Commit ed18868c 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 b4678105
Pipeline #93456 skipped
......@@ -8,6 +8,7 @@
"Name[az]": "Martin Klapetek",
"Name[ca]": "Martin Klapetek",
"Name[cs]": "Martin Klapetek",
"Name[de]": "Martin Klapetek",
"Name[en_GB]": "Martin Klapetek",
"Name[es]": "Martin Klapetek",
"Name[eu]": "Martin Klapetek",
......@@ -66,6 +67,7 @@
"Name[az]": "Bayramlar",
"Name[ca]": "Dies festius",
"Name[cs]": "Svátky",
"Name[de]": "Urlaub",
"Name[en_GB]": "Holidays",
"Name[es]": "Días festivos",
"Name[eu]": "Jaiegunak",
......
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