diff options
65 files changed, 449 insertions, 449 deletions
diff --git a/core/res/res/values-ar-rEG/donottranslate-cldr.xml b/core/res/res/values-ar-rEG/donottranslate-cldr.xml index a157ec86e370..64f174eceed4 100644 --- a/core/res/res/values-ar-rEG/donottranslate-cldr.xml +++ b/core/res/res/values-ar-rEG/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B، %Y</string> <string name="time_of_day">%-l:%M:%S %p</string> <string name="date_and_time">%-l:%M:%S %p %d/%m/%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d/%m/%Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s – %2$s</string> - <string name="date1_date2">%1$s – %2$s</string> + <string name="date1_date2">%2$s – %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s، %3$s/%2$s - %6$s، %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s، %3$s %2$s %4$s – %10$s %6$s، %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s، %3$s %2$s %4$s – %10$s %6$s، %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s، %3$s %2$s %4$s – %6$s، %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s – %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s – %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s، %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s، %9$s</string> diff --git a/core/res/res/values-bg-rBG/donottranslate-cldr.xml b/core/res/res/values-bg-rBG/donottranslate-cldr.xml index 2ea40f484939..ae39696f3506 100644 --- a/core/res/res/values-bg-rBG/donottranslate-cldr.xml +++ b/core/res/res/values-bg-rBG/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%d %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %d.%m.%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d.%m.%Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y %b</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s - %8$s.%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%3$s.%2$s, %1$s - %8$s.%7$s, %6$s</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s - %10$s %6$s, %9$s %7$s %8$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s - %10$s %6$s, %9$s %7$s %8$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %4$s %2$s %3$s - %6$s, %9$s %7$s %8$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%3$s %2$s, %1$s - %8$s %7$s, %6$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-ca-rES/donottranslate-cldr.xml b/core/res/res/values-ca-rES/donottranslate-cldr.xml index d5a3c1eb9f11..34ed19699f67 100644 --- a/core/res/res/values-ca-rES/donottranslate-cldr.xml +++ b/core/res/res/values-ca-rES/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e de %B de %Y</string> <string name="time_of_day">%-k:%M:%S</string> <string name="date_and_time">%-k:%M:%S %d/%m/%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d/%m/%Y</string> <string name="month_day">%-e de %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s/%2$s - %6$s %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s - %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s - %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s %3$s %2$s %4$s - %6$s %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s de %2$s - %8$s de %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s de %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s - %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s de %2$s - %8$s de %7$s de %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s de %2$s de %9$s</string> diff --git a/core/res/res/values-cs-rCZ/donottranslate-cldr.xml b/core/res/res/values-cs-rCZ/donottranslate-cldr.xml index efe3e991bcd6..c735778d0773 100644 --- a/core/res/res/values-cs-rCZ/donottranslate-cldr.xml +++ b/core/res/res/values-cs-rCZ/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e. %B %Y</string> <string name="time_of_day">%-k:%M:%S</string> <string name="date_and_time">%-k:%M:%S %-e.%-m.%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e.%-m.%Y</string> <string name="month_day">%-e. %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y %b</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s. - %8$s.%7$s.</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s. - %6$s, %8$s.%7$s.</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s - %10$s %6$s, %9$s %7$s %8$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s - %10$s %6$s, %9$s %7$s %8$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %4$s %2$s %3$s - %6$s, %9$s %7$s %8$s</string> - <string name="same_month_md1_md2">%3$s. %2$s - %8$s. %7$s</string> + <string name="same_month_md1_md2">%3$s.-%8$s. %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %2$s %3$s - %6$s %7$s %8$s</string> <string name="same_year_mdy1_mdy2">%3$s. %2$s - %8$s. %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s.-%8$s. %2$s %9$s</string> diff --git a/core/res/res/values-cs/donottranslate-cldr.xml b/core/res/res/values-cs/donottranslate-cldr.xml index efe3e991bcd6..c735778d0773 100644 --- a/core/res/res/values-cs/donottranslate-cldr.xml +++ b/core/res/res/values-cs/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e. %B %Y</string> <string name="time_of_day">%-k:%M:%S</string> <string name="date_and_time">%-k:%M:%S %-e.%-m.%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e.%-m.%Y</string> <string name="month_day">%-e. %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y %b</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s. - %8$s.%7$s.</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s. - %6$s, %8$s.%7$s.</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s - %10$s %6$s, %9$s %7$s %8$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s - %10$s %6$s, %9$s %7$s %8$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %4$s %2$s %3$s - %6$s, %9$s %7$s %8$s</string> - <string name="same_month_md1_md2">%3$s. %2$s - %8$s. %7$s</string> + <string name="same_month_md1_md2">%3$s.-%8$s. %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %2$s %3$s - %6$s %7$s %8$s</string> <string name="same_year_mdy1_mdy2">%3$s. %2$s - %8$s. %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s.-%8$s. %2$s %9$s</string> diff --git a/core/res/res/values-da-rDK/donottranslate-cldr.xml b/core/res/res/values-da-rDK/donottranslate-cldr.xml index 0324f6bde951..e0cc394f77a8 100644 --- a/core/res/res/values-da-rDK/donottranslate-cldr.xml +++ b/core/res/res/values-da-rDK/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e. %b %Y</string> <string name="time_of_day">%H.%M.%S</string> <string name="date_and_time">%H.%M.%S %d/%m/%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d/%m/%Y</string> <string name="month_day">%-e. %B</string> <string name="month">%b</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s/%2$s - %6$s %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s. %3$s. %2$s %4$s - %10$s %6$s. %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s. %3$s. %2$s %4$s - %10$s %6$s. %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s. %3$s. %2$s %4$s - %6$s. %8$s. %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s. %2$s - %8$s. %7$s</string> + <string name="same_month_md1_md2">%3$s.-%8$s. %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s - %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s. %2$s - %8$s. %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s.-%8$s. %2$s %9$s</string> diff --git a/core/res/res/values-de-rAT/donottranslate-cldr.xml b/core/res/res/values-de-rAT/donottranslate-cldr.xml index 25c4f173b21d..2399e69f00a3 100644 --- a/core/res/res/values-de-rAT/donottranslate-cldr.xml +++ b/core/res/res/values-de-rAT/donottranslate-cldr.xml @@ -65,8 +65,8 @@ <string name="month_day_year">%d. %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %d.%m.%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d.%m.%Y</string> <string name="month_day">%-e. %B</string> <string name="month">%-B</string> @@ -75,7 +75,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s. - %8$s.%7$s.</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s. - %6$s, %8$s.%7$s.</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string> @@ -101,7 +101,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s. %2$s %4$s - %10$s %6$s, %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s. %2$s %4$s - %10$s %6$s, %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s. %2$s %4$s - %6$s, %8$s. %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s. %2$s - %8$s. %7$s</string> + <string name="same_month_md1_md2">%3$s.-%8$s. %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s. %2$s - %6$s %8$s. %7$s</string> <string name="same_year_mdy1_mdy2">%3$s. %2$s - %8$s. %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s.-%8$s. %2$s %9$s</string> diff --git a/core/res/res/values-de-rCH/donottranslate-cldr.xml b/core/res/res/values-de-rCH/donottranslate-cldr.xml index 659999b46e76..7081d028bd4f 100644 --- a/core/res/res/values-de-rCH/donottranslate-cldr.xml +++ b/core/res/res/values-de-rCH/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e. %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %d.%m.%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d.%m.%Y</string> <string name="month_day">%-e. %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s. - %8$s.%7$s.</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s. - %6$s, %8$s.%7$s.</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s. %2$s %4$s - %10$s %6$s, %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s. %2$s %4$s - %10$s %6$s, %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s. %2$s %4$s - %6$s, %8$s. %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s. %2$s - %8$s. %7$s</string> + <string name="same_month_md1_md2">%3$s.-%8$s. %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s. %2$s - %6$s %8$s. %7$s</string> <string name="same_year_mdy1_mdy2">%3$s. %2$s - %8$s. %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s.-%8$s. %2$s %9$s</string> diff --git a/core/res/res/values-de-rDE/donottranslate-cldr.xml b/core/res/res/values-de-rDE/donottranslate-cldr.xml index 659999b46e76..7081d028bd4f 100644 --- a/core/res/res/values-de-rDE/donottranslate-cldr.xml +++ b/core/res/res/values-de-rDE/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e. %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %d.%m.%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d.%m.%Y</string> <string name="month_day">%-e. %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s. - %8$s.%7$s.</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s. - %6$s, %8$s.%7$s.</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s. %2$s %4$s - %10$s %6$s, %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s. %2$s %4$s - %10$s %6$s, %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s. %2$s %4$s - %6$s, %8$s. %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s. %2$s - %8$s. %7$s</string> + <string name="same_month_md1_md2">%3$s.-%8$s. %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s. %2$s - %6$s %8$s. %7$s</string> <string name="same_year_mdy1_mdy2">%3$s. %2$s - %8$s. %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s.-%8$s. %2$s %9$s</string> diff --git a/core/res/res/values-de-rLI/donottranslate-cldr.xml b/core/res/res/values-de-rLI/donottranslate-cldr.xml index 659999b46e76..7081d028bd4f 100644 --- a/core/res/res/values-de-rLI/donottranslate-cldr.xml +++ b/core/res/res/values-de-rLI/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e. %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %d.%m.%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d.%m.%Y</string> <string name="month_day">%-e. %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s. - %8$s.%7$s.</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s. - %6$s, %8$s.%7$s.</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s. %2$s %4$s - %10$s %6$s, %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s. %2$s %4$s - %10$s %6$s, %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s. %2$s %4$s - %6$s, %8$s. %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s. %2$s - %8$s. %7$s</string> + <string name="same_month_md1_md2">%3$s.-%8$s. %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s. %2$s - %6$s %8$s. %7$s</string> <string name="same_year_mdy1_mdy2">%3$s. %2$s - %8$s. %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s.-%8$s. %2$s %9$s</string> diff --git a/core/res/res/values-de/donottranslate-cldr.xml b/core/res/res/values-de/donottranslate-cldr.xml index 659999b46e76..7081d028bd4f 100644 --- a/core/res/res/values-de/donottranslate-cldr.xml +++ b/core/res/res/values-de/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e. %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %d.%m.%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d.%m.%Y</string> <string name="month_day">%-e. %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s. - %8$s.%7$s.</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s. - %6$s, %8$s.%7$s.</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s. %2$s %4$s - %10$s %6$s, %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s. %2$s %4$s - %10$s %6$s, %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s. %2$s %4$s - %6$s, %8$s. %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s. %2$s - %8$s. %7$s</string> + <string name="same_month_md1_md2">%3$s.-%8$s. %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s. %2$s - %6$s %8$s. %7$s</string> <string name="same_year_mdy1_mdy2">%3$s. %2$s - %8$s. %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s.-%8$s. %2$s %9$s</string> diff --git a/core/res/res/values-el-rGR/donottranslate-cldr.xml b/core/res/res/values-el-rGR/donottranslate-cldr.xml index f4500a6644c9..d6a1010359ed 100644 --- a/core/res/res/values-el-rGR/donottranslate-cldr.xml +++ b/core/res/res/values-el-rGR/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%d %B %Y</string> <string name="time_of_day">%-l:%M:%S %p</string> <string name="date_and_time">%-l:%M:%S %p %d %b %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d %b %Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s/%2$s - %6$s, %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s - %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s - %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s %2$s %4$s - %6$s, %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s, %3$s %2$s - %6$s, %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-en-rAU/donottranslate-cldr.xml b/core/res/res/values-en-rAU/donottranslate-cldr.xml index d4a0c8386d9b..9e4b88e026a3 100644 --- a/core/res/res/values-en-rAU/donottranslate-cldr.xml +++ b/core/res/res/values-en-rAU/donottranslate-cldr.xml @@ -91,15 +91,15 @@ <string name="today">Today</string> <string name="tomorrow">Tomorrow</string> - <string name="hour_minute_ampm">%-l:%M %p</string> - <string name="hour_minute_cap_ampm">%-l:%M %^p</string> + <string name="hour_minute_ampm">%-l:%M%p</string> + <string name="hour_minute_cap_ampm">%-l:%M%^p</string> <string name="numeric_date">%-e/%m/%Y</string> <string name="numeric_date_format">d/MM/yyyy</string> <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%-l:%M:%S %p</string> - <string name="date_and_time">%-l:%M:%S %p %d/%m/%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_and_time">%d/%m/%Y, %-l:%M:%S %p</string> + <string name="date_time">%1$s, %2$s</string> + <string name="time_date">%1$s, %3$s</string> <string name="abbrev_month_day_year">%d/%m/%Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,33 +108,33 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s/%2$s - %6$s, %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string> <string name="numeric_wday1_mdy1_wday2_mdy2">%1$s, %3$s/%2$s/%4$s - %6$s, %8$s/%7$s/%9$s</string> - <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s/%3$s/%4$s - %10$s %6$s, %7$s/%8$s/%9$s</string> - <string name="numeric_md1_time1_md2_time2">%5$s %2$s/%3$s - %10$s %7$s/%8$s</string> - <string name="numeric_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s/%3$s - %10$s %6$s, %7$s/%8$s</string> - <string name="numeric_mdy1_time1_mdy2_time2">%5$s %3$s/%2$s/%4$s - %10$s %8$s/%7$s/%9$s</string> - <string name="wday1_date1_time1_wday2_date2_time2">%3$s %1$s, %2$s - %6$s %4$s, %5$s</string> + <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s/%3$s/%4$s, %5$s - %6$s, %7$s/%8$s/%9$s, %10$s</string> + <string name="numeric_md1_time1_md2_time2">%2$s/%3$s, %5$s - %7$s/%8$s, %10$s</string> + <string name="numeric_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s/%3$s, %5$s - %6$s, %7$s/%8$s, %10$s</string> + <string name="numeric_mdy1_time1_mdy2_time2">%3$s/%2$s/%4$s, %5$s - %8$s/%7$s/%9$s, %10$s</string> + <string name="wday1_date1_time1_wday2_date2_time2">%1$s, %2$s, %3$s - %4$s, %5$s, %6$s</string> <string name="wday1_date1_wday2_date2">%1$s, %2$s - %4$s, %5$s</string> - <string name="date1_time1_date2_time2">%3$s %2$s - %6$s %5$s</string> - <string name="time_wday_date">%1$s %2$s, %3$s</string> + <string name="date1_time1_date2_time2">%2$s, %3$s - %5$s, %6$s</string> + <string name="time_wday_date">%1$s, %2$s, %3$s</string> <string name="wday_date">%2$s, %3$s</string> - <string name="time_wday">%1$s %2$s</string> + <string name="time_wday">%1$s, %2$s</string> <string name="same_year_md1_md2">%3$s %2$s - %8$s %7$s</string> <string name="same_year_wday1_md1_wday2_md2">%1$s, %2$s %3$s - %6$s, %7$s %8$s</string> - <string name="same_year_md1_time1_md2_time2">%5$s %3$s %2$s - %10$s %8$s %7$s</string> - <string name="same_month_md1_time1_md2_time2">%5$s %3$s %2$s - %10$s %8$s %7$s</string> - <string name="same_year_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s - %10$s %6$s, %7$s %8$s</string> - <string name="same_month_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s - %10$s %6$s, %7$s %8$s</string> - <string name="same_year_mdy1_time1_mdy2_time2">%5$s %3$s %2$s %4$s - %10$s %8$s %7$s %9$s</string> - <string name="same_month_mdy1_time1_mdy2_time2">%5$s %3$s %2$s %4$s - %10$s %8$s %7$s %9$s</string> - <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s - %10$s %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s - %10$s %6$s, %7$s %8$s, %9$s</string> + <string name="same_year_md1_time1_md2_time2">%3$s %2$s, %5$s - %8$s %7$s, %10$s</string> + <string name="same_month_md1_time1_md2_time2">%3$s %2$s, %5$s - %8$s %7$s, %10$s</string> + <string name="same_year_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s - %6$s, %7$s %8$s, %10$s</string> + <string name="same_month_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s - %6$s, %7$s %8$s, %10$s</string> + <string name="same_year_mdy1_time1_mdy2_time2">%3$s %2$s %4$s, %5$s - %8$s %7$s %9$s, %10$s</string> + <string name="same_month_mdy1_time1_mdy2_time2">%3$s %2$s %4$s, %5$s - %8$s %7$s %9$s, %10$s</string> + <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s - %6$s, %7$s %8$s, %9$s, %10$s</string> + <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s - %6$s, %7$s %8$s, %9$s, %10$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %2$s %3$s, %4$s - %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s, %2$s %3$s - %6$s, %7$s %8$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-en-rCA/donottranslate-cldr.xml b/core/res/res/values-en-rCA/donottranslate-cldr.xml index 9a204c9a7b2e..5340c29dd2fa 100644 --- a/core/res/res/values-en-rCA/donottranslate-cldr.xml +++ b/core/res/res/values-en-rCA/donottranslate-cldr.xml @@ -91,15 +91,15 @@ <string name="today">Today</string> <string name="tomorrow">Tomorrow</string> - <string name="hour_minute_ampm">%-l:%M %p</string> - <string name="hour_minute_cap_ampm">%-l:%M %^p</string> + <string name="hour_minute_ampm">%-l:%M%p</string> + <string name="hour_minute_cap_ampm">%-l:%M%^p</string> <string name="numeric_date">%Y-%m-%d</string> <string name="numeric_date_format">yyyy-MM-dd</string> <string name="month_day_year">%B %-e, %Y</string> <string name="time_of_day">%-l:%M:%S %p</string> - <string name="date_and_time">%-l:%M:%S %p %Y-%m-%d</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_and_time">%Y-%m-%d, %-l:%M:%S %p</string> + <string name="date_time">%1$s, %2$s</string> + <string name="time_date">%1$s, %3$s</string> <string name="abbrev_month_day_year">%Y-%m-%d</string> <string name="month_day">%B %-e</string> <string name="month">%-B</string> @@ -108,33 +108,33 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%2$s-%3$s - %7$s-%8$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %2$s-%3$s - %6$s, %7$s-%8$s</string> <string name="numeric_mdy1_mdy2">%4$s-%2$s-%3$s - %9$s-%7$s-%8$s</string> <string name="numeric_wday1_mdy1_wday2_mdy2">%1$s, %4$s-%2$s-%3$s - %6$s, %9$s-%7$s-%8$s</string> - <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s/%3$s/%4$s - %10$s %6$s, %7$s/%8$s/%9$s</string> - <string name="numeric_md1_time1_md2_time2">%5$s %2$s/%3$s - %10$s %7$s/%8$s</string> - <string name="numeric_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s/%3$s - %10$s %6$s, %7$s/%8$s</string> - <string name="numeric_mdy1_time1_mdy2_time2">%5$s %4$s-%2$s-%3$s - %10$s %9$s-%7$s-%8$s</string> - <string name="wday1_date1_time1_wday2_date2_time2">%3$s %1$s, %2$s - %6$s %4$s, %5$s</string> + <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s/%3$s/%4$s, %5$s - %6$s, %7$s/%8$s/%9$s, %10$s</string> + <string name="numeric_md1_time1_md2_time2">%2$s/%3$s, %5$s - %7$s/%8$s, %10$s</string> + <string name="numeric_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s/%3$s, %5$s - %6$s, %7$s/%8$s, %10$s</string> + <string name="numeric_mdy1_time1_mdy2_time2">%4$s-%2$s-%3$s, %5$s - %9$s-%7$s-%8$s, %10$s</string> + <string name="wday1_date1_time1_wday2_date2_time2">%1$s, %2$s, %3$s - %4$s, %5$s, %6$s</string> <string name="wday1_date1_wday2_date2">%1$s, %2$s - %4$s, %5$s</string> - <string name="date1_time1_date2_time2">%3$s %2$s - %6$s %5$s</string> - <string name="time_wday_date">%1$s %2$s, %3$s</string> + <string name="date1_time1_date2_time2">%2$s, %3$s - %5$s, %6$s</string> + <string name="time_wday_date">%1$s, %2$s, %3$s</string> <string name="wday_date">%2$s, %3$s</string> - <string name="time_wday">%1$s %2$s</string> + <string name="time_wday">%1$s, %2$s</string> <string name="same_year_md1_md2">%2$s %3$s - %7$s %8$s</string> <string name="same_year_wday1_md1_wday2_md2">%1$s, %2$s %3$s - %6$s, %7$s %8$s</string> - <string name="same_year_md1_time1_md2_time2">%5$s %2$s %3$s - %10$s %7$s %8$s</string> - <string name="same_month_md1_time1_md2_time2">%5$s %2$s %3$s - %10$s %7$s %8$s</string> - <string name="same_year_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s - %10$s %6$s, %7$s %8$s</string> - <string name="same_month_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s - %10$s %6$s, %7$s %8$s</string> - <string name="same_year_mdy1_time1_mdy2_time2">%5$s %2$s %3$s, %4$s - %10$s %7$s %8$s, %9$s</string> - <string name="same_month_mdy1_time1_mdy2_time2">%5$s %2$s %3$s, %4$s - %10$s %7$s %8$s, %9$s</string> - <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s - %10$s %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s - %10$s %6$s, %7$s %8$s, %9$s</string> + <string name="same_year_md1_time1_md2_time2">%2$s %3$s, %5$s - %7$s %8$s, %10$s</string> + <string name="same_month_md1_time1_md2_time2">%2$s %3$s, %5$s - %7$s %8$s, %10$s</string> + <string name="same_year_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s - %6$s, %7$s %8$s, %10$s</string> + <string name="same_month_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s - %6$s, %7$s %8$s, %10$s</string> + <string name="same_year_mdy1_time1_mdy2_time2">%2$s %3$s, %4$s, %5$s - %7$s %8$s, %9$s, %10$s</string> + <string name="same_month_mdy1_time1_mdy2_time2">%2$s %3$s, %4$s, %5$s - %7$s %8$s, %9$s, %10$s</string> + <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s - %6$s, %7$s %8$s, %9$s, %10$s</string> + <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s - %6$s, %7$s %8$s, %9$s, %10$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %2$s %3$s, %4$s - %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_md1_md2">%2$s %3$s - %7$s %8$s</string> + <string name="same_month_md1_md2">%2$s %3$s-%8$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s, %2$s %3$s - %6$s, %7$s %8$s</string> <string name="same_year_mdy1_mdy2">%2$s %3$s - %7$s %8$s, %9$s</string> <string name="same_month_mdy1_mdy2">%2$s %3$s-%8$s, %9$s</string> diff --git a/core/res/res/values-en-rGB/donottranslate-cldr.xml b/core/res/res/values-en-rGB/donottranslate-cldr.xml index b48e7b25ed69..226968a4c310 100644 --- a/core/res/res/values-en-rGB/donottranslate-cldr.xml +++ b/core/res/res/values-en-rGB/donottranslate-cldr.xml @@ -97,9 +97,9 @@ <string name="numeric_date_format">dd/MM/yyyy</string> <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%H:%M:%S</string> - <string name="date_and_time">%H:%M:%S %-e %b %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_and_time">%-e %b %Y, %H:%M:%S</string> + <string name="date_time">%1$s, %2$s</string> + <string name="time_date">%1$s, %3$s</string> <string name="abbrev_month_day_year">%-e %b %Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,33 +108,33 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s/%2$s - %6$s, %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string> <string name="numeric_wday1_mdy1_wday2_mdy2">%1$s, %3$s/%2$s/%4$s - %6$s, %8$s/%7$s/%9$s</string> - <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s/%2$s/%4$s - %10$s %6$s, %8$s/%7$s/%9$s</string> - <string name="numeric_md1_time1_md2_time2">%5$s %3$s/%2$s - %10$s %8$s/%7$s</string> - <string name="numeric_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %3$s/%2$s - %10$s %6$s, %8$s/%7$s</string> - <string name="numeric_mdy1_time1_mdy2_time2">%5$s %3$s/%2$s/%4$s - %10$s %8$s/%7$s/%9$s</string> - <string name="wday1_date1_time1_wday2_date2_time2">%3$s %1$s, %2$s - %6$s %4$s, %5$s</string> + <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %3$s/%2$s/%4$s, %5$s - %6$s, %8$s/%7$s/%9$s, %10$s</string> + <string name="numeric_md1_time1_md2_time2">%3$s/%2$s, %5$s - %8$s/%7$s, %10$s</string> + <string name="numeric_wday1_md1_time1_wday2_md2_time2">%1$s, %3$s/%2$s, %5$s - %6$s, %8$s/%7$s, %10$s</string> + <string name="numeric_mdy1_time1_mdy2_time2">%3$s/%2$s/%4$s, %5$s - %8$s/%7$s/%9$s, %10$s</string> + <string name="wday1_date1_time1_wday2_date2_time2">%1$s, %2$s, %3$s - %4$s, %5$s, %6$s</string> <string name="wday1_date1_wday2_date2">%1$s, %2$s - %4$s, %5$s</string> - <string name="date1_time1_date2_time2">%3$s %2$s - %6$s %5$s</string> - <string name="time_wday_date">%1$s %2$s, %3$s</string> + <string name="date1_time1_date2_time2">%2$s, %3$s - %5$s, %6$s</string> + <string name="time_wday_date">%1$s, %2$s, %3$s</string> <string name="wday_date">%2$s, %3$s</string> - <string name="time_wday">%1$s %2$s</string> + <string name="time_wday">%1$s, %2$s</string> <string name="same_year_md1_md2">%3$s %2$s - %8$s %7$s</string> <string name="same_year_wday1_md1_wday2_md2">%1$s %3$s %2$s - %6$s %8$s %7$s</string> - <string name="same_year_md1_time1_md2_time2">%5$s %3$s %2$s - %10$s %8$s %7$s</string> - <string name="same_month_md1_time1_md2_time2">%5$s %3$s %2$s - %10$s %8$s %7$s</string> - <string name="same_year_wday1_md1_time1_wday2_md2_time2">%5$s %1$s %3$s %2$s - %10$s %6$s %8$s %7$s</string> - <string name="same_month_wday1_md1_time1_wday2_md2_time2">%5$s %1$s %3$s %2$s - %10$s %6$s %8$s %7$s</string> - <string name="same_year_mdy1_time1_mdy2_time2">%5$s %3$s %2$s %4$s - %10$s %8$s %7$s %9$s</string> - <string name="same_month_mdy1_time1_mdy2_time2">%5$s %3$s %2$s %4$s - %10$s %8$s %7$s %9$s</string> - <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s - %10$s %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s - %10$s %6$s, %7$s %8$s, %9$s</string> + <string name="same_year_md1_time1_md2_time2">%3$s %2$s, %5$s - %8$s %7$s, %10$s</string> + <string name="same_month_md1_time1_md2_time2">%3$s %2$s, %5$s - %8$s %7$s, %10$s</string> + <string name="same_year_wday1_md1_time1_wday2_md2_time2">%1$s %3$s %2$s, %5$s - %6$s %8$s %7$s, %10$s</string> + <string name="same_month_wday1_md1_time1_wday2_md2_time2">%1$s %3$s %2$s, %5$s - %6$s %8$s %7$s, %10$s</string> + <string name="same_year_mdy1_time1_mdy2_time2">%3$s %2$s %4$s, %5$s - %8$s %7$s %9$s, %10$s</string> + <string name="same_month_mdy1_time1_mdy2_time2">%3$s %2$s %4$s, %5$s - %8$s %7$s %9$s, %10$s</string> + <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s - %6$s, %7$s %8$s, %9$s, %10$s</string> + <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s - %6$s, %7$s %8$s, %9$s, %10$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %2$s %3$s, %4$s - %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s - %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-en-rIE/donottranslate-cldr.xml b/core/res/res/values-en-rIE/donottranslate-cldr.xml index f14016723e27..2809bc0be4a4 100644 --- a/core/res/res/values-en-rIE/donottranslate-cldr.xml +++ b/core/res/res/values-en-rIE/donottranslate-cldr.xml @@ -97,9 +97,9 @@ <string name="numeric_date_format">dd/MM/yyyy</string> <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%H:%M:%S</string> - <string name="date_and_time">%H:%M:%S %-e %b %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_and_time">%-e %b %Y, %H:%M:%S</string> + <string name="date_time">%1$s, %2$s</string> + <string name="time_date">%1$s, %3$s</string> <string name="abbrev_month_day_year">%-e %b %Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,33 +108,33 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s/%2$s - %6$s %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string> <string name="numeric_wday1_mdy1_wday2_mdy2">%1$s %3$s/%2$s/%4$s - %6$s %8$s/%7$s/%9$s</string> - <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s/%2$s/%4$s - %10$s %6$s, %8$s/%7$s/%9$s</string> - <string name="numeric_md1_time1_md2_time2">%5$s %3$s/%2$s - %10$s %8$s/%7$s</string> - <string name="numeric_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %3$s/%2$s - %10$s %6$s, %8$s/%7$s</string> - <string name="numeric_mdy1_time1_mdy2_time2">%5$s %3$s/%2$s/%4$s - %10$s %8$s/%7$s/%9$s</string> - <string name="wday1_date1_time1_wday2_date2_time2">%3$s %1$s, %2$s - %6$s %4$s, %5$s</string> + <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %3$s/%2$s/%4$s, %5$s - %6$s, %8$s/%7$s/%9$s, %10$s</string> + <string name="numeric_md1_time1_md2_time2">%3$s/%2$s, %5$s - %8$s/%7$s, %10$s</string> + <string name="numeric_wday1_md1_time1_wday2_md2_time2">%1$s, %3$s/%2$s, %5$s - %6$s, %8$s/%7$s, %10$s</string> + <string name="numeric_mdy1_time1_mdy2_time2">%3$s/%2$s/%4$s, %5$s - %8$s/%7$s/%9$s, %10$s</string> + <string name="wday1_date1_time1_wday2_date2_time2">%1$s, %2$s, %3$s - %4$s, %5$s, %6$s</string> <string name="wday1_date1_wday2_date2">%1$s, %2$s - %4$s, %5$s</string> - <string name="date1_time1_date2_time2">%3$s %2$s - %6$s %5$s</string> - <string name="time_wday_date">%1$s %2$s, %3$s</string> + <string name="date1_time1_date2_time2">%2$s, %3$s - %5$s, %6$s</string> + <string name="time_wday_date">%1$s, %2$s, %3$s</string> <string name="wday_date">%2$s, %3$s</string> - <string name="time_wday">%1$s %2$s</string> + <string name="time_wday">%1$s, %2$s</string> <string name="same_year_md1_md2">%3$s %2$s - %8$s %7$s</string> <string name="same_year_wday1_md1_wday2_md2">%1$s, %2$s %3$s - %6$s, %7$s %8$s</string> - <string name="same_year_md1_time1_md2_time2">%5$s %3$s %2$s - %10$s %8$s %7$s</string> - <string name="same_month_md1_time1_md2_time2">%5$s %3$s %2$s - %10$s %8$s %7$s</string> - <string name="same_year_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s - %10$s %6$s, %7$s %8$s</string> - <string name="same_month_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s - %10$s %6$s, %7$s %8$s</string> - <string name="same_year_mdy1_time1_mdy2_time2">%5$s %3$s %2$s %4$s - %10$s %8$s %7$s %9$s</string> - <string name="same_month_mdy1_time1_mdy2_time2">%5$s %3$s %2$s %4$s - %10$s %8$s %7$s %9$s</string> - <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s - %10$s %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s - %10$s %6$s, %7$s %8$s, %9$s</string> + <string name="same_year_md1_time1_md2_time2">%3$s %2$s, %5$s - %8$s %7$s, %10$s</string> + <string name="same_month_md1_time1_md2_time2">%3$s %2$s, %5$s - %8$s %7$s, %10$s</string> + <string name="same_year_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s - %6$s, %7$s %8$s, %10$s</string> + <string name="same_month_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s - %6$s, %7$s %8$s, %10$s</string> + <string name="same_year_mdy1_time1_mdy2_time2">%3$s %2$s %4$s, %5$s - %8$s %7$s %9$s, %10$s</string> + <string name="same_month_mdy1_time1_mdy2_time2">%3$s %2$s %4$s, %5$s - %8$s %7$s %9$s, %10$s</string> + <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s - %6$s, %7$s %8$s, %9$s, %10$s</string> + <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s - %6$s, %7$s %8$s, %9$s, %10$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %2$s %3$s, %4$s - %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s, %2$s %3$s - %6$s, %7$s %8$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-en-rIN/donottranslate-cldr.xml b/core/res/res/values-en-rIN/donottranslate-cldr.xml index b62c01b161f3..82fce91227c3 100644 --- a/core/res/res/values-en-rIN/donottranslate-cldr.xml +++ b/core/res/res/values-en-rIN/donottranslate-cldr.xml @@ -91,15 +91,15 @@ <string name="today">Today</string> <string name="tomorrow">Tomorrow</string> - <string name="hour_minute_ampm">%-l:%M %p</string> - <string name="hour_minute_cap_ampm">%-l:%M %^p</string> + <string name="hour_minute_ampm">%-l:%M%p</string> + <string name="hour_minute_cap_ampm">%-l:%M%^p</string> <string name="numeric_date">%d/%m/%Y</string> <string name="numeric_date_format">dd/MM/yyyy</string> <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%-l:%M:%S %p</string> - <string name="date_and_time">%-l:%M:%S %p %d-%b-%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_and_time">%d-%b-%Y, %-l:%M:%S %p</string> + <string name="date_time">%1$s, %2$s</string> + <string name="time_date">%1$s, %3$s</string> <string name="abbrev_month_day_year">%d-%b-%Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,33 +108,33 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s/%2$s - %6$s %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string> <string name="numeric_wday1_mdy1_wday2_mdy2">%1$s %3$s/%2$s/%4$s - %6$s %8$s/%7$s/%9$s</string> - <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s/%3$s/%4$s - %10$s %6$s, %7$s/%8$s/%9$s</string> - <string name="numeric_md1_time1_md2_time2">%5$s %2$s/%3$s - %10$s %7$s/%8$s</string> - <string name="numeric_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s/%3$s - %10$s %6$s, %7$s/%8$s</string> - <string name="numeric_mdy1_time1_mdy2_time2">%5$s %3$s/%2$s/%4$s - %10$s %8$s/%7$s/%9$s</string> - <string name="wday1_date1_time1_wday2_date2_time2">%3$s %1$s, %2$s - %6$s %4$s, %5$s</string> + <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s/%3$s/%4$s, %5$s - %6$s, %7$s/%8$s/%9$s, %10$s</string> + <string name="numeric_md1_time1_md2_time2">%2$s/%3$s, %5$s - %7$s/%8$s, %10$s</string> + <string name="numeric_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s/%3$s, %5$s - %6$s, %7$s/%8$s, %10$s</string> + <string name="numeric_mdy1_time1_mdy2_time2">%3$s/%2$s/%4$s, %5$s - %8$s/%7$s/%9$s, %10$s</string> + <string name="wday1_date1_time1_wday2_date2_time2">%1$s, %2$s, %3$s - %4$s, %5$s, %6$s</string> <string name="wday1_date1_wday2_date2">%1$s, %2$s - %4$s, %5$s</string> - <string name="date1_time1_date2_time2">%3$s %2$s - %6$s %5$s</string> - <string name="time_wday_date">%1$s %2$s, %3$s</string> + <string name="date1_time1_date2_time2">%2$s, %3$s - %5$s, %6$s</string> + <string name="time_wday_date">%1$s, %2$s, %3$s</string> <string name="wday_date">%2$s, %3$s</string> - <string name="time_wday">%1$s %2$s</string> + <string name="time_wday">%1$s, %2$s</string> <string name="same_year_md1_md2">%3$s %2$s - %8$s %7$s</string> <string name="same_year_wday1_md1_wday2_md2">%1$s, %2$s %3$s - %6$s, %7$s %8$s</string> - <string name="same_year_md1_time1_md2_time2">%5$s %3$s %2$s - %10$s %8$s %7$s</string> - <string name="same_month_md1_time1_md2_time2">%5$s %3$s %2$s - %10$s %8$s %7$s</string> - <string name="same_year_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s - %10$s %6$s, %7$s %8$s</string> - <string name="same_month_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s - %10$s %6$s, %7$s %8$s</string> - <string name="same_year_mdy1_time1_mdy2_time2">%5$s %3$s %2$s %4$s - %10$s %8$s %7$s %9$s</string> - <string name="same_month_mdy1_time1_mdy2_time2">%5$s %3$s %2$s %4$s - %10$s %8$s %7$s %9$s</string> - <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s - %10$s %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s - %10$s %6$s, %7$s %8$s, %9$s</string> + <string name="same_year_md1_time1_md2_time2">%3$s %2$s, %5$s - %8$s %7$s, %10$s</string> + <string name="same_month_md1_time1_md2_time2">%3$s %2$s, %5$s - %8$s %7$s, %10$s</string> + <string name="same_year_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s - %6$s, %7$s %8$s, %10$s</string> + <string name="same_month_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s - %6$s, %7$s %8$s, %10$s</string> + <string name="same_year_mdy1_time1_mdy2_time2">%3$s %2$s %4$s, %5$s - %8$s %7$s %9$s, %10$s</string> + <string name="same_month_mdy1_time1_mdy2_time2">%3$s %2$s %4$s, %5$s - %8$s %7$s %9$s, %10$s</string> + <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s - %6$s, %7$s %8$s, %9$s, %10$s</string> + <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s - %6$s, %7$s %8$s, %9$s, %10$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %2$s %3$s, %4$s - %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s, %2$s %3$s - %6$s, %7$s %8$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-en-rNZ/donottranslate-cldr.xml b/core/res/res/values-en-rNZ/donottranslate-cldr.xml index 3e3e6ba60ea6..10559816ce09 100644 --- a/core/res/res/values-en-rNZ/donottranslate-cldr.xml +++ b/core/res/res/values-en-rNZ/donottranslate-cldr.xml @@ -91,15 +91,15 @@ <string name="today">Today</string> <string name="tomorrow">Tomorrow</string> - <string name="hour_minute_ampm">%-l:%M %p</string> - <string name="hour_minute_cap_ampm">%-l:%M %^p</string> + <string name="hour_minute_ampm">%-l:%M%p</string> + <string name="hour_minute_cap_ampm">%-l:%M%^p</string> <string name="numeric_date">%-e/%m/%Y</string> <string name="numeric_date_format">d/MM/yyyy</string> <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%-l:%M:%S %p</string> - <string name="date_and_time">%-l:%M:%S %p %-e/%m/%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_and_time">%-e/%m/%Y, %-l:%M:%S %p</string> + <string name="date_time">%1$s, %2$s</string> + <string name="time_date">%1$s, %3$s</string> <string name="abbrev_month_day_year">%-e/%m/%Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,33 +108,33 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s/%2$s - %6$s, %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string> <string name="numeric_wday1_mdy1_wday2_mdy2">%1$s, %3$s/%2$s/%4$s - %6$s, %8$s/%7$s/%9$s</string> - <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s/%3$s/%4$s - %10$s %6$s, %7$s/%8$s/%9$s</string> - <string name="numeric_md1_time1_md2_time2">%5$s %3$s/%2$s - %10$s %8$s/%7$s</string> - <string name="numeric_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s/%3$s - %10$s %6$s, %7$s/%8$s</string> - <string name="numeric_mdy1_time1_mdy2_time2">%5$s %3$s/%2$s/%4$s - %10$s %8$s/%7$s/%9$s</string> - <string name="wday1_date1_time1_wday2_date2_time2">%3$s %1$s, %2$s - %6$s %4$s, %5$s</string> + <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s/%3$s/%4$s, %5$s - %6$s, %7$s/%8$s/%9$s, %10$s</string> + <string name="numeric_md1_time1_md2_time2">%3$s/%2$s, %5$s - %8$s/%7$s, %10$s</string> + <string name="numeric_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s/%3$s, %5$s - %6$s, %7$s/%8$s, %10$s</string> + <string name="numeric_mdy1_time1_mdy2_time2">%3$s/%2$s/%4$s, %5$s - %8$s/%7$s/%9$s, %10$s</string> + <string name="wday1_date1_time1_wday2_date2_time2">%1$s, %2$s, %3$s - %4$s, %5$s, %6$s</string> <string name="wday1_date1_wday2_date2">%1$s, %2$s - %4$s, %5$s</string> - <string name="date1_time1_date2_time2">%3$s %2$s - %6$s %5$s</string> - <string name="time_wday_date">%1$s %2$s, %3$s</string> + <string name="date1_time1_date2_time2">%2$s, %3$s - %5$s, %6$s</string> + <string name="time_wday_date">%1$s, %2$s, %3$s</string> <string name="wday_date">%2$s, %3$s</string> - <string name="time_wday">%1$s %2$s</string> + <string name="time_wday">%1$s, %2$s</string> <string name="same_year_md1_md2">%3$s %2$s - %8$s %7$s</string> <string name="same_year_wday1_md1_wday2_md2">%1$s, %2$s %3$s - %6$s, %7$s %8$s</string> - <string name="same_year_md1_time1_md2_time2">%5$s %3$s %2$s - %10$s %8$s %7$s</string> - <string name="same_month_md1_time1_md2_time2">%5$s %3$s %2$s - %10$s %8$s %7$s</string> - <string name="same_year_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s - %10$s %6$s, %7$s %8$s</string> - <string name="same_month_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s - %10$s %6$s, %7$s %8$s</string> - <string name="same_year_mdy1_time1_mdy2_time2">%5$s %3$s %2$s %4$s - %10$s %8$s %7$s %9$s</string> - <string name="same_month_mdy1_time1_mdy2_time2">%5$s %3$s %2$s %4$s - %10$s %8$s %7$s %9$s</string> - <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s - %10$s %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s - %10$s %6$s, %7$s %8$s, %9$s</string> + <string name="same_year_md1_time1_md2_time2">%3$s %2$s, %5$s - %8$s %7$s, %10$s</string> + <string name="same_month_md1_time1_md2_time2">%3$s %2$s, %5$s - %8$s %7$s, %10$s</string> + <string name="same_year_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s - %6$s, %7$s %8$s, %10$s</string> + <string name="same_month_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s - %6$s, %7$s %8$s, %10$s</string> + <string name="same_year_mdy1_time1_mdy2_time2">%3$s %2$s %4$s, %5$s - %8$s %7$s %9$s, %10$s</string> + <string name="same_month_mdy1_time1_mdy2_time2">%3$s %2$s %4$s, %5$s - %8$s %7$s %9$s, %10$s</string> + <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s - %6$s, %7$s %8$s, %9$s, %10$s</string> + <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s - %6$s, %7$s %8$s, %9$s, %10$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %2$s %3$s, %4$s - %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s, %2$s %3$s - %6$s, %7$s %8$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-en-rSG/donottranslate-cldr.xml b/core/res/res/values-en-rSG/donottranslate-cldr.xml index 3c13bcf08f8b..e3808a733371 100644 --- a/core/res/res/values-en-rSG/donottranslate-cldr.xml +++ b/core/res/res/values-en-rSG/donottranslate-cldr.xml @@ -91,15 +91,15 @@ <string name="today">Today</string> <string name="tomorrow">Tomorrow</string> - <string name="hour_minute_ampm">%-l:%M %p</string> - <string name="hour_minute_cap_ampm">%-l:%M %^p</string> + <string name="hour_minute_ampm">%-l:%M%p</string> + <string name="hour_minute_cap_ampm">%-l:%M%^p</string> <string name="numeric_date">%-m/%-e/%Y</string> <string name="numeric_date_format">M/d/yyyy</string> <string name="month_day_year">%B %-e, %Y</string> <string name="time_of_day">%-l:%M:%S %p</string> - <string name="date_and_time">%-l:%M:%S %p %b %-e, %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_and_time">%b %-e, %Y, %-l:%M:%S %p</string> + <string name="date_time">%1$s, %2$s</string> + <string name="time_date">%1$s, %3$s</string> <string name="abbrev_month_day_year">%b %-e, %Y</string> <string name="month_day">%B %-e</string> <string name="month">%-B</string> @@ -108,35 +108,35 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s – %2$s</string> - <string name="date1_date2">%1$s – %2$s</string> + <string name="date1_date2">%2$s – %5$s</string> <string name="numeric_md1_md2">%2$s/%3$s – %7$s/%8$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %2$s/%3$s – %6$s, %7$s/%8$s</string> <string name="numeric_mdy1_mdy2">%2$s/%3$s/%4$s – %7$s/%8$s/%9$s</string> <string name="numeric_wday1_mdy1_wday2_mdy2">%1$s, %2$s/%3$s/%4$s – %6$s, %7$s/%8$s/%9$s</string> - <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s/%3$s/%4$s – %10$s %6$s, %7$s/%8$s/%9$s</string> - <string name="numeric_md1_time1_md2_time2">%5$s %2$s/%3$s – %10$s %7$s/%8$s</string> - <string name="numeric_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s/%3$s – %10$s %6$s, %7$s/%8$s</string> - <string name="numeric_mdy1_time1_mdy2_time2">%5$s %2$s/%3$s/%4$s – %10$s %7$s/%8$s/%9$s</string> - <string name="wday1_date1_time1_wday2_date2_time2">%3$s %1$s, %2$s – %6$s %4$s, %5$s</string> + <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s/%3$s/%4$s, %5$s – %6$s, %7$s/%8$s/%9$s, %10$s</string> + <string name="numeric_md1_time1_md2_time2">%2$s/%3$s, %5$s – %7$s/%8$s, %10$s</string> + <string name="numeric_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s/%3$s, %5$s – %6$s, %7$s/%8$s, %10$s</string> + <string name="numeric_mdy1_time1_mdy2_time2">%2$s/%3$s/%4$s, %5$s – %7$s/%8$s/%9$s, %10$s</string> + <string name="wday1_date1_time1_wday2_date2_time2">%1$s, %2$s, %3$s – %4$s, %5$s, %6$s</string> <string name="wday1_date1_wday2_date2">%1$s, %2$s – %4$s, %5$s</string> - <string name="date1_time1_date2_time2">%3$s %2$s – %6$s %5$s</string> - <string name="time_wday_date">%1$s %2$s, %3$s</string> + <string name="date1_time1_date2_time2">%2$s, %3$s – %5$s, %6$s</string> + <string name="time_wday_date">%1$s, %2$s, %3$s</string> <string name="wday_date">%2$s, %3$s</string> - <string name="time_wday">%1$s %2$s</string> + <string name="time_wday">%1$s, %2$s</string> <string name="same_year_md1_md2">%2$s %3$s – %7$s %8$s</string> <string name="same_year_wday1_md1_wday2_md2">%1$s, %2$s %3$s – %6$s, %7$s %8$s</string> - <string name="same_year_md1_time1_md2_time2">%5$s %2$s %3$s – %10$s %7$s %8$s</string> - <string name="same_month_md1_time1_md2_time2">%5$s %2$s %3$s – %10$s %7$s %8$s</string> - <string name="same_year_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s – %10$s %6$s, %7$s %8$s</string> - <string name="same_month_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s – %10$s %6$s, %7$s %8$s</string> - <string name="same_year_mdy1_time1_mdy2_time2">%5$s %2$s %3$s, %4$s – %10$s %7$s %8$s, %9$s</string> - <string name="same_month_mdy1_time1_mdy2_time2">%5$s %2$s %3$s, %4$s – %10$s %7$s %8$s, %9$s</string> - <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s – %10$s %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s – %10$s %6$s, %7$s %8$s, %9$s</string> + <string name="same_year_md1_time1_md2_time2">%2$s %3$s, %5$s – %7$s %8$s, %10$s</string> + <string name="same_month_md1_time1_md2_time2">%2$s %3$s, %5$s – %7$s %8$s, %10$s</string> + <string name="same_year_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s – %6$s, %7$s %8$s, %10$s</string> + <string name="same_month_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s – %6$s, %7$s %8$s, %10$s</string> + <string name="same_year_mdy1_time1_mdy2_time2">%2$s %3$s, %4$s, %5$s – %7$s %8$s, %9$s, %10$s</string> + <string name="same_month_mdy1_time1_mdy2_time2">%2$s %3$s, %4$s, %5$s – %7$s %8$s, %9$s, %10$s</string> + <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s – %6$s, %7$s %8$s, %9$s, %10$s</string> + <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s – %6$s, %7$s %8$s, %9$s, %10$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %2$s %3$s, %4$s – %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_md1_md2">%2$s %3$s – %7$s %8$s</string> + <string name="same_month_md1_md2">%2$s %3$s – %8$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s, %2$s %3$s – %6$s, %7$s %8$s</string> <string name="same_year_mdy1_mdy2">%2$s %3$s – %7$s %8$s, %9$s</string> - <string name="same_month_mdy1_mdy2">%2$s %3$s–%8$s, %9$s</string> + <string name="same_month_mdy1_mdy2">%2$s %3$s – %8$s, %9$s</string> <string name="same_year_wday1_mdy1_wday2_mdy2">%1$s, %2$s %3$s – %6$s, %7$s %8$s, %9$s</string> </resources> diff --git a/core/res/res/values-en-rUS/donottranslate-cldr.xml b/core/res/res/values-en-rUS/donottranslate-cldr.xml index 3c13bcf08f8b..e3808a733371 100644 --- a/core/res/res/values-en-rUS/donottranslate-cldr.xml +++ b/core/res/res/values-en-rUS/donottranslate-cldr.xml @@ -91,15 +91,15 @@ <string name="today">Today</string> <string name="tomorrow">Tomorrow</string> - <string name="hour_minute_ampm">%-l:%M %p</string> - <string name="hour_minute_cap_ampm">%-l:%M %^p</string> + <string name="hour_minute_ampm">%-l:%M%p</string> + <string name="hour_minute_cap_ampm">%-l:%M%^p</string> <string name="numeric_date">%-m/%-e/%Y</string> <string name="numeric_date_format">M/d/yyyy</string> <string name="month_day_year">%B %-e, %Y</string> <string name="time_of_day">%-l:%M:%S %p</string> - <string name="date_and_time">%-l:%M:%S %p %b %-e, %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_and_time">%b %-e, %Y, %-l:%M:%S %p</string> + <string name="date_time">%1$s, %2$s</string> + <string name="time_date">%1$s, %3$s</string> <string name="abbrev_month_day_year">%b %-e, %Y</string> <string name="month_day">%B %-e</string> <string name="month">%-B</string> @@ -108,35 +108,35 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s – %2$s</string> - <string name="date1_date2">%1$s – %2$s</string> + <string name="date1_date2">%2$s – %5$s</string> <string name="numeric_md1_md2">%2$s/%3$s – %7$s/%8$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %2$s/%3$s – %6$s, %7$s/%8$s</string> <string name="numeric_mdy1_mdy2">%2$s/%3$s/%4$s – %7$s/%8$s/%9$s</string> <string name="numeric_wday1_mdy1_wday2_mdy2">%1$s, %2$s/%3$s/%4$s – %6$s, %7$s/%8$s/%9$s</string> - <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s/%3$s/%4$s – %10$s %6$s, %7$s/%8$s/%9$s</string> - <string name="numeric_md1_time1_md2_time2">%5$s %2$s/%3$s – %10$s %7$s/%8$s</string> - <string name="numeric_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s/%3$s – %10$s %6$s, %7$s/%8$s</string> - <string name="numeric_mdy1_time1_mdy2_time2">%5$s %2$s/%3$s/%4$s – %10$s %7$s/%8$s/%9$s</string> - <string name="wday1_date1_time1_wday2_date2_time2">%3$s %1$s, %2$s – %6$s %4$s, %5$s</string> + <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s/%3$s/%4$s, %5$s – %6$s, %7$s/%8$s/%9$s, %10$s</string> + <string name="numeric_md1_time1_md2_time2">%2$s/%3$s, %5$s – %7$s/%8$s, %10$s</string> + <string name="numeric_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s/%3$s, %5$s – %6$s, %7$s/%8$s, %10$s</string> + <string name="numeric_mdy1_time1_mdy2_time2">%2$s/%3$s/%4$s, %5$s – %7$s/%8$s/%9$s, %10$s</string> + <string name="wday1_date1_time1_wday2_date2_time2">%1$s, %2$s, %3$s – %4$s, %5$s, %6$s</string> <string name="wday1_date1_wday2_date2">%1$s, %2$s – %4$s, %5$s</string> - <string name="date1_time1_date2_time2">%3$s %2$s – %6$s %5$s</string> - <string name="time_wday_date">%1$s %2$s, %3$s</string> + <string name="date1_time1_date2_time2">%2$s, %3$s – %5$s, %6$s</string> + <string name="time_wday_date">%1$s, %2$s, %3$s</string> <string name="wday_date">%2$s, %3$s</string> - <string name="time_wday">%1$s %2$s</string> + <string name="time_wday">%1$s, %2$s</string> <string name="same_year_md1_md2">%2$s %3$s – %7$s %8$s</string> <string name="same_year_wday1_md1_wday2_md2">%1$s, %2$s %3$s – %6$s, %7$s %8$s</string> - <string name="same_year_md1_time1_md2_time2">%5$s %2$s %3$s – %10$s %7$s %8$s</string> - <string name="same_month_md1_time1_md2_time2">%5$s %2$s %3$s – %10$s %7$s %8$s</string> - <string name="same_year_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s – %10$s %6$s, %7$s %8$s</string> - <string name="same_month_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s – %10$s %6$s, %7$s %8$s</string> - <string name="same_year_mdy1_time1_mdy2_time2">%5$s %2$s %3$s, %4$s – %10$s %7$s %8$s, %9$s</string> - <string name="same_month_mdy1_time1_mdy2_time2">%5$s %2$s %3$s, %4$s – %10$s %7$s %8$s, %9$s</string> - <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s – %10$s %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s – %10$s %6$s, %7$s %8$s, %9$s</string> + <string name="same_year_md1_time1_md2_time2">%2$s %3$s, %5$s – %7$s %8$s, %10$s</string> + <string name="same_month_md1_time1_md2_time2">%2$s %3$s, %5$s – %7$s %8$s, %10$s</string> + <string name="same_year_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s – %6$s, %7$s %8$s, %10$s</string> + <string name="same_month_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s – %6$s, %7$s %8$s, %10$s</string> + <string name="same_year_mdy1_time1_mdy2_time2">%2$s %3$s, %4$s, %5$s – %7$s %8$s, %9$s, %10$s</string> + <string name="same_month_mdy1_time1_mdy2_time2">%2$s %3$s, %4$s, %5$s – %7$s %8$s, %9$s, %10$s</string> + <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s – %6$s, %7$s %8$s, %9$s, %10$s</string> + <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s – %6$s, %7$s %8$s, %9$s, %10$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %2$s %3$s, %4$s – %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_md1_md2">%2$s %3$s – %7$s %8$s</string> + <string name="same_month_md1_md2">%2$s %3$s – %8$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s, %2$s %3$s – %6$s, %7$s %8$s</string> <string name="same_year_mdy1_mdy2">%2$s %3$s – %7$s %8$s, %9$s</string> - <string name="same_month_mdy1_mdy2">%2$s %3$s–%8$s, %9$s</string> + <string name="same_month_mdy1_mdy2">%2$s %3$s – %8$s, %9$s</string> <string name="same_year_wday1_mdy1_wday2_mdy2">%1$s, %2$s %3$s – %6$s, %7$s %8$s, %9$s</string> </resources> diff --git a/core/res/res/values-en-rZA/donottranslate-cldr.xml b/core/res/res/values-en-rZA/donottranslate-cldr.xml index 70dc667c9e84..bfde8a39a8d1 100644 --- a/core/res/res/values-en-rZA/donottranslate-cldr.xml +++ b/core/res/res/values-en-rZA/donottranslate-cldr.xml @@ -91,15 +91,15 @@ <string name="today">Today</string> <string name="tomorrow">Tomorrow</string> - <string name="hour_minute_ampm">%-l:%M %p</string> - <string name="hour_minute_cap_ampm">%-l:%M %^p</string> + <string name="hour_minute_ampm">%-l:%M%p</string> + <string name="hour_minute_cap_ampm">%-l:%M%^p</string> <string name="numeric_date">%Y/%m/%d</string> <string name="numeric_date_format">yyyy/MM/dd</string> <string name="month_day_year">%d %B %Y</string> <string name="time_of_day">%-l:%M:%S %p</string> - <string name="date_and_time">%-l:%M:%S %p %d %b %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_and_time">%d %b %Y, %-l:%M:%S %p</string> + <string name="date_time">%1$s, %2$s</string> + <string name="time_date">%1$s, %3$s</string> <string name="abbrev_month_day_year">%d %b %Y</string> <string name="month_day">%B %-e</string> <string name="month">%-B</string> @@ -108,33 +108,33 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%2$s/%3$s - %7$s/%8$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %2$s/%3$s - %6$s %7$s/%8$s</string> <string name="numeric_mdy1_mdy2">%4$s/%2$s/%3$s - %9$s/%7$s/%8$s</string> <string name="numeric_wday1_mdy1_wday2_mdy2">%1$s %4$s/%2$s/%3$s - %6$s %9$s/%7$s/%8$s</string> - <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s/%3$s/%4$s - %10$s %6$s, %7$s/%8$s/%9$s</string> - <string name="numeric_md1_time1_md2_time2">%5$s %2$s/%3$s - %10$s %7$s/%8$s</string> - <string name="numeric_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s/%3$s - %10$s %6$s, %7$s/%8$s</string> - <string name="numeric_mdy1_time1_mdy2_time2">%5$s %4$s/%2$s/%3$s - %10$s %9$s/%7$s/%8$s</string> - <string name="wday1_date1_time1_wday2_date2_time2">%3$s %1$s, %2$s - %6$s %4$s, %5$s</string> + <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s/%3$s/%4$s, %5$s - %6$s, %7$s/%8$s/%9$s, %10$s</string> + <string name="numeric_md1_time1_md2_time2">%2$s/%3$s, %5$s - %7$s/%8$s, %10$s</string> + <string name="numeric_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s/%3$s, %5$s - %6$s, %7$s/%8$s, %10$s</string> + <string name="numeric_mdy1_time1_mdy2_time2">%4$s/%2$s/%3$s, %5$s - %9$s/%7$s/%8$s, %10$s</string> + <string name="wday1_date1_time1_wday2_date2_time2">%1$s, %2$s, %3$s - %4$s, %5$s, %6$s</string> <string name="wday1_date1_wday2_date2">%1$s, %2$s - %4$s, %5$s</string> - <string name="date1_time1_date2_time2">%3$s %2$s - %6$s %5$s</string> - <string name="time_wday_date">%1$s %2$s, %3$s</string> + <string name="date1_time1_date2_time2">%2$s, %3$s - %5$s, %6$s</string> + <string name="time_wday_date">%1$s, %2$s, %3$s</string> <string name="wday_date">%2$s, %3$s</string> - <string name="time_wday">%1$s %2$s</string> + <string name="time_wday">%1$s, %2$s</string> <string name="same_year_md1_md2">%2$s %3$s - %7$s %8$s</string> <string name="same_year_wday1_md1_wday2_md2">%1$s, %2$s %3$s - %6$s, %7$s %8$s</string> - <string name="same_year_md1_time1_md2_time2">%5$s %2$s %3$s - %10$s %7$s %8$s</string> - <string name="same_month_md1_time1_md2_time2">%5$s %2$s %3$s - %10$s %7$s %8$s</string> - <string name="same_year_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s - %10$s %6$s, %7$s %8$s</string> - <string name="same_month_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s - %10$s %6$s, %7$s %8$s</string> - <string name="same_year_mdy1_time1_mdy2_time2">%5$s %3$s %2$s %4$s - %10$s %8$s %7$s %9$s</string> - <string name="same_month_mdy1_time1_mdy2_time2">%5$s %3$s %2$s %4$s - %10$s %8$s %7$s %9$s</string> - <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s - %10$s %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s - %10$s %6$s, %7$s %8$s, %9$s</string> + <string name="same_year_md1_time1_md2_time2">%2$s %3$s, %5$s - %7$s %8$s, %10$s</string> + <string name="same_month_md1_time1_md2_time2">%2$s %3$s, %5$s - %7$s %8$s, %10$s</string> + <string name="same_year_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s - %6$s, %7$s %8$s, %10$s</string> + <string name="same_month_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s - %6$s, %7$s %8$s, %10$s</string> + <string name="same_year_mdy1_time1_mdy2_time2">%3$s %2$s %4$s, %5$s - %8$s %7$s %9$s, %10$s</string> + <string name="same_month_mdy1_time1_mdy2_time2">%3$s %2$s %4$s, %5$s - %8$s %7$s %9$s, %10$s</string> + <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s - %6$s, %7$s %8$s, %9$s, %10$s</string> + <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s - %6$s, %7$s %8$s, %9$s, %10$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %2$s %3$s, %4$s - %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_md1_md2">%2$s %3$s - %7$s %8$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s, %2$s %3$s - %6$s, %7$s %8$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-es-rES/donottranslate-cldr.xml b/core/res/res/values-es-rES/donottranslate-cldr.xml index b28cec2fad5d..aeb93ea902ec 100644 --- a/core/res/res/values-es-rES/donottranslate-cldr.xml +++ b/core/res/res/values-es-rES/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e de %B de %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %d/%m/%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d/%m/%Y</string> <string name="month_day">%-e de %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s – %2$s</string> - <string name="date1_date2">%1$s – %2$s</string> + <string name="date1_date2">%2$s – %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s – %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s/%2$s – %6$s %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s – %8$s/%7$s/%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s – %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s – %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s %2$s %4$s – %6$s, %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s de %2$s – %8$s de %7$s</string> + <string name="same_month_md1_md2">%3$s–%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s – %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s – %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s–%8$s %2$s %9$s</string> diff --git a/core/res/res/values-es-rUS/donottranslate-cldr.xml b/core/res/res/values-es-rUS/donottranslate-cldr.xml index 2a7b0555069d..6bcdfd7477b4 100644 --- a/core/res/res/values-es-rUS/donottranslate-cldr.xml +++ b/core/res/res/values-es-rUS/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e de %B de %Y</string> <string name="time_of_day">%-l:%M:%S %p</string> <string name="date_and_time">%-l:%M:%S %p %b %-e, %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%b %-e, %Y</string> <string name="month_day">%-e de %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s a el %2$s</string> - <string name="date1_date2">%1$s a el %2$s</string> + <string name="date1_date2">%2$s a el %5$s</string> <string name="numeric_md1_md2">%2$s/%3$s - %7$s/%8$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %2$s/%3$s - %6$s %7$s/%8$s</string> <string name="numeric_mdy1_mdy2">%2$s/%3$s/%4$s - %7$s/%8$s/%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s a el %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s a el %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s %2$s %4$s a el %6$s, %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s de %2$s a el %8$s de %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s de %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s a el %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s de %2$s al %8$s de %7$s de %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s de %2$s de %9$s</string> diff --git a/core/res/res/values-es/donottranslate-cldr.xml b/core/res/res/values-es/donottranslate-cldr.xml index b28cec2fad5d..aeb93ea902ec 100644 --- a/core/res/res/values-es/donottranslate-cldr.xml +++ b/core/res/res/values-es/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e de %B de %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %d/%m/%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d/%m/%Y</string> <string name="month_day">%-e de %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s – %2$s</string> - <string name="date1_date2">%1$s – %2$s</string> + <string name="date1_date2">%2$s – %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s – %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s/%2$s – %6$s %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s – %8$s/%7$s/%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s – %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s – %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s %2$s %4$s – %6$s, %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s de %2$s – %8$s de %7$s</string> + <string name="same_month_md1_md2">%3$s–%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s – %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s – %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s–%8$s %2$s %9$s</string> diff --git a/core/res/res/values-fi-rFI/donottranslate-cldr.xml b/core/res/res/values-fi-rFI/donottranslate-cldr.xml index 4433351809eb..96b5cd6af05c 100644 --- a/core/res/res/values-fi-rFI/donottranslate-cldr.xml +++ b/core/res/res/values-fi-rFI/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e. %B %Y</string> <string name="time_of_day">%-k.%M.%S</string> <string name="date_and_time">%-k.%M.%S %-e.%-m.%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e.%-m.%Y</string> <string name="month_day">%-e. %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%-b %Y</string> <string name="time1_time2">%1$s–%2$s</string> - <string name="date1_date2">%1$s–%2$s</string> + <string name="date1_date2">%2$s–%5$s</string> <string name="numeric_md1_md2">%3$s.%2$s.–%8$s.%7$s.</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s.%2$s. – %6$s %8$s.%7$s.</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s–%8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s. %2$s %4$s–%10$s %6$s %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s. %2$s %4$s–%10$s %6$s %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s %3$s. %2$s %4$s–%6$s %8$s. %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s. %2$s–%8$s. %7$s</string> + <string name="same_month_md1_md2">%3$s.–%8$s. %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s. %2$s–%6$s %8$s. %7$s</string> <string name="same_year_mdy1_mdy2">%3$s. %2$s – %8$s. %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s.–%8$s. %2$s %9$s</string> diff --git a/core/res/res/values-fr-rBE/donottranslate-cldr.xml b/core/res/res/values-fr-rBE/donottranslate-cldr.xml index 1f9009d76a9a..01f6c0cc6bab 100644 --- a/core/res/res/values-fr-rBE/donottranslate-cldr.xml +++ b/core/res/res/values-fr-rBE/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %-e %b %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e %b %Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">du %1$s au %2$s</string> - <string name="date1_date2">du %1$s au %2$s</string> + <string name="date1_date2">du %2$s au %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s/%2$s - %6$s %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">du %5$s %1$s %3$s %2$s %4$s au %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">du %5$s %1$s %3$s %2$s %4$s au %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">du %1$s %3$s %2$s %4$s au %6$s %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">du %3$s %2$s au %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">du %1$s %3$s %2$s au %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s au %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-fr-rCA/donottranslate-cldr.xml b/core/res/res/values-fr-rCA/donottranslate-cldr.xml index c118f6118c8c..8039e273c7c3 100644 --- a/core/res/res/values-fr-rCA/donottranslate-cldr.xml +++ b/core/res/res/values-fr-rCA/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %Y-%m-%d</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%Y-%m-%d</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s – %2$s</string> - <string name="date1_date2">%1$s – %2$s</string> + <string name="date1_date2">%2$s – %5$s</string> <string name="numeric_md1_md2">%2$s-%3$s – %7$s-%8$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %2$s-%3$s – %6$s %7$s-%8$s</string> <string name="numeric_mdy1_mdy2">%4$s-%2$s-%3$s – %9$s-%7$s-%8$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s – %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s – %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s %3$s %2$s %4$s – %6$s %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s – %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s–%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s – %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">du %3$s %2$s au %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s–%8$s %2$s %9$s</string> diff --git a/core/res/res/values-fr-rCH/donottranslate-cldr.xml b/core/res/res/values-fr-rCH/donottranslate-cldr.xml index e1f88e8e4db9..63c2d2bf7fe3 100644 --- a/core/res/res/values-fr-rCH/donottranslate-cldr.xml +++ b/core/res/res/values-fr-rCH/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %-e %b %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e %b %Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">du %1$s au %2$s</string> - <string name="date1_date2">du %1$s au %2$s</string> + <string name="date1_date2">du %2$s au %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s - %8$s.%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s - %6$s, %8$s.%7$s</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">du %5$s %1$s %3$s %2$s %4$s au %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">du %5$s %1$s %3$s %2$s %4$s au %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">du %1$s %3$s %2$s %4$s au %6$s %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">du %3$s %2$s au %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">du %1$s %3$s %2$s au %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s au %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-fr-rFR/donottranslate-cldr.xml b/core/res/res/values-fr-rFR/donottranslate-cldr.xml index 217e8fab61b1..ac168be74169 100644 --- a/core/res/res/values-fr-rFR/donottranslate-cldr.xml +++ b/core/res/res/values-fr-rFR/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %-e %b %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e %b %Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s – %2$s</string> - <string name="date1_date2">%1$s – %2$s</string> + <string name="date1_date2">%2$s – %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s/%2$s - %6$s %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s – %8$s/%7$s/%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s – %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s – %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s %3$s %2$s %4$s – %6$s %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s – %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s–%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s – %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s – %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s–%8$s %2$s %9$s</string> diff --git a/core/res/res/values-fr/donottranslate-cldr.xml b/core/res/res/values-fr/donottranslate-cldr.xml index 217e8fab61b1..ac168be74169 100644 --- a/core/res/res/values-fr/donottranslate-cldr.xml +++ b/core/res/res/values-fr/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %-e %b %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e %b %Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s – %2$s</string> - <string name="date1_date2">%1$s – %2$s</string> + <string name="date1_date2">%2$s – %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s/%2$s - %6$s %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s – %8$s/%7$s/%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s – %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s – %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s %3$s %2$s %4$s – %6$s %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s – %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s–%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s – %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s – %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s–%8$s %2$s %9$s</string> diff --git a/core/res/res/values-he-rIL/donottranslate-cldr.xml b/core/res/res/values-he-rIL/donottranslate-cldr.xml index fb9c8cbfcfc8..316db351fd27 100644 --- a/core/res/res/values-he-rIL/donottranslate-cldr.xml +++ b/core/res/res/values-he-rIL/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e ב%B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %-e.%-m.%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e.%-m.%Y</string> <string name="month_day">%-e ב%B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y %b</string> <string name="time1_time2">%1$s – %2$s</string> - <string name="date1_date2">%1$s – %2$s</string> + <string name="date1_date2">%2$s – %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s/%2$s - %6$s %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s – %10$s %6$s, %9$s %7$s %8$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s – %10$s %6$s, %9$s %7$s %8$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %4$s %2$s %3$s – %6$s, %9$s %7$s %8$s</string> - <string name="same_month_md1_md2">%3$s ב%2$s – %8$s ב%7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s – %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-hi-rIN/donottranslate-cldr.xml b/core/res/res/values-hi-rIN/donottranslate-cldr.xml index 836e4207b915..6e8b887df103 100644 --- a/core/res/res/values-hi-rIN/donottranslate-cldr.xml +++ b/core/res/res/values-hi-rIN/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%-l:%M:%S %p</string> <string name="date_and_time">%-l:%M:%S %p %d-%m-%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d-%m-%Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s – %2$s</string> - <string name="date1_date2">%1$s – %2$s</string> + <string name="date1_date2">%2$s – %5$s</string> <string name="numeric_md1_md2">%2$s-%3$s – %7$s-%8$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %2$s-%3$s – %6$s, %7$s-%8$s</string> <string name="numeric_mdy1_mdy2">%4$s-%2$s-%3$s – %9$s-%7$s-%8$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s – %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s – %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s %2$s %4$s – %6$s, %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s – %8$s %7$s</string> + <string name="same_month_md1_md2">%2$s-%3$s – %8$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s, %3$s %2$s – %6$s, %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%9$s-%2$s-%3$s – %7$s-%8$s</string> <string name="same_month_mdy1_mdy2">%9$s-%2$s-%3$s – %8$s</string> diff --git a/core/res/res/values-hu-rHU/donottranslate-cldr.xml b/core/res/res/values-hu-rHU/donottranslate-cldr.xml index 38c8c1c77397..18c680fa5a97 100644 --- a/core/res/res/values-hu-rHU/donottranslate-cldr.xml +++ b/core/res/res/values-hu-rHU/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%Y. %B %-e.</string> <string name="time_of_day">%-k:%M:%S</string> <string name="date_and_time">%-k:%M:%S %Y.%m.%d.</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%Y.%m.%d.</string> <string name="month_day">%B %-e.</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y %b</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%2$s.%3$s. - %7$s.%8$s.</string> <string name="numeric_wday1_md1_wday2_md2">%2$s.%3$s., %1$s - %7$s.%8$s., %6$s</string> <string name="numeric_mdy1_mdy2">%4$s.%2$s.%3$s. - %9$s.%7$s.%8$s.</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s - %10$s %6$s, %9$s %7$s %8$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s - %10$s %6$s, %9$s %7$s %8$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %4$s %2$s %3$s - %6$s, %9$s %7$s %8$s</string> - <string name="same_month_md1_md2">%2$s %3$s. - %7$s %8$s.</string> + <string name="same_month_md1_md2">%2$s %3$s-%8$s.</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %2$s %3$s - %6$s %7$s %8$s</string> <string name="same_year_mdy1_mdy2">%9$s. %2$s %3$s. - %7$s %8$s.</string> <string name="same_month_mdy1_mdy2">%9$s. %2$s %3$s-%8$s.</string> diff --git a/core/res/res/values-id-rID/donottranslate-cldr.xml b/core/res/res/values-id-rID/donottranslate-cldr.xml index 51792736e8f2..6120a7b0543a 100644 --- a/core/res/res/values-id-rID/donottranslate-cldr.xml +++ b/core/res/res/values-id-rID/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %-e %b %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e %b %Y</string> <string name="month_day">%B %-e</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y %b</string> <string name="time1_time2">%1$s – %2$s</string> - <string name="date1_date2">%1$s – %2$s</string> + <string name="date1_date2">%2$s – %5$s</string> <string name="numeric_md1_md2">%2$s-%3$s – %7$s-%8$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %2$s-%3$s – %6$s, %7$s-%8$s</string> <string name="numeric_mdy1_mdy2">%4$s-%2$s-%3$s – %9$s-%7$s-%8$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s – %10$s %6$s, %9$s %7$s %8$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s – %10$s %6$s, %9$s %7$s %8$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %4$s %2$s %3$s – %6$s, %9$s %7$s %8$s</string> - <string name="same_month_md1_md2">%2$s %3$s – %7$s %8$s</string> + <string name="same_month_md1_md2">%2$s-%3$s – %8$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %2$s %3$s – %6$s %7$s %8$s</string> <string name="same_year_mdy1_mdy2">%9$s-%2$s-%3$s – %7$s-%8$s</string> <string name="same_month_mdy1_mdy2">%9$s-%2$s-%3$s – %8$s</string> diff --git a/core/res/res/values-it-rCH/donottranslate-cldr.xml b/core/res/res/values-it-rCH/donottranslate-cldr.xml index 6c888deee56b..8dc042d4da45 100644 --- a/core/res/res/values-it-rCH/donottranslate-cldr.xml +++ b/core/res/res/values-it-rCH/donottranslate-cldr.xml @@ -93,8 +93,8 @@ <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%H.%M.%S</string> <string name="date_and_time">%H.%M.%S %-e-%b-%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e-%b-%Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -103,7 +103,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s - %8$s.%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s - %6$s, %8$s.%7$s</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string> @@ -129,7 +129,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s - %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s - %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s %3$s %2$s %4$s - %6$s %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s - %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-it-rIT/donottranslate-cldr.xml b/core/res/res/values-it-rIT/donottranslate-cldr.xml index bcd07b054f10..93cda6e6b62d 100644 --- a/core/res/res/values-it-rIT/donottranslate-cldr.xml +++ b/core/res/res/values-it-rIT/donottranslate-cldr.xml @@ -93,8 +93,8 @@ <string name="month_day_year">%d %B %Y</string> <string name="time_of_day">%H.%M.%S</string> <string name="date_and_time">%H.%M.%S %d/%b/%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d/%b/%Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -103,7 +103,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s/%2$s - %6$s %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string> @@ -129,7 +129,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s - %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s - %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s %3$s %2$s %4$s - %6$s %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s - %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-it/donottranslate-cldr.xml b/core/res/res/values-it/donottranslate-cldr.xml index bcd07b054f10..93cda6e6b62d 100644 --- a/core/res/res/values-it/donottranslate-cldr.xml +++ b/core/res/res/values-it/donottranslate-cldr.xml @@ -93,8 +93,8 @@ <string name="month_day_year">%d %B %Y</string> <string name="time_of_day">%H.%M.%S</string> <string name="date_and_time">%H.%M.%S %d/%b/%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d/%b/%Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -103,7 +103,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s/%2$s - %6$s %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string> @@ -129,7 +129,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s - %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s - %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s %3$s %2$s %4$s - %6$s %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s - %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-ja-rJP/donottranslate-cldr.xml b/core/res/res/values-ja-rJP/donottranslate-cldr.xml index 06350bb93f6b..e2d1f2e684bb 100644 --- a/core/res/res/values-ja-rJP/donottranslate-cldr.xml +++ b/core/res/res/values-ja-rJP/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%Y年%-m月%-e日</string> <string name="time_of_day">%-k:%M:%S</string> <string name="date_and_time">%-k:%M:%S %Y/%m/%d</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%Y/%m/%d</string> <string name="month_day">%-m月%-e日</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y年%-m月</string> <string name="time1_time2">%1$s～%2$s</string> - <string name="date1_date2">%1$s～%2$s</string> + <string name="date1_date2">%2$s～%5$s</string> <string name="numeric_md1_md2">%2$s/%3$s～%7$s/%8$s</string> <string name="numeric_wday1_md1_wday2_md2">%2$s/%3$s(%1$s)～%7$s/%8$s(%6$s)</string> <string name="numeric_mdy1_mdy2">%4$s/%2$s/%3$s～%9$s/%7$s/%8$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %4$s年%2$s%3$s日(%1$s)～%10$s %9$s年%7$s%8$s日(%6$s)</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %4$s年%2$s%3$s日(%1$s)～%10$s %9$s年%7$s%8$s日(%6$s)</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%4$s年%2$s%3$s日(%1$s)～%9$s年%7$s%8$s日(%6$s)</string> - <string name="same_month_md1_md2">%2$s%3$s日～%7$s%8$s日</string> + <string name="same_month_md1_md2">%2$s月%3$s日～%8$s日</string> <string name="same_month_wday1_md1_wday2_md2">%2$s%3$s日(%1$s)～%7$s%8$s日(%6$s)</string> <string name="same_year_mdy1_mdy2">%9$s年%2$s%3$s日～%7$s月%8$s日</string> <string name="same_month_mdy1_mdy2">%9$s年%2$s%3$s日～%8$s日</string> diff --git a/core/res/res/values-ja/donottranslate-cldr.xml b/core/res/res/values-ja/donottranslate-cldr.xml index 06350bb93f6b..e2d1f2e684bb 100644 --- a/core/res/res/values-ja/donottranslate-cldr.xml +++ b/core/res/res/values-ja/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%Y年%-m月%-e日</string> <string name="time_of_day">%-k:%M:%S</string> <string name="date_and_time">%-k:%M:%S %Y/%m/%d</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%Y/%m/%d</string> <string name="month_day">%-m月%-e日</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y年%-m月</string> <string name="time1_time2">%1$s～%2$s</string> - <string name="date1_date2">%1$s～%2$s</string> + <string name="date1_date2">%2$s～%5$s</string> <string name="numeric_md1_md2">%2$s/%3$s～%7$s/%8$s</string> <string name="numeric_wday1_md1_wday2_md2">%2$s/%3$s(%1$s)～%7$s/%8$s(%6$s)</string> <string name="numeric_mdy1_mdy2">%4$s/%2$s/%3$s～%9$s/%7$s/%8$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %4$s年%2$s%3$s日(%1$s)～%10$s %9$s年%7$s%8$s日(%6$s)</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %4$s年%2$s%3$s日(%1$s)～%10$s %9$s年%7$s%8$s日(%6$s)</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%4$s年%2$s%3$s日(%1$s)～%9$s年%7$s%8$s日(%6$s)</string> - <string name="same_month_md1_md2">%2$s%3$s日～%7$s%8$s日</string> + <string name="same_month_md1_md2">%2$s月%3$s日～%8$s日</string> <string name="same_month_wday1_md1_wday2_md2">%2$s%3$s日(%1$s)～%7$s%8$s日(%6$s)</string> <string name="same_year_mdy1_mdy2">%9$s年%2$s%3$s日～%7$s月%8$s日</string> <string name="same_month_mdy1_mdy2">%9$s年%2$s%3$s日～%8$s日</string> diff --git a/core/res/res/values-ko-rKR/donottranslate-cldr.xml b/core/res/res/values-ko-rKR/donottranslate-cldr.xml index ea780cf6c677..61e82f83ce6e 100644 --- a/core/res/res/values-ko-rKR/donottranslate-cldr.xml +++ b/core/res/res/values-ko-rKR/donottranslate-cldr.xml @@ -86,8 +86,8 @@ <string name="month_day_year">%Y년 %-m월 %-e일</string> <string name="time_of_day">%p %-l:%M:%S</string> <string name="date_and_time">%p %-l:%M:%S %Y. %-m. %-e.</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%Y. %-m. %-e.</string> <string name="month_day">%B %-e일</string> <string name="month">%-B</string> @@ -96,7 +96,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y년 %b</string> <string name="time1_time2">%1$s – %2$s</string> - <string name="date1_date2">%1$s – %2$s</string> + <string name="date1_date2">%2$s – %5$s</string> <string name="numeric_md1_md2">%2$s. %3$s ~ %7$s. %8$s</string> <string name="numeric_wday1_md1_wday2_md2">%2$s. %3$s %1$s ~ %7$s. %8$s %6$s</string> <string name="numeric_mdy1_mdy2">%4$s. %2$s. %3$s. ~ %9$s. %7$s. %8$s.</string> @@ -122,7 +122,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %4$s년 %2$s %3$s일 %1$s – %10$s %9$s년 %7$s %8$s일 %6$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %4$s년 %2$s %3$s일 %1$s – %10$s %9$s년 %7$s %8$s일 %6$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%4$s년 %2$s %3$s일 %1$s – %9$s년 %7$s %8$s일 %6$s</string> - <string name="same_month_md1_md2">%2$s %3$s일 – %7$s %8$s일</string> + <string name="same_month_md1_md2">%2$s월 %3$s일 ~ %8$s일</string> <string name="same_month_wday1_md1_wday2_md2">%2$s %3$s일 (%1$s) – %7$s %8$s일 (%6$s)</string> <string name="same_year_mdy1_mdy2">%9$s년 %2$s %3$s일 ~ %7$s월 %8$s일</string> <string name="same_month_mdy1_mdy2">%9$s년 %2$s %3$s일~%8$s일</string> diff --git a/core/res/res/values-ko/donottranslate-cldr.xml b/core/res/res/values-ko/donottranslate-cldr.xml index ea780cf6c677..61e82f83ce6e 100644 --- a/core/res/res/values-ko/donottranslate-cldr.xml +++ b/core/res/res/values-ko/donottranslate-cldr.xml @@ -86,8 +86,8 @@ <string name="month_day_year">%Y년 %-m월 %-e일</string> <string name="time_of_day">%p %-l:%M:%S</string> <string name="date_and_time">%p %-l:%M:%S %Y. %-m. %-e.</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%Y. %-m. %-e.</string> <string name="month_day">%B %-e일</string> <string name="month">%-B</string> @@ -96,7 +96,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y년 %b</string> <string name="time1_time2">%1$s – %2$s</string> - <string name="date1_date2">%1$s – %2$s</string> + <string name="date1_date2">%2$s – %5$s</string> <string name="numeric_md1_md2">%2$s. %3$s ~ %7$s. %8$s</string> <string name="numeric_wday1_md1_wday2_md2">%2$s. %3$s %1$s ~ %7$s. %8$s %6$s</string> <string name="numeric_mdy1_mdy2">%4$s. %2$s. %3$s. ~ %9$s. %7$s. %8$s.</string> @@ -122,7 +122,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %4$s년 %2$s %3$s일 %1$s – %10$s %9$s년 %7$s %8$s일 %6$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %4$s년 %2$s %3$s일 %1$s – %10$s %9$s년 %7$s %8$s일 %6$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%4$s년 %2$s %3$s일 %1$s – %9$s년 %7$s %8$s일 %6$s</string> - <string name="same_month_md1_md2">%2$s %3$s일 – %7$s %8$s일</string> + <string name="same_month_md1_md2">%2$s월 %3$s일 ~ %8$s일</string> <string name="same_month_wday1_md1_wday2_md2">%2$s %3$s일 (%1$s) – %7$s %8$s일 (%6$s)</string> <string name="same_year_mdy1_mdy2">%9$s년 %2$s %3$s일 ~ %7$s월 %8$s일</string> <string name="same_month_mdy1_mdy2">%9$s년 %2$s %3$s일~%8$s일</string> diff --git a/core/res/res/values-lt-rLT/donottranslate-cldr.xml b/core/res/res/values-lt-rLT/donottranslate-cldr.xml index cb03d4136935..d004f7023c65 100644 --- a/core/res/res/values-lt-rLT/donottranslate-cldr.xml +++ b/core/res/res/values-lt-rLT/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%Y m. %B %-e d.</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %Y.%m.%d</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%Y.%m.%d</string> <string name="month_day">%B %-e</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y %b</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%2$s-%3$s - %7$s-%8$s</string> <string name="numeric_wday1_md1_wday2_md2">%2$s-%3$s%1$s - %7$s-%8$s%6$s</string> <string name="numeric_mdy1_mdy2">%4$s-%2$s-%3$s - %9$s-%7$s-%8$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s - %10$s %6$s, %9$s %7$s %8$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s - %10$s %6$s, %9$s %7$s %8$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %4$s %2$s %3$s - %6$s, %9$s %7$s %8$s</string> - <string name="same_month_md1_md2">%2$s %3$s - %7$s %8$s</string> + <string name="same_month_md1_md2">%2$s %3$s d.-%8$s d.</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %2$s %3$s - %6$s %7$s %8$s</string> <string name="same_year_mdy1_mdy2">%9$s m. %2$s %3$s d. - %7$s %8$s d.</string> <string name="same_month_mdy1_mdy2">%9$s m. %2$s %3$s d.-%8$s d.</string> diff --git a/core/res/res/values-lv-rLV/donottranslate-cldr.xml b/core/res/res/values-lv-rLV/donottranslate-cldr.xml index d4c3c8de67b2..d0751d08066c 100644 --- a/core/res/res/values-lv-rLV/donottranslate-cldr.xml +++ b/core/res/res/values-lv-rLV/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%Y. gada %-e. %B</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %Y. gada %-e. %b</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%Y. gada %-e. %b</string> <string name="month_day">%-e. %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y. g. %b</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s–%8$s.%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s - %6$s, %8$s.%7$s</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s.–%8$s.%7$s.%9$s.</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s. g. %3$s. %2$s - %10$s %6$s, %9$s. g. %8$s. %7$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s. g. %3$s. %2$s - %10$s %6$s, %9$s. g. %8$s. %7$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %4$s. g. %3$s. %2$s - %6$s, %9$s. g. %8$s. %7$s</string> - <string name="same_month_md1_md2">%3$s. %2$s - %8$s. %7$s</string> + <string name="same_month_md1_md2">%3$s.-%8$s. %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s, %3$s. %2$s - %6$s, %8$s. %7$s</string> <string name="same_year_mdy1_mdy2">%9$s. gada %3$s. %2$s - %8$s. %7$s</string> <string name="same_month_mdy1_mdy2">%9$s. gada %3$s.-%8$s. %2$s</string> diff --git a/core/res/res/values-nb/donottranslate-cldr.xml b/core/res/res/values-nb/donottranslate-cldr.xml index 478657af3d1c..1aebf2e9b7c2 100644 --- a/core/res/res/values-nb/donottranslate-cldr.xml +++ b/core/res/res/values-nb/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e. %B %Y</string> <string name="time_of_day">%H.%M.%S</string> <string name="date_and_time">%H.%M.%S %-e. %b %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e. %b %Y</string> <string name="month_day">%-e. %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s–%2$s</string> - <string name="date1_date2">%1$s–%2$s</string> + <string name="date1_date2">%2$s–%5$s</string> <string name="numeric_md1_md2">%3$s.%2$s.–%8$s.%7$s.</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s.%2$s.–%6$s %8$s.%7$s.</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s–%8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s. %2$s %4$s–%10$s %6$s %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s. %2$s %4$s–%10$s %6$s %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s %3$s. %2$s %4$s–%6$s %8$s. %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s. %2$s–%8$s. %7$s</string> + <string name="same_month_md1_md2">%3$s.–%8$s. %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s. %2$s–%6$s %8$s. %7$s</string> <string name="same_year_mdy1_mdy2">%3$s. %2$s–%8$s. %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s.–%8$s. %2$s %9$s</string> diff --git a/core/res/res/values-nl-rBE/donottranslate-cldr.xml b/core/res/res/values-nl-rBE/donottranslate-cldr.xml index a7781701b5e0..3ab87b09ab22 100644 --- a/core/res/res/values-nl-rBE/donottranslate-cldr.xml +++ b/core/res/res/values-nl-rBE/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %-e-%b-%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e-%b-%Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s/%2$s - %6$s %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s - %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s - %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s %3$s %2$s %4$s - %6$s %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s - %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-nl-rNL/donottranslate-cldr.xml b/core/res/res/values-nl-rNL/donottranslate-cldr.xml index 24318a1f4ffc..accd0861b4cf 100644 --- a/core/res/res/values-nl-rNL/donottranslate-cldr.xml +++ b/core/res/res/values-nl-rNL/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %-e %b %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e %b %Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s-%2$s - %8$s-%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s-%2$s - %6$s %8$s-%7$s</string> <string name="numeric_mdy1_mdy2">%3$s-%2$s-%4$s - %8$s-%7$s-%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s - %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s - %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s %3$s %2$s %4$s - %6$s %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s - %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-nl/donottranslate-cldr.xml b/core/res/res/values-nl/donottranslate-cldr.xml index 24318a1f4ffc..accd0861b4cf 100644 --- a/core/res/res/values-nl/donottranslate-cldr.xml +++ b/core/res/res/values-nl/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %-e %b %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e %b %Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s-%2$s - %8$s-%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s-%2$s - %6$s %8$s-%7$s</string> <string name="numeric_mdy1_mdy2">%3$s-%2$s-%4$s - %8$s-%7$s-%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s - %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s - %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s %3$s %2$s %4$s - %6$s %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s - %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-pl-rPL/donottranslate-cldr.xml b/core/res/res/values-pl-rPL/donottranslate-cldr.xml index 102addc56123..2d23d61dabf1 100644 --- a/core/res/res/values-pl-rPL/donottranslate-cldr.xml +++ b/core/res/res/values-pl-rPL/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %d-%m-%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d-%m-%Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y %b</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s-%8$s.%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s - %6$s, %8$s.%7$s</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s-%8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s - %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s - %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s %2$s %4$s - %6$s, %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%3$s %2$s %1$s - %8$s %7$s %6$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-pl/donottranslate-cldr.xml b/core/res/res/values-pl/donottranslate-cldr.xml index 102addc56123..2d23d61dabf1 100644 --- a/core/res/res/values-pl/donottranslate-cldr.xml +++ b/core/res/res/values-pl/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %d-%m-%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d-%m-%Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y %b</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s-%8$s.%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s - %6$s, %8$s.%7$s</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s-%8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s - %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s - %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s %2$s %4$s - %6$s, %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%3$s %2$s %1$s - %8$s %7$s %6$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-pt-rBR/donottranslate-cldr.xml b/core/res/res/values-pt-rBR/donottranslate-cldr.xml index 4c488f435d1c..0976292ff3e1 100644 --- a/core/res/res/values-pt-rBR/donottranslate-cldr.xml +++ b/core/res/res/values-pt-rBR/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e de %B de %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %d/%m/%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d/%m/%Y</string> <string name="month_day">%-e de %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b de %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s/%2$s - %6$s, %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s de %2$s de %4$s - %10$s %6$s, %8$s de %7$s de %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s de %2$s de %4$s - %10$s %6$s, %8$s de %7$s de %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s de %2$s de %4$s - %6$s, %8$s de %7$s de %9$s</string> - <string name="same_month_md1_md2">%3$s de %2$s - %8$s de %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s de %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s, %3$s de %2$s - %6$s, %8$s de %7$s</string> <string name="same_year_mdy1_mdy2">%3$s de %2$s - %8$s de %7$s de %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s de %2$s de %9$s</string> diff --git a/core/res/res/values-pt-rPT/donottranslate-cldr.xml b/core/res/res/values-pt-rPT/donottranslate-cldr.xml index c854d9edafd0..bbb8c1b90dd2 100644 --- a/core/res/res/values-pt-rPT/donottranslate-cldr.xml +++ b/core/res/res/values-pt-rPT/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e de %B de %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %-e de %b de %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e de %b de %Y</string> <string name="month_day">%-e de %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b de %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s/%2$s - %6$s, %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s de %2$s de %4$s - %10$s %6$s, %8$s de %7$s de %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s de %2$s de %4$s - %10$s %6$s, %8$s de %7$s de %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s de %2$s de %4$s - %6$s, %8$s de %7$s de %9$s</string> - <string name="same_month_md1_md2">%3$s de %2$s - %8$s de %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s de %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s, %3$s de %2$s - %6$s, %8$s de %7$s</string> <string name="same_year_mdy1_mdy2">%3$s de %2$s - %8$s de %7$s de %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s de %2$s de %9$s</string> diff --git a/core/res/res/values-ro-rRO/donottranslate-cldr.xml b/core/res/res/values-ro-rRO/donottranslate-cldr.xml index e8b2376c36ae..10fc10e1beab 100644 --- a/core/res/res/values-ro-rRO/donottranslate-cldr.xml +++ b/core/res/res/values-ro-rRO/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S, %d.%m.%Y</string> - <string name="date_time">%2$s, %$1s</string> - <string name="time_date">%1$s, %$2s</string> + <string name="date_time">%2$s, %1$s</string> + <string name="time_date">%1$s, %3$s</string> <string name="abbrev_month_day_year">%d.%m.%Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s - %8$s.%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s - %6$s, %8$s.%7$s</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s, %1$s, %3$s %2$s %4$s - %10$s, %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s, %1$s, %3$s %2$s %4$s - %10$s, %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s %2$s %4$s - %6$s, %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s, %3$s %2$s - %6$s, %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-ru-rRU/donottranslate-cldr.xml b/core/res/res/values-ru-rRU/donottranslate-cldr.xml index 12f419e4df05..c5b22b66d22f 100644 --- a/core/res/res/values-ru-rRU/donottranslate-cldr.xml +++ b/core/res/res/values-ru-rRU/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y г.</string> <string name="time_of_day">%-k:%M:%S</string> <string name="date_and_time">%-k:%M:%S %d.%m.%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d.%m.%Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s - %8$s.%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %2$s-%3$s – %6$s, %7$s-%8$s</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s - %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s - %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s %2$s %4$s - %6$s, %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %2$s %3$s - %6$s %7$s %8$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s г.</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s г.</string> diff --git a/core/res/res/values-ru/donottranslate-cldr.xml b/core/res/res/values-ru/donottranslate-cldr.xml index 12f419e4df05..c5b22b66d22f 100644 --- a/core/res/res/values-ru/donottranslate-cldr.xml +++ b/core/res/res/values-ru/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y г.</string> <string name="time_of_day">%-k:%M:%S</string> <string name="date_and_time">%-k:%M:%S %d.%m.%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d.%m.%Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s - %8$s.%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %2$s-%3$s – %6$s, %7$s-%8$s</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s - %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s - %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s %2$s %4$s - %6$s, %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %2$s %3$s - %6$s %7$s %8$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s г.</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s г.</string> diff --git a/core/res/res/values-sk-rSK/donottranslate-cldr.xml b/core/res/res/values-sk-rSK/donottranslate-cldr.xml index 47fc73cd3032..75352f7c23df 100644 --- a/core/res/res/values-sk-rSK/donottranslate-cldr.xml +++ b/core/res/res/values-sk-rSK/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e. %B %Y</string> <string name="time_of_day">%-k:%M:%S</string> <string name="date_and_time">%-k:%M:%S %-e.%-m.%Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e.%-m.%Y</string> <string name="month_day">%-e. %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s. - %8$s.%7$s.</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s. - %6$s, %8$s.%7$s.</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s. %2$s %4$s - %10$s %6$s, %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s. %2$s %4$s - %10$s %6$s, %8$s. %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s. %2$s %4$s - %6$s, %8$s. %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s. %2$s - %8$s. %7$s</string> + <string name="same_month_md1_md2">%3$s. - %8$s. %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s, %3$s. %2$s - %6$s, %8$s. %7$s</string> <string name="same_year_mdy1_mdy2">%3$s. %2$s - %8$s. %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s. - %8$s. %2$s %9$s</string> diff --git a/core/res/res/values-sl-rSI/donottranslate-cldr.xml b/core/res/res/values-sl-rSI/donottranslate-cldr.xml index d7ec4a2c9ee9..8885a9f04722 100644 --- a/core/res/res/values-sl-rSI/donottranslate-cldr.xml +++ b/core/res/res/values-sl-rSI/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%d. %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %-e. %b. %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e. %b. %Y</string> <string name="month_day">%-e. %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y %b</string> <string name="time1_time2">%1$s – %2$s</string> - <string name="date1_date2">%1$s – %2$s</string> + <string name="date1_date2">%2$s – %5$s</string> <string name="numeric_md1_md2">%3$s. %2$s. – %8$s. %7$s.</string> <string name="numeric_wday1_md1_wday2_md2">%1$s., %3$s. %2$s. – %6$s., %8$s. %7$s.</string> <string name="numeric_mdy1_mdy2">%3$s. %2$s. %4$s – %8$s. %7$s. %9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s – %10$s %6$s, %9$s %7$s %8$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %4$s %2$s %3$s – %10$s %6$s, %9$s %7$s %8$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %4$s %2$s %3$s – %6$s, %9$s %7$s %8$s</string> - <string name="same_month_md1_md2">%3$s. %2$s – %8$s. %7$s</string> + <string name="same_month_md1_md2">%3$s.–%8$s. %2$s.</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %2$s %3$s – %6$s %7$s %8$s</string> <string name="same_year_mdy1_mdy2">%3$s. %2$s. – %8$s. %7$s. %9$s</string> <string name="same_month_mdy1_mdy2">%3$s.–%8$s. %2$s. %9$s</string> diff --git a/core/res/res/values-sr-rRS/donottranslate-cldr.xml b/core/res/res/values-sr-rRS/donottranslate-cldr.xml index a35bcfd6ea2e..f97d6c67069e 100644 --- a/core/res/res/values-sr-rRS/donottranslate-cldr.xml +++ b/core/res/res/values-sr-rRS/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%d. %B %Y.</string> <string name="time_of_day">%H.%M.%S</string> <string name="date_and_time">%H.%M.%S %d.%m.%Y.</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d.%m.%Y.</string> <string name="month_day">%B %-e.</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b. %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s - %8$s.%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s - %6$s, %8$s.%7$s</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s. - %8$s.%7$s.%9$s.</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s. %2$s %4$s. - %10$s %6$s, %8$s. %7$s %9$s.</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s. %2$s %4$s. - %10$s %6$s, %8$s. %7$s %9$s.</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s. %2$s %4$s. - %6$s, %8$s. %7$s %9$s.</string> - <string name="same_month_md1_md2">%2$s %3$s. - %7$s %8$s.</string> + <string name="same_month_md1_md2">%3$s.-%8$s. %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s. %2$s - %6$s %8$s. %7$s</string> <string name="same_year_mdy1_mdy2">%3$s. %2$s - %8$s. %7$s %9$s.</string> <string name="same_month_mdy1_mdy2">%3$s.-%8$s. %2$s %9$s.</string> diff --git a/core/res/res/values-sv-rSE/donottranslate-cldr.xml b/core/res/res/values-sv-rSE/donottranslate-cldr.xml index 5237008feb07..eb7305f33b47 100644 --- a/core/res/res/values-sv-rSE/donottranslate-cldr.xml +++ b/core/res/res/values-sv-rSE/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %-e %b %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e %b %Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y %b</string> <string name="time1_time2">%1$s – %2$s</string> - <string name="date1_date2">%1$s – %2$s</string> + <string name="date1_date2">%2$s – %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s – %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s/%2$s – %6$s %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%4$s-%2$s-%3$s – %9$s-%7$s-%8$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s – %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s – %10$s %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s %3$s %2$s %4$s – %6$s %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s – %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s–%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s – %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s–%8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s–%8$s %2$s %9$s</string> diff --git a/core/res/res/values-th-rTH/donottranslate-cldr.xml b/core/res/res/values-th-rTH/donottranslate-cldr.xml index ec939a16fc51..0398b5612d13 100644 --- a/core/res/res/values-th-rTH/donottranslate-cldr.xml +++ b/core/res/res/values-th-rTH/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y</string> <string name="time_of_day">%-k:%M:%S</string> <string name="date_and_time">%-k:%M:%S, %-e %b %Y</string> - <string name="date_time">%2$s, %$1s</string> - <string name="time_date">%1$s, %$2s</string> + <string name="date_time">%2$s, %1$s</string> + <string name="time_date">%1$s, %3$s</string> <string name="abbrev_month_day_year">%-e %b %Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s %3$s/%2$s – %6$s %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s – %8$s/%7$s/%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s, %1$s %3$s %2$s %4$s - %10$s, %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s, %1$s %3$s %2$s %4$s - %10$s, %6$s %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s %3$s %2$s %4$s - %6$s %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s – %8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s - %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s – %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s–%8$s %2$s %9$s</string> diff --git a/core/res/res/values-tr-rTR/donottranslate-cldr.xml b/core/res/res/values-tr-rTR/donottranslate-cldr.xml index 0318a458ecaf..2de135925716 100644 --- a/core/res/res/values-tr-rTR/donottranslate-cldr.xml +++ b/core/res/res/values-tr-rTR/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%d %B %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %d %b %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%d %b %Y</string> <string name="month_day">%d %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s - %8$s.%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%3$s.%2$s %1$s - %8$s.%7$s %6$s</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %3$s %2$s %4$s %1$s - %10$s %8$s %7$s %9$s %6$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %3$s %2$s %4$s %1$s - %10$s %8$s %7$s %9$s %6$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%3$s %2$s %4$s %1$s - %8$s %7$s %9$s %6$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s-%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%3$s %2$s %1$s - %8$s %7$s %6$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string> diff --git a/core/res/res/values-uk-rUA/donottranslate-cldr.xml b/core/res/res/values-uk-rUA/donottranslate-cldr.xml index 374a8714baa1..024a9b36fe41 100644 --- a/core/res/res/values-uk-rUA/donottranslate-cldr.xml +++ b/core/res/res/values-uk-rUA/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%-e %B %Y р.</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%H:%M:%S %-e %b %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%-e %b %Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%-b %Y</string> <string name="time1_time2">%1$s – %2$s</string> - <string name="date1_date2">%1$s – %2$s</string> + <string name="date1_date2">%2$s – %5$s</string> <string name="numeric_md1_md2">%3$s.%2$s – %8$s.%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s – %6$s, %8$s.%7$s</string> <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s – %8$s.%7$s.%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s – %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %3$s %2$s %4$s – %10$s %6$s, %8$s %7$s %9$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s %2$s %4$s – %6$s, %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s – %8$s %7$s</string> + <string name="same_month_md1_md2">%3$s–%8$s %2$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s, %3$s %2$s – %6$s, %8$s %7$s</string> <string name="same_year_mdy1_mdy2">%3$s %2$s – %8$s %7$s %9$s</string> <string name="same_month_mdy1_mdy2">%3$s–%8$s %2$s %9$s</string> diff --git a/core/res/res/values-vi-rVN/donottranslate-cldr.xml b/core/res/res/values-vi-rVN/donottranslate-cldr.xml index 4f1acde94bf6..674c37f411dc 100644 --- a/core/res/res/values-vi-rVN/donottranslate-cldr.xml +++ b/core/res/res/values-vi-rVN/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">Ngày %d tháng %-m năm %Y</string> <string name="time_of_day">%H:%M:%S</string> <string name="date_and_time">%d-%m-%Y %H:%M:%S</string> - <string name="date_time">%$1s %2$s</string> - <string name="time_date">%$2s %1$s</string> + <string name="date_time">%1$s %2$s</string> + <string name="time_date">%3$s %1$s</string> <string name="abbrev_month_day_year">%d-%m-%Y</string> <string name="month_day">%-e %B</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s - %2$s</string> - <string name="date1_date2">%1$s - %2$s</string> + <string name="date1_date2">%2$s - %5$s</string> <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s/%2$s - %6$s, %8$s/%7$s</string> <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %3$s %2$s %4$s %5$s - %6$s, %8$s %7$s %9$s %10$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %3$s %2$s %4$s %5$s - %6$s, %8$s %7$s %9$s %10$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s %2$s %4$s - %6$s, %8$s %7$s %9$s</string> - <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string> + <string name="same_month_md1_md2">Ngày %3$s tháng %2$s - Ngày %8$s tháng %7$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s - %6$s %8$s %7$s</string> <string name="same_year_mdy1_mdy2">Ngày %3$s tháng %2$s - Ngày %8$s tháng %7$s năm %9$s</string> <string name="same_month_mdy1_mdy2">Ngày %3$s tháng %2$s - Ngày %8$s tháng M năm %9$s</string> diff --git a/core/res/res/values-zh-rCN/donottranslate-cldr.xml b/core/res/res/values-zh-rCN/donottranslate-cldr.xml index 5d22a409a578..d18ce36aaba3 100644 --- a/core/res/res/values-zh-rCN/donottranslate-cldr.xml +++ b/core/res/res/values-zh-rCN/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%Y年%-m月%-e日</string> <string name="time_of_day">%p%I:%M:%S</string> <string name="date_and_time">%p%I:%M:%S %Y-%-m-%-e</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%Y-%-m-%-e</string> <string name="month_day">%B%-e日</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y年%b</string> <string name="time1_time2">%1$s–%2$s</string> - <string name="date1_date2">%1$s–%2$s</string> + <string name="date1_date2">%2$s–%5$s</string> <string name="numeric_md1_md2">%2$s-%3$s至%7$s-%8$s</string> <string name="numeric_wday1_md1_wday2_md2">%2$s-%3$s%1$s至%7$s-%8$s%6$s</string> <string name="numeric_mdy1_mdy2">%4$s-%2$s-%3$s至%9$s-%7$s-%8$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %4$s年%2$s%3$s日%1$s–%10$s %9$s年%7$s%8$s日%6$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %4$s年%2$s%3$s日%1$s–%10$s %9$s年%7$s%8$s日%6$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%4$s年%2$s%3$s日%1$s–%9$s年%7$s%8$s日%6$s</string> - <string name="same_month_md1_md2">%2$s%3$s日–%7$s%8$s日</string> + <string name="same_month_md1_md2">%2$s月%3$s日至%8$s日</string> <string name="same_month_wday1_md1_wday2_md2">%2$s%3$s日%1$s–%7$s%8$s日%6$s</string> <string name="same_year_mdy1_mdy2">%9$s年%2$s%3$s日至%7$s月%8$s日</string> <string name="same_month_mdy1_mdy2">%9$s年%2$s%3$s日至%8$s日</string> diff --git a/core/res/res/values-zh-rTW/donottranslate-cldr.xml b/core/res/res/values-zh-rTW/donottranslate-cldr.xml index 5d22a409a578..d18ce36aaba3 100644 --- a/core/res/res/values-zh-rTW/donottranslate-cldr.xml +++ b/core/res/res/values-zh-rTW/donottranslate-cldr.xml @@ -98,8 +98,8 @@ <string name="month_day_year">%Y年%-m月%-e日</string> <string name="time_of_day">%p%I:%M:%S</string> <string name="date_and_time">%p%I:%M:%S %Y-%-m-%-e</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_time">%2$s %1$s</string> + <string name="time_date">%1$s %3$s</string> <string name="abbrev_month_day_year">%Y-%-m-%-e</string> <string name="month_day">%B%-e日</string> <string name="month">%-B</string> @@ -108,7 +108,7 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%Y年%b</string> <string name="time1_time2">%1$s–%2$s</string> - <string name="date1_date2">%1$s–%2$s</string> + <string name="date1_date2">%2$s–%5$s</string> <string name="numeric_md1_md2">%2$s-%3$s至%7$s-%8$s</string> <string name="numeric_wday1_md1_wday2_md2">%2$s-%3$s%1$s至%7$s-%8$s%6$s</string> <string name="numeric_mdy1_mdy2">%4$s-%2$s-%3$s至%9$s-%7$s-%8$s</string> @@ -134,7 +134,7 @@ <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %4$s年%2$s%3$s日%1$s–%10$s %9$s年%7$s%8$s日%6$s</string> <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %4$s年%2$s%3$s日%1$s–%10$s %9$s年%7$s%8$s日%6$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%4$s年%2$s%3$s日%1$s–%9$s年%7$s%8$s日%6$s</string> - <string name="same_month_md1_md2">%2$s%3$s日–%7$s%8$s日</string> + <string name="same_month_md1_md2">%2$s月%3$s日至%8$s日</string> <string name="same_month_wday1_md1_wday2_md2">%2$s%3$s日%1$s–%7$s%8$s日%6$s</string> <string name="same_year_mdy1_mdy2">%9$s年%2$s%3$s日至%7$s月%8$s日</string> <string name="same_month_mdy1_mdy2">%9$s年%2$s%3$s日至%8$s日</string> diff --git a/core/res/res/values/donottranslate-cldr.xml b/core/res/res/values/donottranslate-cldr.xml index 3c13bcf08f8b..e3808a733371 100644 --- a/core/res/res/values/donottranslate-cldr.xml +++ b/core/res/res/values/donottranslate-cldr.xml @@ -91,15 +91,15 @@ <string name="today">Today</string> <string name="tomorrow">Tomorrow</string> - <string name="hour_minute_ampm">%-l:%M %p</string> - <string name="hour_minute_cap_ampm">%-l:%M %^p</string> + <string name="hour_minute_ampm">%-l:%M%p</string> + <string name="hour_minute_cap_ampm">%-l:%M%^p</string> <string name="numeric_date">%-m/%-e/%Y</string> <string name="numeric_date_format">M/d/yyyy</string> <string name="month_day_year">%B %-e, %Y</string> <string name="time_of_day">%-l:%M:%S %p</string> - <string name="date_and_time">%-l:%M:%S %p %b %-e, %Y</string> - <string name="date_time">%2$s %$1s</string> - <string name="time_date">%1$s %$2s</string> + <string name="date_and_time">%b %-e, %Y, %-l:%M:%S %p</string> + <string name="date_time">%1$s, %2$s</string> + <string name="time_date">%1$s, %3$s</string> <string name="abbrev_month_day_year">%b %-e, %Y</string> <string name="month_day">%B %-e</string> <string name="month">%-B</string> @@ -108,35 +108,35 @@ <string name="abbrev_month">%-b</string> <string name="abbrev_month_year">%b %Y</string> <string name="time1_time2">%1$s – %2$s</string> - <string name="date1_date2">%1$s – %2$s</string> + <string name="date1_date2">%2$s – %5$s</string> <string name="numeric_md1_md2">%2$s/%3$s – %7$s/%8$s</string> <string name="numeric_wday1_md1_wday2_md2">%1$s, %2$s/%3$s – %6$s, %7$s/%8$s</string> <string name="numeric_mdy1_mdy2">%2$s/%3$s/%4$s – %7$s/%8$s/%9$s</string> <string name="numeric_wday1_mdy1_wday2_mdy2">%1$s, %2$s/%3$s/%4$s – %6$s, %7$s/%8$s/%9$s</string> - <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s/%3$s/%4$s – %10$s %6$s, %7$s/%8$s/%9$s</string> - <string name="numeric_md1_time1_md2_time2">%5$s %2$s/%3$s – %10$s %7$s/%8$s</string> - <string name="numeric_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s/%3$s – %10$s %6$s, %7$s/%8$s</string> - <string name="numeric_mdy1_time1_mdy2_time2">%5$s %2$s/%3$s/%4$s – %10$s %7$s/%8$s/%9$s</string> - <string name="wday1_date1_time1_wday2_date2_time2">%3$s %1$s, %2$s – %6$s %4$s, %5$s</string> + <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s/%3$s/%4$s, %5$s – %6$s, %7$s/%8$s/%9$s, %10$s</string> + <string name="numeric_md1_time1_md2_time2">%2$s/%3$s, %5$s – %7$s/%8$s, %10$s</string> + <string name="numeric_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s/%3$s, %5$s – %6$s, %7$s/%8$s, %10$s</string> + <string name="numeric_mdy1_time1_mdy2_time2">%2$s/%3$s/%4$s, %5$s – %7$s/%8$s/%9$s, %10$s</string> + <string name="wday1_date1_time1_wday2_date2_time2">%1$s, %2$s, %3$s – %4$s, %5$s, %6$s</string> <string name="wday1_date1_wday2_date2">%1$s, %2$s – %4$s, %5$s</string> - <string name="date1_time1_date2_time2">%3$s %2$s – %6$s %5$s</string> - <string name="time_wday_date">%1$s %2$s, %3$s</string> + <string name="date1_time1_date2_time2">%2$s, %3$s – %5$s, %6$s</string> + <string name="time_wday_date">%1$s, %2$s, %3$s</string> <string name="wday_date">%2$s, %3$s</string> - <string name="time_wday">%1$s %2$s</string> + <string name="time_wday">%1$s, %2$s</string> <string name="same_year_md1_md2">%2$s %3$s – %7$s %8$s</string> <string name="same_year_wday1_md1_wday2_md2">%1$s, %2$s %3$s – %6$s, %7$s %8$s</string> - <string name="same_year_md1_time1_md2_time2">%5$s %2$s %3$s – %10$s %7$s %8$s</string> - <string name="same_month_md1_time1_md2_time2">%5$s %2$s %3$s – %10$s %7$s %8$s</string> - <string name="same_year_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s – %10$s %6$s, %7$s %8$s</string> - <string name="same_month_wday1_md1_time1_wday2_md2_time2">%5$s %1$s, %2$s %3$s – %10$s %6$s, %7$s %8$s</string> - <string name="same_year_mdy1_time1_mdy2_time2">%5$s %2$s %3$s, %4$s – %10$s %7$s %8$s, %9$s</string> - <string name="same_month_mdy1_time1_mdy2_time2">%5$s %2$s %3$s, %4$s – %10$s %7$s %8$s, %9$s</string> - <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s – %10$s %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s, %2$s %3$s, %4$s – %10$s %6$s, %7$s %8$s, %9$s</string> + <string name="same_year_md1_time1_md2_time2">%2$s %3$s, %5$s – %7$s %8$s, %10$s</string> + <string name="same_month_md1_time1_md2_time2">%2$s %3$s, %5$s – %7$s %8$s, %10$s</string> + <string name="same_year_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s – %6$s, %7$s %8$s, %10$s</string> + <string name="same_month_wday1_md1_time1_wday2_md2_time2">%1$s, %2$s %3$s, %5$s – %6$s, %7$s %8$s, %10$s</string> + <string name="same_year_mdy1_time1_mdy2_time2">%2$s %3$s, %4$s, %5$s – %7$s %8$s, %9$s, %10$s</string> + <string name="same_month_mdy1_time1_mdy2_time2">%2$s %3$s, %4$s, %5$s – %7$s %8$s, %9$s, %10$s</string> + <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s – %6$s, %7$s %8$s, %9$s, %10$s</string> + <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %2$s %3$s, %4$s, %5$s – %6$s, %7$s %8$s, %9$s, %10$s</string> <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %2$s %3$s, %4$s – %6$s, %7$s %8$s, %9$s</string> - <string name="same_month_md1_md2">%2$s %3$s – %7$s %8$s</string> + <string name="same_month_md1_md2">%2$s %3$s – %8$s</string> <string name="same_month_wday1_md1_wday2_md2">%1$s, %2$s %3$s – %6$s, %7$s %8$s</string> <string name="same_year_mdy1_mdy2">%2$s %3$s – %7$s %8$s, %9$s</string> - <string name="same_month_mdy1_mdy2">%2$s %3$s–%8$s, %9$s</string> + <string name="same_month_mdy1_mdy2">%2$s %3$s – %8$s, %9$s</string> <string name="same_year_wday1_mdy1_wday2_mdy2">%1$s, %2$s %3$s – %6$s, %7$s %8$s, %9$s</string> </resources> |