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 2020-06-07 05:08:59 +02:00
parent 36dfb0791f
commit af545676a5
1 changed files with 2 additions and 0 deletions

View File

@ -17,6 +17,7 @@ Name[fr]=Keysmith
Name[it]=Keysmith
Name[ko]=Keysmith
Name[nl]=Keysmith
Name[nn]=Keysmith
Name[pt]=Keysmith
Name[pt_BR]=Keysmith
Name[ru]=Keysmith
@ -37,6 +38,7 @@ 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[ko]=2단계 인증(2FA) OTP 토큰 관리 도구
Comment[nl]=Uw OTP-tokens beheren voor twee-factor authenticatie (2fa)
Comment[nn]=Handsam OTP-pollettar for tofaktor­autentisering (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)