diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2016-06-14 01:06:25 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2016-06-14 01:06:25 +0200 |
| commit | ae02685e6f31d9922dbfeb758f41556369e55864 (patch) | |
| tree | cb14b4fe9374bf7d7448f4326758a7a428b6e335 /core | |
| parent | d0e4727ecdc317e65be5705cbbbeb61793aa9a03 (diff) | |
| parent | 990ac34aaa707652614820848e6b740763936831 (diff) | |
| download | nextcloud-server-ae02685e6f31d9922dbfeb758f41556369e55864.tar.gz nextcloud-server-ae02685e6f31d9922dbfeb758f41556369e55864.zip | |
Merge branch 'master' of https://github.com/owncloud/core into downstream-160614
Diffstat (limited to 'core')
| -rw-r--r-- | core/l10n/cs_CZ.js | 1 | ||||
| -rw-r--r-- | core/l10n/cs_CZ.json | 1 | ||||
| -rw-r--r-- | core/l10n/es.js | 1 | ||||
| -rw-r--r-- | core/l10n/es.json | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js index c83b7f25225..e887b3c1c7c 100644 --- a/core/l10n/cs_CZ.js +++ b/core/l10n/cs_CZ.js @@ -298,6 +298,7 @@ OC.L10N.register( "Thank you for your patience." : "Děkujeme za vaši trpělivost.", "Two-step verification" : "Dvoufázové ověření", "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Bylo zapnuto vylepšené zabezpečení pro tento účet. Přihlašte se za použití druhého faktoru.", + "Cancel login" : "Zrušit přihlášení", "Please authenticate using the selected factor." : "Přihlašte se za použití vybraného faktoru.", "An error occured while verifying the token" : "Chyba při ověřování tokenu", "You are accessing the server from an untrusted domain." : "Přistupujete na server z nedůvěryhodné domény.", diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json index f54d903fd5d..81c98662604 100644 --- a/core/l10n/cs_CZ.json +++ b/core/l10n/cs_CZ.json @@ -296,6 +296,7 @@ "Thank you for your patience." : "Děkujeme za vaši trpělivost.", "Two-step verification" : "Dvoufázové ověření", "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Bylo zapnuto vylepšené zabezpečení pro tento účet. Přihlašte se za použití druhého faktoru.", + "Cancel login" : "Zrušit přihlášení", "Please authenticate using the selected factor." : "Přihlašte se za použití vybraného faktoru.", "An error occured while verifying the token" : "Chyba při ověřování tokenu", "You are accessing the server from an untrusted domain." : "Přistupujete na server z nedůvěryhodné domény.", diff --git a/core/l10n/es.js b/core/l10n/es.js index ae5471b3db0..917f73b3087 100644 --- a/core/l10n/es.js +++ b/core/l10n/es.js @@ -298,6 +298,7 @@ OC.L10N.register( "Thank you for your patience." : "Gracias por su paciencia.", "Two-step verification" : "Verificación en dos pasos", "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "La seguridad mejorada se ha habilitado para tu cuenta. Por favor, autenticar utilizando un segundo factor.", + "Cancel login" : "Cancelar inicio de sesión", "Please authenticate using the selected factor." : "Por favor, autenticar utilizando el factor seleccionado.", "An error occured while verifying the token" : "Ocurrió un error mientras se verificaba el \"token\".", "You are accessing the server from an untrusted domain." : "Está accediendo al servidor desde un dominio inseguro.", diff --git a/core/l10n/es.json b/core/l10n/es.json index fc8e2cafbdb..d37b77e07a1 100644 --- a/core/l10n/es.json +++ b/core/l10n/es.json @@ -296,6 +296,7 @@ "Thank you for your patience." : "Gracias por su paciencia.", "Two-step verification" : "Verificación en dos pasos", "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "La seguridad mejorada se ha habilitado para tu cuenta. Por favor, autenticar utilizando un segundo factor.", + "Cancel login" : "Cancelar inicio de sesión", "Please authenticate using the selected factor." : "Por favor, autenticar utilizando el factor seleccionado.", "An error occured while verifying the token" : "Ocurrió un error mientras se verificaba el \"token\".", "You are accessing the server from an untrusted domain." : "Está accediendo al servidor desde un dominio inseguro.", |