From de6a5141b9ca4dfeb018203fb9d2594bea8b9a20 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Sun, 6 Mar 2016 14:49:30 +0800
Subject: [PATCH] Update string.xml

---
 .../hippo/ehviewer/ui/CommonOperations.java   |  2 +-
 .../com/hippo/ehviewer/ui/MainActivity.java   |  8 +++----
 ...DownloadScene.java => DownloadsScene.java} |  6 ++---
 .../ehviewer/ui/scene/FavoritesScene.java     |  2 +-
 .../ehviewer/ui/scene/GalleryDetailScene.java |  2 +-
 app/src/main/res/menu/drawer_favorites.xml    |  2 +-
 app/src/main/res/menu/nav_drawer_main.xml     |  4 ++--
 app/src/main/res/values-zh-rCN/strings.xml    | 24 ++++++++++++++++---
 app/src/main/res/values-zh-rHK/strings.xml    | 24 ++++++++++++++++---
 app/src/main/res/values-zh-rTW/strings.xml    | 24 ++++++++++++++++---
 app/src/main/res/values/strings.xml           |  7 +++---
 11 files changed, 80 insertions(+), 25 deletions(-)
 rename app/src/main/java/com/hippo/ehviewer/ui/scene/{DownloadScene.java => DownloadsScene.java} (99%)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java
index a73215e0c..35a98f75f 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java
@@ -75,7 +75,7 @@ public final class CommonOperations {
                                 Settings.putDefaultFavSlot(Settings.INVALID_DEFAULT_FAV_SLOT);
                             }
                         }
-                    }, activity.getString(R.string.remember_favorite_slot), false)
+                    }, activity.getString(R.string.remember_favorite_collection), false)
                     .setTitle(R.string.add_favorites_dialog_title)
                     .show();
         }
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
index f819786e8..62ef1716c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
@@ -38,7 +38,7 @@ import com.hippo.ehviewer.client.EhUrlOpener;
 import com.hippo.ehviewer.client.EhUtils;
 import com.hippo.ehviewer.ui.scene.BaseScene;
 import com.hippo.ehviewer.ui.scene.DownloadLabelScene;
-import com.hippo.ehviewer.ui.scene.DownloadScene;
+import com.hippo.ehviewer.ui.scene.DownloadsScene;
 import com.hippo.ehviewer.ui.scene.FavoritesScene;
 import com.hippo.ehviewer.ui.scene.GalleryCommentsScene;
 import com.hippo.ehviewer.ui.scene.GalleryDetailScene;
@@ -76,7 +76,7 @@ public final class MainActivity extends StageActivity
         registerLaunchMode(GalleryInfoScene.class, SceneFragment.LAUNCH_MODE_STANDARD);
         registerLaunchMode(GalleryCommentsScene.class, SceneFragment.LAUNCH_MODE_STANDARD);
         registerLaunchMode(GalleryPreviewsScene.class, SceneFragment.LAUNCH_MODE_STANDARD);
