Merge "Edits to strings to meet UI text standards. Bugs: 5162668, 5162667, 5163232"

1 files changed, 31 insertions, 32 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7deb8f7..694ba9b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -19,13 +19,13 @@
     <string name="install">Install</string>
     <string name="done">Done</string>
     <!-- TODO REMOVE LATER -->
-    <string name="security_settings_desc">Allow this application to:</string>
+    <string name="security_settings_desc">Allow this app to:</string>
     <string name="cancel">Cancel</string>
     <string name="unknown">Unknown</string>
     <string name="installing">Installing\u2026</string>
-    <string name="install_done">Application installed</string>
-    <string name="install_confirm_question">Do you want to install this application?</string>
-    <string name="install_failed">Application not installed</string>
+    <string name="install_done">App installed.</string>
+    <string name="install_confirm_question">Do you want to install this app?</string>
+    <string name="install_failed">App not installed.</string>
     <!-- Reason displayed when installation fails because the installation package itself is invalid
         in some way (e.g., corrupt) [CHAR LIMIT=100] -->
     <string name="install_failed_invalid_apk">The package appears to be corrupt.</string>
@@ -39,12 +39,12 @@
         Android.</string>
     <!-- Reason displayed when installation fails because the package specifies it is compatible
         only with a CPU that the current tablet doesn't have. [CHAR LIMIT=100] -->
-    <string name="install_failed_cpu_abi_incompatible" product="tablet">This application is not
-        compatible with this tablet\'s CPU.</string>
+    <string name="install_failed_cpu_abi_incompatible" product="tablet">This app isn\'t
+        compatible with your tablet.</string>
     <!-- Reason displayed when installation fails because the package specifies it is compatible
         only with a CPU that the current phone doesn't have. [CHAR LIMIT=100] -->
-    <string name="install_failed_cpu_abi_incompatible" product="default">This application is not
-        compatible with this phone\'s CPU.</string>
+    <string name="install_failed_cpu_abi_incompatible" product="default">This app isn\'t
+        compatible with your phone.</string>
     <!-- Reason displayed when installation fails because the package was deleted during the
         installation process. [CHAR LIMIT=100] -->
     <string name="install_failed_file_not_found">The package specified was deleted before
@@ -56,55 +56,54 @@
     <!-- Reason displayed when installation fails because the package could not be verified
         before the internal system timer expired. [CHAR LIMIT=100] -->
     <string name="install_failed_verify_timeout">A timeout occurred while trying to verify this
-        package. Please try to install it again later.</string>
+        package. Try to install it again later.</string>
     <!-- Message presented when an application could not be installed on the tablet for some reason. [CHAR LIMIT=100] -->
-    <string name="install_failed_msg" product="tablet"><xliff:g id="app_name">%1$s</xliff:g> could not be installed on this tablet.</string>
+    <string name="install_failed_msg" product="tablet"><xliff:g id="app_name">%1$s</xliff:g> couldn\'t be installed on your tablet.</string>
     <!-- Message presented when an application could not be installed on the phone for some reason. [CHAR LIMIT=100] -->
-    <string name="install_failed_msg" product="default"><xliff:g id="app_name">%1$s</xliff:g> could not be installed on this phone.</string>
+    <string name="install_failed_msg" product="default"><xliff:g id="app_name">%1$s</xliff:g> couldn\'t be installed on your phone.</string>
     <string name="launch">Open</string>
     <string name="unknown_apps_dlg_title">Install blocked</string>
     <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
-    <string name="unknown_apps_dlg_text" product="tablet">For security, your tablet is set to block installation of applications not obtained from Android Market.</string>
+    <string name="unknown_apps_dlg_text" product="tablet">For security, your tablet is set to block installation of apps not obtained from Android Market.</string>
     <!-- Message presented in a dialog box when a package is requested to be installed, but the "Allow unknown applications" checkbox is not enabled. [CHAR LIMIT=100] -->
-    <string name="unknown_apps_dlg_text" product="default">For security, your phone is set to block installation of applications not obtained from Android Market.</string>
+    <string name="unknown_apps_dlg_text" product="default">For security, your phone is set to block installation of apps not obtained from Android Market.</string>
     <string name="ok">OK</string>
     <string name="settings">Settings</string>
     <!-- Title of dialog asking user if they would allow an application to be an install source. -->
-    <string name="allow_source_dlg_title">Allow new source for apps?</string>
+    <string name="allow_source_dlg_title">New source for apps</string>
     <!-- Message of dialog asking user if they would allow an application to be an install source. -->
     <string name="allow_source_dlg_text"><xliff:g id="app_name">%1$s</xliff:g> wants to install other apps.\n\nAllow
         this now and in the future?</string>
-    <string name="manage_applications">Manage applications</string>
-    <string name="dlg_app_replacement_title">Replace application</string>
-    <string name="dlg_app_replacement_statement">The application you are installing will replace another application.\n\nAll previous user data will be saved.</string>
+    <string name="manage_applications">Manage apps</string>
+    <string name="dlg_app_replacement_title">Replace app?</string>
+    <string name="dlg_app_replacement_statement">The app you\'re installing will replace another app.\n\nAll your previous user data will be saved.</string>
     <!-- Dialog attributes when replacing system app -->
-    <string name="dlg_sys_app_replacement_statement">This is a system application. Do you still want to replace it?\n\nAll previous user data will be saved.</string>
+    <string name="dlg_sys_app_replacement_statement">This is a system app.\n\nAll your previous user data will be saved.</string>
     <string name="out_of_space_dlg_title">Out of space</string>
-    <string name="out_of_space_dlg_text"><xliff:g id="app_name">%1$s</xliff:g> could not be installed. Free up some space and try again.</string>
+    <string name="out_of_space_dlg_text"><xliff:g id="app_name">%1$s</xliff:g> couldn\'t be installed. Free up some space and try again.</string>
     <!-- strings related to uninstall activity -->
     <string name="dlg_ok">OK</string>
-    <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_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 will be replaced with the factory version.</string>
+    <string name="app_not_found_dlg_title">App not found</string>
+    <string name="app_not_found_dlg_text"> The app wasn\'t found in the list of installed apps.</string>
+    <string name="uninstall_application_title">Uninstall app</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 app:</string>
+    <string name="uninstall_application_text">Do you want to uninstall this app?</string>
+    <string name="uninstall_update_text">Do you want to replace this app 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>
+    <string name="uninstall_done">Uninstall finished.</string>
+    <string name="uninstall_failed">Uninstall unsuccessful.</string>
     <!-- String presented to the user when uninstalling a package failed because the target package
         is a current device administrator [CHAR LIMIT=80] -->
-    <string name="uninstall_failed_device_policy_manager">Cannot uninstall: this package is an
+    <string name="uninstall_failed_device_policy_manager">Can\'t uninstall because this package is an
         active device administrator.</string>
     <!-- String on a button that leads to the "device administrator" configuration setting where a
         user will be able to disable the device administrator in order to uninstall
         it. [CHAR LIMIT=50] -->
     <string name="manage_device_administrators">Manage device administrators</string>
-    <string name="uninstall_failed_msg"><xliff:g id="app_name">%1$s</xliff:g> could not be uninstalled</string>
+    <string name="uninstall_failed_msg"><xliff:g id="app_name">%1$s</xliff:g> couldn\'t be uninstalled.</string>
 
     <!-- Dialog attributes to indicate parse errors -->
     <string name="Parse_error_dlg_title">Parse error</string>
-    <string name="Parse_error_dlg_text">There is a problem parsing the package.</string>
+    <string name="Parse_error_dlg_text">There was a problem parsing the package.</string>
 </resources>