resolved conflicts for merge of 1bc128fd to master

[android-x86/packages-apps-DeskClock.git] / res / values-zh-rTW / strings.xml

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 04b08fe..027aa1e 100644 (file)
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -18,59 +18,34 @@
     <string name="app_label">"鬧鐘"</string>
     <string name="add_alarm">"新增鬧鐘"</string>
     <string name="delete_alarm">"刪除鬧鐘"</string>
-    <string name="delete_alarm_confirm">"å°\87å\88ªé\99¤æ­¤é¬§é\90\98ã\80\82"</string>
+    <string name="delete_alarm_confirm">"å\88ªé\99¤æ­¤é¬§é\90\98ï¼\9f"</string>
     <string name="show_clock">"顯示時鐘"</string>
     <string name="hide_clock">"隱藏時鐘"</string>
+    <string name="label">"標籤"</string>
+    <string name="default_label">"鬧鐘"</string>
     <string name="set_alarm">"設定鬧鐘"</string>
-    <string name="enable">"開啟鬧鐘"</string>
     <string name="alarm_vibrate">"震動"</string>
     <string name="alarm_repeat">"重複"</string>
     <string name="alert">"鈴聲"</string>
     <string name="time">"時間"</string>
-    <string name="alert_title">"鬧鐘"</string>
     <string name="alarm_alert_dismiss_text">"關閉"</string>
     <string name="alarm_alert_alert_silenced">"鬧鐘 <xliff:g id="MINUTES">%d</xliff:g> 分鐘後靜音"</string>
     <string name="alarm_alert_snooze_text">"貪睡"</string>
     <string name="alarm_alert_snooze_set">"再貪睡 <xliff:g id="MINUTES">%d</xliff:g> 分鐘。"</string>
-    <string name="alarm_alert_snooze_not_set">"未設定貪睡鬧鐘 -- 下一次鬧鐘時間為 <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="alarm_set">"還有 <xliff:g id="TIME_DELTA">%s</xliff:g> 會啟動鬧鐘。"</string>
-    <!-- no translation found for combiner (3170916241487451546) -->
-    <skip />
     <string name="day">"1 天"</string>
     <string name="days">"<xliff:g id="DAYS">%s</xliff:g> 天"</string>
     <string name="hour">"1 小時"</string>
     <string name="hours">"<xliff:g id="HOURS">%s</xliff:g> 小時"</string>
-    <string name="and">" 又 "</string>
-    <!-- no translation found for space (5294521584675021576) -->
-    <skip />
-    <string name="subminute">"少於 1 分鐘"</string>
     <string name="minute">"1 分鐘"</string>
     <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> 分鐘"</string>
-    <string name="am">"am"</string>
-    <string name="pm">"pm"</string>
     <string name="every_day">"每天"</string>
     <string name="never">"從不"</string>
     <string name="day_concat">"、 "</string>
     <string name="clock_instructions">"選取顯示的時鐘。"</string>
     <string name="error">"鬧鐘未設定"</string>
-    <string name="dberror">"抱歉，無法設定鬧鐘。"</string>
+    <string name="dberror">"很抱歉，無法設定鬧鐘。"</string>
     <string name="analog_gadget">"類比時鐘"</string>
-  <string-array name="days_of_week">
-    <item>"星期一"</item>
-    <item>"星期二"</item>
-    <item>"星期三"</item>
-    <item>"星期四"</item>
-    <item>"星期五"</item>
-    <item>"星期六"</item>
-    <item>"星期日"</item>
-  </string-array>
-  <string-array name="days_of_week_short">
-    <item>"週一"</item>
-    <item>"週二"</item>
-    <item>"週三"</item>
-    <item>"週四"</item>
-    <item>"週五"</item>
-    <item>"週六"</item>
-    <item>"週日"</item>
-  </string-array>
+    <string name="settings">"設定"</string>
+    <string name="alarm_in_silent_mode_title">"靜音模式下的鬧鐘"</string>
+    <string name="alarm_in_silent_mode_summary">"手機處於靜音模式時，鬧鐘仍會響"</string>
 </resources>