Commit ee397be8 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 c6afe39f
......@@ -18,6 +18,7 @@
"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[ru]": "Подключение и отключение образов ISO",
"Name[sk]": "Pripojiť a odpojiť ISO obraz",
"Name[sl]": "Priklopi in odklopi iso sliko sistema",
"Name[sv]": "Montera och avmontera ISO-avbild",
......
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