Commit e211da0c 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 3daccd48
......@@ -17,6 +17,7 @@
"Name[eu]": "Muntatuta eta desmuntatu ISO irudiak",
"Name[fi]": "Liitä ja irrota ISO-levykuva",
"Name[fr]": "Monter et libérer une image « ISO »",
"Name[id]": "Kait dan lepaskan kait citra iso",
"Name[it]": "Monta e smonta immagine iso",
"Name[ko]": "ISO 이미지 마운트 및 마운트 해제",
"Name[nl]": "Aan- en afkoppelen van 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