Merge change 4990 into donut

* changes:
  Fix a few more blatantly wrong date formats.
This commit is contained in:
Android (Google) Code Review
2009-06-22 16:45:20 -07:00
14 changed files with 43 additions and 28 deletions

View File

@@ -84,7 +84,7 @@
<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, %4$s-%2$s-%3$s - %10$s %6$s, %9$s-%7$s-%8$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>

View File

@@ -117,7 +117,7 @@
<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, %4$s-%2$s-%3$s - %10$s %6$s, %9$s-%7$s-%8$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>

View File

@@ -117,7 +117,7 @@
<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, %4$s-%2$s-%3$s - %10$s %6$s, %9$s-%7$s-%8$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>

View File

@@ -117,7 +117,7 @@
<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, %4$s-%2$s-%3$s - %10$s %6$s, %9$s-%7$s-%8$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>

View File

@@ -117,7 +117,7 @@
<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, %4$s-%2$s-%3$s - %10$s %6$s, %9$s-%7$s-%8$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>

View File

@@ -8,6 +8,11 @@
<string name="month_long_standalone_may">Maggio</string>
<string name="month_long_standalone_june">Giugno</string>
<string name="month_long_standalone_july">Luglio</string>
<string name="month_long_standalone_august">Agosto</string>
<string name="month_long_standalone_september">Settembre</string>
<string name="month_long_standalone_october">Ottobre</string>
<string name="month_long_standalone_november">Novembre</string>
<string name="month_long_standalone_december">Dicembre</string>
<string name="month_long_january">gennaio</string>
<string name="month_long_february">febbraio</string>
@@ -15,7 +20,7 @@
<string name="month_long_april">aprile</string>
<string name="month_long_may">maggio</string>
<string name="month_long_june">giugno</string>
<string name="month_long_july">Luglio</string>
<string name="month_long_july">luglio</string>
<string name="month_long_august">agosto</string>
<string name="month_long_september">settembre</string>
<string name="month_long_october">ottobre</string>

View File

@@ -8,6 +8,11 @@
<string name="month_long_standalone_may">Maggio</string>
<string name="month_long_standalone_june">Giugno</string>
<string name="month_long_standalone_july">Luglio</string>
<string name="month_long_standalone_august">Agosto</string>
<string name="month_long_standalone_september">Settembre</string>
<string name="month_long_standalone_october">Ottobre</string>
<string name="month_long_standalone_november">Novembre</string>
<string name="month_long_standalone_december">Dicembre</string>
<string name="month_long_january">gennaio</string>
<string name="month_long_february">febbraio</string>
@@ -15,7 +20,7 @@
<string name="month_long_april">aprile</string>
<string name="month_long_may">maggio</string>
<string name="month_long_june">giugno</string>
<string name="month_long_july">Luglio</string>
<string name="month_long_july">luglio</string>
<string name="month_long_august">agosto</string>
<string name="month_long_september">settembre</string>
<string name="month_long_october">ottobre</string>
@@ -112,7 +117,7 @@
<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_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>

View File

@@ -8,6 +8,11 @@
<string name="month_long_standalone_may">Maggio</string>
<string name="month_long_standalone_june">Giugno</string>
<string name="month_long_standalone_july">Luglio</string>
<string name="month_long_standalone_august">Agosto</string>
<string name="month_long_standalone_september">Settembre</string>
<string name="month_long_standalone_october">Ottobre</string>
<string name="month_long_standalone_november">Novembre</string>
<string name="month_long_standalone_december">Dicembre</string>
<string name="month_long_january">gennaio</string>
<string name="month_long_february">febbraio</string>
@@ -15,7 +20,7 @@
<string name="month_long_april">aprile</string>
<string name="month_long_may">maggio</string>
<string name="month_long_june">giugno</string>
<string name="month_long_july">Luglio</string>
<string name="month_long_july">luglio</string>
<string name="month_long_august">agosto</string>
<string name="month_long_september">settembre</string>
<string name="month_long_october">ottobre</string>
@@ -112,7 +117,7 @@
<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_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>

View File

@@ -138,10 +138,10 @@
<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日%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_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>
<string name="same_year_wday1_mdy1_wday2_mdy2">%9$s年%2$s%3$s日(%1$s)%7$s%8$s日(%6$s)</string>
<string name="same_year_wday1_mdy1_wday2_mdy2">%9$s年%2$s%3$s日(%1$s)%7$s%8$s日(%6$s)</string>
<string name="short_format_month">%b</string>
</resources>

View File

@@ -138,10 +138,10 @@
<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日%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_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>
<string name="same_year_wday1_mdy1_wday2_mdy2">%9$s年%2$s%3$s日(%1$s)%7$s%8$s日(%6$s)</string>
<string name="same_year_wday1_mdy1_wday2_mdy2">%9$s年%2$s%3$s日(%1$s)%7$s%8$s日(%6$s)</string>
<string name="short_format_month">%b</string>
</resources>

View File

@@ -126,10 +126,10 @@
<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일 ~ %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_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>
<string name="same_year_wday1_mdy1_wday2_mdy2">%9$s년 %2$s %3$s일 %1$s ~ %7$s %8$s일 %6$s</string>
<string name="same_year_wday1_mdy1_wday2_mdy2">%9$s년 %2$s %3$s일 %1$s ~ %7$s %8$s일 %6$s</string>
<string name="short_format_month">%b</string>
</resources>

View File

@@ -126,10 +126,10 @@
<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일 ~ %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_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>
<string name="same_year_wday1_mdy1_wday2_mdy2">%9$s년 %2$s %3$s일 %1$s ~ %7$s %8$s일 %6$s</string>
<string name="same_year_wday1_mdy1_wday2_mdy2">%9$s년 %2$s %3$s일 %1$s ~ %7$s %8$s일 %6$s</string>
<string name="short_format_month">%b</string>
</resources>

View File

@@ -138,10 +138,10 @@
<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日至%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_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>
<string name="same_year_wday1_mdy1_wday2_mdy2">%9$s年%2$s%3$s日%1$s至%7$s%8$s日%6$s</string>
<string name="same_year_wday1_mdy1_wday2_mdy2">%9$s年%2$s%3$s日%1$s至%7$s%8$s日%6$s</string>
<string name="short_format_month">%b</string>
</resources>

View File

@@ -138,10 +138,10 @@
<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日至%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_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>
<string name="same_year_wday1_mdy1_wday2_mdy2">%9$s年%2$s%3$s日%1$s至%7$s%8$s日%6$s</string>
<string name="same_year_wday1_mdy1_wday2_mdy2">%9$s年%2$s%3$s日%1$s至%7$s%8$s日%6$s</string>
<string name="short_format_month">%b</string>
</resources>