diff options
| author | Geoffrey Borggaard <geoffreyb@google.com> | 2013-11-05 18:59:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 18:59:12 -0800 |
| commit | f2f1ad9cddd32dd890054c5d40508c4aaf096f71 (patch) | |
| tree | ecc3f2715451fd0aded49762edd41fbff8777e97 /res | |
| parent | 492c8ef15e7413593b1d008fbd99af6c2565625a (diff) | |
| parent | 12a2c40871e2c9d965b0e9e1dbde5e00709f7b0a (diff) | |
| download | packages_apps_Settings-f2f1ad9cddd32dd890054c5d40508c4aaf096f71.zip packages_apps_Settings-f2f1ad9cddd32dd890054c5d40508c4aaf096f71.tar.gz packages_apps_Settings-f2f1ad9cddd32dd890054c5d40508c4aaf096f71.tar.bz2 | |
am 12a2c408: am 36ddea8c: am 5b7111d0: Merge "Remove line break." into klp-dev
* commit '12a2c40871e2c9d965b0e9e1dbde5e00709f7b0a':
Remove line break.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index a6a1d1a..b9966b1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4725,7 +4725,7 @@ <!-- Text of message to show to users whose administrator has installed a SSL CA Cert. [CHAR LIMIT=NONE] --> <string name="ssl_ca_cert_info_message">This device is managed by:\n<xliff:g id="managing_domain">%s</xliff:g>\n\nYour administrator is capable of monitoring your network activity, including emails, apps, and secure websites.\n\nFor more information, contact your administrator.</string> <!-- Text of warning to show to users that have a SSL CA Cert installed. [CHAR LIMIT=NONE] --> - <string name="ssl_ca_cert_warning_message">A third party is capable of monitoring your network\nactivity, including emails, apps, and secure websites.\n\nA trusted credential installed on your device is making this possible.</string> + <string name="ssl_ca_cert_warning_message">A third party is capable of monitoring your network activity, including emails, apps, and secure websites.\n\nA trusted credential installed on your device is making this possible.</string> <!-- Label on button that will take the user to the Trusted Credentials settings page. [CHAR LIMIT=NONE]--> <string name="ssl_ca_cert_settings_button">Check trusted credentials</string> |