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

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

Issue 7481023: Adding notifications for new sync types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Now acknowledges sync types when notification is clocked. 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
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 4388 matching lines...) Expand 10 before | Expand all | Expand 10 after
4399 to the profile's cookie jar, so that retyping the username and password in the browser is not necessary. 4399 to the profile's cookie jar, so that retyping the username and password in the browser is not necessary.
4400 Pre-login is always disabled if the profile is not connected to a Google Account. 4400 Pre-login is always disabled if the profile is not connected to a Google Account.
4401 </message> 4401 </message>
4402 <message name="IDS_FLAGS_SHOW_AUTOFILL_TYPE_PREDICTIONS_NAME" desc="Title for the flag to show Autofill field type predictions for all forms"> 4402 <message name="IDS_FLAGS_SHOW_AUTOFILL_TYPE_PREDICTIONS_NAME" desc="Title for the flag to show Autofill field type predictions for all forms">
4403 Show Autofill predictions 4403 Show Autofill predictions
4404 </message> 4404 </message>
4405 <message name="IDS_FLAGS_SHOW_AUTOFILL_TYPE_PREDICTIONS_DESCRIPTION" desc= "Description for the flag to show Autofill field type predictions for all forms" > 4405 <message name="IDS_FLAGS_SHOW_AUTOFILL_TYPE_PREDICTIONS_DESCRIPTION" desc= "Description for the flag to show Autofill field type predictions for all forms" >
4406 Annotates web forms with Autofill field type predictions as placeholder text. 4406 Annotates web forms with Autofill field type predictions as placeholder text.
4407 </message> 4407 </message>
4408 <message name="IDS_FLAGS_SYNC_TYPED_URLS_NAME" desc="Title for the flag to enable syncing the TypedUrl datatype"> 4408 <message name="IDS_FLAGS_SYNC_TYPED_URLS_NAME" desc="Title for the flag to enable syncing the TypedUrl datatype">
4409 Enable syncing typed URLs 4409 Enable syncing Omnibox History
4410 </message> 4410 </message>
4411 <message name="IDS_FLAGS_SYNC_TYPED_URLS_DESCRIPTION" desc="Description fo r the flag to enable syncing the TypedURL datatype"> 4411 <message name="IDS_FLAGS_SYNC_TYPED_URLS_DESCRIPTION" desc="Description fo r the flag to enable syncing the TypedURL datatype">
4412 Enable typed URLs in the sync options. This allows syncing your typed UR L history to other clients to assist in omnibox auto-completion. 4412 Enable Omnibox History in the sync options. This allows syncing your typ ed URL history to other clients to assist in omnibox auto-completion.
4413 </message> 4413 </message>
4414 <message name="IDS_FLAGS_PRERENDER_FROM_OMNIBOX_NAME" desc="Title for the flag to prerender from the omnibox"> 4414 <message name="IDS_FLAGS_PRERENDER_FROM_OMNIBOX_NAME" desc="Title for the flag to prerender from the omnibox">
4415 Prerender from omnibox 4415 Prerender from omnibox
4416 </message> 4416 </message>
4417 <message name="IDS_FLAGS_PRERENDER_FROM_OMNIBOX_DESCRIPTION" desc="Descrip tion for the flag to prerender from the omnibox"> 4417 <message name="IDS_FLAGS_PRERENDER_FROM_OMNIBOX_DESCRIPTION" desc="Descrip tion for the flag to prerender from the omnibox">
4418 Prerender suggestions given in the omnibox. 4418 Prerender suggestions given in the omnibox.
4419 </message> 4419 </message>
4420 <message name="IDS_FLAGS_ENABLE_ADDITIONAL_AUTOFILL_FEEDBACK_NAME" desc="T itle for the flag to enable prompts for Autofill feedback"> 4420 <message name="IDS_FLAGS_ENABLE_ADDITIONAL_AUTOFILL_FEEDBACK_NAME" desc="T itle for the flag to enable prompts for Autofill feedback">
4421 Send additional Autofill feedback 4421 Send additional Autofill feedback
4422 </message> 4422 </message>
(...skipping 4945 matching lines...) Expand 10 before | Expand all | Expand 10 after
9368 <message name="IDS_SYNC_STOP_SYNCING_EXPLANATION_LABEL" desc="The text to display below the 'Stop syncing this account' button on the options pane, explai ning what the button does."> 9368 <message name="IDS_SYNC_STOP_SYNCING_EXPLANATION_LABEL" desc="The text to display below the 'Stop syncing this account' button on the options pane, explai ning what the button does.">
9369 If you stop syncing, the data stored on this computer as well as the dat a stored in your Google Account will remain in both places. However, new data or changes you make to your data will not be synchronized between them. 9369 If you stop syncing, the data stored on this computer as well as the dat a stored in your Google Account will remain in both places. However, new data or changes you make to your data will not be synchronized between them.
9370 </message> 9370 </message>
9371 <!-- Sync time strings --> 9371 <!-- Sync time strings -->
9372 <message name="IDS_SYNC_TIME_NEVER" desc="Indicates that the first sync ha s never completed."> 9372 <message name="IDS_SYNC_TIME_NEVER" desc="Indicates that the first sync ha s never completed.">
9373 Never 9373 Never
9374 </message> 9374 </message>
9375 <message name="IDS_SYNC_TIME_JUST_NOW" desc="Indicates that a sync cycle j ust finished."> 9375 <message name="IDS_SYNC_TIME_JUST_NOW" desc="Indicates that a sync cycle j ust finished.">
9376 Just now 9376 Just now
9377 </message> 9377 </message>
9378 <message name="IDS_SYNC_ADVANCED_OPTIONS" desc="The text in the link that brings up the sync configure screen in the new tab page new data type notificati on.">
9379 Advanced options
9380 </message>
9381 <message name="IDS_SYNC_ADDED_SESSIONS_AND_TYPED_URLS" desc="The text in t he new tab page notifying the user that we've enabled session and typed url sync .">
9382 New! Chrome is now syncing your Omnibox History and Foreign Sessions.
9383 </message>
9384 <message name="IDS_SYNC_ADDED_SESSIONS" desc="The text in the new tab page notifying the user that we've enabled session sync.">
9385 New! Chrome is now syncing your Foreign Sessions.
9386 </message>
9387 <message name="IDS_SYNC_ADDED_TYPED_URLS" desc="The text in the new tab pa ge notifying the user that we've enabled typed url sync.">
9388 New! Chrome is now syncing your Omnibox History.
9389 </message>
9378 9390
9379 <!-- Sync / Extension interaction messages --> 9391 <!-- Sync / Extension interaction messages -->
9380 <message name="IDS_SYNC_EXTENSIONS_MALFUNCTION_DISABLE_SYNC_OPTION" desc=" The label of a button allowing the user to choose to disable sync when an extens ion is believed to be causing sync problems preventing sync operation."> 9392 <message name="IDS_SYNC_EXTENSIONS_MALFUNCTION_DISABLE_SYNC_OPTION" desc=" The label of a button allowing the user to choose to disable sync when an extens ion is believed to be causing sync problems preventing sync operation.">
9381 Disable Sync 9393 Disable Sync
9382 </message> 9394 </message>
9383 <message name="IDS_SYNC_EXTENSIONS_MALFUNCTION_EXTENSION_DISABLED" desc="A message shown on a dialog when an extension or app has been disabled due to pro blems arising from interactions with sync."> 9395 <message name="IDS_SYNC_EXTENSIONS_MALFUNCTION_EXTENSION_DISABLED" desc="A message shown on a dialog when an extension or app has been disabled due to pro blems arising from interactions with sync.">
9384 <ph name="NAME_OF_EXTENSION">$1<ex>foo extension</ex></ph> has been disa bled. If you stop syncing your bookmarks, you can re-enable it on the extensions page, accessible through the Tools menu. 9396 <ph name="NAME_OF_EXTENSION">$1<ex>foo extension</ex></ph> has been disa bled. If you stop syncing your bookmarks, you can re-enable it on the extensions page, accessible through the Tools menu.
9385 </message> 9397 </message>
9386 9398
9387 <!-- Sync New Tab Page strings --> 9399 <!-- Sync New Tab Page strings -->
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
9460 <message name="IDS_SYNC_DATATYPE_THEMES" desc="Themes, one of the data typ es that we allow syncing."> 9472 <message name="IDS_SYNC_DATATYPE_THEMES" desc="Themes, one of the data typ es that we allow syncing.">
9461 Themes 9473 Themes
9462 </message> 9474 </message>
9463 <message name="IDS_SYNC_DATATYPE_EXTENSIONS" desc="Extensions, one of the data types that we allow syncing."> 9475 <message name="IDS_SYNC_DATATYPE_EXTENSIONS" desc="Extensions, one of the data types that we allow syncing.">
9464 Extensions 9476 Extensions
9465 </message> 9477 </message>
9466 <message name="IDS_SYNC_DATATYPE_PASSWORDS" desc="Saved passwords, one of the data types that we allow syncing."> 9478 <message name="IDS_SYNC_DATATYPE_PASSWORDS" desc="Saved passwords, one of the data types that we allow syncing.">
9467 Passwords 9479 Passwords
9468 </message> 9480 </message>
9469 <message name="IDS_SYNC_DATATYPE_TYPED_URLS" desc="Typed URLs, one of the data types that we allow syncing."> 9481 <message name="IDS_SYNC_DATATYPE_TYPED_URLS" desc="Typed URLs, one of the data types that we allow syncing.">
9470 Typed URLs 9482 Omnibox History
9471 </message> 9483 </message>
9472 <message name="IDS_SYNC_DATATYPE_APPS" desc="Apps, one of the data types t hat we allow syncing."> 9484 <message name="IDS_SYNC_DATATYPE_APPS" desc="Apps, one of the data types t hat we allow syncing.">
9473 Apps 9485 Apps
9474 </message> 9486 </message>
9475 <message name="IDS_SYNC_DATATYPE_SESSIONS" desc="Sessions, one of the data types that we allow syncing."> 9487 <message name="IDS_SYNC_DATATYPE_SESSIONS" desc="Sessions, one of the data types that we allow syncing.">
9476 Foreign Sessions 9488 Foreign Sessions
9477 </message> 9489 </message>
9478 9490
9479 <!-- Encryption tab of the configure sync dialog --> 9491 <!-- Encryption tab of the configure sync dialog -->
9480 <if expr="not pp_ifdef('use_titlecase')"> 9492 <if expr="not pp_ifdef('use_titlecase')">
(...skipping 3801 matching lines...) Expand 10 before | Expand all | Expand 10 after
13282 </includes> 13294 </includes>
13283 <structures fallback_to_english="true"> 13295 <structures fallback_to_english="true">
13284 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 13296 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
13285 </structure> 13297 </structure>
13286 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 13298 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
13287 </structure> 13299 </structure>
13288 </structures> 13300 </structures>
13289 13301
13290 </release> 13302 </release>
13291 </grit> 13303 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/new_tab.js » ('j') | chrome/browser/sync/profile_sync_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698