Commit e9387205 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 57b90a44
......@@ -5,6 +5,7 @@
"Name": "Mount and unmount iso image",
"Name[ca@valencia]": "Muntatge i desmuntatge d'una imatge ISO",
"Name[ca]": "Muntatge i desmuntatge d'una imatge ISO",
"Name[cs]": "Připojit a odpojit obraz iso",
"Name[en_GB]": "Mount and unmount ISO image",
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