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

Commit af64013e authored by Eric Fischer's avatar Eric Fischer Committed by The Android Open Source Project
Browse files

Merge branch 'readonly-p4-master'

parents 3267062d 580b1301

core/res/res/values-es/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ 
    <string name="Noon">"Mediodía"</string>

    <string name="midnight">"medianoche"</string>

    <string name="Midnight">"Medianoche"</string>

    <string name="month_day">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string>

    <string name="month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>"</string>

    <!-- no translation found for month (7026169712234774086) -->

    <skip />

    <string name="month_day_year">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string>

core/res/res/values-fr/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ 
    <string name="Noon">"Midi"</string>

    <string name="midnight">"minuit"</string>

    <string name="Midnight">"Minuit"</string>

    <string name="month_day">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string>

    <string name="month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>"</string>

    <!-- no translation found for month (7026169712234774086) -->

    <skip />

    <string name="month_day_year">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string>

core/res/res/values-it/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ 
    <string name="Noon">"Mezzogiorno"</string>

    <string name="midnight">"mezzanotte"</string>

    <string name="Midnight">"Mezzanotte"</string>

    <string name="month_day">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string>

    <string name="month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>"</string>

    <!-- no translation found for month (7026169712234774086) -->

    <skip />

    <string name="month_day_year">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string>

core/res/res/values-ja/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
    <string name="needPuk2">"SIMカードのロック解除のためPUK2を入力します。"</string>

    <string name="ClipMmi">"着信時の発信者番号"</string>

    <string name="ClirMmi">"発信者番号"</string>

    <string name="CfMmi">"電話の転送"</string>

    <string name="CfMmi">"着信転送"</string>

    <string name="CwMmi">"通話中着信"</string>

    <string name="BaMmi">"発信制限"</string>

    <string name="PwdMmi">"パスワードの変更"</string>

core/res/res/values-pl/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -576,10 +576,10 @@ 
    <string name="Noon">"Południe"</string>

    <string name="midnight">"północ"</string>

    <string name="Midnight">"Północ"</string>

    <string name="month_day">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string>

    <string name="month_day">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g>"</string>

    <!-- no translation found for month (7026169712234774086) -->

    <skip />

    <string name="month_day_year">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string>

    <string name="month_day_year">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%B</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string>

    <string name="month_year">"<xliff:g id="MONTH">%B</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string>

    <string name="time_of_day">"<xliff:g id="HOUR">%H</xliff:g>:<xliff:g id="MINUTE">%M</xliff:g>:<xliff:g id="SECOND">%S</xliff:g>"</string>

    <string name="date_and_time">"<xliff:g id="HOUR">%H</xliff:g>:<xliff:g id="MINUTE">%M</xliff:g>:<xliff:g id="SECOND">%S</xliff:g> <xliff:g id="MONTH">%B</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string>
@@ -607,7 +607,7 @@ 
    <string name="same_month_wday1_md1_time1_wday2_md2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>

    <string name="same_month_mdy1_time1_mdy2_time2">"<xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1">%3$s</xliff:g>, <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>

    <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">"<xliff:g id="WEEKDAY1">%1$s</xliff:g>, <xliff:g id="MONTH1">%2$s</xliff:g> <xliff:g id="DAY1_0">%3$s</xliff:g>, <xliff:g id="YEAR1">%4$s</xliff:g>, <xliff:g id="TIME1">%5$s</xliff:g> – <xliff:g id="WEEKDAY2">%6$s</xliff:g>, <xliff:g id="MONTH2">%7$s</xliff:g> <xliff:g id="DAY2_1">%8$s</xliff:g>, <xliff:g id="YEAR2">%9$s</xliff:g>, <xliff:g id="TIME2">%10$s</xliff:g>"</string>

    <string name="abbrev_month_day_year">"<xliff:g id="MONTH">%b</xliff:g> <xliff:g id="DAY">%-d</xliff:g>, <xliff:g id="YEAR">%Y</xliff:g>"</string>

    <string name="abbrev_month_day_year">"<xliff:g id="DAY">%-d</xliff:g> <xliff:g id="MONTH">%b</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string>

    <string name="abbrev_month_year">"<xliff:g id="MONTH">%b</xliff:g> <xliff:g id="YEAR">%Y</xliff:g>"</string>

    <string name="abbrev_month_day">"<xliff:g id="MONTH">%b</xliff:g> <xliff:g id="DAY">%-d</xliff:g>"</string>

    <!-- no translation found for abbrev_month (3131032032850777433) -->