auto import from //branches/cupcake/...@130745

1 files changed, 125 insertions, 83 deletions

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 56745bd57..d7c3dea82 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -16,9 +16,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"未知"</string>
-    <string name="device_info_uptime">"正常使用时间"</string>
-    <string name="device_info_awaketime">"唤醒时间"</string>
-    <string name="device_info_asleeptime">"休眠时间"</string>
     <string name="turn_on_radio">"打开收音机"</string>
     <string name="turn_off_radio">"关闭收音机"</string>
     <string name="turn_on_qxdm">"启用 QXDM SD 日志"</string>
@@ -52,14 +49,13 @@
     <string name="radioInfo_lac">"LAC"</string>
     <string name="radioInfo_cid">"CID"</string>
     <string name="sdcard_unmount">"卸下 SD 卡"</string>
+    <!-- no translation found for sdcard_format (362497552060004057) -->
+    <skip />
     <string name="small_font">"小"</string>
     <string name="medium_font">"中"</string>
     <string name="large_font">"大"</string>
     <string name="font_size_save">"确定"</string>
     <string name="sdcard_setting">"SD 卡"</string>
-    <string name="screen_off_timeout_label">"充电时从不待机"</string>
-    <string name="stay_on">"充电时屏幕始终处于开启状态"</string>
-    <string name="app_launcher_newView_text">"新 AppLauncher"</string>
     <string name="battery_info_status_label">"电池状态："</string>
     <string name="battery_info_scale_label">"电池容量："</string>
     <string name="battery_info_level_label">"电池级别："</string>
@@ -87,11 +83,6 @@
     <string name="battery_info_health_over_voltage">"过电压"</string>
     <string name="battery_info_health_unspecified_failure">"未知错误"</string>
     <string name="bluetooth">"蓝牙"</string>
-    <string name="bluetooth_stopping">"蓝牙正在停止..."</string>
-    <string name="bluetooth_disabled">"打开蓝牙"</string>
-    <!-- no translation found for bluetooth_enabled (314506563815464155) -->
-    <skip />
-    <string name="bluetooth_enabling">"正在打开蓝牙..."</string>
     <string name="bluetooth_visibility">"可发现"</string>
     <string name="bluetooth_is_discoverable">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> 秒内可发现..."</string>
     <string name="bluetooth_not_discoverable">"让设备能被搜索到"</string>
@@ -99,7 +90,6 @@
     <string name="bluetooth_device_name">"设备名称"</string>
     <string name="bluetooth_name_not_set">"无名称集，使用帐户名"</string>
     <string name="bluetooth_scan_for_devices">"扫描以找到设备"</string>
-    <string name="bluetooth_clear_list">"清除设备列表"</string>
     <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>会断开连接。"</string>
     <string name="bluetooth_connected">"已连接"</string>
     <string name="bluetooth_disconnected">"已断开连接"</string>
@@ -108,17 +98,9 @@
     <!-- no translation found for bluetooth_unknown (644716244548801421) -->
     <skip />
     <string name="bluetooth_not_connected">"与此设备配对"</string>
-    <string name="bluetooth_failed_to_enable">"无法打开蓝牙"</string>
     <string name="bluetooth_pairing">"正在配对..."</string>
-    <string name="failed_to_pair">"无法与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对。"</string>
-    <string name="failed_to_connect">"无法连接至<xliff:g id="DEVICE_NAME">%1$s</xliff:g>。"</string>
     <string name="bluetooth_paired">"已配对"</string>
-    <string name="bluetooth_paired_not_nearby">"已配对"</string>
     <string name="bluetooth_device">"免持听筒/耳机"</string>
-    <string name="bluetooth_disconnect">"断开连接"</string>
-    <string name="bluetooth_connect">"连接"</string>
-    <string name="bluetooth_unpair">"取消配对"</string>
-    <string name="bluetooth_pair">"配对"</string>
     <string name="progress_scanning">"正在扫描"</string>
     <string name="bluetooth_notif_ticker">"蓝牙配对请求"</string>
     <string name="bluetooth_notif_title">"配对请求"</string>
@@ -136,16 +118,6 @@
     <string name="intent_sender_startactivity_text">"开始 <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>："</string>
     <string name="intent_sender_account_label">"帐户："</string>
