From 811134588a6dba898059acee7e8b7d3cb2d31521 Mon Sep 17 00:00:00 2001
From: lishoujun <lsjun@aliyun.com>
Date: Thu, 3 Jan 2019 22:40:24 +0800
Subject: [PATCH] translate zh. some string should not be translate add
 translatable false mark.

---
 app/src/main/res/values-zh-rCN/strings.xml |  8 ++++++++
 app/src/main/res/values/strings.xml        | 12 ++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 6b184a3..d1ba83b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -56,4 +56,12 @@
     <string name="gray">灰色</string>
     <string name="bluegray">蓝灰色</string>
     <string name="meta_data_views">次观看</string>
+    <string name="bottom_nav_title_local">本地</string>
+    <string name="title_activity_account">帐号</string>
+    <string name="pref_language">按语言过滤</string>
+    <string name="pref_description_language">选择你使用的语言，不勾选时所有语言的视频都会显示</string>
+    <string name="pref_title_torrent_player">使用种子播放</string>
+    <string name="pref_description_torrent_player">视频通过一个种子下载，此选项需要存储权限（实验阶段，不稳定！）</string>
+    <string name="action_bar_title_logout">退出</string>
+    <string name="zh">中文</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 959ad98..ddc7190 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">PeerTube</string>
+    <string name="app_name" translatable="false">PeerTube</string>
 
     <string name="title_activity_video_play">VideoPlayActivity</string>
     <string name="title_activity_settings">Settings</string>
@@ -31,16 +31,16 @@
     <string name="bottom_nav_title_account">Account</string>
 
     <!-- Strings related to Settings -->
-    <string name="peertube_required_server_version">1.0.0-alpha.7</string>
+    <string name="peertube_required_server_version" translatable="false">1.0.0-alpha.7</string>
 
-    <string name="pref_default_api_base_url" formatted="false">https://troll.tv</string>
+    <string name="pref_default_api_base_url" formatted="false" translatable="false">https://troll.tv</string>
     <string name="pref_title_peertube_server">PeerTube Server</string>
 
 
     <!-- Strings related to Video meta data -->
-    <string name="meta_data_seperator">\u0020-\u0020</string>
+    <string name="meta_data_seperator" translatable="false">\u0020-\u0020</string>
     <string name="meta_data_views">\u0020Views</string>
-    <string name="meta_data_owner_seperator">\@</string>
+    <string name="meta_data_owner_seperator" translatable="false">\@</string>
 
 
     <string name="video_row_video_thumbnail">Video Thumbnail</string>
@@ -61,7 +61,7 @@
     <string name="no_data_available">No Results</string>
     <string name="descr_overflow_button">More</string>
     <string name="menu_share">Share</string>
-    <string name="playback_channel_name">PeerTube</string>
+    <string name="playback_channel_name" translatable="false">PeerTube</string>
     <string name="invalid_url">Invalid Url!</string>
     <string name="pref_title_dark_mode">Dark Mode</string>
     <string name="pref_description_dark_mode">Restart App for Dark Mode to take effect.</string>