Merge branch 'trz/rebase' into trz/rename

1 files changed, 1 insertions, 15 deletions

diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 95d9e4e6..9a59cfe6 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -8,7 +8,6 @@
   <string name="action_secure">安全對話</string>
   <string name="action_add_account">新增帳戶</string>
   <string name="action_edit_contact">編輯姓名</string>
-  <string name="action_add_phone_book">新增到手機通訊錄</string>
   <string name="action_delete_contact">從列表中刪除</string>
   <string name="title_activity_manage_accounts">管理帳戶</string>
   <string name="title_activity_conference_details">群組詳情</string>
@@ -21,7 +20,6 @@
   <string name="minutes_ago">%d 分鐘前</string>
   <string name="unread_conversations">未讀對話</string>
   <string name="sending">正在發送…</string>
-  <string name="encrypted_message">正在解密訊息中，請稍候…</string>
   <string name="nick_in_use">該用戶名稱已被使用</string>
   <string name="admin">管理員</string>
   <string name="owner">擁有人</string>
@@ -58,9 +56,7 @@
   <string name="clear_conversation_history">清除對話記錄</string>
   <string name="clear_histor_msg">你確定要刪除該對話中所有訊息嗎？\n\n<b>警告:</b> 這將不會影響其他設備或伺服器儲存的訊息。</string>
   <string name="delete_messages">刪除訊息</string>
-  <string name="also_end_conversation">之後結束這對話</string>
   <string name="choose_presence">選擇狀態訊息</string>
-  <string name="send_plain_text_message">發送純文字訊息</string>
   <string name="send_otr_message">發送 OTR 加密訊息</string>
   <string name="send_pgp_message">發送 OpenPGP 加密訊息</string>
   <string name="your_nick_has_been_changed">用戶名稱修改成功</string>
@@ -76,29 +72,25 @@
   <string name="contact_has_no_pgp_key">Conversations 不能將你的訊息加密，因為聯絡人沒有公佈他/她的公鑰。\n\n<small>請通知聯絡人設定 OpenPGP。</small></string>
   <string name="no_pgp_keys">找不到多條 OpenPGP 鑰匙</string>
   <string name="contacts_have_no_pgp_keys">Conversations 不能將你的訊息加密，因為多位聯絡人沒有公佈他/她的公鑰。\n\n<small>請通知聯絡人設定 OpenPGP。</small></string>
-  <string name="encrypted_message_received"><i>已收到加密訊息，點擊進行解密和查看。</i></string>
   <string name="pref_general">一般</string>
   <string name="pref_xmpp_resource">XMPP 資源</string>
   <string name="pref_xmpp_resource_summary">客戶端標示名稱</string>
   <string name="pref_accept_files">接收文件</string>
   <string name="pref_accept_files_size_summary">自動接收小於 … 的文件</string>
   <string name="pref_notification_settings">通知設定</string>
+  <string name="pref_accept_files_summary">自動接收小於 … 的文件</string>
   <string name="pref_notifications">通知</string>
   <string name="pref_notifications_summary">收到新訊息時通知</string>
   <string name="pref_vibrate">震動</string>
   <string name="pref_vibrate_summary">收到新訊息時震動</string>
   <string name="pref_sound">聲音</string>
   <string name="pref_sound_summary">收到新訊息時播放鈴聲</string>
-  <string name="pref_conference_notifications">群組通知</string>
-  <string name="pref_conference_notifications_summary">當有新訊息時總是通知，而不是被標記時才通知</string>
   <string name="pref_notification_grace_period">通知限期</string>
   <string name="pref_notification_grace_period_summary">收到副本後，關閉通知一小段時間</string>
-  <string name="pref_advanced_options">進階選項</string>
   <string name="pref_never_send_crash">總是不發送故障報告</string>
   <string name="pref_never_send_crash_summary">發送「堆疊追蹤」給 Conversations 的開發人員能幫助改進本程式</string>
   <string name="pref_confirm_messages">確認訊息</string>
   <string name="pref_confirm_messages_summary">讓你的聯絡人知道你已收到及閱讀訊息</string>
-  <string name="pref_ui_options">介面選項</string>
   <string name="openpgp_error">OpenKeychain 回報了一個錯誤</string>
   <string name="error_decrypting_file">解密文件時出現 I/O 錯誤</string>
   <string name="accept">接受</string>
@@ -131,7 +123,6 @@
   <string name="account_status_regis_conflict">該用戶名稱已被使用</string>
   <string name="account_status_regis_success">註冊完成</string>
   <string name="account_status_regis_not_sup">伺服器不支持註冊</string>
-  <string name="encryption_choice_none">純文字內容</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="mgmt_account_edit">編輯帳戶</string>
@@ -152,7 +143,6 @@
   <string name="passwords_do_not_match">密碼不一致</string>
   <string name="invalid_jid">該 Jabber ID 無效</string>
   <string name="error_out_of_memory">空間不足，圖片過大</string>
-  <string name="add_phone_book_text">你確定要新增 %s 為聯絡人嗎？</string>
   <string name="contact_status_online">線上</string>
   <string name="contact_status_free_to_chat">目前有空</string>
   <string name="contact_status_away">離開</string>
@@ -163,7 +153,6 @@
   <string name="muc_details_other_members">其他成員</string>
   <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
   <string name="server_info_stream_management">XEP-0198: Stream Management</string>
-  <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
   <string name="server_info_available">支援</string>
   <string name="server_info_unavailable">不支援</string>
   <string name="missing_public_keys">沒有公佈公鑰訊息。</string>
@@ -224,7 +213,6 @@
   <string name="skip">略過</string>
   <string name="disable_notifications">關閉通知</string>
   <string name="disable_notifications_for_this_conversation">關閉該對話消息</string>
-  <string name="notifications_disabled">通知已關閉</string>
   <string name="enable">打開通知</string>
   <string name="conference_requires_password">群組設有密碼</string>
   <string name="enter_password">輸入密碼</string>
@@ -235,12 +223,10 @@
   <string name="sure_delete_fingerprint">你確定刪除該指紋嗎？</string>
   <string name="ignore">忽略</string>
   <string name="without_mutual_presence_updates"><b>警告:</b> 在沒有互相關注狀態訊息的情況下發送或會引起不能預計的問題。\n\n<small>請檢視聯絡人詳情頁面以確認你們的關注狀態。</small></string>
-  <string name="pref_encryption_settings">加密設定</string>
   <string name="pref_force_encryption">強制要求端到端加密</string>
   <string name="pref_force_encryption_summary">總是發送加密訊息 (群組訊息除外)</string>
   <string name="pref_dont_save_encrypted">不儲存加密訊息</string>
   <string name="pref_dont_save_encrypted_summary">警告: 此操作或會導致訊息丟失</string>
-  <string name="pref_expert_options">專家選項</string>
   <string name="pref_expert_options_summary">請小心設定</string>
   <string name="pref_use_larger_font">增加字體大小</string>
   <string name="pref_use_larger_font_summary">讓整個 app 界面使用更大號的字體</string>