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-09-19 06:20:22 +02:00
parent f1dbd0c4b7
commit e8e4b916a2
1 changed files with 2 additions and 0 deletions

View File

@ -21,6 +21,7 @@ Name[nl]=Keysmith
Name[nn]=Keysmith
Name[pt]=Keysmith
Name[pt_BR]=Keysmith
Name[ro]=Keysmith
Name[ru]=Keysmith
Name[sk]=Keysmith
Name[sl]=Keysmith
@ -45,6 +46,7 @@ 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[ro]=Gestionați-vă jetoanele OTP pentru autentificarea în doi factori (2fa)
Comment[sl]=Upravljajte vaših enkratnih gesel žetonov za dvo-faktorsko overjanje (2fa)
Comment[sv]=Hantera OTP-symboler för tvåfaktorsbehörighetskontroll (2fa)
Comment[tg]=Нишонҳои OTP-и худро барои санҷиши ҳаққонияти дуомила идора намоед (2fa)