resolved conflicts for merge of bccfd553 to lmp-mr1-dev-plus-aosp

Change-Id: I618ba902bf82d6ef4fef606addea45cb169313cd

15 files changed, 185 insertions, 3 deletions

diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index e39f20ece..ed39aaf3d 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 76630354e..2ffdb3c65 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -242,4 +242,18 @@
     <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="TIME_INTERVAL">%s</xliff:g>, <xliff:g id="DATE">%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>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index ba7e425ef..bbb8be9b9 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -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">"(Įvykis be pavadinimo)"</string>
     <string name="date_time_set" msgid="4761419824439606690">"Nustatyti"</string>
+    <string name="header_im_entry" msgid="3581720979640225615">"TP"</string>
+    <string name="header_organization_entry" msgid="8515394955666265406">"Organizacija"</string>
+    <string name="header_nickname_entry" msgid="6743561883967451485">"Slapyvardis"</string>
+    <string name="header_note_entry" msgid="4320190426480612344">"Užrašas"</string>
+    <string name="header_website_entry" msgid="1411467850000824745">"Svetainė"</string>
+    <string name="header_event_entry" msgid="6738250422744401460">"Įvykis"</string>
+    <string name="header_relation_entry" msgid="1520292958088146460">"Ryšys"</string>
+    <string name="content_description_directions" msgid="2686791825798189335">"nuorodos į vietovę"</string>
+    <string name="content_description_recent_sms" msgid="6268563442222149676">"Naujausi SMS. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. Spustelėkite, kad atsakytumėte"</string>
+    <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"gaunamieji"</string>
+    <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"siunčiamieji"</string>
+    <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"praleistieji"</string>
+    <string name="content_description_recent_call" msgid="6204048362763219585">"Naujausias skambutis. <xliff:g id="CALL_DETAILS">%s</xliff:g>. Spustelėkite, atskambintumėte"</string>
+    <string name="message_from_you_prefix" msgid="7180706529908434482">"Jūs: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index ea6483098..aacbc7f82 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -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">"(Pasākums bez nosaukuma)"</string>
     <string name="date_time_set" msgid="4761419824439606690">"Iestatīt"</string>
+    <string name="header_im_entry" msgid="3581720979640225615">"Tūlītējā ziņojumapmaiņa"</string>
+    <string name="header_organization_entry" msgid="8515394955666265406">"Organizācija"</string>
+    <string name="header_nickname_entry" msgid="6743561883967451485">"Segvārds"</string>
+    <string name="header_note_entry" msgid="4320190426480612344">"Piezīme"</string>
+    <string name="header_website_entry" msgid="1411467850000824745">"Vietne"</string>
+    <string name="header_event_entry" msgid="6738250422744401460">"Pasākums"</string>
+    <string name="header_relation_entry" msgid="1520292958088146460">"Saistība"</string>
+    <string name="content_description_directions" msgid="2686791825798189335">"norādes uz atrašanās vietu"</string>
+    <string name="content_description_recent_sms" msgid="6268563442222149676">"Nesen saņemta īsziņa. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. Noklikšķiniet, lai atbildētu."</string>
+    <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"ienākošs"</string>
+    <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"izejošs"</string>
+    <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"neatbildēts"</string>
+    <string name="content_description_recent_call" msgid="6204048362763219585">"Nesen saņemts zvans. <xliff:g id="CALL_DETAILS">%s</xliff:g>. Noklikšķiniet, lai atzvanītu."</string>
+    <string name="message_from_you_prefix" msgid="7180706529908434482">"Jūs: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 795dea640..c3bb7b6a4 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -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>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0c2b5d8c0..77d982ae5 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -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>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 2e61b11a5..e9818d028 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -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">"(Kaganapang walang pamagat)"</string>
     <string name="date_time_set" msgid="4761419824439606690">"Itakda"</string>
+    <string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
+    <string name="header_organization_entry" msgid="8515394955666265406">"Organisasyon"</string>
+    <string name="header_nickname_entry" msgid="6743561883967451485">"Palayaw"</string>
+    <string name="header_note_entry" msgid="4320190426480612344">"Tala"</string>
+    <string name="header_website_entry" msgid="1411467850000824745">"Website"</string>
+    <string name="header_event_entry" msgid="6738250422744401460">"Kaganapan"</string>
+    <string name="header_relation_entry" msgid="1520292958088146460">"Kaugnayan"</string>
+    <string name="content_description_directions" msgid="2686791825798189335">"mga direksyon sa lokasyon"</string>
+    <string name="content_description_recent_sms" msgid="6268563442222149676">"kamakailang sms. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. i-click upang tumugon"</string>
+    <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"incoming"</string>
+    <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"papalabas"</string>
+    <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"hindi nasagot"</string>
+    <string name="content_description_recent_call" msgid="6204048362763219585">"kamakailang tawag. <xliff:g id="CALL_DETAILS">%s</xliff:g>. i-click upang tumawag"</string>
+    <string name="message_from_you_prefix" msgid="7180706529908434482">"Ikaw: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 57311d5cc..2b302c80c 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -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">"(Başlıksız etkinlik)"</string>
     <string name="date_time_set" msgid="4761419824439606690">"Ayarla"</string>