-    <string name="keyguard_pw_mod_text">"选择锁定图案"</string>
-    <string name="keyguard_pin_mod_text">"更改 PIN 码"</string>
-    <string name="keyguard_label">"键盘锁"</string>
-    <string name="keyguard_sim_pin_label">"SIM 卡 PIN 码"</string>
-    <string name="keyguard_password_old_password_error_text">"您键入的旧密码不正确。请重试。"</string>
-    <string name="keyguard_password_button_text">"确定"</string>
-    <string name="keyguard_password_confirm_new_label">"确认新密码："</string>
-    <string name="keyguard_password_new_label">"新密码："</string>
-    <string name="keyguard_password_old_label">"旧密码："</string>
-    <string name="keyguard_password_mismatch_error_text">"两个密码不一致。请重新键入。"</string>
     <string name="proxy_clear_text">"清除"</string>
     <string name="proxy_port_label">"端口"</string>
     <string name="proxy_defaultView_text">"恢复默认值"</string>
@@ -188,15 +160,13 @@
     <string name="radio_info_smsc_label">"SMSC："</string>
     <string name="radio_info_smsc_update_label">"更新"</string>
     <string name="radio_info_smsc_refresh_label">"刷新"</string>
+    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
+    <skip />
     <string name="band_mode_title">"设置 GSM/UMTS 波段"</string>
     <string name="band_mode_loading">"正在载入波段列表..."</string>
     <string name="band_mode_set">"设置"</string>
     <string name="band_mode_failed">"失败"</string>
     <string name="band_mode_succeeded">"成功"</string>
-    <string name="ringer_volume_ringer_mode_label">"响铃模式"</string>
-    <string name="ringer_volume_screen_increasing_text">"铃声渐强"</string>
-    <string name="ringer_volume_ringtone_label">"铃声"</string>
-    <string name="ringer_volume_instructions">"使用音量按钮调节振铃音量"</string>
     <string name="sdcard_changes_instructions">"更改会在重新连接 USB 电缆后生效"</string>
     <string name="sdcard_settings_screen_mass_storage_text">"启用 USB 大容量存储"</string>
     <string name="sdcard_settings_total_bytes_label">"字节总数："</string>
@@ -208,20 +178,6 @@
     <string name="sdcard_settings_used_bytes_label">"使用的字节数："</string>
     <string name="sdcard_settings_scanning_status">"正在扫描 SD 卡以获取媒体..."</string>
     <string name="sdcard_settings_read_only_status">"装载的 SD 卡为只读"</string>
-    <string name="sdcard_removal_alert_title">"卸下 SD 卡的操作不安全！"</string>
-    <string name="sdcard_unmountable_alert_title">"SD 卡不可读"</string>
-    <string name="telephony_user_label">"用户："</string>
-    <string name="telephony_server_label">"服务器："</string>
-    <string name="telephony_name_label">"名称："</string>
-    <string name="telephony_mmsc_label">"MMSC："</string>
-    <string name="telephony_apn_label">"APN："</string>
-    <string name="telephony_mcc_label">"MCC："</string>
-    <string name="telephony_port_label">"端口："</string>
-    <string name="telephony_password_label">"密码："</string>
-    <string name="telephony_proxy_label">"代理："</string>
-    <string name="telephony_mnc_label">"MNC："</string>
-    <string name="telephony_mmsproxy_label">"彩信代理："</string>
-    <string name="telephony_mmsport_label">"彩信端口："</string>
     <string name="next_label">"下一步"</string>
     <string name="language_picker_title">"区域"</string>
     <string name="select_your_language">"选择语言"</string>
@@ -264,23 +220,12 @@
     <string name="bluetooth_settings_summary">"管理连接，设置设备名称和可发现性"</string>
     <string name="bluetooth_pin_entry">"蓝牙配对请求"</string>
     <string name="bluetooth_device_info">"蓝牙设备信息"</string>
-    <string name="bluetooth_pairing_msg">"正在配对..."</string>
     <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"键入 PIN 码以配对。"\n"（尝试键入 0000 或 1234。）"</string>
     <string name="bluetooth_error_title">"注意"</string>
     <string name="bluetooth_pairing_error_message">"与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对时出现问题。"</string>
-    <string name="bluetooth_pairing_alternate_error_message">"与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对时出现问题。请尝试使用其他 PIN 码。"</string>
     <string name="bluetooth_pairing_pin_error_message">"与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对时出现问题，因为键入的 PIN 码不正确。"</string>
     <string name="bluetooth_connecting_error_message">"连接至<xliff:g id="DEVICE_NAME">%1$s</xliff:g>时出现问题。"</string>
-    <string name="bluetooth_new_data">"键入新数据"</string>
-    <string name="bluetooth_new_data_confirm">"确定"</string>
-    <string name="bluetooth_new_data_cancel">"取消"</string>
-    <string name="bluetooth_scan_for_new_devices">"正在扫描以找到新设备..."</string>
-    <string name="bluetooth_discoverability_panel_title">"让我..."</string>
-    <string name="bluetooth_discoverable">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> 秒内可发现"</string>
-    <string name="bluetooth_connectable">"只可连接"</string>
-    <string name="bluetooth_neither">"既不可发现也不可连接"</string>
     <string name="bluetooth_preference_scan_title">"扫描以找到设备"</string>
-    <string name="bluetooth_preference_scan_summary">"查找要配对的设备"</string>
     <string name="bluetooth_device_context_connect">"连接"</string>
     <string name="bluetooth_device_context_disconnect">"断开连接"</string>
     <string name="bluetooth_device_context_pair_connect">"配对和连接"</string>
@@ -420,32 +365,24 @@
     <string name="sound_effects_enable_title">"操作音选择"</string>
     <string name="sound_effects_enable_summary_on">"进行屏幕选择时发出声音"</string>
     <string name="sound_effects_enable_summary_off">"进行屏幕选择时发出声音"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_title (1008791464029179529) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (426729807044947187) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (803791141563778934) -->
+    <skip />
     <string name="sync_settings">"数据同步"</string>
     <string name="sync_settings_summary">"选择同步哪些应用程序"</string>
-    <string name="sync_settings_header_general_settings">"常规同步设置"</string>
-    <string name="sync_settings_header_application_settings">"应用程序同步设置"</string>
-    <string name="sync_too_many_deletes">"超出了删除限制"</string>
-    <string name="sync_automatically">"自动同步"</string>
-    <string name="sync_enabled">"自动同步数据"</string>
-    <string name="sync_disabled">"选择以自动同步数据"</string>
-    <string name="sync_menu_sync_now">"立即同步"</string>
-    <string name="sync_menu_sync_cancel">"取消同步"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"日历"</string>
-    <string name="sync_contacts">"联系人"</string>
-    <string name="sync_too_many_deletes_desc">"对于<xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>、帐户 <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>，有 <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> 个删除的项目。您希望执行什么操作？"</string>
-    <string name="sync_really_delete">"删除这些项目。"</string>
-    <string name="sync_undo_deletes">"撤消删除操作。"</string>
-    <string name="sync_do_nothing">"现在什么都不做。"</string>
-    <string name="sync_is_failing">"同步操作当前遇到了一些问题，很快便可恢复。"</string>
-    <string name="sync_plug"><font fgcolor="#ffffffff">"欢迎使用 Google Sync！"</font>\n"这是一种同步数据以允许您从任何位置访问您的联系人、约会以及更多信息的 Google 方法。"</string>
     <string name="display_settings">"显示设置"</string>
     <string name="animations_title">"动画"</string>
     <string name="animations_summary_on">"打开/关闭窗口时显示动画"</string>
     <string name="animations_summary_off">"打开/关闭窗口时显示动画"</string>
     <string name="brightness">"亮度"</string>
+    <!-- no translation found for brightness_summary (838917350127550703) -->
+    <skip />
     <string name="screen_timeout">"屏幕待机"</string>
-    <string name="dim_screen">"屏幕变暗"</string>
+    <!-- no translation found for screen_timeout_summary (2905757633140605334) -->
+    <skip />
     <string name="sim_lock_settings">"SIM 卡锁定设置"</string>
     <string name="sim_lock_settings_category">"设置 SIM 卡锁定"</string>
     <string name="sim_lock_settings_title">"SIM 卡锁定"</string>
