diff options
-rw-r--r-- | Android.mk | 3 | ||||
-rw-r--r-- | res/layout/chronometer_notif_content.xml | 4 | ||||
-rw-r--r-- | res/values-ca/strings.xml | 2 | ||||
-rw-r--r-- | res/values-fa/strings.xml | 2 | ||||
-rw-r--r-- | res/values-nl/strings.xml | 8 | ||||
-rw-r--r-- | res/values-pl/strings.xml | 2 | ||||
-rw-r--r-- | res/values-pt-rPT/strings.xml | 22 | ||||
-rw-r--r-- | res/values-ta/strings.xml | 2 | ||||
-rw-r--r-- | res/values-th/strings.xml | 2 | ||||
-rw-r--r-- | res/values-uk/strings.xml | 2 | ||||
-rw-r--r-- | res/values-zh-rTW/strings.xml | 6 | ||||
-rw-r--r-- | src/com/android/deskclock/data/StopwatchNotificationBuilder.java | 2 | ||||
-rw-r--r-- | src/com/android/deskclock/data/TimerNotificationBuilder.java | 2 |
13 files changed, 30 insertions, 29 deletions
diff --git a/Android.mk b/Android.mk index e4fa27366..bee91034c 100644 --- a/Android.mk +++ b/Android.mk @@ -19,7 +19,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ android-support-design \ android-support-percent \ android-support-transition \ - android-support-v4 \ + android-support-compat \ + android-support-media-compat \ android-support-v13 \ android-support-v14-preference \ android-support-v7-appcompat \ diff --git a/res/layout/chronometer_notif_content.xml b/res/layout/chronometer_notif_content.xml index c962a0e11..e460f4442 100644 --- a/res/layout/chronometer_notif_content.xml +++ b/res/layout/chronometer_notif_content.xml @@ -26,13 +26,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" - android:textAppearance="@style/TextAppearance.AppCompat.Notification.Title" /> + android:textAppearance="@style/TextAppearance.Compat.Notification.Title" /> <TextView android:id="@+id/state" android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" - android:textAppearance="@style/TextAppearance.AppCompat.Notification" /> + android:textAppearance="@style/TextAppearance.Compat.Notification" /> </LinearLayout> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index df482a8af..06088bf14 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -295,7 +295,7 @@ <item msgid="8636989494746218677">"Terranova"</item> <item msgid="4402541016410147505">"Brasília"</item> <item msgid="2251184440733164084">"Buenos Aires"</item> - <item msgid="6202926618569004969">"Grenlàndia"</item> + <item msgid="6202926618569004969">"Groenlàndia"</item> <item msgid="2355275037115290628">"Montevideo"</item> <item msgid="1377549694711708945">"Mig-Atlàntic"</item> <item msgid="3457671272126347981">"Açores"</item> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 68ae15e3e..d595b12cb 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -298,7 +298,7 @@ <item msgid="6202926618569004969">"گرینلند"</item> <item msgid="2355275037115290628">"مونته ویدئو"</item> <item msgid="1377549694711708945">"آتلانتیک میانی"</item> - <item msgid="3457671272126347981">"آزورس"</item> + <item msgid="3457671272126347981">"آزور"</item> <item msgid="3659315141063710840">"جزایر کیپ ورد"</item> <item msgid="1260941741802367635">"کازابلانکا"</item> <item msgid="8275203689687954762">"لندن، دوبلین"</item> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index d1e872a38..81b1987c6 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -390,10 +390,10 @@ <string name="alarm_undo" msgid="5710042601177655254">"ongedaan maken"</string> <string name="alarm_deleted" msgid="6131529309389084785">"Verwijderd"</string> <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string> - <string name="world_time_ahead" msgid="625559988238637652">"<xliff:g id="TIME">%1$s</xliff:g> vroeger"</string> - <string name="world_time_behind" msgid="5395771290726167865">"<xliff:g id="TIME">%1$s</xliff:g> later"</string> - <string name="world_hours_minutes_ahead" msgid="5132012793021696377">"<xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g> vroeger"</string> - <string name="world_hours_minutes_behind" msgid="8978567362140923698">"<xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g> later"</string> + <string name="world_time_ahead" msgid="625559988238637652">"<xliff:g id="TIME">%1$s</xliff:g> later"</string> + <string name="world_time_behind" msgid="5395771290726167865">"<xliff:g id="TIME">%1$s</xliff:g> vroeger"</string> + <string name="world_hours_minutes_ahead" msgid="5132012793021696377">"<xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g> later"</string> + <string name="world_hours_minutes_behind" msgid="8978567362140923698">"<xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g> vroeger"</string> <string name="world_hours_tomorrow" msgid="2504465609269004794">"Morgen, <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="world_hours_yesterday" msgid="4425086322610882745">"Gisteren, <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="world_tomorrow" msgid="7633067935455580920">"Morgen"</string> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index faba7c372..d2615eefd 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -408,7 +408,7 @@ <string name="alarm_undo" msgid="5710042601177655254">"cofnij"</string> <string name="alarm_deleted" msgid="6131529309389084785">"Alarm usunięto"</string> <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string> - <string name="world_time_ahead" msgid="625559988238637652">"Za <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="world_time_ahead" msgid="625559988238637652">"<xliff:g id="TIME">%1$s</xliff:g> później"</string> <string name="world_time_behind" msgid="5395771290726167865">"<xliff:g id="TIME">%1$s</xliff:g> temu"</string> <string name="world_hours_minutes_ahead" msgid="5132012793021696377">"Za <xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g>"</string> <string name="world_hours_minutes_behind" msgid="8978567362140923698">"<xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g> temu"</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index a7c519309..f6c1996a4 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -40,14 +40,14 @@ <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string> <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Suspenso"</string> <plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865"> - <item quantity="one">1 min</item> - <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item> + <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min</item> + <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min.</item> </plurals> <string name="alarm_alert_off_text" msgid="4472073417593915002">"Alarme desl."</string> <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Suspender"</string> <plurals name="alarm_alert_snooze_set" formatted="false" msgid="3212729193036041768"> - <item quantity="one">Suspenso durante 1 minuto</item> - <item quantity="other">Suspenso durante <xliff:g id="MINUTES">%d</xliff:g> minutos</item> + <item quantity="one">Snoozing for <xliff:g id="MINUTES">%d</xliff:g> minutes.</item> + <item quantity="other">Suspendido durante <xliff:g id="MINUTES">%d</xliff:g> minutos.</item> </plurals> <string name="alarm_alert_snooze_until" msgid="6958013659168344550">"Suspendido até à(s) <xliff:g id="TIME">%s</xliff:g>"</string> <string name="alarm_alert_predismiss_title" msgid="5723945586913705445">"Próximo alarme"</string> @@ -76,27 +76,27 @@ <item msgid="2332583385137381060">"Alarme definido para daqui a <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> e <xliff:g id="MINUTES">%3$s</xliff:g>."</item> </string-array> <plurals name="days" formatted="false" msgid="3706846447285206235"> - <item quantity="one">1 dia</item> + <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> days</item> <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> dias</item> </plurals> <plurals name="hours" formatted="false" msgid="3871283109767171655"> - <item quantity="one">1 hora</item> + <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> hours</item> <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item> </plurals> <plurals name="hours_short" formatted="false" msgid="3709250715691092925"> - <item quantity="one">1 h</item> + <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> hr</item> <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> h</item> </plurals> <plurals name="minutes" formatted="false" msgid="5484431721696058697"> - <item quantity="one">1 minuto</item> + <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minutes</item> <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item> </plurals> <plurals name="minutes_short" formatted="false" msgid="6397328304369080233"> - <item quantity="one">1 min</item> + <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> min</item> <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> min</item> </plurals> <plurals name="seconds" formatted="false" msgid="670343577734266047"> - <item quantity="one">1 segundo</item> + <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> seconds</item> <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item> </plurals> <string name="every_day" msgid="4100909974923444602">"Todos os dias"</string> @@ -109,7 +109,7 @@ <string name="crescendo_duration_title" msgid="8606408542726189528">"Aumento gradual do volume"</string> <string name="auto_silence_title" msgid="2012754009554434544">"Silenciar depois de"</string> <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396"> - <item quantity="one">1 minuto</item> + <item quantity="one"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutes</item> <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutos</item> </plurals> <string name="auto_silence_never" msgid="4821982647348750809">"Nunca"</string> diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index 5c8867d5a..34742457e 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -107,7 +107,7 @@ <string name="settings" msgid="5849739030579520686">"அமைப்பு"</string> <string name="snooze_duration_title" msgid="1097309861110780483">"உறக்கநிலையின் காலஅளவு"</string> <string name="crescendo_duration_title" msgid="8606408542726189528">"படிப்படியாக ஒலியளவை அதிகரி"</string> - <string name="auto_silence_title" msgid="2012754009554434544">"அமைதியாக்க வெண்டியது"</string> + <string name="auto_silence_title" msgid="2012754009554434544">"அமைதியாக்க வேண்டியது"</string> <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396"> <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> நிமிடங்கள்</item> <item quantity="one">1 நிமிடம்</item> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 46da14b16..be91886a3 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -192,7 +192,7 @@ </string-array> <string name="label_description" msgid="8736179296142915727">"ป้ายกำกับ"</string> <string name="ringtone_description" msgid="7580922112921069925">"เสียงเรียกเข้า"</string> - <string name="menu_alarm" msgid="4772010125376647519">"เตือน"</string> + <string name="menu_alarm" msgid="4772010125376647519">"ปลุก"</string> <string name="menu_timer" msgid="6459070074762877114">"ตัวจับเวลา"</string> <string name="menu_clock" msgid="5612760670606829805">"นาฬิกา"</string> <string name="menu_stopwatch" msgid="3396117705293574701">"นาฬิกาจับเวลา"</string> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 9d7e6caf8..bef4957db 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -348,7 +348,7 @@ <item msgid="5487724896895412089">"Уральськ"</item> <item msgid="364906869710826982">"Єкатеринбург"</item> <item msgid="2106505051751383358">"Колката"</item> - <item msgid="6851586621581501447">"Шри-Ланка"</item> + <item msgid="6851586621581501447">"Шрі-Ланка"</item> <item msgid="800438544128213134">"Катманду"</item> <item msgid="6173621471007643021">"Астана"</item> <item msgid="8645125891971581128">"Янгон"</item> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 0c4124c1c..0f743bb1d 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -280,13 +280,13 @@ <item msgid="7156402158716866161">"蒂華納"</item> <item msgid="1144117502254612241">"亞利桑那"</item> <item msgid="101284182011722637">"赤瓦瓦"</item> - <item msgid="689121094232986897">"山區時間"</item> + <item msgid="689121094232986897">"美國山區標準時間"</item> <item msgid="5445331923942302756">"中美洲"</item> - <item msgid="2749806434052452351">"中部時間"</item> + <item msgid="2749806434052452351">"美國中部標準時間"</item> <item msgid="3997138870229703753">"墨西哥城"</item> <item msgid="5425567073027744888">"薩克其萬"</item> <item msgid="2877342865396629368">"波哥大"</item> - <item msgid="568682398893899670">"東部時間"</item> + <item msgid="568682398893899670">"美國東部標準時間"</item> <item msgid="668135984541863866">"委內瑞拉"</item> <item msgid="3737474220861486223">"大西洋時間 (巴貝多)"</item> <item msgid="6279116051273436870">"大西洋時間 (加拿大)"</item> diff --git a/src/com/android/deskclock/data/StopwatchNotificationBuilder.java b/src/com/android/deskclock/data/StopwatchNotificationBuilder.java index 91de2ba24..6e62f06f6 100644 --- a/src/com/android/deskclock/data/StopwatchNotificationBuilder.java +++ b/src/com/android/deskclock/data/StopwatchNotificationBuilder.java @@ -24,10 +24,10 @@ import android.content.res.Resources; import android.os.SystemClock; import android.support.annotation.DrawableRes; import android.support.annotation.StringRes; +import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat.Action; import android.support.v4.app.NotificationCompat.Builder; import android.support.v4.content.ContextCompat; -import android.support.v7.app.NotificationCompat; import android.widget.RemoteViews; import com.android.deskclock.R; diff --git a/src/com/android/deskclock/data/TimerNotificationBuilder.java b/src/com/android/deskclock/data/TimerNotificationBuilder.java index 445485702..2119869ba 100644 --- a/src/com/android/deskclock/data/TimerNotificationBuilder.java +++ b/src/com/android/deskclock/data/TimerNotificationBuilder.java @@ -26,8 +26,8 @@ import android.content.res.Resources; import android.os.Build; import android.os.SystemClock; import android.support.annotation.DrawableRes; +import android.support.v4.app.NotificationCompat; import android.support.v4.content.ContextCompat; -import android.support.v7.app.NotificationCompat; import android.text.TextUtils; import android.widget.RemoteViews; |