From 2d2c035a77586962e26ba2259012584ec6320448 Mon Sep 17 00:00:00 2001
From: cyBerta <richy@cyborgsociety.org>
Date: Wed, 4 Dec 2013 18:33:55 +0100
Subject: remove translations for LEAP for Android

---
 res/values/strings.xml        | 2 --
 res/values/untranslatable.xml | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2598d452..60124215 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,8 +2,6 @@
 <!-- Generated by crowdin.net -->
 <resources>
 
-    <string name="app">Bitmask</string>
-    <string name="app_name">Bitmask</string>
     <string name="address">Server Address:</string>
     <string name="port">Server Port:</string>
     <string name="location">Location</string>
diff --git a/res/values/untranslatable.xml b/res/values/untranslatable.xml
index fe620aa8..8c15a213 100644
--- a/res/values/untranslatable.xml
+++ b/res/values/untranslatable.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+	<string name="app" translatable="false">Bitmask</string>
+	<string name="app_name" translatable="false">Bitmask</string>
+	
     <string name="copyright_leapgui" translatable="false">Copyright 2012\nLEAP Encryption Access Project &lt;info@leap.se></string>
     <string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. &lt;sales@openvpn.net>\n
 
-- 
cgit v1.2.3


From 3b8bcb1383ec4e9deecd7a6d97180e60a3bf021a Mon Sep 17 00:00:00 2001
From: cyBerta <richy@cyborgsociety.org>
Date: Wed, 4 Dec 2013 20:49:23 +0100
Subject: about bitmask instead of about LEAP

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

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 60124215..01eab8fe 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -19,7 +19,7 @@
     <string name="no_certificate">You must select a certificate</string>
     <string name="repository_url_text">Source code and issue tracker available at https://github.com/leapcode/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 LEAP</string>
+    <string name="about">About Bitmask</string>
     <string name="switch_provider_menu_option">Switch provider</string>
     <string name="about_summary">About Bitmask for Android</string>
     <string name="vpn_list_summary">List of all configured VPNs</string>
-- 
cgit v1.2.3


From 8833649c3468fce9cc40a0e94371049093c5dd7d Mon Sep 17 00:00:00 2001
From: cyBerta <richy@cyborgsociety.org>
Date: Thu, 5 Dec 2013 01:45:51 +0100
Subject: Show location in openvpn notification message (Feature #4665)

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

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2598d452..28d159b0 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -239,7 +239,7 @@
     <string name="minidump_generated">OpenVPN crashed unexpectedly. Please consider using the send Minidump option in the main menu</string>
     <string name="send_minidump">Send Minidump to developer</string>
     <string name="send_minidump_summary">Send debugging information about last crash to developer</string>
-    <string name="notifcation_title">OpenVPN - %s</string>
+    <string name="notifcation_title">Bitmask - %s</string>
     <string name="session_ipv4string">%1$s - %2$s</string>
     <string name="session_ipv6string">%1$s - %3$s, %2$s</string>
     <string name="state_connecting">Connecting</string>
-- 
cgit v1.2.3