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"

kcms/users/kcm_users.desktop

@@ -81,7 +81,7 @@ Comment[zh_CN]=管理用户帐户.
 X-KDE-Keywords=user,account
 X-KDE-Keywords[az]=istifadəçi,hesab,user,account
 X-KDE-Keywords[ca]=usuari,compte
-X-KDE-Keywords[cs]=Uživatelský účet
+X-KDE-Keywords[cs]=uživatel,účet
 X-KDE-Keywords[da]=bruger,konto
 X-KDE-Keywords[de]=benutzer,konto,account
 X-KDE-Keywords[en_GB]=user,account