Updated translations

// FREEBIE

res/values-zh-rCN/strings.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">TextSecure</string>
+  <string name="app_name">暗号</string>
   <string name="yes">是</string>
   <string name="no">否</string>
   <string name="delete">删除</string>
@@ -17,16 +17,16 @@
 为信息禁用锁屏？</string>
   <string name="ApplicationPreferencesActivity_disable">禁用</string>
   <string name="ApplicationPreferencesActivity_unregistering">反注册</string>
-  <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">正在反注册来自 TextSecure 的信息...</string>
-  <string name="ApplicationPreferencesActivity_disable_textsecure_messages">禁用 TextSecure 信息？</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages">
-通过反注册，您将会禁用在当前服务器的 TextSecure 信息。
-您将会需要重新注册您的手机号码以便使用 TextSecure 信息的功能。</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages">来自未注册的暗号信息...</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages">禁用暗号信息？</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_signal_messages">
+这将会从服务器上注销您的暗号信息并禁用。
+您在未来如果还想使用该功能，则需要再次注册。</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">连接服务器错误！</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">已开启短信</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">点击来改变默认的短信应用</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">已禁用短信</string>
-  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">点击将TextSecure设定为默认的短信应用</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app">触击以将暗号标记为默认的短信应用</string>
   <string name="ApplicationPreferencesActivity_on">开</string>
   <string name="ApplicationPreferencesActivity_On">开</string>
   <string name="ApplicationPreferencesActivity_off">关</string>
@@ -49,7 +49,9 @@
   <!--BlockedContactsActivity-->
   <string name="BlockedContactsActivity_blocked_contacts">已屏蔽的联系人</string>
   <!--ConfirmIdentityDialog-->
-  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">%1$s 的身份密钥已经改变，这可能是有人正在尝试拦截您的通信，或 %2$s 只是重新安装了 TextSecure ，并且获得了一个新的身份密钥。</string>
+  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">当前 %1$s 的身份密钥已经改变。
+这可能是由于有人尝试破解您和对方的通信，
+也可能是有 %2$s 重装了暗号然后生成了新的身份密钥。</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">您可能希望验证
 这个联系人。</string>
   <string name="ConfirmIdentityDialog_accept">接受</string>
@@ -68,7 +70,6 @@
   <string name="ConversationItem_click_to_approve_unencrypted">点击退回不安全的通信</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">退回未加密的短信？</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">退回到未加密的彩信？</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">这条信息将<b>不会</b>被加密，因为对方已经不再是 TextSecure 用户了。\n\n发送不加密的信息？</string>
   <string name="ConversationItem_unable_to_open_media">无法找到能打开该媒体的应用。</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">发起安全会话？</string>
@@ -99,7 +100,7 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">您确定想要离开此群组？</string>
   <string name="ConversationActivity_transport_insecure_sms">不安全的短信</string>
   <string name="ConversationActivity_transport_insecure_mms">不安全的彩信</string>
-  <string name="ConversationActivity_transport_textsecure">TextSecure</string>
+  <string name="ConversationActivity_transport_signal">信号</string>
   <string name="ConversationActivity_get_with_it">已获得： %s</string>
   <string name="ConversationActivity_lets_use_this_to_chat">让我们使用这个来聊天：%s</string>
   <string name="ConversationActivity_error_leaving_group">离开群组时遇到错误…</string>
@@ -124,7 +125,6 @@
   <string name="ConversationFragment_saving_attachment">正在保存附件</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">正在保存附件到存储…</string>
   <string name="ConversationFragment_pending">待定…</string>
-  <string name="ConversationFragment_push">数据（TextSecure）</string>
   <string name="ConversationFragment_mms">彩信</string>
   <string name="ConversationFragment_sms">短信</string>
   <string name="ConversationFragment_deleting">删除中</string>
@@ -159,10 +159,10 @@
   <string name="DeviceListItem_last_active_s">最后活动  %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">共享给</string>
+  <!--ExperienceUpgradeActivity-->
   <!--ExportFragment-->
   <string name="ExportFragment_export">导出</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">导出明文到SD卡？</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">警告：这会将您的TextSecure信息以明文的方式导出到SD卡上。</string>
   <string name="ExportFragment_cancel">取消</string>
   <string name="ExportFragment_exporting">正在导出</string>
   <string name="ExportFragment_exporting_plaintext_to_sd_card">正在导出明文到 SD 卡…</string>
