Commit a60f21ac 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 1daeba05
......@@ -6,11 +6,13 @@
"Name": "Start a Slideshow",
"Name[az]": "Slayd şounu başlatmaq",
"Name[ca@valencia]": "Inicia un passe de diapositives",
"Name[ca]": "Inicia un passi de diapositives",
"Name[es]": "Comenzar una presentación",
"Name[nl]": "Een diavoorstelling starten",
"Name[pt]": "Iniciar uma Apresentação",
"Name[sl]": "Začni predstavitev",
"Name[sv]": "Starta ett bildspel",
"Name[uk]": "Розпочати показ слайдів",
"Name[x-test]": "xxStart a Slideshowxx",
Supports Markdown
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