Commit e5a369f3 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 6c0b1a69
......@@ -7,6 +7,7 @@
"Name": "Mount and unmount iso image",
"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",
"Name[et]": "ISO-tõmmise ühendamine ja lahutamine",
"Name[fi]": "Liitä ja irrota ISO-levykuva",
"Name[fr]": "Monter et libérer une image « ISO »",
......@@ -15,6 +16,7 @@
"Name[pt]": "Montar e desmontar a imagem ISO",
"Name[pt_BR]": "Montar e desmontar imagem ISO",
"Name[sk]": "Pripojiť a odpojiť ISO obraz",
"Name[sv]": "Montera och avmontera ISO-avbild",
"Name[uk]": "Монтування і демонтування образів ISO",
"Name[x-test]": "xxMount and unmount iso imagexx",
"ServiceTypes": [
......
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