summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-14 07:06:52 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-14 07:06:52 +0000
commitc233c140fdffb9dc8042b6ab55ddafd218a3cbf2 (patch)
tree2ef2180bcc45c3bcf2ab0e91257cef7ba0100eb8
parent5ff8d81b7ccd7a679ff51f002621c5e43f08dc93 (diff)
parentd0346b76d5e3f80c17c99acc8903ab8a939eadfb (diff)
downloadEmergencyInfo-c233c140fdffb9dc8042b6ab55ddafd218a3cbf2.tar.gz
Snap for 8294919 from d0346b76d5e3f80c17c99acc8903ab8a939eadfb to main-cg-testing-release
Change-Id: I0c87fe19341223355cf1ac811b7f4cc4086b5330
-rw-r--r--EmergencyGestureAction/res/values-b+sr+Latn/strings.xml2
-rw-r--r--EmergencyGestureAction/res/values-de/strings.xml2
-rw-r--r--EmergencyGestureAction/res/values-eu/strings.xml2
-rw-r--r--EmergencyGestureAction/res/values-gl/strings.xml2
-rw-r--r--EmergencyGestureAction/res/values-gu/strings.xml2
-rw-r--r--EmergencyGestureAction/res/values-is/strings.xml2
-rw-r--r--EmergencyGestureAction/res/values-it/strings.xml2
-rw-r--r--EmergencyGestureAction/res/values-kk/strings.xml2
-rw-r--r--EmergencyGestureAction/res/values-km/strings.xml2
-rw-r--r--EmergencyGestureAction/res/values-my/strings.xml2
-rw-r--r--EmergencyGestureAction/res/values-nl/strings.xml2
-rw-r--r--EmergencyGestureAction/res/values-pt-rPT/strings.xml2
-rw-r--r--EmergencyGestureAction/res/values-ru/strings.xml2
-rw-r--r--EmergencyGestureAction/res/values-sr/strings.xml2
-rw-r--r--EmergencyGestureAction/res/values-zh-rTW/strings.xml2
-rw-r--r--EmergencyGestureAction/res/values-zu/strings.xml2
-rw-r--r--res/values-as/strings.xml6
-rw-r--r--res/values-bs/strings.xml4
-rw-r--r--res/values-hi/strings.xml4
-rw-r--r--res/values-iw/strings.xml2
-rw-r--r--res/values-my/strings.xml2
-rw-r--r--res/values-te/strings.xml22
-rw-r--r--src/com/android/emergency/edit/EditInfoFragment.java3
-rw-r--r--src/com/android/emergency/preferences/ContactPreference.java5
24 files changed, 41 insertions, 39 deletions
diff --git a/EmergencyGestureAction/res/values-b+sr+Latn/strings.xml b/EmergencyGestureAction/res/values-b+sr+Latn/strings.xml
index c7ba3d0e..4a7e6ea8 100644
--- a/EmergencyGestureAction/res/values-b+sr+Latn/strings.xml
+++ b/EmergencyGestureAction/res/values-b+sr+Latn/strings.xml
@@ -19,7 +19,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="cancel" msgid="1942863792086990604">"Otkaži"</string>
<string name="emergency_action_title" msgid="4329795972111990414">"Hitna pomoć"</string>
- <string name="emergency_action_subtitle" msgid="5667616628096114616">"Priprema se poziv na <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>"</string>
+ <string name="emergency_action_subtitle" msgid="5667616628096114616">"Priprema se poziv za <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>"</string>
<string name="count_down_unit" msgid="7461042666268976220">"s"</string>
<string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 sekunda}one{# sekunda}few{# sekunde}other{# sekundi}}"</string>
<string name="slider_seek_bar_content_description" msgid="811285658152645524">"Prevucite sa dva prsta da biste aktivirali"</string>
diff --git a/EmergencyGestureAction/res/values-de/strings.xml b/EmergencyGestureAction/res/values-de/strings.xml
index 3b763070..83a4d3d7 100644
--- a/EmergencyGestureAction/res/values-de/strings.xml
+++ b/EmergencyGestureAction/res/values-de/strings.xml
@@ -19,7 +19,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="cancel" msgid="1942863792086990604">"Abbrechen"</string>
<string name="emergency_action_title" msgid="4329795972111990414">"Notfall-SOS"</string>
- <string name="emergency_action_subtitle" msgid="5667616628096114616">"Anruf bei <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g> wird eingeleitet"</string>
+ <string name="emergency_action_subtitle" msgid="5667616628096114616">"Anruf bei <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g> vorbereiten"</string>
<string name="count_down_unit" msgid="7461042666268976220">"s"</string>
<string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 Sekunde}other{# Sekunden}}"</string>
<string name="slider_seek_bar_content_description" msgid="811285658152645524">"Zum Aktivieren mit zwei Fingern ziehen"</string>
diff --git a/EmergencyGestureAction/res/values-eu/strings.xml b/EmergencyGestureAction/res/values-eu/strings.xml
index 52a9e6c9..918ec905 100644
--- a/EmergencyGestureAction/res/values-eu/strings.xml
+++ b/EmergencyGestureAction/res/values-eu/strings.xml
@@ -18,7 +18,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="cancel" msgid="1942863792086990604">"Utzi"</string>
- <string name="emergency_action_title" msgid="4329795972111990414">"SOS larrialdia"</string>
+ <string name="emergency_action_title" msgid="4329795972111990414">"Larrialdia"</string>
<string name="emergency_action_subtitle" msgid="5667616628096114616">"Larrialdi-zerbitzuetara (<xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>) deitzeko prestatzen ari gara"</string>
<string name="count_down_unit" msgid="7461042666268976220">"s"</string>
<string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 segundo}other{# segundo}}"</string>
diff --git a/EmergencyGestureAction/res/values-gl/strings.xml b/EmergencyGestureAction/res/values-gl/strings.xml
index 45cdeecb..13da98ce 100644
--- a/EmergencyGestureAction/res/values-gl/strings.xml
+++ b/EmergencyGestureAction/res/values-gl/strings.xml
@@ -19,7 +19,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="cancel" msgid="1942863792086990604">"Cancelar"</string>
<string name="emergency_action_title" msgid="4329795972111990414">"Emerxencia SOS"</string>
- <string name="emergency_action_subtitle" msgid="5667616628096114616">"Preparándose para chamar ao <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>"</string>
+ <string name="emergency_action_subtitle" msgid="5667616628096114616">"Preparándose para chamar a <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>"</string>
<string name="count_down_unit" msgid="7461042666268976220">"s"</string>
<string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 segundo}other{# segundos}}"</string>
<string name="slider_seek_bar_content_description" msgid="811285658152645524">"Pasa dous dedos para activar"</string>
diff --git a/EmergencyGestureAction/res/values-gu/strings.xml b/EmergencyGestureAction/res/values-gu/strings.xml
index a787442f..1f944f73 100644
--- a/EmergencyGestureAction/res/values-gu/strings.xml
+++ b/EmergencyGestureAction/res/values-gu/strings.xml
@@ -19,7 +19,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="cancel" msgid="1942863792086990604">"રદ કરો"</string>
<string name="emergency_action_title" msgid="4329795972111990414">"ઇમર્જન્સી સહાય"</string>
- <string name="emergency_action_subtitle" msgid="5667616628096114616">"<xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>ને કૉલ કરવા માટેની તૈયારી કરી રહ્યાં છીએ"</string>
+ <string name="emergency_action_subtitle" msgid="5667616628096114616">"<xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>ને કૉલ કરવા માટેની તૈયાર કરી રહ્યાં છીએ"</string>
<string name="count_down_unit" msgid="7461042666268976220">"સેકન્ડ"</string>
<string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 સેકન્ડ}one{# સેકન્ડ}other{# સેકન્ડ}}"</string>
<string name="slider_seek_bar_content_description" msgid="811285658152645524">"સક્રિય કરવા માટે બે આંગળી વડે સ્લાઇડ કરો"</string>
diff --git a/EmergencyGestureAction/res/values-is/strings.xml b/EmergencyGestureAction/res/values-is/strings.xml
index 7b8e4998..369a7929 100644
--- a/EmergencyGestureAction/res/values-is/strings.xml
+++ b/EmergencyGestureAction/res/values-is/strings.xml
@@ -19,7 +19,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="cancel" msgid="1942863792086990604">"Hætta við"</string>
<string name="emergency_action_title" msgid="4329795972111990414">"Neyðartilkynning"</string>
- <string name="emergency_action_subtitle" msgid="5667616628096114616">"Undirbýr símtal í <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>"</string>
+ <string name="emergency_action_subtitle" msgid="5667616628096114616">"Undirbýr símtal til <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>"</string>
<string name="count_down_unit" msgid="7461042666268976220">"sek."</string>
<string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 sekúnda}one{# sekúnda}other{# sekúndur}}"</string>
<string name="slider_seek_bar_content_description" msgid="811285658152645524">"Renndu með tveimur fingrum til að virkja"</string>
diff --git a/EmergencyGestureAction/res/values-it/strings.xml b/EmergencyGestureAction/res/values-it/strings.xml
index c9ab2be6..13ce78fe 100644
--- a/EmergencyGestureAction/res/values-it/strings.xml
+++ b/EmergencyGestureAction/res/values-it/strings.xml
@@ -21,6 +21,6 @@
<string name="emergency_action_title" msgid="4329795972111990414">"SOS emergenze"</string>
<string name="emergency_action_subtitle" msgid="5667616628096114616">"Preparazione di una chiamata al numero <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g> in corso…"</string>
<string name="count_down_unit" msgid="7461042666268976220">"s"</string>
- <string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 secondo}one{# secondo}other{# secondi}}"</string>
+ <string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 secondo}other{# secondi}}"</string>
<string name="slider_seek_bar_content_description" msgid="811285658152645524">"Fai scorrere con due dita per attivare"</string>
</resources>
diff --git a/EmergencyGestureAction/res/values-kk/strings.xml b/EmergencyGestureAction/res/values-kk/strings.xml
index 1f8f9b35..4efd1c10 100644
--- a/EmergencyGestureAction/res/values-kk/strings.xml
+++ b/EmergencyGestureAction/res/values-kk/strings.xml
@@ -19,7 +19,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="cancel" msgid="1942863792086990604">"Бас тарту"</string>
<string name="emergency_action_title" msgid="4329795972111990414">"Құтқару қызметін шақыру"</string>
- <string name="emergency_action_subtitle" msgid="5667616628096114616">"<xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g> нөміріне қоңырау шалынады."</string>
+ <string name="emergency_action_subtitle" msgid="5667616628096114616">"<xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g> нөміріне шалынатын қоңырау дайындалуда."</string>
<string name="count_down_unit" msgid="7461042666268976220">"с"</string>
<string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 секунд}other{# секунд}}"</string>
<string name="slider_seek_bar_content_description" msgid="811285658152645524">"Іске қосу үшін екі саусақпен жылжыту"</string>
diff --git a/EmergencyGestureAction/res/values-km/strings.xml b/EmergencyGestureAction/res/values-km/strings.xml
index 433b2d1f..5e040b71 100644
--- a/EmergencyGestureAction/res/values-km/strings.xml
+++ b/EmergencyGestureAction/res/values-km/strings.xml
@@ -19,7 +19,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="cancel" msgid="1942863792086990604">"បោះបង់"</string>
<string name="emergency_action_title" msgid="4329795972111990414">"SOS ពេលមានអាសន្ន"</string>
- <string name="emergency_action_subtitle" msgid="5667616628096114616">"កំពុងត្រៀមហៅទូរសព្ទ​ទៅ <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>"</string>
+ <string name="emergency_action_subtitle" msgid="5667616628096114616">"កំពុងរៀបចំ​ការហៅទូរសព្ទ​ទៅលេខ <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>"</string>
<string name="count_down_unit" msgid="7461042666268976220">"វិ"</string>
<string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 វិនាទី}other{# វិនាទី}}"</string>
<string name="slider_seek_bar_content_description" msgid="811285658152645524">"អូស​ដោយប្រើម្រាមដៃពីរ ដើម្បី​បើកដំណើរការ"</string>
diff --git a/EmergencyGestureAction/res/values-my/strings.xml b/EmergencyGestureAction/res/values-my/strings.xml
index fc65e98a..029cce44 100644
--- a/EmergencyGestureAction/res/values-my/strings.xml
+++ b/EmergencyGestureAction/res/values-my/strings.xml
@@ -19,7 +19,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="cancel" msgid="1942863792086990604">"မလုပ်တော့"</string>
<string name="emergency_action_title" msgid="4329795972111990414">"အရေးပေါ် SOS"</string>
- <string name="emergency_action_subtitle" msgid="5667616628096114616">"<xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g> ကို ခေါ်ရန် ပြင်ဆင်နေသည်"</string>
+ <string name="emergency_action_subtitle" msgid="5667616628096114616">"<xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g> ကို ဖုန်းဆက်ရန် ပြင်ဆင်နေသည်"</string>
<string name="count_down_unit" msgid="7461042666268976220">"s"</string>
<string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 စက္ကန့်}other{# စက္ကန့်}}"</string>
<string name="slider_seek_bar_content_description" msgid="811285658152645524">"စသုံးရန် လက်နှစ်ချောင်းနှင့် ဘေးတိုက်ပွတ်ဆွဲပါ"</string>
diff --git a/EmergencyGestureAction/res/values-nl/strings.xml b/EmergencyGestureAction/res/values-nl/strings.xml
index e0d1741f..2075f84f 100644
--- a/EmergencyGestureAction/res/values-nl/strings.xml
+++ b/EmergencyGestureAction/res/values-nl/strings.xml
@@ -19,7 +19,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="cancel" msgid="1942863792086990604">"Annuleren"</string>
<string name="emergency_action_title" msgid="4329795972111990414">"SOS"</string>
- <string name="emergency_action_subtitle" msgid="5667616628096114616">"Gesprek met <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g> wordt voorbereid"</string>
+ <string name="emergency_action_subtitle" msgid="5667616628096114616">"Er wordt een gesprek met <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g> voorbereid"</string>
<string name="count_down_unit" msgid="7461042666268976220">"s"</string>
<string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 seconde}other{# seconden}}"</string>
<string name="slider_seek_bar_content_description" msgid="811285658152645524">"Schuif met 2 vingers om te activeren"</string>
diff --git a/EmergencyGestureAction/res/values-pt-rPT/strings.xml b/EmergencyGestureAction/res/values-pt-rPT/strings.xml
index 4b24ac44..423fb6e7 100644
--- a/EmergencyGestureAction/res/values-pt-rPT/strings.xml
+++ b/EmergencyGestureAction/res/values-pt-rPT/strings.xml
@@ -21,6 +21,6 @@
<string name="emergency_action_title" msgid="4329795972111990414">"Urgência SOS"</string>
<string name="emergency_action_subtitle" msgid="5667616628096114616">"A preparar uma chamada para <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>"</string>
<string name="count_down_unit" msgid="7461042666268976220">"s"</string>
- <string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 segundo}one{# segundo(s)}other{# segundos}}"</string>
+ <string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 segundo}other{# segundos}}"</string>
<string name="slider_seek_bar_content_description" msgid="811285658152645524">"Deslize lentamente com dois dedos para ativar"</string>
</resources>
diff --git a/EmergencyGestureAction/res/values-ru/strings.xml b/EmergencyGestureAction/res/values-ru/strings.xml
index 06b2304c..cf045330 100644
--- a/EmergencyGestureAction/res/values-ru/strings.xml
+++ b/EmergencyGestureAction/res/values-ru/strings.xml
@@ -19,7 +19,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="cancel" msgid="1942863792086990604">"Отмена"</string>
<string name="emergency_action_title" msgid="4329795972111990414">"Экстренный вызов"</string>
- <string name="emergency_action_subtitle" msgid="5667616628096114616">"Подготовка к звонку на номер <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>."</string>
+ <string name="emergency_action_subtitle" msgid="5667616628096114616">"Подготовка вызова по номеру <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>."</string>
<string name="count_down_unit" msgid="7461042666268976220">"сек."</string>
<string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 секунда}one{# секунда}few{# секунды}many{# секунд}other{# секунды}}"</string>
<string name="slider_seek_bar_content_description" msgid="811285658152645524">"Чтобы активировать, проведите двумя пальцами"</string>
diff --git a/EmergencyGestureAction/res/values-sr/strings.xml b/EmergencyGestureAction/res/values-sr/strings.xml
index e192f1a3..42a6febd 100644
--- a/EmergencyGestureAction/res/values-sr/strings.xml
+++ b/EmergencyGestureAction/res/values-sr/strings.xml
@@ -19,7 +19,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="cancel" msgid="1942863792086990604">"Откажи"</string>
<string name="emergency_action_title" msgid="4329795972111990414">"Хитна помоћ"</string>
- <string name="emergency_action_subtitle" msgid="5667616628096114616">"Припрема се позив на <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>"</string>
+ <string name="emergency_action_subtitle" msgid="5667616628096114616">"Припрема се позив за <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>"</string>
<string name="count_down_unit" msgid="7461042666268976220">"с"</string>
<string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 секунда}one{# секунда}few{# секунде}other{# секунди}}"</string>
<string name="slider_seek_bar_content_description" msgid="811285658152645524">"Превуците са два прста да бисте активирали"</string>
diff --git a/EmergencyGestureAction/res/values-zh-rTW/strings.xml b/EmergencyGestureAction/res/values-zh-rTW/strings.xml
index 85fe0f4c..9a8e568d 100644
--- a/EmergencyGestureAction/res/values-zh-rTW/strings.xml
+++ b/EmergencyGestureAction/res/values-zh-rTW/strings.xml
@@ -19,7 +19,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="cancel" msgid="1942863792086990604">"取消"</string>
<string name="emergency_action_title" msgid="4329795972111990414">"緊急求救"</string>
- <string name="emergency_action_subtitle" msgid="5667616628096114616">"正在準備撥打 <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>"</string>
+ <string name="emergency_action_subtitle" msgid="5667616628096114616">"正在準備打電話到 <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>"</string>
<string name="count_down_unit" msgid="7461042666268976220">"秒"</string>
<string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{1 秒}other{# 秒}}"</string>
<string name="slider_seek_bar_content_description" msgid="811285658152645524">"用雙指滑動即可啟用"</string>
diff --git a/EmergencyGestureAction/res/values-zu/strings.xml b/EmergencyGestureAction/res/values-zu/strings.xml
index 8f2de5d2..6450fcbf 100644
--- a/EmergencyGestureAction/res/values-zu/strings.xml
+++ b/EmergencyGestureAction/res/values-zu/strings.xml
@@ -18,7 +18,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="cancel" msgid="1942863792086990604">"Khansela"</string>
- <string name="emergency_action_title" msgid="4329795972111990414">"I-SOS yezimo eziphuthumayo"</string>
+ <string name="emergency_action_title" msgid="4329795972111990414">"Isimo esiphuthumayo se-SOS"</string>
<string name="emergency_action_subtitle" msgid="5667616628096114616">"Ilungiselela ukushayela i-<xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g> ucingo"</string>
<string name="count_down_unit" msgid="7461042666268976220">"s"</string>
<string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{isekhondi eli-1}one{amasekhondi #}other{amasekhondi #}}"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 24e856ce..e78eda74 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -100,10 +100,10 @@
<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="8751758742506410146">"আপোনাৰ স্বাস্থ্য সম্পৰ্কীয় বিশেষ তথ্য আৰু জৰুৰীকালীন সম্পৰ্ক যোগ কৰিলে জৰুৰীকালীন পৰিস্থিতিত প্ৰথম সঁহাৰিদাতাজনৰ বাবে সহায়ক হয়।\n\nআপোনাৰ লক স্ক্ৰীনতেই যিকোনো লোকে এই তথ্য পঢ়িব পাৰে আৰু আপোনাৰ ফ’নটো আনলক নকৰাকৈয়ে তেওঁলোকে জৰুৰীকালীন সম্পৰ্কসমূহৰ নাম টিপি তেওঁলোকক ফ’ন কৰিব পাৰে।"</string>
+ <string name="clear_all_message" msgid="1548432000373861295">"সকলো তথ্য আৰু সম্পৰ্ক মচিবনে?"</string>
+ <string name="emergency_info_footer" msgid="8751758742506410146">"আপোনাৰ স্বাস্থ্য সম্পৰ্কীয় বিশেষ তথ্য আৰু জৰুৰীকালীন সম্পৰ্ক যোগ কৰিলে জৰুৰীকালীন পৰিস্থিতিত প্ৰথম সঁহাৰিদাতাজনৰ বাবে সহায়ক হয়।\n\nআপোনাৰ বন্ধ স্ক্ৰীণতেই যিকোনো লোকে এই তথ্য পঢ়িব পাৰে আৰু আপোনাৰ ফ\'নটো আনলক নকৰাকৈয়ে তেওঁলোকে জৰুৰীকালীন সম্পৰ্কসমূহৰ নাম টিপি তেওঁলোকক ফ\'ন কৰিব পাৰে।"</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"জৰুৰীকালীন তথ্য যোগ কৰক"</string>
<string name="settings_suggestion_body" msgid="5559349261345837716">"প্ৰথমে সঁহাৰি দিয়া লোকসকলক আপোনাৰ তথ্য চাবলৈ দিয়ক"</string>
<string name="user_image_take_photo" msgid="2779924488370750102">"এখন ফট’ তোলক"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index eadd6bee..184ae518 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -103,9 +103,9 @@
<string name="clear_all" msgid="8899013032870561633">"Obriši sve"</string>
<string name="clear" msgid="3648880442502887163">"Obriši"</string>
<string name="clear_all_message" msgid="1548432000373861295">"Obrisati sve informacije i kontakte?"</string>
- <string name="emergency_info_footer" msgid="8751758742506410146">"Dodavanje zdravstvenih podataka i kontakata za hitne slučajeve može pomoći hitnim službama u hitnim slučajevima.\n\nSvako može pročitati te informacije s vašeg zaključanog ekrana i bez otključavanja ekrana pozvati vaše kontakte dodirom na njihovo ime."</string>
+ <string name="emergency_info_footer" msgid="8751758742506410146">"Dodavanje zdravstvenih podataka i kontakata za hitne slučajeve može pomoći osobama koje prve reagiraju u hitnim slučajevima.\n\nSvako može pročitati te informacije s vašeg zaključanog ekrana i bez otključavanja ekrana pozvati vaše kontakte dodirom na njihovo ime."</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"Dodajte informacije za hitne slučajeve"</string>
- <string name="settings_suggestion_body" msgid="5559349261345837716">"Omogući da hitne službe vide informaciju"</string>
+ <string name="settings_suggestion_body" msgid="5559349261345837716">"Omogući da oni koji prvi reagiraju vide informaciju"</string>
<string name="user_image_take_photo" msgid="2779924488370750102">"Snimite fotografiju"</string>
<string name="user_image_choose_photo" msgid="2442095378052415700">"Odaberite sliku"</string>
<string name="user_image_photo_selector" msgid="8941966433899876760">"Odaberite fotografiju"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 06a9be88..d389e484 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/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="add_medical_info" msgid="483921612415907139">"जानकारी जोड़ें"</string>
<string name="edit_info" msgid="5973929805855224805">"आपातकालीन जानकारी में बदलाव करें"</string>
@@ -99,7 +99,7 @@
<string name="ok" msgid="163967937451981024">"ठीक है"</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">"ये जिसका फ़ोन है उसके बारे में कोई जानकारी नहीं है"</string>
- <string name="tap_pencil" msgid="2723698054265296934">"अगर यह आपका फ़ोन है, तो आपका ब्लड ग्रुप या किसी परिचित के फ़ोन नंबर जैसी जानकारी जोड़ने के लिए पेंसिल आइकॉन को छूएं. यह जानकारी मुसीबत के समय दिखाई देगी."</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_message" msgid="1548432000373861295">"सभी जानकारी और संपर्क साफ़ करें?"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 157c9c08..c62d8155 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -87,7 +87,7 @@
<!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
<!-- 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="emergency_contacts_title" msgid="5462202017417821030">"אנשי קשר בחירום"</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>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 63bd8960..d59266e4 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/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="8751758742506410146">"ကျန်းမာရေးအချက်အလက်များနှင့် အရေးပေါ် အဆက်အသွယ်များကို ထည့်သွင်းခြင်းအားဖြင့် အရေးပေါ်အခြေအနေတစ်ခုတွင် ဦးဆုံးတုံ့ပြန်သူများက ၎င်းအချက်အလက်များကို တွေ့မြင်နိုင်ရန် ကူညီပေးပါသည်။\n\nသင့်ဖုန်းကို လော့ခ်ဖွင့်စရာမလိုဘဲ သင့်အဆက်အသွယ်များကို လော့ခ်ချထားချိန်မျက်နှာပြင်တွင် ဤအချက်အလက်များကို မည်သူမဆိုဖတ်နိုင်ပြီး သင့်အဆက်အသွယ်များ၏ အမည်ကို တို့၍ ၎င်းတို့ကို ဖုန်းဆက်နိုင်ပါသည်။"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index f78999fa..e288fcfc 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -19,12 +19,12 @@
<string name="app_label" msgid="1090682794607161063">"ఎమర్జెన్సీ సమాచారం"</string>
<string name="medical_info_title" msgid="3000192781136934887">"వైద్య సమాచారం"</string>
<string name="add_medical_info" msgid="483921612415907139">"సమాచారాన్ని జోడించండి"</string>
- <string name="edit_info" msgid="5973929805855224805">"అత్యవసర సమాచారాన్ని ఎడిట్ చేస్తుంది"</string>
+ <string name="edit_info" msgid="5973929805855224805">"అత్యవసర సమాచారాన్ని సవరిస్తుంది"</string>
<string name="tab_title_info" msgid="1402033103294855812">"సమాచారం"</string>
- <string name="tab_title_contacts" msgid="4298341166404791209">"కాంటాక్ట్‌లు"</string>
+ <string name="tab_title_contacts" msgid="4298341166404791209">"పరిచయాలు"</string>
<string name="name" msgid="4286267457738861977">"పేరు"</string>
<string name="unknown_name" msgid="2834802479170495056">"తెలియదు"</string>
- <string name="address" msgid="6449303483151189969">"అడ్రస్‌"</string>
+ <string name="address" msgid="6449303483151189969">"చిరునామా"</string>
<string name="unknown_address" msgid="4212576729941786121">"తెలియదు"</string>
<string name="date_of_birth" msgid="777979232444227891">"పుట్టిన తేదీ"</string>
<string name="unknown_date_of_birth" msgid="7416355536916066758">"తెలియదు"</string>
@@ -88,12 +88,12 @@
<!-- 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="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>
- <string name="remove_contact_icon_text" msgid="4576641386490101363">"కాంటాక్ట్‌ను తీసివేయండి"</string>
- <string name="fail_add_contact" msgid="6511490846952942291">"కాంటాక్ట్ సమాచారాన్ని సరిగ్గా చదవడం సాధ్యం కాదు"</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>
+ <string name="remove_contact_icon_text" msgid="4576641386490101363">"పరిచయాన్ని తీసివేస్తుంది"</string>
+ <string name="fail_add_contact" msgid="6511490846952942291">"పరిచయ సమాచారాన్ని సరిగ్గా చదవడం సాధ్యం కాదు"</string>
<string name="remove" msgid="1243949503772376064">"తీసివేయి"</string>
<string name="cancel" msgid="7401575239009060939">"రద్దు చేయి"</string>
<string name="ok" msgid="163967937451981024">"సరే"</string>
@@ -102,8 +102,8 @@
<string name="tap_pencil" msgid="2723698054265296934">"ఇది మీ ఫోన్ అయితే, అత్యవసర పరిస్థితి తలెత్తే సందర్భాల కోసం ఇక్కడ ప్రదర్శించబడే సమాచారాన్ని జోడించడానికి పెన్సిల్ చిహ్నాన్ని నొక్కండి"</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="8751758742506410146">"వైద్య సమాచారం మరియు అత్యవసర కాంటాక్ట్‌లను జోడిస్తే, అత్యవసర పరిస్థితిలో ముందుగా ప్రతిస్పందించే వారికి సహాయకరంగా ఉంటాయి.\n\nఎవరైనా సరే, మీ ఫోన్‌ని అన్‌లాక్ చేయకుండానే మీ లాక్ స్క్రీన్ నుండి ఈ సమాచారాన్ని చదవగలరు మరియు మీ కాంటాక్ట్‌ల పేర్లు ట్యాప్ చేయడం ద్వారా వారికి కాల్ చేయగలరు."</string>
+ <string name="clear_all_message" msgid="1548432000373861295">"మొత్తం సమాచారం మరియు పరిచయాలను తీసివేయాలా?"</string>
+ <string name="emergency_info_footer" msgid="8751758742506410146">"వైద్య సమాచారం మరియు అత్యవసర పరిచయాలను జోడిస్తే, అత్యవసర పరిస్థితిలో ముందుగా ప్రతిస్పందించే వారికి సహాయకరంగా ఉంటాయి.\n\nఎవరైనా సరే, మీ ఫోన్‌ని అన్‌లాక్ చేయకుండానే మీ లాక్ స్క్రీన్ నుండి ఈ సమాచారాన్ని చదవగలరు మరియు మీ పరిచయాల పేర్లు నొక్కడం ద్వారా వారికి కాల్ చేయగలరు."</string>
<string name="settings_suggestion_title" msgid="2503369576806243476">"అత్యవసర సమాచారాన్ని జోడించండి"</string>
<string name="settings_suggestion_body" msgid="5559349261345837716">"మీ సమాచారాన్ని మొదటగా ప్రతిస్పందించే వారిని చూడనివ్వండి"</string>
<string name="user_image_take_photo" msgid="2779924488370750102">"ఫోటోను తీయి"</string>
diff --git a/src/com/android/emergency/edit/EditInfoFragment.java b/src/com/android/emergency/edit/EditInfoFragment.java
index 53cae381..54508f4b 100644
--- a/src/com/android/emergency/edit/EditInfoFragment.java
+++ b/src/com/android/emergency/edit/EditInfoFragment.java
@@ -91,7 +91,8 @@ public class EditInfoFragment extends PreferenceFragment {
// presented with a list of contacts, with one entry per phone number.
// The selected contact is guaranteed to have a name and phone number.
Intent contactPickerIntent = new Intent(Intent.ACTION_PICK,
- ContactsContract.CommonDataKinds.Phone.CONTENT_URI);
+ ContactsContract.CommonDataKinds.Phone.CONTENT_URI)
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
try {
startActivityForResult(contactPickerIntent, CONTACT_PICKER_RESULT);
return true;
diff --git a/src/com/android/emergency/preferences/ContactPreference.java b/src/com/android/emergency/preferences/ContactPreference.java
index 447723c7..f823e74e 100644
--- a/src/com/android/emergency/preferences/ContactPreference.java
+++ b/src/com/android/emergency/preferences/ContactPreference.java
@@ -232,8 +232,9 @@ public class ContactPreference extends Preference {
* Displays a contact card for the contact.
*/
public void displayContact() {
- Intent displayIntent = new Intent(Intent.ACTION_VIEW);
- displayIntent.setData(mContact.getContactLookupUri());
+ Intent displayIntent = new Intent(Intent.ACTION_VIEW)
+ .setData(mContact.getContactLookupUri())
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
try {
getContext().startActivity(displayIntent);
} catch (ActivityNotFoundException e) {