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

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

Issue 2499483002: MD Settings: Internet: Allow Shared Proxies (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
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 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after
1030 </message> 1030 </message>
1031 <message name="IDS_SETTINGS_INTERNET_NETWORK_SHARED" desc="Settings > Intern et > Netwok details: Text to show when a network is shared."> 1031 <message name="IDS_SETTINGS_INTERNET_NETWORK_SHARED" desc="Settings > Intern et > Netwok details: Text to show when a network is shared.">
1032 This network is shared with other users. 1032 This network is shared with other users.
1033 </message> 1033 </message>
1034 <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."> 1034 <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.">
1035 The network proxy is controlled by an extension. 1035 The network proxy is controlled by an extension.
1036 </message> 1036 </message>
1037 <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."> 1037 <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.">
1038 This proxy is enforced by your administrator. 1038 This proxy is enforced by your administrator.
1039 </message> 1039 </message>
1040 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED" desc="Setti ngs > Internet > Netwok details: Text next to the checkbox for allowing proxy se ttings for shared networks.">
michaelpg 2016/11/15 22:22:04 Same (Netwok => Network)
stevenjb 2016/11/17 01:43:27 Done.
1041 Allow proxies for shared networks
1042 </message>
1043 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED_WARNING_TITL E" desc="Settings > Internet > Netwok details: Title for warning dialog when cha nging the alow shared proxies setting.">
michaelpg 2016/11/15 22:22:04 alow => allow
stevenjb 2016/11/17 01:43:27 Done.
1044 Confirm change to allow proxies for shared networks
1045 </message>
1046 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED_WARNING_MESS AGE" desc="Settings > Internet > Netwok details: Warning message when changing t he alow shared proxies setting.">
michaelpg 2016/11/15 22:22:04 same
stevenjb 2016/11/17 01:43:27 Done.
1047 Changing this setting will affect all shared networks.
1048 </message>
1040 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_DIRECT" desc="Radio used to tell it to just connect directly, not use a proxy."> 1049 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_DIRECT" desc="Radio used to tell it to just connect directly, not use a proxy.">
1041 Direct Internet connection 1050 Direct Internet connection
1042 </message> 1051 </message>
1043 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_MANUAL" desc="Radio used to tell it to configure manually."> 1052 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_MANUAL" desc="Radio used to tell it to configure manually.">
1044 Manual proxy configuration 1053 Manual proxy configuration
1045 </message> 1054 </message>
1046 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_PAC" desc="Radio to select configuring from a URL."> 1055 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_PAC" desc="Radio to select configuring from a URL.">
1047 Automatic proxy configuration 1056 Automatic proxy configuration
1048 </message> 1057 </message>
1049 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_WPAD" desc="Label fo r the checkbox that controls whether to use an autoconfiguration URL."> 1058 <message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_WPAD" desc="Label fo r the checkbox that controls whether to use an autoconfiguration URL.">
(...skipping 1519 matching lines...) Expand 10 before | Expand all | Expand 10 after
2569 System 2578 System
2570 </message> 2579 </message>
2571 <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."> 2580 <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.">
2572 Use hardware acceleration when available 2581 Use hardware acceleration when available
2573 </message> 2582 </message>
2574 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings."> 2583 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings.">
2575 Change proxy settings 2584 Change proxy settings
2576 </message> 2585 </message>
2577 </if> 2586 </if>
2578 </grit-part> 2587 </grit-part>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698