Commit e6f8a391 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 5831de92
Pipeline #5477 passed with stage
in 11 minutes and 4 seconds
......@@ -51,6 +51,7 @@
"Name[es]": "Presentador",
"Name[gl]": "Presentador",
"Name[it]": "Presentatore",
"Name[ko]": "프레젠터",
"Name[lt]": "Pristatytojas",
"Name[nl]": "Presentator",
"Name[nn]": "Presentatør",
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