23 files changed, 128 insertions, 99 deletions
diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml
index 82ecff34..7dbd0a23 100755
--- a/res/layout/app_details.xml
+++ b/res/layout/app_details.xml
@@ -23,18 +23,17 @@ installation screens
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/app_snippet"
     android:layout_width="match_parent"
-    android:layout_height="65dip"
-    android:background="@drawable/title_bar_medium"
->
+    android:layout_height="wrap_content"
+    android:layout_marginTop="12dip"
+    >
     <ImageView android:id="@+id/app_icon"
-        android:paddingLeft="6dip"
         android:layout_width="54dip"
-        android:layout_height="48dip"
+        android:layout_height="54dip"
         android:background="@color/transparent"
         android:layout_alignParentLeft="true"
-        android:gravity="center"
-        android:layout_centerInParent="true"
-        android:scaleType="centerCrop" />
+        android:gravity="left"
+        android:scaleType="centerCrop"
+        android:paddingLeft="6dip"/>
     <TextView android:id="@+id/app_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/layout/uninstall_confirm.xml b/res/layout/uninstall_confirm.xml
index 7c079d92..78cd64be 100755
--- a/res/layout/uninstall_confirm.xml
+++ b/res/layout/uninstall_confirm.xml
@@ -26,34 +26,43 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <!-- The snippet about the application - title, icon, description.  -->
-    <include
-        layout="@layout/app_details"
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_alignParentTop="true"
-        android:id="@+id/app_snippet" />
+        android:orientation="vertical"
+        android:paddingTop="6dip"
+        android:paddingBottom="6dip">
 
-    <!-- uninstall application confirmation question -->
-    <TextView
-        android:id="@+id/uninstall_question"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textStyle="bold"
-        android:paddingTop="16dip"
-        android:paddingLeft="16dip"
-        android:layout_below="@id/app_snippet"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textAppearance="?android:attr/textAppearanceMedium"       
-        android:paddingBottom="36dip"/>
+        <!-- If an activity was specified, explains what package it's in. -->
+        <TextView
+            android:id="@+id/activity_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:paddingTop="16dip"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip"
+            android:visibility="gone" />
 
-    <!-- uninstall application confirmation text -->
-    <TextView
-        android:id="@+id/uninstall_confirm_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textAppearance="?android:attr/textAppearanceMedium"       
-        android:layout_below="@id/uninstall_question"
-        android:paddingLeft="16dip"/>
+        <!-- The snippet (title & icon) about the application being uninstalled. -->
+        <include
+            layout="@layout/app_details"
+            android:id="@+id/uninstall_activity_snippet" />
+
+        <!-- uninstall application confirmation text -->
+        <TextView
+            android:id="@+id/uninstall_confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:paddingTop="16dip"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip" />
+
+   </LinearLayout>
 
     <!-- OK confirm and cancel buttons.  -->
     <LinearLayout
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7184511d..6df34d94 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"OK"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"Aplikace nebyla nalezena"</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"Aplikace nebyla nalezena na seznamu nainstalovaných aplikací."</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"Odinstalovat aplikaci?"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"Odinstalovat aktualizaci?"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"Odinstalovat aplikaci"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"Odinstalovat aktualizaci"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"Činnost <xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> je součástí následující aplikace:"</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"Tato aplikace bude odinstalována."</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"Aktualizace aplikace bude odinstalována. Můžete stále používat tovární verzi aplikace."</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"Aplikace bude nahrazena výchozí verzí z výroby."</string>
     <string name="uninstalling" msgid="5556217435895938250">"Probíhá odinstalace..."</string>
     <string name="uninstall_done" msgid="2270435276009022874">"Odinstalace byla dokončena."</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"Odinstalace nebyla úspěšná."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 104179c2..f92add26 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"OK"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"Programmet blev ikke fundet"</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"Programmet blev ikke fundet på listen over installerede programmer."</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"Afinstaller program?"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"Afinstaller opdatering?"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"Afinstaller programmet"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"Afinstaller opdateringen"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> er en del af følgende program:"</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"Dette program afinstalleres."</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"Programopdateringen afinstalleres. Du kan stadig bruge programmets fabriksversion."</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"Programmet erstattes med fabriksversionen."</string>
     <string name="uninstalling" msgid="5556217435895938250">"Afinstallerer ..."</string>
     <string name="uninstall_done" msgid="2270435276009022874">"Afinstallationen er afsluttet"</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"Afinstallationen mislykkedes"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d2076d90..47497c3a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -19,7 +19,7 @@
     <string name="app_name" msgid="2738748390251381682">"Paket-Installer"</string>
     <string name="install" msgid="5896438203900042068">"Installieren"</string>
     <string name="done" msgid="3889387558374211719">"Fertig"</string>
