Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit af545676 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 36dfb079
Pipeline #22804 passed with stage
in 11 minutes and 42 seconds
......@@ -17,6 +17,7 @@ Name[fr]=Keysmith
Name[it]=Keysmith
Name[ko]=Keysmith
Name[nl]=Keysmith
Name[nn]=Keysmith
Name[pt]=Keysmith
Name[pt_BR]=Keysmith
Name[ru]=Keysmith
......@@ -37,6 +38,7 @@ 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[nn]=Handsam OTP-pollettar for tofaktor­autentisering (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)
Comment[sv]=Hantera OTP-symboler för tvåfaktorsbehörighetskontroll (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