From 73d85b0b5692502aaf4374cdbca39cb622402f43 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 10 Nov 2017 15:44:30 +0100 Subject: #8743 adds new build type beta that rewrites the packageID. This will be needed to have the FDroid beta channel in IzzySofts repository and the official releases in the official FDroid repository. --- app/src/main/AndroidManifest.xml | 4 ++-- app/src/main/java/se/leap/bitmaskclient/AboutActivity.java | 2 +- app/src/main/res/values-pt/strings.xml | 6 ------ app/src/main/res/values-sv/strings.xml | 6 ------ app/src/main/res/values/strings.xml | 1 - app/src/main/res/values/untranslatable.xml | 2 -- 6 files changed, 3 insertions(+), 18 deletions(-) delete mode 100755 app/src/main/res/values-pt/strings.xml delete mode 100755 app/src/main/res/values-sv/strings.xml (limited to 'app/src/main') diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7f3336f2..86d1f01f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -35,7 +35,7 @@ android:allowBackup="true" android:icon="@drawable/icon" android:logo="@drawable/icon" - android:label="@string/app" + android:label="@string/app_name" android:theme="@style/blinkt"> diff --git a/app/src/main/java/se/leap/bitmaskclient/AboutActivity.java b/app/src/main/java/se/leap/bitmaskclient/AboutActivity.java index 5825bb33..4ebae32d 100644 --- a/app/src/main/java/se/leap/bitmaskclient/AboutActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/AboutActivity.java @@ -22,7 +22,7 @@ public class AboutActivity extends Activity { try { PackageInfo packageinfo = getPackageManager().getPackageInfo(getPackageName(), 0); version = packageinfo.versionName; - name = getString(R.string.app); + name = getString(R.string.app_name); } catch (NameNotFoundException e) { version = "error fetching version"; } diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml deleted file mode 100755 index 29eff2ba..00000000 --- a/app/src/main/res/values-pt/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - OpenVPN para Android - diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml deleted file mode 100755 index 9e2326bf..00000000 --- a/app/src/main/res/values-sv/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - OpenVPN för Android - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b5553394..04e83a18 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,7 +12,6 @@ Routes IPv6: %s The username must not be empty. Got certificate \'%s\' from Keystore - Bitmask Provider: No provider configured Status unknown. diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml index 6e4472af..59605609 100644 --- a/app/src/main/res/values/untranslatable.xml +++ b/app/src/main/res/values/untranslatable.xml @@ -1,7 +1,5 @@ - Bitmask - Bitmask Bitmask - %s Copyright 2012-2017\nLEAP Encryption Access Project <info@leap.se> -- cgit v1.2.3