Commit 068c04e0 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 f5a44987
Pipeline #167659 skipped
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
"Name[ca@valencia]": "Dies festius", "Name[ca@valencia]": "Dies festius",
"Name[ca]": "Dies festius", "Name[ca]": "Dies festius",
"Name[cs]": "Svátky", "Name[cs]": "Svátky",
"Name[de]": "Urlaub", "Name[de]": "Feiertage",
"Name[en_GB]": "Holidays", "Name[en_GB]": "Holidays",
"Name[es]": "Días festivos", "Name[es]": "Días festivos",
"Name[eu]": "Jaiegunak", "Name[eu]": "Jaiegunak",
......
Supports Markdown
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