@@ -170,15 +170,11 @@
   <string name="ExportFragment_error_while_writing_to_sd_card">在写入 SD 卡时遇到错误。</string>
   <string name="ExportFragment_success">成功！</string>
   <!--GcmRefreshJob-->
-  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">TextSecure 持续连接失效！</string>
-  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure 无法在 Google Play 服务中注册。通过数据通信通道已被禁用，请尝试在 TextSecure 的设置菜单中重新注册。</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">新群组</string>
   <string name="GroupCreateActivity_actionbar_update_title">更新群组</string>
   <string name="GroupCreateActivity_group_name_hint">群组名称</string>
   <string name="GroupCreateActivity_actionbar_mms_title">新彩信群组</string>
-  <string name="GroupCreateActivity_contacts_dont_support_push">您所选择的联系人并不支持TextSecure群组，该群组将转化为彩信群组。</string>
-  <string name="GroupCreateActivity_you_dont_support_push">您没有注册使用数据信道，TextSecure群组功能将被禁用。</string>
   <string name="GroupCreateActivity_contacts_mms_exception">发生不可预料的错误导致创建群组失败。</string>
   <string name="GroupCreateActivity_contacts_no_members">群组中至少要有一个人！</string>
   <string name="GroupCreateActivity_contacts_invalid_number">目前无法正确获取您组内一名成员的信息，请尝试修复或移除这名联系人以重试。</string>
@@ -186,7 +182,6 @@
   <string name="GroupCreateActivity_menu_create_title">创建群组</string>
   <string name="GroupCreateActivity_creating_group">正在创建群组 %1$s…</string>
   <string name="GroupCreateActivity_updating_group">更新中… %1$s</string>
-  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">无法添加非TextSecure联系人到现存的TextSecure群组</string>
   <string name="GroupCreateActivity_loading_group_details">读取群组详情…</string>
   <!--GroupMembersDialog-->
   <string name="GroupMembersDialog_me">我</string>
@@ -195,11 +190,9 @@
   <string name="ImportExportActivity_export">导出</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">导入系统短信数据库？</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">系统默认的短信数据库将会被导入TextSecure，如果您已经进行过导入的操作，本次操作可能会导致出现重复的短信。</string>
   <string name="ImportFragment_import">导入</string>
   <string name="ImportFragment_cancel">取消</string>
   <string name="ImportFragment_restore_encrypted_backup">恢复加密备份？</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">恢复加密的备份将会完全替代当前的密钥，选项以及短信。您会丢失当前存储于TextSecure的一切，但是已经备份的内容不会被替换。</string>
   <string name="ImportFragment_restore">还原</string>
   <string name="ImportFragment_import_plaintext_backup">导入明文备份？</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">这将会导入
@@ -217,7 +210,6 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">没有扫描到密钥！</string>
   <string name="KeyScanningActivity_install_barcode_Scanner">安装条码扫描器？</string>
-  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">TextSecure需要条码扫描器来扫描QR条码。</string>
   <!--MessageDetailsRecipient-->
   <string name="MessageDetailsRecipient_failed_to_send">发送失败</string>
   <string name="MessageDetailsRecipient_new_identity">新身份</string>
@@ -225,10 +217,10 @@
   <string name="MmsDownloader_error_storing_mms">存储彩信错误！</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">连接彩信服务器错误…</string>
   <string name="MmsDownloader_error_reading_mms_settings">在读取彩信服务器设置时遇到错误…</string>
+  <!--- NotificationBarManager-->
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">多媒体信息</string>
   <!--MessageRecord-->
-  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">此消息经由旧版本的协议加密，并且已经不再受支持。请要求发送者升级至最新版本的TextSecure，并重新发送这条信息。</string>
   <string name="MessageRecord_left_group">您已经离开了此群组。</string>
   <string name="MessageRecord_updated_group">已更新群组。</string>
   <!--PassphraseChangeActivity-->
@@ -253,7 +245,6 @@
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">抱歉，您已经连接了太多的设备，请先移除一些…</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">输入密钥</string>
-  <string name="PassphrasePromptActivity_watermark_content_description">TextSecure 图标</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">提交密钥</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">不真实的密钥！</string>
   <!--PlayServicesProblemFragment-->