-    <string name="security_settings_desc" msgid="4984920898157282073">"Dieser Anwendung Zugriff erlauben auf:"</string>
+    <string name="security_settings_desc" msgid="4984920898157282073">"Folgendes auf dieser Anwendung zulassen:"</string>
     <string name="cancel" msgid="8360346460165114585">"Abbrechen"</string>
     <string name="unknown" msgid="4742479012767208045">"Unbekannt"</string>
     <string name="installing" msgid="8613631001631998372">"Installation..."</string>
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"OK"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"Anwendung nicht gefunden"</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"Diese Anwendung wurde in der Liste der installierten Anwendungen nicht gefunden."</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"Anwendung deinstallieren?"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"Update deinstallieren?"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"Anwendung deinstallieren"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"Update deinstallieren"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> gehört zu folgender Anwendung:"</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"Diese Anwendung wird deinstalliert."</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"Das Anwendungs-Update wird deinstalliert. Sie können weiterhin die Werksversion der Anwendung nutzen."</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"Die Anwendung wird durch die Werksversion ersetzt."</string>
     <string name="uninstalling" msgid="5556217435895938250">"Deinstallation..."</string>
     <string name="uninstall_done" msgid="2270435276009022874">"Deinstallation abgeschlossen"</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"Deinstallation nicht erfolgreich"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 822d2825..d03d35fd 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"OK"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"Η εφαρμογή δεν βρέθηκε"</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"Η εφαρμογή δεν βρέθηκε στη λίστα των εγκατεστημένων εφαρμογών."</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"Να γίνει κατάργηση εγκατάστασης της εφαρμογής;"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"Κατάργηση εγκατάστασης ενημέρωσης;"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"Κατάργηση εγκατάστασης εφαρμογής"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"Κατάργηση εγκατάστασης ενημέρωσης"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"Η δραστηριότητα <xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> αποτελεί τμήμα της ακόλουθης εφαρμογής:"</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"Η εγκατάσταση αυτής της εφαρμογής θα καταργηθεί."</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"Θα γίνει κατάργηση της εγκατάστασης της ενημέρωσης της εφαρμογής. Θα εξακολουθείτε να μπορείτε να χρησιμοποιήσετε την εργοστασιακή έκδοση της εφαρμογής."</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"Θα γίνει αντικατάσταση της εφαρμογής με την εργοστασιακή έκδοση."</string>
     <string name="uninstalling" msgid="5556217435895938250">"Κατάργηση εγκατάστασης..."</string>
     <string name="uninstall_done" msgid="2270435276009022874">"Η κατάργηση εγκατάστασης ολοκληρώθηκε"</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"Η κατάργηση εγκατάστασης δεν ήταν επιτυχής"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c4b0505d..06903123 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"Aceptar"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"No se ha encontrado la aplicación"</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"No se ha encontrado la aplicación en la lista de aplicaciones instaladas."</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"¿Deseas desinstalar la aplicación?"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"¿Deseas desinstalar la actualización?"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"Desinstalar la aplicación"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"Desinstalar la actualización"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> es parte de la siguiente aplicación:"</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"Esta aplicación se desinstalará."</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"La actualización de la aplicación será desinstalada. Aún puedes usar la versión original de la aplicación."</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"Esta aplicación se reemplazará con la versión de fábrica."</string>
     <string name="uninstalling" msgid="5556217435895938250">"Desinstalando…"</string>
     <string name="uninstall_done" msgid="2270435276009022874">"Finalizó la desinstalación."</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"La desinstalación no se ha realizado correctamente"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d43182d0..7475537a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"Aceptar"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"No se ha encontrado la aplicación."</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"No se ha encontrado la aplicación en la lista de aplicaciones instaladas."</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"¿Desinstalar aplicación?"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"¿Quieres desinstalar la actualización?"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"Desinstalar aplicación"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"Desinstalar actualización"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> forma parte de la siguiente aplicación:"</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"Esta aplicación se desinstalará."</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"La actualización de la aplicación se desinstalará. Aún puedes utilizar la versión de fábrica de la aplicación."</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"La aplicación se sustituirá por la versión de fábrica."</string>
     <string name="uninstalling" msgid="5556217435895938250">"Desinstalando..."</string>
     <string name="uninstall_done" msgid="2270435276009022874">"Desinstalación completada"</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"La desinstalación no se ha realizado correctamente."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0358d28d..a1f88c61 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"OK"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"Application introuvable"</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"Cette application ne figure pas dans la liste des applications installées."</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"Désinstaller l\'application ?"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"Désinstaller la mise à jour ?"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"Désinstaller l\'application"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"Désinstaller la mise à jour"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> fait partie de l\'application suivante :"</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"Cette application sera désinstallée."</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"La mise à jour de l\'application va être désinstallée. Vous pouvez continuer d\'utiliser la version usine de l\'application."</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"L\'application sera remplacée par la version d\'usine."</string>
     <string name="uninstalling" msgid="5556217435895938250">"Désinstallation..."</string>
     <string name="uninstall_done" msgid="2270435276009022874">"Désinstallation terminée"</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"Échec de la désinstallation"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 58644a00..952092c3 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -19,7 +19,7 @@
     <string name="app_name" msgid="2738748390251381682">"Installazione pacchetti"</string>
     <string name="install" msgid="5896438203900042068">"Installa"</string>
     <string name="done" msgid="3889387558374211719">"Fine"</string>
