diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-04-22 12:32:57 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-04-22 12:32:57 +0200 |
| commit | e5e9ac6e43b9cdec0f362711bb33747ab73fc297 (patch) | |
| tree | 8728c5416b29ca4b66438eb64d06f974f0117e37 /app/src/main/res | |
| parent | 467abc3431e2ae148ea72e2c3b4c560473424c3f (diff) | |
| parent | 7d6d55cb62fcdc1e3a36f2634f0399b2d77db263 (diff) | |
Merge branch 'feature/bitmask-for-android-should-pin-some-prooviders-ca's-cert-fingerprint#6877' into develop
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/values-es/strings.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 7ab5150e..82ca44e9 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -48,6 +48,7 @@ <string name="setup_error_close_button">Salir</string> <string name="setup_error_text">Sucedió un error configurando Bitmask con tu proveedor elegido.\n\nPuedes volver a intentarlo, o elegir otro proveedor.</string> <string name="server_unreachable_message">No se ha detectado red para hablar con el servidor, inténtalo de nuevo.</string> + <string name="error.security.pinnedcertificate">Error de seguridad, actualiza la aplicación o elige otro proveedor.</string> <string name="malformed_url">No parece que sea un proveedor de Bitmask.</string> <string name="certificate_error">No es un proveedor de Bitmak de confianza.</string> <string name="service_is_down_error">El servicio está caído.</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ac6191a9..bcfd3a2c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -47,6 +47,7 @@ <string name="setup_error_close_button">Exit</string> <string name="setup_error_text">There was an error configuring Bitmask with your chosen provider.\n\nYou may choose to reconfigure, or exit and configure a provider upon next launch.</string> <string name="server_unreachable_message">Server is unreachable, please try again.</string> + <string name="error.security.pinnedcertificate">Security error, update the app or choose another provider.</string> <string name="malformed_url">It doesn\'t seem to be a Bitmask provider.</string> <string name="certificate_error">This is not a trusted Bitmask provider.</string> <string name="service_is_down_error">Service is down.</string> |