@@ -273,8 +264,8 @@
   <string name="RecipientPreferenceActivity_unblock">解除屏蔽</string>
   <string name="RecipientPreferenceActivity_enabled">启用</string>
   <string name="RecipientPreferenceActivity_disabled">禁用</string>
+  <!--RedPhone-->
   <!--RegistrationActivity-->
-  <string name="RegistrationActivity_connect_with_textsecure">通过TextSecure连接</string>
   <string name="RegistrationActivity_select_your_country">选择您的国家</string>
   <string name="RegistrationActivity_you_must_specify_your_country_code">您必须指定您的
 国家代码</string>
@@ -314,12 +305,9 @@
   <string name="RegistrationProgressActivity_too_many_requests">太多请求！</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">近期您已经请求了一个语音呼叫，等待20分钟后才能再次请求。</string>
   <string name="RegistrationProgressActivity_registration_conflict">注册冲突</string>
-  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">该号码已经在另一个不同的 TextSecure 服务器上注册(CyanogenMod?)，您必须在其他地方反注册后才能在此处注册。</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">注册已完成</string>
-  <string name="RegistrationService_textsecure_registration_has_successfully_completed">已经成功完成TextSecure注册。</string>
   <string name="RegistrationService_registration_error">注册出现错误</string>
-  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure注册出错。</string>
   <!--Slide-->
   <string name="Slide_image">图片</string>
   <string name="Slide_audio">音频</string>
@@ -386,9 +374,6 @@
   <string name="ApplicationMigrationService_import_in_progress">正在导入数据</string>
   <string name="ApplicationMigrationService_importing_text_messages">正在导入文本信息</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">轻触以开启。</string>
-  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">轻触以开启，或点击锁定以关闭。</string>
-  <string name="KeyCachingService_passphrase_cached">TextSecure 已解锁</string>
   <string name="KeyCachingService_lock">使用密码锁定</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d 新信息是在 %2$d 中的会话</string>
@@ -404,10 +389,8 @@
   <string name="MessageNotifier_media_message">媒体信息</string>
   <string name="MessageNotifier_reply">回复</string>
   <!--QuickResponseService-->
-  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">当 TextSecure 处于锁定状态时，快速回复不可用！</string>
   <string name="QuickResponseService_problem_sending_message">发送信息时遇到问题！</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">新 TextSecure 信息</string>
   <string name="SingleRecipientNotificationBuilder_contents_hidden">内容隐藏</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">旧密码：</string>
@@ -429,7 +412,6 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">会话已静音</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">发送 TextSecure 信息</string>
   <string name="conversation_activity__type_message_sms_insecure">发送未加密的短信</string>
   <string name="conversation_activity__type_message_mms_insecure">发送未加密的彩信</string>
   <string name="conversation_activity__send">发送</string>
@@ -461,13 +443,13 @@
   <string name="country_selection_fragment__search">搜索</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">没有连接的设备...</string>
+  <!--experience_upgrade_activity-->
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">无法获取您设备上的日志，不过您仍然可以以ADB方式来获得您的调试日志。</string>
   <string name="log_submit_activity__thanks">感谢！</string>
   <string name="log_submit_activity__submitting">正在提交</string>
   <string name="log_submit_activity__posting_logs">正在将日志发布到 gist …</string>
   <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">您希望将目前已经存在的短信导入至TextSecure的加密数据库吗？</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">默认的系统数据库将不会被修改或改变。</string>
   <string name="database_migration_activity__skip">略过</string>
   <string name="database_migration_activity__import">导入</string>
@@ -481,7 +463,6 @@
   <string name="import_fragment__import_system_sms_database">导入系统短信数据库</string>
   <string name="import_fragment__import_the_database_from_the_default_system">从系统默认的短信应用中导入数据库。</string>
   <string name="import_fragment__import_encrypted_backup">导入已加密的备份</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">还原之前导出的TextSecure加密备份。</string>
   <string name="import_fragment__import_plaintext_backup">导入明文备份</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 导入明文备份文件，与\"SMSBackup And Restore\"软件兼容。</string>
@@ -504,21 +485,18 @@
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">解锁</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure需要通过运营商获取您的彩信设置才能接受彩信或组播信息，但是您的设备没有这些信息，可能是由于设备被锁定或者访问受到限制。</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">想发送多媒体和组播信息，需点击“好”来完成所需的设置。您可以通过搜索“您的运营商 APN”（如百度／谷歌：中国移动 APN）来获取这些信息。通常，您只需要设置一次。</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">已屏蔽</string>
   <!--recipient_preferences-->
   <string name="recipient_preferences__mute_conversation">静音会话</string>
   <string name="recipient_preferences__disable_notifications_for_this_conversation">禁用此会话的通知</string>
