Commit a914765b authored by Script Kiddy's avatar Script Kiddy

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 8454fdc6
......@@ -14,7 +14,7 @@
"Name[el]": "Μενού υπηρεσίας 'Συμπίεσης'",
"Name[en_GB]": "'Compress' service menu",
"Name[es]": "Menú de servicio para «Comprimir»",
"Name[et]": "Tihendamise teenusemenüü",
"Name[et]": "Pakkimise teenusemenüü",
"Name[eu]": "'Konprimatu' zerbitzu menua",
"Name[fi]": "Pakkaa-palveluvalikko",
"Name[fr]": "Menu de service « compresser »",
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