Merge branch 'master' into FDroid

k3b · Feb 9, 2018 · 6a6d3c5 · 6a6d3c5
2 parents 7c8f5ec + 9b94f69
commit 6a6d3c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -44,10 +44,11 @@ android {
         // 0.6.1.170803 (31)    edit exif; enhanced media scanner
         // 0.6.1.170816 (32)    Bugfix crash android-7.1
         // 0.6.2.171114 (33)    Bugfix: non-root android-5 (or newer) direcotry picker not working because of permissions. Necessary for copy/move file commands.
-		// 0.6.2.171126 (34)    Bugfix Crash (NullPointerException) in mediascanner after updating exif
+        // 0.6.2.171126 (34)    Bugfix Crash (NullPointerException) in mediascanner after updating exif
+        // 0.6.3.180211 (35)    Extended Applocking; Autoprocessingmode for copy/move; Private images
 
-        versionCode = 34
-        versionName = '0.6.2.171126'
+        versionCode = 35
+        versionName = '0.6.3.180211'
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7

diff --git a/fastlane/metadata/android/en-US/changelogs/35.txt b/fastlane/metadata/android/en-US/changelogs/35.txt
@@ -6,4 +6,4 @@ Changes from 0.6.2.171126 (34) to 0.6.3 (35)
 * Gallery view: Added sort by (image-)width, (file-)size
 * Fix update tags/geo also update lastModified in mediadb always in format secs since 1970. Else "sort by last modified" does not work.
 * Fix allow xmp edit of png/gif.
-* Translations and Translationupdates: French by Poussinou and Tuuux; Indonesian by riesky and isaideureka; Hindi by jznsamuel (jasonsamuel88); Japanese by naofum; Chinese Simplified and Chinese Traditional by Liu Feng (pitumaomao), Russian by ku ku,
+* Translations and Translationupdates: 	fr, id, hi, ja, zh-CN, zh-TW, ru, de, en