| 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 781 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 792 </message> | 792 </message> |
| 793 <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_MESSAGE" desc="T
he text of the prompt to create a new profile after signing in to an enterprise
account"> | 793 <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_MESSAGE" desc="T
he text of the prompt to create a new profile after signing in to an enterprise
account"> |
| 794 If you prefer to keep your existing Chromium data separate, you can cr
eate a new Chromium user for <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph
>. | 794 If you prefer to keep your existing Chromium data separate, you can cr
eate a new Chromium user for <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph
>. |
| 795 </message> | 795 </message> |
| 796 <message name="IDS_ENTERPRISE_SIGNIN_CONTINUE" desc="Text of the button
to link the current profile with the signed-in enterprise account"> | 796 <message name="IDS_ENTERPRISE_SIGNIN_CONTINUE" desc="Text of the button
to link the current profile with the signed-in enterprise account"> |
| 797 Link my Chromium data to this account | 797 Link my Chromium data to this account |
| 798 </message> | 798 </message> |
| 799 </if> | 799 </if> |
| 800 | 800 |
| 801 <!-- Enterprise sign-in dialog (new-style) --> | 801 <!-- Enterprise sign-in dialog (new-style) --> |
| 802 <!-- TODO(dconnelly): remove "new-style" once the old dialog is gone. --> | 802 <!-- TODO(crbug.com/660349): remove "new-style" once the old dialog is gon
e. --> |
| 803 <if expr="toolkit_views or is_macosx"> | 803 <if expr="toolkit_views or is_macosx"> |
| 804 <message name="IDS_ENTERPRISE_SIGNIN_TITLE_NEW_STYLE" desc="The title of
the dialog to confirm linking the browser profile with the signed-in enterprise
account"> | 804 <message name="IDS_ENTERPRISE_SIGNIN_TITLE_NEW_STYLE" desc="The title of
the dialog to confirm linking the browser profile with the signed-in enterprise
account"> |
| 805 Link your Chromium data to this account? | 805 Link your Chromium data to this account? |
| 806 </message> | 806 </message> |
| 807 <message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITHOUT_PROFILE_CREATIO
N_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."> | 807 <message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITHOUT_PROFILE_CREATIO
N_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."> |
| 808 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. <ph name="LEARN_MORE">$2<ex>Learn more</ex></p
h> | 808 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. <ph name="LEARN_MORE">$2<ex>Learn more</ex></p
h> |
| 809 </message> | 809 </message> |
| 810 <message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITH_PROFILE_CREATION_N
EW_STYLE" desc="The warning message displayed to an enterprise user about to lin
k their profile to their Google account. Additionally notifies the user that the
y can create a new profile instead. This message is followed by a 'Learn more' l
ink."> | 810 <message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITH_PROFILE_CREATION_N
EW_STYLE" desc="The warning message displayed to an enterprise user about to lin
k their profile to their Google account. Additionally notifies the user that the
y can create a new profile instead. This message is followed by a 'Learn more' l
ink."> |
| 811 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. You can optionally create a new profile to kee
p your existing Chromium data separate. <ph name="LEARN_MORE">$2<ex>Learn more</
ex></ph> | 811 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. You can optionally create a new profile to kee
p your existing Chromium data separate. <ph name="LEARN_MORE">$2<ex>Learn more</
ex></ph> |
| 812 </message> | 812 </message> |
| (...skipping 487 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"> | 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"> |
| 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). | 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). |
| 1302 </message> | 1302 </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"> | 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"> |
| 1304 This page includes a password or credit card input over HTTP. A warning
has been added to the URL bar. | 1304 This page includes a password or credit card input over HTTP. A warning
has been added to the URL bar. |
| 1305 </message> | 1305 </message> |
| 1306 | 1306 |
| 1307 </messages> | 1307 </messages> |
| 1308 </release> | 1308 </release> |
| 1309 </grit> | 1309 </grit> |
| OLD | NEW |