-  <string name="recipient_preferences__ringtone">铃声</string>
   <string name="recipient_preferences__vibrate">振动</string>
   <string name="recipient_preferences__block">屏蔽</string>
   <string name="recipient_preferences__color">颜色</string>
   <string name="recipient_preferences__color_for_this_contact">此联系人的颜色</string>
+  <!--- redphone_call_controls-->
   <!--registration_activity-->
-  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
-通过验证您的手机号码来连接到 TextSecure 。</string>
   <string name="registration_activity__your_country">国家或地区</string>
   <string name="registration_activity__your_country_code_and_phone_number">您的国家代码和
 电话号码</string>
@@ -530,51 +508,29 @@
   <string name="registration_problems__some_possible_problems_include">可能的问题
 包括：</string>
   <string name="registration_problems__sms_interceptors">短信拦截</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
-一些第三方的短信客户端，比如Handcent或GoSMS表现糟糕，
-并会拦截所收到的短信。检查你是否收到以
-“Your TextSecure verification code:”或“您的TextSecure验证码”开头的短信。如果有，你要更改
-这些第三方短信客户端设置以便让验证码通过。</string>
   <string name="registration_problems__incorrect_number">不正确的号码。</string>
   <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
 请检查并确定您输入的号码是正确的，并且它的格式
 符合您所在
 的地区。</string>
   <string name="registration_problems__google_voice">Google 语音。</string>
-  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
-TextSecure无法使用Google语音号码。</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">语音验证</string>
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
-Verification也可以通过拨打您的电话号码来进行验证。点击“呼叫我”并在下方输入您所听到的
-四位数字代码。</string>
   <string name="registration_progress_activity__verify">验证</string>
   <string name="registration_progress_activity__call_me">呼叫我</string>
   <string name="registration_progress_activity__edit_number">编辑号码</string>
   <string name="registration_progress_activity__connectivity_error">连接错误。</string>
-  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">
-TextSecure无法连接推送服务器。</string>
   <string name="registration_progress_activity__some_possible_problems_include">一些可能的问题
 包括：</string>
   <string name="registration_progress_activity__no_network_connectivity">无网络
 连接。</string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">您的
-设备需要可用的网络连接来使用TextSecure的功能。请检查并确保
-当前已经连接到3G或Wi-Fi。</string>
   <string name="registration_progress_activity__restrictive_firewall">受限防火墙。</string>
-  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
-如果您通过Wi-Fi连接，可能是防火墙屏蔽了到
-TextSecure服务器的连接，请尝试其他的网络或使用移动数据。</string>
-  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
-TextSecure将会通过短信自动验证您的手机号码。</string>
   <string name="registration_progress_activity__connecting">连接中……</string>
   <string name="registration_progress_activity__waiting_for_sms_verification">等待短信
 验证…</string>
   <string name="registration_progress_activity__registering_with_server">正在服务器上注册…</string>
   <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">这需要一些时间，
 请保持耐心，验证结束后会通知您。</string>
-  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
-TextSecure 在等待短信验证时超时。</string>
   <string name="registration_progress_activity__sms_verification_failed">短信验证
 失败。</string>
   <string name="registration_progress_activity__generating_keys">正在生成密钥…</string>
@@ -599,7 +555,6 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="AndroidManifest__create_passphrase">创建口令</string>
   <string name="AndroidManifest__enter_passphrase">输入密钥</string>
   <string name="AndroidManifest__select_contacts">选择联系人</string>
-  <string name="AndroidManifest__textsecure_detected">已检测到TextSecure</string>
   <string name="AndroidManifest__public_identity_key">身份公钥</string>
   <string name="AndroidManifest__change_passphrase"> 修改密码</string>
   <string name="AndroidManifest__verify_identity">验证身份</string>
