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

@@ -3,9 +3,12 @@ Name=Keysmith
 Name[ca]=Keysmith
 Name[cs]=Keysmith
 Name[es]=Keysmith
+Name[et]=Keysmith
+Name[fr]=Keysmith
 Name[it]=Keysmith
 Name[nl]=Keysmith
 Name[pt]=Keysmith
+Name[pt_BR]=Keysmith
 Name[sv]=Keysmith
 Name[tg]=Keysmith
 Name[uk]=Keysmith
@@ -15,9 +18,12 @@ Comment=Manage your OTP tokens for two factor authentication (2fa)
 Comment[ca]=Gestiona els vostres símbols OTP per a una autenticació de dos factors (2fa)
 Comment[cs]=Spravujte tokeny OTP pomocí dvoufaktorového ověření (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[it]=Gestisce i token OTP per l'autenticazione a due fattori (2fa)
 Comment[nl]=Uw OTP-tokens beheren voor twee-factor authenticatie (2fa)
 Comment[pt]=Faça a gestão dos seus códigos OTP para a autenticação em dois-factores (2FA)
+Comment[pt_BR]=Gerencie seus tokens OTP para a autenticação de dois fatores (2fa)
 Comment[sv]=Hantera OTP-symboler för tvåfaktorsbehörighetskontroll (2fa)
 Comment[tg]=Нишонҳои OTP-и худро барои санҷиши ҳаққонияти дуомила идора намоед (2fa)
 Comment[uk]=Керування вашими ключами OTP для двофакторного розпізнавання (2fa)