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

74 files changed, 9 insertions, 154 deletions

diff --git a/core/java/android/text/format/DateUtils.java b/core/java/android/text/format/DateUtils.java
index 2e962a0..354e1fe 100644
--- a/core/java/android/text/format/DateUtils.java
+++ b/core/java/android/text/format/DateUtils.java
@@ -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];
     }
 
     /**
diff --git a/core/java/android/text/format/Time.java b/core/java/android/text/format/Time.java
index b0b18da..c70182b 100644
--- a/core/java/android/text/format/Time.java
+++ b/core/java/android/text/format/Time.java
@@ -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;
             }
diff --git a/core/res/res/values-af/donottranslate-cldr.xml b/core/res/res/values-af/donottranslate-cldr.xml
index 9d38717..a3d8b9c 100644
--- a/core/res/res/values-af/donottranslate-cldr.xml
+++ b/core/res/res/values-af/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-am/donottranslate-cldr.xml b/core/res/res/values-am/donottranslate-cldr.xml
index 2319fbf..7d8b7be2 100644
--- a/core/res/res/values-am/donottranslate-cldr.xml
+++ b/core/res/res/values-am/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-ar-rEG/donottranslate-cldr.xml b/core/res/res/values-ar-rEG/donottranslate-cldr.xml
index 57011d7..31172e7 100644
--- a/core/res/res/values-ar-rEG/donottranslate-cldr.xml
+++ b/core/res/res/values-ar-rEG/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-ar/donottranslate-cldr.xml b/core/res/res/values-ar/donottranslate-cldr.xml
index 0b9da23..7ee1ee7 100644
--- a/core/res/res/values-ar/donottranslate-cldr.xml
+++ b/core/res/res/values-ar/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-be/donottranslate-cldr.xml b/core/res/res/values-be/donottranslate-cldr.xml
index 365e60d..c0f85dd 100644
--- a/core/res/res/values-be/donottranslate-cldr.xml
+++ b/core/res/res/values-be/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-bg/donottranslate-cldr.xml b/core/res/res/values-bg/donottranslate-cldr.xml
index 972d661..7e59f2b 100644
--- a/core/res/res/values-bg/donottranslate-cldr.xml
+++ b/core/res/res/values-bg/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-ca-rES/donottranslate-cldr.xml b/core/res/res/values-ca-rES/donottranslate-cldr.xml
index 113133d..a8a1825 100644
--- a/core/res/res/values-ca-rES/donottranslate-cldr.xml
+++ b/core/res/res/values-ca-rES/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-ca/donottranslate-cldr.xml b/core/res/res/values-ca/donottranslate-cldr.xml
index 03cf69d..3089ad6 100644
--- a/core/res/res/values-ca/donottranslate-cldr.xml
+++ b/core/res/res/values-ca/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-cs/donottranslate-cldr.xml b/core/res/res/values-cs/donottranslate-cldr.xml
index 59b82d3..c6df7af 100644
--- a/core/res/res/values-cs/donottranslate-cldr.xml
+++ b/core/res/res/values-cs/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-da/donottranslate-cldr.xml b/core/res/res/values-da/donottranslate-cldr.xml
index 1dfc96c..3324449 100644
--- a/core/res/res/values-da/donottranslate-cldr.xml
+++ b/core/res/res/values-da/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-de/donottranslate-cldr.xml b/core/res/res/values-de/donottranslate-cldr.xml
index 8b834db..eaf4dc5 100644
--- a/core/res/res/values-de/donottranslate-cldr.xml
+++ b/core/res/res/values-de/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-el/donottranslate-cldr.xml b/core/res/res/values-el/donottranslate-cldr.xml
index 1e7caa4..d432a53 100644
--- a/core/res/res/values-el/donottranslate-cldr.xml
+++ b/core/res/res/values-el/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-en-rAU/donottranslate-cldr.xml b/core/res/res/values-en-rAU/donottranslate-cldr.xml
index 557833e..59e2718 100644
--- a/core/res/res/values-en-rAU/donottranslate-cldr.xml
+++ b/core/res/res/values-en-rAU/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-en-rCA/donottranslate-cldr.xml b/core/res/res/values-en-rCA/donottranslate-cldr.xml
index 2aa7cbe..2821d23 100644
--- a/core/res/res/values-en-rCA/donottranslate-cldr.xml
+++ b/core/res/res/values-en-rCA/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-en-rGB/donottranslate-cldr.xml b/core/res/res/values-en-rGB/donottranslate-cldr.xml
index cce895e..d617b85 100644
--- a/core/res/res/values-en-rGB/donottranslate-cldr.xml
+++ b/core/res/res/values-en-rGB/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-en-rIE/donottranslate-cldr.xml b/core/res/res/values-en-rIE/donottranslate-cldr.xml
index 46b13ec..e0b64db 100644
--- a/core/res/res/values-en-rIE/donottranslate-cldr.xml
+++ b/core/res/res/values-en-rIE/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-en-rIN/donottranslate-cldr.xml b/core/res/res/values-en-rIN/donottranslate-cldr.xml
index 177bd7e..0f13a23 100644
--- a/core/res/res/values-en-rIN/donottranslate-cldr.xml
+++ b/core/res/res/values-en-rIN/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-en-rNZ/donottranslate-cldr.xml b/core/res/res/values-en-rNZ/donottranslate-cldr.xml
index 41a00a5..9990076 100644
--- a/core/res/res/values-en-rNZ/donottranslate-cldr.xml
+++ b/core/res/res/values-en-rNZ/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-en-rUS/donottranslate-cldr.xml b/core/res/res/values-en-rUS/donottranslate-cldr.xml
index 15fcd8b..5831807 100644
--- a/core/res/res/values-en-rUS/donottranslate-cldr.xml
+++ b/core/res/res/values-en-rUS/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-en-rZA/donottranslate-cldr.xml b/core/res/res/values-en-rZA/donottranslate-cldr.xml
index 7a5bdbd..52b7b32 100644
--- a/core/res/res/values-en-rZA/donottranslate-cldr.xml
+++ b/core/res/res/values-en-rZA/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-es-rUS/donottranslate-cldr.xml b/core/res/res/values-es-rUS/donottranslate-cldr.xml
index e2c3254..d1d2e8a 100644
--- a/core/res/res/values-es-rUS/donottranslate-cldr.xml
+++ b/core/res/res/values-es-rUS/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-es/donottranslate-cldr.xml b/core/res/res/values-es/donottranslate-cldr.xml
index faf171a..83e579d 100644
--- a/core/res/res/values-es/donottranslate-cldr.xml
+++ b/core/res/res/values-es/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-et/donottranslate-cldr.xml b/core/res/res/values-et/donottranslate-cldr.xml
index d50d041..05e8bea 100644
--- a/core/res/res/values-et/donottranslate-cldr.xml
+++ b/core/res/res/values-et/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-fa/donottranslate-cldr.xml b/core/res/res/values-fa/donottranslate-cldr.xml
index 11473fe..d41cb08 100644
--- a/core/res/res/values-fa/donottranslate-cldr.xml
+++ b/core/res/res/values-fa/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-fi-rFI/donottranslate-cldr.xml b/core/res/res/values-fi-rFI/donottranslate-cldr.xml
index e9e1a25..7246a6b 100644
--- a/core/res/res/values-fi-rFI/donottranslate-cldr.xml
+++ b/core/res/res/values-fi-rFI/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-fi/donottranslate-cldr.xml b/core/res/res/values-fi/donottranslate-cldr.xml
index 71cccf3..4c72299 100644
--- a/core/res/res/values-fi/donottranslate-cldr.xml
+++ b/core/res/res/values-fi/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-fr/donottranslate-cldr.xml b/core/res/res/values-fr/donottranslate-cldr.xml
index 840f728..a70da74 100644
--- a/core/res/res/values-fr/donottranslate-cldr.xml
+++ b/core/res/res/values-fr/donottranslate-cldr.xml
@@ -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">aujourd’hui</string>
     <string name="tomorrow">demain</string>
diff --git a/core/res/res/values-hi-rIN/donottranslate-cldr.xml b/core/res/res/values-hi-rIN/donottranslate-cldr.xml
index 6bfd3de..c6c0e66 100644
--- a/core/res/res/values-hi-rIN/donottranslate-cldr.xml
+++ b/core/res/res/values-hi-rIN/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-hi/donottranslate-cldr.xml b/core/res/res/values-hi/donottranslate-cldr.xml
index d9405d8..5b69137 100644
--- a/core/res/res/values-hi/donottranslate-cldr.xml
+++ b/core/res/res/values-hi/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-hr-rHR/donottranslate-cldr.xml b/core/res/res/values-hr-rHR/donottranslate-cldr.xml
index a601d93..023904c 100644
--- a/core/res/res/values-hr-rHR/donottranslate-cldr.xml
+++ b/core/res/res/values-hr-rHR/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-hr/donottranslate-cldr.xml b/core/res/res/values-hr/donottranslate-cldr.xml
index 9b51862..35b7ca8 100644
--- a/core/res/res/values-hr/donottranslate-cldr.xml
+++ b/core/res/res/values-hr/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-hu-rHU/donottranslate-cldr.xml b/core/res/res/values-hu-rHU/donottranslate-cldr.xml
index afb7676..ff5b3c2 100644
--- a/core/res/res/values-hu-rHU/donottranslate-cldr.xml
+++ b/core/res/res/values-hu-rHU/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-hu/donottranslate-cldr.xml b/core/res/res/values-hu/donottranslate-cldr.xml
index 28b65bc..5632092 100644
--- a/core/res/res/values-hu/donottranslate-cldr.xml
+++ b/core/res/res/values-hu/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-in-rID/donottranslate-cldr.xml b/core/res/res/values-in-rID/donottranslate-cldr.xml
index b79fe00..34a67a8 100644
--- a/core/res/res/values-in-rID/donottranslate-cldr.xml
+++ b/core/res/res/values-in-rID/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-in/donottranslate-cldr.xml b/core/res/res/values-in/donottranslate-cldr.xml
index 9a634cc..0fb7f22 100644
--- a/core/res/res/values-in/donottranslate-cldr.xml
+++ b/core/res/res/values-in/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-it/donottranslate-cldr.xml b/core/res/res/values-it/donottranslate-cldr.xml
index 8cee828..de15285 100644
--- a/core/res/res/values-it/donottranslate-cldr.xml
+++ b/core/res/res/values-it/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-iw/donottranslate-cldr.xml b/core/res/res/values-iw/donottranslate-cldr.xml
index 02d1e9c..229f3ea 100644
--- a/core/res/res/values-iw/donottranslate-cldr.xml
+++ b/core/res/res/values-iw/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-ja/donottranslate-cldr.xml b/core/res/res/values-ja/donottranslate-cldr.xml
index 450adc3..7b3356d 100644
--- a/core/res/res/values-ja/donottranslate-cldr.xml
+++ b/core/res/res/values-ja/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-ko/donottranslate-cldr.xml b/core/res/res/values-ko/donottranslate-cldr.xml
index 5382871..15c6a11 100644
--- a/core/res/res/values-ko/donottranslate-cldr.xml
+++ b/core/res/res/values-ko/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-lt-rLT/donottranslate-cldr.xml b/core/res/res/values-lt-rLT/donottranslate-cldr.xml
index 0c1d0aa..b5176d2 100644
--- a/core/res/res/values-lt-rLT/donottranslate-cldr.xml
+++ b/core/res/res/values-lt-rLT/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-lt/donottranslate-cldr.xml b/core/res/res/values-lt/donottranslate-cldr.xml
index 8a2c0f4..eca5512 100644
--- a/core/res/res/values-lt/donottranslate-cldr.xml
+++ b/core/res/res/values-lt/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-lv-rLV/donottranslate-cldr.xml b/core/res/res/values-lv-rLV/donottranslate-cldr.xml
index 9dbc5e0..c40ef89 100644
--- a/core/res/res/values-lv-rLV/donottranslate-cldr.xml
+++ b/core/res/res/values-lv-rLV/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-lv/donottranslate-cldr.xml b/core/res/res/values-lv/donottranslate-cldr.xml
index 10dcd35..a31ba47 100644
--- a/core/res/res/values-lv/donottranslate-cldr.xml
+++ b/core/res/res/values-lv/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-ms/donottranslate-cldr.xml b/core/res/res/values-ms/donottranslate-cldr.xml
index 09d461c..81f08a9 100644
--- a/core/res/res/values-ms/donottranslate-cldr.xml
+++ b/core/res/res/values-ms/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-nb/donottranslate-cldr.xml b/core/res/res/values-nb/donottranslate-cldr.xml
index 637dd5e..32951e5 100644
--- a/core/res/res/values-nb/donottranslate-cldr.xml
+++ b/core/res/res/values-nb/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-nl/donottranslate-cldr.xml b/core/res/res/values-nl/donottranslate-cldr.xml
index ca3813f..51c26b4 100644
--- a/core/res/res/values-nl/donottranslate-cldr.xml
+++ b/core/res/res/values-nl/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-pl/donottranslate-cldr.xml b/core/res/res/values-pl/donottranslate-cldr.xml
index 2950e60..8ac5b44 100644
--- a/core/res/res/values-pl/donottranslate-cldr.xml
+++ b/core/res/res/values-pl/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-pt-rPT/donottranslate-cldr.xml b/core/res/res/values-pt-rPT/donottranslate-cldr.xml
index 54417a4..f1a2b32 100644
--- a/core/res/res/values-pt-rPT/donottranslate-cldr.xml
+++ b/core/res/res/values-pt-rPT/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-pt/donottranslate-cldr.xml b/core/res/res/values-pt/donottranslate-cldr.xml
index d999c06..305f4dd 100644
--- a/core/res/res/values-pt/donottranslate-cldr.xml
+++ b/core/res/res/values-pt/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-ro-rRO/donottranslate-cldr.xml b/core/res/res/values-ro-rRO/donottranslate-cldr.xml
index 732ae24..d4782f9 100644
--- a/core/res/res/values-ro-rRO/donottranslate-cldr.xml
+++ b/core/res/res/values-ro-rRO/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-ro/donottranslate-cldr.xml b/core/res/res/values-ro/donottranslate-cldr.xml
index e9a70dc..858a264 100644
--- a/core/res/res/values-ro/donottranslate-cldr.xml
+++ b/core/res/res/values-ro/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-ru/donottranslate-cldr.xml b/core/res/res/values-ru/donottranslate-cldr.xml
index 2fbcd43..e4cc075 100644
--- a/core/res/res/values-ru/donottranslate-cldr.xml
+++ b/core/res/res/values-ru/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-sk-rSK/donottranslate-cldr.xml b/core/res/res/values-sk-rSK/donottranslate-cldr.xml
index 2843ae3..e8ed389 100644
--- a/core/res/res/values-sk-rSK/donottranslate-cldr.xml
+++ b/core/res/res/values-sk-rSK/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-sk/donottranslate-cldr.xml b/core/res/res/values-sk/donottranslate-cldr.xml
index dcdaad1..e0f33dc 100644
--- a/core/res/res/values-sk/donottranslate-cldr.xml
+++ b/core/res/res/values-sk/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-sl-rSI/donottranslate-cldr.xml b/core/res/res/values-sl-rSI/donottranslate-cldr.xml
index cbabccd..08597f6 100644
--- a/core/res/res/values-sl-rSI/donottranslate-cldr.xml
+++ b/core/res/res/values-sl-rSI/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-sl/donottranslate-cldr.xml b/core/res/res/values-sl/donottranslate-cldr.xml
index b804b3f..8273521 100644
--- a/core/res/res/values-sl/donottranslate-cldr.xml
+++ b/core/res/res/values-sl/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-sr-rRS/donottranslate-cldr.xml b/core/res/res/values-sr-rRS/donottranslate-cldr.xml
index 7168bcc..ea0d8b7 100644
--- a/core/res/res/values-sr-rRS/donottranslate-cldr.xml
+++ b/core/res/res/values-sr-rRS/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-sr/donottranslate-cldr.xml b/core/res/res/values-sr/donottranslate-cldr.xml
index 7426bdc..4146176 100644
--- a/core/res/res/values-sr/donottranslate-cldr.xml
+++ b/core/res/res/values-sr/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-sv/donottranslate-cldr.xml b/core/res/res/values-sv/donottranslate-cldr.xml
index 8b7833f..8e5684a 100644
--- a/core/res/res/values-sv/donottranslate-cldr.xml
+++ b/core/res/res/values-sv/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-sw/donottranslate-cldr.xml b/core/res/res/values-sw/donottranslate-cldr.xml
index 2bc07c1..124266b 100644
--- a/core/res/res/values-sw/donottranslate-cldr.xml
+++ b/core/res/res/values-sw/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-th-rTH/donottranslate-cldr.xml b/core/res/res/values-th-rTH/donottranslate-cldr.xml
index 7049c52..cddc5c3 100644
--- a/core/res/res/values-th-rTH/donottranslate-cldr.xml
+++ b/core/res/res/values-th-rTH/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-th/donottranslate-cldr.xml b/core/res/res/values-th/donottranslate-cldr.xml
index f3196d1..bf0d093 100644
--- a/core/res/res/values-th/donottranslate-cldr.xml
+++ b/core/res/res/values-th/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-tl/donottranslate-cldr.xml b/core/res/res/values-tl/donottranslate-cldr.xml
index 6ff92e3..7e8c535 100644
--- a/core/res/res/values-tl/donottranslate-cldr.xml
+++ b/core/res/res/values-tl/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-tr/donottranslate-cldr.xml b/core/res/res/values-tr/donottranslate-cldr.xml
index 92b0c72..09db853 100644
--- a/core/res/res/values-tr/donottranslate-cldr.xml
+++ b/core/res/res/values-tr/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-uk-rUA/donottranslate-cldr.xml b/core/res/res/values-uk-rUA/donottranslate-cldr.xml
index caf46a3..18afd2d 100644
--- a/core/res/res/values-uk-rUA/donottranslate-cldr.xml
+++ b/core/res/res/values-uk-rUA/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-uk/donottranslate-cldr.xml b/core/res/res/values-uk/donottranslate-cldr.xml
index 46211ac..3b78a25 100644
--- a/core/res/res/values-uk/donottranslate-cldr.xml
+++ b/core/res/res/values-uk/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-vi-rVN/donottranslate-cldr.xml b/core/res/res/values-vi-rVN/donottranslate-cldr.xml
index 5d049a1..f385740 100644
--- a/core/res/res/values-vi-rVN/donottranslate-cldr.xml
+++ b/core/res/res/values-vi-rVN/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-vi/donottranslate-cldr.xml b/core/res/res/values-vi/donottranslate-cldr.xml
index 9a757cd..4c2d5d6 100644
--- a/core/res/res/values-vi/donottranslate-cldr.xml
+++ b/core/res/res/values-vi/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-zh-rCN/donottranslate-cldr.xml b/core/res/res/values-zh-rCN/donottranslate-cldr.xml
index 9e6ef1c..7647cc7 100644
--- a/core/res/res/values-zh-rCN/donottranslate-cldr.xml
+++ b/core/res/res/values-zh-rCN/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-zh-rTW/donottranslate-cldr.xml b/core/res/res/values-zh-rTW/donottranslate-cldr.xml
index 907d82e..b960aac 100644
--- a/core/res/res/values-zh-rTW/donottranslate-cldr.xml
+++ b/core/res/res/values-zh-rTW/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values-zu/donottranslate-cldr.xml b/core/res/res/values-zu/donottranslate-cldr.xml
index df578ed..62653a3 100644
--- a/core/res/res/values-zu/donottranslate-cldr.xml
+++ b/core/res/res/values-zu/donottranslate-cldr.xml
@@ -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>
diff --git a/core/res/res/values/donottranslate-cldr.xml b/core/res/res/values/donottranslate-cldr.xml
index 15fcd8b..5831807 100644
--- a/core/res/res/values/donottranslate-cldr.xml
+++ b/core/res/res/values/donottranslate-cldr.xml
@@ -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>