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

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

Issue 8334030: Merge search engines sync data type with Preferences. Sync the default search provider. Add some ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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
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. The variables is_win, is_macosx, is_linux, and is_posix are available 5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available
6 for making strings OS specific. Other platform defines such as use_titlecase 6 for making strings OS specific. Other platform defines such as use_titlecase
7 are declared in build/common.gypi. 7 are declared in build/common.gypi.
8 --> 8 -->
9 9
10 <grit base_dir="." latest_public_release="0" current_release="1" 10 <grit base_dir="." latest_public_release="0" current_release="1"
(...skipping 10447 matching lines...) Expand 10 before | Expand all | Expand 10 after
10458 </message> 10458 </message>
10459 <message name="IDS_SYNC_DATATYPE_PASSWORDS" desc="Saved passwords, one of the data types that we allow syncing."> 10459 <message name="IDS_SYNC_DATATYPE_PASSWORDS" desc="Saved passwords, one of the data types that we allow syncing.">
10460 Passwords 10460 Passwords
10461 </message> 10461 </message>
10462 <message name="IDS_SYNC_DATATYPE_TYPED_URLS" desc="Typed URLs, one of the data types that we allow syncing."> 10462 <message name="IDS_SYNC_DATATYPE_TYPED_URLS" desc="Typed URLs, one of the data types that we allow syncing.">
10463 Omnibox History 10463 Omnibox History
10464 </message> 10464 </message>
10465 <message name="IDS_SYNC_DATATYPE_APPS" desc="Apps, one of the data types t hat we allow syncing."> 10465 <message name="IDS_SYNC_DATATYPE_APPS" desc="Apps, one of the data types t hat we allow syncing.">
10466 Apps 10466 Apps
10467 </message> 10467 </message>
10468 <message name="IDS_SYNC_DATATYPE_SEARCH_ENGINES" desc="Search Engines, one of the data types that we allow syncing.">
10469 Search Engines
10470 </message>
10471 <message name="IDS_SYNC_DATATYPE_TABS" desc="Open Tabs, one of the data ty pes that we allow syncing."> 10468 <message name="IDS_SYNC_DATATYPE_TABS" desc="Open Tabs, one of the data ty pes that we allow syncing.">
10472 Open Tabs 10469 Open Tabs
10473 </message> 10470 </message>
10474 <message name="IDS_SYNC_DATATYPE_APP_NOTIFICATIONS" desc="App notification s, one of the data types that we allow syncing."> 10471 <message name="IDS_SYNC_DATATYPE_APP_NOTIFICATIONS" desc="App notification s, one of the data types that we allow syncing.">
10475 App Notifications 10472 App Notifications
10476 </message> 10473 </message>
10477 10474
10478 <!-- Encryption tab of the configure sync dialog --> 10475 <!-- Encryption tab of the configure sync dialog -->
10479 <if expr="not pp_ifdef('use_titlecase')"> 10476 <if expr="not pp_ifdef('use_titlecase')">
10480 <message name="IDS_SYNC_ENCRYPTION_DATA_TYPES_TITLE" desc="Title of the section containing the data types to encrypt."> 10477 <message name="IDS_SYNC_ENCRYPTION_DATA_TYPES_TITLE" desc="Title of the section containing the data types to encrypt.">
(...skipping 4097 matching lines...) Expand 10 before | Expand all | Expand 10 after
14578 </messages> 14575 </messages>
14579 <structures fallback_to_english="true"> 14576 <structures fallback_to_english="true">
14580 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. --> 14577 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. -->
14581 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 14578 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
14582 </structure> 14579 </structure>
14583 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 14580 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
14584 </structure> 14581 </structure>
14585 </structures> 14582 </structures>
14586 </release> 14583 </release>
14587 </grit> 14584 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/about_flags.cc » ('j') | chrome/browser/sync/test/integration/search_engines_helper.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698