Commit a66537dd authored by Script Kiddy's avatar Script Kiddy

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"
parent f9dde151
Pipeline #10589 passed with stage
in 10 minutes and 57 seconds
......@@ -4,6 +4,7 @@ Name[ca]=Keysmith
Name[cs]=Keysmith
Name[nl]=Keysmith
Name[pt]=Keysmith
Name[sv]=Keysmith
Name[tg]=Keysmith
Name[uk]=Keysmith
Name[x-test]=xxKeysmithxx
......@@ -13,6 +14,7 @@ Comment[ca]=Gestiona els vostres símbols OTP per a una autenticació de dos fac
Comment[cs]=Spravujte tokeny OTP pomocí dvoufaktorového ověření (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[sv]=Hantera OTP-symboler för tvåfaktorsbehörighetskontroll (2fa)
Comment[tg]=Нишонҳои OTP-и худро барои санҷиши ҳаққонияти дуомила идора намоед (2fa)
Comment[uk]=Керування вашими ключами OTP для двофакторного розпізнавання (2fa)
Comment[x-test]=xxManage your OTP tokens for two factor authentication (2fa)xx
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment