Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Settings into cm-13.0

Android 6.0.1 release 22

Change-Id: Ided010bc125199d47ca59d10f0ed5032a26632ff

1 files changed, 8 insertions, 4 deletions

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index c955812..e18d72b 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1802,7 +1802,7 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"Android 作業系統"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"媒體伺服器"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"應用程式最佳化"</string>
-    <string name="battery_saver" msgid="1426682272004907982">"節約耗電量"</string>
+    <string name="battery_saver" msgid="1426682272004907982">"省電模式"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"自動開啟"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"永遠不要"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"電量為 %1$s 時"</string>
@@ -2516,6 +2516,7 @@
     <string name="keywords_default_apps" msgid="3581727483175522599">"應用程式 預設"</string>
     <string name="keywords_ignore_optimizations" msgid="946516741848647905">"忽略 最佳化設定 休眠 應用程式待命"</string>
     <string name="keywords_color_mode" msgid="4670570451841540200">"鮮活 rgb srgb 色彩 自然 標準"</string>
+    <string name="keywords_color_temperature" msgid="2688947724153266364">"色溫 D65 D73 白色 黃色 藍色 暖 冷"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"滑動 密碼 圖形 PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 Wi-Fi NFC 標記"</string>
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
@@ -2553,10 +2554,10 @@
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"撥號鍵盤音效"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"螢幕鎖定音效"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"充電音效"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"固定音效"</string>
+    <string name="docking_sounds_title" msgid="155236288949940607">"座架插入音效"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"觸控音效"</string>
     <string name="vibrate_on_touch_title" msgid="674710566941697253">"觸控時震動"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"固定喇叭播放音效"</string>
+    <string name="dock_audio_media_title" msgid="1346838179626123900">"座架喇叭播放音效"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"所有音訊"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"僅限媒體音訊"</string>
     <string name="emergency_tone_silent" msgid="1067515631635824291">"靜音"</string>
@@ -2813,7 +2814,7 @@
     <string name="system_ui_settings" msgid="579824306467081123">"顯示 SystemUI 調整精靈"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"其他權限"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"還有 <xliff:g id="COUNT">%1$d</xliff:g> 項"</string>
-    <string name="usb_use_charging_only" msgid="167707234832117768">"充電中"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"充電"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"僅為這個裝置充電"</string>
     <string name="usb_use_power_only" msgid="6304554004177083963">"電源"</string>
     <string name="usb_use_power_only_desc" msgid="708134382305728112">"為其他連接的裝置充電"</string>
@@ -2904,4 +2905,7 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"螢幕色彩模式"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"使用 sRGB"</string>
+    <string name="color_temperature" msgid="2070126836910615605">"冷色溫"</string>
+    <string name="color_temperature_desc" msgid="4793729830226404052">"使用較冷的顯示器色溫"</string>
+    <string name="color_temperature_toast" msgid="4974218172133854827">"如要套用色溫變更設定，請關閉螢幕"</string>
 </resources>