commit bc6017cce25fcbec49008c7a90e66a208664f6b6
author Brad Ebinger <breadley@google.com> Mon Apr 25 21:14:42 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 25 21:14:42 2016 +0000
tree e3d56432650acccd1dd7e7f475f90a95b5e16d20
parent d3c04a9afbe80d761b28e4fd1488898e54e65c34
parent 707f5e8d2f66131ff9b811eaaa6e262d0fab92d7

Merge "Check Phone\'s ServiceState to see if it accepts Emergency Calls" into nyc-dev
am: 707f5e8

* commit '707f5e8d2f66131ff9b811eaaa6e262d0fab92d7':
  Check Phone's ServiceState to see if it accepts Emergency Calls

Change-Id: Iee57d09ca46fdea663ec481092f4ff5955a45c8c

res/values-zh-rTW/strings.xml

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d49a0a6..b054110 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -559,7 +559,7 @@
     <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"協助工具"</string>
     <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Wi-Fi 來電"</string>
     <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi 通話"</string>
-    <string name="emergency_action_launch_hint" msgid="4906759256275562674">"再次輕觸即可開啟"</string>
+    <string name="emergency_action_launch_hint" msgid="4906759256275562674">"再次輕按即可開啟"</string>
     <string name="message_decode_error" msgid="3456481534066924855">"為郵件解碼時發生錯誤。"</string>
     <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM 卡已啟用您的服務並更新了手機的漫遊功能。"</string>
     <string name="callFailed_cdma_call_limit" msgid="1556916577171457086">"進行中的通話過多。請先結束或合併現有通話，再撥打新的電話。"</string>