diff options
| -rw-r--r-- | app/build.gradle | 12 | ||||
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/AboutActivity.java | 2 | ||||
| -rwxr-xr-x | app/src/main/res/values-pt/strings.xml | 6 | ||||
| -rwxr-xr-x | app/src/main/res/values-sv/strings.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/values/untranslatable.xml | 2 |
7 files changed, 14 insertions, 19 deletions
diff --git a/app/build.gradle b/app/build.gradle index 7a2fa73a..60ae394f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,12 @@ apply plugin: 'com.android.application' android { compileSdkVersion 26 buildToolsVersion '26.0.0' -; + + defaultConfig { + applicationId "se.leap.bitmaskclient" + resValue "string", "app_name", "Bitmask" + } + signingConfigs { release { storeFile project.hasProperty('storeFileProperty') ? file(storeFileProperty) : null @@ -28,6 +33,11 @@ android { if(signingConfigs.contains(release)) signingConfig signingConfigs.release.isSigningReady() ? signingConfigs.release : signingConfigs.debug } + beta { + initWith release + applicationIdSuffix ".beta" + resValue "string", "app_name", "Bitmask Beta" + } } lintOptions { 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"> <service @@ -84,7 +84,7 @@ <activity android:name="se.leap.bitmaskclient.Dashboard" - android:label="@string/title_activity_dashboard" + android:label="@string/app_name" android:uiOptions="splitActionBarWhenNarrow" android:launchMode="singleTop" > 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.com--> -<!-- Generated by crowdin.net --> -<resources> - <string name="app">OpenVPN para Android</string> -</resources> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<!--Generated by crowdin.net--> -<!-- Generated by crowdin.net --> -<resources> - <string name="app">OpenVPN för Android</string> -</resources> 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 @@ <string name="routes_info6">Routes IPv6: %s</string> <string name="error_empty_username">The username must not be empty.</string> <string name="cert_from_keystore">Got certificate \'%s\' from Keystore</string> - <string name="title_activity_dashboard">Bitmask</string> <string name="provider_label">Provider:</string> <string name="provider_label_none">No provider configured</string> <string name="status_unknown">Status unknown.</string> 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 @@ <?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="notifcation_title_bitmask">Bitmask - %s</string> <string name="copyright_leapgui" translatable="false">Copyright 2012-2017\nLEAP Encryption Access Project <info@leap.se></string> |