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

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

Issue 11272026: Remove the managed banner from the Chrome settings UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('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 <!-- ChromeOS-specific strings (included from generated_resources.grd). 2 <!-- ChromeOS-specific strings (included from generated_resources.grd).
3 Everything in this file is wrapped in <if expr="pp_ifdef('chromeos')">. --> 3 Everything in this file is wrapped in <if expr="pp_ifdef('chromeos')">. -->
4 <grit-part> 4 <grit-part>
5 <!-- Idle Logout Dialog Strings --> 5 <!-- Idle Logout Dialog Strings -->
6 <message name="IDS_IDLE_LOGOUT_TITLE" desc="Dialog title for the idle logout d ialog"> 6 <message name="IDS_IDLE_LOGOUT_TITLE" desc="Dialog title for the idle logout d ialog">
7 Are you still there? 7 Are you still there?
8 </message> 8 </message>
9 <message name="IDS_IDLE_LOGOUT_WARNING_RESTART" desc="Restart label for the id le logout dialog"> 9 <message name="IDS_IDLE_LOGOUT_WARNING_RESTART" desc="Restart label for the id le logout dialog">
10 This computer will reset in <ph name="LOGOUT_TIME_LEFT">$1<ex>20</ex></ph> s econds. 10 This computer will reset in <ph name="LOGOUT_TIME_LEFT">$1<ex>20</ex></ph> s econds.
(...skipping 1147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 </message> 1158 </message>
1159 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_GATEWAY" desc="In setting s Internet options, the label for gateway."> 1159 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_GATEWAY" desc="In setting s Internet options, the label for gateway.">
1160 Gateway: 1160 Gateway:
1161 </message> 1161 </message>
1162 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_DNSSERVER" desc="In setti ngs Internet options, the label dns server."> 1162 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_DNSSERVER" desc="In setti ngs Internet options, the label dns server.">
1163 DNS server: 1163 DNS server:
1164 </message> 1164 </message>
1165 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CHANGE_PROXY_BUTTON" desc ="In settings Internet options, the button to configure proxy settings."> 1165 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CHANGE_PROXY_BUTTON" desc ="In settings Internet options, the button to configure proxy settings.">
1166 Change proxy settings... 1166 Change proxy settings...
1167 </message> 1167 </message>
1168 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_ENABLE_SHARED_PROXIES_HIN T" desc="In settings Internet options, when proxy can't be changed, the hint for user to do so by enabling the setting for IDS_OPTIONS_SETTINGS_USE_SHARED_PROXI ES."> 1168 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_POLICY" desc="In se ttings Internet options, banner displayed when the proxy settings are enforced b y a policy.">
1169 The proxy is enforced by your administrator.
1170 </message>
1171 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_EXTENSION" desc="In settings Internet options, banner displayed when the proxy settings are enforce d by an extension.">
1172 The proxy is enforced by an extension.
1173 </message>
1174 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_OTHER_PRECEDE" desc ="In settings Internet options, banner displayed when the proxy settings cannot be changed as they are enforced by a higher-precedence source.">
1175 The proxy cannot be modified by the user.
1176 </message>
1177 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_ENABLE_SHARED_HINT" desc="In settings Internet options, banner displayed when the proxy settings ca nnot be changed as the user needs to enable the setting for IDS_OPTIONS_SETTINGS _USE_SHARED_PROXIES first.">
1169 To change proxy, enable "<ph name="USE_SHARED_PROXIES">$1<ex>Allow proxies f or shared networks</ex></ph>" setting. 1178 To change proxy, enable "<ph name="USE_SHARED_PROXIES">$1<ex>Allow proxies f or shared networks</ex></ph>" setting.
1170 </message> 1179 </message>
1171 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_HARDWARE_ADDRESS" desc="I n settings Internet options, the label hardware address."> 1180 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_HARDWARE_ADDRESS" desc="I n settings Internet options, the label hardware address.">
1172 Hardware address: 1181 Hardware address:
1173 </message> 1182 </message>
1174 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_NONE" desc="In s ettings Internet options, a string specifying security none."> 1183 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_NONE" desc="In s ettings Internet options, a string specifying security none.">
1175 None 1184 None
1176 </message> 1185 </message>
1177 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_WEP" desc="In se ttings Internet options, a string specifying security WEP."> 1186 <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_WEP" desc="In se ttings Internet options, a string specifying security WEP.">
1178 WEP 1187 WEP
(...skipping 2247 matching lines...) Expand 10 before | Expand all | Expand 10 after
3426 <message name="IDS_LOGIN_MANAGED_BY_STATUS_NETWORK_ERROR" desc="Text for the n etwork error status in 'Managed by DOMAIN' label on login screen."> 3435 <message name="IDS_LOGIN_MANAGED_BY_STATUS_NETWORK_ERROR" desc="Text for the n etwork error status in 'Managed by DOMAIN' label on login screen.">
3427 Network error while communicating with the device management service. 3436 Network error while communicating with the device management service.
3428 </message> 3437 </message>
3429 <message name="IDS_LOGIN_MANAGED_BY_NOTICE" desc="Text for the notification ba r on the login screen showing that this is a managed device."> 3438 <message name="IDS_LOGIN_MANAGED_BY_NOTICE" desc="Text for the notification ba r on the login screen showing that this is a managed device.">
3430 This device is managed by <ph name="DOMAIN">$1<ex>yourdomain.com</ex></ph>. 3439 This device is managed by <ph name="DOMAIN">$1<ex>yourdomain.com</ex></ph>.
3431 </message> 3440 </message>
3432 <message name="IDS_LOGIN_MANAGED_REPORTING_HINT" desc="Text for the hint on re porting features displayed in the enterprise notification bar on the login scree n."> 3441 <message name="IDS_LOGIN_MANAGED_REPORTING_HINT" desc="Text for the hint on re porting features displayed in the enterprise notification bar on the login scree n.">
3433 Device usage may be tracked. 3442 Device usage may be tracked.
3434 </message> 3443 </message>
3435 </grit-part> 3444 </grit-part>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698