| OLD | NEW |
| 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 840 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 851 You were signed in to Chromium as <ph name="USER_EMAIL_ADDRESS">$1<ex>
foo@gmail.com</ex></ph>. Please use the same account to sign in again. | 851 You were signed in to Chromium as <ph name="USER_EMAIL_ADDRESS">$1<ex>
foo@gmail.com</ex></ph>. Please use the same account to sign in again. |
| 852 </message> | 852 </message> |
| 853 <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."> | 853 <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."> |
| 854 Someone previously signed in to Chromium on this computer as <ph name=
"ACCOUNT_EMAIL_LAST">$1<ex>user@example.com</ex></ph>. If that isn't your accoun
t, create a new Chromium user to keep your information separate. | 854 Someone previously signed in to Chromium on this computer as <ph name=
"ACCOUNT_EMAIL_LAST">$1<ex>user@example.com</ex></ph>. If that isn't your accoun
t, create a new Chromium user to keep your information separate. |
| 855 | 855 |
| 856 Signing in anyway will merge Chromium information like bookmarks, history, and o
ther settings to <ph name="ACCOUNT_EMAIL_NEW">$2<ex>user@example.com</ex></ph>. | 856 Signing in anyway will merge Chromium information like bookmarks, history, and o
ther settings to <ph name="ACCOUNT_EMAIL_NEW">$2<ex>user@example.com</ex></ph>. |
| 857 </message> | 857 </message> |
| 858 </if> | 858 </if> |
| 859 | 859 |
| 860 <!-- Enterprise sign-in profile linking --> | 860 <!-- Enterprise sign-in profile linking --> |
| 861 <message name="IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_DIALOG_TITLE" desc="The
title of the dialog to confirm linking the browser profile with the signed-in en
terprise account"> | 861 <message name="IDS_ENTERPRISE_SIGNIN_TITLE" desc="The title of the dialog
to confirm linking the browser profile with the signed-in enterprise account"> |
| 862 Important information regarding your Chromium data | 862 Important information regarding your Chromium data |
| 863 </message> | 863 </message> |
| 864 <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."> | 864 <message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION" desc="The warning messag
e displayed to an enterprise user about to link their profile to their Google ac
count. This message is followed by a 'Learn more' link."> |
| 865 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. | 865 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. |
| 866 </message> | 866 </message> |
| 867 <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"> | 867 <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_MESSAGE" desc="The
text of the prompt to create a new profile after signing into an enterprise acc
ount"> |
| 868 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>. | 868 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>. |
| 869 </message> | 869 </message> |
| 870 <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"> | 870 <message name="IDS_ENTERPRISE_SIGNIN_CONTINUE" desc="Text of the button to
link the current profile with the signed-in enterprise account"> |
| 871 Link my Chromium data to this account | 871 Link my Chromium data to this account |
| 872 </message> | 872 </message> |
| 873 | 873 |
| 874 <!-- Enterprise sign-in dialog (new-style) --> |
| 875 <!-- TODO(dconnelly): remove "new-style" once the old dialog is gone. --> |
| 876 <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"> |
| 877 Save your Chromium data to this account? |
| 878 </message> |
| 879 <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."> |
| 880 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. <ph name="LEARN_MORE">$2<ex>Learn more</ex></ph> |
| 881 </message> |
| 882 <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."> |
| 883 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. You can optionally create a new profile to keep
your existing Chromium data separate. <ph name="LEARN_MORE">$2<ex>Learn more</ex
></ph> |
| 884 </message> |
| 885 |
| 874 <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."> | 886 <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."> |
| 875 Save details in Chromium | 887 Save details in Chromium |
| 876 </message> | 888 </message> |
| 877 | 889 |
| 878 <!-- Network Error Pages --> | 890 <!-- Network Error Pages --> |
| 879 <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."> | 891 <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."> |
| 880 Go to | 892 Go to |
| 881 the Chromium menu > | 893 the Chromium menu > |
| 882 <ph name="SETTINGS_TITLE"><span jscontent="settingsTitle"></spa
n><ex>Settings</ex></ph> | 894 <ph name="SETTINGS_TITLE"><span jscontent="settingsTitle"></spa
n><ex>Settings</ex></ph> |
| 883 > | 895 > |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 959 | 971 |
| 960 <!-- Chrome OS OOBE Terms of Service screen--> | 972 <!-- Chrome OS OOBE Terms of Service screen--> |
| 961 <if expr="pp_ifdef('chromeos')"> | 973 <if expr="pp_ifdef('chromeos')"> |
| 962 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading
at the top of the Terms of Service screen."> | 974 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading
at the top of the Terms of Service screen."> |
| 963 <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. | 975 <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. |
| 964 </message> | 976 </message> |
| 965 </if> | 977 </if> |
| 966 </messages> | 978 </messages> |
| 967 </release> | 979 </release> |
| 968 </grit> | 980 </grit> |
| OLD | NEW |