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

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

Issue 14846020: Add Views implementation of ProfileSigninConfirmationDialog. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more nits Created 7 years, 6 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/browser_dialogs.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. --> 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 777 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 <message name="IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_MESSAGE" desc="The warni ng message displayed to an enterprise user about to link their profile to their Google account. This message is followed by a 'Learn more' link."> 788 <message name="IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_MESSAGE" desc="The warni ng message displayed to an enterprise user about to link their profile to their Google account. This message is followed by a 'Learn more' link.">
789 You are signing in with a managed account and giving its administrator c ontrol over your Google Chrome profile. Your Chrome data, such as your apps, boo kmarks, 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 delete this data via the Google Accounts Dashboard, but you will not be able to associa te this data with another account. 789 You are signing in with a managed account and giving its administrator c ontrol over your Google Chrome profile. Your Chrome data, such as your apps, boo kmarks, 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 delete this data via the Google Accounts Dashboard, but you will not be able to associa te this data with another account.
790 </message> 790 </message>
791 <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_PROMPT" desc="The text of the prompt to create a new profile after signing into an enterprise acco unt"> 791 <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_PROMPT" desc="The text of the prompt to create a new profile after signing into an enterprise acco unt">
792 If you prefer to keep your existing Chrome data separate, you can create a new Chrome user for <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. 792 If you prefer to keep your existing Chrome data separate, you can create a new Chrome user for <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>.
793 </message> 793 </message>
794 <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_NO" desc="Text of the button to link the current profile with the signed-in enterprise account"> 794 <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_NO" desc="Text of the button to link the current profile with the signed-in enterprise account">
795 Link my Chrome data to this account 795 Link my Chrome data to this account
796 </message> 796 </message>
797 797
798 <!-- Enterprise sign-in dialog (new-style) -->
799 <!-- TODO(dconnelly): remove "new-style" once the old dialog is gone. -->
800 <message name="IDS_ENTERPRISE_SIGNIN_TITLE_NEW_STYLE" desc="The title of t he dialog to confirm linking the browser profile with the signed-in enterprise a ccount">
801 Save your Chrome data to this account?
802 </message>
803 <message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITHOUT_PROFILE_CREATION_ NEW_STYLE" desc="The warning message displayed to an enterprise user about to li nk their profile to their Google account. This message is followed by a 'Learn m ore' link.">
804 You are signing in with a managed account and giving its administrator c ontrol over your Google Chrome profile. Your Chrome data, such as your apps, boo kmarks, 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 delete this data via the Google Accounts Dashboard, but you will not be able to associa te this data with another account. <ph name="LEARN_MORE">$2<ex>Learn more</ex></ ph>
805 </message>
806 <message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITH_PROFILE_CREATION_NEW _STYLE" desc="The warning message displayed to an enterprise user about to link their profile to their Google account. Additionally notifies the user that they can create a new profile instead. This message is followed by a 'Learn more' lin k.">
807 You are signing in with a managed account and giving its administrator c ontrol over your Google Chrome profile. Your Chrome data, such as your apps, boo kmarks, 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 delete this data via the Google Accounts Dashboard, but you will not be able to associa te this data with another account. You can optionally create a new profile to ke ep your existing Chrome data separate. <ph name="LEARN_MORE">$2<ex>Learn more</e x></ph>
808 </message>
809
798 <message name="IDS_AUTOFILL_DIALOG_SAVE_LOCALLY_CHECKBOX" desc="Checkbox t hat controls whether info the user types into the autofill dialog is saved by ch rome."> 810 <message name="IDS_AUTOFILL_DIALOG_SAVE_LOCALLY_CHECKBOX" desc="Checkbox t hat controls whether info the user types into the autofill dialog is saved by ch rome.">
799 Save details in Chrome 811 Save details in Chrome
800 </message> 812 </message>
801 813
802 <!-- Network Error Pages --> 814 <!-- Network Error Pages -->
803 <message name="IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION_BODY" desc="Wh en a page fails to load, sometimes we suggest disabling predicting network actio ns. These are details below a header."> 815 <message name="IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION_BODY" desc="Wh en a page fails to load, sometimes we suggest disabling predicting network actio ns. These are details below a header.">
804 Go to 816 Go to
805 the Chrome menu &gt; 817 the Chrome menu &gt;
806 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/spa n&gt;<ex>Settings</ex></ph> 818 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/spa n&gt;<ex>Settings</ex></ph>
807 &gt; 819 &gt;
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 895
884 <!-- Chrome OS OOBE Terms of Service screen--> 896 <!-- Chrome OS OOBE Terms of Service screen-->
885 <if expr="pp_ifdef('chromeos')"> 897 <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."> 898 <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. 899 <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> 900 </message>
889 </if> 901 </if>
890 </messages> 902 </messages>
891 </release> 903 </release>
892 </grit> 904 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/browser_dialogs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698