From 36d605a1e9b8ca05c5f9342602731e11346f3447 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 1 Dec 2010 13:10:54 -0800
Subject: [PATCH] Ticket #2912 tweaks: clean up wording on the incoming email
 generator box a bit.

---
 actions/emailsettings.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 02b6892e0f..aae39f6afc 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -173,11 +173,17 @@ class EmailsettingsAction extends AccountSettingsAction
             }
 
             $this->elementStart('p');
-            $this->element('span', 'input_instructions',
-                           // TRANS: Instructions for incoming e-mail address input form.
-                           _('Make a new email address for posting to; '.
-                             'cancels the old one.'));
+            if ($user->incomingemail) {
+                // TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
+                $msg = _('Make a new email address for posting to; '.
+                         'cancels the old one.');
+            } else {
+                // TRANS: Instructions for incoming e-mail address input form.
+                $msg = _('To send notices via email, we need to create a unique email address for you on this server:');
+            }
+            $this->element('span', 'input_instructions', $msg);
             $this->elementEnd('p');
+
             // TRANS: Button label for adding an e-mail address to send notices from.
             $this->submit('newincoming', _m('BUTTON','New'));
             $this->elementEnd('fieldset');