summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorPauloftheWest <paulofthewest@google.com>2014-08-14 15:39:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-12 23:14:35 +0000
commit841f760fd7345ef2d84b9409c27e36c2365a3de4 (patch)
tree53a36f6b29d765663d797974e843d5a95bf0c819 /res/values
parent3aaf0eb457639b52228143b84d9624bf73d862ea (diff)
parentbc976a017ee162f1227dfb63729c2e002be17bb3 (diff)
downloadpackages_apps_Settings-841f760fd7345ef2d84b9409c27e36c2365a3de4.zip
packages_apps_Settings-841f760fd7345ef2d84b9409c27e36c2365a3de4.tar.gz
packages_apps_Settings-841f760fd7345ef2d84b9409c27e36c2365a3de4.tar.bz2
Merge "Fixed a bug were secure Wi-Fi connections would show unsecured." into lmp-dev
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml6
1 files changed, 0 insertions, 6 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f410357..b71c344 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1628,12 +1628,6 @@
<!-- Substring of wifi status when Wi-Fi Protected Setup (WPS) is available and
string is listed after a wifi_secured_* string-->
<string name="wifi_wps_available_second_item">\u0020(WPS available)</string>
- <!-- Substring of wifi status for wifi with authentication. This version is for when the
- string is first in the list (titlecase in english) -->
- <string name="wifi_secured_first_item">Secured with <xliff:g id="wifi_security_short">%1$s</xliff:g></string>
- <!-- Substring of wifi status for wifi with authentication. This version is for when the
- string is not first in the list (lowercase in english) -->
- <string name="wifi_secured_second_item">, secured with <xliff:g id="wifi_security_short">%1$s</xliff:g></string>
<!-- Message in WriteWifiConfigToNfcDialog when prompted to enter network password [CHAR_LIMIT=40] -->
<string name="wifi_wps_nfc_enter_password">Enter your network password</string>