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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/app/generated_resources.grd

Issue 7121014: When a user logs into sync, the appropriate cookies are retrieved so that (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixing merge issue that caused previous trybots to fail Created 9 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/about_flags.cc » ('j') | chrome/browser/sync/signin_manager.h » ('J')
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 2
3 <!-- 3 <!--
4 This file contains definitions of resources that will be translated for each 4 This file contains definitions of resources that will be translated for each
5 locale. OS values are passed through from Python's sys.platform: 5 locale. OS values are passed through from Python's sys.platform:
6 6
7 win32 - Windows 7 win32 - Windows
8 darwin - Mac 8 darwin - Mac
9 linux2 - Linux (both Views and GTK+) 9 linux2 - Linux (both Views and GTK+)
10 10
(...skipping 4284 matching lines...) Expand 10 before | Expand all | Expand 10 after
4295 </message> 4295 </message>
4296 <message name="IDS_FLAGS_INDEXEDDB_USE_LEVELDB_DESCRIPTION" desc="Descript ion for the flag to use the LevelDB back-end for IndexedDB"> 4296 <message name="IDS_FLAGS_INDEXEDDB_USE_LEVELDB_DESCRIPTION" desc="Descript ion for the flag to use the LevelDB back-end for IndexedDB">
4297 Enable the experimental LevelDB back-end for IndexedDB. 4297 Enable the experimental LevelDB back-end for IndexedDB.
4298 </message> 4298 </message>
4299 <message name="IDS_FLAGS_PRELOAD_INSTANT_SEARCH_NAME" desc="Title for the flag to preload Instant search"> 4299 <message name="IDS_FLAGS_PRELOAD_INSTANT_SEARCH_NAME" desc="Title for the flag to preload Instant search">
4300 Preload Instant Search 4300 Preload Instant Search
4301 </message> 4301 </message>
4302 <message name="IDS_FLAGS_PRELOAD_INSTANT_SEARCH_DESCRIPTION" desc="Descrip tion for the flag to preload Instant search"> 4302 <message name="IDS_FLAGS_PRELOAD_INSTANT_SEARCH_DESCRIPTION" desc="Descrip tion for the flag to preload Instant search">
4303 Preload the default search engine for Instant. 4303 Preload the default search engine for Instant.
4304 </message> 4304 </message>
4305 <message name="IDS_FLAGS_AUTO_LOGIN_NAME" desc="title for the flag to pre- and auto-login the user">
4306 Disable pre- and auto-login
4307 </message>
4308 <message name="IDS_FLAGS_AUTO_LOGIN_DESCRIPTION" desc="Description for the flag to pre- and auto-login the user">
4309 Disable pre-login to services when sync is enabled. Also disable infoba r on login pages which help automate the login process.
4310 Pre- and auto-login are always disabled if sync is disabled.
4311 </message>
4305 4312
4306 <!-- Crashes --> 4313 <!-- Crashes -->
4307 <message name="IDS_CRASHES_TITLE" desc="Title for the chrome://crashes pag e."> 4314 <message name="IDS_CRASHES_TITLE" desc="Title for the chrome://crashes pag e.">
4308 Crashes 4315 Crashes
4309 </message> 4316 </message>
4310 <message name="IDS_CRASHES_CRASH_COUNT_BANNER_FORMAT" desc="Format for cra sh count banner on chrome://crashes"> 4317 <message name="IDS_CRASHES_CRASH_COUNT_BANNER_FORMAT" desc="Format for cra sh count banner on chrome://crashes">
4311 Crashes (<ph name="CRASH_COUNT">$1<ex>3</ex></ph>) 4318 Crashes (<ph name="CRASH_COUNT">$1<ex>3</ex></ph>)
4312 </message> 4319 </message>
4313 <message name="IDS_CRASHES_CRASH_HEADER_FORMAT" desc="Format for crash ent ry headings on chrome://crashes"> 4320 <message name="IDS_CRASHES_CRASH_HEADER_FORMAT" desc="Format for crash ent ry headings on chrome://crashes">
4314 Crash ID <ph name="CRASH_ID">$1<ex>8fa95dbb6f2ec862</ex></ph> 4321 Crash ID <ph name="CRASH_ID">$1<ex>8fa95dbb6f2ec862</ex></ph>
(...skipping 8341 matching lines...) Expand 10 before | Expand all | Expand 10 after
12656 </includes> 12663 </includes>
12657 <structures fallback_to_english="true"> 12664 <structures fallback_to_english="true">
12658 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 12665 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
12659 </structure> 12666 </structure>
12660 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 12667 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
12661 </structure> 12668 </structure>
12662 </structures> 12669 </structures>
12663 12670
12664 </release> 12671 </release>
12665 </grit> 12672 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/about_flags.cc » ('j') | chrome/browser/sync/signin_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698