Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Unified Diff: chrome/app/generated_resources.grd

Side-by-side diff isn't available for this file because of its large size.
Issue 2315393002: [Signin Error Dialog] (2/3) Added handlers and UI constructors (Closed)
Patch Set: Rebase Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/saml/saml_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index db3a19d5413d08c00f9ad89e9845b79e53f739eb..1f5a0a3562772c09765cb20158aae5e2c034d244 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -11139,6 +11139,9 @@ I don't think this site should be blocked!
<message name="IDS_SYNC_USER_NAME_IN_USE_ERROR" desc="An error message shown when a user tries to sign in to sync using a user name that's already in use by another profile.">
This account is already being used on this computer.
</message>
+ <message name="IDS_SYNC_USER_NAME_IN_USE_BY_ERROR" desc="An error message shown when a user tries to sign in to sync using a user name that's already in use by another profile. This error message includes the avatar name of the existing duplicate profile and only appears in the signin error tab modal dialog.">
+ This account is already being used on this computer by <ph name="AVATAR_NAME">$1<ex>Jane</ex></ph>.
+ </message>
</if>
<!-- Sync Confirmation section of the tab modal signin flow -->
@@ -11170,6 +11173,26 @@ I don't think this site should be blocked!
Undo
</message>
+ <!-- Signin Error tab modal dialogue -->
+ <message name="IDS_SIGNIN_ERROR_TITLE" desc="Title of the signin error tab modal dialog.">
+ Can't sign in
+ </message>
+ <message name="IDS_SIGNIN_ERROR_EMAIL_TITLE" desc="Title of the signin error tab modal dialog when username can be retrieved to display.">
+ Can't sign in to <ph name="USERNAME">$1<ex>Jane.Doe@gmail.com</ex></ph>
+ </message>
+ <message name="IDS_SIGNIN_ERROR_LEARN_MORE_LINK" desc="Label in the signin error tab modal dialog containing the link to go to the Chrome Help page for sync problems.">
+ <ph name="SIGNIN_ERROR">$1<ex>Signing in with this username has been disabled by your administrator.</ex></ph> <ph name="BEGIN_LINK">&lt;a id="learnMoreLink" href="#"&gt;Learn more&lt;/a&gt;</ph>
+ </message>
+ <message name="IDS_SIGNIN_ERROR_CLOSE_BUTTON_LABEL" desc="Label of the Close button in the signin error dialog.">
+ Close
+ </message>
+ <message name="IDS_SIGNIN_ERROR_OK_BUTTON_LABEL" desc="Label of the confirmation button in the signin error dialog.">
+ OK
+ </message>
+ <message name="IDS_SIGNIN_ERROR_SWITCH_BUTTON_LABEL" desc="Label of the button for switching to an existing duplicate profile in the signin error dialog.">
+ Switch to <ph name="AVATAR_NAME">$1<ex>Jane</ex></ph>
+ </message>
+
<!-- Sign-in section of the tab modal signin flow -->
<message name="IDS_SIGNIN_ACCESSIBLE_CLOSE_BUTTON" desc="Accessibility label for the close button of the tab modal signin flow">
Close
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/saml/saml_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698