-    <string name="security_settings_desc" msgid="4984920898157282073">"Consenti all\'applicazione:"</string>
+    <string name="security_settings_desc" msgid="4984920898157282073">"Consenti all\'applicazione di:"</string>
     <string name="cancel" msgid="8360346460165114585">"Annulla"</string>
     <string name="unknown" msgid="4742479012767208045">"Sconosciuto"</string>
     <string name="installing" msgid="8613631001631998372">"Installazione..."</string>
@@ -40,11 +40,12 @@
     <string name="out_of_space_dlg_text" msgid="7767221563720090883">"Impossibile installare <xliff:g id="APP_NAME">%1$s</xliff:g>. Libera dello spazio e riprova."</string>
     <string name="dlg_ok" msgid="6944357727705699232">"OK"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"Applicazione non trovata"</string>
-    <string name="app_not_found_dlg_text" msgid="754013198108180241">"Impossibile trovare l\'applicazione nell\'elenco di applicazioni installate."</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"Disinstallare l\'applicazione?"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"Disinstallare l\'aggiornamento?"</string>
+    <string name="app_not_found_dlg_text" msgid="754013198108180241">"Impossibile trovare l\'applicazione \nnell\'elenco di applicazioni installate."</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"Disinstalla applicazione"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"Disinstalla aggiornamento"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> fa parte della seguente applicazione:"</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"Questa applicazione verrà disinstallata."</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"Verrà disinstallato l\'aggiornamento dell\'applicazione. Puoi comunque utilizzare la versione di fabbrica dell\'applicazione."</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"L\'applicazione verrà sostituita con la versione di fabbrica."</string>
     <string name="uninstalling" msgid="5556217435895938250">"Disinstallazione..."</string>
     <string name="uninstall_done" msgid="2270435276009022874">"Disinstallazione completata"</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"Disinstallazione non riuscita"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 56ba0225..879d7e93 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"OK"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"アプリケーションが見つかりません"</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"インストール済みアプリケーションのリストに、このアプリケーションはありません。"</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"アプリケーションをアンインストールしますか？"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"アップデートをアンインストールしますか？"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"アプリケーションのアンインストール"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"アップデートのアンインストール"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g>は次のアプリケーションの一部です:"</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"このアプリケーションはアンインストールされます。"</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"アプリケーションのアップデートをアンインストールします。出荷時のアプリケーションは引き続き使用できます。"</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"アプリケーションは出荷時の状態にリセットされます。"</string>
     <string name="uninstalling" msgid="5556217435895938250">"アンインストール中..."</string>
     <string name="uninstall_done" msgid="2270435276009022874">"アンインストールが完了しました。"</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"アンインストールできませんでした"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 108eb551..8d3b02c9 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"확인"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"애플리케이션을 찾지 못했습니다."</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"애플리케이션이 설치된 애플리케이션 목록에 없습니다."</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"애플리케이션을 제거하시겠습니까?"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"업데이트를 제거하시겠습니까?"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"애플리케이션 제거"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"업데이트 제거"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g>은(는) 다음 애플리케이션의 일부입니다."</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"이 애플리케이션을 제거합니다."</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"애플리케이션 업데이트가 제거됩니다. 하지만 애플리케이션의 초기 버전을 계속 사용할 수 있습니다."</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"애플리케이션이 초기 버전으로 바뀝니다."</string>
     <string name="uninstalling" msgid="5556217435895938250">"제거 중..."</string>
     <string name="uninstall_done" msgid="2270435276009022874">"제거가 완료되었습니다."</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"제거하지 못했습니다."</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index e004abac..6cc25dcb 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"OK"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"Fant ikke applikasjonen"</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"Fant ikke applikasjonen i listen over installerte applikasjoner."</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"Avinstaller applikasjonen?"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"Avinstaller oppdatering?"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"Avinstaller program"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"Avinstaller oppdatering"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> er en del av følgende program:"</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"Programmet avinstalleres."</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"Applikasjonsoppdateringen vil bli avinstallert. Du kan fortsatt bruke den opprinnelige versjonen av applikasjonen."</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"Programmet erstattes med fabrikkversjonen."</string>
     <string name="uninstalling" msgid="5556217435895938250">"Avinstallerer…"</string>
     <string name="uninstall_done" msgid="2270435276009022874">"Avinstallering fullført"</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"Avinstallasjonen var mislykket"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 8172e27c..a3a1b6be 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"OK"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"Toepassing niet gevonden"</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"De toepassing is niet gevonden in de lijst met geïnstalleerde toepassingen."</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"Toepassing verwijderen?"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"Update verwijderen?"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"Toepassing verwijderen"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"Update verwijderen"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> maakt deel uit van de volgende toepassing:"</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"Deze toepassing wordt verwijderd."</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"De toepassingsupdate wordt verwijderd. U kunt de fabrieksversie van de toepassing nog steeds gebruiken."</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"De toepassing wordt vervangen door de fabrieksversie."</string>
     <string name="uninstalling" msgid="5556217435895938250">"Verwijderen..."</string>
     <string name="uninstall_done" msgid="2270435276009022874">"Verwijdering voltooid"</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"Verwijderen is mislukt"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a531ee6f..a11f0602 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"OK"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"Nie znaleziono aplikacji"</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"Nie znaleziono aplikacji na liście zainstalowanych aplikacji."</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"Czy odinstalować aplikację?"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"Czy odinstalować aktualizację?"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"Odinstaluj aplikację"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"Odinstaluj aktualizację"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> jest częścią następującej aplikacji:"</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"Ta aplikacja zostanie odinstalowana."</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"Aktualizacja aplikacji zostanie odinstalowana. Nadal możesz używać fabrycznej wersji tej aplikacji."</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"Aplikacja zostanie zastąpiona wersją fabryczną."</string>
     <string name="uninstalling" msgid="5556217435895938250">"Odinstalowywanie..."</string>
     <string name="uninstall_done" msgid="2270435276009022874">"Odinstalowywanie zakończone"</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"Odinstalowanie nie powiodło się"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 8da956e2..a6427d07 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"OK"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"Aplicação não encontrada"</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"Não foi possível localizar a aplicação na lista de aplicações instaladas."</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"Desinstalar a aplicação?"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"Desinstalar actualização?"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"Desinstalar aplicação"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"Desinstalar actualização"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> faz parte da seguinte aplicação:"</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"Esta aplicação será desinstalada."</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"A actualização da aplicação será desinstalada. Ainda pode utilizar a versão de origem da aplicação."</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"A aplicação será substituída pela versão de fábrica."</string>
     <string name="uninstalling" msgid="5556217435895938250">"A desinstalar..."</string>
     <string name="uninstall_done" msgid="2270435276009022874">"Desinstalação concluída"</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"Desinstalação sem sucesso"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 24d81dff..469fcb08 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"OK"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"Aplicativo não encontrado"</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"O aplicativo não foi encontrado na lista de aplicativos instalados."</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"Desinstalar aplicativo?"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"Desinstalar atualização?"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"Desinstalar aplicativo"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"Desinstalar atualização"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> é parte do seguinte aplicativo:"</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"Este aplicativo será desinstalado."</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"A atualização do aplicativo será desinstalada. Você ainda poderá usar a versão de fábrica do aplicativo."</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"O aplicativo será substituído pela versão de fábrica."</string>
     <string name="uninstalling" msgid="5556217435895938250">"Desinstalando..."</string>
     <string name="uninstall_done" msgid="2270435276009022874">"Desinstalação concluída"</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"Falha na desinstalação"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 34368857..0aeb53b2 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"ОК"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"Приложение не найдено"</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"Приложение не было найдено в списке установленных приложений."</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"Удалить приложение?"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"Удалить обновление?"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"Удалить приложение"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"Удалить обновление"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> является частью следующего приложения:"</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"Приложение будет удалено"</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"Обновление приложения будет удалено. Вы и далее сможете использовать версию приложения, установленную на заводе-изготовителе."</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"Будет восстановлена исходная версия приложения."</string>
     <string name="uninstalling" msgid="5556217435895938250">"Удаление..."</string>
     <string name="uninstall_done" msgid="2270435276009022874">"Удаление завершено"</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"Ошибка при удалении"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index bf0025ae..b7f02151 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"OK"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"Programmet hittades inte"</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"Programmet hittades inte i listan över installerade program."</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"Avinstallera program?"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"Vill du avinstallera uppdateringen?"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"Avinstallera programmet"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"Avinstallera uppdateringen"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> är en del av följande program:"</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"Det här programmet avinstalleras."</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"Programuppdateringen avinstalleras. Du kan fortfarande använda fabriksversionen av programmet."</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"Programmet ersätts av fabriksversionen."</string>
     <string name="uninstalling" msgid="5556217435895938250">"Avinstallerar…"</string>
     <string name="uninstall_done" msgid="2270435276009022874">"Avinstallationen slutförd"</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"Det gick inte att avinstallera"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 2f47a3c5..4beaf4ea 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"Tamam"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"Uygulama bulunamadı"</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"Uygulama yüklü uygulamalar listesinde bulunamadı."</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"Uygulama kaldırılsın mı?"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"Güncelleme kaldırılsın mı?"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"Uygulamayı Kaldır"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"Güncellemeyi Kaldır"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g>, şu uygulamanın bir parçasıdır:"</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"Bu uygulama kaldırılacak."</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"Uygulama güncellemesi kaldırılacak. Uygulamanın fabrika sürümünü hala kullanabilirsiniz."</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"Uygulama, fabrika sürümüyle değiştirilecek."</string>
     <string name="uninstalling" msgid="5556217435895938250">"Kaldırılıyor…"</string>
     <string name="uninstall_done" msgid="2270435276009022874">"Yüklemeyi kaldırma tamamlandı"</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"Yüklemeyi kaldırma işlemi başarısız"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 9b2b492a..d8c0b4b7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"确定"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"找不到应用程序"</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"在已安装应用程序的列表中找不到该应用程序。"</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"是否卸载应用程序？"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"是否卸载更新？"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"卸载应用程序"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"卸载更新"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g>属于以下应用程序："</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"将卸载此应用程序。"</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"此时将卸载该应用程序更新。仍可使用该应用程序的出厂版。"</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"该应用程序会替换成出厂版本。"</string>
     <string name="uninstalling" msgid="5556217435895938250">"正在卸载..."</string>
     <string name="uninstall_done" msgid="2270435276009022874">"卸载完成"</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"卸载失败"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 59d281c2..89d7e544 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -41,10 +41,11 @@
     <string name="dlg_ok" msgid="6944357727705699232">"確定"</string>
     <string name="app_not_found_dlg_title" msgid="1510267643973600726">"找不到應用程式"</string>
     <string name="app_not_found_dlg_text" msgid="754013198108180241">"已安裝的應用程式清單中沒有此應用程式。"</string>
