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

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

Issue 818433003: ChromeOS: Implement CaptivePortalAuthenticationIgnoresProxy policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tests fixed. Created 5 years, 9 months 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/about_flags.cc » ('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="chromeos">. --> 3 Everything in this file is wrapped in <if expr="chromeos">. -->
4 <grit-part> 4 <grit-part>
5 <message name="IDS_EMPTY_STRING" desc="Empty string, exist only to make code g eneric. No translation required."> 5 <message name="IDS_EMPTY_STRING" desc="Empty string, exist only to make code g eneric. No translation required.">
6 </message> 6 </message>
7 <message name="IDS_CHROMEBOOK" desc="The localized name for Chromebook."> 7 <message name="IDS_CHROMEBOOK" desc="The localized name for Chromebook.">
8 Chromebook 8 Chromebook
9 </message> 9 </message>
10 <message name="IDS_CHROMEBOX" desc="The localized name for Chromebox"> 10 <message name="IDS_CHROMEBOX" desc="The localized name for Chromebox">
(...skipping 6065 matching lines...) Expand 10 before | Expand all | Expand 10 after
6076 6076
6077 <message name="IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME" desc="T itle for the flag to disable automatic timezone update on user location change." > 6077 <message name="IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME" desc="T itle for the flag to disable automatic timezone update on user location change." >
6078 Disable automatic timezone update by geolocation 6078 Disable automatic timezone update by geolocation
6079 </message> 6079 </message>
6080 <message name="IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION" desc="Description for the flag to disable user setting to automatically update t imezone by user geolocation."> 6080 <message name="IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION" desc="Description for the flag to disable user setting to automatically update t imezone by user geolocation.">
6081 If set, automatic timezone update by the current geolocation is turned off. 6081 If set, automatic timezone update by the current geolocation is turned off.
6082 </message> 6082 </message>
6083 <message name="IDS_OPTIONS_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION" desc=" Label for checkbox to allow automatic timezone update by user geolocation."> 6083 <message name="IDS_OPTIONS_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION" desc=" Label for checkbox to allow automatic timezone update by user geolocation.">
6084 Set time zone automatically using your location 6084 Set time zone automatically using your location
6085 </message> 6085 </message>
6086 <message name="IDS_OPTIONS_CAPTIVE_PORTAL_BYPASS_PROXY_LABEL" desc="Option in chrome://settings that allows Captive Portal authorization pages to ignore proxy settings.">
6087 Allow captive portal sign-in page to bypass proxy servers
6088 </message>
6086 </grit-part> 6089 </grit-part>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/about_flags.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698