Commit f6319ae9 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 21896d7f
......@@ -10,6 +10,7 @@
"Name[en_GB]": "Mount and unmount ISO image",
"Name[es]": "Montar y desmontar imágenes ISO",
"Name[et]": "ISO-tõmmise ühendamine ja lahutamine",
"Name[eu]": "Muntatuta eta desmuntatu ISO irudiak",
"Name[fi]": "Liitä ja irrota ISO-levykuva",
"Name[fr]": "Monter et libérer une image « ISO »",
"Name[it]": "Monta e smonta immagine iso",
......
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