From af545676a54da0df1ffbe22bc51f6065703bf475 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 7 Jun 2020 05:08:59 +0200 Subject: [PATCH] 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" --- org.kde.keysmith.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/org.kde.keysmith.desktop b/org.kde.keysmith.desktop index b031a88..a4ee380 100644 --- a/org.kde.keysmith.desktop +++ b/org.kde.keysmith.desktop @@ -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)