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

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

Issue 14846020: Add Views implementation of ProfileSigninConfirmationDialog. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no ifdef on function proto 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
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 distribution specific. 2 <!-- This file contains definitions of strings that are distribution specific.
3 These strings will not be translated and only english versions will 3 These strings will not be translated and only english versions will
4 be available for now. --> 4 be available for now. -->
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/chromium_strings.h" type="rc_header"> 9 <output filename="grit/chromium_strings.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after
870 <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."> 870 <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.">
871 You are signing in with a managed account and giving its administrator c ontrol over your Chromium profile. Your Chromium data, such as your apps, bookma rks, 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 thi s data via the Google Accounts Dashboard, but you will not be able to associate this data with another account. 871 You are signing in with a managed account and giving its administrator c ontrol over your Chromium profile. Your Chromium data, such as your apps, bookma rks, 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 thi s data via the Google Accounts Dashboard, but you will not be able to associate this data with another account.
872 </message> 872 </message>
873 <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"> 873 <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">
874 If you prefer to keep your existing Chromium data separate, you can crea te a new Chromium user for <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. 874 If you prefer to keep your existing Chromium data separate, you can crea te a new Chromium user for <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>.
875 </message> 875 </message>
876 <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"> 876 <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">
877 Link my Chromium data to this account 877 Link my Chromium data to this account
878 </message> 878 </message>
879 879
880 <!-- Enterprise sign-in dialog (new-style) -->
881 <message name="IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_DIALOG_TITLE_NEW_STYLE" desc="The title of the dialog to confirm linking the browser profile with the si gned-in enterprise account">
882 Save your Chromium data to this account?
883 </message>
884 <message name="IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_MESSAGE_NEW_STYLE" desc= "The warning message displayed to an enterprise user about to link their profile to their Google account. This message is followed by a 'Learn more' link.">
885 Your bookmarks, history and other Chromium data can be saved to your Googl e Account and will then be controlled by the <ph name="DOMAIN">$1<ex>example.com </ex></ph> administrator. You can optionally create a new profile to keep your e xisting Chrome data separate. <ph name="LEARN_MORE">$2<ex>Learn more</ex></ph>
Andrew T Wilson (Slow) 2013/05/08 14:23:48 Just to document our offline discussion - we proba
dconnelly 2013/05/13 14:45:21 Done.
886 </message>
887
880 <message name="IDS_AUTOFILL_OPTIONS_POPUP" desc="The value of the Autofill options menu entry."> 888 <message name="IDS_AUTOFILL_OPTIONS_POPUP" desc="The value of the Autofill options menu entry.">
881 Chromium Autofill settings 889 Chromium Autofill settings
882 </message> 890 </message>
883 <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."> 891 <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.">
884 Save details in Chromium 892 Save details in Chromium
885 </message> 893 </message>
886 894
887 <!-- Network Error Pages --> 895 <!-- Network Error Pages -->
888 <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."> 896 <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.">
889 Go to 897 Go to
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
968 976
969 <!-- Chrome OS OOBE Terms of Service screen--> 977 <!-- Chrome OS OOBE Terms of Service screen-->
970 <if expr="pp_ifdef('chromeos')"> 978 <if expr="pp_ifdef('chromeos')">
971 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading at the top of the Terms of Service screen."> 979 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading at the top of the Terms of Service screen.">
972 <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 Chromium OS Terms. 980 <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 Chromium OS Terms.
973 </message> 981 </message>
974 </if> 982 </if>
975 </messages> 983 </messages>
976 </release> 984 </release>
977 </grit> 985 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698