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

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

Issue 7669052: Added DataTypeController integration and UI surfacing for syncing Search Engines. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: TODO comment in ProfileImpl Created 9 years, 4 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/profiles/profile_impl.cc » ('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. 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 4432 matching lines...) Expand 10 before | Expand all | Expand 10 after
4443 </message> 4443 </message>
4444 <message name="IDS_FLAGS_SHOW_AUTOFILL_TYPE_PREDICTIONS_DESCRIPTION" desc= "Description for the flag to show Autofill field type predictions for all forms" > 4444 <message name="IDS_FLAGS_SHOW_AUTOFILL_TYPE_PREDICTIONS_DESCRIPTION" desc= "Description for the flag to show Autofill field type predictions for all forms" >
4445 Annotates web forms with Autofill field type predictions as placeholder text. 4445 Annotates web forms with Autofill field type predictions as placeholder text.
4446 </message> 4446 </message>
4447 <message name="IDS_FLAGS_SYNC_SESSIONS_NAME" desc="Title for the flag to e nable syncing the Sessions datatype"> 4447 <message name="IDS_FLAGS_SYNC_SESSIONS_NAME" desc="Title for the flag to e nable syncing the Sessions datatype">
4448 Enable syncing sessions 4448 Enable syncing sessions
4449 </message> 4449 </message>
4450 <message name="IDS_FLAGS_SYNC_SESSIONS_DESCRIPTION" desc="Description for the flag to enable syncing the Sessions datatype"> 4450 <message name="IDS_FLAGS_SYNC_SESSIONS_DESCRIPTION" desc="Description for the flag to enable syncing the Sessions datatype">
4451 Enable sessions in the sync options. This allows syncing your sessions t o other clients. 4451 Enable sessions in the sync options. This allows syncing your sessions t o other clients.
4452 </message> 4452 </message>
4453 <message name="IDS_FLAGS_SYNC_SEARCH_ENGINES_NAME" desc="Title for the fla g to enable syncing the Search Engines datatype">
4454 Enable syncing search engines
4455 </message>
4456 <message name="IDS_FLAGS_SYNC_SEARCH_ENGINES_DESCRIPTION" desc="Descriptio n for the flag to enable syncing the Search Engines datatype">
4457 Enable search engines in the sync options. This allows syncing your cust om search engines to other clients.
4458 </message>
4453 <message name="IDS_FLAGS_SYNC_OAUTH_NAME" desc="Title for the flag to enab le authenticating with OAuth"> 4459 <message name="IDS_FLAGS_SYNC_OAUTH_NAME" desc="Title for the flag to enab le authenticating with OAuth">
4454 Use OAuth to authenticate Sync operations. 4460 Use OAuth to authenticate Sync operations.
4455 </message> 4461 </message>
4456 <message name="IDS_FLAGS_SYNC_OAUTH_DESCRIPTION" desc="Description for the flag to enable authenticating with OAuth"> 4462 <message name="IDS_FLAGS_SYNC_OAUTH_DESCRIPTION" desc="Description for the flag to enable authenticating with OAuth">
4457 Use OAuth, rather than ClientLogin, to authenticate Sync operations. Th is decouples authentication-specific user interface elements from the browser an d enables a rich set of second-factor mechanisms. 4463 Use OAuth, rather than ClientLogin, to authenticate Sync operations. Th is decouples authentication-specific user interface elements from the browser an d enables a rich set of second-factor mechanisms.
4458 </message> 4464 </message>
4459 <message name="IDS_FLAGS_SYNC_TYPED_URLS_NAME" desc="Title for the flag to enable syncing the TypedUrl datatype"> 4465 <message name="IDS_FLAGS_SYNC_TYPED_URLS_NAME" desc="Title for the flag to enable syncing the TypedUrl datatype">
4460 Enable syncing Omnibox History 4466 Enable syncing Omnibox History
4461 </message> 4467 </message>
4462 <message name="IDS_FLAGS_SYNC_TYPED_URLS_DESCRIPTION" desc="Description fo r the flag to enable syncing the TypedURL datatype"> 4468 <message name="IDS_FLAGS_SYNC_TYPED_URLS_DESCRIPTION" desc="Description fo r the flag to enable syncing the TypedURL datatype">
(...skipping 5195 matching lines...) Expand 10 before | Expand all | Expand 10 after
9658 </message> 9664 </message>
9659 <message name="IDS_SYNC_DATATYPE_PASSWORDS" desc="Saved passwords, one of the data types that we allow syncing."> 9665 <message name="IDS_SYNC_DATATYPE_PASSWORDS" desc="Saved passwords, one of the data types that we allow syncing.">
9660 Passwords 9666 Passwords
9661 </message> 9667 </message>
9662 <message name="IDS_SYNC_DATATYPE_TYPED_URLS" desc="Typed URLs, one of the data types that we allow syncing."> 9668 <message name="IDS_SYNC_DATATYPE_TYPED_URLS" desc="Typed URLs, one of the data types that we allow syncing.">
9663 Omnibox History 9669 Omnibox History
9664 </message> 9670 </message>
9665 <message name="IDS_SYNC_DATATYPE_APPS" desc="Apps, one of the data types t hat we allow syncing."> 9671 <message name="IDS_SYNC_DATATYPE_APPS" desc="Apps, one of the data types t hat we allow syncing.">
9666 Apps 9672 Apps
9667 </message> 9673 </message>
9674 <message name="IDS_SYNC_DATATYPE_SEARCH_ENGINES" desc="Search Engines, one of the data types that we allow syncing.">
9675 Search Engines
9676 </message>
9668 <message name="IDS_SYNC_DATATYPE_SESSIONS" desc="Sessions, one of the data types that we allow syncing."> 9677 <message name="IDS_SYNC_DATATYPE_SESSIONS" desc="Sessions, one of the data types that we allow syncing.">
9669 Foreign Sessions 9678 Foreign Sessions
9670 </message> 9679 </message>
9671 9680
9672 <!-- Encryption tab of the configure sync dialog --> 9681 <!-- Encryption tab of the configure sync dialog -->
9673 <if expr="not pp_ifdef('use_titlecase')"> 9682 <if expr="not pp_ifdef('use_titlecase')">
9674 <message name="IDS_SYNC_ENCRYPTION_DATA_TYPES_TITLE" desc="Title of the section containing the data types to encrypt."> 9683 <message name="IDS_SYNC_ENCRYPTION_DATA_TYPES_TITLE" desc="Title of the section containing the data types to encrypt.">
9675 Encrypted data types 9684 Encrypted data types
9676 </message> 9685 </message>
9677 </if> 9686 </if>
(...skipping 3780 matching lines...) Expand 10 before | Expand all | Expand 10 after
13458 </if> 13467 </if>
13459 </includes> 13468 </includes>
13460 <structures fallback_to_english="true"> 13469 <structures fallback_to_english="true">
13461 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 13470 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
13462 </structure> 13471 </structure>
13463 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 13472 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
13464 </structure> 13473 </structure>
13465 </structures> 13474 </structures>
13466 </release> 13475 </release>
13467 </grit> 13476 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/about_flags.cc » ('j') | chrome/browser/profiles/profile_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698