From 3d8aa7967bbbd2f40ec077449dd08d3778678421 Mon Sep 17 00:00:00 2001
From: kwadronaut <kwadronaut@leap.se>
Date: Wed, 5 Mar 2014 10:53:10 +0100
Subject: typo

---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index bfdf5acd..fd451c00 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -54,7 +54,7 @@
     <string name="building_configration">Building configuration…</string>
     <string name="cert_from_keystore">Got certificate \'%s\' from Keystore</string>
     <string name="netstatus">Network Status: %s</string>
-    <string name="keychain_nocacert">No CA Certificate returned while reading from Android keystore. Auhtentication will probably fail.</string>
+    <string name="keychain_nocacert">No CA Certificate returned while reading from Android keystore. Authentication will probably fail.</string>
     <string name="mobile_info">Running on %1$s (%2$s) %3$s, Android API %4$d</string>
     <string name="error_rsa_sign">Error signing with Android keystore key %1$s: %2$s</string>
     <string name="translationby">English translation by Arne Schwabe&lt;arne@rfc2549.org&gt;</string>
-- 
cgit v1.2.3


From 726569f0b9d18c311b307f6a108f6749f96423c5 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Wed, 5 Mar 2014 11:48:26 -0800
Subject: Rewrite "Server is down" message to "Server is unreachable"

---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index bfdf5acd..585fa7b2 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -122,7 +122,7 @@
     <string name="setup_error_configure_button">Configure</string>
     <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_is_down_message">Server is down.</string>
+    <string name="server_unreachable_message">Server is unreachable, please try again.</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="configuring_provider">Configuring provider</string>
-- 
cgit v1.2.3


From b600226787227883b62ef0fecb2a56d82ba58e0b Mon Sep 17 00:00:00 2001
From: root <root@ankush-Inspiron-5520.(none)>
Date: Sat, 8 Mar 2014 18:34:54 +0530
Subject: Remove 'Top padding' string from ConfigurationWizard (Bug #5260)

---
 res/values/strings.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d4e84d3a..9a603d68 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -94,7 +94,6 @@
     <string name="authed_secured_status">Connection secure using your own certificate.</string>
     <string name="eip_service_label">Encrypted Internet</string>
     <string name="title_activity_configuration_wizard">Select a service provider</string>
-    <string name="top_padding">Top padding</string>
     <string name="new_provider_button">Add new Provider</string>
     <string name="introduce_new_provider">Add a new service provider</string>
     <string name="save">Save</string>
-- 
cgit v1.2.3


From 718e4195d175ce4a7f0b5e5e1c3c14d8ccb237c4 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Mon, 3 Mar 2014 14:29:02 -0800
Subject: Remove crowdin.net references

---
 res/values/strings.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9a603d68..24207c6c 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by crowdin.net -->
 <resources>
 
     <string name="cancel">Cancel</string>
@@ -57,7 +56,6 @@
     <string name="keychain_nocacert">No CA Certificate returned while reading from Android keystore. Authentication will probably fail.</string>
     <string name="mobile_info">Running on %1$s (%2$s) %3$s, Android API %4$d</string>
     <string name="error_rsa_sign">Error signing with Android keystore key %1$s: %2$s</string>
-    <string name="translationby">English translation by Arne Schwabe&lt;arne@rfc2549.org&gt;</string>
     <string name="warn_no_dns">No DNS servers being used. Name resolution may not work. Consider setting custom DNS Servers</string>
     <string name="dns_add_error">Could not add DNS Server \"%1$s\", rejected by the system: %2$s</string>
     <string name="getproxy_error">Error getting proxy settings: %s</string>
-- 
cgit v1.2.3


From 47c125f7e7e2312d505052b63432581862034bb7 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Mon, 3 Mar 2014 13:55:37 -0800
Subject: Add Transifex link to About View

---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 24207c6c..e64e7eae 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5,6 +5,7 @@
     <string name="ok">OK</string>
     <string name="retry">Retry</string>
     <string name="repository_url_text">Source code and issue tracker available at https://github.com/leapcode/bitmask_android/</string>
+    <string name="translation_project_text">Translations welcome and appreciated.  See our Transifex project at https://www.transifex.com/projects/p/bitmask-android/</string>
     <string name="copyright_others">This program uses the following components; see the source code for full details on the licenses</string>
     <string name="about">About Bitmask</string>
     <string name="switch_provider_menu_option">Switch provider</string>
-- 
cgit v1.2.3


From 2945761806c655b4809f2a812f0d8ad4da35be53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 12 Mar 2014 22:55:32 +0100
Subject: Default translationby to Arne and English.

---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index e64e7eae..bcb6ecc9 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -57,6 +57,7 @@
     <string name="keychain_nocacert">No CA Certificate returned while reading from Android keystore. Authentication will probably fail.</string>
     <string name="mobile_info">Running on %1$s (%2$s) %3$s, Android API %4$d</string>
     <string name="error_rsa_sign">Error signing with Android keystore key %1$s: %2$s</string>
+    <string name="translationby">English translation by Arne Schwabe &lt;arne@rfc2549.org&gt;</string>
     <string name="warn_no_dns">No DNS servers being used. Name resolution may not work. Consider setting custom DNS Servers</string>
     <string name="dns_add_error">Could not add DNS Server \"%1$s\", rejected by the system: %2$s</string>
     <string name="getproxy_error">Error getting proxy settings: %s</string>
-- 
cgit v1.2.3