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

Commit 680c8c8e authored by Elliott Hughes's avatar Elliott Hughes
Browse files

resolved conflicts for merge of 33f86196 to stage-aosp-master 

Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8
parents c5fc6231 33f86196

res/values-af/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -160,8 +160,6 @@ 
    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s wil toegang hê tot jou kontakte en oproepgeskiedenis. Gee toegang aan %2$s?"</string>

    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Moenie weer vra nie"</string>

    <string name="date_and_time" msgid="4114084177056654663">"Datum- en tydinstellings"</string>

    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 nm"</string>

    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>

    <string name="choose_timezone" msgid="1362834506479536274">"Kies tydsone"</string>

    <string name="normal_date_format" msgid="7636406984925498359">"Volgens streek (<xliff:g id="DATE">%s</xliff:g>)"</string>

    <string name="display_preview_label" msgid="1127597250917274792">"Voorskou:"</string>

res/values-am/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -160,8 +160,6 @@ 
    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s የአንተን ዕውቂያዎች እና የጥሪ ታሪኮች ለመድረስ ይፈልጋል ። ለ%2$s መድረስ ይሰጥ?"</string>

    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"ዳግመኛ አትጠይቅ"</string>

    <string name="date_and_time" msgid="4114084177056654663">"ቀን&amp; የሰዓትቅንብሮች"</string>

    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"ከሰዓት በኃላ1:00"</string>

    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>

    <string name="choose_timezone" msgid="1362834506479536274">"የጊዜ ሰቅ ምረጥ"</string>

    <string name="normal_date_format" msgid="7636406984925498359">"የአካባቢው (<xliff:g id="DATE">%s</xliff:g>)"</string>

    <string name="display_preview_label" msgid="1127597250917274792">"ቅድመ-ዕይታ"</string>

res/values-ar/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -160,8 +160,6 @@ 
    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"يريد %1$s الدخول إلى جهات الاتصال وسجل المكالمات. هل تريد منحه حق الدخول إلى %2$s؟"</string>

    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"لا تسألني مرة أخرى"</string>

    <string name="date_and_time" msgid="4114084177056654663">"إعدادات التاريخ والوقت"</string>

    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 م"</string>

    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>

    <string name="choose_timezone" msgid="1362834506479536274">"اختيار المنطقة الزمنية"</string>

    <string name="normal_date_format" msgid="7636406984925498359">"إقليمي (<xliff:g id="DATE">%s</xliff:g>)"</string>

    <string name="display_preview_label" msgid="1127597250917274792">"معاينة:"</string>

res/values-be/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -160,8 +160,6 @@ 
    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s спрабуе атрымаць доступ да вашых кантактаў і гісторыі выклікаў. Дазволіць доступ тэлефоннай кнiзе %2$s?"</string>

    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Больш не пытацца"</string>

    <string name="date_and_time" msgid="4114084177056654663">"Налады даты і часу"</string>

    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 пасля поўдню"</string>

    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>

    <string name="choose_timezone" msgid="1362834506479536274">"Вылучыце гадзінны пояс"</string>

    <string name="normal_date_format" msgid="7636406984925498359">"Рэгіянальны фармат даты (<xliff:g id="DATE">%s</xliff:g>)"</string>

    <string name="display_preview_label" msgid="1127597250917274792">"Прагляд:"</string>

res/values-bg/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -160,8 +160,6 @@ 
    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"От %1$s се иска достъп до вашите контакти и история на обажданията. Да се даде ли достъп до %2$s?"</string>

    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Без повторно питане"</string>

    <string name="date_and_time" msgid="4114084177056654663">"Настройки за дата и час"</string>

    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00"</string>

    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>

    <string name="choose_timezone" msgid="1362834506479536274">"Избор на часова зона"</string>

    <string name="normal_date_format" msgid="7636406984925498359">"Регионално (<xliff:g id="DATE">%s</xliff:g>)"</string>

    <string name="display_preview_label" msgid="1127597250917274792">"Визуализация:"</string>