Commit 6176c967 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 9dd9fc77
......@@ -15,6 +15,7 @@
"Name[en_GB]": "Start a Slideshow",
"Name[es]": "Comenzar una presentación",
"Name[eu]": "Hasi diapositiba-emanaldi bat",
"Name[fi]": "Käynnistä diaesitys",
"Name[fr]": "Démarrer un diaporama",
"Name[ia]": "Starta un presentation (slideshow)",
"Name[it]": "Avvia una presentazione",
......
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