Commit 794fa299 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 720cc9f2
......@@ -13,10 +13,12 @@
"Name[fi]": "Liitä ja irrota ISO-levykuva",
"Name[fr]": "Monter et libérer une image « ISO »",
"Name[it]": "Monta e smonta immagine iso",
"Name[ko]": "ISO 이미지 마운트 및 마운트 해제",
"Name[nl]": "Aan- en afkoppelen van iso-image",
"Name[pt]": "Montar e desmontar a imagem ISO",
"Name[pt_BR]": "Montar e desmontar imagem ISO",
"Name[sk]": "Pripojiť a odpojiť ISO obraz",
"Name[sl]": "Priklopi in odklopi iso sliko sistema",
"Name[sv]": "Montera och avmontera ISO-avbild",
"Name[uk]": "Монтування і демонтування образів ISO",
"Name[x-test]": "xxMount and unmount iso imagexx",
......
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