| 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 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 766 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 777 </message> | 777 </message> |
| 778 <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."> | 778 <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 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. | 779 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 | 780 |
| 781 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>. | 781 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 </message> | 782 </message> |
| 783 </if> | 783 </if> |
| 784 | 784 |
| 785 <!-- Enterprise sign-in profile linking --> | 785 <!-- Enterprise sign-in profile linking --> |
| 786 <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"> | 786 <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"> |
| 787 » Link your Chrome profile | 787 Important information regarding your Google Chrome data |
| 788 </message> | 788 </message> |
| 789 <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 <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."> |
| 790 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 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. |
| 791 </message> | 791 </message> |
| 792 <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 <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"> |
| 793 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 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>. |
| 794 </message> | 794 </message> |
| 795 <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 <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"> |
| 796 Link my Chrome data to this account | 796 Link my Chrome data to this account |
| 797 </message> | 797 </message> |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 911 | 911 |
| 912 <!-- Chrome OS OOBE Terms of Service screen--> | 912 <!-- Chrome OS OOBE Terms of Service screen--> |
| 913 <if expr="pp_ifdef('chromeos')"> | 913 <if expr="pp_ifdef('chromeos')"> |
| 914 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading
at the top of the Terms of Service screen."> | 914 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading
at the top of the Terms of Service screen."> |
| 915 <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. | 915 <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. |
| 916 </message> | 916 </message> |
| 917 </if> | 917 </if> |
| 918 </messages> | 918 </messages> |
| 919 </release> | 919 </release> |
| 920 </grit> | 920 </grit> |
| OLD | NEW |