summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sean Cotter <cotter@google.com> 2011-08-05 18:53:41 -0700
committer Sean Cotter <cotter@google.com> 2011-08-09 16:49:32 -0700
commit270f6a654e34f19e74692e3946cf8ddbe03fd71d (patch)
treed7afb7306dba58f9da34d9913e6d7cd009b8f0f8
parent1a4a7364571d70f814037389a3ce69c133666407 (diff)
Improve language for dialogs with force close button, including removing Sorry! title and rephrasing messages.
Bug: 5064440 Change-Id: I9f74883d94e094fbb6273fcb4a24707b1918b19d
-rwxr-xr-xcore/res/res/values/strings.xml19
1 files changed, 9 insertions, 10 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index afd890822308..26606ed3785a 100755
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -2460,25 +2460,24 @@
activity chooser. See the "Select an action" title. -->
<string name="noApplications">No applications can perform this action.</string>
<!-- Title of the alert when an application has crashed. -->
- <string name="aerr_title">Sorry!</string>
+ <string name="aerr_title"></string>
<!-- Text of the alert that is displayed when an application has crashed. -->
- <string name="aerr_application">The application <xliff:g id="application">%1$s</xliff:g>
- (process <xliff:g id="process">%2$s</xliff:g>) has stopped unexpectedly. Please try again.</string>
+ <string name="aerr_application"><xliff:g id="application">%1$s</xliff:g> has stopped by mistake.</string>
<!-- Text of the alert that is displayed when an application has crashed. -->
<string name="aerr_process">The process <xliff:g id="process">%1$s</xliff:g> has
- stopped unexpectedly. Please try again.</string>
+ stopped by mistake.</string>
<!-- Title of the alert when an application is not responding. -->
- <string name="anr_title">Sorry!</string>
+ <string name="anr_title"></string>
<!-- Text of the alert that is displayed when an application is not responding. -->
- <string name="anr_activity_application">Activity <xliff:g id="activity">%1$s</xliff:g> (in application <xliff:g id="application">%2$s</xliff:g>) is not responding.</string>
+ <string name="anr_activity_application"><xliff:g id="application">%2$s</xliff:g> is not responding.\n\nWould you like to close it?</string>
<!-- Text of the alert that is displayed when an application is not responding. -->
- <string name="anr_activity_process">Activity <xliff:g id="activity">%1$s</xliff:g> (in process <xliff:g id="process">%2$s</xliff:g>) is not responding.</string>
+ <string name="anr_activity_process">Activity <xliff:g id="activity">%1$s</xliff:g> is not responding.\n\nWould you like to close it?</string>
<!-- Text of the alert that is displayed when an application is not responding. -->
- <string name="anr_application_process">Application <xliff:g id="application">%1$s</xliff:g> (in process <xliff:g id="process">%2$s</xliff:g>) is not responding.</string>
+ <string name="anr_application_process"><xliff:g id="application">%1$s</xliff:g> is not responding. Would you like to close it?</string>
<!-- Text of the alert that is displayed when an application is not responding. -->
- <string name="anr_process">Process <xliff:g id="process">%1$s</xliff:g> is not responding.</string>
+ <string name="anr_process">Process <xliff:g id="process">%1$s</xliff:g> is not responding.\n\nWould you like to close it?</string>
<!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
- <string name="force_close">Force close</string>
+ <string name="force_close">OK</string>
<!-- Button allowing the user to send a bug report for application which has encountered an error. -->
<string name="report">Report</string>
<!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->