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

Commit a2694c99 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 7166 into donut 

* changes:
  Fix a few date format strings to put backslashes in front of apostrophes.
parents b5c735d3 9c947e9e

core/res/res/values-he-rIL/donottranslate-cldr.xml

+12 −12
Original line number Original line Diff line number Diff line
@@ -61,20 +61,20 @@ 
    <string name="day_of_week_long_friday">יום שישי</string>

    <string name="day_of_week_long_friday">יום שישי</string>

    <string name="day_of_week_long_saturday">יום שבת</string>

    <string name="day_of_week_long_saturday">יום שבת</string>





    <string name="day_of_week_medium_sunday">יום א'</string>

    <string name="day_of_week_medium_sunday">יום א\'</string>

    <string name="day_of_week_medium_monday">יום ב'</string>

    <string name="day_of_week_medium_monday">יום ב\'</string>

    <string name="day_of_week_medium_tuesday">יום ג'</string>

    <string name="day_of_week_medium_tuesday">יום ג\'</string>

    <string name="day_of_week_medium_wednesday">יום ד'</string>

    <string name="day_of_week_medium_wednesday">יום ד\'</string>

    <string name="day_of_week_medium_thursday">יום ה'</string>

    <string name="day_of_week_medium_thursday">יום ה\'</string>

    <string name="day_of_week_medium_friday">יום ו'</string>

    <string name="day_of_week_medium_friday">יום ו\'</string>

    <string name="day_of_week_medium_saturday">שבת</string>

    <string name="day_of_week_medium_saturday">שבת</string>





    <string name="day_of_week_short_sunday">יום א'</string>

    <string name="day_of_week_short_sunday">יום א\'</string>

    <string name="day_of_week_short_monday">יום ב'</string>

    <string name="day_of_week_short_monday">יום ב\'</string>

    <string name="day_of_week_short_tuesday">יום ג'</string>

    <string name="day_of_week_short_tuesday">יום ג\'</string>

    <string name="day_of_week_short_wednesday">יום ד'</string>

    <string name="day_of_week_short_wednesday">יום ד\'</string>

    <string name="day_of_week_short_thursday">יום ה'</string>

    <string name="day_of_week_short_thursday">יום ה\'</string>

    <string name="day_of_week_short_friday">יום ו'</string>

    <string name="day_of_week_short_friday">יום ו\'</string>

    <string name="day_of_week_short_saturday">שבת</string>

    <string name="day_of_week_short_saturday">שבת</string>





    <string name="day_of_week_shortest_sunday">א</string>

    <string name="day_of_week_shortest_sunday">א</string>

core/res/res/values-pt-rBR/donottranslate-cldr.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -95,7 +95,7 @@ 
    <string name="hour_minute_ampm">%-l:%M %p</string>

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

    <string name="hour_minute_cap_ampm">%-l:%M %^p</string>

    <string name="hour_minute_cap_ampm">%-l:%M %^p</string>

    <string name="twelve_hour_time_format">h:mm a</string>

    <string name="twelve_hour_time_format">h:mm a</string>

    <string name="twenty_four_hour_time_format">H'h'mm</string>

    <string name="twenty_four_hour_time_format">H\'h\'mm</string>

    <string name="numeric_date">%d/%m/%Y</string>

    <string name="numeric_date">%d/%m/%Y</string>

    <string name="numeric_date_format">dd/MM/yyyy</string>

    <string name="numeric_date_format">dd/MM/yyyy</string>

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

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

core/res/res/values-pt-rPT/donottranslate-cldr.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -95,7 +95,7 @@ 
    <string name="hour_minute_ampm">%-l:%M %p</string>

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

    <string name="hour_minute_cap_ampm">%-l:%M %^p</string>

    <string name="hour_minute_cap_ampm">%-l:%M %^p</string>

    <string name="twelve_hour_time_format">h:mm a</string>

    <string name="twelve_hour_time_format">h:mm a</string>

    <string name="twenty_four_hour_time_format">H'h'mm</string>

    <string name="twenty_four_hour_time_format">H\'h\'mm</string>

    <string name="numeric_date">%d/%m/%Y</string>

    <string name="numeric_date">%d/%m/%Y</string>

    <string name="numeric_date_format">dd/MM/yyyy</string>

    <string name="numeric_date_format">dd/MM/yyyy</string>

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

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

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -95,7 +95,7 @@ 
    <string name="hour_minute_ampm">%-l:%M %p</string>

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

    <string name="hour_minute_cap_ampm">%-l:%M %^p</string>

    <string name="hour_minute_cap_ampm">%-l:%M %^p</string>

    <string name="twelve_hour_time_format">h:mm a</string>

    <string name="twelve_hour_time_format">h:mm a</string>

    <string name="twenty_four_hour_time_format">H'h'mm</string>

    <string name="twenty_four_hour_time_format">H\'h\'mm</string>

    <string name="numeric_date">%d/%m/%Y</string>

    <string name="numeric_date">%d/%m/%Y</string>

    <string name="numeric_date_format">dd/MM/yyyy</string>

    <string name="numeric_date_format">dd/MM/yyyy</string>

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

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

core/res/res/values-vi-rVN/donottranslate-cldr.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -133,8 +133,8 @@ 
    <string name="same_month_md1_time1_md2_time2">%3$s %2$s %5$s - %8$s %7$s %10$s</string>

    <string name="same_month_md1_time1_md2_time2">%3$s %2$s %5$s - %8$s %7$s %10$s</string>

    <string name="same_year_wday1_md1_time1_wday2_md2_time2">%1$s %3$s %2$s %5$s - %6$s %8$s %7$s %10$s</string>

    <string name="same_year_wday1_md1_time1_wday2_md2_time2">%1$s %3$s %2$s %5$s - %6$s %8$s %7$s %10$s</string>

    <string name="same_month_wday1_md1_time1_wday2_md2_time2">%1$s %3$s %2$s %5$s - %6$s %8$s %7$s %10$s</string>

    <string name="same_month_wday1_md1_time1_wday2_md2_time2">%1$s %3$s %2$s %5$s - %6$s %8$s %7$s %10$s</string>

    <string name="same_year_mdy1_time1_mdy2_time2">Ngày %3$s tháng %2$s năm %4$s %5$s - 'Ngày %8$s tháng %7$s năm %9$s %10$s</string>

    <string name="same_year_mdy1_time1_mdy2_time2">Ngày %3$s tháng %2$s năm %4$s %5$s - \'Ngày %8$s tháng %7$s năm %9$s %10$s</string>

    <string name="same_month_mdy1_time1_mdy2_time2">Ngày %3$s tháng %2$s năm %4$s %5$s - 'Ngày %8$s tháng %7$s năm %9$s %10$s</string>

    <string name="same_month_mdy1_time1_mdy2_time2">Ngày %3$s tháng %2$s năm %4$s %5$s - \'Ngày %8$s tháng %7$s năm %9$s %10$s</string>

    <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %3$s %2$s %4$s %5$s - %6$s, %8$s %7$s %9$s %10$s</string>

    <string name="same_year_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %3$s %2$s %4$s %5$s - %6$s, %8$s %7$s %9$s %10$s</string>

    <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %3$s %2$s %4$s %5$s - %6$s, %8$s %7$s %9$s %10$s</string>

    <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%1$s, %3$s %2$s %4$s %5$s - %6$s, %8$s %7$s %9$s %10$s</string>

    <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s %2$s %4$s - %6$s, %8$s %7$s %9$s</string>

    <string name="same_month_wday1_mdy1_wday2_mdy2">%1$s, %3$s %2$s %4$s - %6$s, %8$s %7$s %9$s</string>