Commit 3f28929a authored by Script Kiddy's avatar Script Kiddy
Browse files

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 0fa050b9
Pipeline #118849 skipped
......@@ -9,6 +9,7 @@
"Name[az]": "İSO faylını disk surətini qoşmaq",
"Name[ca@valencia]": "Muntatge d'imatges ISO i de disc",
"Name[ca]": "Muntatge d'imatges ISO i de disc",
"Name[cs]": "Připojit ISO a obrazy disku",
"Name[en_GB]": "Mount ISO and disk images",
"Name[es]": "Montar imágenes ISO y de disco",
"Name[fr]": "Monter des images « ISO » et de disque",
......
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