Commit cad0e687 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 502a2856
......@@ -14,6 +14,7 @@ Name[fi]=Paikallinen järjestelmäviestipalvelu
Name[fr]=Service local de messages du système
Name[hi]=स्थानिक तंत्र संदेश सेवा
Name[hu]=Helyi rendszerüzenet-szolgáltatás
Name[ia]=Servicio de message de systema local
Name[it]=Servizio dei messaggi del sistema locale
Name[ko]=로컬 시스템 메시지 서비스
Name[nl]=Service voor lokale systeemberichten
......
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