| 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 842 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 853 </message> | 853 </message> |
| 854 <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 <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."> |
| 855 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 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. |
| 856 | 856 |
| 857 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 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>. |
| 858 </message> | 858 </message> |
| 859 </if> | 859 </if> |
| 860 | 860 |
| 861 <!-- Enterprise sign-in profile linking --> | 861 <!-- Enterprise sign-in profile linking --> |
| 862 <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"> | 862 <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"> |
| 863 » Link your Chromium profile | 863 Important information regarding your Chromium data |
| 864 </message> | 864 </message> |
| 865 <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."> | 865 <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."> |
| 866 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 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. |
| 867 </message> | 867 </message> |
| 868 <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"> | 868 <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"> |
| 869 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 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>. |
| 870 </message> | 870 </message> |
| 871 <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"> | 871 <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"> |
| 872 Link my Chromium data to this account | 872 Link my Chromium data to this account |
| 873 </message> | 873 </message> |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 987 | 987 |
| 988 <!-- Chrome OS OOBE Terms of Service screen--> | 988 <!-- Chrome OS OOBE Terms of Service screen--> |
| 989 <if expr="pp_ifdef('chromeos')"> | 989 <if expr="pp_ifdef('chromeos')"> |
| 990 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading
at the top of the Terms of Service screen."> | 990 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading
at the top of the Terms of Service screen."> |
| 991 <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. | 991 <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. |
| 992 </message> | 992 </message> |
| 993 </if> | 993 </if> |
| 994 </messages> | 994 </messages> |
| 995 </release> | 995 </release> |
| 996 </grit> | 996 </grit> |
| OLD | NEW |