Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(199)

Side by Side Diff: chrome/app/settings_strings.grdp

Issue 2467123003: Settings: Internet: Update proxy controlled indicator and fields. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/settings/internet_page/compiled_resources2.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Settings-specific strings (included from generated_resources.grd). --> 2 <!-- Settings-specific strings (included from generated_resources.grd). -->
3 <grit-part> 3 <grit-part>
4 <!-- About Page --> 4 <!-- About Page -->
5 <if expr="chromeos"> 5 <if expr="chromeos">
6 <message name="IDS_SETTINGS_ABOUT_PAGE_DETAILED_BUILD_INFO" desc="Label desc ribing the section that shows detailed information about the current Chrome buil d."> 6 <message name="IDS_SETTINGS_ABOUT_PAGE_DETAILED_BUILD_INFO" desc="Label desc ribing the section that shows detailed information about the current Chrome buil d.">
7 Detailed build information 7 Detailed build information
8 </message> 8 </message>
9 <message name="IDS_SETTINGS_ABOUT_PAGE_ARC_VERSION" desc="Label for ARC vers ion"> 9 <message name="IDS_SETTINGS_ABOUT_PAGE_ARC_VERSION" desc="Label for ARC vers ion">
10 ARC Version 10 ARC Version
(...skipping 1007 matching lines...) Expand 10 before | Expand all | Expand 10 after
1018 </message> 1018 </message>
1019 <message name="IDS_SETTINGS_INTERNET_NETWORK_SECTION_PROXY" desc="Settings > Internet > Network details: Proxy section label."> 1019 <message name="IDS_SETTINGS_INTERNET_NETWORK_SECTION_PROXY" desc="Settings > Internet > Network details: Proxy section label.">
1020 Proxy 1020 Proxy
1021 </message> 1021 </message>
1022 <message name="IDS_SETTINGS_INTERNET_NETWORK_SECTION_WPAD" desc="Settings > Internet > Network details: Web Proxy Auto Discovery (WPAD) section label."> 1022 <message name="IDS_SETTINGS_INTERNET_NETWORK_SECTION_WPAD" desc="Settings > Internet > Network details: Web Proxy Auto Discovery (WPAD) section label.">
1023 Web Proxy Auto Discovery URL: 1023 Web Proxy Auto Discovery URL:
1024 </message> 1024 </message>
1025 <message name="IDS_SETTINGS_INTERNET_NETWORK_SHARED" desc="Settings > Intern et > Netwok details: Text to show when a network is shared."> 1025 <message name="IDS_SETTINGS_INTERNET_NETWORK_SHARED" desc="Settings > Intern et > Netwok details: Text to show when a network is shared.">
1026 This network is shared with other users. 1026 This network is shared with other users.
1027 </message> 1027 </message>
1028 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_ENFORCED" desc="Settings > Internet > Netwok details: Text to show when a network proxy is policy enforce d."> 1028 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONTROLLED_EXTENSION" des c="Settings > Internet > Netwok details: Text to show when a network proxy is co ntrolled by an extension.">
michaelpg 2016/11/03 00:17:34 https://memegen.googleplex.com/5899020588810240 he
stevenjb 2016/11/09 22:23:38 ?
michaelpg 2016/11/12 00:22:23 I was suggesting you change the various instances
1029 The network proxy is controlled by an extension.
1030 </message>
1031 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_ENFORCED_POLICY" desc="Se ttings > Internet > Netwok details: Text to show when a network proxy is policy enforced.">
1029 This proxy is enforced by your administrator. 1032 This proxy is enforced by your administrator.
1030 </message> 1033 </message>
1034 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_DIRECT" desc="Radio used to tell it to just connect directly, not use a proxy.">
1035 Direct Internet connection
1036 </message>
1037 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_MANUAL" desc="Radio used to tell it to configure manually.">
1038 Manual proxy configuration
1039 </message>
1040 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_PAC" desc="Radio to select configuring from a URL.">
1041 Automatic proxy configuration
1042 </message>
1043 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_WPAD" desc="Label fo r the checkbox that controls whether to use an autoconfiguration URL.">
1044 Web proxy autodiscovery
1045 </message>
1031 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_USE_SAME" desc="Settings > Internet > Netwok details: Label for checkbox indicating that a network proxy uses the same value for all protocols."> 1046 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_USE_SAME" desc="Settings > Internet > Netwok details: Label for checkbox indicating that a network proxy uses the same value for all protocols.">
1032 Use the same proxy for all protocols 1047 Use the same proxy for all protocols
1033 </message> 1048 </message>
1034 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_EXCEPTION_LIST" desc="Set tings > Internet > Netwok details: Label for list of network proxy exceptions."> 1049 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_EXCEPTION_LIST" desc="Set tings > Internet > Netwok details: Label for list of network proxy exceptions.">
1035 Do not use the proxy settings for these hosts and domains: 1050 Do not use the proxy settings for these hosts and domains:
1036 </message> 1051 </message>
1037 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_ADD_EXCEPTION" desc="Sett ings > Internet > Netwok details: Label for button to add a network proxy except ion."> 1052 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_ADD_EXCEPTION" desc="Sett ings > Internet > Netwok details: Label for button to add a network proxy except ion.">
1038 Add exception 1053 Add exception
1039 </message> 1054 </message>
1040 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONNECTION_TYPE" desc="Se ttings > Internet > Netwok details: Label for proxy connection type dropdown."> 1055 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONNECTION_TYPE" desc="Se ttings > Internet > Netwok details: Label for proxy connection type dropdown.">
(...skipping 1463 matching lines...) Expand 10 before | Expand all | Expand 10 after
2504 System 2519 System
2505 </message> 2520 </message>
2506 <message name="IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL" desc="Label for the checkbox that forces Chrome to render via hardware acceleration (GPU) wh en available."> 2521 <message name="IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL" desc="Label for the checkbox that forces Chrome to render via hardware acceleration (GPU) wh en available.">
2507 Use hardware acceleration when available 2522 Use hardware acceleration when available
2508 </message> 2523 </message>
2509 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings."> 2524 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings.">
2510 Change proxy settings 2525 Change proxy settings
2511 </message> 2526 </message>
2512 </if> 2527 </if>
2513 </grit-part> 2528 </grit-part>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/internet_page/compiled_resources2.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698