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

Commit b099c469 authored by Eric Fischer's avatar Eric Fischer
Browse files

resolved conflicts for merge of 137c45 to master

parents 8d5b48fc 137c4503

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

+34 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ 
    <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>

    <string name="date_time">%2$s %$1s</string>

    <string name="time_date">%1$s %$2s</string>

    <string name="abbrev_month_day_year">%d‏/%m‏/%Y</string>

    <string name="month_day">%-e %B</string>

    <string name="month">%-B</string>
@@ -105,4 +107,36 @@ 
    <string name="abbrev_month_day">%-e %b</string>

    <string name="abbrev_month">%-b</string>

    <string name="abbrev_month_year">%b %Y</string>

    <string name="time1_time2">%1$s – %2$s</string>

    <string name="date1_date2">%1$s – %2$s</string>

    <string name="numeric_md1_md2">%3$s‏/%2$s - %8$s‏/%7$s</string>

    <string name="numeric_wday1_md1_wday2_md2">%1$s، %3$s/‏%2$s - %6$s، %8$s/‏%7$s</string>

    <string name="numeric_mdy1_mdy2">%3$s‏/%2$s‏/%4$s - %8$s‏/%7$s‏/%9$s</string>

    <string name="numeric_wday1_mdy1_wday2_mdy2">%1$s، %3$s‏/%2$s‏/%4$s - %6$s، %8$s‏/%7$s‏/%9$s</string>

    <string name="numeric_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s، %3$s/‏%2$s/‏%4$s – %10$s %6$s، %8$s/‏%7$s/‏%9$s</string>

    <string name="numeric_md1_time1_md2_time2">%5$s %3$s/‏%2$s – %10$s %8$s/‏%7$s</string>

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

    <string name="numeric_mdy1_time1_mdy2_time2">%5$s %3$s‏/%2$s‏/%4$s – %10$s %8$s‏/%7$s‏/%9$s</string>

    <string name="wday1_date1_time1_wday2_date2_time2">%3$s %1$s %2$s – %6$s %4$s %5$s</string>

    <string name="wday1_date1_wday2_date2">%1$s %2$s – %4$s %5$s</string>

    <string name="date1_time1_date2_time2">%3$s %2$s – %6$s %5$s</string>

    <string name="time_wday_date">%1$s %2$s %3$s</string>

    <string name="wday_date">%2$s %3$s</string>

    <string name="time_wday">%1$s %2$s</string>

    <string name="same_year_md1_md2">%3$s %2$s – %8$s %7$s</string>

    <string name="same_year_wday1_md1_wday2_md2">%1$s %3$s %2$s – %6$s %8$s %7$s</string>

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

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

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

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

    <string name="same_year_mdy1_time1_mdy2_time2">%5$s %3$s %2$s، %4$s – %10$s %8$s %7$s، %9$s</string>

    <string name="same_month_mdy1_time1_mdy2_time2">%5$s %3$s %2$s، %4$s – %10$s %8$s %7$s، %9$s</string>

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

    <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s، %3$s %2$s %4$s – %10$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>

    <string name="same_month_md1_md2">%3$s %2$s – %8$s %7$s</string>

    <string name="same_month_wday1_md1_wday2_md2">%1$s %3$s %2$s – %6$s %8$s %7$s</string>

    <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s، %9$s</string>

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

</resources>

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

