diff options
| author | Nancy Chen <nancychen@google.com> | 2014-11-12 00:28:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 00:28:17 +0000 |
| commit | 1aace738c89ded4a0a4d2db3afedf19d1ab5aa4c (patch) | |
| tree | d28156def10cd8508d81c1808bbc1aa9fa6eb2a5 | |
| parent | 2c915d575e728f403d299f79e60f4a70a8820796 (diff) | |
| parent | fc322e884a5a358cedc7a98c3de9dd487b4d21d2 (diff) | |
| download | packages_apps_PhoneCommon-1aace738c89ded4a0a4d2db3afedf19d1ab5aa4c.tar.gz packages_apps_PhoneCommon-1aace738c89ded4a0a4d2db3afedf19d1ab5aa4c.tar.bz2 packages_apps_PhoneCommon-1aace738c89ded4a0a4d2db3afedf19d1ab5aa4c.zip | |
am fc322e88: am 15621e00: Merge "String resource edits for PhoneCommon" into lmp-mr1-dev
* commit 'fc322e884a5a358cedc7a98c3de9dd487b4d21d2':
String resource edits for PhoneCommon
| -rw-r--r-- | res/values/strings.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index eb6dbdb..942c59e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -101,7 +101,7 @@ <!-- In-call screen: call failure reason (incorrect username or password) --> <string name="callFailed_invalid_credentials">Incorrect username or password</string> <!-- In-call screen: call failure reason (calling from out of network is not allowed) --> - <string name="callFailed_out_of_network">Called from out-of-network</string> + <string name="callFailed_out_of_network">Out\u2011of\u2011network call</string> <!-- In-call screen: call failure reason (server error) --> <string name="callFailed_server_error">Server error. Try again later.</string> <!-- In-call screen: call failure reason (no signal) --> @@ -113,17 +113,17 @@ <!-- In-call screen: call failure reason (SIM error) --> <string name="callFailed_simError">No SIM or SIM error</string> <!-- In-call screen: call failure reason (out of service) --> - <string name="callFailed_outOfService">Mobile network not available</string> + <string name="callFailed_outOfService">Cellular network not available</string> <!-- In-call screen: call failure reason (call denied because of current FDN setting) --> <string name="callFailed_fdn_only">Outgoing calls are restricted by FDN.</string> <!-- In-call screen: call failure reason (call denied because call barring is on) --> - <string name="callFailed_cb_enabled">You can\'t make outgoing calls while call barring is on.</string> + <string name="callFailed_cb_enabled">Can\'t make outgoing calls while call barring is on.</string> <!-- In-call screen: call failure reason (call denied because domain specific access control is on) --> - <string name="callFailed_dsac_restricted">All calls are restricted by access control.</string> + <string name="callFailed_dsac_restricted">Calls restricted by access control.</string> <!-- In-call screen: call failure reason (Emergency call denied because domain specific access control is on)--> - <string name="callFailed_dsac_restricted_emergency">Emergency calls are restricted by access control.</string> + <string name="callFailed_dsac_restricted_emergency">Emergency calls restricted by access control.</string> <!-- In-call screen: call failure reason (Normal call denied because domain specific access control is on)--> - <string name="callFailed_dsac_restricted_normal">Normal calls are restricted by access control.</string> + <string name="callFailed_dsac_restricted_normal">Normal calls restricted by access control.</string> <!-- In-call screen: call failure reason (Dialed number doesn't exist) --> <string name="callFailed_unobtainable_number">Invalid number</string> <!-- In-call screen: message displayed in an error dialog --> |