diff options
Diffstat (limited to 'res')
68 files changed, 592 insertions, 68 deletions
diff --git a/res/layout-land/stopwatch_fragment.xml b/res/layout-land/stopwatch_fragment.xml index 7f7030277..b35f6dac2 100644 --- a/res/layout-land/stopwatch_fragment.xml +++ b/res/layout-land/stopwatch_fragment.xml @@ -25,7 +25,7 @@ android:layout_height="match_parent" android:layout_marginLeft="@dimen/circle_margin" android:layout_marginRight="@dimen/circle_margin" - android:layout_weight="1" > + android:layout_weight="0.95" > <com.android.deskclock.timer.CountingTimerView android:id="@+id/stopwatch_time_text" @@ -78,8 +78,7 @@ <ListView android:id="@+id/laps_list" android:layout_weight="1" - android:layout_marginLeft="@dimen/laps_margin" - android:layout_marginRight="@dimen/laps_margin" + android:layout_marginRight="@dimen/sw_right_margin" android:layout_gravity="center" android:layout_width="0dip" android:layout_height="wrap_content" /> diff --git a/res/layout-land/time_setup_view.xml b/res/layout-land/time_setup_view.xml new file mode 100644 index 000000000..8badd96c7 --- /dev/null +++ b/res/layout-land/time_setup_view.xml @@ -0,0 +1,138 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <com.android.deskclock.timer.TimerView + android:id="@+id/timer_time_text" + android:layout_width="0dip" + android:layout_weight="2" + android:layout_height="wrap_content" + android:paddingTop="@dimen/medium_font_padding" + android:paddingBottom="@dimen/medium_font_padding" + android:paddingLeft="@dimen/timer_padding_left" + android:layout_gravity="center" + android:gravity="top" + android:baselineAligned="false"> + <com.android.deskclock.ZeroTopPaddingTextView + android:id="@+id/hours_ones" + android:singleLine="true" + android:ellipsize="none" + style="@style/medium_bold" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textColor="@color/clock_white"/> + + <com.android.deskclock.ZeroTopPaddingTextView + android:id="@+id/hours_label" + android:singleLine="true" + android:ellipsize="none" + style="@style/label" + android:layout_gravity="top" + android:contentDescription="@string/hours_label_description" + android:text="@string/hours_label" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textColor="@color/clock_white"/> + + <com.android.deskclock.ZeroTopPaddingTextView + android:id="@+id/minutes_tens" + android:singleLine="true" + android:ellipsize="none" + style="@style/medium_bold" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textColor="@color/clock_white"/> + + <com.android.deskclock.ZeroTopPaddingTextView + android:id="@+id/minutes_ones" + android:singleLine="true" + android:ellipsize="none" + style="@style/medium_bold" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textColor="@color/clock_white"/> + <com.android.deskclock.ZeroTopPaddingTextView + android:id="@+id/minutes_label" + android:singleLine="true" + android:ellipsize="none" + style="@style/label" + android:contentDescription="@string/minutes_label_description" + android:text="@string/minutes_label" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textColor="@color/clock_white"/> + + <com.android.deskclock.ZeroTopPaddingTextView + android:id="@+id/seconds" + android:singleLine="true" + android:ellipsize="none" + style="@style/medium_light" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textColor="@color/clock_white"/> + + <com.android.deskclock.ZeroTopPaddingTextView + android:id="@+id/seconds_label" + android:singleLine="true" + android:ellipsize="none" + style="@style/label" + android:layout_gravity="top" + android:contentDescription="@string/seconds_label_description" + android:text="@string/seconds_label" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textColor="@color/clock_white"/> + + </com.android.deskclock.timer.TimerView> + <ImageButton + android:id="@+id/delete" + android:layout_width="0dip" + android:layout_weight="1" + android:gravity="center" + android:layout_gravity="center" + android:paddingBottom="@dimen/body_font_padding" + android:src="@drawable/ic_backspace" + android:background="@drawable/item_background" + android:contentDescription="@string/timer_delete" + android:layout_height="match_parent" /> + </LinearLayout> + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:layout_marginBottom="8dip" + android:background="#28ffffff" /> + <include layout="@layout/three_keys_view" + android:id="@+id/first" /> + + <include layout="@layout/three_keys_view" + android:id="@+id/second"/> + + <include layout="@layout/three_keys_view" + android:id="@+id/third"/> + + <include layout="@layout/three_keys_view" + android:id="@+id/fourth" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:layout_marginTop="16dip" /> +</LinearLayout> diff --git a/res/layout-land/timer_list_item.xml b/res/layout-land/timer_list_item.xml index 15ddfdf31..854d19d54 100644 --- a/res/layout-land/timer_list_item.xml +++ b/res/layout-land/timer_list_item.xml @@ -27,8 +27,8 @@ android:id="@+id/timer_frame" android:layout_width="@dimen/timer_circle_width" android:layout_height="@dimen/timer_circle_diameter" - android:layout_marginLeft="@dimen/circle_margin" - android:layout_marginRight="@dimen/circle_margin"> + android:layout_marginLeft="@dimen/timer_circle_margin" + android:layout_marginRight="@dimen/timer_circle_margin"> <com.android.deskclock.CircleTimerView android:id="@+id/timer_time" diff --git a/res/layout/desk_clock_saver.xml b/res/layout/desk_clock_saver.xml index 7fae38054..2cddbd635 100644 --- a/res/layout/desk_clock_saver.xml +++ b/res/layout/desk_clock_saver.xml @@ -29,8 +29,10 @@ android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/screensaver_margin" + android:layout_marginRight="@dimen/screensaver_margin" android:layout_marginTop="@dimen/time_margin_top" - android:layout_marginBottom="@dimen/time_margin_bottom"> + android:layout_marginBottom="@dimen/screensaver_margin"> <include layout="@layout/desk_clock_time_date" android:id="@+id/digital_clock" @@ -38,6 +40,7 @@ android:layout_height="wrap_content" android:gravity="center" android:layout_gravity="center" + android:layout_marginBottom="@dimen/digital_margin_bottom" /> <com.android.deskclock.AnalogClock android:id="@+id/analog_clock" diff --git a/res/layout/lap_view.xml b/res/layout/lap_view.xml index 30d875783..f4e90f8dd 100644 --- a/res/layout/lap_view.xml +++ b/res/layout/lap_view.xml @@ -18,25 +18,24 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_marginTop="4dip" android:layout_marginBottom="4dip" + android:gravity="center" android:paddingTop="@dimen/body_font_padding" android:paddingBottom="@dimen/body_font_padding" - android:paddingLeft="@dimen/laps_margin" - android:paddingRight="@dimen/laps_margin" android:layout_width="match_parent" android:layout_height="match_parent" > <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/clock_gray" - android:layout_marginRight="8dip" + android:layout_marginRight="@dimen/sw_item_space" android:gravity="left" style="@style/body" android:textAllCaps="false" android:id="@+id/lap_number" /> <TextView - android:layout_width="0dip" - android:layout_weight="1" + android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginRight="@dimen/sw_item_space" android:textColor="@color/clock_gray" android:gravity="right" style="@style/body" @@ -44,8 +43,7 @@ android:id="@+id/lap_time" /> <TextView android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="1" + android:layout_width="wrap_content" android:textColor="@color/clock_gray" android:gravity="right" style="@style/body" diff --git a/res/layout/main_clock_frame.xml b/res/layout/main_clock_frame.xml index 935a92507..e36565b2a 100644 --- a/res/layout/main_clock_frame.xml +++ b/res/layout/main_clock_frame.xml @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="@dimen/time_margin_top" - android:layout_marginBottom="@dimen/medium_space_bottom" + android:layout_marginBottom="@dimen/digital_margin_bottom" /> </FrameLayout> <LinearLayout diff --git a/res/layout/time_setup_view.xml b/res/layout/time_setup_view.xml index 8657f0732..0d875eb00 100644 --- a/res/layout/time_setup_view.xml +++ b/res/layout/time_setup_view.xml @@ -27,9 +27,7 @@ android:layout_height="wrap_content" android:paddingTop="@dimen/medium_font_padding" android:paddingBottom="@dimen/medium_font_padding" - android:paddingLeft="@dimen/timer_padding_left" - android:layout_gravity="center" - android:gravity="top" + android:gravity="top|center_horizontal" android:baselineAligned="false"> <com.android.deskclock.ZeroTopPaddingTextView android:id="@+id/hours_ones" diff --git a/res/layout/timer_fragment.xml b/res/layout/timer_fragment.xml index 2293d0a0e..f8f1304b6 100644 --- a/res/layout/timer_fragment.xml +++ b/res/layout/timer_fragment.xml @@ -60,8 +60,6 @@ android:orientation="vertical"> <com.android.deskclock.TimerSetupView android:id="@+id/timer_setup" - android:layout_marginLeft="8dip" - android:layout_marginRight="8dip" android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" /> diff --git a/res/layout/timer_list_item.xml b/res/layout/timer_list_item.xml index 1dfc04f28..f5ac85101 100644 --- a/res/layout/timer_list_item.xml +++ b/res/layout/timer_list_item.xml @@ -27,8 +27,8 @@ android:id="@+id/timer_frame" android:layout_width="match_parent" android:layout_height="@dimen/timer_circle_diameter" - android:layout_marginLeft="@dimen/circle_margin" - android:layout_marginRight="@dimen/circle_margin"> + android:layout_marginLeft="@dimen/timer_circle_margin" + android:layout_marginRight="@dimen/timer_circle_margin"> <com.android.deskclock.CircleTimerView android:id="@+id/timer_time" diff --git a/res/layout/world_clock_list_item.xml b/res/layout/world_clock_list_item.xml index 4628d9ae8..a8322655d 100644 --- a/res/layout/world_clock_list_item.xml +++ b/res/layout/world_clock_list_item.xml @@ -18,8 +18,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/circle_margin" - android:layout_marginLeft="@dimen/circle_margin" + android:layout_marginRight="@dimen/world_clock_margin" + android:layout_marginLeft="@dimen/world_clock_margin" android:orientation="horizontal"> diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 9f986dd34..de6bbebba 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"My tyd is <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Rondtetye:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Rondte <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m. <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m. <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>u. <xliff:g id="M">%2$02d</xliff:g>m. <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>u. <xliff:g id="M">%2$02d</xliff:g>m. <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>u. <xliff:g id="M">%2$02d</xliff:g>m. <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 uur"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> ure"</item> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 06b8dd21d..97c4f5a0d 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"የእኔ ሰዓት <xliff:g id="TIME">%s</xliff:g> ነው"</string> <string name="sw_share_laps" msgid="614390674795945007">"የዙር ሰዓት፦"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"ዙር <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>ደ <xliff:g id="S">%3$02d</xliff:g>ሴ።<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>ደ <xliff:g id="S">%3$02d</xliff:g>ሴ።<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>ሰ <xliff:g id="M">%2$02d</xliff:g>ደ <xliff:g id="S">%3$02d</xliff:g>ሴ።<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>ሰ <xliff:g id="M">%2$02d</xliff:g>ደ <xliff:g id="S">%3$02d</xliff:g>ሴ።<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>ሰ <xliff:g id="M">%2$02d</xliff:g>ደ <xliff:g id="S">%3$02d</xliff:g>ሴ።<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 ሰዓት"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> ሰዓታት"</item> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index c63c3d545..b67c11298 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"وقتي هو <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"مرات الدوران:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"معمل <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>د <xliff:g id="S">%3$02d</xliff:g>ث.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>د <xliff:g id="S">%3$02d</xliff:g>ث.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>س <xliff:g id="M">%2$02d</xliff:g>د <xliff:g id="S">%3$02d</xliff:g>ث.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>س <xliff:g id="M">%2$02d</xliff:g>د <xliff:g id="S">%3$02d</xliff:g>ث.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>س <xliff:g id="M">%2$02d</xliff:g>د <xliff:g id="S">%3$02d</xliff:g>ث.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"ساعة واحدة"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> من الساعات"</item> diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index c0b039244..e6c458287 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Мой час: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Час круга:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Круг <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g> хв. <xliff:g id="S">%3$02d</xliff:g> с.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g> хв. <xliff:g id="S">%3$02d</xliff:g> с.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g> гадз. <xliff:g id="M">%2$02d</xliff:g> хв. <xliff:g id="S">%3$02d</xliff:g> с.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g> гадз. <xliff:g id="M">%2$02d</xliff:g> хв. <xliff:g id="S">%3$02d</xliff:g> с.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g> гадз. <xliff:g id="M">%2$02d</xliff:g> хв. <xliff:g id="S">%3$02d</xliff:g> с.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 гадзіна"</item> <item quantity="other" msgid="7018184076091344797">"Гадзiн: <xliff:g id="NUMBER">%d</xliff:g>"</item> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 5239c15e4..0428c1ab2 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Времето ми е <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Междинни резултати:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Междинен резултат <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g> м <xliff:g id="S">%3$02d</xliff:g> с,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g> м <xliff:g id="S">%3$02d</xliff:g> с,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g> ч <xliff:g id="M">%2$02d</xliff:g> м <xliff:g id="S">%3$02d</xliff:g> с,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g> ч <xliff:g id="M">%2$02d</xliff:g> м <xliff:g id="S">%3$02d</xliff:g> с,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g> ч <xliff:g id="M">%2$02d</xliff:g> м <xliff:g id="S">%3$02d</xliff:g> с,<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 час"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> часа"</item> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index ee3e8f88c..ac02af84e 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"La meva hora: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Temps per volta:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Etapa <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g> min, <xliff:g id="S">%3$02d</xliff:g> s, <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g> min, <xliff:g id="S">%3$02d</xliff:g> s, <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g> h, <xliff:g id="M">%2$02d</xliff:g> m, <xliff:g id="S">%3$02d</xliff:g> s, <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g> h, <xliff:g id="M">%2$02d</xliff:g> min, <xliff:g id="S">%3$02d</xliff:g> s, <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g> h, <xliff:g id="M">%2$02d</xliff:g> min, <xliff:g id="S">%3$02d</xliff:g> s, <xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 hora"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> hores"</item> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 7c82e32c9..b2f77d8c8 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Můj čas je <xliff:g id="TIME">%s</xliff:g>."</string> <string name="sw_share_laps" msgid="614390674795945007">"Časy etap:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Úsek <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 hodina"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> h"</item> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 81c9b4b8a..29bee2588 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Min tid er <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Omgangstider:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Omgang <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m. <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m. <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>t. <xliff:g id="M">%2$02d</xliff:g>m. <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>t. <xliff:g id="M">%2$02d</xliff:g>m. <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>t. <xliff:g id="M">%2$02d</xliff:g>m. <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"Én time"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> timer"</item> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 980417ba2..711e69d2c 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -133,12 +133,12 @@ <string name="menu_item_night_mode" msgid="3486930302245398975">"Nachtmodus"</string> <string name="sw_resume_button" msgid="2569360966002022248">"Fortsetzen"</string> <string name="sw_start_button" msgid="8373422516681242270">"Starten"</string> - <string name="sw_stop_button" msgid="8322958613123274451">"Stoppen"</string> + <string name="sw_stop_button" msgid="8322958613123274451">"Anhalten"</string> <string name="sw_lap_button" msgid="6992264696039004233">"Runde"</string> <string name="sw_reset_button" msgid="6616804728322906117">"Reset"</string> <string name="sw_share_button" msgid="4478648110382859382">"Teilen"</string> <string name="hours_label" msgid="3393478155635368097">"h"</string> - <string name="minutes_label" msgid="3568098128251438588">"min"</string> + <string name="minutes_label" msgid="3568098128251438588">"Min"</string> <string name="seconds_label" msgid="124655952824003246">"s"</string> <string name="hours_label_description" msgid="8652842524970971830">"Stunden"</string> <string name="minutes_label_description" msgid="965686733490357796">"Minuten"</string> @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Meine Zeit: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Rundenzeiten:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. Runde"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s <xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 Stunde"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> Stunden"</item> @@ -160,7 +167,7 @@ <item quantity="other" msgid="7583230315175387547">"<xliff:g id="NUMBER">%d</xliff:g> Sekunden"</item> </plurals> <string name="timer_add_timer" msgid="862733633862574752">"Timer hinzufügen"</string> - <string name="timer_start" msgid="6158486445614356442">"Start"</string> + <string name="timer_start" msgid="6158486445614356442">"Starten"</string> <string name="timer_delete" msgid="8699122001991909302">"Löschen"</string> <string name="timer_plus_one" msgid="6631211310420106116">"1 Minute hinzufügen"</string> <string name="timer_stop" msgid="3361154678667736722">"Anhalten"</string> @@ -226,7 +233,7 @@ <item msgid="8513382867172014244">"Manaus"</item> <item msgid="7776299003105932407">"Santiago"</item> <item msgid="8636989494746218677">"Neufundland"</item> - <item msgid="4402541016410147505">"Brasilia"</item> + <item msgid="4402541016410147505">"Brasília"</item> <item msgid="2251184440733164084">"Buenos Aires"</item> <item msgid="6202926618569004969">"Grönland"</item> <item msgid="2355275037115290628">"Montevideo"</item> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index ef01ce2b8..7e76e4376 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -101,7 +101,7 @@ <string name="volume_button_setting_title" msgid="6937131248843413357">"Κουμπί έντασης"</string> <string name="volume_button_dialog_title" msgid="8768042543750036853">"Εφέ κουμπιού"</string> <string-array name="volume_button_setting_entries"> - <item msgid="7972756698723318690">"Αφύπνιση"</item> + <item msgid="7972756698723318690">"Αναβολή αφύπνισης"</item> <item msgid="3450979320164769576">"Παράβλεψη"</item> <item msgid="6302517608411378024">"Να μη γίνει καμία ενέργεια"</item> </string-array> @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Ο χρόνος μου είναι <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Χρόνοι γύρων:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Γύρος <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>λ <xliff:g id="S">%3$02d</xliff:g>δ.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>λ <xliff:g id="S">%3$02d</xliff:g>δ.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>ω <xliff:g id="M">%2$02d</xliff:g>λ <xliff:g id="S">%3$02d</xliff:g>δ.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>ω <xliff:g id="M">%2$02d</xliff:g>λ <xliff:g id="S">%3$02d</xliff:g>δ.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>ω <xliff:g id="M">%2$02d</xliff:g>λ <xliff:g id="S">%3$02d</xliff:g>δ.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 ώρα"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> ώρες"</item> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 63ddd3f93..68a069fc1 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"My time is <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Lap times:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Lap <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 hour"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> hours"</item> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 9e36077aa..f46fdc1bc 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Mi hora es <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Duración:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Duración <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 hora"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> horas"</item> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index c4b2a2038..40deef91c 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Hora: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Duración de las vueltas:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Fase <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g> min <xliff:g id="S">%3$02d</xliff:g> s <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g> min <xliff:g id="S">%3$02d</xliff:g> s <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g> h <xliff:g id="M">%2$02d</xliff:g> min <xliff:g id="S">%3$02d</xliff:g> s <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g> h <xliff:g id="M">%2$02d</xliff:g> min <xliff:g id="S">%3$02d</xliff:g> s <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g> h <xliff:g id="M">%2$02d</xliff:g> min <xliff:g id="S">%3$02d</xliff:g> s <xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 hora"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> horas"</item> diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index 940bd62a2..777fc31bd 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Minu aeg on <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Ringi ajad:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. ring"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 tund"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> tundi"</item> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index c412a15d2..ae01b78e4 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -138,7 +138,7 @@ <string name="sw_reset_button" msgid="6616804728322906117">"بازنشانی"</string> <string name="sw_share_button" msgid="4478648110382859382">"اشتراکگذاری"</string> <string name="hours_label" msgid="3393478155635368097">"ساعت"</string> - <string name="minutes_label" msgid="3568098128251438588">"متر"</string> + <string name="minutes_label" msgid="3568098128251438588">"دقیقه"</string> <string name="seconds_label" msgid="124655952824003246">"ثانیه"</string> <string name="hours_label_description" msgid="8652842524970971830">"ساعت"</string> <string name="minutes_label_description" msgid="965686733490357796">"دقیقه"</string> @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"زمان من <xliff:g id="TIME">%s</xliff:g> است"</string> <string name="sw_share_laps" msgid="614390674795945007">"زمانهای دور:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"دور <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"۱ ساعت"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> ساعت"</item> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index f61d7f066..40c5fe922 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Oma aika: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Kierrosajat:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Kierros <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>t <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>t <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>t <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 tunti"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> tuntia"</item> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index e414ffd4f..f8bddfd9d 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -148,6 +148,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Mon heure est <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Temps de circuit :"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Tour <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>min <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>min <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>min <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>min <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>min <xliff:g id="S">%3$02d</xliff:g>s,<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 heure"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> heures"</item> @@ -187,8 +194,8 @@ </plurals> <string name="home_label" msgid="4436139365695453870">"Domicile"</string> <string name="cities_activity_title" msgid="8552462751129256730">"Villes"</string> - <string name="alarm_on" msgid="4344630320756422804">"ACTIVÉE"</string> - <string name="alarm_off" msgid="6478058633710013612">"DÉSACTIVÉE"</string> + <string name="alarm_on" msgid="4344630320756422804">"OUI"</string> + <string name="alarm_off" msgid="6478058633710013612">"NON"</string> <string name="clock_settings" msgid="8887845806151785393">"HORLOGE"</string> <string name="clock_style" msgid="2265011060429742344">"Style"</string> <string-array name="clock_style_entries"> diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 21445fd61..704fdf1b0 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"मेरा समय <xliff:g id="TIME">%s</xliff:g> है"</string> <string name="sw_share_laps" msgid="614390674795945007">"लैप अवधियां:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"लैप <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 घंटा"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> घंटे"</item> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index a9a1f9e5e..209e773d4 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Moje je vrijeme <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Vremena krugova:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. krug"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g> h <xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g> h <xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g> h <xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s <xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 sat"</item> <item quantity="other" msgid="7018184076091344797">"Broj sati: <xliff:g id="NUMBER">%d</xliff:g>"</item> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 1d743ac6d..1f269a554 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -158,6 +158,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Az én időm: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Köridők:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. kör"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>p <xliff:g id="S">%3$02d</xliff:g>.<xliff:g id="D">%4$02d</xliff:g>m"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>p <xliff:g id="S">%3$02d</xliff:g>.<xliff:g id="D">%4$02d</xliff:g>m"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>ó <xliff:g id="M">%2$02d</xliff:g>p <xliff:g id="S">%3$02d</xliff:g>.<xliff:g id="D">%4$02d</xliff:g>m"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>ó <xliff:g id="M">%2$02d</xliff:g>p <xliff:g id="S">%3$02d</xliff:g>.<xliff:g id="D">%4$02d</xliff:g>m"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>ó <xliff:g id="M">%2$02d</xliff:g>p <xliff:g id="S">%3$02d</xliff:g>.<xliff:g id="D">%4$02d</xliff:g>m"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 óra"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> óra"</item> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index e4da03578..e5079d9bf 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -35,7 +35,7 @@ <string name="alert" msgid="6506982899651975645">"Nada Dering Alarm"</string> <string name="ringtone" msgid="9110746249688559579">"Nada Dering"</string> <string name="time" msgid="8067216534232296518">"Waktu"</string> - <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Tolak"</string> + <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Tutup"</string> <string name="alarm_alert_alert_silenced" msgid="2704775170733835993">"Alarm disenyapkan setelah <xliff:g id="MINUTES">%d</xliff:g> menit."</string> <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Tunda"</string> <string name="alarm_alert_snooze_set" msgid="656470966696912087">"Menunda selama <xliff:g id="MINUTES">%d</xliff:g> menit."</string> @@ -102,7 +102,7 @@ <string name="volume_button_dialog_title" msgid="8768042543750036853">"Efek tombol"</string> <string-array name="volume_button_setting_entries"> <item msgid="7972756698723318690">"Tunda"</item> - <item msgid="3450979320164769576">"Singkirkan"</item> + <item msgid="3450979320164769576">"Tutup"</item> <item msgid="6302517608411378024">"Tidak melakukan apa-apa"</item> </string-array> <string name="default_ringtone_setting_title" msgid="4549726190682964245">"Setel nada dering default"</string> @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Waktu saya adalah <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Waktu putaran:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Putaran <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>d.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>d.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>j <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>d.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>j <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>d.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>j <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>d.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 jam"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> jam"</item> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index ec02a6771..8dce21f5d 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -158,6 +158,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Il mio tempo è <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Tempi sul giro:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Giro <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g> h <xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g> h <xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g> h <xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s <xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 ora"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> ore"</item> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 6cc8785d5..1af731d65 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"השעה שלי הוא <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"זמני הקפה:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"הקפה <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>ד <xliff:g id="S">%3$02d</xliff:g>ש.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>ד <xliff:g id="S">%3$02d</xliff:g>ש.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>שע <xliff:g id="M">%2$02d</xliff:g>ד <xliff:g id="S">%3$02d</xliff:g>ש.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>שע <xliff:g id="M">%2$02d</xliff:g>ד <xliff:g id="S">%3$02d</xliff:g>ש.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>שע <xliff:g id="M">%2$02d</xliff:g>ד <xliff:g id="S">%3$02d</xliff:g>ש.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"שעה אחת"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> שעות"</item> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 220277214..3942cfacc 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -126,7 +126,7 @@ <string name="menu_clock" msgid="5612760670606829805">"時計"</string> <string name="menu_stopwatch" msgid="3396117705293574701">"ストップウォッチ"</string> <string name="button_alarms" msgid="8016103479617020265">"アラーム"</string> - <string name="button_cities" msgid="4555761857494501363">"都市"</string> + <string name="button_cities" msgid="4555761857494501363">"世界時計"</string> <string name="button_menu" msgid="6050484561842120282">"その他のオプション"</string> <string name="menu_item_settings" msgid="1413723516369078665">"設定"</string> <string name="menu_item_help" msgid="4570953476186849841">"ヘルプ"</string> @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"私の時間は<xliff:g id="TIME">%s</xliff:g>です"</string> <string name="sw_share_laps" msgid="614390674795945007">"ラップ時間:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"ラップ<xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>分<xliff:g id="S">%3$02d</xliff:g>秒<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>分<xliff:g id="S">%3$02d</xliff:g>秒<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>時間<xliff:g id="M">%2$02d</xliff:g>分<xliff:g id="S">%3$02d</xliff:g>秒<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>時間<xliff:g id="M">%2$02d</xliff:g>分<xliff:g id="S">%3$02d</xliff:g>秒<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>時間<xliff:g id="M">%2$02d</xliff:g>分<xliff:g id="S">%3$02d</xliff:g>秒<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1時間"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g>時間"</item> @@ -185,7 +192,7 @@ <item quantity="other" msgid="3799129667336330616">"<xliff:g id="NUMBER">%d</xliff:g>件のタイマー"</item> </plurals> <string name="home_label" msgid="4436139365695453870">"ホーム"</string> - <string name="cities_activity_title" msgid="8552462751129256730">"都市"</string> + <string name="cities_activity_title" msgid="8552462751129256730">"世界時計"</string> <string name="alarm_on" msgid="4344630320756422804">"ON"</string> <string name="alarm_off" msgid="6478058633710013612">"OFF"</string> <string name="clock_settings" msgid="8887845806151785393">"時刻"</string> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 04da8c15e..ab79530ab 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"내 시간: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"랩 타임:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"랩 타임 <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>분<xliff:g id="S">%3$02d</xliff:g>초.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>분<xliff:g id="S">%3$02d</xliff:g>초.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>시간<xliff:g id="M">%2$02d</xliff:g>분<xliff:g id="S">%3$02d</xliff:g>초.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>시간<xliff:g id="M">%2$02d</xliff:g>분<xliff:g id="S">%3$02d</xliff:g>초.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>시간<xliff:g id="M">%2$02d</xliff:g>분<xliff:g id="S">%3$02d</xliff:g>초.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1시간"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g>시간"</item> diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 4cc714e57..7b75074cc 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -26,7 +26,7 @@ <dimen name="next_alarm_text_size">15sp</dimen> <dimen name="time_margin_right">8dip</dimen> <dimen name="time_margin_bottom">14dip</dimen> - <dimen name="time_margin_top">8dip</dimen> + <dimen name="time_margin_top">24dip</dimen> <dimen name="ampm_margin_top">16dip</dimen> <dimen name="font_margin_adjust">8dip</dimen> <dimen name="next_alarm_margin_top">-5dip</dimen> @@ -39,8 +39,11 @@ <!-- Size of margin for circles. --> <dimen name="circle_margin">8dp</dimen> - <dimen name="laps_margin">16dp</dimen> <dimen name="analog_clock_margin">200dp</dimen> + <dimen name="timer_circle_margin">8dp</dimen> + + <dimen name="world_clock_margin">8dp</dimen> + <dimen name="sw_right_margin">8dp</dimen> <!-- Extra offset for timer button paddings. Only nonzero for non-tablets. --> <dimen name="timer_button_extra_offset">45dip</dimen> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 27a88e251..338f2869d 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Mano laikas yra <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Persidengiantis laikas:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g> ratas"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 val."</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> val."</item> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 36f14bcf4..cbd9fcf15 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Mans laiks ir: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Intervāla laiki:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. intervāls"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g> h <xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g> h <xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g> h <xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s,<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 stunda"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> stundas"</item> diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 3bd3e1f06..dac380659 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Masa saya ialah <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Masa pusingan:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Pusingan <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>j <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>j <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>j <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 jam"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> jam"</item> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index bdacdcc30..50e7c6624 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Tiden min er <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Rundetider:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Runde <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g> t <xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g> t <xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g> t <xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 time"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> timer"</item> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 5ba10e7ee..4bb4da844 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Mijn tijd is <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Rondetijden:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Ronde <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>u <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>u <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>u <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 uur"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> uur"</item> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 5b477aa2a..fa5fc2426 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Mój czas to <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Czasy okrążeń:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Okr. <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>,<xliff:g id="D">%4$02d</xliff:g>s"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>,<xliff:g id="D">%4$02d</xliff:g>s"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>g <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>,<xliff:g id="D">%4$02d</xliff:g>s"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>g <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>,<xliff:g id="D">%4$02d</xliff:g>s"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>g <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>,<xliff:g id="D">%4$02d</xliff:g>s"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 godz."</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> godz."</item> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index ab36f7fb0..631235160 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"O meu tempo é <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Tempos de volta:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Volta <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 hora"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> horas"</item> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 45c3cede4..b76ccc3a9 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Meu tempo é <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Tempos de volta:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Volta <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 hora"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> horas"</item> @@ -339,4 +346,4 @@ <string name="stopwatch_settings">CRONÔMETRO</string> <string name="keep_display_on_stopwatch">Manter a tela ligada</string> <string name="keep_display_on_stopwatch_summary">Manter a tela ligada enquanto o cronômetro estiver rodando</string> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml index fe34274c7..375d9ef0a 100644 --- a/res/values-rm/strings.xml +++ b/res/values-rm/strings.xml @@ -184,6 +184,11 @@ <skip /> <!-- no translation found for sw_notification_lap_number (3535420316052647126) --> <skip /> + <!-- no translation found for stopwatch_format_set:0 (7855304148648938406) --> + <!-- no translation found for stopwatch_format_set:1 (3964356050933061913) --> + <!-- no translation found for stopwatch_format_set:2 (4906928997138522728) --> + <!-- no translation found for stopwatch_format_set:3 (1167529664702951052) --> + <!-- no translation found for stopwatch_format_set:4 (4383974684898411623) --> <!-- no translation found for Nhours_description:one (371227238759147245) --> <!-- no translation found for Nhours_description:other (7018184076091344797) --> <!-- no translation found for Nminutes_description:one (1001391305885322059) --> @@ -395,8 +400,6 @@ <skip /> <!-- no translation found for city_delete_confirmation (1783441538785676299) --> <skip /> - <!-- no translation found for widget_loading_ms (790841709484678848) --> - <skip /> <!-- no translation found for digital_gadget (2326954556720571358) --> <skip /> </resources> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 47219d2df..349e19093 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Ora mea este <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Timpi circuit:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Circuitul <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 oră"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> ore"</item> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 9dd9dd668..08c65f3c7 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -31,7 +31,7 @@ <string name="default_label" msgid="5590025289805630372">"Будильник"</string> <string name="set_alarm" msgid="9148359866152726808">"Установить будильник"</string> <string name="alarm_vibrate" msgid="3476686921490362230">"Вибросигнал"</string> - <string name="alarm_repeat" msgid="7242985466344233206">"Дни недели"</string> + <string name="alarm_repeat" msgid="7242985466344233206">"Повторять"</string> <string name="alert" msgid="6506982899651975645">"Звонок будильника"</string> <string name="ringtone" msgid="9110746249688559579">"Рингтон"</string> <string name="time" msgid="8067216534232296518">"Время"</string> @@ -41,10 +41,10 @@ <string name="alarm_alert_snooze_set" msgid="656470966696912087">"Повтор сигнала через <xliff:g id="MINUTES">%d</xliff:g> мин."</string> <string name="alarm_alert_snooze_until" msgid="6958013659168344550">"Повтор в <xliff:g id="TIME">%s</xliff:g>"</string> <string-array name="timer_notifications"> - <item msgid="7760558912503484257">"Осталось меньше минуты"</item> - <item msgid="83197792732433351">"Осталось <xliff:g id="HOURS">%1$s</xliff:g>"</item> - <item msgid="8919698220200894252">"Осталось <xliff:g id="MINUTES">%2$s</xliff:g>"</item> - <item msgid="8458069283817013813">"Осталось <xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g>"</item> + <item msgid="7760558912503484257">"Осталось: меньше минуты"</item> + <item msgid="83197792732433351">"Осталось: <xliff:g id="HOURS">%1$s</xliff:g>"</item> + <item msgid="8919698220200894252">"Осталось: <xliff:g id="MINUTES">%2$s</xliff:g>"</item> + <item msgid="8458069283817013813">"Осталось: <xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g>"</item> </string-array> <string-array name="alarm_set"> <item msgid="6450913786084215050">"Будильник зазвонит менее чем через минуту."</item> @@ -58,9 +58,9 @@ </string-array> <string name="day" msgid="7984755014526510295">"1 день"</string> <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> дн."</string> - <string name="hour" msgid="2546819039651509323">"1 час"</string> + <string name="hour" msgid="2546819039651509323">"1 ч."</string> <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> ч."</string> - <string name="minute" msgid="2486157997434653710">"1 минуту"</string> + <string name="minute" msgid="2486157997434653710">"1 мин."</string> <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> мин."</string> <string name="every_day" msgid="4100909974923444602">"Каждый день"</string> <string name="never" msgid="54104287800571769">"Не выбрано"</string> @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Мое время: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Время круга"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Круг <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>м <xliff:g id="S">%3$02d</xliff:g>с.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>м <xliff:g id="S">%3$02d</xliff:g>с.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>ч <xliff:g id="M">%2$02d</xliff:g>м <xliff:g id="S">%3$02d</xliff:g>с.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>ч <xliff:g id="M">%2$02d</xliff:g>м <xliff:g id="S">%3$02d</xliff:g>с.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>ч <xliff:g id="M">%2$02d</xliff:g>м <xliff:g id="S">%3$02d</xliff:g>с.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 ч."</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> ч."</item> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 68888ba10..566e089cf 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Môj čas je <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Intervalové časy:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Kolo č. <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 hodina"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> hod."</item> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 05b5ea6e5..52d12e2f0 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Moj čas je <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Časi kroga:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. krog"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s. <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s. <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g> h <xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s. <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g> h <xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s. <xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g> h <xliff:g id="M">%2$02d</xliff:g> m <xliff:g id="S">%3$02d</xliff:g> s. <xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 ura"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> h"</item> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 70f0367d8..d3ea977e0 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Моје време је <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Пролазна времена:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. круг"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>м <xliff:g id="S">%3$02d</xliff:g>с,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>м <xliff:g id="S">%3$02d</xliff:g>с,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>ч <xliff:g id="M">%2$02d</xliff:g> м <xliff:g id="S">%3$02d</xliff:g>с,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>ч <xliff:g id="M">%2$02d</xliff:g>м <xliff:g id="S">%3$02d</xliff:g>с,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>ч <xliff:g id="M">%2$02d</xliff:g>м <xliff:g id="S">%3$02d</xliff:g>с,<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 сат"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> сата(и)"</item> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 6b4156bd2..946ad418e 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Min tid är <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Varvtider:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Varv <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 timme"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> timmar"</item> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index d8e55bf09..681b9af27 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Muda wangu ni <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Muda wa mzunguko:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Mzunguko <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"Saa 1"</item> <item quantity="other" msgid="7018184076091344797">"Saa <xliff:g id="NUMBER">%d</xliff:g>"</item> diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml index 15fc265d5..311d495a3 100644 --- a/res/values-sw600dp-land/dimens.xml +++ b/res/values-sw600dp-land/dimens.xml @@ -27,7 +27,7 @@ <dimen name="time_margin_right">8dip</dimen> <dimen name="time_margin_left">8dip</dimen> <dimen name="time_margin_bottom">14dip</dimen> - <dimen name="time_margin_top">16dip</dimen> + <dimen name="time_margin_top">32dip</dimen> <dimen name="ampm_margin_top">28dip</dimen> <dimen name="font_margin_adjust">8dip</dimen> <dimen name="next_alarm_margin_top">-5dip</dimen> @@ -38,8 +38,11 @@ <!-- Size of margin for circles. --> <dimen name="circle_margin_top">16dp</dimen> <dimen name="circle_margin">48dp</dimen> - <dimen name="laps_margin">36dp</dimen> <dimen name="analog_clock_margin">48dp</dimen> + <dimen name="timer_circle_margin">48dp</dimen> + + <dimen name="world_clock_margin">48dp</dimen> + <dimen name="sw_right_margin">48dp</dimen> <!-- Empty space at the edges of the +1 and reset button icons. Based off of 56dip width.--> <dimen name="plusone_reset_button_padding">23dip</dimen> @@ -52,5 +55,7 @@ <dimen name="glowpadview_margin_right">-64dip</dimen> - <dimen name="def_digital_widget_height">200dip</dimen> + <dimen name="min_digital_widget_resize_width">370dip</dimen> + <dimen name="min_digital_widget_height">200dip</dimen> + <dimen name="digital_widget_list_min_height">200dip</dimen> </resources> diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index 9ff029259..d14e6c632 100644 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -27,7 +27,9 @@ <dimen name="time_margin_right">8dip</dimen> <dimen name="time_margin_left">8dip</dimen> <dimen name="time_margin_bottom">14dip</dimen> - <dimen name="time_margin_top">32dip</dimen> + <dimen name="time_margin_top">48dip</dimen> + <dimen name="digital_margin_bottom">36dip</dimen> + <dimen name="screensaver_margin">32dip</dimen> <dimen name="ampm_margin_top">15dip</dimen> <dimen name="font_margin_adjust">8dip</dimen> <dimen name="next_alarm_margin_top">-5dip</dimen> @@ -56,14 +58,15 @@ <!-- Size of margin for circles. --> <dimen name="circle_margin_top">48dp</dimen> <dimen name="circle_margin">96dp</dimen> - <dimen name="laps_margin">110dp</dimen> <dimen name="analog_clock_margin">96dp</dimen> + <dimen name="timer_circle_margin">96dp</dimen> <!-- Width of the clock, for use with alarm buttons. --> <dimen name="alarm_alert_display_width">550dip</dimen> <!-- Size of analog clock in world clock. --> <dimen name="world_clock_analog_size">200dip</dimen> + <dimen name="world_clock_margin">96dp</dimen> <!-- Empty space at the edges of the +1 and reset button icons. Based off of 56dip width.--> <dimen name="plusone_reset_button_padding">23dip</dimen> <!-- Empty space at the edges of the delete button icons. Based off of 56dip width. --> @@ -81,11 +84,11 @@ <dimen name="glowpadview_margin_bottom">0dip</dimen> - <dimen name="min_digital_widget_width">300dip</dimen> + <dimen name="min_digital_widget_width">450dip</dimen> <dimen name="min_digital_widget_height">120dip</dimen> - <dimen name="min_digital_widget_resize_width">200dip</dimen> + <dimen name="min_digital_widget_resize_width">450dip</dimen> <dimen name="min_digital_widget_resize_height">120dip</dimen> <dimen name="def_digital_widget_width">200dip</dimen> - <dimen name="def_digital_widget_height">190dip</dimen> + <dimen name="digital_widget_list_min_height">190dip</dimen> </resources> diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml index de69a5da1..bee4607c2 100644 --- a/res/values-sw720dp-land/dimens.xml +++ b/res/values-sw720dp-land/dimens.xml @@ -22,6 +22,7 @@ <dimen name="glowpadview_margin_right">48dip</dimen> <dimen name="alarm_alert_clock_padding_left">128dp</dimen> - <dimen name="def_digital_widget_height">150dip</dimen> + <dimen name="digital_widget_list_min_height">150dip</dimen> + <dimen name="min_digital_widget_resize_width">370dip</dimen> </resources> diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index 51ffaf03c..142ff7932 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -18,5 +18,5 @@ <!-- These resources are around just to allow their values to be customized for different hardware and product builds. --> <resources> - <dimen name="def_digital_widget_height">145dip</dimen> + <dimen name="digital_widget_list_min_height">100dip</dimen> </resources> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 1551ee099..3d26d5a6a 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"เวลาของฉันคือ <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"เวลาสิ้นสุดรอบ:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"สิ้นสุดรอบที่ <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 ชั่วโมง"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> ชั่วโมง"</item> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index b4788d351..cd791172e 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Ang aking oras ay <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Mga lap time:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Lap <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 oras"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> (na) oras"</item> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 869aeba85..d6fd55d43 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Saatim: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Tur süreleri:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g>. tur"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>d <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>d <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>s <xliff:g id="M">%2$02d</xliff:g>d <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>s <xliff:g id="M">%2$02d</xliff:g>d <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>s <xliff:g id="M">%2$02d</xliff:g>d <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 saat"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> saat"</item> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 7f6924125..1f485e011 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -68,7 +68,7 @@ <string name="clock_instructions" msgid="2656876819515011590">"Виберіть годинник"</string> <string name="analog_gadget" msgid="1670505720837152766">"Аналог. годинник"</string> <string name="help" msgid="7786263119482654015">"довідка"</string> - <string name="settings" msgid="5849739030579520686">"Налаштув-ня"</string> + <string name="settings" msgid="5849739030579520686">"Налаштування"</string> <string name="snooze_duration_title" msgid="1097309861110780483">"Відкласти на"</string> <plurals name="snooze_duration"> <item quantity="one" msgid="7406963706727564418">"1 хвилина"</item> @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Мій час – <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Час кола:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Коло <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>хв <xliff:g id="S">%3$02d</xliff:g>с,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>хв <xliff:g id="S">%3$02d</xliff:g>с,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>год <xliff:g id="M">%2$02d</xliff:g>хв <xliff:g id="S">%3$02d</xliff:g>с,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>год <xliff:g id="M">%2$02d</xliff:g>хв <xliff:g id="S">%3$02d</xliff:g>с,<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>год <xliff:g id="M">%2$02d</xliff:g>хв <xliff:g id="S">%3$02d</xliff:g>с,<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 год."</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> год."</item> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 9223d4193..17da5051c 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Thời gian của tôi là <xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Số lần bấm giờ:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"<xliff:g id="NUMBER">%d</xliff:g> bấm giờ"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>p <xliff:g id="S">%3$02d</xliff:g>g.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>p <xliff:g id="S">%3$02d</xliff:g>g.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>p <xliff:g id="S">%3$02d</xliff:g>g.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>p <xliff:g id="S">%3$02d</xliff:g>g.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>p <xliff:g id="S">%3$02d</xliff:g>g.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 giờ"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> giờ"</item> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index e9a14f26a..6ab44aa7d 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -181,6 +181,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"我的时间：<xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"各圈时间："</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"第 <xliff:g id="NUMBER">%d</xliff:g> 圈"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>:<xliff:g id="S">%3$02d</xliff:g>.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>:<xliff:g id="S">%3$02d</xliff:g>.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>:<xliff:g id="M">%2$02d</xliff:g>:<xliff:g id="S">%3$02d</xliff:g>.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>:<xliff:g id="M">%2$02d</xliff:g>:<xliff:g id="S">%3$02d</xliff:g>.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>:<xliff:g id="M">%2$02d</xliff:g>:<xliff:g id="S">%3$02d</xliff:g>.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 小时"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> 小时"</item> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 902b99f7f..64d18bc5b 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"我的時間：<xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"單圈時間："</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"第 <xliff:g id="NUMBER">%d</xliff:g> 圈"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>:<xliff:g id="S">%3$02d</xliff:g>。<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>:<xliff:g id="S">%3$02d</xliff:g>。<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>:<xliff:g id="M">%2$02d</xliff:g>:<xliff:g id="S">%3$02d</xliff:g>。<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>:<xliff:g id="M">%2$02d</xliff:g>:<xliff:g id="S">%3$02d</xliff:g>。<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>:<xliff:g id="M">%2$02d</xliff:g>:<xliff:g id="S">%3$02d</xliff:g>。<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 小時"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> 小時"</item> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 6fa1d5778..b48e482a0 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -147,6 +147,13 @@ <string name="sw_share_main" msgid="7703563468204234405">"Isikhathi sami ngu-<xliff:g id="TIME">%s</xliff:g>"</string> <string name="sw_share_laps" msgid="614390674795945007">"Ukuhluka kwezikhathi:"</string> <string name="sw_notification_lap_number" msgid="3535420316052647126">"Xhapha <xliff:g id="NUMBER">%d</xliff:g>"</string> + <string-array name="stopwatch_format_set"> + <item msgid="7855304148648938406">"<xliff:g id="M">%2$d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="3964356050933061913">"<xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4906928997138522728">"<xliff:g id="H">%1$d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="1167529664702951052">"<xliff:g id="H">%1$02d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + <item msgid="4383974684898411623">"<xliff:g id="H">%1$03d</xliff:g>h <xliff:g id="M">%2$02d</xliff:g>m <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>"</item> + </string-array> <plurals name="Nhours_description"> <item quantity="one" msgid="371227238759147245">"1 ihora"</item> <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> amahora"</item> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 3acc55054..dbad8a77d 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -27,8 +27,10 @@ <dimen name="time_margin_right">8dip</dimen> <dimen name="time_margin_left">8dip</dimen> <dimen name="time_margin_bottom">8dip</dimen> - <dimen name="time_margin_top">16dip</dimen> + <dimen name="time_margin_top">32dip</dimen> + <dimen name="digital_margin_bottom">24dip</dimen> <dimen name="timer_padding_left">16dip</dimen> + <dimen name="screensaver_margin">16dip</dimen> <dimen name="ampm_margin_top">8dip</dimen> <dimen name="font_margin_adjust">4dip</dimen> <dimen name="next_alarm_margin_top">-4dip</dimen> @@ -69,6 +71,7 @@ <dimen name="medium_space_top">24dp</dimen> <dimen name="medium_space_bottom">8dp</dimen> <dimen name="style_label_space">4dip</dimen> + <dimen name="sw_item_space">16dip</dimen> <dimen name="label_margin_big">4dp</dimen> <dimen name="label_margin_small">2dp</dimen> @@ -86,8 +89,10 @@ <!-- Size of margin for circles. --> <dimen name="circle_margin_top">16dp</dimen> <dimen name="circle_margin">32dp</dimen> - <dimen name="laps_margin">52dp</dimen> <dimen name="analog_clock_margin">60dp</dimen> + <dimen name="timer_circle_margin">32dp</dimen> + + <dimen name="sw_right_margin">32dp</dimen> <!-- The width of the big icons in notifications. --> <dimen name="notification_large_icon_width">64dp</dimen> @@ -105,6 +110,7 @@ <!-- Size of analog clock in world clock. --> <dimen name="world_clock_analog_size">100dip</dimen> + <dimen name="world_clock_margin">32dp</dimen> <dimen name="toast_bar_bottom_margin_in_conversation">24dip</dimen> @@ -147,9 +153,10 @@ <dimen name="min_digital_widget_width">160dip</dimen> <dimen name="min_digital_widget_height">70dip</dimen> <dimen name="min_digital_widget_resize_width">160dip</dimen> - <dimen name="min_digital_widget_resize_height">35dip</dimen> + <dimen name="min_digital_widget_resize_height">70dip</dimen> <dimen name="def_digital_widget_width">160dip</dimen> - <dimen name="def_digital_widget_height">70dip</dimen> + <dimen name="def_digital_widget_height">130dip</dimen> + <dimen name="digital_widget_list_min_height">70dip</dimen> <dimen name="digital_widget_list_margin_top">12dip</dimen> <integer name="timer_weight">4</integer> diff --git a/res/values/strings.xml b/res/values/strings.xml index 106fed59c..dc3d6ef27 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -379,11 +379,11 @@ <!-- Describes the purpose of the button to share the stopwatch value. --> <string name="sw_share_button">Share</string> - <!-- Abbreviation for temporal hours --> + <!-- Abbreviation for temporal hours [CHAR LIMIT=1] --> <string name="hours_label">h</string> - <!-- Abbreviation for temporal minutes --> + <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] --> <string name="minutes_label">m</string> - <!-- Abbreviation for temporal seconds --> + <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] --> <string name="seconds_label">s</string> <!-- Accessibility strings --> <string name="hours_label_description">hours</string> @@ -397,8 +397,40 @@ <string name="sw_share_main">My time is <xliff:g id="time">%s</xliff:g></string> <!-- Header within the message created to share a list of lap times (a new line is appended to this) --> <string name="sw_share_laps">Lap times:</string> - <!-- Label to enumerate the number of laps the user has counted --> + <!-- Label to enumerate the number of laps in the notification the user has counted --> <string name="sw_notification_lap_number">Lap <xliff:g id="number">%d</xliff:g></string> + <!-- Formatted stopwatch time + [CHAR LIMIT=1] for each abbreviation as in hours_label, etc. --> + <string-array name="stopwatch_format_set"> + <item> <!-- <10 minutes - example "1m 02s.03" --> + <xliff:g id="M">%2$d</xliff:g>m + <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g> + </item> + <item> <!-- <1 hour - example "12m 03s.04" --> + <xliff:g id="M">%2$02d</xliff:g>m + <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g> + </item> + <item> <!-- <10 hours - example "1h 02m 03s.04" --> + <xliff:g id="H">%1$d</xliff:g>h + <xliff:g id="M">%2$02d</xliff:g>m + <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g> + </item> + <item> <!-- <100 hours - example "12h 03m 04s.05" --> + <xliff:g id="H">%1$02d</xliff:g>h + <xliff:g id="M">%2$02d</xliff:g>m + <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g> + </item> + <item> <!-- <1000 hours - example "123h 04m 05s.06" --> + <xliff:g id="H">%1$03d</xliff:g>h + <xliff:g id="M">%2$02d</xliff:g>m + <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g> + </item> + </string-array> + <!-- Label to enumerate the number of laps the user has counted --> + <string-array name="sw_lap_number_set" translatable="false"> + <item># <xliff:g id="number">%d</xliff:g></item> + <item># <xliff:g id="number">%02d</xliff:g></item> + </string-array> <!-- Stopwatch accessibility strings --> <plurals name="Nhours_description"> diff --git a/res/xml/dream_settings.xml b/res/xml/dream_settings.xml index 063143488..5c7a3e135 100644 --- a/res/xml/dream_settings.xml +++ b/res/xml/dream_settings.xml @@ -26,5 +26,5 @@ android:key="screensaver_night_mode" android:title="@string/night_mode_title" android:summary="@string/night_mode_summary" - android:defaultValue="false" /> + android:defaultValue="true" /> </PreferenceScreen> diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 46977b8ec..e48a1605c 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -96,7 +96,7 @@ android:key="keep_display_on_stopwatch" android:title="@string/keep_display_on_stopwatch" android:summary="@string/keep_display_on_stopwatch_summary" - android:defaultValue="true" /> + android:defaultValue="0" /> </PreferenceCategory> </PreferenceScreen> |