Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa122241 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

am 77a8f9d2: Merge "Remove obsolete \'numeric_date_template\'." 

automerge: da1bd4c0

* commit 'da1bd4c0':
  Remove obsolete 'numeric_date_template'.
parents a3147545 da1bd4c0

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

+0 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="numeric_date_template">"%s/%s/%s"</string>

    <string name="month_day_year">%d %B %Y</string>

    <string name="time_of_day">%-l:%M:%S %p</string>

    <string name="date_and_time">%-l:%M:%S %p %d %b %Y</string>

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

+0 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="numeric_date_template">"%s/%s/%s"</string>

    <string name="month_day_year">%d %B %Y</string>

    <string name="time_of_day">%-l:%M:%S %p</string>

    <string name="date_and_time">%-l:%M:%S %p %b %-e %Y</string>

core/res/res/values-ar-rEG/donottranslate-cldr.xml

+0 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="numeric_date_template">"%s‏/%s‏/%s"</string>

    <string name="month_day_year">%-e %B، %Y</string>

    <string name="time_of_day">%-l:%M:%S %p</string>

    <string name="date_and_time">%-l:%M:%S %p %d‏/%m‏/%Y</string>

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

+0 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="numeric_date_template">"%s‏/%s‏/%s"</string>

    <string name="month_day_year">%-e %B، %Y</string>

    <string name="time_of_day">%-l:%M:%S %p</string>

    <string name="date_and_time">%-l:%M:%S %p %d‏/%m‏/%Y</string>

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

+0 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="numeric_date_template">"%s.%s.%s"</string>

    <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>