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

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

Issue 14914003: Move post-signin confirmation bubble to OneClickSigninSyncStarter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaned up extraneous whitespace. Created 7 years, 7 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 <!-- This file contains definitions of strings that are specific to 2 <!-- This file contains definitions of strings that are specific to
3 Google Chrome. These strings will be translated for each locale that Google 3 Google Chrome. These strings will be translated for each locale that Google
4 Chrome supports. --> 4 Chrome supports. -->
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/google_chrome_strings.h" type="rc_header"> 9 <output filename="grit/google_chrome_strings.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after
767 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_MESSAGE_NEW" desc="The messag e of the one click sign in dialog."> 767 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_MESSAGE_NEW" desc="The messag e of the one click sign in dialog.">
768 You're signing in to Chrome using your <ph name="USER_EMAIL_ADDRESS">$ 1<ex>foo@gmail.com</ex></ph> account. You will be able to access your bookmarks, history, and other settings on all of your signed in devices. 768 You're signing in to Chrome using your <ph name="USER_EMAIL_ADDRESS">$ 1<ex>foo@gmail.com</ex></ph> account. You will be able to access your bookmarks, history, and other settings on all of your signed in devices.
769 </message> 769 </message>
770 <!-- Delete DIALOG_TITLE/MESSAGE when we switch to the _NEW versions --> 770 <!-- Delete DIALOG_TITLE/MESSAGE when we switch to the _NEW versions -->
771 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_TITLE" desc="The title of the modal dialog window that opens when the user chooses to use one click sign in." > 771 <message name="IDS_ONE_CLICK_SIGNIN_DIALOG_TITLE" desc="The title of the modal dialog window that opens when the user chooses to use one click sign in." >
772 You're signed in to Chrome! 772 You're signed in to Chrome!
773 </message> 773 </message>
774 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE" desc="The body of th e sync promo NTP bubble."> 774 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE" desc="The body of th e sync promo NTP bubble.">
775 You're now signed in to Chrome! Your bookmarks, history, and other set tings will be synced to your Google Account. 775 You're now signed in to Chrome! Your bookmarks, history, and other set tings will be synced to your Google Account.
776 </message> 776 </message>
777 <message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_SYNC_DISABLED_MESSAGE" desc=" The body of the signin bubble, when sync has been disabled.">
778 You're now signed in to Chrome! Sync is disabled by your administrator .
779 </message>
777 <message name="IDS_SYNC_WRONG_EMAIL" desc="Message shown when sync setup failed due to the user entering the wrong email address for sign in."> 780 <message name="IDS_SYNC_WRONG_EMAIL" desc="Message shown when sync setup failed due to the user entering the wrong email address for sign in.">
778 You were signed in to Chrome as <ph name="USER_EMAIL_ADDRESS">$1<ex>fo o@gmail.com</ex></ph>. Please use the same account to sign in again. 781 You were signed in to Chrome as <ph name="USER_EMAIL_ADDRESS">$1<ex>fo o@gmail.com</ex></ph>. Please use the same account to sign in again.
779 </message> 782 </message>
780 <message name="IDS_ONE_CLICK_SIGNIN_CONFIRM_EMAIL_DIALOG_MESSAGE" desc=" Error message to display when setting up sync for a second time and the user nam e is different from the previous user name."> 783 <message name="IDS_ONE_CLICK_SIGNIN_CONFIRM_EMAIL_DIALOG_MESSAGE" desc=" Error message to display when setting up sync for a second time and the user nam e is different from the previous user name.">
781 Someone previously signed in to Chrome on this computer as <ph name="A CCOUNT_EMAIL_LAST">$1<ex>user@example.com</ex></ph>. If that isn't your account, create a new Chrome user to keep your information separate. 784 Someone previously signed in to Chrome on this computer as <ph name="A CCOUNT_EMAIL_LAST">$1<ex>user@example.com</ex></ph>. If that isn't your account, create a new Chrome user to keep your information separate.
782 785
783 Signing in anyway will merge Chrome information like bookmarks, history, and oth er settings to <ph name="ACCOUNT_EMAIL_NEW">$2<ex>user@example.com</ex></ph>. 786 Signing in anyway will merge Chrome information like bookmarks, history, and oth er settings to <ph name="ACCOUNT_EMAIL_NEW">$2<ex>user@example.com</ex></ph>.
784 </message> 787 </message>
785 </if> 788 </if>
786 789
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 886
884 <!-- Chrome OS OOBE Terms of Service screen--> 887 <!-- Chrome OS OOBE Terms of Service screen-->
885 <if expr="pp_ifdef('chromeos')"> 888 <if expr="pp_ifdef('chromeos')">
886 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading at the top of the Terms of Service screen."> 889 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading at the top of the Terms of Service screen.">
887 <ph name="DOMAIN">$1<ex>example.com</ex></ph> requires that you read a nd accept the following Terms of Service before using this device. These terms d o not expand, modify or limit the Google Chrome OS Terms. 890 <ph name="DOMAIN">$1<ex>example.com</ex></ph> requires that you read a nd accept the following Terms of Service before using this device. These terms d o not expand, modify or limit the Google Chrome OS Terms.
888 </message> 891 </message>
889 </if> 892 </if>
890 </messages> 893 </messages>
891 </release> 894 </release>
892 </grit> 895 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698