Merge commit '9b9e7485747fe60b315aacb05c0c61b802cbc7c6' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master
Change-Id: I2a84192e94ca0eb7ec2e54d059581cac4c103a25
Merged-In: Ia8e8194028825190addbe3b2c33da2a54d83d6fc
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index b2e50b0..7685386 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -100,7 +100,7 @@
<string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
<string name="no_info_provided" msgid="716200382010821001">"Няма информация за собственика на телефона"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Ако това е вашият телефон, докоснете иконата на молив, за да добавите информация, която ще се показва тук при спешни случаи"</string>
- <string name="clear_all" msgid="8899013032870561633">"Изчиств. на вс."</string>
+ <string name="clear_all" msgid="8899013032870561633">"Изчиств. на всичко"</string>
<string name="clear" msgid="3648880442502887163">"Изчистване"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Да се изчистят ли всички данни и контакти?"</string>
<string name="emergency_info_footer" msgid="4694516011247606250">"Добавянето на медицинска информация и контакти за спешни случаи може да помогне на органите за бързо реагиране при необходимост.\n\nВсеки може да прочете тази информация на заключения ви екран, без да отключва телефона ви."</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 473550e..8e1df3c 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -71,7 +71,7 @@
<string name="ab_positive" msgid="1931300033534642005">"এ বি পজেটিভ"</string>
<string name="ab_negative" msgid="2064555613093591729">"এ বি নেগেটিভ"</string>
<string name="h_h" msgid="2183333409760379720">"এইচ এইচ"</string>
- <string name="allergies" msgid="2789200777539258165">"এলার্জি"</string>
+ <string name="allergies" msgid="2789200777539258165">"অ্যালার্জি"</string>
<string name="unknown_allergies" msgid="4383115953418061237">"অজানা"</string>
<string name="allergies_hint" msgid="5488918780522184147">"যেমন, চীনাবাদাম"</string>
<string name="medications" msgid="644428945685557183">"ঔষধ"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index c8cccb5..e807fc9 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -17,7 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="1090682794607161063">"Larrialdietarako informazioa"</string>
- <string name="medical_info_title" msgid="3000192781136934887">"Mediku-informazioa"</string>
+ <string name="medical_info_title" msgid="3000192781136934887">"Osasun-informazioa"</string>
<string name="edit_medical_info" msgid="6733720353375319476">"Editatu informazioa"</string>
<string name="edit_info" msgid="5973929805855224805">"Editatu larrialdietarako informazioa"</string>
<string name="tab_title_info" msgid="1402033103294855812">"Informazioa"</string>
@@ -77,7 +77,7 @@
<string name="medications" msgid="644428945685557183">"Sendagaiak"</string>
<string name="unknown_medications" msgid="2764171064510423734">"Ezezaguna"</string>
<string name="medications_hint" msgid="3221620025945593723">"Adibidez, aspirina"</string>
- <string name="medical_conditions" msgid="3555690011498283592">"Ohar medikoak"</string>
+ <string name="medical_conditions" msgid="3555690011498283592">"Osasun-oharrak"</string>
<string name="unknown_medical_conditions" msgid="8051364895172053770">"Ezezaguna"</string>
<string name="medical_conditions_hint" msgid="6959152183029062882">"Adibidez, asma"</string>
<string name="organ_donor" msgid="5953509460007124827">"Organo-emailea"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 0fccc1e..d62d642 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -18,7 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="1090682794607161063">"מידע למקרה חירום"</string>
<string name="medical_info_title" msgid="3000192781136934887">"מידע רפואי"</string>
- <string name="edit_medical_info" msgid="6733720353375319476">"ערוך את המידע"</string>
+ <string name="edit_medical_info" msgid="6733720353375319476">"עריכת המידע"</string>
<string name="edit_info" msgid="5973929805855224805">"עריכת מידע למקרה חירום"</string>
<string name="tab_title_info" msgid="1402033103294855812">"מידע"</string>
<string name="tab_title_contacts" msgid="4298341166404791209">"אנשי קשר"</string>
@@ -80,7 +80,7 @@
<string name="medical_conditions" msgid="3555690011498283592">"הערות רפואיות"</string>
<string name="unknown_medical_conditions" msgid="8051364895172053770">"לא ידוע"</string>
<string name="medical_conditions_hint" msgid="6959152183029062882">"לדוגמה, אסטמה"</string>
- <string name="organ_donor" msgid="5953509460007124827">"תורם איברים"</string>
+ <string name="organ_donor" msgid="5953509460007124827">"תרומת איברים"</string>
<string name="unknown_organ_donor" msgid="2780515342875494225">"לא ידוע"</string>
<string name="yes" msgid="5829765567799916128">"כן"</string>
<string name="no" msgid="1681689233660683509">"לא"</string>
@@ -100,8 +100,8 @@
<string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
<string name="no_info_provided" msgid="716200382010821001">"אין מידע על הבעלים של הטלפון"</string>
<string name="tap_pencil" msgid="2723698054265296934">"אם זהו הטלפון שלך, הקש על סמל העיפרון כדי להוסיף מידע שיוצג כאן במקרה חירום"</string>
- <string name="clear_all" msgid="8899013032870561633">"נקה הכול"</string>
- <string name="clear" msgid="3648880442502887163">"נקה"</string>
+ <string name="clear_all" msgid="8899013032870561633">"ניקוי הכול"</string>
+ <string name="clear" msgid="3648880442502887163">"ניקוי"</string>
<string name="clear_all_message" msgid="1548432000373861295">"האם לנקות את כל המידע ואנשי הקשר?"</string>
<string name="emergency_info_footer" msgid="4694516011247606250">"הוספה של מידע רפואי ואנשי קשר לשעת חירום יכולה לעזור למגישי עזרה ראשונה במקרה חירום.\n\nכל אחד יוכל לקרוא את המידע הזה ממסך הנעילה בלי לבטל את הנעילה של הטלפון."</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"הוספת מידע למקרה חירום"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 53565a0..e4976f9 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -70,7 +70,7 @@
<string name="b_negative" msgid="4110646487598488955">"მესამე ჯგუფის რეზუსუარყოფითი"</string>
<string name="ab_positive" msgid="1931300033534642005">"მეოთხე ჯგუფის რეზუსდადებითი"</string>
<string name="ab_negative" msgid="2064555613093591729">"მეოთხე ჯგუფის რეზუსუარყოფითი"</string>
- <string name="h_h" msgid="2183333409760379720">"ბომბეის ფენომენი"</string>
+ <string name="h_h" msgid="2183333409760379720">"H H ბომბეის ტიპი"</string>
<string name="allergies" msgid="2789200777539258165">"ალერგია"</string>
<string name="unknown_allergies" msgid="4383115953418061237">"უცნობია"</string>
<string name="allergies_hint" msgid="5488918780522184147">"მაგალითად, მიწის თხილი"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index c6610d6..3bb6ec4 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -100,8 +100,8 @@
<string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
<string name="no_info_provided" msgid="716200382010821001">"គ្មានព័ត៌មានអំពីម្ចាស់ទូរសព្ទនេះទេ"</string>
<string name="tap_pencil" msgid="2723698054265296934">"ប្រសិនបើទូរសព្ទនេះជារបស់អ្នក សូមប៉ះរូបតំណាងខ្មៅដៃដើម្បីបញ្ចូលព័ត៌មានដែលនឹងត្រូវបង្ហាញនៅទីនេះក្នុងករណីសង្គ្រោះបន្ទាន់"</string>
- <string name="clear_all" msgid="8899013032870561633">"ជម្រះទាំងអស់"</string>
- <string name="clear" msgid="3648880442502887163">"ជម្រះ"</string>
+ <string name="clear_all" msgid="8899013032870561633">"លុបទាំងអស់"</string>
+ <string name="clear" msgid="3648880442502887163">"លុប"</string>
<string name="clear_all_message" msgid="1548432000373861295">"លុបព័ត៌មាន និងទំនាក់ទំនងទាំងអស់ឬ?"</string>
<string name="emergency_info_footer" msgid="4694516011247606250">"ការបញ្ចូលទំនាក់ទំនងវេជ្ជសាស្ត្រ និងសង្គ្រោះបន្ទាន់ អាចជួយអ្នកដែលធ្វើការសង្រ្គោះដំបូងក្នុងករណីបន្ទាន់។\n\nអ្នករាល់គ្នាអាចអានព័ត៌មាននេះពីអេក្រង់ចាក់សោរបស់អ្នក ដោយមិនចាំបាច់ដោះសោទូរសព្ទរបស់អ្នកទេ។"</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"បញ្ចូលព័ត៌មានបន្ទាន់"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 607d6b0..2ad31a4 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -31,7 +31,7 @@
<string name="dob" msgid="2813161080307245706">"(<xliff:g id="DATE_OF_BIRTH">%1$s</xliff:g>)"</string>
<string name="age" msgid="8327537794752630199">"Курагы: <xliff:g id="NUMERICAL_AGE">%1$d</xliff:g>"</string>
<string name="remove_dob_icon_text" msgid="4413507180967999944">"Туулган күнүн алып салуу"</string>
- <string name="blood_type" msgid="6947022772999974608">"Кан тобу"</string>
+ <string name="blood_type" msgid="6947022772999974608">"Канынын тобу"</string>
<string name="unknown_blood_type" msgid="6337228278125085668">"Белгисиз"</string>
<string name="oplus" msgid="7759756742377867011">"1-топ, +"</string>
<string name="ominus" msgid="5227278501191741055">"1-топ, -"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 4a192bf..09a85d7 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -88,7 +88,7 @@
<!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
<!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
<string name="emergency_contacts_title" msgid="5462202017417821030">"Kontaktpersonas ārkārtas situācijām"</string>
- <string name="add_emergency_contact" msgid="4063577069613981029">"Kontaktpersonas pievienošana"</string>
+ <string name="add_emergency_contact" msgid="4063577069613981029">"Pievienot kontaktpersonu"</string>
<string name="fail_load_contact_picker" msgid="817205483833876726">"Nevarēja atrast kontaktpersonu atlasītāju."</string>
<string name="fail_display_contact" msgid="4128854688897045879">"Nevar parādīt kontaktpersonu."</string>
<string name="remove_contact" msgid="6934983445723096759">"Vai noņemt kontaktpersonu <xliff:g id="CONTACT_NAME">%1$s</xliff:g> no ārkārtas situāciju kontaktpersonām?"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 458f584..6efc848 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -88,7 +88,7 @@
<!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
<!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
<string name="emergency_contacts_title" msgid="5462202017417821030">"အရေးပေါ်အခြေအနေတွင် ဆက်သွယ်ရမည့်သူများ"</string>
- <string name="add_emergency_contact" msgid="4063577069613981029">"အဆက်အသွယ် ထည့်ပါ"</string>
+ <string name="add_emergency_contact" msgid="4063577069613981029">"ထည့်ရန်"</string>
<string name="fail_load_contact_picker" msgid="817205483833876726">"အဆက်အသွယ် ရွေးချယ်ခြင်းစနစ်ကို ရှာမတွေ့ပါ"</string>
<string name="fail_display_contact" msgid="4128854688897045879">"အဆက်အသွယ်များကို ပြသ၍မရပါ"</string>
<string name="remove_contact" msgid="6934983445723096759">"<xliff:g id="CONTACT_NAME">%1$s</xliff:g> ကို အရေးပေါ်အခြေအနေတွင် ဆက်သွယ်ရမည့်သူများစာရင်းမှ ဖယ်ရှားမလား။"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f02bd10..1a3a195 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -77,7 +77,7 @@
<string name="medications" msgid="644428945685557183">"Медицинские препараты"</string>
<string name="unknown_medications" msgid="2764171064510423734">"Неизвестно"</string>
<string name="medications_hint" msgid="3221620025945593723">"Например, аспирин"</string>
- <string name="medical_conditions" msgid="3555690011498283592">"Медицинская информация"</string>
+ <string name="medical_conditions" msgid="3555690011498283592">"Заболевания"</string>
<string name="unknown_medical_conditions" msgid="8051364895172053770">"Неизвестно"</string>
<string name="medical_conditions_hint" msgid="6959152183029062882">"Например, астма"</string>
<string name="organ_donor" msgid="5953509460007124827">"Донор органов"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 48840bb..967c497 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -71,7 +71,7 @@
<string name="ab_positive" msgid="1931300033534642005">"AB-positiv"</string>
<string name="ab_negative" msgid="2064555613093591729">"AB-negativ"</string>
<string name="h_h" msgid="2183333409760379720">"H H"</string>
- <string name="allergies" msgid="2789200777539258165">"Allergi"</string>
+ <string name="allergies" msgid="2789200777539258165">"Allergier"</string>
<string name="unknown_allergies" msgid="4383115953418061237">"Ingen uppgift"</string>
<string name="allergies_hint" msgid="5488918780522184147">"Till exempel jordnötter"</string>
<string name="medications" msgid="644428945685557183">"Läkemedel"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3fed4d7..b1e7886 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -99,7 +99,7 @@
<string name="ok" msgid="163967937451981024">"Sawa"</string>
<string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
<string name="no_info_provided" msgid="716200382010821001">"Hatuna maelezo kuhusu mwenye simu hii"</string>
- <string name="tap_pencil" msgid="2723698054265296934">"Ikiwa hii ni simu yako, gonga aikoni ya penseli ili uongeze maelezo ambayo yataonekana hapa wakati wa dharura."</string>
+ <string name="tap_pencil" msgid="2723698054265296934">"Ikiwa hii ni simu yako, gusa aikoni ya penseli ili uongeze maelezo ambayo yataonekana hapa wakati wa dharura."</string>
<string name="clear_all" msgid="8899013032870561633">"Futa yote"</string>
<string name="clear" msgid="3648880442502887163">"Futa"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Je, ungependa kufuta maelezo na anwani zote?"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 39c3919..62cce38 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="1090682794607161063">"Дані для екстр. вип."</string>
+ <string name="app_label" msgid="1090682794607161063">"Дані для екстр. випадків"</string>
<string name="medical_info_title" msgid="3000192781136934887">"Медична інформація"</string>
<string name="edit_medical_info" msgid="6733720353375319476">"Редагувати інформацію"</string>
<string name="edit_info" msgid="5973929805855224805">"Редагувати дані про екстрену ситуацію"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 6be84d8..9ede527 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -100,7 +100,7 @@
<string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
<string name="no_info_provided" msgid="716200382010821001">"Telefon egasi haqida ma’lumot yo‘q"</string>
<string name="tap_pencil" msgid="2723698054265296934">"Agar bu sizning telefoningiz bo‘lsa, bu yerda favqulodda holatlarda ko‘rsatiladigan ma’lumotlarni qo‘shish uchun qalam belgisini bosing"</string>
- <string name="clear_all" msgid="8899013032870561633">"Hammasini o‘chirish"</string>
+ <string name="clear_all" msgid="8899013032870561633">"Hammasini tozalash"</string>
<string name="clear" msgid="3648880442502887163">"O‘chirish"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Barcha kontaktlar va ma’lumotlar o‘chirib tashlansinmi?"</string>
<string name="emergency_info_footer" msgid="4694516011247606250">"Tibbiy axborot va favqulodda kontaktlar kiritish favqulodda holatlarda birinchi javob beruvchi uchun yordam beradi.\n\nIstalgan kishi bu ma’lumotlarni telefonni qulfdan chiqarmasdan ekran qulfidan o‘qiy oladi."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a7842d3..2cf946f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -74,7 +74,7 @@
<string name="allergies" msgid="2789200777539258165">"Dị ứng"</string>
<string name="unknown_allergies" msgid="4383115953418061237">"Không xác định"</string>
<string name="allergies_hint" msgid="5488918780522184147">"Ví dụ: đậu phộng"</string>
- <string name="medications" msgid="644428945685557183">"Dược phẩm"</string>
+ <string name="medications" msgid="644428945685557183">"Thuốc"</string>
<string name="unknown_medications" msgid="2764171064510423734">"Không xác định"</string>
<string name="medications_hint" msgid="3221620025945593723">"Ví dụ: aspirin"</string>
<string name="medical_conditions" msgid="3555690011498283592">"Ghi chú y tế"</string>