From 9ae9fa094ea903c2f79bf29fe8b7f27c0170f170 Mon Sep 17 00:00:00 2001 From: olivierperes Date: Wed, 16 Jun 2021 15:49:30 +0200 Subject: [PATCH] refactor(mail): replace "Google Authenticator" with more general vocabulary The 2FA feature is not specific to one application, rewording makes this more clear. Fixes #5294 --- UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings | 4 ++-- UI/MainUI/Catalan.lproj/Localizable.strings | 4 ++-- UI/MainUI/Czech.lproj/Localizable.strings | 4 ++-- UI/MainUI/English.lproj/Localizable.strings | 4 ++-- UI/MainUI/French.lproj/Localizable.strings | 4 ++-- UI/MainUI/German.lproj/Localizable.strings | 4 ++-- UI/MainUI/Hungarian.lproj/Localizable.strings | 4 ++-- UI/MainUI/Polish.lproj/Localizable.strings | 4 ++-- UI/MainUI/Russian.lproj/Localizable.strings | 4 ++-- UI/MainUI/SOGoRootPage.m | 4 ++-- UI/MainUI/Serbian.lproj/Localizable.strings | 4 ++-- UI/MainUI/SerbianLatin.lproj/Localizable.strings | 4 ++-- UI/MainUI/Slovak.lproj/Localizable.strings | 4 ++-- UI/MainUI/Slovenian.lproj/Localizable.strings | 4 ++-- .../BrazilianPortuguese.lproj/Localizable.strings | 4 ++-- UI/PreferencesUI/Catalan.lproj/Localizable.strings | 4 ++-- UI/PreferencesUI/Czech.lproj/Localizable.strings | 4 ++-- UI/PreferencesUI/English.lproj/Localizable.strings | 4 ++-- UI/PreferencesUI/French.lproj/Localizable.strings | 4 ++-- UI/PreferencesUI/German.lproj/Localizable.strings | 4 ++-- UI/PreferencesUI/Hungarian.lproj/Localizable.strings | 4 ++-- UI/PreferencesUI/Polish.lproj/Localizable.strings | 4 ++-- UI/PreferencesUI/Russian.lproj/Localizable.strings | 4 ++-- UI/PreferencesUI/Serbian.lproj/Localizable.strings | 4 ++-- UI/PreferencesUI/SerbianLatin.lproj/Localizable.strings | 4 ++-- UI/PreferencesUI/Slovak.lproj/Localizable.strings | 4 ++-- UI/PreferencesUI/Slovenian.lproj/Localizable.strings | 4 ++-- UI/Templates/MainUI/SOGoRootPage.wox | 4 ++-- UI/Templates/PreferencesUI/UIxPreferences.wox | 6 +++--- UI/WebServerResources/js/Common/Authentication.service.js | 4 ++-- 30 files changed, 61 insertions(+), 61 deletions(-) diff --git a/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings index e39b9806c..b74dca3c5 100644 --- a/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings @@ -24,8 +24,8 @@ /* 2FA */ "Verification Code" = "Código de verificação"; -"Enter the 6-digit verification code from your Google Authenticator application." = "Digite o código de verificação de 6 dígitos do seu aplicativo Google Authenticator."; -"You provided an invalid Google Authenticator key." = "Você forneceu uma chave inválida do Google Authenticator."; +"Enter the 6-digit verification code from your TOTP application." = "Digite o código de verificação de 6 dígitos do seu aplicativo Google Authenticator."; +"You provided an invalid TOTP key." = "Você forneceu uma chave inválida do Google Authenticator."; "Download" = "Download"; "Language" = "Idioma"; diff --git a/UI/MainUI/Catalan.lproj/Localizable.strings b/UI/MainUI/Catalan.lproj/Localizable.strings index 7a3aa1f66..319053931 100644 --- a/UI/MainUI/Catalan.lproj/Localizable.strings +++ b/UI/MainUI/Catalan.lproj/Localizable.strings @@ -24,8 +24,8 @@ /* 2FA */ "Verification Code" = "Codi de verificació"; -"Enter the 6-digit verification code from your Google Authenticator application." = "Introdueix el codi de verificació de 6 dígits de l'aplicació Google Authenticator."; -"You provided an invalid Google Authenticator key." = "Has proporcionat una clau de Google Authenticator invàlida."; +"Enter the 6-digit verification code from your TOTP application." = "Introdueix el codi de verificació de 6 dígits de l'aplicació Google Authenticator."; +"You provided an invalid TOTP key." = "Has proporcionat una clau de Google Authenticator invàlida."; "Download" = "Descàrrega"; "Language" = "Llengua"; diff --git a/UI/MainUI/Czech.lproj/Localizable.strings b/UI/MainUI/Czech.lproj/Localizable.strings index fa0f8f67c..de781a082 100644 --- a/UI/MainUI/Czech.lproj/Localizable.strings +++ b/UI/MainUI/Czech.lproj/Localizable.strings @@ -24,8 +24,8 @@ /* 2FA */ "Verification Code" = "Ověřovací kód"; -"Enter the 6-digit verification code from your Google Authenticator application." = "Zadejte 6-ti místný číselný ověřovací kód z Vaší aplikace Google Authenticator."; -"You provided an invalid Google Authenticator key." = "Zadali jste neplatný ověřovací kód z Google Authenticator."; +"Enter the 6-digit verification code from your TOTP application." = "Zadejte 6-ti místný číselný ověřovací kód z Vaší aplikace Google Authenticator."; +"You provided an invalid TOTP key." = "Zadali jste neplatný ověřovací kód z Google Authenticator."; "Download" = "Stáhnout"; "Language" = "Jazyk"; diff --git a/UI/MainUI/English.lproj/Localizable.strings b/UI/MainUI/English.lproj/Localizable.strings index adf6024dd..c7895d75f 100644 --- a/UI/MainUI/English.lproj/Localizable.strings +++ b/UI/MainUI/English.lproj/Localizable.strings @@ -24,8 +24,8 @@ /* 2FA */ "Verification Code" = "Verification Code"; -"Enter the 6-digit verification code from your Google Authenticator application." = "Enter the 6-digit verification code from your Google Authenticator application."; -"You provided an invalid Google Authenticator key." = "You provided an invalid Google Authenticator key."; +"Enter the 6-digit verification code from your TOTP application." = "Enter the 6-digit verification code from your TOTP application."; +"You provided an invalid TOTP key." = "You provided an invalid TOTP key."; "Download" = "Download"; "Language" = "Language"; diff --git a/UI/MainUI/French.lproj/Localizable.strings b/UI/MainUI/French.lproj/Localizable.strings index a500972dd..022f7d1b7 100644 --- a/UI/MainUI/French.lproj/Localizable.strings +++ b/UI/MainUI/French.lproj/Localizable.strings @@ -24,8 +24,8 @@ /* 2FA */ "Verification Code" = "Code de vérification"; -"Enter the 6-digit verification code from your Google Authenticator application." = "Saisissez le code de vérification à 6 chiffres de votre application Google Authenticator."; -"You provided an invalid Google Authenticator key." = "Vous avez fourni une clé Google Authenticator non valide."; +"Enter the 6-digit verification code from your TOTP application." = "Saisissez le code de vérification à 6 chiffres de votre application TOTP."; +"You provided an invalid TOTP key." = "Vous avez fourni une clé TOTP non valide."; "Download" = "Télécharger"; "Language" = "Langue"; diff --git a/UI/MainUI/German.lproj/Localizable.strings b/UI/MainUI/German.lproj/Localizable.strings index b0ec5c080..3726f28ac 100644 --- a/UI/MainUI/German.lproj/Localizable.strings +++ b/UI/MainUI/German.lproj/Localizable.strings @@ -24,8 +24,8 @@ /* 2FA */ "Verification Code" = "Sicherheitscode"; -"Enter the 6-digit verification code from your Google Authenticator application." = "Geben Sie den 6-stelligen Sicherheitscode aus Ihrer Google Authenticator App ein."; -"You provided an invalid Google Authenticator key." = "Sie haben einen ungültigen Google Authenticator Schlüssel eingegeben."; +"Enter the 6-digit verification code from your TOTP application." = "Geben Sie den 6-stelligen Sicherheitscode aus Ihrer Google Authenticator App ein."; +"You provided an invalid TOTP key." = "Sie haben einen ungültigen Google Authenticator Schlüssel eingegeben."; "Download" = "Herunterladen"; "Language" = "Sprache"; diff --git a/UI/MainUI/Hungarian.lproj/Localizable.strings b/UI/MainUI/Hungarian.lproj/Localizable.strings index 45fea171e..cfaeeaf1e 100644 --- a/UI/MainUI/Hungarian.lproj/Localizable.strings +++ b/UI/MainUI/Hungarian.lproj/Localizable.strings @@ -24,8 +24,8 @@ /* 2FA */ "Verification Code" = "Megerősítő kód"; -"Enter the 6-digit verification code from your Google Authenticator application." = "Adja meg a Google Authenticator alkalmazás által megadott 6 jegyű megerősítő kódot."; -"You provided an invalid Google Authenticator key." = "Érvénytelen Google Authenticator kódot adott meg."; +"Enter the 6-digit verification code from your TOTP application." = "Adja meg a Google Authenticator alkalmazás által megadott 6 jegyű megerősítő kódot."; +"You provided an invalid TOTP key." = "Érvénytelen Google Authenticator kódot adott meg."; "Download" = "Letöltés"; "Language" = "Nyelv"; diff --git a/UI/MainUI/Polish.lproj/Localizable.strings b/UI/MainUI/Polish.lproj/Localizable.strings index 0265d4845..48974df9e 100644 --- a/UI/MainUI/Polish.lproj/Localizable.strings +++ b/UI/MainUI/Polish.lproj/Localizable.strings @@ -24,8 +24,8 @@ /* 2FA */ "Verification Code" = "Kod weryfikacyjny"; -"Enter the 6-digit verification code from your Google Authenticator application." = "Wpisz 6-cio cyfrowy kod z aplikacji Google Authenticator."; -"You provided an invalid Google Authenticator key." = "Podałeś nieprawidłowy klucz Google Authenticator."; +"Enter the 6-digit verification code from your TOTP application." = "Wpisz 6-cio cyfrowy kod z aplikacji Google Authenticator."; +"You provided an invalid TOTP key." = "Podałeś nieprawidłowy klucz Google Authenticator."; "Download" = "Pobierz"; "Language" = "Język"; diff --git a/UI/MainUI/Russian.lproj/Localizable.strings b/UI/MainUI/Russian.lproj/Localizable.strings index 072c5e370..4e29891a3 100644 --- a/UI/MainUI/Russian.lproj/Localizable.strings +++ b/UI/MainUI/Russian.lproj/Localizable.strings @@ -24,8 +24,8 @@ /* 2FA */ "Verification Code" = "Код верификации"; -"Enter the 6-digit verification code from your Google Authenticator application." = "Введите 6-значный код подтверждения из приложения Google Authenticator."; -"You provided an invalid Google Authenticator key." = "Вы ввели неверный ключ Google Authenticator."; +"Enter the 6-digit verification code from your TOTP application." = "Введите 6-значный код подтверждения из приложения Google Authenticator."; +"You provided an invalid TOTP key." = "Вы ввели неверный ключ Google Authenticator."; "Download" = "Скачать"; "Language" = "Язык"; diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m index 9caa6293c..5a8cee5bf 100644 --- a/UI/MainUI/SOGoRootPage.m +++ b/UI/MainUI/SOGoRootPage.m @@ -273,7 +273,7 @@ if (code != [verificationCode unsignedIntValue]) { - [self logWithFormat: @"Invalid Google Authenticator key for '%@'", username]; + [self logWithFormat: @"Invalid TOTP key for '%@'", username]; json = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt: 1] forKey: @"GoogleAuthenticatorInvalidKey"]; return [self responseWithStatus: 403 @@ -282,7 +282,7 @@ } // if ([verificationCode length] == 6 && [verificationCode unsignedIntValue] > 0) else { - [self logWithFormat: @"Missing Google Authenticator key for '%@', asking it..", username]; + [self logWithFormat: @"Missing TOTP key for '%@', asking it..", username]; json = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt: 1] forKey: @"GoogleAuthenticatorMissingKey"]; return [self responseWithStatus: 202 diff --git a/UI/MainUI/Serbian.lproj/Localizable.strings b/UI/MainUI/Serbian.lproj/Localizable.strings index b1d154f90..36a28a14d 100644 --- a/UI/MainUI/Serbian.lproj/Localizable.strings +++ b/UI/MainUI/Serbian.lproj/Localizable.strings @@ -24,8 +24,8 @@ /* 2FA */ "Verification Code" = "Верификациони код"; -"Enter the 6-digit verification code from your Google Authenticator application." = "Унесите 6-цифрени код из ваше Google Authenticator апликације."; -"You provided an invalid Google Authenticator key." = "Унели сте неисправан код."; +"Enter the 6-digit verification code from your TOTP application." = "Унесите 6-цифрени код из ваше Google Authenticator апликације."; +"You provided an invalid TOTP key." = "Унели сте неисправан код."; "Download" = "Преузимање"; "Language" = "Језик"; diff --git a/UI/MainUI/SerbianLatin.lproj/Localizable.strings b/UI/MainUI/SerbianLatin.lproj/Localizable.strings index b5c0043f6..cc0b4bbd5 100644 --- a/UI/MainUI/SerbianLatin.lproj/Localizable.strings +++ b/UI/MainUI/SerbianLatin.lproj/Localizable.strings @@ -24,8 +24,8 @@ /* 2FA */ "Verification Code" = "Verifikacioni kod"; -"Enter the 6-digit verification code from your Google Authenticator application." = "Unesite 6-ocifreni verifikacioni kod iz aplikacije Google Authenticator."; -"You provided an invalid Google Authenticator key." = "Naveli ste nevažeći ključ Google Authenticator-a."; +"Enter the 6-digit verification code from your TOTP application." = "Unesite 6-ocifreni verifikacioni kod iz aplikacije Google Authenticator."; +"You provided an invalid TOTP key." = "Naveli ste nevažeći ključ Google Authenticator-a."; "Download" = "Preuzimanje"; "Language" = "Jezik"; diff --git a/UI/MainUI/Slovak.lproj/Localizable.strings b/UI/MainUI/Slovak.lproj/Localizable.strings index a769d0fcd..459163332 100644 --- a/UI/MainUI/Slovak.lproj/Localizable.strings +++ b/UI/MainUI/Slovak.lproj/Localizable.strings @@ -24,8 +24,8 @@ /* 2FA */ "Verification Code" = "Overovací kód"; -"Enter the 6-digit verification code from your Google Authenticator application." = "Zadajte 6-miestny číselný overovací kód z Vašej aplikácie Google Authenticator."; -"You provided an invalid Google Authenticator key." = "Zadali ste neplatný overovací kód z Google Authenticator."; +"Enter the 6-digit verification code from your TOTP application." = "Zadajte 6-miestny číselný overovací kód z Vašej aplikácie Google Authenticator."; +"You provided an invalid TOTP key." = "Zadali ste neplatný overovací kód z Google Authenticator."; "Download" = "Stiahnuť"; "Language" = "Jazyk"; diff --git a/UI/MainUI/Slovenian.lproj/Localizable.strings b/UI/MainUI/Slovenian.lproj/Localizable.strings index 55183421b..7dfdd34eb 100644 --- a/UI/MainUI/Slovenian.lproj/Localizable.strings +++ b/UI/MainUI/Slovenian.lproj/Localizable.strings @@ -24,8 +24,8 @@ /* 2FA */ "Verification Code" = "Potrditvena koda"; -"Enter the 6-digit verification code from your Google Authenticator application." = "Vnesite 6 mestno potrditveno številko iz Google Authenticator aplikacije."; -"You provided an invalid Google Authenticator key." = "Vnesena številka je napačna."; +"Enter the 6-digit verification code from your TOTP application." = "Vnesite 6 mestno potrditveno številko iz Google Authenticator aplikacije."; +"You provided an invalid TOTP key." = "Vnesena številka je napačna."; "Download" = "Prenos"; "Language" = "Jezik"; diff --git a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings index 1161fe9a9..a6bfb3e16 100644 --- a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings @@ -459,8 +459,8 @@ "animation_NONE" = "Nenhum"; /* 2FA */ -"Enable two-factor authentication using Google Authenticator" = "Ative a autenticação de dois fatores usando o Google Authenticator"; -"You must enter this key into your Google Authenticator application." = "Ative a autenticação de dois fatores usando o Google Authenticator"; +"Enable two-factor authentication using a TOTP application" = "Ative a autenticação de dois fatores usando o Google Authenticator"; +"You must enter this key into your TOTP application." = "Ative a autenticação de dois fatores usando o Google Authenticator"; "If you do not and you log out you will not be able to login again." = "Se você não fizer isso e fizer logout, não será possível fazer o login novamente."; /* External Sieve scripts */ diff --git a/UI/PreferencesUI/Catalan.lproj/Localizable.strings b/UI/PreferencesUI/Catalan.lproj/Localizable.strings index 9dae2c546..17930142e 100644 --- a/UI/PreferencesUI/Catalan.lproj/Localizable.strings +++ b/UI/PreferencesUI/Catalan.lproj/Localizable.strings @@ -455,8 +455,8 @@ "animation_NONE" = "Cap"; /* 2FA */ -"Enable two-factor authentication using Google Authenticator" = "Activa l'autenticació en dos passos mitjançant Google Authenticator"; -"You must enter this key into your Google Authenticator application." = "Has d'introduir aquesta clau a l'aplicació Google Authenticator."; +"Enable two-factor authentication using a TOTP application" = "Activa l'autenticació en dos passos mitjançant Google Authenticator"; +"You must enter this key into your TOTP application." = "Has d'introduir aquesta clau a l'aplicació Google Authenticator."; "If you do not and you log out you will not be able to login again." = "Si no ho fas i surts, no podràs tornar a iniciar la sessió."; /* External Sieve scripts */ diff --git a/UI/PreferencesUI/Czech.lproj/Localizable.strings b/UI/PreferencesUI/Czech.lproj/Localizable.strings index ea063e9c1..ef5046ce9 100644 --- a/UI/PreferencesUI/Czech.lproj/Localizable.strings +++ b/UI/PreferencesUI/Czech.lproj/Localizable.strings @@ -459,8 +459,8 @@ "animation_NONE" = "Žádná"; /* 2FA */ -"Enable two-factor authentication using Google Authenticator" = "Povolit 2-fázové ověřování pomocí Google Authenticator"; -"You must enter this key into your Google Authenticator application." = "Tento klíč musíte zadat do své aplikace Google Authenticator."; +"Enable two-factor authentication using a TOTP application" = "Povolit 2-fázové ověřování pomocí Google Authenticator"; +"You must enter this key into your TOTP application." = "Tento klíč musíte zadat do své aplikace Google Authenticator."; "If you do not and you log out you will not be able to login again." = "Pokud tak neučiníte a odhlásíte se, nebudete se moci znovu přihlásit."; /* External Sieve scripts */ diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings index edbb9cbbf..83d267f55 100644 --- a/UI/PreferencesUI/English.lproj/Localizable.strings +++ b/UI/PreferencesUI/English.lproj/Localizable.strings @@ -459,8 +459,8 @@ "animation_NONE" = "None"; /* 2FA */ -"Enable two-factor authentication using Google Authenticator" = "Enable two-factor authentication using Google Authenticator"; -"You must enter this key into your Google Authenticator application." = "You must enter this key into your Google Authenticator application."; +"Enable two-factor authentication using a TOTP application" = "Enable two-factor authentication using a TOTP application"; +"You must enter this key into your TOTP application." = "You must enter this key into your TOTP application."; "If you do not and you log out you will not be able to login again." = "If you do not and you log out you will not be able to login again."; /* External Sieve scripts */ diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings index a5bb5bc24..1a5d25146 100644 --- a/UI/PreferencesUI/French.lproj/Localizable.strings +++ b/UI/PreferencesUI/French.lproj/Localizable.strings @@ -459,8 +459,8 @@ "animation_NONE" = "Aucun"; /* 2FA */ -"Enable two-factor authentication using Google Authenticator" = "Activer l'authentification à deux facteurs à l'aide de Google Authenticator"; -"You must enter this key into your Google Authenticator application." = "Vous devez saisir cette clé dans votre application Google Authenticator."; +"Enable two-factor authentication using a TOTP application = "Activer l'authentification à deux facteurs à l'aide d’une application TOTP"; +"You must enter this key into your TOTP application." = "Vous devez saisir cette clé dans votre application TOTP."; "If you do not and you log out you will not be able to login again." = "À défaut de le faire, vous ne pourrez pas vous reconnecter."; /* External Sieve scripts */ diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings index 64a1bc74e..df4f3ed83 100644 --- a/UI/PreferencesUI/German.lproj/Localizable.strings +++ b/UI/PreferencesUI/German.lproj/Localizable.strings @@ -459,8 +459,8 @@ "animation_NONE" = "Keine"; /* 2FA */ -"Enable two-factor authentication using Google Authenticator" = "Zwei-Faktor-Authentifizierung mit Google Authenticator aktivieren"; -"You must enter this key into your Google Authenticator application." = "Sie müssen diesen Schlüssel in Ihrer Google Authenticator App eingeben."; +"Enable two-factor authentication using a TOTP application" = "Zwei-Faktor-Authentifizierung mit Google Authenticator aktivieren"; +"You must enter this key into your TOTP application." = "Sie müssen diesen Schlüssel in Ihrer Google Authenticator App eingeben."; "If you do not and you log out you will not be able to login again." = "Wenn Sie das nicht tun und sich abmelden, können Sie sich nicht mehr anmelden."; /* External Sieve scripts */ diff --git a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings index 8de53b10b..39f170962 100644 --- a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings @@ -459,8 +459,8 @@ "animation_NONE" = "Nincs"; /* 2FA */ -"Enable two-factor authentication using Google Authenticator" = "Két faktoros hitelesítés engedélyezése Google Authenticator használatával"; -"You must enter this key into your Google Authenticator application." = "Meg kell adnia ezt a kulcsot a Google Authenticator alkalmazásban."; +"Enable two-factor authentication using a TOTP application" = "Két faktoros hitelesítés engedélyezése Google Authenticator használatával"; +"You must enter this key into your TOTP application." = "Meg kell adnia ezt a kulcsot a Google Authenticator alkalmazásban."; "If you do not and you log out you will not be able to login again." = "Ha nem teszi meg és kijelentkezik, akkor nem lesz képes újra bejelentkezni."; /* External Sieve scripts */ diff --git a/UI/PreferencesUI/Polish.lproj/Localizable.strings b/UI/PreferencesUI/Polish.lproj/Localizable.strings index 30a1a878a..ee25b24b0 100644 --- a/UI/PreferencesUI/Polish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Polish.lproj/Localizable.strings @@ -459,8 +459,8 @@ "animation_NONE" = "Bez animacji"; /* 2FA */ -"Enable two-factor authentication using Google Authenticator" = "Włącz dwuskładnikowe uwierzytelnianie przez Google Authenticator"; -"You must enter this key into your Google Authenticator application." = "Musisz wpisać ten klucz w aplikacji Google Authenticator."; +"Enable two-factor authentication using a TOTP application" = "Włącz dwuskładnikowe uwierzytelnianie przez Google Authenticator"; +"You must enter this key into your TOTP application." = "Musisz wpisać ten klucz w aplikacji Google Authenticator."; "If you do not and you log out you will not be able to login again." = "Jeśli tego nie zrobisz i wylogujesz się, nie będziesz w stanie ponownie się zalogować."; /* External Sieve scripts */ diff --git a/UI/PreferencesUI/Russian.lproj/Localizable.strings b/UI/PreferencesUI/Russian.lproj/Localizable.strings index 32c0ae898..711c73660 100644 --- a/UI/PreferencesUI/Russian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Russian.lproj/Localizable.strings @@ -459,8 +459,8 @@ "animation_NONE" = "Выключена"; /* 2FA */ -"Enable two-factor authentication using Google Authenticator" = "Включить двухфакторную аутентификацию с помощью Google Authenticator"; -"You must enter this key into your Google Authenticator application." = "Вы должны ввести этот ключ в приложение Google Authenticator."; +"Enable two-factor authentication using a TOTP application" = "Включить двухфакторную аутентификацию с помощью Google Authenticator"; +"You must enter this key into your TOTP application." = "Вы должны ввести этот ключ в приложение Google Authenticator."; "If you do not and you log out you will not be able to login again." = "Если вы этого не сделаете и выйдете из системы, вы не сможете войти снова."; /* External Sieve scripts */ diff --git a/UI/PreferencesUI/Serbian.lproj/Localizable.strings b/UI/PreferencesUI/Serbian.lproj/Localizable.strings index 879aafe80..52e475678 100644 --- a/UI/PreferencesUI/Serbian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Serbian.lproj/Localizable.strings @@ -459,8 +459,8 @@ "animation_NONE" = "Нема"; /* 2FA */ -"Enable two-factor authentication using Google Authenticator" = "Омогући двоструку аутентикацију уз помоћ Google Authenticator апликације"; -"You must enter this key into your Google Authenticator application." = "Морате унети овај кључ у вашу Google Authenticator апликацију."; +"Enable two-factor authentication using a TOTP application" = "Омогући двоструку аутентикацију уз помоћ Google Authenticator апликације"; +"You must enter this key into your TOTP application." = "Морате унети овај кључ у вашу Google Authenticator апликацију."; "If you do not and you log out you will not be able to login again." = "Уколико то не урадите и изађете из апликације, нећете моћи да се вратите накнадно."; /* External Sieve scripts */ diff --git a/UI/PreferencesUI/SerbianLatin.lproj/Localizable.strings b/UI/PreferencesUI/SerbianLatin.lproj/Localizable.strings index 21826dc93..79e873785 100644 --- a/UI/PreferencesUI/SerbianLatin.lproj/Localizable.strings +++ b/UI/PreferencesUI/SerbianLatin.lproj/Localizable.strings @@ -459,8 +459,8 @@ "animation_NONE" = "Nijedan"; /* 2FA */ -"Enable two-factor authentication using Google Authenticator" = "Omogućite dvofaktorsku potvrdu identiteta pomoću Google Authenticator-a"; -"You must enter this key into your Google Authenticator application." = "Ovaj ključ morate da unesete u aplikaciju Google Authenticator."; +"Enable two-factor authentication using a TOTP application" = "Omogućite dvofaktorsku potvrdu identiteta pomoću Google Authenticator-a"; +"You must enter this key into your TOTP application." = "Ovaj ključ morate da unesete u aplikaciju Google Authenticator."; "If you do not and you log out you will not be able to login again." = "Ako to ne učinite i odjavite se, više nećete moći da se prijavite."; /* External Sieve scripts */ diff --git a/UI/PreferencesUI/Slovak.lproj/Localizable.strings b/UI/PreferencesUI/Slovak.lproj/Localizable.strings index 22eadacb4..f74e50b14 100644 --- a/UI/PreferencesUI/Slovak.lproj/Localizable.strings +++ b/UI/PreferencesUI/Slovak.lproj/Localizable.strings @@ -459,8 +459,8 @@ "animation_NONE" = "Žiadna"; /* 2FA */ -"Enable two-factor authentication using Google Authenticator" = "Povoliť 2-fázové overovanie pomocou Google Authenticator"; -"You must enter this key into your Google Authenticator application." = "Tento kľúč musíte zadať do svojej aplikácie Google Authenticator."; +"Enable two-factor authentication using a TOTP application" = "Povoliť 2-fázové overovanie pomocou Google Authenticator"; +"You must enter this key into your TOTP application." = "Tento kľúč musíte zadať do svojej aplikácie Google Authenticator."; "If you do not and you log out you will not be able to login again." = "Pokiaľ tak neurobíte a odhlásíte sa, nebudete sa môcť znova prihlásiť."; /* External Sieve scripts */ diff --git a/UI/PreferencesUI/Slovenian.lproj/Localizable.strings b/UI/PreferencesUI/Slovenian.lproj/Localizable.strings index 03c53b299..9ebf2d22d 100644 --- a/UI/PreferencesUI/Slovenian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Slovenian.lproj/Localizable.strings @@ -459,8 +459,8 @@ "animation_NONE" = "Nobena"; /* 2FA */ -"Enable two-factor authentication using Google Authenticator" = "Omogoči dvojno stopnjo prijave z uporabo Google Authenticator aplikacije"; -"You must enter this key into your Google Authenticator application." = "Prosimo, da prikazan ključ vnesete v vašo Google Authenticator aplikacijo."; +"Enable two-factor authentication using a TOTP application" = "Omogoči dvojno stopnjo prijave z uporabo Google Authenticator aplikacije"; +"You must enter this key into your TOTP application." = "Prosimo, da prikazan ključ vnesete v vašo Google Authenticator aplikacijo."; "If you do not and you log out you will not be able to login again." = "Če ne, se ob naslednji prijavi ne boste uspeli vpisati."; /* External Sieve scripts */ diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox index 0c6f7f617..8f9468905 100644 --- a/UI/Templates/MainUI/SOGoRootPage.wox +++ b/UI/Templates/MainUI/SOGoRootPage.wox @@ -126,7 +126,7 @@ - +
@@ -135,7 +135,7 @@ lock -
+
- + label:aria-label="Enable two-factor authentication using a TOTP application"> +
- +
diff --git a/UI/WebServerResources/js/Common/Authentication.service.js b/UI/WebServerResources/js/Common/Authentication.service.js index c801fdcb1..074ba6679 100644 --- a/UI/WebServerResources/js/Common/Authentication.service.js +++ b/UI/WebServerResources/js/Common/Authentication.service.js @@ -93,7 +93,7 @@ d.reject({error: l('cookiesNotEnabled')}); } else { - // Check for Google Authenticator 2FA + // Check for TOTP if (typeof data.GoogleAuthenticatorMissingKey != 'undefined' && response.status == 202) { d.resolve({gamissingkey: 1}); } @@ -126,7 +126,7 @@ }, function(error) { var response, perr, data = error.data; if (data && data.GoogleAuthenticatorInvalidKey) { - response = {error: l('You provided an invalid Google Authenticator key.')}; + response = {error: l('You provided an invalid TOTP key.')}; } else if (data && angular.isDefined(data.LDAPPasswordPolicyError)) { perr = data.LDAPPasswordPolicyError;