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 2022-04-02 01:43:00 +00:00
parent 88fbcb37cc
commit 506234cb57
1 changed files with 2 additions and 0 deletions

View File

@ -33,6 +33,7 @@ Name[sk]=Keysmith
Name[sl]=Keysmith
Name[sv]=Keysmith
Name[tg]=Keysmith
Name[tr]=Keysmith
Name[uk]=Keysmith
Name[x-test]=xxKeysmithxx
Name[zh_CN]=Keysmith
@ -64,6 +65,7 @@ Comment[sk]=Spravujte svoje OTP tokeny pre dvojfaktorové overenie (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)
Comment[tr]=İki aşamalı kimlik doğrulama (2fa) için tek kerelik parola jetonlarını yönetin
Comment[uk]=Керування вашими ключами OTP для двофакторного розпізнавання (2fa)
Comment[x-test]=xxManage your OTP tokens for two factor authentication (2fa)xx
Comment[zh_CN]=管理 OTP 令牌的双重身份验证 (2fa)