resolved conflicts for merge of f30a09a7 to master

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

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7192106..b8de2c2 100644 (file)
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -24,17 +24,14 @@
     <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>
     <string name="combiner">"<xliff:g id="XXX_0">%1$s</xliff:g><xliff:g id="XXX_1">%2$s</xliff:g><xliff:g id="XXX_2">%3$s</xliff:g><xliff:g id="XXX_3">%4$s</xliff:g><xliff:g id="XXX_4">%5$s</xliff:g>"</string>
     <string name="day">"1 天"</string>