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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 13334007: Added "Use an autoconfiguration URL" checkbox in proxy tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src@git-svn
Patch Set: Fixed conflict in Authors file Created 7 years, 8 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 | « AUTHORS ('k') | chrome/browser/chromeos/proxy_cros_settings_parser.h » ('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 <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 <!-- Idle logout dialog for retail mode --> 7 <!-- Idle logout dialog for retail mode -->
8 <message name="IDS_IDLE_LOGOUT_TITLE" desc="Dialog title for the idle logout d ialog. Used in retail mode only."> 8 <message name="IDS_IDLE_LOGOUT_TITLE" desc="Dialog title for the idle logout d ialog. Used in retail mode only.">
9 Are you still there? 9 Are you still there?
10 </message> 10 </message>
(...skipping 2348 matching lines...) Expand 10 before | Expand all | Expand 10 after
2359 </message> 2359 </message>
2360 <message name="IDS_PROXY_FTP_PROXY" desc="Label for the ftp proxy box."> 2360 <message name="IDS_PROXY_FTP_PROXY" desc="Label for the ftp proxy box.">
2361 FTP proxy 2361 FTP proxy
2362 </message> 2362 </message>
2363 <message name="IDS_PROXY_SOCKS_HOST" desc="Label for the SOCKS host box."> 2363 <message name="IDS_PROXY_SOCKS_HOST" desc="Label for the SOCKS host box.">
2364 SOCKS host 2364 SOCKS host
2365 </message> 2365 </message>
2366 <message name="IDS_PROXY_AUTOMATIC" desc="Radio to select configuring from a U RL."> 2366 <message name="IDS_PROXY_AUTOMATIC" desc="Radio to select configuring from a U RL.">
2367 Automatic proxy configuration 2367 Automatic proxy configuration
2368 </message> 2368 </message>
2369 <message name="IDS_PROXY_CONFIG_URL" desc="Label for the proxy config URL box. "> 2369 <message name="IDS_PROXY_USE_AUTOCONFIG_URL" desc="Label for the checkbox that controls whether to use an autoconfiguration URL.">
2370 Autoconfiguration URL 2370 Use an autoconfiguration URL
2371 </message> 2371 </message>
2372 <message name="IDS_PROXY_ADVANCED_CONFIG" desc="Label for the Advanced Proxy." > 2372 <message name="IDS_PROXY_ADVANCED_CONFIG" desc="Label for the Advanced Proxy." >
2373 Advanced Configuration 2373 Advanced Configuration
2374 </message> 2374 </message>
2375 <message name="IDS_PROXY_ADD_HOST" desc="Label for the Add host button."> 2375 <message name="IDS_PROXY_ADD_HOST" desc="Label for the Add host button.">
2376 Add 2376 Add
2377 </message> 2377 </message>
2378 <message name="IDS_PROXY_REMOVE_HOST" desc="Label for the Remove host button." > 2378 <message name="IDS_PROXY_REMOVE_HOST" desc="Label for the Remove host button." >
2379 Remove 2379 Remove
2380 </message> 2380 </message>
(...skipping 1231 matching lines...) Expand 10 before | Expand all | Expand 10 after
3612 <message name="IDS_KIOSK_APP_ERROR_UNABLE_TO_MOUNT" desc="Error message used w hen a kiosk app fails to launch due to cryptohome error."> 3612 <message name="IDS_KIOSK_APP_ERROR_UNABLE_TO_MOUNT" desc="Error message used w hen a kiosk app fails to launch due to cryptohome error.">
3613 Kryptonite! The cryptohome for the kiosk application could not be mounted. 3613 Kryptonite! The cryptohome for the kiosk application could not be mounted.
3614 </message> 3614 </message>
3615 <message name="IDS_KIOSK_APP_ERROR_UNABLE_TO_INSTALL" desc="Error message used when a kiosk app fails to launch due to install failure."> 3615 <message name="IDS_KIOSK_APP_ERROR_UNABLE_TO_INSTALL" desc="Error message used when a kiosk app fails to launch due to install failure.">
3616 Kiosk application could not be installed. 3616 Kiosk application could not be installed.
3617 </message> 3617 </message>
3618 <message name="IDS_KIOSK_APP_ERROR_USER_CANCEL" desc="Error message used when a kiosk app launch is canceled by user."> 3618 <message name="IDS_KIOSK_APP_ERROR_USER_CANCEL" desc="Error message used when a kiosk app launch is canceled by user.">
3619 Kiosk application launch canceled. 3619 Kiosk application launch canceled.
3620 </message> 3620 </message>
3621 </grit-part> 3621 </grit-part>
OLDNEW
« no previous file with comments | « AUTHORS ('k') | chrome/browser/chromeos/proxy_cros_settings_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698