From 6a98b9bf58b0715713834d75028b3c21a6d92a43 Mon Sep 17 00:00:00 2001 From: Russell Brenner Date: Fri, 18 Jan 2013 16:36:06 -0800 Subject: [PATCH] Use non-breaking hyphen for "Wi-Fi" Bug: 6632800 Change-Id: I5838a16ffce10ae6df4b2b5fd504b43124b6de3e --- res/values/strings.xml | 138 ++++++++++++++++++++++++------------------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 01a52158e9..e24228e593 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -585,7 +585,7 @@ Wireless & networks - Manage Wi-Fi, Bluetooth, airplane mode, mobile networks, & VPNs + Manage Wi\u2011Fi, Bluetooth, airplane mode, mobile networks, & VPNs Data roaming @@ -1169,7 +1169,7 @@ To see devices, turn wireless display on. - Wireless display is disabled because Wi-Fi is off. + Wireless display is disabled because Wi\u2011Fi is off. Search for displays @@ -1239,23 +1239,23 @@ - Wi-Fi + Wi\u2011Fi - Turn on Wi-Fi + Turn on Wi\u2011Fi - Wi-Fi + Wi\u2011Fi - Wi-Fi settings + Wi\u2011Fi settings - Wi-Fi + Wi\u2011Fi Set up & manage wireless access points - Select Wi-Fi + Select Wi\u2011Fi - Turning Wi-Fi on\u2026 + Turning Wi\u2011Fi on\u2026 - Turning off Wi-Fi\u2026 + Turning off Wi\u2011Fi\u2026 Error @@ -1269,19 +1269,19 @@ Avoid poor connections - Don\'t use a Wi-Fi network unless it has a good Internet connection + Don\'t use a Wi\u2011Fi network unless it has a good Internet connection - Keep Wi-Fi on during sleep + Keep Wi\u2011Fi on during sleep There was a problem changing the setting - Wi-Fi optimization + Wi\u2011Fi optimization - Minimize battery usage when Wi-Fi is on + Minimize battery usage when Wi\u2011Fi is on Add network - Wi-Fi networks + Wi\u2011Fi networks WPS Push Button @@ -1289,7 +1289,7 @@ WPS Pin Entry - Wi-Fi Direct + Wi\u2011Fi Direct Scan @@ -1301,9 +1301,9 @@ Modify network - To see available networks, turn Wi-Fi on. + To see available networks, turn Wi\u2011Fi on. - Searching for Wi-Fi networks\u2026 + Searching for Wi\u2011Fi networks\u2026 Other network\u2026 @@ -1311,23 +1311,23 @@ Automatic setup (WPS) - To complete setup, your tablet needs access to Wi-Fi. After setup, you can switch between mobile data and Wi-Fi. + To complete setup, your tablet needs access to Wi\u2011Fi. After setup, you can switch between mobile data and Wi\u2011Fi. Show advanced options - Wi-Fi Protected Setup + Wi\u2011Fi Protected Setup Starting WPS\u2026 - Press the Wi-Fi Protected Setup button on your router. It may be called \"WPS\" or contain this symbol: + Press the Wi\u2011Fi Protected Setup button on your router. It may be called \"WPS\" or contain this symbol: - Enter pin %1$s on your Wi-Fi router. The setup can take up to two minutes to complete. + Enter pin %1$s on your Wi\u2011Fi router. The setup can take up to two minutes to complete. WPS succeeded. Connecting to the network\u2026 - Connected to Wi-Fi network %s + Connected to Wi\u2011Fi network %s WPS is already in progress and can take up to two minutes to complete @@ -1458,15 +1458,15 @@ WARNING: Until you have an internet connection, the phone won\'t be able to verify that your software is up to date. - The tablet was unable to connect to this Wi-Fi network. + The tablet was unable to connect to this Wi\u2011Fi network. - The phone was unable to connect to this Wi-Fi network. + The phone was unable to connect to this Wi\u2011Fi network. - Advanced Wi-Fi + Advanced Wi\u2011Fi - Wi-Fi frequency band + Wi\u2011Fi frequency band Specify the frequency range of operation @@ -1510,7 +1510,7 @@ - Wi-Fi Direct + Wi\u2011Fi Direct Device information Remember this connection @@ -1542,7 +1542,7 @@ - Portable Wi-Fi hotspot + Portable Wi\u2011Fi hotspot Turning hotspot on\u2026 @@ -1550,17 +1550,17 @@ Portable hotspot %1$s active - Portable Wi-Fi hotspot error + Portable Wi\u2011Fi hotspot error - Set up Wi-Fi hotspot + Set up Wi\u2011Fi hotspot - %1$s %2$s portable Wi-Fi hotspot + %1$s %2$s portable Wi\u2011Fi hotspot AndroidHotspot - Wi-Fi information + Wi\u2011Fi information disableNetwork @@ -1578,16 +1578,16 @@ getConnectionInfo - Wi-Fi API + Wi\u2011Fi API - Wi-Fi status + Wi\u2011Fi status Refresh stats - Wi-Fi state: + Wi\u2011Fi state: Network state: @@ -1636,7 +1636,7 @@ - Wi-Fi config + Wi\u2011Fi config Configured networks @@ -1927,7 +1927,7 @@ Network - Wi-Fi MAC address + Wi\u2011Fi MAC address Bluetooth address @@ -2282,11 +2282,11 @@ My Location - Wi-Fi & mobile network location + Wi\u2011Fi & mobile network location Let apps use Google\'s location service to estimate your location faster. Anonymous location data will be collected and sent to Google. - Location determined by Wi-Fi + Location determined by Wi\u2011Fi GPS satellites @@ -3212,7 +3212,7 @@ GPS on - Wi-Fi + Wi\u2011Fi Awake @@ -3222,9 +3222,9 @@ Device awake time - Wi-Fi on time + Wi\u2011Fi on time - Wi-Fi on time + Wi\u2011Fi on time %1$s" - " %2$s%% @@ -3244,7 +3244,7 @@ Screen - Wi-Fi + Wi\u2011Fi Bluetooth @@ -3265,7 +3265,7 @@ GPS - Wi-Fi running + Wi\u2011Fi running Tablet @@ -3291,7 +3291,7 @@ Screen settings - Wi-Fi settings + Wi\u2011Fi settings Bluetooth settings @@ -3314,9 +3314,9 @@ Reduce the screen brightness and/or screen timeout - Battery used by Wi-Fi + Battery used by Wi\u2011Fi - Turn off Wi-Fi when not using it or when it isn\'t available + Turn off Wi\u2011Fi when not using it or when it isn\'t available Battery used by Bluetooth @@ -3468,10 +3468,10 @@ Power control - Updating Wi-Fi setting + Updating Wi\u2011Fi setting Updating Bluetooth setting - %1$s %2$s + %1$s %2$s on @@ -3481,7 +3481,7 @@ turning off - Wi-Fi + Wi\u2011Fi/string> Bluetooth @@ -3567,7 +3567,7 @@ Back up my data - Back up app data, Wi-Fi passwords, and other settings to Google servers + Back up app data, Wi\u2011Fi passwords, and other settings to Google servers Backup account @@ -3594,7 +3594,7 @@ - Stop backing up your Wi-Fi passwords, bookmarks, other settings, and app data, plus erase all copies on Google servers? + Stop backing up your Wi\u2011Fi passwords, bookmarks, other settings, and app data, plus erase all copies on Google servers? @@ -3639,22 +3639,22 @@ - Wi-Fi setup + Wi\u2011Fi setup - Connect to Wi-Fi network %s + Connect to Wi\u2011Fi network %s - Connecting to Wi-Fi network %s\u2026 + Connecting to Wi\u2011Fi network %s\u2026 - Connected to Wi-Fi network %s + Connected to Wi\u2011Fi network %s @@ -3730,11 +3730,11 @@ - You can\'t configure an EAP Wi-Fi connection during setup. After setup, you can do that in Settings > Wireless & networks. + You can\'t configure an EAP Wi\u2011Fi connection during setup. After setup, you can do that in Settings > Wireless & networks. Connecting can take a few minutes\u2026 - Touch Next to continue with setup.\n\nTouch Back to connect to a different Wi-Fi network. + Touch Next to continue with setup.\n\nTouch Back to connect to a different Wi\u2011Fi network. Select Time Zone @@ -3997,7 +3997,7 @@ Separate 4G usage - Show Wi-Fi usage + Show Wi\u2011Fi usage Show Ethernet usage @@ -4028,10 +4028,10 @@ Set 2G-3G data limit - Set Wi-Fi data limit + Set Wi\u2011Fi data limit - Wi-Fi + Wi\u2011Fi Ethernet @@ -4100,11 +4100,11 @@ Restrict background data? - If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi-Fi network. + If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi\u2011Fi network. - If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi-Fi network.\n\nThis setting affects all users on this tablet. + If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi\u2011Fi network.\n\nThis setting affects all users on this tablet. - If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi-Fi network.\n\nThis setting affects all users on this phone. + If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi\u2011Fi network.\n\nThis setting affects all users on this phone. ^1 ^2\nwarning @@ -4128,13 +4128,13 @@ Mobile hotspots - Select the Wi-Fi networks which are mobile hotspots. Apps can be restricted from using these networks when in the background. Apps may also warn before using these networks for large downloads. + Select the Wi\u2011Fi networks which are mobile hotspots. Apps can be restricted from using these networks when in the background. Apps may also warn before using these networks for large downloads. Mobile networks - Wi-Fi networks + Wi\u2011Fi networks - To select mobile hotspots, turn Wi-Fi on. + To select mobile hotspots, turn Wi\u2011Fi on. Emergency call @@ -4285,7 +4285,7 @@ Add new user - You can share this device with other people by creating additional users. Each user has their own space, which they can customize with their own apps, wallpaper, and so on. Users can also adjust tablet settings like Wi-Fi that affect everyone.\n\nAfter you create a new user, that person needs to go through a setup process.\n\nAny user can accept updated app permissions on behalf of all other users. + You can share this device with other people by creating additional users. Each user has their own space, which they can customize with their own apps, wallpaper, and so on. Users can also adjust tablet settings like Wi\u2011Fi that affect everyone.\n\nAfter you create a new user, that person needs to go through a setup process.\n\nAny user can accept updated app permissions on behalf of all other users. After you create a new user, that person needs to go through a setup process.\n\nAny user can accept updated app permissions on behalf of all other users. -- 2.11.0