Commit 2b69cae6 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 ca77c081
......@@ -47,6 +47,7 @@ Comment[zh_TW]=PolicyKit 認證對話框
Name=Authentication System
Name[ca]=Sistema d'autenticació
Name[cs]=Systém ověření
Name[da]=Autentificeringssystem
Name[de]=Authentifizierungssystem
Name[el]=Σύστημα ταυτοποίησης
Name[en_GB]=Authentication System
......@@ -72,6 +73,7 @@ Name[zh_CN]=身份验证系统
Name=Authenticate
Name[ca]=Autentica
Name[cs]=Ověřit
Name[da]=Autentificér
Name[de]=Authentifizieren
Name[el]=Ταυτοποίηση
Name[en_GB]=Authenticate
......
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