@@ -493,13 +430,24 @@
     <string name="status_wifi_mac_address">"Wi-Fi MAC 地址"</string>
     <string name="status_bt_address">"蓝牙地址"</string>
     <string name="status_unavailable">"不可用"</string>
+    <!-- no translation found for status_network_traffic_stats (2089739529980224804) -->
+    <skip />
+    <!-- no translation found for status_network_traffic_summary (1456797220417923108) -->
+    <skip />
     <string name="status_up_time">"正常使用时间"</string>
     <string name="status_awake_time">"唤醒时间"</string>
     <string name="internal_memory">"手机内部存储"</string>
     <string name="sd_memory">"SD 卡"</string>
     <string name="memory_available">"可用的空间"</string>
     <string name="memory_size">"空间总量"</string>
-    <string name="sd_eject">"卸下/弹出 SD 卡"</string>
+    <!-- no translation found for sd_eject (6915293408836853020) -->
+    <skip />
+    <!-- no translation found for sd_eject_summary (3315557796211542962) -->
+    <skip />
+    <!-- no translation found for sd_format (5448738337382712203) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (6616491027883134004) -->
+    <skip />
     <string name="sd_unavailable">"不可用"</string>
     <string name="read_only">"（只读）"</string>
     <string name="battery_status_title">"电池状态"</string>
@@ -538,6 +486,22 @@
     <string name="master_clear_gesture_prompt">"绘制解锁图案"</string>
     <string name="master_clear_gesture_explanation">"您必须绘制解锁图案才能确认手机重设。"</string>
     <string name="master_clear_failed">"未执行重设，因为 System Clear 服务不可用。"</string>
+    <!-- no translation found for media_format_title (4671276096695789895) -->
+    <skip />
+    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <skip />
+    <!-- no translation found for media_format_desc (1142563222357820834) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (370856400090190151) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (1776666694910717198) -->
+    <skip />
+    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_prompt (3109349468816856670) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_explanation (4239529439389660159) -->
+    <skip />
     <string name="call_settings_title">"通话设置"</string>
     <string name="call_settings_summary">"设置语音信箱、呼叫转移、呼叫等待、呼叫者 ID"</string>
     <string name="network_settings_title">"移动网络"</string>
@@ -591,17 +555,25 @@
     <string name="lock_example_title">"示例图案"</string>
     <string name="lock_example_message">"连接至少四个点。"\n\n"准备好绘制自己的图案后选择“下一步”。"</string>
     <string name="manageapplications_settings_title">"管理应用程序"</string>
+    <!-- no translation found for manageapplications_settings_summary (6097117021500651232) -->
+    <skip />
     <string name="applications_settings">"应用程序"</string>
     <string name="applications_settings_summary">"管理应用程序，设置快速启动快捷键"</string>
     <string name="applications_settings_header">"应用程序设置"</string>
     <string name="install_applications">"未知源"</string>
     <string name="install_unknown_applications">"允许安装非市场应用程序"</string>
     <string name="install_all_warning">"您的手机和个人数据很容易受到来自未知源的应用程序的攻击。您同意单方面承担由于使用这些应用程序而可能对您的手机造成的任何损坏或数据丢失的责任。"</string>
-    <string name="manage_applications_title">"管理应用程序"</string>
     <string name="application_info_label">"应用程序信息"</string>
     <string name="storage_label">"存储"</string>
     <string name="auto_launch_label">"默认情况下启动"</string>
     <string name="permissions_label">"权限"</string>
+    <string name="cache_header_label">"缓存"</string>
+    <string name="clear_cache_btn_text">"清除缓存"</string>
+    <string name="cache_size_label">"缓存"</string>
+    <!-- no translation found for controls_label (7611113077086853799) -->
+    <skip />
+    <!-- no translation found for force_stop (7435006169872876756) -->
+    <skip />
     <string name="total_size_label">"总量"</string>
     <string name="application_size_label">"应用程序"</string>
     <string name="data_size_label">"数据"</string>
@@ -614,6 +586,10 @@
     <string name="sort_order_alpha">"排序"</string>
     <string name="sort_order_size">"按大小排序"</string>
     <string name="manage_space_text">"管理空间"</string>
