Commit 38a8b9cc 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 1ecd7edc
Pipeline #5264 passed with stage
in 16 minutes and 14 seconds
......@@ -48,6 +48,7 @@
"License": "GPL",
"Name": "Presenter",
"Name[ca]": "Presentador",
"Name[es]": "Presentador",
"Name[gl]": "Presentador",
"Name[it]": "Presentatore",
"Name[lt]": "Pristatytojas",
......
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