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

Commit 7d7257dd authored by Eric Fischer's avatar Eric Fischer Committed by Android Git Automerger
Browse files

am 65f27f87: Merge change I98f82b9a into eclair

Merge commit '65f27f87' into eclair-mr2

* commit '65f27f87':
  Fix the full-weekday date format strings to actually use the full weekday.
parents 373329d4 65f27f87
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -144,6 +144,6 @@
    <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s، %9$s</string>
    <string name="same_year_wday1_mdy1_wday2_mdy2">%1$s، %3$s %2$s - %6$s، %8$s %7$s، %9$s</string>
    <string name="short_format_month">%b</string>
    <string name="full_wday_month_day_no_year">E d MMMM</string>
    <string name="abbrev_wday_month_day_year">EEE، d MMMM y</string>
    <string name="full_wday_month_day_no_year">EEEE d MMMM</string>
    <string name="abbrev_wday_month_day_year">EEE، d MMMM yyyy</string>
</resources>
+2 −2
Original line number Diff line number Diff line
@@ -144,6 +144,6 @@
    <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s %9$s</string>
    <string name="same_year_wday1_mdy1_wday2_mdy2">%3$s %2$s %9$s, %1$s - %8$s %7$s y, %6$s</string>
    <string name="short_format_month">%b</string>
    <string name="full_wday_month_day_no_year">E MMMM d</string>
    <string name="abbrev_wday_month_day_year">d MMM y, E</string>
    <string name="full_wday_month_day_no_year">EEEE MMMM d</string>
    <string name="abbrev_wday_month_day_year">d MMM yyyy, E</string>
</resources>
+2 −2
Original line number Diff line number Diff line
@@ -144,6 +144,6 @@
    <string name="same_month_mdy1_mdy2">%3$s-%8$s de %2$s de %9$s</string>
    <string name="same_year_wday1_mdy1_wday2_mdy2">%1$s %3$s de %2$s - %6$s %8$s de %7$s de %9$s</string>
    <string name="short_format_month">%b</string>
    <string name="full_wday_month_day_no_year">E d MMMM</string>
    <string name="abbrev_wday_month_day_year">EEE d MMM y</string>
    <string name="full_wday_month_day_no_year">EEEE d MMMM</string>
    <string name="abbrev_wday_month_day_year">EEE d MMM yyyy</string>
</resources>
+2 −2
Original line number Diff line number Diff line
@@ -144,6 +144,6 @@
    <string name="same_month_mdy1_mdy2">%3$s.-%8$s. %2$s %9$s</string>
    <string name="same_year_wday1_mdy1_wday2_mdy2">%1$s %3$s. %2$s - %6$s %8$s. %7$s %9$s</string>
    <string name="short_format_month">%b</string>
    <string name="full_wday_month_day_no_year">E MMMM d</string>
    <string name="abbrev_wday_month_day_year">E d. MMMM y</string>
    <string name="full_wday_month_day_no_year">EEEE MMMM d</string>
    <string name="abbrev_wday_month_day_year">E d. MMMM yyyy</string>
</resources>
+2 −2
Original line number Diff line number Diff line
@@ -144,6 +144,6 @@
    <string name="same_month_mdy1_mdy2">%3$s.-%8$s. %2$s %9$s</string>
    <string name="same_year_wday1_mdy1_wday2_mdy2">%1$s d. %3$s. %2$s - %6$s d. %8$s. %7$s %9$s</string>
    <string name="short_format_month">%b</string>
    <string name="full_wday_month_day_no_year">E d. MMMM</string>
    <string name="abbrev_wday_month_day_year">EEE d. MMM y</string>
    <string name="full_wday_month_day_no_year">EEEE d. MMMM</string>
    <string name="abbrev_wday_month_day_year">EEE d. MMM yyyy</string>
</resources>
Loading