Commit 5b83d8fd 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 3c27d443
......@@ -10,6 +10,7 @@
"Name[ca]": "Muntatge i desmuntatge d'una imatge ISO",
"Name[cs]": "Připojit a odpojit obraz iso",
"Name[da]": "Montér og afmontér ISO-imagefil",
"Name[de]": "ISO-Abbilder ein- und aushängen",
"Name[el]": "Προσάρτηση και αποπροσάρτηση εικόνων iso",
"Name[en_GB]": "Mount and unmount ISO image",
"Name[es]": "Montar y desmontar imágenes 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