Merge pull request #18082 from willyaranda/bug/993422

Bug 993422. Use a specific string for ActiveSync username
mozilla-b2g · Apr 16, 2014 · 47836f8 · 47836f8
2 parents badf2a6 + e9dcb52
commit 47836f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/apps/email/js/cards/setup_manual_config.html b/apps/email/js/cards/setup_manual_config.html
@@ -165,7 +165,7 @@ <h2 data-l10n-id="setup-manual-activesync-header">
           </p>
           <p>
             <input class="sup-manual-activesync-username" type="text"
-                   data-l10n-id="setup-manual-username"
+                   data-l10n-id="setup-manual-activesync-username"
                    data-maybe-required />
             <button type="reset"></button>
           </p>

diff --git a/apps/email/locales/email.en-US.properties b/apps/email/locales/email.en-US.properties
@@ -112,6 +112,7 @@ setup-manual-socket-starttls=STARTTLS
 setup-manual-hostname.placeholder=Hostname
 setup-manual-port.placeholder=Port Number
 setup-manual-username.placeholder=Username
+setup-manual-activesync-username.placeholder=Domain\Username
 
 setup-bad-password-header=Bad password!
 setup-bad-password=We could not sign in to the server. Maybe your password is wrong?