diff options
| author | Eric Fischer <enf@google.com> | 2009-06-09 18:30:34 -0700 |
|---|---|---|
| committer | Eric Fischer <enf@google.com> | 2009-06-09 18:30:34 -0700 |
| commit | c110ec0ab685c4bc7e8db04859631b69aa592cd5 (patch) | |
| tree | 051bb67a1365f36c3a000156b33c936ac44a2abe /core/res/res/values-sr-rRS | |
| parent | 137c45036699eeceb061a47ab14d9a7eb860674d (diff) | |
| download | frameworks_base-c110ec0ab685c4bc7e8db04859631b69aa592cd5.zip frameworks_base-c110ec0ab685c4bc7e8db04859631b69aa592cd5.tar.gz frameworks_base-c110ec0ab685c4bc7e8db04859631b69aa592cd5.tar.bz2 | |
Get the FormatDateRange tests passing again.
This fixes a few places that were accidentally using the wrong numbered
parameter in the format call. It also makes other adjustments so that
the formats for English are exactly the same as they were in Cupcake.
Diffstat (limited to 'core/res/res/values-sr-rRS')
| -rw-r--r-- | core/res/res/values-sr-rRS/donottranslate-cldr.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/res/res/values-sr-rRS/donottranslate-cldr.xml b/core/res/res/values-sr-rRS/donottranslate-cldr.xml index a35bcfd..f97d6c6 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> |