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

Commit 91beba6d authored by Brian Attwell's avatar Brian Attwell
Browse files

resolved conflicts for merge of 1a2b07f1 to lmp-dev-plus-aosp 

Change-Id: I63b14ddcde6ffc2280cce1ab8201ea79010b27ad
parents a094bb07 1a2b07f1

res/values-af/strings.xml

+14 −0
Original line number Diff line number Diff line
@@ -242,4 +242,18 @@ 
    <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>

    <string name="untitled_event" msgid="3484859385405939366">"(Titellose geleentheid)"</string>

    <string name="date_time_set" msgid="4761419824439606690">"Stel"</string>

    <string name="header_im_entry" msgid="3581720979640225615">"Kitsboodskappe"</string>

    <string name="header_organization_entry" msgid="8515394955666265406">"Organisasie"</string>

    <string name="header_nickname_entry" msgid="6743561883967451485">"Bynaam"</string>

    <string name="header_note_entry" msgid="4320190426480612344">"Nota"</string>

    <string name="header_website_entry" msgid="1411467850000824745">"Webwerf"</string>

    <string name="header_event_entry" msgid="6738250422744401460">"Geleentheid"</string>

    <string name="header_relation_entry" msgid="1520292958088146460">"Verwantskap"</string>

    <string name="content_description_directions" msgid="2686791825798189335">"rigtingaanwysings na ligging"</string>

    <string name="content_description_recent_sms" msgid="6268563442222149676">"onlangse sms. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. klik om te antwoord"</string>

    <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"inkomend"</string>

    <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"uitgaande"</string>

    <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"gemis"</string>

    <string name="content_description_recent_call" msgid="6204048362763219585">"onlangse oproep. <xliff:g id="CALL_DETAILS">%s</xliff:g>. klik om terug te bel"</string>

    <string name="message_from_you_prefix" msgid="7180706529908434482">"Jy: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>

</resources>

res/values-am/strings.xml

+14 −0
Original line number Diff line number Diff line
@@ -242,4 +242,18 @@ 
    <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>፣ <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>

    <string name="untitled_event" msgid="3484859385405939366">"(ርዕስ-አልባ ክስተት)"</string>

    <string name="date_time_set" msgid="4761419824439606690">"አዘጋጅ"</string>

    <string name="header_im_entry" msgid="3581720979640225615">"ፈጣን መልዕክት"</string>

    <string name="header_organization_entry" msgid="8515394955666265406">"ድርጅት"</string>

    <string name="header_nickname_entry" msgid="6743561883967451485">"ቅጽል ስም"</string>

    <string name="header_note_entry" msgid="4320190426480612344">"ማስታወሻ"</string>

    <string name="header_website_entry" msgid="1411467850000824745">"ድር ጣቢያ"</string>

    <string name="header_event_entry" msgid="6738250422744401460">"ክስተት"</string>

    <string name="header_relation_entry" msgid="1520292958088146460">"ዝምድና"</string>

    <string name="content_description_directions" msgid="2686791825798189335">"ወደ አካባቢ የሚወስዱ አቅጣጫዎች"</string>

    <string name="content_description_recent_sms" msgid="6268563442222149676">"የቅርብ ጊዜ ኤስኤምኤስ። <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>። ምላሽ ለመስጠት ጠቅ ያድርጉ"</string>

    <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"ገቢ"</string>

    <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"ወጪ"</string>

    <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ያመለጡ"</string>

    <string name="content_description_recent_call" msgid="6204048362763219585">"የቅርብ ጊዜ ጥሪ። <xliff:g id="CALL_DETAILS">%s</xliff:g>። መልሰው ለመደወል ጠቅ ያድርጉ"</string>

    <string name="message_from_you_prefix" msgid="7180706529908434482">"እርስዎ፦ <xliff:g id="SMS_BODY">%s</xliff:g>"</string>

</resources>

res/values-ar/strings.xml

