Index: chrome/app/generated_resources.grd |
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd |
index 36cde3e248cad4c1a38a57ef9bf77729cc9d3f41..27c82ee7e3257ba045adb03013dac98a8b13f022 100644 |
--- a/chrome/app/generated_resources.grd |
+++ b/chrome/app/generated_resources.grd |
@@ -11260,6 +11260,26 @@ experiment id: "<ph name="EXPERIMENT_ID">$5<ex>ar1</ex></ph>" |
Use default settings |
</message> |
+ <!-- Enterprise sign-in profile linking --> |
+ <message name="IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_MESSAGE" desc="The warning message displayed to an enterprise user about to link their profile to their Google account"> |
Andrew T Wilson (Slow)
2013/02/04 13:53:12
Note in the description that this message is follo
dconnelly
2013/02/04 14:00:17
Done.
|
+ You are signing in with a managed account and giving its administrator control over your <ph name="PRODUCT_NAME">$1<ex>Chrome</ex></ph> profile. Your <ph name="PRODUCT_NAME">$1<ex>Chrome</ex></ph> data, such as your apps, bookmarks, 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 associate this data with another account. |
Andrew T Wilson (Slow)
2013/02/04 13:53:12
I want to confirm that we should use "Chrome" and
dconnelly
2013/02/04 15:07:27
Done.
|
+ </message> |
+ <message name="IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_LEARN_MORE" desc="The link to get more information about profile linking after signing into an enterprise account"> |
+ Learn more |
+ </message> |
+ <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 account"> |
+ If you prefer to keep your existing <ph name="PRODUCT_NAME">$1<ex>Chrome</ex></ph> data separate, you can create a new <ph name="PRODUCT_NAME">$1<ex>Chrome</ex></ph> user for <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. |
+ </message> |
+ <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_YES" desc="Text of the button to create a new profile after enterprise account signin"> |
+ Create a new user |
+ </message> |
+ <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"> |
+ Link my <ph name="PRODUCT_NAME">$1<ex>Chrome</ex></ph> data to this account |
+ </message> |
+ <message name="IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_CANCEL" desc="Text of the button to cancel signin"> |
+ Cancel |
+ </message> |
+ |
<!-- Cookies Window --> |
<message name="IDS_COOKIES_WEBSITE_PERMISSIONS_WINDOW_TITLE" desc="The title of the redesigned Cookies Window that lets you manage cookies, storage quota for websites and other permissions per-website"> |
Cookies and site data |