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

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

Issue 6364009: From the enter-passphrase screen in sync setup, canceling should only disable... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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 <!-- This file contains definitions of resources that will be translated for 3 <!-- This file contains definitions of resources that will be translated for
4 each locale. --> 4 each locale. -->
5 5
6 <grit base_dir="." latest_public_release="0" current_release="1" 6 <grit base_dir="." latest_public_release="0" current_release="1"
7 source_lang_id="en" enc_check="möl"> 7 source_lang_id="en" enc_check="möl">
8 <outputs> 8 <outputs>
9 <output filename="grit/generated_resources.h" type="rc_header"> 9 <output filename="grit/generated_resources.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 8348 matching lines...) Expand 10 before | Expand all | Expand 10 after
8359 <message name="IDS_SYNC_PASSPHRASE_MISMATCH_ERROR" desc="Error message whe n the passphrase and confirmation don't match."> 8359 <message name="IDS_SYNC_PASSPHRASE_MISMATCH_ERROR" desc="Error message whe n the passphrase and confirmation don't match.">
8360 You must enter the same passphrase twice. 8360 You must enter the same passphrase twice.
8361 </message> 8361 </message>
8362 <message name="IDS_SYNC_INCORRECT_PASSPHRASE" desc="Message when the passp hrase is incorrect."> 8362 <message name="IDS_SYNC_INCORRECT_PASSPHRASE" desc="Message when the passp hrase is incorrect.">
8363 The passphrase you entered is incorrect. 8363 The passphrase you entered is incorrect.
8364 </message> 8364 </message>
8365 <message name="IDS_SYNC_PASSPHRASE_RECOVER" desc="Message about how to rec over from a lost passphrase."> 8365 <message name="IDS_SYNC_PASSPHRASE_RECOVER" desc="Message about how to rec over from a lost passphrase.">
8366 If you've forgotten your passphrase, stop and reset Sync via the Google Dashboard. 8366 If you've forgotten your passphrase, stop and reset Sync via the Google Dashboard.
8367 </message> 8367 </message>
8368 8368
8369 <message name="IDS_SYNC_PASSPHRASE_CANCEL_WARNING_HEADER" desc="Header for the passphrase cancel warning. Should be phrased as a yes-or-no question.">
8370 Skip password sync?
8371 </message>
8372 <message name="IDS_SYNC_PASSPHRASE_CANCEL_WARNING" desc="Warning message w hen the passphrase entry is canceled.">
8373 Without a passphrase, your passwords will not be synced on this computer . You can enable password sync by changing your sync settings and entering your passphrase.
8374 </message>
8375 <message name="IDS_SYNC_PASSPHRASE_CANCEL_YES" desc="String for 'yes' butt on on passphrase cancel warning dialog.">
8376 Skip password sync
8377 </message>
8378 <message name="IDS_SYNC_PASSPHRASE_CANCEL_NO" desc="String for 'no' button on passphrase cancel warning dialog.">
8379 Enter passphrase
8380 </message>
8381
8369 <!-- Login dialog strings --> 8382 <!-- Login dialog strings -->
8370 <message name="IDS_SYNC_MY_BOOKMARKS_LABEL" desc="Title of the sync login dialog."> 8383 <message name="IDS_SYNC_MY_BOOKMARKS_LABEL" desc="Title of the sync login dialog.">
8371 Set up sync 8384 Set up sync
8372 </message> 8385 </message>
8373 <message name="IDS_SYNC_LOGIN_INTRODUCTION" desc="The message to display a t the top of the login dialog"> 8386 <message name="IDS_SYNC_LOGIN_INTRODUCTION" desc="The message to display a t the top of the login dialog">
8374 <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> sync makes it easy to share your data (such as bookmarks and preferences) between your computers. 8387 <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> sync makes it easy to share your data (such as bookmarks and preferences) between your computers.
8375 <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> synchronizes your data by storing it online with Google when you sign in with your Google Account. 8388 <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> synchronizes your data by storing it online with Google when you sign in with your Google Account.
8376 </message> 8389 </message>
8377 <message name="IDS_SYNC_LOGIN_SIGNIN_PREFIX" desc="The first part of the s entence that is displayed after the login info"> 8390 <message name="IDS_SYNC_LOGIN_SIGNIN_PREFIX" desc="The first part of the s entence that is displayed after the login info">
8378 Sign in with your 8391 Sign in with your
(...skipping 2830 matching lines...) Expand 10 before | Expand all | Expand 10 after
11209 </includes> 11222 </includes>
11210 <structures fallback_to_english="true"> 11223 <structures fallback_to_english="true">
11211 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 11224 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
11212 </structure> 11225 </structure>
11213 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 11226 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
11214 </structure> 11227 </structure>
11215 </structures> 11228 </structures>
11216 11229
11217 </release> 11230 </release>
11218 </grit> 11231 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/profile_sync_service.h » ('j') | chrome/browser/sync/sync_setup_flow.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698