From ab91c498ab66415c5949a444c7c9c17c6a17c137 Mon Sep 17 00:00:00 2001 From: Audrius Butkevicius Date: Mon, 11 Feb 2019 20:57:24 +0000 Subject: [PATCH] Merge 0.10.17-beta4 into master (#1269) * Bumped version to 0.10.17-beta2 * Discard invalid locale * Imported translations * Bumped version to 0.10.17-beta3 * Discard invalid locale * Imported translations * Bumped version to 0.10.17-beta4 --- app/build.gradle | 12 +++++++----- app/src/main/play/en-GB/whatsnew | 1 + app/src/main/play/eu/listing/fulldescription | 9 --------- app/src/main/play/eu/listing/shortdescription | 1 - app/src/main/play/eu/listing/title | 1 - app/src/main/play/ta/listing/fulldescription | 9 --------- app/src/main/play/ta/listing/shortdescription | 1 - app/src/main/play/ta/listing/title | 1 - 8 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 app/src/main/play/eu/listing/fulldescription delete mode 100644 app/src/main/play/eu/listing/shortdescription delete mode 100644 app/src/main/play/eu/listing/title delete mode 100644 app/src/main/play/ta/listing/fulldescription delete mode 100644 app/src/main/play/ta/listing/shortdescription delete mode 100644 app/src/main/play/ta/listing/title diff --git a/app/build.gradle b/app/build.gradle index 24345673..d4c55984 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,8 +35,8 @@ android { applicationId "com.nutomic.syncthingandroid" minSdkVersion 16 targetSdkVersion 26 - versionCode 4151 - versionName "0.10.17-beta1" + versionCode 4154 + versionName "0.10.17-beta4" testApplicationId 'com.nutomic.syncthingandroid.test' testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' playAccountConfig = playAccountConfigs.defaultAccountConfig @@ -81,8 +81,10 @@ play { * Some languages are not supported by Google Play, so we ignore them. */ task deleteUnsupportedPlayTranslations(type: Delete) { - delete 'src/main/play/nn' - delete 'src/main/play/el-EL' - delete 'src/main/play/nb' + delete 'src/main/play/nn/' + delete 'src/main/play/el-EL/' + delete 'src/main/play/nb/' delete 'src/main/play/en/' + delete 'src/main/play/ta/' + delete 'src/main/play/eu/' } diff --git a/app/src/main/play/en-GB/whatsnew b/app/src/main/play/en-GB/whatsnew index 825fe847..affa6cac 100644 --- a/app/src/main/play/en-GB/whatsnew +++ b/app/src/main/play/en-GB/whatsnew @@ -1,3 +1,4 @@ * Update syncthing to v1.0.1 * Fix app getting killed by activity manager in Android 8+ (thanks Catfriend1 for backport) * Show reasons for disabled service in notification dialog (#1264) + diff --git a/app/src/main/play/eu/listing/fulldescription b/app/src/main/play/eu/listing/fulldescription deleted file mode 100644 index f83adf9c..00000000 --- a/app/src/main/play/eu/listing/fulldescription +++ /dev/null @@ -1,9 +0,0 @@ -Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet. - -Website: https://syncthing.net/ - -Source code: https://github.com/syncthing/syncthing-android - -Forum: https://forum.syncthing.net/ - -Issues: https://github.com/syncthing/syncthing-android/issues \ No newline at end of file diff --git a/app/src/main/play/eu/listing/shortdescription b/app/src/main/play/eu/listing/shortdescription deleted file mode 100644 index 2020025b..00000000 --- a/app/src/main/play/eu/listing/shortdescription +++ /dev/null @@ -1 +0,0 @@ -Open, trustworthy and decentralized file synchronization \ No newline at end of file diff --git a/app/src/main/play/eu/listing/title b/app/src/main/play/eu/listing/title deleted file mode 100644 index b9a21b0f..00000000 --- a/app/src/main/play/eu/listing/title +++ /dev/null @@ -1 +0,0 @@ -Syncthing \ No newline at end of file diff --git a/app/src/main/play/ta/listing/fulldescription b/app/src/main/play/ta/listing/fulldescription deleted file mode 100644 index f83adf9c..00000000 --- a/app/src/main/play/ta/listing/fulldescription +++ /dev/null @@ -1,9 +0,0 @@ -Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet. - -Website: https://syncthing.net/ - -Source code: https://github.com/syncthing/syncthing-android - -Forum: https://forum.syncthing.net/ - -Issues: https://github.com/syncthing/syncthing-android/issues \ No newline at end of file diff --git a/app/src/main/play/ta/listing/shortdescription b/app/src/main/play/ta/listing/shortdescription deleted file mode 100644 index 2020025b..00000000 --- a/app/src/main/play/ta/listing/shortdescription +++ /dev/null @@ -1 +0,0 @@ -Open, trustworthy and decentralized file synchronization \ No newline at end of file diff --git a/app/src/main/play/ta/listing/title b/app/src/main/play/ta/listing/title deleted file mode 100644 index b9a21b0f..00000000 --- a/app/src/main/play/ta/listing/title +++ /dev/null @@ -1 +0,0 @@ -Syncthing \ No newline at end of file