| 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 If you update this file, be sure also to update google_chrome_strings.grd. --> | 3 If you update this file, be sure also to update google_chrome_strings.grd. --> |
| 4 | 4 |
| 5 <grit base_dir="." latest_public_release="0" current_release="1" | 5 <grit base_dir="." latest_public_release="0" current_release="1" |
| 6 output_all_resource_defines="false" source_lang_id="en" enc_check="möl"> | 6 output_all_resource_defines="false" source_lang_id="en" enc_check="möl"> |
| 7 <outputs> | 7 <outputs> |
| 8 <output filename="grit/chromium_strings.h" type="rc_header"> | 8 <output filename="grit/chromium_strings.h" type="rc_header"> |
| 9 <emit emit_type='prepend'></emit> | 9 <emit emit_type='prepend'></emit> |
| 10 </output> | 10 </output> |
| (...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 773 You're now signed in to Chromium! Sync is disabled by your administrat
or. | 773 You're now signed in to Chromium! Sync is disabled by your administrat
or. |
| 774 </message> | 774 </message> |
| 775 <message name="IDS_SYNC_WRONG_EMAIL" desc="Message shown when sync setup
failed due to the user entering the wrong email address for sign-in."> | 775 <message name="IDS_SYNC_WRONG_EMAIL" desc="Message shown when sync setup
failed due to the user entering the wrong email address for sign-in."> |
| 776 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. | 776 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. |
| 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 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. | 779 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. |
| 780 | 780 |
| 781 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>. | 781 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>. |
| 782 </message> | 782 </message> |
| 783 <message name="IDS_SYNC_USED_PROFILE_ERROR" desc="An error message shown
when user tries to sign in to a profile that is used by other user name before.
"> |
| 784 Someone previously signed in to Chromium on this computer as <ph name=
"ACCOUNT_EMAIL_LAST">$1<ex>user@example.com</ex></ph>. Please create a new Chrom
ium user to keep your information separate. |
| 785 </message> |
| 783 </if> | 786 </if> |
| 784 | 787 |
| 785 <!-- Enterprise sign-in profile linking --> | 788 <!-- Enterprise sign-in profile linking --> |
| 786 <if expr="not is_android"> | 789 <if expr="not is_android"> |
| 787 <message name="IDS_ENTERPRISE_SIGNIN_TITLE" desc="The title of the dialo
g to confirm linking the browser profile with the signed-in enterprise account"> | 790 <message name="IDS_ENTERPRISE_SIGNIN_TITLE" desc="The title of the dialo
g to confirm linking the browser profile with the signed-in enterprise account"> |
| 788 Important information regarding your Chromium data | 791 Important information regarding your Chromium data |
| 789 </message> | 792 </message> |
| 790 <message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION" desc="The warning mess
age displayed to an enterprise user about to link their profile to their Google
account. This message is followed by a 'Learn more' link."> | 793 <message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION" desc="The warning mess
age displayed to an enterprise user about to link their profile to their Google
account. This message is followed by a 'Learn more' link."> |
| 791 You are signing in with a managed account and giving its administrator
control over your Chromium profile. Your Chromium data, such as your apps, book
marks, history, passwords, and other settings will become permanently tied to <p
h name="USER_NAME">$1<ex>pat@example.com</ex></ph>. You will be able to delete t
his data via the Google Accounts Dashboard, but you will not be able to associat
e this data with another account. | 794 You are signing in with a managed account and giving its administrator
control over your Chromium profile. Your Chromium data, such as your apps, book
marks, history, passwords, and other settings will become permanently tied to <p
h name="USER_NAME">$1<ex>pat@example.com</ex></ph>. You will be able to delete t
his data via the Google Accounts Dashboard, but you will not be able to associat
e this data with another account. |
| 792 </message> | 795 </message> |
| (...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1300 <message name="IDS_PRIVATE_USER_DATA_INPUT_FUTURE_DESCRIPTION" desc="Descr
iption of a security problem where the site collects private user data on an ins
ecure page, which will result in an omnibox warning in future versions of Chromi
um." translateable="false"> | 1303 <message name="IDS_PRIVATE_USER_DATA_INPUT_FUTURE_DESCRIPTION" desc="Descr
iption of a security problem where the site collects private user data on an ins
ecure page, which will result in an omnibox warning in future versions of Chromi
um." translateable="false"> |
| 1301 This page includes a password or credit card input over HTTP. A warning
will be added to the URL bar starting in Chromium 56 (Jan 2017). | 1304 This page includes a password or credit card input over HTTP. A warning
will be added to the URL bar starting in Chromium 56 (Jan 2017). |
| 1302 </message> | 1305 </message> |
| 1303 <message name="IDS_PRIVATE_USER_DATA_INPUT_DESCRIPTION" desc="Description
of a security problem where the site collects private user data on an insecure p
age, which results in an omnibox warning." translateable="false"> | 1306 <message name="IDS_PRIVATE_USER_DATA_INPUT_DESCRIPTION" desc="Description
of a security problem where the site collects private user data on an insecure p
age, which results in an omnibox warning." translateable="false"> |
| 1304 This page includes a password or credit card input over HTTP. A warning
has been added to the URL bar. | 1307 This page includes a password or credit card input over HTTP. A warning
has been added to the URL bar. |
| 1305 </message> | 1308 </message> |
| 1306 | 1309 |
| 1307 </messages> | 1310 </messages> |
| 1308 </release> | 1311 </release> |
| 1309 </grit> | 1312 </grit> |
| OLD | NEW |