+    <!-- no translation found for filter (2018011724373033887) -->
+    <skip />
+    <!-- no translation found for filter_dlg_title (6507663329723966854) -->
+    <skip />
     <string name="filter_apps_all">"全部"</string>
     <string name="filter_apps_third_party">"第三方"</string>
     <string name="filter_apps_running">"正在运行"</string>
@@ -627,22 +603,24 @@
     <string name="app_not_found_dlg_text">"未在已安装的应用程序的列表中找到该应用程序。"</string>
     <string name="clear_data_failed">"无法清除应用程序数据。"</string>
     <string name="security_settings_desc">"此应用程序可访问您手机上的以下内容："</string>
-    <string name="computing_size">"仍在计算..."</string>
+    <!-- no translation found for computing_size (1599186977475211186) -->
+    <skip />
     <string name="invalid_size_value">"无法计算包大小"</string>
     <string name="empty_list_msg">"您尚未安装任何第三方应用程序。"</string>
-    <string name="cache_header_label">"缓存"</string>
-    <string name="clear_cache_btn_text">"清除缓存"</string>
-    <string name="cache_size_label">"缓存"</string>
     <string name="language_settings">"区域和文本"</string>
     <string name="language_settings_summary">"设置区域（语言和区域）、文本输入和自动纠错选项"</string>
     <string name="language_category">"区域设置"</string>
     <string name="text_category">"文本设置"</string>
     <string name="phone_language">"选择区域"</string>
+    <!-- no translation found for phone_language_summary (1809580675831352352) -->
+    <skip />
     <string name="auto_replace">"自动替换"</string>
     <string name="auto_replace_summary">"纠正错误键入的词"</string>
     <string name="auto_caps">"自动大写"</string>
     <string name="auto_caps_summary">"将句子中的首字母大写"</string>
     <string name="auto_punctuate">"自动加标点"</string>
+    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
+    <skip />
     <string name="auto_punctuate_summary">"按两次空格键来插入“。”"</string>
     <string name="show_password">"可见的密码"</string>
     <string name="show_password_summary">"键入时显示密码"</string>
@@ -690,4 +668,68 @@
     <string name="keep_screen_on_summary">"充电时屏幕不会休眠"</string>
     <string name="allow_mock_location">"允许模仿位置"</string>
     <string name="allow_mock_location_summary">"允许模仿位置"</string>
+    <!-- no translation found for battery_history_known_apps (6907374478255786240) -->
+    <skip />
+    <!-- no translation found for gadget_picker_title (4335873961457985189) -->
+    <skip />
+    <!-- no translation found for battery_history_details_for (5189636461798594740) -->
+    <skip />
+    <!-- no translation found for battery_history_uid (1016606150528436298) -->
+    <skip />
+    <!-- no translation found for battery_history_network_usage (8010852371665217020) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_received (980307569180518302) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_sent (2501748768602119159) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_total (4444807574361642753) -->
+    <skip />
+    <!-- no translation found for battery_history_cpu_usage (2597353713014790877) -->
+    <skip />
+    <!-- no translation found for battery_history_user_time (6227507614894791359) -->
+    <skip />
+    <!-- no translation found for battery_history_system_time (2015862072724507547) -->
+    <skip />
+    <!-- no translation found for battery_history_total_time (3618703970098556104) -->
+    <skip />
+    <!-- no translation found for battery_history_starts (9137453931978571696) -->
+    <skip />
+    <!-- no translation found for battery_history_days (6387593985264923377) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (2593055276272350197) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (5608990219891318138) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (7397664460929461350) -->
+    <skip />
+    <!-- no translation found for battery_history_packages_sharing_this_uid (4101596071379250050) -->
+    <skip />
+    <!-- no translation found for battery_history_no_data (1177238743237067617) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor (2333488996028993982) -->
+    <skip />
+    <!-- no translation found for battery_history_used_by_packages (3000711380023436470) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage (3593133338613209024) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage_multi (4536084375991014508) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on (1377240025275657277) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_battery (536058210445081888) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_plugged (5019127390021871260) -->
+    <skip />
+    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <skip />
+    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <skip />
+    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <skip />
+    <!-- no translation found for app_name_label (2000949925256858308) -->
+    <skip />
+    <!-- no translation found for launch_count_label (4019444833263957024) -->
+    <skip />
+    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <skip />
 </resources>