# HG changeset patch
# User Da Risk <da_risk@beem-project.com>
# Date 1362604545 -3600
# Node ID 3c02bfd5c885b22700ddcebef1e4916131c06e09
# Parent  67532322fa3910477d26d7abeb22c8935ef5b449
Update chinese translation

diff -r 67532322fa39 -r 3c02bfd5c885 res/values-zh-rCN/strings.xml
--- a/res/values-zh-rCN/strings.xml	Wed Mar 06 22:09:34 2013 +0100
+++ b/res/values-zh-rCN/strings.xml	Wed Mar 06 22:15:45 2013 +0100
@@ -55,6 +55,13 @@
 <string name="MenuConnection">编辑账号</string>
 <string name="ChangeStatusOk">更新状态</string>
 <string name="ChangeStatusNoChange">没有东西需要改变</string>
+<string name="my_avatar">我的头像</string>
+<string name="select_avatar">选择头像</string>
+<string name="take_photo">照相</string>
+<string name="pick_photo">选择照片</string>
+<string name="delete_avatar">删除头像</string>
+<string name="photoPickerNotFoundText">找不到照片</string>
+
 
 <!-- Settings class -->
 <string name="SettingsText">修改用户名</string>
@@ -120,8 +127,13 @@
 <string name="settings_chat_compact">聊天协议</string>
 <string name="settings_chat_compact_sum">设定聊天协议</string>
 <string name="history">历史记录</string>
+<string name="history_sum">保存对话到SD卡</string>
 <string name="history_mount">你需要有已插入设备并可以写入的SD存储来允许历史记录</string>
 <string name="history_on_off">允许历史记录</string>
+<string name="chat_preferences">聊天</string>
+<string name="chat_preferences_sum"></string>
+<string name="chat_history_path">历史路径</string>
+<string name="chat_history_path_sum">对话保存在SD卡上的文件夹中</string>
 <string name="settings_smack_debug">允许XMPPP调试</string>
 <string name="settings_full_jid_login">使用我完整的Jid作为用户名</string>
 <string name="settings_full_jid_login_sum">某些例如Google Talk这样的服务器需要</string>
@@ -200,6 +212,9 @@
 <string name="network_preferences">网络选项</string>
 <string name="proxy_proxy_settings">代理选项</string>
 <string name="proxy_user_settings">代理选项</string>
+<string name="history_preferences">历史</string>
+<string name="chat_layout_option">聊天布局</string>
+
 
 <!-- EditSettings Activity Tabs -->
 <string name="settings_tab_tag_account">编辑账户设定</string>
@@ -243,7 +258,7 @@
 <string name="userinfo_label_block">阻止</string>
 <string name="userinfo_label_delete">删除</string>
 <string name="userinfo_resend">重新发送订阅</string>
-<string name="userinfo_sure2delete">Are you sure you want to delete this contact ?
+<string name="userinfo_sure2delete">Are you sure you want to delete this contact?
 </string>
 <string name="userinfo_yes">是</string>
 <string name="userinfo_no">否</string>
diff -r 67532322fa39 -r 3c02bfd5c885 res/values-zh-rTW/strings.xml
--- a/res/values-zh-rTW/strings.xml	Wed Mar 06 22:09:34 2013 +0100
+++ b/res/values-zh-rTW/strings.xml	Wed Mar 06 22:15:45 2013 +0100
@@ -55,6 +55,13 @@
 <string name="MenuConnection">编辑账号</string>
 <string name="ChangeStatusOk">更新状态</string>
 <string name="ChangeStatusNoChange">没有东西需要改变</string>
+<string name="my_avatar">我的头像</string>
+<string name="select_avatar">选择头像</string>
+<string name="take_photo">照相</string>
+<string name="pick_photo">选择照片</string>
+<string name="delete_avatar">删除头像</string>
+<string name="photoPickerNotFoundText">找不到照片</string>
+
 
 <!-- Settings class -->
 <string name="SettingsText">修改用户名</string>
@@ -120,8 +127,13 @@
 <string name="settings_chat_compact">聊天协议</string>
 <string name="settings_chat_compact_sum">设定聊天协议</string>
 <string name="history">历史记录</string>
+<string name="history_sum">保存对话到SD卡</string>
 <string name="history_mount">你需要有已插入设备并可以写入的SD存储来允许历史记录</string>
 <string name="history_on_off">允许历史记录</string>
+<string name="chat_preferences">聊天</string>
+<string name="chat_preferences_sum"></string>
+<string name="chat_history_path">历史路径</string>
+<string name="chat_history_path_sum">对话保存在SD卡上的文件夹中</string>
 <string name="settings_smack_debug">允许XMPPP调试</string>
 <string name="settings_full_jid_login">使用我完整的Jid作为用户名</string>
 <string name="settings_full_jid_login_sum">某些例如Google Talk这样的服务器需要</string>
@@ -200,6 +212,9 @@
 <string name="network_preferences">网络选项</string>
 <string name="proxy_proxy_settings">代理选项</string>
 <string name="proxy_user_settings">代理选项</string>
+<string name="history_preferences">历史</string>
+<string name="chat_layout_option">聊天布局</string>
+
 
 <!-- EditSettings Activity Tabs -->
 <string name="settings_tab_tag_account">编辑账户设定</string>
@@ -243,7 +258,7 @@
 <string name="userinfo_label_block">阻止</string>
 <string name="userinfo_label_delete">删除</string>
 <string name="userinfo_resend">重新发送订阅</string>
-<string name="userinfo_sure2delete">Are you sure you want to delete this contact ?
+<string name="userinfo_sure2delete">Are you sure you want to delete this contact?
 </string>
 <string name="userinfo_yes">是</string>
 <string name="userinfo_no">否</string>