+14 −0
Original line number Diff line number Diff line
@@ -242,4 +242,18 @@ 
    <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>، <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>

    <string name="untitled_event" msgid="3484859385405939366">"(حدث بدون اسم)"</string>

    <string name="date_time_set" msgid="4761419824439606690">"تعيين"</string>

    <string name="header_im_entry" msgid="3581720979640225615">"المراسلة الفورية"</string>

    <string name="header_organization_entry" msgid="8515394955666265406">"المؤسسة"</string>

    <string name="header_nickname_entry" msgid="6743561883967451485">"اللقب"</string>

    <string name="header_note_entry" msgid="4320190426480612344">"ملاحظة"</string>

    <string name="header_website_entry" msgid="1411467850000824745">"موقع الويب"</string>

    <string name="header_event_entry" msgid="6738250422744401460">"الحدث"</string>

    <string name="header_relation_entry" msgid="1520292958088146460">"العلاقة"</string>

    <string name="content_description_directions" msgid="2686791825798189335">"الاتجاهات إلى الموقع"</string>

    <string name="content_description_recent_sms" msgid="6268563442222149676">"‏رسالة قصيرة SMS حديثة. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. انقر للرد"</string>

    <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"الواردة"</string>

    <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"الصادرة"</string>

    <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"الفائتة"</string>

    <string name="content_description_recent_call" msgid="6204048362763219585">"مكالمة حديثة. <xliff:g id="CALL_DETAILS">%s</xliff:g>. انقر لرد الاتصال"</string>

    <string name="message_from_you_prefix" msgid="7180706529908434482">"أنت: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>

</resources>

res/values-bg/strings.xml

+14 −0
Original line number Diff line number Diff line
@@ -242,4 +242,18 @@ 
    <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>

    <string name="untitled_event" msgid="3484859385405939366">"(Неозаглавено събитие)"</string>

    <string name="date_time_set" msgid="4761419824439606690">"Задаване"</string>

    <string name="header_im_entry" msgid="3581720979640225615">"Незабавно съобщение"</string>

    <string name="header_organization_entry" msgid="8515394955666265406">"Организация"</string>

    <string name="header_nickname_entry" msgid="6743561883967451485">"Псевдоним"</string>

    <string name="header_note_entry" msgid="4320190426480612344">"Бележка"</string>

    <string name="header_website_entry" msgid="1411467850000824745">"Уебсайт"</string>

    <string name="header_event_entry" msgid="6738250422744401460">"Събитие"</string>

    <string name="header_relation_entry" msgid="1520292958088146460">"Отношение"</string>

    <string name="content_description_directions" msgid="2686791825798189335">"упътвания до местоположението"</string>

    <string name="content_description_recent_sms" msgid="6268563442222149676">"Скорошен SMS. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. Кликнете, за да отговорите"</string>

    <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"входящо"</string>

    <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"изходящо"</string>

    <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"пропуснато"</string>

    <string name="content_description_recent_call" msgid="6204048362763219585">"Скорошно обаждане. <xliff:g id="CALL_DETAILS">%s</xliff:g>. Кликнете, за да се обадите обратно"</string>

    <string name="message_from_you_prefix" msgid="7180706529908434482">"Вие: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>

</resources>

res/values-ca/strings.xml

+14 −0
Original line number Diff line number Diff line
@@ -242,4 +242,18 @@ 
    <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>

    <string name="untitled_event" msgid="3484859385405939366">"(Esdeveniment sense títol)"</string>

    <string name="date_time_set" msgid="4761419824439606690">"Configura"</string>

    <string name="header_im_entry" msgid="3581720979640225615">"MI"</string>

    <string name="header_organization_entry" msgid="8515394955666265406">"Organització"</string>

    <string name="header_nickname_entry" msgid="6743561883967451485">"Àlies"</string>

    <string name="header_note_entry" msgid="4320190426480612344">"Nota"</string>

    <string name="header_website_entry" msgid="1411467850000824745">"Lloc web"</string>

    <string name="header_event_entry" msgid="6738250422744401460">"Esdeveniment"</string>

    <string name="header_relation_entry" msgid="1520292958088146460">"Relació"</string>

    <string name="content_description_directions" msgid="2686791825798189335">"indicacions cap a la ubicació"</string>

    <string name="content_description_recent_sms" msgid="6268563442222149676">"sms recent. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. fes clic per respondre"</string>

    <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"entrant"</string>

    <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"sortints"</string>

    <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"perdudes"</string>

    <string name="content_description_recent_call" msgid="6204048362763219585">"trucada recent. <xliff:g id="CALL_DETAILS">%s</xliff:g>. fes clic per tornar la trucada"</string>

    <string name="message_from_you_prefix" msgid="7180706529908434482">"Usuari: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>

</resources>