Merge "Use ICU's CLDR data for "AM" and "PM" strings." into jb-mr1-dev

This commit is contained in:
Elliott Hughes
2012-09-14 18:55:27 -07:00
committed by Android (Google) Code Review
74 changed files with 9 additions and 154 deletions

View File

@@ -29,6 +29,8 @@ import java.util.GregorianCalendar;
import java.util.Locale;
import java.util.TimeZone;
import libcore.icu.LocaleData;
/**
* This class contains various date-related utilities for creating text for things like
* elapsed time and date ranges, strings for days of the week and months, and AM/PM text etc.
@@ -128,10 +130,6 @@ public class DateUtils
com.android.internal.R.string.month_shortest_november,
com.android.internal.R.string.month_shortest_december,
};
private static final int[] sAmPm = new int[] {
com.android.internal.R.string.am,
com.android.internal.R.string.pm,
};
private static Configuration sLastConfig;
private static java.text.DateFormat sStatusTimeFormat;
private static String sElapsedFormatMMSS;
@@ -359,8 +357,7 @@ public class DateUtils
*/
@Deprecated
public static String getAMPMString(int ampm) {
Resources r = Resources.getSystem();
return r.getString(sAmPm[ampm - Calendar.AM]);
return LocaleData.get(Locale.getDefault()).amPm[ampm - Calendar.AM];
}
/**

View File

@@ -21,6 +21,8 @@ import android.content.res.Resources;
import java.util.Locale;
import java.util.TimeZone;
import libcore.icu.LocaleData;
/**
* An alternative to the {@link java.util.Calendar} and
* {@link java.util.GregorianCalendar} classes. An instance of the Time class represents
@@ -382,8 +384,10 @@ public class Time {
sTimeOnlyFormat = r.getString(com.android.internal.R.string.time_of_day);
sDateOnlyFormat = r.getString(com.android.internal.R.string.month_day_year);
sDateTimeFormat = r.getString(com.android.internal.R.string.date_and_time);
sAm = r.getString(com.android.internal.R.string.am);
sPm = r.getString(com.android.internal.R.string.pm);
LocaleData localeData = LocaleData.get(locale);
sAm = localeData.amPm[0];
sPm = localeData.amPm[1];
sLocale = locale;
}

View File

@@ -85,9 +85,6 @@
<string name="day_of_week_shortest_friday">6</string>
<string name="day_of_week_shortest_saturday">7</string>
<string name="am">vm.</string>
<string name="pm">nm.</string>
<string name="hour_minute_24">%-k:%M</string>
<string name="hour_minute_ampm">%-l:%M %p</string>
<string name="hour_minute_cap_ampm">%-l:%M %^p</string>

View File

@@ -85,9 +85,6 @@
<string name="day_of_week_shortest_friday"></string>
<string name="day_of_week_shortest_saturday"></string>
<string name="am">ጡዋት</string>
<string name="pm">ከሳዓት</string>
<string name="hour_minute_24">%-k:%M</string>
<string name="hour_minute_ampm">%-l:%M %p</string>
<string name="hour_minute_cap_ampm">%-l:%M %p</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">ج</string>
<string name="day_of_week_shortest_saturday">س</string>
<string name="am">ص</string>
<string name="pm">م</string>
<string name="yesterday">أمس</string>
<string name="today">اليوم</string>
<string name="tomorrow">غدًا</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">ج</string>
<string name="day_of_week_shortest_saturday">س</string>
<string name="am">ص</string>
<string name="pm">م</string>
<string name="yesterday">أمس</string>
<string name="today">اليوم</string>
<string name="tomorrow">غدًا</string>

View File

@@ -74,8 +74,6 @@
<string name="day_of_week_shortest_friday">п</string>
<string name="day_of_week_shortest_saturday">с</string>
<string name="am">да палудня</string>
<string name="pm">пасля палудня</string>
<string name="yesterday">учора</string>
<string name="today">сёння</string>
<string name="tomorrow">заўтра</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">п</string>
<string name="day_of_week_shortest_saturday">с</string>
<string name="am">пр. об.</string>
<string name="pm">сл. об.</string>
<string name="yesterday">Вчера</string>
<string name="today">Днес</string>
<string name="tomorrow">Утре</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">v</string>
<string name="day_of_week_shortest_saturday">s</string>
<string name="am">a.m.</string>
<string name="pm">p.m.</string>
<string name="yesterday">ahir</string>
<string name="today">avui</string>
<string name="tomorrow">demà</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">v</string>
<string name="day_of_week_shortest_saturday">s</string>
<string name="am">a.m.</string>
<string name="pm">p.m.</string>
<string name="yesterday">ahir</string>
<string name="today">avui</string>
<string name="tomorrow">demà</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">P</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">dop.</string>
<string name="pm">odp.</string>
<string name="yesterday">Včera</string>
<string name="today">Dnes</string>
<string name="tomorrow">Zítra</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">F</string>
<string name="day_of_week_shortest_saturday">L</string>
<string name="am">f.m.</string>
<string name="pm">e.m.</string>
<string name="yesterday">i går</string>
<string name="today">i dag</string>
<string name="tomorrow">i morgen</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">F</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">vorm.</string>
<string name="pm">nachm.</string>
<string name="yesterday">Gestern</string>
<string name="today">Heute</string>
<string name="tomorrow">Morgen</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">Π</string>
<string name="day_of_week_shortest_saturday">Σ</string>
<string name="am">π.μ.</string>
<string name="pm">μ.μ.</string>
<string name="yesterday">Χτες</string>
<string name="today">Σήμερα</string>
<string name="tomorrow">Αύριο</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">F</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">am</string>
<string name="pm">pm</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">F</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">am</string>
<string name="pm">pm</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">F</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">am</string>
<string name="pm">pm</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">F</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">a.m.</string>
<string name="pm">p.m.</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">F</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">am</string>
<string name="pm">pm</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">F</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">am</string>
<string name="pm">pm</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">F</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">am</string>
<string name="pm">pm</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">F</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">am</string>
<string name="pm">pm</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">V</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">a. m.</string>
<string name="pm">p. m.</string>
<string name="yesterday">ayer</string>
<string name="today">hoy</string>
<string name="tomorrow">mañana</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">V</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">a.m.</string>
<string name="pm">p.m.</string>
<string name="yesterday">ayer</string>
<string name="today">hoy</string>
<string name="tomorrow">mañana</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">6</string>
<string name="day_of_week_shortest_saturday">7</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -71,8 +71,6 @@
<string name="day_of_week_shortest_friday">ج</string>
<string name="day_of_week_shortest_saturday">ش</string>
<string name="am">قبل از ظهر</string>
<string name="pm">بعد از ظهر</string>
<string name="yesterday">دیروز</string>
<string name="today">امروز</string>
<string name="tomorrow">فردا</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">P</string>
<string name="day_of_week_shortest_saturday">L</string>
<string name="am">ap.</string>
<string name="pm">ip.</string>
<string name="yesterday">eilen</string>
<string name="today">tänään</string>
<string name="tomorrow">huomenna</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">P</string>
<string name="day_of_week_shortest_saturday">L</string>
<string name="am">ap.</string>
<string name="pm">ip.</string>
<string name="yesterday">eilen</string>
<string name="today">tänään</string>
<string name="tomorrow">huomenna</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">V</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">matin</string>
<string name="pm">soir</string>
<string name="yesterday">hier</string>
<string name="today">aujourdhui</string>
<string name="tomorrow">demain</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">शु</string>
<string name="day_of_week_shortest_saturday"></string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">शु</string>
<string name="day_of_week_shortest_saturday"></string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">p</string>
<string name="day_of_week_shortest_saturday">s</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">jučer</string>
<string name="today">danas</string>
<string name="tomorrow">sutra</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">p</string>
<string name="day_of_week_shortest_saturday">s</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">jučer</string>
<string name="today">danas</string>
<string name="tomorrow">sutra</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">P</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">de.</string>
<string name="pm">du.</string>
<string name="yesterday">tegnap</string>
<string name="today">ma</string>
<string name="tomorrow">holnap</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">P</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">de.</string>
<string name="pm">du.</string>
<string name="yesterday">tegnap</string>
<string name="today">ma</string>
<string name="tomorrow">holnap</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">6</string>
<string name="day_of_week_shortest_saturday">7</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">6</string>
<string name="day_of_week_shortest_saturday">7</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">V</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">m.</string>
<string name="pm">p.</string>
<string name="yesterday">ieri</string>
<string name="today">oggi</string>
<string name="tomorrow">domani</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">ו</string>
<string name="day_of_week_shortest_saturday">ש</string>
<string name="am">לפנה"צ</string>
<string name="pm">אחה"צ</string>
<string name="yesterday">אתמול</string>
<string name="today">היום</string>
<string name="tomorrow">מחר</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday"></string>
<string name="day_of_week_shortest_saturday"></string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">昨日</string>
<string name="today">今日</string>
<string name="tomorrow">明日</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday"></string>
<string name="day_of_week_shortest_saturday"></string>
<string name="am">오전</string>
<string name="pm">오후</string>
<string name="yesterday">어제</string>
<string name="today">오늘</string>
<string name="tomorrow">내일</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">P</string>
<string name="day_of_week_shortest_saturday">Š</string>
<string name="am">priešpiet</string>
<string name="pm">popiet</string>
<string name="yesterday">vakar</string>
<string name="today">šiandien</string>
<string name="tomorrow">rytoj</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">P</string>
<string name="day_of_week_shortest_saturday">Š</string>
<string name="am">priešpiet</string>
<string name="pm">popiet</string>
<string name="yesterday">vakar</string>
<string name="today">šiandien</string>
<string name="tomorrow">rytoj</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">P</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">vakar</string>
<string name="today">šodien</string>
<string name="tomorrow">rīt</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">P</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">vakar</string>
<string name="today">šodien</string>
<string name="tomorrow">rīt</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">6</string>
<string name="day_of_week_shortest_saturday">7</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">F</string>
<string name="day_of_week_shortest_saturday">L</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">i går</string>
<string name="today">i dag</string>
<string name="tomorrow">i morgen</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">V</string>
<string name="day_of_week_shortest_saturday">Z</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">Gisteren</string>
<string name="today">Vandaag</string>
<string name="tomorrow">Morgen</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">P</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">Wczoraj</string>
<string name="today">Dzisiaj</string>
<string name="tomorrow">Jutro</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">S</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">Antes do meio-dia</string>
<string name="pm">Depois do meio-dia</string>
<string name="yesterday">Ontem</string>
<string name="today">Hoje</string>
<string name="tomorrow">Amanhã</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">S</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">Ontem</string>
<string name="today">Hoje</string>
<string name="tomorrow">Amanhã</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">V</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">ieri</string>
<string name="today">azi</string>
<string name="tomorrow">mâine</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">V</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">ieri</string>
<string name="today">azi</string>
<string name="tomorrow">mâine</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">П</string>
<string name="day_of_week_shortest_saturday">С</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">Вчера</string>
<string name="today">Сегодня</string>
<string name="tomorrow">Завтра</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">P</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">dopoludnia</string>
<string name="pm">popoludní</string>
<string name="yesterday">Včera</string>
<string name="today">Dnes</string>
<string name="tomorrow">Zajtra</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">P</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">dopoludnia</string>
<string name="pm">popoludní</string>
<string name="yesterday">Včera</string>
<string name="today">Dnes</string>
<string name="tomorrow">Zajtra</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">p</string>
<string name="day_of_week_shortest_saturday">s</string>
<string name="am">dop.</string>
<string name="pm">pop.</string>
<string name="yesterday">Včeraj</string>
<string name="today">Danes</string>
<string name="tomorrow">Jutri</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">p</string>
<string name="day_of_week_shortest_saturday">s</string>
<string name="am">dop.</string>
<string name="pm">pop.</string>
<string name="yesterday">Včeraj</string>
<string name="today">Danes</string>
<string name="tomorrow">Jutri</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">п</string>
<string name="day_of_week_shortest_saturday">с</string>
<string name="am">пре подне</string>
<string name="pm">поподне</string>
<string name="yesterday">јуче</string>
<string name="today">данас</string>
<string name="tomorrow">сутра</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">п</string>
<string name="day_of_week_shortest_saturday">с</string>
<string name="am">пре подне</string>
<string name="pm">поподне</string>
<string name="yesterday">јуче</string>
<string name="today">данас</string>
<string name="tomorrow">сутра</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">F</string>
<string name="day_of_week_shortest_saturday">L</string>
<string name="am">f.m.</string>
<string name="pm">e.m.</string>
<string name="yesterday">igår</string>
<string name="today">idag</string>
<string name="tomorrow">imorgon</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">6</string>
<string name="day_of_week_shortest_saturday">7</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday"></string>
<string name="day_of_week_shortest_saturday"></string>
<string name="am">ก่อนเที่ยง</string>
<string name="pm">หลังเที่ยง</string>
<string name="yesterday">เมื่อวาน</string>
<string name="today">วันนี้</string>
<string name="tomorrow">พรุ่งนี้</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday"></string>
<string name="day_of_week_shortest_saturday"></string>
<string name="am">ก่อนเที่ยง</string>
<string name="pm">หลังเที่ยง</string>
<string name="yesterday">เมื่อวาน</string>
<string name="today">วันนี้</string>
<string name="tomorrow">พรุ่งนี้</string>

View File

@@ -59,8 +59,6 @@
<string name="day_of_week_shortest_friday">6</string>
<string name="day_of_week_shortest_saturday">7</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">C</string>
<string name="day_of_week_shortest_saturday">C</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">Dün</string>
<string name="today">Bugün</string>
<string name="tomorrow">Yarın</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">П</string>
<string name="day_of_week_shortest_saturday">С</string>
<string name="am">дп</string>
<string name="pm">пп</string>
<string name="yesterday">Вчора</string>
<string name="today">Сьогодні</string>
<string name="tomorrow">Завтра</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">П</string>
<string name="day_of_week_shortest_saturday">С</string>
<string name="am">дп</string>
<string name="pm">пп</string>
<string name="yesterday">Вчора</string>
<string name="today">Сьогодні</string>
<string name="tomorrow">Завтра</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">6</string>
<string name="day_of_week_shortest_saturday">7</string>
<string name="am">SA</string>
<string name="pm">CH</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">6</string>
<string name="day_of_week_shortest_saturday">7</string>
<string name="am">SA</string>
<string name="pm">CH</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday"></string>
<string name="day_of_week_shortest_saturday"></string>
<string name="am">上午</string>
<string name="pm">下午</string>
<string name="yesterday">昨天</string>
<string name="today">今天</string>
<string name="tomorrow">明天</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday"></string>
<string name="day_of_week_shortest_saturday"></string>
<string name="am">上午</string>
<string name="pm">下午</string>
<string name="yesterday">昨天</string>
<string name="today">今天</string>
<string name="tomorrow">明天</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">H</string>
<string name="day_of_week_shortest_saturday">M</string>
<string name="am">AM</string>
<string name="pm">PM</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>

View File

@@ -85,8 +85,6 @@
<string name="day_of_week_shortest_friday">F</string>
<string name="day_of_week_shortest_saturday">S</string>
<string name="am">am</string>
<string name="pm">pm</string>
<string name="yesterday">Yesterday</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>