Merge master to fdroid to prepare 0.8.3.200315 (47) (backup bugfix)

k3b · Mar 12, 2020 · f7abd36 · f7abd36
2 parents a07c746 + cf141b5
commit f7abd36
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 25 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -61,9 +61,10 @@ android {
         // 0.8.0.191021 (44)    Backup to zip
         // 0.8.1.200212 (45)    Theme Support
         // 0.8.1.200218 (46)    Bugfix Delete Image
+        // 0.8.3.200315 (47)    Bugfix Backup to zip
 
-        versionCode = 46
-        versionName = '0.8.1.200218'
+        versionCode = 47
+        versionName = '0.8.3.200315'
 
 		// all supported locales
 		// resConfigs "ar","de","es","fr","hi","in","it","ja","nl","pl","ro","ru","tr","uk","zz","pt-rBR","zh-rCN","zh-rTW"

diff --git a/app/src/debug/res/values-ru/fdroid.xml b/app/src/debug/res/values-ru/fdroid.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--
+/*
+ * Translation to Russian (ru) via Crowdin:
+ *  * 2020 by Вячеслав однолько (brawlstarsodnolko)
+ *
+ * This file is part of "A Photo Manager" (A(ndro)FotoFinder).
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>
+ */
+ -->
+<resources>
+    <!-- Optional: This becomes .../fastlane/metadata/android/title.txt.
+      See https://f-droid.org/docs/Build_Metadata_Reference/#Name
+      Example: If spanish title="Manejador de fotos" then the App name/title in F-Droid-store becomes "A Photo Manager (Manejador de fotos)" -->
+    <string name="title">Фото менеджер</string>
+    <!-- This becomes .../fastlane/metadata/android/short_description.txt.
+    See https://f-droid.org/docs/Build_Metadata_Reference/#Summary -->
+    <string name="short_description">Управление локальными фотографиями: Find/Edit-Exif и показать в Галерее или Карте.</string>
+</resources>
diff --git a/app/src/main/java/de/k3b/android/androFotoFinder/backup/BackupAsyncTask.java b/app/src/main/java/de/k3b/android/androFotoFinder/backup/BackupAsyncTask.java
@@ -95,7 +95,7 @@ protected void onPostExecute(IZipConfig zipConfig) {
 
     @Override
     public boolean onProgress(int itemcount, int size, String message) {
-        boolean result = onProgress(itemcount, size, message);
+        boolean result = super.onProgress(itemcount, size, message);
         if (isCancelled()) {
             if (this.service != null) this.service.cancel();
         }

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
@@ -3,7 +3,7 @@
 <!--
 /*
  * Translation to Dutch by keunes(may ... september 2016), ookikgavertalen(2017-09-08),
- *      Klaas Swart (verydutch) 2018/11 ... 2019/09 , T-v-Gerwen 2019-09
+ *      Klaas Swart (verydutch) 2018/11 ... 2020/03 , T-v-Gerwen 2019-09
  *
  * This file is part of "A Photo Manager" (A(ndro)FotoFinder).
  *
@@ -235,7 +235,9 @@ onzichtbaar voor de mediadatabase, de galerij apps en de mediascanner. De bestan
     <string name="lbl_what">What: </string>
 -->
     <!-- #162: Theme support -->
-    <string name="settings_category_appearance_title">Uiterlijk</string>
+    <string name="settings_category_appearance_title">Themakleur</string>
     <string name="light_theme_title">Licht</string>
     <string name="dark_theme_title">Donker</string>
+    <!-- #155: android10 -->
+    <string name="load_db_menu_title">(Her)Laad Mediadatabase</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -5,6 +5,7 @@
  * Translation to Chinese Simplified (zh-CN) via Crowdin:
  *  * 2017 by Liu Feng (pitumaomao)
  *  * 2018 by Forbidden (cptbl00dra1n)
+ *  * 2020 by Xu Eric (spice2wolf)
  *
  * This file is part of "A Photo Manager" (A(ndro)FotoFinder).
  *
@@ -37,8 +38,8 @@
   <string name="copy_result_format">已复制%1$d/%2$d 文件</string>
   <string name="delete_menu_title">删除</string>
   <string name="delete_question_message_format">"是否确实要永久删除这些文件？
-%1$s 
-  
+%1$s
+
 此操作无法撤销。"</string>
   <string name="delete_question_title">刪除照片？</string>
   <string name="delete_result_format">已删除%1$d/%2$d 文件</string>
@@ -123,6 +124,7 @@
   <string name="share_err_to_many">一次选择共享的项目太多</string>
   <string name="share_menu_title">共享/发送</string>
   <string name="show_in_gallery_menu_title">在新图库中显示</string>
+  <string name="show_in_new_menu_title">显示在......</string>
   <string name="slideshow_menu_title">播放幻灯片</string>
   <string name="sort_by_date">日期</string>
   <string name="sort_by_folder">目录</string>
@@ -144,13 +146,13 @@
   <string name="geo_picker_from_photo_title">从地图中获取地理信息</string>
   <string name="geo_picker_from_map_title">从地图中获取地理信息</string>
   <string name="folder_hide_images_menu_title">隐藏图像</string>
-  <string name="folder_hide_images_question_message_format">"你确定？ 
+  <string name="folder_hide_images_question_message_format">"你确定？
 
-你想要使 
+你想要使
 
-%1$s 
+%1$s
 
-下面的所有媒体文件 （照片，视频，音频等），对系统多媒体库、图片应用和媒体文件扫描服务不可见？ 
+下面的所有媒体文件 （照片，视频，音频等），对系统多媒体库、图片应用和媒体文件扫描服务不可见？
 
 您可以撤消此隐藏操作，方法是在系统图片应用菜单调用媒体文件扫描服务."</string>
   <string name="filter_path_hint">部分目录名或文件名。%= 通配符</string>
@@ -194,10 +196,10 @@
   <string name="lbl_file_name_pattern">文件名模板：</string>
   <string name="lbl_exif">EXIF</string>
   <!-- i.e.
-            Copy 5 Photos
-				hello.jpg (2017-08-02), ...
-			To .../path/toFile/
-				1708NewName0001.jpg -->
+          Copy 5 Photos
+              hello.jpg (2017-08-02), ...
+          To .../path/toFile/
+              1708NewName0001.jpg -->
   <string name="preview_message_format">"%1$s %2$d 照片\n\t%3$s (%4$s), …\n至%5$s\n\t%6$s"</string>
   <!-- new in 0.6.3 additional sorting options -->
   <string name="sort_by_file_size">大小</string>
@@ -219,15 +221,29 @@
   <!-- #115: Virtual album -->
   <string name="filter_menu_title_album">编辑虚拟相册</string>
   <!--  depricated tags_update_result_format
-			replaced by android.R.string.xxx @android:string/xxx : btn_cancel btn_no btn_yes btn_okcopy_menu_title
+          replaced by android.R.string.xxx @android:string/xxx : btn_cancel btn_no btn_yes btn_okcopy_menu_title
 
-    sperate boomark picker is deprecated. now open via folder picker
-        <string name="bookmark_load_from_menu_title">Load album from &#8230;</string><br/>
-	note: with ver 0.7.0 'bookmark' will become 'virtual album'
-    -->
+  sperate boomark picker is deprecated. now open via folder picker
+      <string name="bookmark_load_from_menu_title">Load album from &#8230;</string>
+  note: with ver 0.7.0 'bookmark' will become 'virtual album'
+  -->
   <string name="settings_bookmark_dir_title">书签文件夹</string>
-    <!-- #162: Theme support -->
-    <string name="settings_category_appearance_title">外观</string>
-    <string name="dark_theme_title">灰暗</string>
-    <string name="light_theme_title">明亮</string>
+  <!-- #108: Backup to Zip-file -->
+  <string name="backup_title">备份到zip文件</string>
+  <string name="lbl_zip_out">Zip文件输出路径</string>
+  <string name="lbl_zip_name">文件</string>
+  <string name="lbl_zip_dir">文件夹</string>
+  <string name="lbl_zip_rel_path">在下方生成Zip子文件夹</string>
+  <!-- when should backup start ? -->
+  <string name="lbl_when">何时： </string>
+  <!-- #108 Zip-file export/backup will be implemented later
+  < ! - - what type of data should be saven ? - - >
+  <string name="lbl_what">What: </string>
+-->
+  <!-- #162: Theme support -->
+  <string name="settings_category_appearance_title">外观</string>
+  <string name="light_theme_title">浅色</string>
+  <string name="dark_theme_title">暗色</string>
+  <!-- #155: android10 -->
+  <string name="load_db_menu_title">(重新)加载媒体数据库</string>
 </resources>
diff --git a/fastlane/metadata/android/en-US/changelogs/47.txt b/fastlane/metadata/android/en-US/changelogs/47.txt
@@ -0,0 +1,3 @@
+* #168: Bugfix crash in "incremental backup to zip-file"
+* translation updates nl, ru, zh-CN
+* APhotoManager is not Android-10 (api-29) ready yet.
diff --git a/fastlane/metadata/android/ru-RU/short_description.txt b/fastlane/metadata/android/ru-RU/short_description.txt
@@ -0,0 +1 @@
+Управление локальными фотографиями: Find/Edit-Exif и показать в Галерее или Карте.
diff --git a/fastlane/metadata/android/ru-RU/title.txt b/fastlane/metadata/android/ru-RU/title.txt
@@ -0,0 +1 @@
+Фото менеджер (A Photo Manager)
diff --git a/fastlane/metadata/android/uk-UA/title.txt b/fastlane/metadata/android/uk-UA/title.txt
@@ -1 +1 @@
-Менеджер фотографій
+Менеджер фотографій (A Photo Manager)
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -4,3 +4,4 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionSha256Sum=9af7345c199f1731c187c96d3fe3d31f5405192a42046bafa71d846c3d9adacb
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Управление локальными фотографиями: Find/Edit-Exif и показать в Галерее или Карте.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Менеджер фотографій
		Менеджер фотографій (A Photo Manager)