diff options
author | Justin Ho <justinho@google.com> | 2011-08-17 14:18:05 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-17 14:18:05 -0700 |
commit | 9403d8b2397cac1cb90e59eab1704a8df377149a (patch) | |
tree | f161be5c1894f9490710b3c52dd9894163f4945a /res | |
parent | b9b2422dee3ec0c412b7950707266ffbe986ea5c (diff) | |
parent | 8c74e4525cfa05d336f74f9e8202e24506089977 (diff) | |
download | packages_apps_Settings-9403d8b2397cac1cb90e59eab1704a8df377149a.tar.gz packages_apps_Settings-9403d8b2397cac1cb90e59eab1704a8df377149a.tar.bz2 packages_apps_Settings-9403d8b2397cac1cb90e59eab1704a8df377149a.zip |
Merge "Part of effort to remove "failure" messaging to end-users. Bug: 5165745"
Diffstat (limited to 'res')
-rw-r--r-- | res/values/arrays.xml | 4 | ||||
-rw-r--r-- | res/values/strings.xml | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index aeda58566..09d94de56 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -351,7 +351,7 @@ <string-array name="wifi_p2p_status"> <item>Connected</item> <item>Invited</item> - <item>Failed</item> + <item>Unsuccessful</item> <item>Available</item> <item>Out of range</item> </string-array> @@ -714,6 +714,6 @@ <!-- Status message when VPN is timeout. --> <item>Timeout</item> <!-- Status message when VPN is failed. --> - <item>Failed</item> + <item>Unsuccessful</item> </string-array> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 4610c35c9..b777fd7d3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -729,7 +729,7 @@ <string name="crypt_keeper_enter_password">Enter your password</string> <!-- Title of the encryption screen when encrypting the device failed --> - <string name="crypt_keeper_failed_title">Encryption failed</string> + <string name="crypt_keeper_failed_title">Encryption unsuccessful</string> <!-- Informational text when encryption fails --> <string name="crypt_keeper_failed_summary" product="tablet"> @@ -1175,7 +1175,7 @@ <!-- Text displayed when WPS setup is in progress [CHAR LIMIT=75] --> <string name="wifi_wps_in_progress">WPS is already in progress and can take tens of seconds to complete</string> <!-- Text displayed when WPS fails to start [CHAR LIMIT=75] --> - <string name="wifi_wps_failed">Failed to start WPS, please try again</string> + <string name="wifi_wps_failed">Couldn\'t start WPS, try again.</string> <!-- Label for the SSID of the network --> <string name="wifi_ssid">Network SSID</string> <!-- Label for the security of the connection --> @@ -1786,9 +1786,9 @@ <!-- SD card eject confirmation dialog --> <string name="dlg_confirm_unmount_text" product="default">If you unmount the SD card, some applications you are using will stop and may be unavailable until you remount the SD card.</string> <!-- SD card eject error dialog title [CHAR LIMIT=30] --> - <string name="dlg_error_unmount_title" product="nosdcard">Unmounting USB storage failed</string> + <string name="dlg_error_unmount_title" product="nosdcard">Couldn\'t unmount USB storage</string> <!-- SD card eject error dialog title --> - <string name="dlg_error_unmount_title" product="default">Unmount SD card failed</string> + <string name="dlg_error_unmount_title" product="default">Couldn\'t unmount SD card</string> <!-- SD card eject error dialog text [CHAR LIMIT=NONE] --> <string name="dlg_error_unmount_text" product="nosdcard">Cannot unmount USB storage. Try again later.</string> <!-- SD card eject error dialog text --> @@ -2348,7 +2348,7 @@ found in the list of installed applications.</string> <!-- Manage applications, title for dialog if clear data fails--> <string name="clear_failed_dlg_title">Clear data</string> <!-- Manage applications, text for dialog if clear data fails--> - <string name="clear_failed_dlg_text">Failed clearing data for application</string> + <string name="clear_failed_dlg_text">Couldn\'t clear data for application.</string> <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. --> <string name="security_settings_desc" product="tablet">This application can access the following on your tablet:</string> <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. --> @@ -2386,7 +2386,7 @@ found in the list of installed applications.</string> <!-- Manage applications, text for dialog when moving an app --> <string name="move_app_failed_dlg_title">Move application</string> <!-- Manage applications, text for dialog moving an app --> - <string name="move_app_failed_dlg_text">Failed to move application. <xliff:g id="reason">%1$s</xliff:g></string> + <string name="move_app_failed_dlg_text">Couldn\'t move application. <xliff:g id="reason">%1$s</xliff:g></string> <!-- Manage applications, application installation location title --> <string name="app_install_location_title">Preferred install location</string> <!-- Manage applications. application installation location summary --> |