Settings: Internet: I18N

chrome/browser/resources/settings/internet_page/network_proxy.html

Index: chrome/browser/resources/settings/internet_page/network_proxy.html
diff --git a/chrome/browser/resources/settings/internet_page/network_proxy.html b/chrome/browser/resources/settings/internet_page/network_proxy.html
index fa7e498214c01f6ff2753c4983adf8f502217586..8ed3dcbe29329c74a9d0e003b875483e5ae58c2b 100644
--- a/chrome/browser/resources/settings/internet_page/network_proxy.html
+++ b/chrome/browser/resources/settings/internet_page/network_proxy.html
@@ -1,16 +1,16 @@
+<link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.html">
+<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior.html">
+<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_indicator.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/paper-dropdown-menu-light.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input-container.html">
-<link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_indicator.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html">
 <link rel="import" href="internet_shared_css.html">
 <link rel="import" href="network_property_list.html">
-<link rel="import" href="network_proxy_input.html">
 <link rel="import" href="network_proxy_exclusions.html">
+<link rel="import" href="network_proxy_input.html">
 
 <dom-module id="network-proxy">
   <template>
@@ -23,10 +23,6 @@
         margin-bottom: 10px;
       }
 
-      #proxyDiv paper-checkbox {
-        padding: 10px 0;
-      }
-
       #exceptionsDiv {
         padding: 10px 0;
       }
@@ -34,6 +30,10 @@
       #exceptionsDiv network-proxy-exclusions {
         margin: 10px 0;
       }
+
+      #proxyDiv paper-checkbox {
+        padding: 10px 0;
+      }
     </style>
     <!-- Policy indicator -->
     <div class="settings-box first single-column"
@@ -43,13 +43,13 @@
         <cr-policy-network-indicator
             property="[[networkProperties.ProxySettings.Type]]">
         </cr-policy-network-indicator>
-        <div>This proxy is enforced by your administrator.</div>
+        <div>$i18n{networkProxyEnforced}</div>
       </div>
     </div>
-    
+
     <!-- Proxy type dropdown -->
     <div class="settings-box continuation">
-      <div class="start">Connection type</div> 
+      <div class="start">$i18n{networkProxyConnectionType}</div>
       <paper-dropdown-menu-light vertical-align="auto" no-label-float>
         <paper-listbox class="dropdown-content" on-iron-activate="onTypeChange_"
             selected="[[proxy.Type]]" attr-for-selected="value">
@@ -65,7 +65,7 @@
     <!-- Autoconfiguration (PAC) -->
     <div class="settings-box continuation indented"
         hidden$="[[!matches_(proxy.Type, ProxySettingsType.PAC)]]">
-      <div class="start">Autoconfiguration URL:</div>
+      <div class="start">$i18n{networkProxyAutoConfig}</div>
       <paper-input  no-label-float class="flex" value="{{proxy.PAC}}"
           disabled="[[isNetworkPolicyEnforced(
                     networkProperties.ProxySettings.PAC)]]"
@@ -76,7 +76,7 @@
     <!-- Web Proxy Auto Discovery (WPAD) -->
     <div class="settings-box continuation indented"
         hidden$="[[!matches_(proxy.Type, ProxySettingsType.WPAD)]]">
-      <div class="start">Web Proxy Auto Discovery URL:</div>
+      <div class="start">$i18n{networkSectionWpad}</div>
       <div>[[WPAD]]</div>
     </div>
 
@@ -84,41 +84,50 @@
     <div id="proxyDiv" class="settings-box continuation single-column indented"
         hidden$="[[!matches_(proxy.Type, ProxySettingsType.MANUAL)]]">
       <paper-checkbox checked="{{useSameProxy}}">
-        Use the same proxy for all protocols
+        $i18n{networkProxyUseSame}
       </paper-checkbox>
       <div hidden$="[[!useSameProxy]]" class="layout vertical">
-        <network-proxy-input on-proxy-change="onProxyInputChange_"
+        <network-proxy-input 
+            on-proxy-change="onProxyInputChange_"
             editable="[[isPropertyEditable_(editable, networkProperties,
                       'ProxySettings.Manual.HTTPProxy')]]"
-            value="{{proxy.Manual.HTTPProxy}}" label="Proxy">
+            value="{{proxy.Manual.HTTPProxy}}"
+            label="$i18n{networkProxy}">
         </network-proxy-input>
       </div>
       <div hidden$="[[useSameProxy]]" class="layout vertical">
-        <network-proxy-input on-proxy-change="onProxyInputChange_"
+        <network-proxy-input
+            on-proxy-change="onProxyInputChange_"
             editable="[[isPropertyEditable_(editable, networkProperties,
                       'ProxySettings.Manual.HTTPProxy)')]]"
-            value="{{proxy.Manual.HTTPProxy}}" label="HTTP Proxy">
+            value="{{proxy.Manual.HTTPProxy}}"
+            label="$i18n{networkProxyHttp}">
         </network-proxy-input>
         <network-proxy-input
+            on-proxy-change="onProxyInputChange_"
             editable="[[isPropertyEditable_(editable, networkProperties,
                       'ProxySettings.Manual.SecureHTTPProxy)')]]"
             value="{{proxy.Manual.SecureHTTPProxy}}"
-            label="Secure HTTP Proxy" on-proxy-change="onProxyInputChange_">
+            label="$i18n{networkProxyShttp}">
         </network-proxy-input>
-        <network-proxy-input on-proxy-change="onProxyInputChange_"
+        <network-proxy-input
+            on-proxy-change="onProxyInputChange_"
             editable="[[isPropertyEditable_(editable, networkProperties,
                       'ProxySettings.Manual.FTPProxy)')]]"
-            value="{{proxy.Manual.FTPProxy}}" label="FTP Proxy">
+            value="{{proxy.Manual.FTPProxy}}"
+            label="$i18n{networkProxyFtp}">
         </network-proxy-input>
-        <network-proxy-input on-proxy-change="onProxyInputChange_"
+        <network-proxy-input
+            on-proxy-change="onProxyInputChange_"
             editable="[[isPropertyEditable_(editable, networkProperties,
                       'ProxySettings.Manual.SOCKS)')]]"
-            value="{{proxy.Manual.SOCKS}}" label="SOCKS host">
+            value="{{proxy.Manual.SOCKS}}"
+            label="$i18n{networkProxySocks}">
         </network-proxy-input>
       </div>
 
       <div id="exceptionsDiv">
-        <div>Do not use the proxy settings for these hosts and domains:</div>
+        <div>$i18n{networkProxyExceptionList}</div>
         <network-proxy-exclusions on-proxy-change="onProxyExclusionsChange_"
             exclusions="{{proxy.ExcludeDomains}}">
         </network-proxy-exclusions>
@@ -127,7 +136,7 @@
             <input id="proxyExclusion" is="iron-input">
           </paper-input-container>
           <paper-button on-tap="onAddProxyExclusionTap_">
-            Add Exception
+            $i18n{networkProxyAddException}
           </paper-button>
         </div>
       </div>