diff -r 545219ce42c7 -r ba37a871aac2 app/src/main/res/values-zh-rTW/strings.xml
--- a/app/src/main/res/values-zh-rTW/strings.xml	Sun Mar 15 22:11:18 2015 +0100
+++ b/app/src/main/res/values-zh-rTW/strings.xml	Sun Mar 15 23:21:01 2015 +0100
@@ -14,16 +14,8 @@
 <!--  AccountConfigure class -->
 <string name="AccountConfigureManualConfiguration">手动设置</string>
 
-<!--  Beem class -->
-<string name="BeemJabberID">Jabber账号 </string>
-
-<!--  BeemApplication class -->
-<string name="BeemApplicationConnect">连接中...</string>
-
 <!--  BeemService class -->
 <string name="BeemServiceDescription">使用Beem服务</string>
-<string name="BeemServiceCreated">Beem服务已创建</string>
-<string name="BeemServiceDestroyed">Beem服务已取消</string>
 
 <!--  ContactDialog class -->
 <string name="CDChat">聊天</string>
@@ -40,7 +32,6 @@
 <string name="AddCContactAdded">联系人已成功添加</string>
 <string name="AddCContactAddedError">联系人添加错误</string>
 <string name="AddCContactAddedLoginError">登录错误</string>
-<string name="AddCBadForm">格式错误</string>
 <string name="AddCContactAlready">联系人已存在</string>
 
 <!--  ChangeStatus class -->
@@ -49,12 +40,7 @@
 <string name="ChangeStatusMessage">我的个人消息</string>
 <string name="OpenContactList">打开联系人列表</string>
 
-<string name="MenuAddContact">添加心联系人</string>
-<string name="MenuAccountAbout">Beem项目</string>
-<string name="MenuAccountCreate">创建账号</string>
-<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>
@@ -64,8 +50,6 @@
 
 
 <!-- Settings class -->
-<string name="SettingsText">修改用户名</string>
-<string name="SettingsPassword">修改密码</string>
 <string name="SettingsProxy">代理</string>
 <string name="SettingsProxyProxy">使用代理服务器</string>
 <string name="SettingsProxySummary">通过代理服务器登录</string>
@@ -94,7 +78,6 @@
 <string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies
 </string>
 <string name="settings_account_username">用户名</string>
-<string name="login_username_info_default">beem@beem-project.com</string>
 <string name="settings_account_password">密码</string>
 <string name="settings_account_server">服务器</string>
 <string name="settings_account_port">端口</string>
@@ -128,8 +111,6 @@
 <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>
@@ -145,9 +126,6 @@
 <string name="SubscriptText">%s 想要添加你到他/她的好友列表.批准他/她的请求吗?</string>
 <string name="SubscriptTitle">批准好友请求?</string>
 
-<!--  BeemChatManager -->
-<string name="BeemChatManagerNewMessage">你有一个新消息</string>
-
 <!--  BeemBroadcastReceiver class -->
 <string name="BeemBroadcastReceiverDisconnect">BEEM:你的连接已断开</string>
 
@@ -156,25 +134,12 @@
 <string name="AcceptContactRequestFrom">批准%s联系你</string>
 
 <!-- Activities -->
-<string name="login_tag">Beem - 登录中</string>
 <string name="edit_settings_name">Beem - 设置</string>
-<string name="edit_settings_tag">Beem - 编制设置</string>
 <string name="create_account_name">Beem - 创建新账号 </string>
-<string name="create_account_tag">Beem - 创建新账号中</string>
 <string name="contact_list_name">Beem - 联系人</string>
-<string name="contact_list_tag">Beem - 联系人列表</string>
 <string name="user_info_name">Beem - 用户信息</string>
 
-<!-- Buttons -->
-<string name="button_create_account">创建这个账户</string>
-<string name="button_create_login_account">创建并使用这个账户</string>
-
 <!-- LogAs Activity -->
-<string name="login_username">用户名</string>
-<string name="login_password">密码</string>
-<string name="login_error_dialog_title">登录 - 错误</string>
-<string name="login_close_dialog_button">关闭</string>
-<string name="login_menu_create_account">创建一个账号</string>
 <string name="login_menu_settings">设置</string>
 <string name="login_menu_about">关于</string>
 <string name="login_about_title">Beem %s - 关于</string>
@@ -183,13 +148,8 @@
 http://www.beem-project.com !
 </string>
 <string name="login_about_button">关闭</string>
-<string name="login_settings_button">设置</string>
-<string name="login_login_button">登录</string>
 <string name="login_login_progress">连接中,请等待...</string>
-<string name="login_error_msg">Unfortunately, an error occured.\n\nError
-detail:\n%s</string>
 <string name="login_menu_login">登陆</string>
-<string name="login_no_connectivity">没有可用连接</string>
 <string name="login_start_msg">菜单设置配置</string>
 
 <!-- LoginAnim activity -->
@@ -227,16 +187,10 @@
 
 <!-- wizard activities -->
 <string name="account_wizard_text1"><b>欢迎使用BEEM.</b>\n\n您还没有设定XMPP (Jabber)账户.请选择下面的选项。\n请选择下面的选项:</string>
-<string name="account_wizard_configure_text"><b>请输入您已有账号的信息</b></string>
 <string name="account_wizard_configure_account">我想使用我已有的账号</string>
 <string name="account_wizard_create_account">我想创建一个新账号</string>
 
 <!-- Create an account Activity -->
-<string name="create_account_instr_dialog_title">创建新账号 - 向导</string>
-<string name="create_account_err_dialog_title">创建新账号 - 错误</string>
-<string name="create_account_err_dialog_settings_button">修改设置</string>
-<string name="create_account_close_dialog_button">关闭</string>
-<string name="create_account_successfull_after">账号%s已成功创建</string>
 <string name="create_account_err_username">错误的Jabber ID</string>
 <string name="create_account_err_passwords">密码不匹配。</string>
 <string name="create_account_username">用户名</string>