Commit be257960 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 d99341fa
Pipeline #39271 skipped
......@@ -59,7 +59,7 @@
"Name[sr@ijekavianlatin]": "Protivspam",
"Name[sr@latin]": "Protivspam",
"Name[sr]": "Противспам",
"Name[sv]": "Antiskräppost",
"Name[sv]": "Eliminering av skräppost",
"Name[tr]": "Antispam",
"Name[uk]": "Антиспам",
"Name[x-test]": "xxAntispamxx",
......
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