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

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

Issue 2478173003: Lock profile before sign in when force sign in is enabled. (Closed)
Patch Set: rogerta's comments Created 4 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
« no previous file with comments | « chrome/app/chromium_strings.grd ('k') | chrome/browser/profiles/profile_attributes_entry.h » ('j') | no next file with comments »
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 <!-- 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. If you update this file, be sure also to update 4 Chrome supports. If you update this file, be sure also to update
5 chromium_strings.grd. --> 5 chromium_strings.grd. -->
6 6
7 <grit base_dir="." latest_public_release="0" current_release="1" 7 <grit base_dir="." latest_public_release="0" current_release="1"
8 output_all_resource_defines="false" source_lang_id="en" enc_check="möl"> 8 output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
9 <outputs> 9 <outputs>
10 <output filename="grit/google_chrome_strings.h" type="rc_header"> 10 <output filename="grit/google_chrome_strings.h" type="rc_header">
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 You're now signed in to Chrome! Sync is disabled by your administrator . 774 You're now signed in to Chrome! Sync is disabled by your administrator .
775 </message> 775 </message>
776 <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."> 776 <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.">
777 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. 777 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.
778 </message> 778 </message>
779 <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."> 779 <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.">
780 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. 780 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.
781 781
782 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>. 782 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>.
783 </message> 783 </message>
784 <message name="IDS_SYNC_USED_PROFILE_ERROR" desc="An error message shown when user tries to sign in to a profile that is used by other user name before. ">
785 Someone previously signed in to Chrome on this computer as <ph name="A CCOUNT_EMAIL_LAST">$1<ex>user@example.com</ex></ph>. Please create a new Chrome user to keep your information separate.
786 </message>
784 </if> 787 </if>
785 788
786 <!-- Enterprise sign-in profile linking --> 789 <!-- Enterprise sign-in profile linking -->
787 <if expr="not is_android"> 790 <if expr="not is_android">
788 <message name="IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_DIALOG_TITLE" desc="Th e title of the dialog to confirm linking the browser profile with the signed-in enterprise account"> 791 <message name="IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_DIALOG_TITLE" desc="Th e title of the dialog to confirm linking the browser profile with the signed-in enterprise account">
789 Important information regarding your Chrome data 792 Important information regarding your Chrome data
790 </message> 793 </message>
791 <message name="IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_MESSAGE" desc="The war ning message displayed to an enterprise user about to link their profile to thei r Google account. This message is followed by a 'Learn more' link."> 794 <message name="IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_MESSAGE" desc="The war ning message displayed to an enterprise user about to link their profile to thei r Google account. This message is followed by a 'Learn more' link.">
792 You are signing in with a managed account and giving its administrator control over your Google Chrome profile. Your Chrome data, such as your apps, b ookmarks, history, passwords, and other settings will become permanently tied to <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. You will be able to delet e this data via the Google Accounts Dashboard, but you will not be able to assoc iate this data with another account. 795 You are signing in with a managed account and giving its administrator control over your Google Chrome profile. Your Chrome data, such as your apps, b ookmarks, history, passwords, and other settings will become permanently tied to <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. You will be able to delet e this data via the Google Accounts Dashboard, but you will not be able to assoc iate this data with another account.
793 </message> 796 </message>
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
1301 <message name="IDS_PRIVATE_USER_DATA_INPUT_FUTURE_DESCRIPTION" desc="Descr iption of a security problem where the site collects private user data on an ins ecure page, which will result in an omnibox warning in future versions of Chrome ." translateable="false"> 1304 <message name="IDS_PRIVATE_USER_DATA_INPUT_FUTURE_DESCRIPTION" desc="Descr iption of a security problem where the site collects private user data on an ins ecure page, which will result in an omnibox warning in future versions of Chrome ." translateable="false">
1302 This page includes a password or credit card input over HTTP. A warning will appear in the URL bar starting in Chrome 56 (Jan 2017). 1305 This page includes a password or credit card input over HTTP. A warning will appear in the URL bar starting in Chrome 56 (Jan 2017).
1303 </message> 1306 </message>
1304 <message name="IDS_PRIVATE_USER_DATA_INPUT_DESCRIPTION" desc="Description of a security problem where the site collects private user data on an insecure p age, which results in an omnibox warning." translateable="false"> 1307 <message name="IDS_PRIVATE_USER_DATA_INPUT_DESCRIPTION" desc="Description of a security problem where the site collects private user data on an insecure p age, which results in an omnibox warning." translateable="false">
1305 This page includes a password or credit card input over HTTP. A warning has been added the URL bar. 1308 This page includes a password or credit card input over HTTP. A warning has been added the URL bar.
1306 </message> 1309 </message>
1307 1310
1308 </messages> 1311 </messages>
1309 </release> 1312 </release>
1310 </grit> 1313 </grit>
OLDNEW
« no previous file with comments | « chrome/app/chromium_strings.grd ('k') | chrome/browser/profiles/profile_attributes_entry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698