Merge branch 'master' of github.com:Determinant/piztor

1 files changed, 28 insertions, 14 deletions

diff --git a/client/Piztor/res/values/strings.xml b/client/Piztor/res/values/strings.xml
index a0843df..82132ed 100644
--- a/client/Piztor/res/values/strings.xml
+++ b/client/Piztor/res/values/strings.xml
@@ -1,29 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="app_name">Piztor</string>
     <string name="action_settings">Settings</string>
     <string name="hello_world">Hello world!</string>
-    <string name="settings">Settings</string>
-    <string name="search">Search</string>
-    <string name="fetch">Fetch</string>
-    <string name="checkin">Checkin</string>
-    <string name="focus">Focus</string>
-    <string name="show_sex">Show sex: </string>
+    <string name="settings">设置</string>
+    <string name="search">搜索</string>
+    <string name="fetch">获取</string>
+    <string name="checkin">签到</string>
+    <string name="focus">聚焦</string>
+    <string name="show_sex">按性别</string>
     <string name="male">Male</string>
     <string name="female">Female</string>
-    <string name="show_team">Show team: </string>
+    <string name="show_team">按班级</string>
     <string name="all">All</string>
     <string name="mine">Mine</string>
     <string name="title_activity_login">Login</string>
     <string name="title_activity_main">Main</string>
     <string name="title_activity_settings">Settings</string>
-    <string name="password">password</string>
-    <string name="username">username</string>
-    <string name="login">login</string>
+    <string name="password">密码</string>
+    <string name="username">用户名</string>
+    <string name="login">登录</string>
     <string name="desc">desc</string>
-    <string name="logout">Logout</string>
-    <string name="update_info">My Account</string>
-    <string name="subscribe_info">Subscribe information</string>
-    <string name="change">Check &amp; Update</string>
+    <string name="logout">注销</string>
+    <string name="update_info">修改密码</string>
+    <string name="subscribe_info">关注信息</string>
+    <string name="change">查看及修改</string>
+    <string name="title_activity_subscribesettings">SubscribeSettings</string>
+    <string name="title_activity_subscribe_settings">SubscribeSettings</string>
+    <string name="title_activity_update_info">UpdateInfo</string>
+    <string name="cancel">取消</string>
+    <string name="remove">移除</string>
+    <string name="company">连队</string>
+    <string name="section">班级</string>
+    <string name="add">添加</string>
+    <string name="GPSrefreshrate">GPS刷新率 每</string>
+    <string name="old_password">旧密码</string>
+    <string name="new_password">新密码</string>
+    <string name="submit">提交</string>
+    <string name="colormode">着色方式</string>
 
 </resources>