@@ -636,8 +591,6 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="preferences__sms_mms">短信和彩信</string>
   <string name="preferences__pref_all_sms_title">获得所有的短信</string>
   <string name="preferences__pref_all_mms_title">获得所有的彩信</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">使用 TextSecure 来接收所有短信</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">使用 TextSecure 来接收所有彩信</string>
   <string name="preferences__input_settings">输入设置</string>
   <string name="preferences__enable_enter_key_title">开启进入密钥</string>
   <string name="preferences__replace_smiley_with_enter_key">使用输入的密钥替换相似的密钥</string>
@@ -722,9 +675,7 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="preferences__default">默认</string>
   <string name="preferences__language">语言</string>
   <string name="preferences__language_summary">语言 %s</string>
-  <string name="preferences__textsecure_messages">TextSecure 信息</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-免费的私密短信至 TextSecure 和单个用户</string>
+  <string name="preferences__signal">暗号</string>
   <string name="preferences__submit_debug_log">提交调试日志</string>
   <string name="preferences__support_wifi_calling">“Wifi呼叫”兼容模式</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">如果您的设备使用WiFi发送彩信或短信，请启用此选项(仅当\"WiFi 语音呼叫\"在您的设备上启用时才可用)</string>
@@ -736,21 +687,19 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="preferences_chats__media_auto_download">媒体自动下载</string>
   <string name="preferences_chats__message_trimming">信息整理</string>
   <string name="preferences_advanced__use_system_emoji">使用系统表情符号</string>
-  <string name="preferences_advanced__disable_textsecures_built_in_emoji_support">禁用 TextSecure 的内置表情支持</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
   <!--contact_selection_list-->
   <string name="contact_selection_list__menu_select_all">全选</string>
   <string name="contact_selection_list__menu_unselect_all">全部取消选择</string>
-  <string name="contact_selection_list__header_textsecure_users">TEXTSECURE 用户</string>
   <string name="contact_selection_list__header_other">所有联系人</string>
   <string name="contact_selection_list__unknown_contact">新信息至…</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">已完成</string>
   <!--refreshing push directory from menu-->
   <string name="push_directory__menu_refresh">刷新联系人列表</string>
-  <!--conversation_callable-->
+  <!--conversation_callable_insecure-->
   <string name="conversation_callable__menu_call">呼叫</string>
   <!--conversation_context-->
   <string name="conversation_context__menu_message_details">信息详情</string>
@@ -778,7 +727,6 @@ TextSecure 在等待短信验证时超时。</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">安全性</string>
   <string name="conversation_secure_verified__menu_verify_identity">验证身份</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">结束安全会话</string>
   <!--conversation_muted-->
   <string name="conversation_muted__unmute">解除静音</string>
   <!--conversation_unmuted-->
@@ -792,7 +740,7 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="conversation__menu_conversation_settings">会话设置</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">展开弹窗</string>
-  <!--conversation_callable-->
+  <!--conversation_callable_insecure-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">添加到联系人</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">接收人列表</string>
@@ -810,13 +758,10 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="text_secure_normal__menu_clear_passphrase">锁定</string>
   <string name="text_secure_normal__mark_all_as_read">全部标记为已读</string>
   <!--reminder_header-->
-  <string name="reminder_header_expired_build">您正在使用的 TextSecure 已经过期！</string>
   <string name="reminder_header_expired_build_details">您的信息已经长时间没有成功发送了，请更新到最新版本。</string>
   <string name="reminder_header_sms_default_title">使用默认的SMS应用程序？</string>
-  <string name="reminder_header_sms_default_text">点击来将 TextSecure 设定为默认的短信应用</string>
   <string name="reminder_header_sms_import_title">导入系统短信？</string>
   <string name="reminder_header_sms_import_text">点击将手机中的短信息复制到 TextSecure 的加密的数据库中。</string>
-  <string name="reminder_header_push_title">启用 TextSecure 信息？</string>
   <string name="reminder_header_push_text">点击以顷刻投递，私密存储，并且没有短信费用。</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">您</string>
@@ -826,13 +771,12 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="media_preview__save_title">保存</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">图片预览</string>
+  <!--redphone_audio_popup_menu-->
   <!--Trimmer-->
   <string name="trimmer__deleting">正在删除</string>
   <string name="trimmer__deleting_old_messages">正在删除旧信息…</string>
   <string name="trimmer__old_messages_successfully_deleted">旧信息已被成功删除。</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">传输图标</string>
-  <!--quick_attachment_drawer-->
-  <string name="quick_camera_unavailable">摄像头不可用</string>
   <!--EOF-->
 </resources>