+35 −1
Original line number Diff line number Diff line
@@ -98,11 +98,45 @@ 
    <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>

    <string name="date_time">%2$s %$1s</string>

    <string name="time_date">%1$s %$2s</string>

    <string name="abbrev_month_day_year">%d.%m.%Y</string>

    <string name="month_day">%-e %B</string>

    <string name="month">%-B</string>

    <string name="month_year">%Y %B</string>

    <string name="abbrev_month_day">%b %-e</string>

    <string name="abbrev_month_day">%-e %b</string>

    <string name="abbrev_month">%-b</string>

    <string name="abbrev_month_year">%Y %b</string>

    <string name="time1_time2">%1$s - %2$s</string>

    <string name="date1_date2">%1$s - %2$s</string>

    <string name="numeric_md1_md2">%3$s.%2$s - %8$s.%7$s</string>

    <string name="numeric_wday1_md1_wday2_md2">%3$s.%2$s, %1$s - %8$s.%7$s, %6$s</string>

    <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string>

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

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

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

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

    <string name="numeric_mdy1_time1_mdy2_time2">%5$s %3$s.%2$s.%4$s - %10$s %8$s.%7$s.%9$s</string>

    <string name="wday1_date1_time1_wday2_date2_time2">%3$s %2$s, %1$s - %6$s %5$s, %4$s</string>

    <string name="wday1_date1_wday2_date2">%2$s, %1$s - %5$s, %4$s</string>

    <string name="date1_time1_date2_time2">%3$s %2$s - %6$s %5$s</string>

    <string name="time_wday_date">%1$s %3$s, %2$s</string>

    <string name="wday_date">%3$s, %2$s</string>

    <string name="time_wday">%1$s %2$s</string>

    <string name="same_year_md1_md2">%3$s %2$s - %8$s %7$s</string>

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

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

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

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

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

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

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

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

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

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

    <string name="same_month_md1_md2">%3$s %2$s - %8$s %7$s</string>

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

    <string name="same_year_mdy1_mdy2">%3$s %2$s - %8$s %7$s %9$s</string>

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

</resources>

core/res/res/values-ca-rES/donottranslate-cldr.xml

+34 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ 
    <string name="month_day_year">%-e de %B de %Y</string>

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

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

    <string name="date_time">%2$s %$1s</string>

    <string name="time_date">%1$s %$2s</string>

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

    <string name="month_day">%-e de %B</string>

    <string name="month">%-B</string>
@@ -105,4 +107,36 @@ 
    <string name="abbrev_month_day">%-e %b</string>

    <string name="abbrev_month">%-b</string>

    <string name="abbrev_month_year">%b %Y</string>

    <string name="time1_time2">%1$s - %2$s</string>

    <string name="date1_date2">%1$s - %2$s</string>

    <string name="numeric_md1_md2">%3$s/%2$s - %8$s/%7$s</string>

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

    <string name="numeric_mdy1_mdy2">%3$s/%2$s/%4$s - %8$s/%7$s/%9$s</string>

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

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

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

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

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

    <string name="wday1_date1_time1_wday2_date2_time2">%3$s %1$s %2$s - %6$s %4$s %5$s</string>

    <string name="wday1_date1_wday2_date2">%1$s %2$s - %4$s %5$s</string>

    <string name="date1_time1_date2_time2">%3$s %2$s - %6$s %5$s</string>

    <string name="time_wday_date">%1$s %2$s %3$s</string>

    <string name="wday_date">%2$s %3$s</string>

    <string name="time_wday">%1$s %2$s</string>

    <string name="same_year_md1_md2">%3$s de %2$s - %8$s de %7$s</string>

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

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

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

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

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

    <string name="same_year_mdy1_time1_mdy2_time2">%5$s %3$s de %2$s de %4$s - %10$s %8$s de %7$s de %9$s</string>

    <string name="same_month_mdy1_time1_mdy2_time2">%5$s %3$s de %2$s de %4$s - %10$s %8$s de %7$s de %9$s</string>

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

    <string name="same_month_wday1_mdy1_time1_wday2_mdy2_time2">%5$s %1$s %3$s %2$s %4$s - %10$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>

    <string name="same_month_md1_md2">%3$s de %2$s - %8$s de %7$s</string>

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

    <string name="same_year_mdy1_mdy2">%3$s de %2$s - %8$s de %7$s de %9$s</string>

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

</resources>

core/res/res/values-cs-rCZ/donottranslate-cldr.xml

+34 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ 
    <string name="month_day_year">%-e. %B %Y</string>

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

    <string name="date_and_time">%-k:%M:%S %-e.%-m.%Y</string>

    <string name="date_time">%2$s %$1s</string>

    <string name="time_date">%1$s %$2s</string>

    <string name="abbrev_month_day_year">%-e.%-m.%Y</string>

    <string name="month_day">%-e. %B</string>

    <string name="month">%-B</string>
