am 58f53f9c: am c85359ef: am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev

* commit '58f53f9c351329bf51bb548409c047e024d94fc4':
  Add PAC UI to Wi-Fi Settings
This commit is contained in:
Jason Monk
2013-11-05 18:59:11 -08:00
committed by Android Git Automerger
3 changed files with 16 additions and 0 deletions

View File

@@ -436,6 +436,9 @@
<!-- HTTP proxy settings. Warning message about limited application support [CHAR LIMIT=100]-->
<string name="proxy_warning_limited_support">The HTTP proxy is used by the browser but may not be used by the other apps.</string>
<!-- HTTP proxy settings. Title for Proxy-Auto Config URL. [CHAR LIMIT=NONE]-->
<string name="proxy_url">"PAC URL: "</string>
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="radio_info_signal_location_label">Location:</string>
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->