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"

org.kde.keysmith.desktop

@@ -14,6 +14,7 @@ Name[es]=Keysmith
 Name[et]=Keysmith
 Name[fi]=Keysmith
 Name[fr]=Keysmith
+Name[hi]=कीस्मिथ (Keysmith)
 Name[it]=Keysmith
 Name[ko]=Keysmith
 Name[nl]=Keysmith
@@ -36,6 +37,7 @@ Comment[en_GB]=Manage your OTP tokens for two factor authentication (2fa)
 Comment[es]=Gestión de elementos OTP para autenticación de dos factores (2fa)
 Comment[et]=Kaheastmelise autentimise (2fa) OTP-pääsmike haldamine 
 Comment[fr]=Gérez vos jetons OTP pour l'authentification à 2 facteurs (2fa)
+Comment[hi]=आपके दोहरे प्रमाणीकरण (2fa) के लिए OTP टोकन का प्रबंधन
 Comment[it]=Gestisce i token OTP per l'autenticazione a due fattori (2fa)
 Comment[ko]=2단계 인증(2FA) OTP 토큰 관리 도구
 Comment[nl]=Uw OTP-tokens beheren voor twee-factor authenticatie (2fa)