@@ -105,4 +107,36 @@ 
    <string name="abbrev_month_day">%b %-e</string>

    <string name="abbrev_month">%-b</string>

    <string name="abbrev_month_year">%Y %b</string>

    <string name="time1_time2">%1$s - %2$s</string>

    <string name="date1_date2">%1$s - %2$s</string>

    <string name="numeric_md1_md2">%3$s.%2$s. - %8$s.%7$s.</string>

    <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s. - %6$s, %8$s.%7$s.</string>

    <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string>

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

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

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

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

    <string name="numeric_mdy1_time1_mdy2_time2">%5$s %3$s.%2$s.%4$s - %10$s %8$s.%7$s.%9$s</string>

    <string name="wday1_date1_time1_wday2_date2_time2">%3$s %1$s %2$s - %6$s %4$s %5$s</string>

    <string name="wday1_date1_wday2_date2">%1$s %2$s - %4$s %5$s</string>

    <string name="date1_time1_date2_time2">%3$s %2$s - %6$s %5$s</string>

    <string name="time_wday_date">%1$s %2$s %3$s</string>

    <string name="wday_date">%2$s %3$s</string>

    <string name="time_wday">%1$s %2$s</string>

    <string name="same_year_md1_md2">%3$s. %2$s - %8$s. %7$s</string>

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

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

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

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

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

    <string name="same_year_mdy1_time1_mdy2_time2">%5$s %3$s. %2$s %4$s - %10$s %8$s. %7$s %9$s</string>

    <string name="same_month_mdy1_time1_mdy2_time2">%5$s %3$s. %2$s %4$s - %10$s %8$s. %7$s %9$s</string>

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

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

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

    <string name="same_month_md1_md2">%3$s. %2$s - %8$s. %7$s</string>

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

    <string name="same_year_mdy1_mdy2">%3$s. %2$s - %8$s. %7$s %9$s</string>

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

</resources>

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

+34 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ 
    <string name="month_day_year">%-e. %B %Y</string>

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

    <string name="date_and_time">%-k:%M:%S %-e.%-m.%Y</string>

    <string name="date_time">%2$s %$1s</string>

    <string name="time_date">%1$s %$2s</string>

    <string name="abbrev_month_day_year">%-e.%-m.%Y</string>

    <string name="month_day">%-e. %B</string>

    <string name="month">%-B</string>
@@ -105,4 +107,36 @@ 
    <string name="abbrev_month_day">%b %-e</string>

    <string name="abbrev_month">%-b</string>

    <string name="abbrev_month_year">%Y %b</string>

    <string name="time1_time2">%1$s - %2$s</string>

    <string name="date1_date2">%1$s - %2$s</string>

    <string name="numeric_md1_md2">%3$s.%2$s. - %8$s.%7$s.</string>

    <string name="numeric_wday1_md1_wday2_md2">%1$s, %3$s.%2$s. - %6$s, %8$s.%7$s.</string>

    <string name="numeric_mdy1_mdy2">%3$s.%2$s.%4$s - %8$s.%7$s.%9$s</string>

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

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

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

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

    <string name="numeric_mdy1_time1_mdy2_time2">%5$s %3$s.%2$s.%4$s - %10$s %8$s.%7$s.%9$s</string>

    <string name="wday1_date1_time1_wday2_date2_time2">%3$s %1$s %2$s - %6$s %4$s %5$s</string>

    <string name="wday1_date1_wday2_date2">%1$s %2$s - %4$s %5$s</string>

    <string name="date1_time1_date2_time2">%3$s %2$s - %6$s %5$s</string>

    <string name="time_wday_date">%1$s %2$s %3$s</string>

    <string name="wday_date">%2$s %3$s</string>

    <string name="time_wday">%1$s %2$s</string>

    <string name="same_year_md1_md2">%3$s. %2$s - %8$s. %7$s</string>

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

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

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

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

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

    <string name="same_year_mdy1_time1_mdy2_time2">%5$s %3$s. %2$s %4$s - %10$s %8$s. %7$s %9$s</string>

    <string name="same_month_mdy1_time1_mdy2_time2">%5$s %3$s. %2$s %4$s - %10$s %8$s. %7$s %9$s</string>

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

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

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

    <string name="same_month_md1_md2">%3$s. %2$s - %8$s. %7$s</string>

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

    <string name="same_year_mdy1_mdy2">%3$s. %2$s - %8$s. %7$s %9$s</string>

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

</resources>