diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-12-03 06:15:57 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-01-23 13:28:02 +0100 |
commit | 6e4fc956abc909232044e7af0fa37cbb1b510f18 (patch) | |
tree | ea89db2094c8921179559273dbf41d686d771d44 /src | |
parent | 43ccf4b1787c294dbfa7b052c41e95ac9eeca3af (diff) | |
download | wallabag-6e4fc956abc909232044e7af0fa37cbb1b510f18.tar.gz wallabag-6e4fc956abc909232044e7af0fa37cbb1b510f18.tar.zst wallabag-6e4fc956abc909232044e7af0fa37cbb1b510f18.zip |
Better translations
Replace “Google Authenticator” by “Google Authenticator, Authy or FreeOTP” in all text.
Translate how to use the code / qr code.
Diffstat (limited to 'src')
15 files changed, 76 insertions, 35 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index e62ba6d0..d3e96e5c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -99,11 +99,14 @@ config: | |||
99 | # all: 'All' | 99 | # all: 'All' |
100 | # rss_limit: 'Number of items in the feed' | 100 | # rss_limit: 'Number of items in the feed' |
101 | form_user: | 101 | form_user: |
102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option." | 102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option." |
103 | name_label: 'Navn' | 103 | name_label: 'Navn' |
104 | email_label: 'Emailadresse' | 104 | email_label: 'Emailadresse' |
105 | # emailTwoFactor_label: 'Using email (receive a code by email)' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)' | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # two_factor_code_description_1: You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. It'll disapear after a page reload. | ||
108 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
109 | # two_factor_code_description_3: 'Or use that code:' | ||
107 | delete: | 110 | delete: |
108 | # title: Delete my account (a.k.a danger zone) | 111 | # title: Delete my account (a.k.a danger zone) |
109 | # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. | 112 | # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index f2d0408f..9aeddceb 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -99,11 +99,14 @@ config: | |||
99 | all: 'Alle' | 99 | all: 'Alle' |
100 | rss_limit: 'Anzahl der Einträge pro Feed' | 100 | rss_limit: 'Anzahl der Einträge pro Feed' |
101 | form_user: | 101 | form_user: |
102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option." | 102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option." |
103 | name_label: 'Name' | 103 | name_label: 'Name' |
104 | email_label: 'E-Mail-Adresse' | 104 | email_label: 'E-Mail-Adresse' |
105 | # emailTwoFactor_label: 'Using email (receive a code by email)' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)' | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # two_factor_code_description_1: You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. It'll disapear after a page reload. | ||
108 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
109 | # two_factor_code_description_3: 'Or use that code:' | ||
107 | delete: | 110 | delete: |
108 | title: 'Lösche mein Konto (a.k.a Gefahrenzone)' | 111 | title: 'Lösche mein Konto (a.k.a Gefahrenzone)' |
109 | description: 'Wenn du dein Konto löschst, werden ALL deine Artikel, ALL deine Tags, ALL deine Anmerkungen und dein Konto dauerhaft gelöscht (kann NICHT RÜCKGÄNGIG gemacht werden). Du wirst anschließend ausgeloggt.' | 112 | description: 'Wenn du dein Konto löschst, werden ALL deine Artikel, ALL deine Tags, ALL deine Anmerkungen und dein Konto dauerhaft gelöscht (kann NICHT RÜCKGÄNGIG gemacht werden). Du wirst anschließend ausgeloggt.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 859acdc0..22c68c79 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -99,11 +99,14 @@ config: | |||
99 | all: 'All' | 99 | all: 'All' |
100 | rss_limit: 'Number of items in the feed' | 100 | rss_limit: 'Number of items in the feed' |
101 | form_user: | 101 | form_user: |
102 | two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option." | 102 | two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option." |
103 | name_label: 'Name' | 103 | name_label: 'Name' |
104 | email_label: 'Email' | 104 | email_label: 'Email' |
105 | emailTwoFactor_label: 'Using email (receive a code by email)' | 105 | emailTwoFactor_label: 'Using email (receive a code by email)' |
106 | googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)' | 106 | googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | two_factor_code_description_1: You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. It'll disapear after a page reload. | ||
108 | two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
109 | two_factor_code_description_3: 'Or use that code:' | ||
107 | delete: | 110 | delete: |
108 | title: Delete my account (a.k.a danger zone) | 111 | title: Delete my account (a.k.a danger zone) |
109 | description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. | 112 | description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 3c3cbed4..6e710e56 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -99,11 +99,14 @@ config: | |||
99 | # all: 'All' | 99 | # all: 'All' |
100 | rss_limit: 'Límite de artículos en feed RSS' | 100 | rss_limit: 'Límite de artículos en feed RSS' |
101 | form_user: | 101 | form_user: |
102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option." | 102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option." |
103 | name_label: 'Nombre' | 103 | name_label: 'Nombre' |
104 | email_label: 'Dirección de e-mail' | 104 | email_label: 'Dirección de e-mail' |
105 | # emailTwoFactor_label: 'Using email (receive a code by email)' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)' | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # two_factor_code_description_1: You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. It'll disapear after a page reload. | ||
108 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
109 | # two_factor_code_description_3: 'Or use that code:' | ||
107 | delete: | 110 | delete: |
108 | title: Eliminar mi cuenta (Zona peligrosa) | 111 | title: Eliminar mi cuenta (Zona peligrosa) |
109 | description: Si eliminas tu cuenta, TODOS tus artículos, TODAS tus etiquetas, TODAS tus anotaciones y tu cuenta serán eliminadas de forma PERMANENTE (no se puede deshacer). Después serás desconectado. | 112 | description: Si eliminas tu cuenta, TODOS tus artículos, TODAS tus etiquetas, TODAS tus anotaciones y tu cuenta serán eliminadas de forma PERMANENTE (no se puede deshacer). Después serás desconectado. |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index ca25b390..855f38cc 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -99,11 +99,14 @@ config: | |||
99 | # all: 'All' | 99 | # all: 'All' |
100 | rss_limit: 'محدودیت آر-اس-اس' | 100 | rss_limit: 'محدودیت آر-اس-اس' |
101 | form_user: | 101 | form_user: |
102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option." | 102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option." |
103 | name_label: 'نام' | 103 | name_label: 'نام' |
104 | email_label: 'نشانی ایمیل' | 104 | email_label: 'نشانی ایمیل' |
105 | # emailTwoFactor_label: 'Using email (receive a code by email)' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)' | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # two_factor_code_description_1: You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. It'll disapear after a page reload. | ||
108 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
109 | # two_factor_code_description_3: 'Or use that code:' | ||
107 | delete: | 110 | delete: |
108 | # title: Delete my account (a.k.a danger zone) | 111 | # title: Delete my account (a.k.a danger zone) |
109 | # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. | 112 | # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index b809ca32..f92b64a5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -99,11 +99,14 @@ config: | |||
99 | all: "Tous" | 99 | all: "Tous" |
100 | rss_limit: "Nombre d’articles dans le flux" | 100 | rss_limit: "Nombre d’articles dans le flux" |
101 | form_user: | 101 | form_user: |
102 | two_factor_description: "Activer l’authentification double-facteur veut dire que vous allez recevoir un code par courriel OU que vous devriez utiliser une application de mot de passe à usage unique (comme Google Authenticator) pour obtenir un code temporaire à chaque nouvelle connexion non approuvée. Vous ne pouvez pas choisir les deux options." | 102 | two_factor_description: "Activer l’authentification double-facteur veut dire que vous allez recevoir un code par courriel OU que vous devriez utiliser une application de mot de passe à usage unique (comme Google Authenticator, Authy or FreeOTP) pour obtenir un code temporaire à chaque nouvelle connexion non approuvée. Vous ne pouvez pas choisir les deux options." |
103 | name_label: "Nom" | 103 | name_label: "Nom" |
104 | email_label: "Adresse courriel" | 104 | email_label: "Adresse courriel" |
105 | emailTwoFactor_label: 'En utlisant l’email (recevez un code par email)' | 105 | emailTwoFactor_label: 'En utlisant l’email (recevez un code par email)' |
106 | googleTwoFactor_label: 'En utilisant une application de mot de passe à usage unique (ouvrez l’app, comme Google Authenticator, pour obtenir un mot de passe à usage unique)' | 106 | googleTwoFactor_label: 'En utilisant une application de mot de passe à usage unique (ouvrez l’app, comme Google Authenticator, Authy or FreeOTP, pour obtenir un mot de passe à usage unique)' |
107 | two_factor_code_description_1: Vous venez d’activer l’authentification double-facteur, ouvrez votre application OTP pour configurer la génération du mot de passe à usage unique. Ces informations disparaîtront après un rechargement de la page. | ||
108 | two_factor_code_description_2: 'Vous pouvez scanner le QR code avec votre application :' | ||
109 | two_factor_code_description_3: 'Ou utiliser le code suivant :' | ||
107 | delete: | 110 | delete: |
108 | title: "Supprimer mon compte (attention danger !)" | 111 | title: "Supprimer mon compte (attention danger !)" |
109 | description: "Si vous confirmez la suppression de votre compte, TOUS les articles, TOUS les tags, TOUTES les annotations et votre compte seront DÉFINITIVEMENT supprimé (c’est IRRÉVERSIBLE). Vous serez ensuite déconnecté." | 112 | description: "Si vous confirmez la suppression de votre compte, TOUS les articles, TOUS les tags, TOUTES les annotations et votre compte seront DÉFINITIVEMENT supprimé (c’est IRRÉVERSIBLE). Vous serez ensuite déconnecté." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 7279dba1..95d4ac20 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -99,11 +99,14 @@ config: | |||
99 | # all: 'All' | 99 | # all: 'All' |
100 | rss_limit: 'Numero di elementi nel feed' | 100 | rss_limit: 'Numero di elementi nel feed' |
101 | form_user: | 101 | form_user: |
102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option." | 102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option." |
103 | name_label: 'Nome' | 103 | name_label: 'Nome' |
104 | email_label: 'E-mail' | 104 | email_label: 'E-mail' |
105 | # emailTwoFactor_label: 'Using email (receive a code by email)' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)' | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # two_factor_code_description_1: You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. It'll disapear after a page reload. | ||
108 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
109 | # two_factor_code_description_3: 'Or use that code:' | ||
107 | delete: | 110 | delete: |
108 | title: Cancella il mio account (zona pericolosa) | 111 | title: Cancella il mio account (zona pericolosa) |
109 | description: Rimuovendo il tuo account, TUTTI i tuoi articoli, TUTTE le tue etichette, TUTTE le tue annotazioni ed il tuo account verranno rimossi PERMANENTEMENTE (impossibile da ANNULLARE). Verrai poi disconnesso. | 112 | description: Rimuovendo il tuo account, TUTTI i tuoi articoli, TUTTE le tue etichette, TUTTE le tue annotazioni ed il tuo account verranno rimossi PERMANENTEMENTE (impossibile da ANNULLARE). Verrai poi disconnesso. |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index f262ba7b..96725a06 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -99,11 +99,14 @@ config: | |||
99 | all: 'Totes' | 99 | all: 'Totes' |
100 | rss_limit: "Nombre d'articles dins un flux RSS" | 100 | rss_limit: "Nombre d'articles dins un flux RSS" |
101 | form_user: | 101 | form_user: |
102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option." | 102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option." |
103 | name_label: 'Nom' | 103 | name_label: 'Nom' |
104 | email_label: 'Adreça de corrièl' | 104 | email_label: 'Adreça de corrièl' |
105 | # emailTwoFactor_label: 'Using email (receive a code by email)' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)' | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # two_factor_code_description_1: You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. It'll disapear after a page reload. | ||
108 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
109 | # two_factor_code_description_3: 'Or use that code:' | ||
107 | delete: | 110 | delete: |
108 | title: Suprimir mon compte (Mèfi zòna perilhosa) | 111 | title: Suprimir mon compte (Mèfi zòna perilhosa) |
109 | description: Se confirmatz la supression de vòstre compte, TOTES vòstres articles, TOTAS vòstras etiquetas, TOTAS vòstras anotacions e vòstre compte seràn suprimits per totjorn. E aquò es IRREVERSIBLE. Puèi seretz desconnectat. | 112 | description: Se confirmatz la supression de vòstre compte, TOTES vòstres articles, TOTAS vòstras etiquetas, TOTAS vòstras anotacions e vòstre compte seràn suprimits per totjorn. E aquò es IRREVERSIBLE. Puèi seretz desconnectat. |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 99c2183e..5f77061c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -99,11 +99,14 @@ config: | |||
99 | all: 'Wszystkie' | 99 | all: 'Wszystkie' |
100 | rss_limit: 'Link do RSS' | 100 | rss_limit: 'Link do RSS' |
101 | form_user: | 101 | form_user: |
102 | two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option." | 102 | two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option." |
103 | name_label: 'Nazwa' | 103 | name_label: 'Nazwa' |
104 | email_label: 'Adres email' | 104 | email_label: 'Adres email' |
105 | # emailTwoFactor_label: 'Using email (receive a code by email)' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)' | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # two_factor_code_description_1: You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. It'll disapear after a page reload. | ||
108 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
109 | # two_factor_code_description_3: 'Or use that code:' | ||
107 | delete: | 110 | delete: |
108 | title: Usuń moje konto (niebezpieczna strefa !) | 111 | title: Usuń moje konto (niebezpieczna strefa !) |
109 | description: Jeżeli usuniesz swoje konto, wszystkie twoje artykuły, tagi, adnotacje, oraz konto zostaną trwale usunięte (operacja jest NIEODWRACALNA). Następnie zostaniesz wylogowany. | 112 | description: Jeżeli usuniesz swoje konto, wszystkie twoje artykuły, tagi, adnotacje, oraz konto zostaną trwale usunięte (operacja jest NIEODWRACALNA). Następnie zostaniesz wylogowany. |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 806c2d78..f40f9795 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -99,11 +99,14 @@ config: | |||
99 | # all: 'All' | 99 | # all: 'All' |
100 | rss_limit: 'Número de itens no feed' | 100 | rss_limit: 'Número de itens no feed' |
101 | form_user: | 101 | form_user: |
102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option." | 102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option." |
103 | name_label: 'Nome' | 103 | name_label: 'Nome' |
104 | email_label: 'E-mail' | 104 | email_label: 'E-mail' |
105 | # emailTwoFactor_label: 'Using email (receive a code by email)' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)' | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # two_factor_code_description_1: You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. It'll disapear after a page reload. | ||
108 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
109 | # two_factor_code_description_3: 'Or use that code:' | ||
107 | delete: | 110 | delete: |
108 | # title: Delete my account (a.k.a danger zone) | 111 | # title: Delete my account (a.k.a danger zone) |
109 | # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. | 112 | # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index ed75ed6e..369d2d44 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -99,11 +99,14 @@ config: | |||
99 | # all: 'All' | 99 | # all: 'All' |
100 | rss_limit: 'Limită RSS' | 100 | rss_limit: 'Limită RSS' |
101 | form_user: | 101 | form_user: |
102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option." | 102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option." |
103 | name_label: 'Nume' | 103 | name_label: 'Nume' |
104 | email_label: 'E-mail' | 104 | email_label: 'E-mail' |
105 | # emailTwoFactor_label: 'Using email (receive a code by email)' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)' | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # two_factor_code_description_1: You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. It'll disapear after a page reload. | ||
108 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
109 | # two_factor_code_description_3: 'Or use that code:' | ||
107 | delete: | 110 | delete: |
108 | # title: Delete my account (a.k.a danger zone) | 111 | # title: Delete my account (a.k.a danger zone) |
109 | # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. | 112 | # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml index 1c6e6771..d9b33fed 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml | |||
@@ -96,11 +96,14 @@ config: | |||
96 | archive: 'архивные' | 96 | archive: 'архивные' |
97 | rss_limit: 'Количество записей в фиде' | 97 | rss_limit: 'Количество записей в фиде' |
98 | form_user: | 98 | form_user: |
99 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option." | 99 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option." |
100 | name_label: 'Имя' | 100 | name_label: 'Имя' |
101 | email_label: 'Email' | 101 | email_label: 'Email' |
102 | # emailTwoFactor_label: 'Using email (receive a code by email)' | 102 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
103 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)' | 103 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
104 | # two_factor_code_description_1: You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. It'll disapear after a page reload. | ||
105 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
106 | # two_factor_code_description_3: 'Or use that code:' | ||
104 | delete: | 107 | delete: |
105 | title: "Удалить мой аккаунт (или опасная зона)" | 108 | title: "Удалить мой аккаунт (или опасная зона)" |
106 | description: "Если Вы удалите ваш аккаунт, ВСЕ ваши записи, теги и другие данные, будут БЕЗВОЗВРАТНО удалены (операция не может быть отменена после). Затем Вы выйдете из системы." | 109 | description: "Если Вы удалите ваш аккаунт, ВСЕ ваши записи, теги и другие данные, будут БЕЗВОЗВРАТНО удалены (операция не может быть отменена после). Затем Вы выйдете из системы." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml index af798943..f25bac84 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml | |||
@@ -99,11 +99,14 @@ config: | |||
99 | all: 'ทั้งหมด' | 99 | all: 'ทั้งหมด' |
100 | rss_limit: 'จำนวนไอเทมที่เก็บ' | 100 | rss_limit: 'จำนวนไอเทมที่เก็บ' |
101 | form_user: | 101 | form_user: |
102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option." | 102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option." |
103 | name_label: 'ชื่อ' | 103 | name_label: 'ชื่อ' |
104 | email_label: 'อีเมล' | 104 | email_label: 'อีเมล' |
105 | # emailTwoFactor_label: 'Using email (receive a code by email)' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)' | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # two_factor_code_description_1: You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. It'll disapear after a page reload. | ||
108 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
109 | # two_factor_code_description_3: 'Or use that code:' | ||
107 | delete: | 110 | delete: |
108 | title: ลบบัญชีของฉัน (โซนที่เป็นภัย!) | 111 | title: ลบบัญชีของฉัน (โซนที่เป็นภัย!) |
109 | description: ถ้าคุณลบบัญชีของคุณIf , รายการทั้งหมดของคุณ, แท็กทั้งหมดของคุณ, หมายเหตุทั้งหมดของคุณและบัญชีของคุณจะถูกลบอย่างถาวร (มันไม่สามารถยกเลิกได้) คุณจะต้องลงชื่อออก | 112 | description: ถ้าคุณลบบัญชีของคุณIf , รายการทั้งหมดของคุณ, แท็กทั้งหมดของคุณ, หมายเหตุทั้งหมดของคุณและบัญชีของคุณจะถูกลบอย่างถาวร (มันไม่สามารถยกเลิกได้) คุณจะต้องลงชื่อออก |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 352a2cc4..d65fc001 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -99,11 +99,14 @@ config: | |||
99 | # all: 'All' | 99 | # all: 'All' |
100 | rss_limit: 'RSS içeriğinden talep edilecek makale limiti' | 100 | rss_limit: 'RSS içeriğinden talep edilecek makale limiti' |
101 | form_user: | 101 | form_user: |
102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator) to get a one time code on every new untrusted connection. You can't choose both option." | 102 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option." |
103 | name_label: 'İsim' | 103 | name_label: 'İsim' |
104 | email_label: 'E-posta' | 104 | email_label: 'E-posta' |
105 | # emailTwoFactor_label: 'Using email (receive a code by email)' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, to get a one time code)' | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # two_factor_code_description_1: You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. It'll disapear after a page reload. | ||
108 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
109 | # two_factor_code_description_3: 'Or use that code:' | ||
107 | delete: | 110 | delete: |
108 | # title: Delete my account (a.k.a danger zone) | 111 | # title: Delete my account (a.k.a danger zone) |
109 | # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. | 112 | # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index ca7eb9f3..73cf592e 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig | |||
@@ -214,19 +214,18 @@ | |||
214 | 214 | ||
215 | {% for OtpQrCode in app.session.flashbag.get('OtpQrCode') %} | 215 | {% for OtpQrCode in app.session.flashbag.get('OtpQrCode') %} |
216 | <div class="card-panel yellow darken-1 black-text"> | 216 | <div class="card-panel yellow darken-1 black-text"> |
217 | You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. | 217 | {{ 'config.form_user.two_factor_code_description_1'|trans }} |
218 | <br/> | 218 | <br/> |
219 | That code will disapear after a page reload. | 219 | {{ 'config.form_user.two_factor_code_description_2'|trans }} |
220 | <br/><br/> | 220 | <br/><br/> |
221 | <strong>{{ app.user.getGoogleAuthenticatorSecret }}</strong> | ||
222 | <br/><br/> | ||
223 | Or you can scan that QR Code with your app: | ||
224 | <br/> | ||
225 | <img id="2faQrcode" class="hide-on-med-and-down" /> | 221 | <img id="2faQrcode" class="hide-on-med-and-down" /> |
226 | |||
227 | <script> | 222 | <script> |
228 | document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ OtpQrCode }}');; | 223 | document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ OtpQrCode }}');; |
229 | </script> | 224 | </script> |
225 | <br/><br/> | ||
226 | {{ 'config.form_user.two_factor_code_description_3'|trans }} | ||
227 | <br/><br/> | ||
228 | <strong>{{ app.user.getGoogleAuthenticatorSecret }}</strong> | ||
230 | </div> | 229 | </div> |
231 | {% endfor %} | 230 | {% endfor %} |
232 | {% endif %} | 231 | {% endif %} |