Commit c46f8e2e 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 6fada16d
Pipeline #14033 passed with stage
in 15 minutes and 16 seconds
......@@ -8,6 +8,7 @@ Name[et]=Keysmith
Name[fi]=Keysmith
Name[fr]=Keysmith
Name[it]=Keysmith
Name[ko]=Keysmith
Name[nl]=Keysmith
Name[pt]=Keysmith
Name[pt_BR]=Keysmith
......@@ -25,6 +26,7 @@ Comment[es]=Gestión de elementos OTP para autenticación de dos factores (2fa)
Comment[et]=Kaheastmelise autentimise (2fa) OTP-pääsmike haldamine
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[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)
......
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