summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2009-08-27 14:38:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-08-27 14:38:34 -0700
commite0a57efd80363a12478525aafc644d8ef985d406 (patch)
tree3bd0e82d7b0f3f1eb24e02cf5a240397152b277d
parentbdc2ae99dfdafb30b39892adf406fb70dea826fb (diff)
parentd1de20d883725ce98931fbebeef9bed8c340352d (diff)
downloadpackages_apps_Settings-e0a57efd80363a12478525aafc644d8ef985d406.zip
packages_apps_Settings-e0a57efd80363a12478525aafc644d8ef985d406.tar.gz
packages_apps_Settings-e0a57efd80363a12478525aafc644d8ef985d406.tar.bz2
am d1de20d8: Fix strings whose apostrophes were eaten because of the lack of a backslash.
Merge commit 'd1de20d883725ce98931fbebeef9bed8c340352d' * commit 'd1de20d883725ce98931fbebeef9bed8c340352d': Fix strings whose apostrophes were eaten because of the lack of a backslash.
-rw-r--r--res/values/strings.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index adb023c..bd6a078 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1770,7 +1770,7 @@ found in the list of installed applications.</string>
<!-- Description for bluetooth power consumption detail -->
<string name="battery_desc_bluetooth">Battery used by bluetooth</string>
<!-- Suggestion for bluetooth -->
- <string name="battery_sugg_bluetooth_basic">Turn off bluetooth when you aren't using it</string>
+ <string name="battery_sugg_bluetooth_basic">Turn off bluetooth when you aren\'t using it</string>
<!-- Suggestion for bluetooth headset -->
<string name="battery_sugg_bluetooth_headset">Try connecting to a different bluetooth device</string>
@@ -1908,9 +1908,9 @@ found in the list of installed applications.</string>
<string name="vpn_a_name">a VPN name</string>
<!-- Toast message shown when a profile is added -->
- <string name="vpn_profile_added">&#39;%s&#39; is added</string>
+ <string name="vpn_profile_added">\'%s\' is added</string>
<!-- Toast message shown when changes of a profile is saved -->
- <string name="vpn_profile_replaced">Changes are made to &#39;%s&#39;</string>
+ <string name="vpn_profile_replaced">Changes are made to \'%s\'</string>
<!-- Preference title -->
<string name="vpn_user_certificate_title">Set user certificate</string>