Commit af57aca5 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 b7766176
Pipeline #4143 passed with stage
in 8 minutes and 32 seconds
......@@ -82,7 +82,7 @@
"Name[hu]": "Telefonintegráció",
"Name[id]": "Telephony integration",
"Name[it]": "Integrazione telefonica",
"Name[ja]": "Telephony 統合",
"Name[ja]": "電話の統合",
"Name[ko]": "전화 통합",
"Name[nl]": "Telefoonintegratie",
"Name[nn]": "Telefonintegrering",
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