-        registerLaunchMode(DownloadScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
+        registerLaunchMode(DownloadsScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
         registerLaunchMode(DownloadLabelScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
         registerLaunchMode(FavoritesScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
         registerLaunchMode(ProgressScene.class, SceneFragment.LAUNCH_MODE_STANDARD);
@@ -295,8 +295,8 @@ public final class MainActivity extends StageActivity
             startScene(new Announcer(FavoritesScene.class));
         } else if (id == R.id.nav_history) {
 
-        } else if (id == R.id.nav_download) {
-            startScene(new Announcer(DownloadScene.class));
+        } else if (id == R.id.nav_downloads) {
+            startScene(new Announcer(DownloadsScene.class));
         } else if (id == R.id.nav_settings) {
             Intent intent = new Intent(this, SettingsActivity.class);
             startActivity(intent);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
similarity index 99%
rename from app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadScene.java
rename to app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
index 8dc292062..41cf98533 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
@@ -86,7 +86,7 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-public class DownloadScene extends ToolbarScene
+public class DownloadsScene extends ToolbarScene
         implements DownloadManager.DownloadInfoListener,
         EasyRecyclerView.OnItemClickListener,
         EasyRecyclerView.OnItemLongClickListener,
@@ -238,7 +238,7 @@ public class DownloadScene extends ToolbarScene
         setNavigationIcon(R.drawable.v_arrow_left_dark_x24);
 
         // Clear nav checked item
-        setNavCheckedItem(R.id.nav_download);
+        setNavCheckedItem(R.id.nav_downloads);
 
         // Hide IME
         ActivityHelper.hideSoftInput(getActivity());
@@ -1000,7 +1000,7 @@ public class DownloadScene extends ToolbarScene
         @Override
         public void onOutOfCustomChoice(EasyRecyclerView view) {
             if (mRecyclerView != null) {
-                mRecyclerView.setOnItemLongClickListener(DownloadScene.this);
+                mRecyclerView.setOnItemLongClickListener(DownloadsScene.this);
             }
             if (mFabLayout != null) {
                 mFabLayout.setExpanded(false);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
index fbe629dfd..b00db5ee2 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
@@ -403,7 +403,7 @@ public class FavoritesScene extends BaseScene implements
                         String[] favCat = Settings.getFavCat();
                         System.arraycopy(favCat, 0, items, 2, 10);
                         new AlertDialog.Builder(getContext())
-                                .setTitle(R.string.default_favorites_slot)
+                                .setTitle(R.string.default_favorites_collection)
                                 .setItems(items, new DialogInterface.OnClickListener() {
                                     @Override
                                     public void onClick(DialogInterface dialog, int which) {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
index a17bf586b..17fd6c303 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
@@ -1248,7 +1248,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
         @TargetApi(Build.VERSION_CODES.LOLLIPOP)
         public boolean onTransition(Context context,
                 FragmentTransaction transaction, Fragment exit, Fragment enter) {
-            if (!(enter instanceof GalleryListScene) && !(enter instanceof DownloadScene) &&
+            if (!(enter instanceof GalleryListScene) && !(enter instanceof DownloadsScene) &&
                     !(enter instanceof FavoritesScene)) {
                 return false;
             }
diff --git a/app/src/main/res/menu/drawer_favorites.xml b/app/src/main/res/menu/drawer_favorites.xml
index 4028c1329..7fbf58143 100644
--- a/app/src/main/res/menu/drawer_favorites.xml
+++ b/app/src/main/res/menu/drawer_favorites.xml
@@ -28,7 +28,7 @@
     <item
         android:id="@+id/action_default_favorites_slot"
         android:icon="@drawable/v_heart_box_dark_x24"
-        android:title="@string/default_favorites_slot"
+        android:title="@string/default_favorites_collection"
         app:showAsAction="ifRoom"/>
 
 </menu>
diff --git a/app/src/main/res/menu/nav_drawer_main.xml b/app/src/main/res/menu/nav_drawer_main.xml
index 800fd37a8..36dfd94ac 100644
--- a/app/src/main/res/menu/nav_drawer_main.xml
+++ b/app/src/main/res/menu/nav_drawer_main.xml
@@ -39,8 +39,8 @@
             android:icon="@drawable/v_history_black_x24"/>
 
         <item
-            android:id="@+id/nav_download"
-            android:title="@string/download"
+            android:id="@+id/nav_downloads"
+            android:title="@string/downloads"
             android:icon="@drawable/v_download_black_x24"/>
 
         <item
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 7b77f75e4..6f1000c2f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -23,7 +23,7 @@
     <string name="whats_hot">热门</string>
     <string name="favourite">收藏</string>
     <string name="history">历史</string>
-    <string name="download">下载</string>
+    <string name="downloads">下载</string>
     <string name="settings">设置</string>
 
     <string name="username">用户名</string>
@@ -101,6 +101,7 @@
 
     <!-- Gallery detail -->
     <string name="error_cannot_find_gallery">找不到画廊</string>
+    <string name="download">下载</string>
     <string name="read">阅读</string>
     <string name="more_information">查看更多信息</string>
     <plurals name="page_count">
@@ -123,6 +124,16 @@
     <string name="open_in_other_app">在其他应用中打开</string>
     <string name="rate_successfully">评分成功</string>
     <string name="rate_failed">评分失败</string>
+    <string name="no_torrents">没有种子</string>
+    <string name="torrents">种子</string>
+    <string name="favorited">已收藏</string>
+    <string name="unfavorited">未收藏</string>
+    <string name="add_favorites_dialog_title">添加收藏</string>
+    <string name="remember_favorite_collection">记住收藏夹</string>
+    <string name="add_to_favorite_success">已添加至收藏</string>
+    <string name="remove_from_favorite_success">移除收藏</string>
+    <string name="add_to_favorite_failure">添加收藏失败</string>
+    <string name="remove_from_favorite_failure">移除收藏失败</string>
 
     <!-- Rating -->
     <string name="rating10">根本把持不住</string>
@@ -179,6 +190,8 @@
     <string name="no_download_info">无下载项目</string>
     <string name="download_state_none">未启动</string>
     <string name="download_state_wait">等待中</string>
+    <string name="download_state_downloading">下载中</string>
+    <string name="download_state_downloaded">已下载</string>
     <string name="download_state_failed">失败</string>
     <string name="download_state_failed_2">%d 未完成</string>
     <string name="download_state_finish">已完成</string>
@@ -204,6 +217,8 @@
     <string name="download_service_label">EhViewer 下载服务</string>
     <string name="download_speed_text">%s</string>
     <string name="download_speed_text_2">%1$s，%2$s</string>
+    <string name="remember_download_label">记住下载标签</string>
+    <string name="default_download_label">默认下载标签</string>
 
     <!-- Download label -->
     <string name="no_download_label">无标签</string>
@@ -275,6 +290,9 @@
     <string name="delete_favorites_dialog_title">删除收藏</string>
     <string name="delete_favorites_dialog_message">删除 %d 项收藏</string>
     <string name="move_favorites_dialog_title">移动收藏</string>
+    <string name="default_favorites_collection">默认收藏夹</string>
+    <string name="let_me_select">让我选择</string>
+    <string name="favorites_info">收藏信息</string>
 
     <!-- Progress Scene -->
     <string name="error_something_wrong_happened">被玩坏了</string>
@@ -295,10 +313,10 @@
         <item quantity="other">秒</item>
     </plurals>
     <plurals name="minute">
-        <item quantity="other">分</item>
+        <item quantity="other">分钟</item>
     </plurals>
     <plurals name="hour">
-        <item quantity="other">时</item>
+        <item quantity="other">小时</item>
     </plurals>
     <plurals name="day">
         <item quantity="other">天</item>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 63c42e2fe..775d45074 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -23,7 +23,7 @@
     <string name="whats_hot">熱門</string>
     <string name="favourite">收藏</string>
     <string name="history">歷史</string>
-    <string name="download">下載</string>
+    <string name="downloads">下載</string>
     <string name="settings">設置</string>
 
     <string name="username">用户名</string>
@@ -101,6 +101,7 @@
 
     <!-- Gallery detail -->
     <string name="error_cannot_find_gallery">找不到畫廊</string>
+    <string name="download">下載</string>
     <string name="read">閲讀</string>
     <string name="more_information">查看更多信息</string>
     <plurals name="page_count">
@@ -123,6 +124,16 @@
     <string name="open_in_other_app">在其他應用中打開</string>
     <string name="rate_successfully">評分成功</string>
     <string name="rate_failed">評分失敗</string>
+    <string name="no_torrents">沒有種子</string>
+    <string name="torrents">種子</string>
+    <string name="favorited">已收藏</string>
+    <string name="unfavorited">未收藏</string>
+    <string name="add_favorites_dialog_title">添加收藏</string>
+    <string name="remember_favorite_collection">記住收藏夾</string>
+    <string name="add_to_favorite_success">已添加至收藏</string>
+    <string name="remove_from_favorite_success">移除收藏</string>
+    <string name="add_to_favorite_failure">添加收藏失敗</string>
+    <string name="remove_from_favorite_failure">移除收藏失敗</string>
 
     <!-- Rating -->
     <string name="rating10">根本把持不住</string>
@@ -179,6 +190,8 @@
     <string name="no_download_info">無下載項目</string>
     <string name="download_state_none">未啟動</string>
     <string name="download_state_wait">等待中</string>
+    <string name="download_state_downloading">下載中</string>
+    <string name="download_state_downloaded">已下載</string>
     <string name="download_state_failed">失敗</string>
     <string name="download_state_failed_2">%d 未完成</string>
     <string name="download_state_finish">已完成</string>
@@ -204,6 +217,8 @@
     <string name="download_service_label">EhViewer 下載服務</string>
     <string name="download_speed_text">%s</string>
     <string name="download_speed_text_2">%1$s，%2$s</string>
+    <string name="remember_download_label">記住下載標籤</string>
+    <string name="default_download_label">默認下載標籤</string>
 
     <!-- Download label -->
     <string name="no_download_label">無標籤</string>
@@ -275,6 +290,9 @@
     <string name="delete_favorites_dialog_title">刪除收藏</string>
     <string name="delete_favorites_dialog_message">刪除 %d 項收藏</string>
     <string name="move_favorites_dialog_title">移動收藏</string>
+    <string name="default_favorites_collection">默認收藏夾</string>
+    <string name="let_me_select">讓我選擇</string>
+    <string name="favorites_info">收藏信息</string>
 
     <!-- Progress Scene -->
     <string name="error_something_wrong_happened">被玩壞了</string>
@@ -295,10 +313,10 @@
         <item quantity="other">秒</item>
     </plurals>
     <plurals name="minute">
-        <item quantity="other">分</item>
+        <item quantity="other">分鐘</item>
     </plurals>
     <plurals name="hour">
-        <item quantity="other">時</item>
+        <item quantity="other">小時</item>
     </plurals>
     <plurals name="day">
         <item quantity="other">天</item>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 3d06592c2..42d3f7ff0 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -23,7 +23,7 @@
     <string name="whats_hot">熱門</string>
     <string name="favourite">收藏</string>
     <string name="history">歷史</string>
-    <string name="download">下載</string>
+    <string name="downloads">下載</string>
     <string name="settings">設定</string>
 
     <string name="username">使用者名稱</string>
@@ -101,6 +101,7 @@
 
     <!-- Gallery detail -->
     <string name="error_cannot_find_gallery">找不到畫廊</string>
+    <string name="download">下載</string>
     <string name="read">閱讀</string>
     <string name="more_information">檢視更多資訊</string>
     <plurals name="page_count">
@@ -123,6 +124,16 @@
     <string name="open_in_other_app">在其他應用中開啟</string>
     <string name="rate_successfully">評分成功</string>
     <string name="rate_failed">評分失敗</string>
+    <string name="no_torrents">沒有種子</string>
+    <string name="torrents">種子</string>
+    <string name="favorited">已收藏</string>
+    <string name="unfavorited">未收藏</string>
+    <string name="add_favorites_dialog_title">新增收藏</string>
+    <string name="remember_favorite_collection">記住收藏夾</string>
+    <string name="add_to_favorite_success">已新增至收藏</string>
+    <string name="remove_from_favorite_success">移除收藏</string>
+    <string name="add_to_favorite_failure">新增收藏失敗</string>
+    <string name="remove_from_favorite_failure">移除收藏失敗</string>
 
     <!-- Rating -->
     <string name="rating10">根本把持不住</string>
@@ -179,6 +190,8 @@
     <string name="no_download_info">無下載項目</string>
     <string name="download_state_none">未啟動</string>
     <string name="download_state_wait">等待中</string>
+    <string name="download_state_downloading">下載中</string>
+    <string name="download_state_downloaded">已下載</string>
     <string name="download_state_failed">失敗</string>
     <string name="download_state_failed_2">%d 未完成</string>
     <string name="download_state_finish">已完成</string>
@@ -204,6 +217,8 @@
     <string name="download_service_label">EhViewer 下載服務</string>
     <string name="download_speed_text">%s</string>
     <string name="download_speed_text_2">%1$s，%2$s</string>
+    <string name="remember_download_label">記住下載標籤</string>
+    <string name="default_download_label">預設下載標籤</string>
 
     <!-- Download label -->
     <string name="no_download_label">無標籤</string>
@@ -275,6 +290,9 @@
     <string name="delete_favorites_dialog_title">刪除收藏</string>
     <string name="delete_favorites_dialog_message">刪除 %d 項收藏</string>
     <string name="move_favorites_dialog_title">移動收藏</string>
+    <string name="default_favorites_collection">預設收藏夾</string>
+    <string name="let_me_select">讓我選擇</string>
+    <string name="favorites_info">收藏資訊</string>
 
     <!-- Progress Scene -->
     <string name="error_something_wrong_happened">被玩壞了</string>
@@ -295,10 +313,10 @@
         <item quantity="other">秒</item>
     </plurals>
     <plurals name="minute">
-        <item quantity="other">分</item>
+        <item quantity="other">分鐘</item>
     </plurals>
     <plurals name="hour">
-        <item quantity="other">時</item>
+        <item quantity="other">小時</item>
     </plurals>
     <plurals name="day">
         <item quantity="other">天</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index becf202b0..f91f42c94 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,7 +35,7 @@
     <string name="whats_hot">What\'s hot</string>
     <string name="favourite">Favourite</string>
     <string name="history">History</string>
-    <string name="download">Download</string>
+    <string name="downloads">Downloads</string>
     <string name="settings">Settings</string>
     <string name="stub" translatable="false">Stub</string>
 
@@ -140,6 +140,7 @@
 
     <!-- Gallery detail -->
     <string name="error_cannot_find_gallery">Can\'t find the gallery</string>
+    <string name="download">Download</string>
     <string name="read">Read</string>
     <string name="more_information">More information</string>
     <plurals name="page_count">
@@ -168,7 +169,7 @@
     <string name="favorited">Favorited</string>
     <string name="unfavorited">Unfavorited</string>
     <string name="add_favorites_dialog_title">Add to favorites</string>
-    <string name="remember_favorite_slot">Remember favorite slot</string>
+    <string name="remember_favorite_collection">Remember favorite collection</string>
     <string name="add_to_favorite_success">Added to favorites</string>
     <string name="remove_from_favorite_success">Removed from favorites</string>
     <string name="add_to_favorite_failure">Failed to add to favorites</string>
@@ -328,7 +329,7 @@
     <string name="delete_favorites_dialog_title">Delete from favorites</string>
     <string name="delete_favorites_dialog_message">Delete %d items from favorites</string>
     <string name="move_favorites_dialog_title">Move favorites</string>
-    <string name="default_favorites_slot">Default favorites slot</string>
+    <string name="default_favorites_collection">Default favorites collection</string>
     <string name="let_me_select">Let me select</string>
     <string name="favorites_info">Favorites info</string>