-    <string name="uninstall_application_question" msgid="7290302854905395978">"要解除安裝應用程式嗎？"</string>
-    <string name="uninstall_update_question" msgid="2600765438050721390">"要解除安裝更新嗎？"</string>
+    <string name="uninstall_application_title" msgid="3783979083504504759">"解除安裝應用程式"</string>
+    <string name="uninstall_update_title" msgid="4347305704874439105">"解除安裝更新"</string>
+    <string name="uninstall_activity_text" msgid="7713436193470955261">"「<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g>」隸屬於下列應用程式："</string>
     <string name="uninstall_application_text" msgid="3730249522678487101">"將會解除安裝此應用程式。"</string>
-    <string name="uninstall_update_text" msgid="6695211142526505726">"無法安裝應用程式更新，您可以繼續使用應用程式的出廠版本。"</string>
+    <string name="uninstall_update_text" msgid="1588440065985786844">"此應用程式將會恢復原廠設定。"</string>
     <string name="uninstalling" msgid="5556217435895938250">"解除安裝中..."</string>
     <string name="uninstall_done" msgid="2270435276009022874">"解除安裝完成"</string>
     <string name="uninstall_failed" msgid="5725854598594371845">"解除安裝失敗"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 618ca1fc..d6bc6d47 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -44,10 +44,11 @@
     <string name="app_not_found_dlg_title">Application not found</string>
     <string name="app_not_found_dlg_text"> The application was not
 found in the list of installed applications.</string>
-    <string name="uninstall_application_question">Uninstall application?</string>
-    <string name="uninstall_update_question">Uninstall update?</string>
+    <string name="uninstall_application_title">Uninstall Application</string>
+    <string name="uninstall_update_title">Uninstall Update</string>
+    <string name="uninstall_activity_text"><xliff:g id="activity_name">%1$s</xliff:g> is part of the following application:</string>
     <string name="uninstall_application_text">This application will be uninstalled.</string>
-    <string name="uninstall_update_text">The application update will be uninstalled. You can still use the factory version of the application.</string>
+    <string name="uninstall_update_text">The application will be replaced with the factory version.</string>
     <string name="uninstalling">Uninstalling\u2026</string>
     <string name="uninstall_done">Uninstall finished</string>
     <string name="uninstall_failed">Uninstall not successful</string>