Commit 65bdad3f authored by Script Kiddy's avatar Script Kiddy
Browse files

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent aec5e2fa
......@@ -9,6 +9,7 @@
"Name[az]": "Slayd şounu başlatmaq",
"Name[ca@valencia]": "Inicia un passe de diapositives",
"Name[ca]": "Inicia un passi de diapositives",
"Name[en_GB]": "Start a Slideshow",
"Name[es]": "Comenzar una presentación",
"Name[it]": "Avvia una presentazione",
"Name[nl]": "Een diavoorstelling starten",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment