summaryrefslogtreecommitdiff
path: root/app/src/main/res/values
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-04-22 12:32:57 +0200
committerParménides GV <parmegv@sdf.org>2015-04-22 12:32:57 +0200
commite5e9ac6e43b9cdec0f362711bb33747ab73fc297 (patch)
tree8728c5416b29ca4b66438eb64d06f974f0117e37 /app/src/main/res/values
parent467abc3431e2ae148ea72e2c3b4c560473424c3f (diff)
parent7d6d55cb62fcdc1e3a36f2634f0399b2d77db263 (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/values')
-rw-r--r--app/src/main/res/values/strings.xml1
1 files changed, 1 insertions, 0 deletions
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>