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"
master
l10n daemon script 2019-12-30 05:39:49 +01:00
parent e551b2a04d
commit 5b430ddc95
1 changed files with 2 additions and 0 deletions

View File

@ -2,6 +2,7 @@
Name=Keysmith
Name[ca]=Keysmith
Name[cs]=Keysmith
Name[en_GB]=Keysmith
Name[es]=Keysmith
Name[et]=Keysmith
Name[fr]=Keysmith
@ -17,6 +18,7 @@ Name[zh_TW]=Keysmith
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[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)