Commit 534d9736 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 509674ec
Pipeline #11960 passed with stage
in 12 minutes and 58 seconds
......@@ -2,6 +2,7 @@
......@@ -13,6 +14,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[es]=Gestión de elementos OTP para autenticación de dos factores (2fa)
Comment[it]=Gestisce i token OTP per l'autenticazione a due fattori (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)
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