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

Commit d644f306 authored by Brian Attwell's avatar Brian Attwell
Browse files

resolved conflicts for merge of f17f057b to lmp-dev-plus-aosp 

Change-Id: I1e45c7fc41c5736b2810a63400410cf46652e987
parents 2b7188c5 f17f057b

res/values-bn-rBD/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">"IM"</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-eu-rES/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">"(Izenik gabeko gertaera)"</string>

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

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

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

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

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

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

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

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

    <string name="content_description_directions" msgid="2686791825798189335">"kokapenerako jarraibideak"</string>

    <string name="content_description_recent_sms" msgid="6268563442222149676">"SMS bat jaso da duela gutxi. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. Egin klik erantzuteko."</string>

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

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

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

    <string name="content_description_recent_call" msgid="6204048362763219585">"Dei bat jaso da duela gutxi. <xliff:g id="CALL_DETAILS">%s</xliff:g>. Egin klik deia itzultzeko."</string>

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

</resources>

res/values-gl-rES/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">"(Evento sen título)"</string>

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

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

    <string name="header_organization_entry" msgid="8515394955666265406">"Organización"</string>

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

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

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

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

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

    <string name="content_description_directions" msgid="2686791825798189335">"indicacións para a localización"</string>

    <string name="content_description_recent_sms" msgid="6268563442222149676">"sms recente. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. fai clic para responder"</string>

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

    <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"saínte"</string>

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

    <string name="content_description_recent_call" msgid="6204048362763219585">"chamada recente. <xliff:g id="CALL_DETAILS">%s</xliff:g>. fai clic para devolver a chamada"</string>

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

</resources>

res/values-is-rIS/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> kl. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>

    <string name="untitled_event" msgid="3484859385405939366">"(Ónefndur viðburður)"</string>

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

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

    <string name="header_organization_entry" msgid="8515394955666265406">"Fyrirtæki"</string>

    <string name="header_nickname_entry" msgid="6743561883967451485">"Gælunafn"</string>

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

    <string name="header_website_entry" msgid="1411467850000824745">"Vefsvæði"</string>

    <string name="header_event_entry" msgid="6738250422744401460">"Viðburður"</string>

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

    <string name="content_description_directions" msgid="2686791825798189335">"leiðarlýsing að stað"</string>

    <string name="content_description_recent_sms" msgid="6268563442222149676">"nýleg sms-skilaboð. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. smelltu til að svara"</string>

    <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"móttekið"</string>

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

    <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ósvarað"</string>

    <string name="content_description_recent_call" msgid="6204048362763219585">"nýlegt símtal. <xliff:g id="CALL_DETAILS">%s</xliff:g>. smelltu til að hringja til baka"</string>

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

</resources>

res/values-kk-rKZ/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">"IM"</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>