diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2015-06-06 01:58:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-06 01:58:20 +0000 |
| commit | 547089c3768f3266a1f18e6d1f42a81aeb0b3bcf (patch) | |
| tree | 0887a4dc7caabb349d444625f14698ab84466517 /res | |
| parent | e35df2ff3b8188bdf710f84390f0fc60ec329ab5 (diff) | |
| parent | 2816e4e3e0431b64bc49c2620729326914d126d7 (diff) | |
| download | packages_apps_Settings-547089c3768f3266a1f18e6d1f42a81aeb0b3bcf.zip packages_apps_Settings-547089c3768f3266a1f18e6d1f42a81aeb0b3bcf.tar.gz packages_apps_Settings-547089c3768f3266a1f18e6d1f42a81aeb0b3bcf.tar.bz2 | |
Merge "Fix wifi network strings shown in Settings." into mnc-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 9d10031..1db6770 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1346,9 +1346,11 @@ <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] --> <string name="wifi_display_operating_channel" translatable="false">Operating channel</string> <!-- Wifi 2.4GHz is used as an universal itendifier for 2.4GHz band --> - <string name="wifi_band_24ghz" translatable="false">2.4GHz</string> + <string name="wifi_band_24ghz">2.4 GHz</string> <!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band --> - <string name="wifi_band_5ghz" translatable="false">5GHz</string> + <string name="wifi_band_5ghz">5 GHz</string> + <!-- Link speed on Wifi Status screen --> + <string name="link_speed">%1$d Mbps</string> <!-- Wifi Alert message when tapping on a preference for a config locked down by device owner. [CHAR LIMIT=200] --> <string name="wifi_alert_lockdown_by_device_owner"><xliff:g id="app_name">%1$s</xliff:g> manages your device and has disabled modifying and deleting this Wi-Fi network. For more information, contact your administrator.</string> |