Skip to content

Commit 3594e85

Browse files
enh-googleAndroid (Google) Code Review
authored andcommitted
Merge "Fix Catalan ("ca") date formatting." into jb-mr1-dev
2 parents d367b70 + e59ac5c commit 3594e85

File tree

2 files changed

+14
-74
lines changed

2 files changed

+14
-74
lines changed

core/res/res/values-ca-rES/donottranslate-cldr.xml

Lines changed: 0 additions & 60 deletions
This file was deleted.

core/res/res/values-ca/donottranslate-cldr.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
<string name="numeric_date">%d/%m/%Y</string>
1010
<string name="numeric_date_format">dd/MM/yyyy</string>
1111
<string name="numeric_date_template">"%s/%s/%s"</string>
12-
<string name="month_day_year">%-e de %B de %Y</string>
12+
<string name="month_day_year">%-e %B de %Y</string>
1313
<string name="time_of_day">%-k:%M:%S</string>
1414
<string name="date_and_time">%-k:%M:%S %d/%m/%Y</string>
1515
<string name="date_time">%2$s %1$s</string>
1616
<string name="time_date">%1$s %3$s</string>
1717
<string name="abbrev_month_day_year">%d/%m/%Y</string>
18-
<string name="month_day">%-e de %B</string>
18+
<string name="month_day">%-e %B</string>
1919
<string name="month">%-B</string>
2020
<string name="month_year">%-B del %Y</string>
2121
<string name="abbrev_month_day">%-e %b</string>
@@ -37,24 +37,24 @@
3737
<string name="time_wday_date">%1$s %2$s %3$s</string>
3838
<string name="wday_date">%2$s %3$s</string>
3939
<string name="time_wday">%1$s %2$s</string>
40-
<string name="same_year_md1_md2">%3$s de %2$s - %8$s de %7$s</string>
40+
<string name="same_year_md1_md2">%3$s %2$s - %8$s %7$s</string>
4141
<string name="same_year_wday1_md1_wday2_md2">%1$s %3$s %2$s - %6$s %8$s %7$s</string>
42-
<string name="same_year_md1_time1_md2_time2">%5$s %3$s de %2$s - %10$s %8$s de %7$s</string>
43-
<string name="same_month_md1_time1_md2_time2">%5$s %3$s de %2$s - %10$s %8$s de %7$s</string>
42+
<string name="same_year_md1_time1_md2_time2">%5$s %3$s %2$s - %10$s %8$s %7$s</string>
43+
<string name="same_month_md1_time1_md2_time2">%5$s %3$s %2$s - %10$s %8$s %7$s</string>
4444
<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>
4545
<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>
46-
<string name="same_year_mdy1_time1_mdy2_time2">%5$s %3$s de %2$s de %4$s - %10$s %8$s de %7$s de %9$s</string>
47-
<string name="same_month_mdy1_time1_mdy2_time2">%5$s %3$s de %2$s de %4$s - %10$s %8$s de %7$s de %9$s</string>
46+
<string name="same_year_mdy1_time1_mdy2_time2">%5$s %3$s %2$s de %4$s - %10$s %8$s %7$s de %9$s</string>
47+
<string name="same_month_mdy1_time1_mdy2_time2">%5$s %3$s %2$s de %4$s - %10$s %8$s %7$s de %9$s</string>
4848
<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>
4949
<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>
5050
<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>
51-
<string name="same_month_md1_md2">%3$s-%8$s de %2$s</string>
51+
<string name="same_month_md1_md2">%3$s-%8$s %2$s</string>
5252
<string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s - %6$s %8$s %7$s</string>
53-
<string name="same_year_mdy1_mdy2">%3$s de %2$s - %8$s de %7$s de %9$s</string>
54-
<string name="same_month_mdy1_mdy2">%3$s-%8$s de %2$s de %9$s</string>
55-
<string name="same_year_wday1_mdy1_wday2_mdy2">%1$s %3$s de %2$s - %6$s %8$s de %7$s de %9$s</string>
53+
<string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s de %9$s</string>
54+
<string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s de %9$s</string>
55+
<string name="same_year_wday1_mdy1_wday2_mdy2">%1$s %3$s %2$s - %6$s %8$s %7$s de %9$s</string>
5656
<string name="short_format_month">%b</string>
57-
<string name="full_wday_month_day_no_year">E d MMMM</string>
58-
<string name="abbrev_wday_month_day_no_year">E d MMMM</string>
59-
<string name="abbrev_wday_month_day_year">EEE d MMM y</string>
57+
<string name="full_wday_month_day_no_year">EEEE d MMMM</string>
58+
<string name="abbrev_wday_month_day_no_year">EEE d MMMM</string>
59+
<string name="abbrev_wday_month_day_year">EEE d MMM yyyy</string>
6060
</resources>

0 commit comments

Comments
 (0)