+    <string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
+    <string name="header_organization_entry" msgid="8515394955666265406">"Kuruluş"</string>
+    <string name="header_nickname_entry" msgid="6743561883967451485">"Takma Ad"</string>
+    <string name="header_note_entry" msgid="4320190426480612344">"Not"</string>
+    <string name="header_website_entry" msgid="1411467850000824745">"Web sitesi"</string>
+    <string name="header_event_entry" msgid="6738250422744401460">"Etkinlik"</string>
+    <string name="header_relation_entry" msgid="1520292958088146460">"İlişki"</string>
+    <string name="content_description_directions" msgid="2686791825798189335">"konum için yol tarifleri"</string>
+    <string name="content_description_recent_sms" msgid="6268563442222149676">"yeni SMS. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. yanıt vermek için tıklayın"</string>
+    <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"gelen"</string>
+    <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"giden"</string>
+    <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"cevapsız"</string>
+    <string name="content_description_recent_call" msgid="6204048362763219585">"yeni çağrı. <xliff:g id="CALL_DETAILS">%s</xliff:g>. geri aramak için tıklayın"</string>
+    <string name="message_from_you_prefix" msgid="7180706529908434482">"Siz: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index ec1bd1391..dd6856d3e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -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>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 5bbe65b8e..b9903fecb 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -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">"(Sự kiện không có tiêu đề)"</string>
     <string name="date_time_set" msgid="4761419824439606690">"Đặt"</string>
+    <string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
+    <string name="header_organization_entry" msgid="8515394955666265406">"Tổ chức"</string>
+    <string name="header_nickname_entry" msgid="6743561883967451485">"Biệt hiệu"</string>
+    <string name="header_note_entry" msgid="4320190426480612344">"Ghi chú"</string>
+    <string name="header_website_entry" msgid="1411467850000824745">"Trang web"</string>
+    <string name="header_event_entry" msgid="6738250422744401460">"Sự kiện"</string>
+    <string name="header_relation_entry" msgid="1520292958088146460">"Quan hệ"</string>
+    <string name="content_description_directions" msgid="2686791825798189335">"chỉ đường tới địa điểm"</string>
+    <string name="content_description_recent_sms" msgid="6268563442222149676">"sms gần đây. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. nhấp để trả lời"</string>
+    <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"cuộc gọi đến"</string>
+    <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"cuộc gọi đi"</string>
+    <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"cuộc gọi bị nhỡ"</string>
+    <string name="content_description_recent_call" msgid="6204048362763219585">"cuộc gọi gần đây. <xliff:g id="CALL_DETAILS">%s</xliff:g>. nhấp để gọi lại"</string>
+    <string name="message_from_you_prefix" msgid="7180706529908434482">"Bạn: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 2bfe4d72e..79440dba5 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ef6ab5092..975e10226 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -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>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 5fa8f553c..8363c1e07 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -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">"(Umcimbi ongenasihloko)"</string>
     <string name="date_time_set" msgid="4761419824439606690">"Setha"</string>
+    <string name="header_im_entry" msgid="3581720979640225615">"I-IM"</string>
+    <string name="header_organization_entry" msgid="8515394955666265406">"Inhlangano"</string>
+    <string name="header_nickname_entry" msgid="6743561883967451485">"Igama lokudlala"</string>
+    <string name="header_note_entry" msgid="4320190426480612344">"Inothi"</string>
+    <string name="header_website_entry" msgid="1411467850000824745">"Iwebhusayithi"</string>
+    <string name="header_event_entry" msgid="6738250422744401460">"Umcimbi"</string>
+    <string name="header_relation_entry" msgid="1520292958088146460">"Ubudlelwano"</string>
+    <string name="content_description_directions" msgid="2686791825798189335">"izikhombisi-ndlela eziya endaweni"</string>
+    <string name="content_description_recent_sms" msgid="6268563442222149676">"i-sms yakamuva. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. chofoza ukuze uphendule"</string>
+    <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"angenayo"</string>
+    <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"aphumayo"</string>
+    <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"akuphuthele"</string>
+    <string name="content_description_recent_call" msgid="6204048362763219585">"ikholi yakamuva. <xliff:g id="CALL_DETAILS">%s</xliff:g>. chofoza ukuze uphinde ushayele"</string>
+    <string name="message_from_you_prefix" msgid="7180706529908434482">"Wena: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values/donottranslate_config.xml b/res/values/donottranslate_config.xml
index 5fc4f8970..eda94878f 100644
--- a/res/values/donottranslate_config.xml
+++ b/res/values/donottranslate_config.xml
@@ -42,4 +42,7 @@
     <!-- Help URL pointing to editing contacts in People. This is intentionally empty because
          the overlay will fill this in during build time. -->
     <string name="help_url_people_edit"></string>
+
+    <!-- File Authority for the photo picker -->
+    <string name="photo_file_provider_authority">com.android.contacts.files</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6a903eca5..2d3940763 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -722,7 +722,4 @@
     <!-- Prefix for messages that you sent [CHAR LIMIT=40] -->
     <string name="message_from_you_prefix">You: <xliff:g id="sms_body">%s</xliff:g></string>
 
-     <!-- File Authority for the photo picker -->
-    <string name="photo_file_provider_authority">com.android.contacts.files</string>
-
 </resources>