Commit 4507c5e0 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 be4fdbe1
Pipeline #47305 skipped
......@@ -15,6 +15,7 @@ Name[et]=Keysmith
Name[fi]=Keysmith
Name[fr]=Keysmith
Name[hi]=कीस्मिथ (Keysmith)
Name[hu]=Keysmith
Name[ia]=Keysmith
Name[it]=Keysmith
Name[ko]=Keysmith
......@@ -42,6 +43,7 @@ Comment[et]=Kaheastmelise autentimise (2fa) OTP-pääsmike haldamine
Comment[fi]=Hallitse kahden tekijän todennuksen (2FA) OTP-merkkejä
Comment[fr]=Gérez vos jetons OTP pour l'authentification à 2 facteurs (2fa)
Comment[hi]=आपके दोहरे प्रमाणीकरण (2fa) के लिए OTP टोकन का प्रबंधन
Comment[hu]=OTP tokenek kezelése a kétfaktoros hitelesítéshez (2FA)
Comment[ia]=Gere tu secretos OTP per authenication a duo factores (2fa)
Comment[it]=Gestisce i token OTP per l'autenticazione a due fattori (2fa)
Comment[ko]=2단계 인증(2FA) OTP 토큰 관리 도구
......
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