Backed out changesets cf87c5c76627 and 1ab1fff092a5 (bug 802266) for bustage.

CLOSED TREE

mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties

@@ -16,9 +16,24 @@ unableToOpenTmpFile=Unable to open the temporary file %S. Check your 'Temporary
 ## @name NS_MSG_UNABLE_TO_SAVE_DRAFT
 12503=Unable to save your message as draft.
 
+## @name NS_MSG_LOAD_ATTACHMNTS
+12504=Loading attachments…
+
+## @name NS_MSG_LOAD_ATTACHMNT
+12505=Loading attachment…
+
 ## @name NS_MSG_COULDNT_OPEN_FCC_FOLDER
 12506=Couldn't open Sent Mail folder. Please verify that your Mail preferences are correct.
 
+## @name NS_MSG_CANT_POST_TO_MULTIPLE_NEWS_HOSTS
+12507=Can't post to multiple news hosts. Try again.
+
+## @name NS_MSG_ASSEMB_DONE_MSG
+12508=Assembling message…Done
+
+## @name NS_MSG_ASSEMBLING_MSG
+12509=Assembling message…
+
 ## @name NS_MSG_NO_SENDER
 12510=No sender was specified. Please fill in your email address in the Mail & Newsgroups account settings.
 
@@ -46,6 +61,15 @@ unableToOpenTmpFile=Unable to open the temporary file %S. Check your 'Temporary
 ## @name NS_ERROR_SEND_FAILED
 12520=Sending of message failed.
 
+## @name SMTP_DELIV_MAIL
+12521=Delivering mail…
+
+## @name SMTP_MESSAGE_SENT_WAITING_MAIL_REPLY
+12522=Mail: Message sent; waiting for reply…
+
+## @name SMTP_PROGRESS_MAILSENT
+12523=Mail sent successfully
+
 ## @name NS_ERROR_SMTP_SERVER_ERROR
 12524=An error occurred sending mail: SMTP server error. The server responded:  %s Contact your mail administrator for assistance.
 
@@ -70,20 +94,75 @@ unableToOpenTmpFile=Unable to open the temporary file %S. Check your 'Temporary
 ## @name NS_MSG_FAILED_COPY_OPERATION
 12532=The message was sent successfully, but could not be copied to your Sent folder.
 
+## @name NS_MSG_FAILURE_ON_OBJ_EMBED_WHILE_SAVING
+12533=There was a problem including the file %.200s in the message. Would you like to continue saving the message without this file?
+
+## @name NS_MSG_ASSEMBLING_MESSAGE
+12534=Assembling mail information…
+
+## @name NS_MSG_GATHERING_ATTACHMENT
+12535=Attaching %s…
+
+## @name NS_MSG_CREATING_MESSAGE
+12536=Creating mail message…
+
+## @name NS_MSG_FAILURE_ON_OBJ_EMBED_WHILE_SENDING
+12537=There was a problem including the file %.200s in the message. Would you like to continue sending the message without this file?
+
+## @name NS_MSG_START_COPY_MESSAGE
+12538=Copying message to %S folder…
+
+## @name NS_MSG_START_COPY_MESSAGE_COMPLETE
+12539=Copy complete.
+
+## @name NS_MSG_START_COPY_MESSAGE_FAILED
+12540=Copy failed.
+
+## @name NS_MSG_LARGE_MESSAGE_WARNING
+12541=Warning! You are about to send a %d byte message. Are you sure that you want to do this?
+
+## @name NS_MSG_SENDING_MESSAGE
+12550=Sending message…
+
+## @name NS_MSG_POSTING_MESSAGE
+12551=Posting message…
+
 ## @name NS_ERROR_NNTP_NO_CROSS_POSTING
 12554=You can only send a message to one news server at a time.
 
 ## @name NS_MSG_CANCELLING
 12555=Cancelling…
 
+## @name NS_MSG_SEND_ERROR_TITLE
+12556=Send Message Error
+
+## @name NS_MSG_SENDLATER_ERROR_TITLE
+12557=Send Later Error
+
+## @name NS_MSG_SAVE_DRAFT_TITLE
+12558=Save Draft Error
+
+## @name NS_MSG_SAVE_TEMPLATE_TITLE
+12559=Save Template Error
+
 ## @name NS_ERROR_SEND_FAILED_BUT_NNTP_OK
 12560=Your message has been posted to the newsgroup but has not been sent to other recipient.
 
+## @name NS_MSG_ASK_TO_COMEBACK_TO_COMPOSE
+12561=Would you like to return to the compose window?
+
+## @name NS_MSG_GENERIC_FAILURE_EXPLANATION
+12562=Please verify that your Mail & Newsgroups account settings are correct and try again.
+
 ## @name NS_MSG_ERROR_READING_FILE
 12563=Error reading file.
 
 followupToSenderMessage=The author of this message has requested that responses be sent only to the author. If you also want to reply to the newsgroup, add a new row to the addressing area, choose Newsgroup from the recipients list, and enter the name of the newsgroup.
 
+## @name NS_MSG_UNDISCLOSED_RECIPIENTS
+## LOCALIZATION NOTE: this string must be using only US_ASCII characters
+12566=undisclosed-recipients
+
 ## @name NS_MSG_ERROR_ATTACHING_FILE
 12570=There was an error attaching %S. Please check if you have access to the file.
 
@@ -164,11 +243,6 @@ saveDlogMessages=Message has not been sent. Do you want to save the message in y
 defaultSubject=(no subject)
 chooseFileToAttach=Attach File(s)
 
-genericFailureExplanation=Please verify that your Mail & Newsgroups account settings are correct and try again.
-
-## LOCALIZATION NOTE (undisclosedRecipients): this string must use only US_ASCII characters
-undisclosedRecipients=undisclosed-recipients
-
 # LOCALIZATION NOTE (chooseFileToAttachViaCloud): %1$S is the cloud
 # provider to save the file to.
 chooseFileToAttachViaCloud=Attach File(s) via %1$S
@@ -235,38 +309,6 @@ sendMessageCheckWindowTitle=Send Message
 sendMessageCheckLabel=Are you sure you are ready to send this message?
 sendMessageCheckSendButtonLabel=Send
 
-assemblingMessageDone=Assembling message…Done
-assemblingMessage=Assembling message…
-
-smtpDeliveringMail=Delivering mail…
-smtpMailSent=Mail sent successfully
-
-assemblingMailInformation=Assembling mail information…
-## LOCALIZATION NOTE (gatheringAttachment): argument %S is file name/URI of attachment
-gatheringAttachment=Attaching %S…
-creatingMailMessage=Creating mail message…
-
-## LOCALIZATION NOTE (copyMessageStart): argument %S is folder name
-copyMessageStart=Copying message to %S folder…
-copyMessageComplete=Copy complete.
-copyMessageFailed=Copy failed.
-
-sendLargeMessageWarning=Warning! You are about to send a %d byte message. Are you sure that you want to do this?
-
-sendingMessage=Sending message…
-sendMessageErrorTitle=Send Message Error
-postingMessage=Posting message…
-
-sendLaterErrorTitle=Send Later Error
-saveDraftErrorTitle=Save Draft Error
-saveTemplateErrorTitle=Save Template Error
-
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is file name/URI of object to be embedded
-failureOnObjectEmbeddingWhileSaving=There was a problem including the file %.200S in the message. Would you like to continue saving the message without this file?
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is file name/URI of object to be embedded
-failureOnObjectEmbeddingWhileSending=There was a problem including the file %.200S in the message. Would you like to continue sending the message without this file?
-returnToComposeWindowQuestion=Would you like to return to the compose window?
-
 ## reply header in composeMsg
 ## <author> wrote:
 mailnews.reply_header_authorwrote=%s wrote

mailnews/compose/src/nsComposeStrings.h

@@ -4,7 +4,7 @@
 
 /**
   String Ids used by mailnews\compose
-  To Do: Convert the callers to use names instead of ids and then make this file obsolete.
+  To Do: Conver the callers to use names instead of ids and then make this file obsolete.
  */
  
 #ifndef _nsComposeStrings_H__
@@ -14,7 +14,12 @@
 #define NS_MSG_UNABLE_TO_OPEN_TMP_FILE              NS_MSG_GENERATE_FAILURE(12501)
 #define NS_MSG_UNABLE_TO_SAVE_TEMPLATE              NS_MSG_GENERATE_FAILURE(12502)
 #define NS_MSG_UNABLE_TO_SAVE_DRAFT                 NS_MSG_GENERATE_FAILURE(12503)
+#define NS_MSG_LOAD_ATTACHMNTS                      NS_MSG_GENERATE_SUCCESS(12504)
+#define NS_MSG_LOAD_ATTACHMNT                       NS_MSG_GENERATE_SUCCESS(12505)
 #define NS_MSG_COULDNT_OPEN_FCC_FOLDER              NS_MSG_GENERATE_FAILURE(12506)
+#define NS_MSG_CANT_POST_TO_MULTIPLE_NEWS_HOSTS     NS_MSG_GENERATE_FAILURE(12507)
+#define NS_MSG_ASSEMB_DONE_MSG                      12508
+#define NS_MSG_ASSEMBLING_MSG                       12509
 #define NS_MSG_NO_SENDER                            NS_MSG_GENERATE_FAILURE(12510)
 #define NS_MSG_NO_RECIPIENTS                        NS_MSG_GENERATE_FAILURE(12511)
 #define NS_MSG_ERROR_WRITING_FILE                   NS_MSG_GENERATE_FAILURE(12512)
@@ -24,6 +29,9 @@
 #define NS_ERROR_POST_FAILED                        NS_MSG_GENERATE_FAILURE(12518)
 #define NS_ERROR_QUEUED_DELIVERY_FAILED             NS_MSG_GENERATE_FAILURE(12519)
 #define NS_ERROR_SEND_FAILED                        NS_MSG_GENERATE_FAILURE(12520)
+#define SMTP_DELIV_MAIL                             12521
+#define SMTP_MESSAGE_SENT_WAITING_MAIL_REPLY        NS_MSG_GENERATE_SUCCESS(12522)
+#define SMTP_PROGRESS_MAILSENT                      12523
 #define NS_ERROR_SMTP_SERVER_ERROR                  NS_MSG_GENERATE_FAILURE(12524)
 #define NS_MSG_UNABLE_TO_SEND_LATER                 NS_MSG_GENERATE_FAILURE(12525)
 #define NS_ERROR_COMMUNICATIONS_ERROR               NS_MSG_GENERATE_FAILURE(12526)
@@ -32,15 +40,36 @@
 #define NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS   NS_MSG_GENERATE_FAILURE(12529)
 #define NS_ERROR_MIME_MPART_ATTACHMENT_ERROR        NS_MSG_GENERATE_FAILURE(12531)
 #define NS_MSG_FAILED_COPY_OPERATION                NS_MSG_GENERATE_FAILURE(12532)
+// For message sending operations...
+#define NS_MSG_FAILURE_ON_OBJ_EMBED_WHILE_SAVING    12533
+#define NS_MSG_ASSEMBLING_MESSAGE                   12534
+#define NS_MSG_GATHERING_ATTACHMENT                 12535
+#define NS_MSG_CREATING_MESSAGE                     12536
+#define NS_MSG_FAILURE_ON_OBJ_EMBED_WHILE_SENDING   12537
+#define NS_MSG_START_COPY_MESSAGE                   12538
+#define NS_MSG_START_COPY_MESSAGE_COMPLETE          12539
+#define NS_MSG_START_COPY_MESSAGE_FAILED            12540
+#define NS_MSG_LARGE_MESSAGE_WARNING                12541
+
+#define NS_MSG_SENDING_MESSAGE                      12550
+#define NS_MSG_POSTING_MESSAGE                      12551
 
 /* 12554 is taken by NS_ERROR_NNTP_NO_CROSS_POSTING.  use 12555 as the next one */
 
 #define NS_MSG_CANCELLING                           NS_MSG_GENERATE_SUCCESS(12555)
 
-// For message sending report
+// For message sending report...
+#define NS_MSG_SEND_ERROR_TITLE                     12556
+#define NS_MSG_SENDLATER_ERROR_TITLE                12557
+#define NS_MSG_SAVE_DRAFT_TITLE                     12558
+#define NS_MSG_SAVE_TEMPLATE_TITLE                  12559
 #define NS_ERROR_SEND_FAILED_BUT_NNTP_OK            NS_MSG_GENERATE_FAILURE(12560)
+#define NS_MSG_ASK_TO_COMEBACK_TO_COMPOSE           12561
+#define NS_MSG_GENERIC_FAILURE_EXPLANATION          12562
 #define NS_MSG_ERROR_READING_FILE                   NS_MSG_GENERATE_FAILURE(12563)
 
+#define NS_MSG_UNDISCLOSED_RECIPIENTS               12566
+
 #define NS_MSG_ERROR_ATTACHING_FILE                 NS_MSG_GENERATE_FAILURE(12570)
 
 #define NS_ERROR_SMTP_GREETING                      NS_MSG_GENERATE_FAILURE(12572)

mailnews/compose/src/nsMsgAttachmentHandler.cpp

@@ -1030,6 +1030,7 @@ nsMsgAttachmentHandler::UrlExit(nsresult status, const char16_t* aMsg)
     bool              keepOnGoing = true;
     nsCString    turl;
     nsString     msg;
+    char16_t         *printfString = nullptr;
     nsresult rv;
     nsCOMPtr<nsIStringBundleService> bundleService =
       mozilla::services::GetStringBundleService();
@@ -1039,34 +1040,29 @@ nsMsgAttachmentHandler::UrlExit(nsresult status, const char16_t* aMsg)
     NS_ENSURE_SUCCESS(rv, rv);
     nsMsgDeliverMode mode = nsIMsgSend::nsMsgDeliverNow;
     m_mime_delivery_state->GetDeliveryMode(&mode);
-    nsCString params;
+    if (mode == nsIMsgSend::nsMsgSaveAsDraft || mode == nsIMsgSend::nsMsgSaveAsTemplate)
+      bundle->GetStringFromID(NS_MSG_FAILURE_ON_OBJ_EMBED_WHILE_SAVING, getter_Copies(msg));
+    else
+      bundle->GetStringFromID(NS_MSG_FAILURE_ON_OBJ_EMBED_WHILE_SENDING, getter_Copies(msg));
     if (!m_realName.IsEmpty())
-      params = m_realName;
+      printfString = nsTextFormatter::smprintf(msg.get(), m_realName.get());
     else if (NS_SUCCEEDED(mURL->GetSpec(turl)) && !turl.IsEmpty())
     {
       nsAutoCString unescapedUrl;
       MsgUnescapeString(turl, 0, unescapedUrl);
       if (unescapedUrl.IsEmpty())
-        params = turl;
+        printfString = nsTextFormatter::smprintf(msg.get(), turl.get());
       else
-        params = unescapedUrl;
+        printfString = nsTextFormatter::smprintf(msg.get(), unescapedUrl.get());
     }
     else
-      params.AssignLiteral("?");
+      printfString = nsTextFormatter::smprintf(msg.get(), "?");
-
-    NS_ConvertUTF8toUTF16 UTF16params(params);
-    const char16_t* formatParams[] = { UTF16params.get() };
-    if (mode == nsIMsgSend::nsMsgSaveAsDraft || mode == nsIMsgSend::nsMsgSaveAsTemplate)
-      bundle->FormatStringFromName(MOZ_UTF16("failureOnObjectEmbeddingWhileSaving"),
-                                   formatParams, 1, getter_Copies(msg));
-    else
-      bundle->FormatStringFromName(MOZ_UTF16("failureOnObjectEmbeddingWhileSending"),
-                                   formatParams, 1, getter_Copies(msg));
 
     nsCOMPtr<nsIPrompt> aPrompt;
     if (m_mime_delivery_state)
       m_mime_delivery_state->GetDefaultPrompt(getter_AddRefs(aPrompt));
-    nsMsgAskBooleanQuestionByString(aPrompt, msg.get(), &keepOnGoing);
+    nsMsgAskBooleanQuestionByString(aPrompt, printfString, &keepOnGoing);
+    PR_FREEIF(printfString);
 
     if (keepOnGoing)
     {

mailnews/compose/src/nsMsgCompUtils.cpp

@@ -631,8 +631,7 @@ mime_generate_headers (nsMsgCompFields *fields,
           if (NS_SUCCEEDED(rv))
           {
             nsString undisclosedRecipients;
-            rv = composeStringBundle->GetStringFromName(MOZ_UTF16("undisclosedRecipients"),
+            rv = composeStringBundle->GetStringFromID(NS_MSG_UNDISCLOSED_RECIPIENTS, getter_Copies(undisclosedRecipients));
-                                                        getter_Copies(undisclosedRecipients));
             if (NS_SUCCEEDED(rv) && !undisclosedRecipients.IsEmpty())
             {
                 PUSH_STRING("To: ");

mailnews/compose/src/nsMsgSend.cpp

@@ -572,8 +572,7 @@ nsMsgComposeAndSend::GatherMimeAttachments()
 
   NS_ASSERTION (m_attachment_pending_count == 0, "m_attachment_pending_count != 0");
 
-  mComposeBundle->GetStringFromName(MOZ_UTF16("assemblingMessage"),
+  mComposeBundle->GetStringFromID(NS_MSG_ASSEMBLING_MSG, getter_Copies(msg));
-                                    getter_Copies(msg));
   SetStatusMessage( msg );
 
   /* First, open the message file.
@@ -922,8 +921,7 @@ nsMsgComposeAndSend::GatherMimeAttachments()
   }
 
   // Tell the user we are creating the message...
-  mComposeBundle->GetStringFromName(MOZ_UTF16("creatingMailMessage"),
+  mComposeBundle->GetStringFromID(NS_MSG_CREATING_MESSAGE, getter_Copies(msg));
-                                    getter_Copies(msg));
   SetStatusMessage( msg );
 
   // OK, now actually write the structure we've carefully built up.
@@ -965,8 +963,7 @@ nsMsgComposeAndSend::GatherMimeAttachments()
     }
   }
 
-  mComposeBundle->GetStringFromName(MOZ_UTF16("assemblingMessageDone"),
+  mComposeBundle->GetStringFromID(NS_MSG_ASSEMB_DONE_MSG, getter_Copies(msg));
-                                    getter_Copies(msg));
   SetStatusMessage(msg);
 
   if (m_dont_deliver_p && mListener)
@@ -2581,15 +2578,16 @@ nsMsgComposeAndSend::HackAttachments(nsIArray *attachments,
       //
 
       // Display some feedback to user...
+      char16_t     *printfString = nullptr;
       nsString msg;
-      NS_ConvertUTF8toUTF16 params(m_attachments[i]->m_realName);
+      mComposeBundle->GetStringFromID(NS_MSG_GATHERING_ATTACHMENT, getter_Copies(msg));
-      const char16_t *formatParams[] = { params.get() };
-      mComposeBundle->FormatStringFromName(MOZ_UTF16("gatheringAttachment"),
-                                           formatParams, 1, getter_Copies(msg));
 
-      if (!msg.IsEmpty())
+      printfString = nsTextFormatter::smprintf(msg.get(), m_attachments[i]->m_realName.get());
+
+      if (printfString)
       {
-        SetStatusMessage(msg);
+        SetStatusMessage(nsDependentString(printfString));
+        PR_Free(printfString);
       }
 
       /* As SnarfAttachment will call GatherMimeAttachments when it will be done (this is an async process),
@@ -3207,7 +3205,7 @@ nsMsgComposeAndSend::Init(
   }
 
   // Tell the user we are assembling the message...
-  mComposeBundle->GetStringFromName(MOZ_UTF16("assemblingMailInformation"), getter_Copies(msg));
+  mComposeBundle->GetStringFromID(NS_MSG_ASSEMBLING_MESSAGE, getter_Copies(msg));
   SetStatusMessage(msg);
   if (mSendReport)
     mSendReport->SetCurrentProcess(nsIMsgSendReport::process_BuildMessage);
@@ -3398,7 +3396,7 @@ nsMsgComposeAndSend::DeliverMessage()
   {
     bool abortTheSend = false;
     nsString msg;
-    mComposeBundle->GetStringFromName(MOZ_UTF16("sendLargeMessageWarning"), getter_Copies(msg));
+    mComposeBundle->GetStringFromID(NS_MSG_LARGE_MESSAGE_WARNING, getter_Copies(msg));
 
     if (!msg.IsEmpty())
     {
@@ -3565,7 +3563,7 @@ nsMsgComposeAndSend::DeliverFileAsMail()
 
     // Tell the user we are sending the message!
     nsString msg;
-    mComposeBundle->GetStringFromName(MOZ_UTF16("sendingMessage"), getter_Copies(msg));
+    mComposeBundle->GetStringFromID(NS_MSG_SENDING_MESSAGE, getter_Copies(msg));
     SetStatusMessage(msg);
     nsCOMPtr<nsIMsgStatusFeedback> msgStatus (do_QueryInterface(mSendProgress));
     // if the sendProgress isn't set, let's use the member variable.
@@ -3614,8 +3612,7 @@ nsMsgComposeAndSend::DeliverFileAsNews()
 
     // Tell the user we are posting the message!
     nsString msg;
-    mComposeBundle->GetStringFromName(MOZ_UTF16("postingMessage"),
+    mComposeBundle->GetStringFromID(NS_MSG_POSTING_MESSAGE, getter_Copies(msg));
-                                      getter_Copies(msg));
     SetStatusMessage(msg);
 
     nsCOMPtr <nsIMsgMailSession> mailSession = do_GetService(NS_MSGMAILSESSION_CONTRACTID, &rv);
@@ -3971,9 +3968,9 @@ nsMsgComposeAndSend::NotifyListenerOnStopCopy(nsresult aStatus)
   // Set a status message...
   nsString msg;
   if (NS_SUCCEEDED(aStatus))
-    mComposeBundle->GetStringFromName(MOZ_UTF16("copyMessageComplete"), getter_Copies(msg));
+    mComposeBundle->GetStringFromID(NS_MSG_START_COPY_MESSAGE_COMPLETE, getter_Copies(msg));
   else
-    mComposeBundle->GetStringFromName(MOZ_UTF16("copyMessageFailed"), getter_Copies(msg));
+    mComposeBundle->GetStringFromID(NS_MSG_START_COPY_MESSAGE_FAILED, getter_Copies(msg));
 
   SetStatusMessage(msg);
   nsCOMPtr<nsIPrompt> prompt;
@@ -4420,8 +4417,7 @@ nsMsgComposeAndSend::MimeDoFCC(nsIFile          *input_file,
     goto FAIL;
 
   // Tell the user we are copying the message...
-  mComposeBundle->GetStringFromName(MOZ_UTF16("copyMessageStart"),
+  mComposeBundle->GetStringFromID(NS_MSG_START_COPY_MESSAGE, getter_Copies(msg));
-                                    getter_Copies(msg));
   if (!msg.IsEmpty())
   {
     nsCOMPtr<nsIRDFService> rdfService = do_GetService(kRDFServiceCID);

mailnews/compose/src/nsMsgSendReport.cpp

@@ -301,8 +301,7 @@ NS_IMETHODIMP nsMsgSendReport::DisplayReport(nsIPrompt *prompt, bool showErrorOn
       return NS_OK;
     }
 
-    bundle->GetStringFromName(MOZ_UTF16("sendMessageErrorTitle"),
+    bundle->GetStringFromID(NS_MSG_SEND_ERROR_TITLE, getter_Copies(dialogTitle));
-                              getter_Copies(dialogTitle));
 
     nsresult preStrId = NS_ERROR_SEND_FAILED;
     bool askToGoBackToCompose = false;
@@ -340,8 +339,7 @@ NS_IMETHODIMP nsMsgSendReport::DisplayReport(nsIPrompt *prompt, bool showErrorOn
     if (!askToGoBackToCompose && currMessage.IsEmpty())
     {
       //we don't have an error description but we can put a generic explanation
-      bundle->GetStringFromName(MOZ_UTF16("genericFailureExplanation"),
+      bundle->GetStringFromID(NS_MSG_GENERIC_FAILURE_EXPLANATION, getter_Copies(currMessage));
-                                getter_Copies(currMessage));
     }
 
     if (!currMessage.IsEmpty())
@@ -359,8 +357,7 @@ NS_IMETHODIMP nsMsgSendReport::DisplayReport(nsIPrompt *prompt, bool showErrorOn
     {
       bool oopsGiveMeBackTheComposeWindow = true;
       nsString text1;
-      bundle->GetStringFromName(MOZ_UTF16("returnToComposeWindowQuestion"),
+      bundle->GetStringFromID(NS_MSG_ASK_TO_COMEBACK_TO_COMPOSE, getter_Copies(text1));
-                                getter_Copies(text1));
       if (!dialogMessage.IsEmpty())
         dialogMessage.AppendLiteral("\n");
       dialogMessage.Append(text1);
@@ -373,35 +370,35 @@ NS_IMETHODIMP nsMsgSendReport::DisplayReport(nsIPrompt *prompt, bool showErrorOn
   }
   else
   {
-    const char16_t* title;
+    int32_t titleID;
     nsresult preStrId;
 
     switch (mDeliveryMode)
     {
       case nsIMsgCompDeliverMode::Later:
-        title = MOZ_UTF16("sendLaterErrorTitle");
+        titleID = NS_MSG_SENDLATER_ERROR_TITLE;
         preStrId = NS_MSG_UNABLE_TO_SEND_LATER;
         break;
 
       case nsIMsgCompDeliverMode::AutoSaveAsDraft:
       case nsIMsgCompDeliverMode::SaveAsDraft:
-        title = MOZ_UTF16("saveDraftErrorTitle");
+        titleID = NS_MSG_SAVE_DRAFT_TITLE;
         preStrId = NS_MSG_UNABLE_TO_SAVE_DRAFT;
         break;
 
       case nsIMsgCompDeliverMode::SaveAsTemplate:
-        title = MOZ_UTF16("saveTemplateErrorTitle");
+        titleID = NS_MSG_SAVE_TEMPLATE_TITLE;
         preStrId = NS_MSG_UNABLE_TO_SAVE_TEMPLATE;
         break;
 
       default:
-        /* This should never happen! */
+        /* This should never happend! */
-        title = MOZ_UTF16("sendMessageErrorTitle");
+        titleID = NS_MSG_SEND_ERROR_TITLE;
         preStrId = NS_ERROR_SEND_FAILED;
         break;
     }
 
-    bundle->GetStringFromName(title, getter_Copies(dialogTitle));
+    bundle->GetStringFromID(titleID, getter_Copies(dialogTitle));
     bundle->GetStringFromID(NS_ERROR_GET_CODE(preStrId),
                             getter_Copies(dialogMessage));
 
@@ -409,8 +406,7 @@ NS_IMETHODIMP nsMsgSendReport::DisplayReport(nsIPrompt *prompt, bool showErrorOn
     if (currMessage.IsEmpty())
     {
       //we don't have an error description but we can put a generic explanation
-      bundle->GetStringFromName(MOZ_UTF16("genericFailureExplanation"),
+      bundle->GetStringFromID(NS_MSG_GENERIC_FAILURE_EXPLANATION, getter_Copies(currMessage));
-                                getter_Copies(currMessage));
     }
 
     if (!currMessage.IsEmpty())

mailnews/compose/src/nsSmtpProtocol.cpp

@@ -431,7 +431,7 @@ NS_IMETHODIMP nsSmtpProtocol::OnStopRequest(nsIRequest *request, nsISupports *ct
 // End of nsIStreamListenerSupport
 //////////////////////////////////////////////////////////////////////////////////////////////
 
-void nsSmtpProtocol::UpdateStatus(char16_t* aStatusName)
+void nsSmtpProtocol::UpdateStatus(int32_t aStatusID)
 {
   if (m_statusFeedback)
   {
@@ -442,7 +442,7 @@ void nsSmtpProtocol::UpdateStatus(char16_t* aStatusName)
     nsresult rv = bundleService->CreateBundle("chrome://messenger/locale/messengercompose/composeMsgs.properties", getter_AddRefs(bundle));
     if (NS_FAILED(rv)) return;
     nsString msg;
-    bundle->GetStringFromName(aStatusName, getter_Copies(msg));
+    bundle->GetStringFromID(aStatusID, getter_Copies(msg));
     UpdateStatusWithString(msg.get());
   }
 }
@@ -1604,7 +1604,7 @@ nsresult nsSmtpProtocol::SendDataResponse()
   m_nextState = SMTP_SEND_POST_DATA;
   ClearFlag(SMTP_PAUSE_FOR_READ);   /* send data directly */
 
-  UpdateStatus(MOZ_UTF16("smtpDeliveringMail"));
+  UpdateStatus(SMTP_DELIV_MAIL);
 
   {
 //      m_runningURL->GetBodySize(&m_totalMessageSize);
@@ -1627,7 +1627,7 @@ void nsSmtpProtocol::SendMessageInFile()
   // for now, we are always done at this point..we aren't making multiple calls
   // to post data...
 
-  UpdateStatus(MOZ_UTF16("smtpDeliveringMail"));
+  UpdateStatus(SMTP_DELIV_MAIL);
   m_nextState = SMTP_RESPONSE;
   m_nextStateAfterResponse = SMTP_SEND_MESSAGE_RESPONSE;
 }
@@ -1670,7 +1670,7 @@ nsresult nsSmtpProtocol::SendMessageResponse()
     return(NS_ERROR_SENDING_MESSAGE);
   }
 
-  UpdateStatus(MOZ_UTF16("smtpMailSent"));
+  UpdateStatus(SMTP_PROGRESS_MAILSENT);
 
   /* else */
   return SendQuit();

mailnews/compose/src/nsSmtpProtocol.h

@@ -149,7 +149,7 @@ private:
     // Communication methods --> Reading and writing protocol
     ////////////////////////////////////////////////////////////////////////////////////////
 
-    void UpdateStatus(char16_t* aStatusName);
+    void UpdateStatus(int32_t aStatusID);
     void UpdateStatusWithString(const char16_t * aStatusString);
 
     ////////////////////////////////////////////////////////////////////////////////////////

mailnews/extensions/mdn/src/nsMsgMdnGenerator.cpp

@@ -1127,7 +1127,7 @@ NS_IMETHODIMP nsMsgMdnGenerator::OnStopRunningUrl(nsIURI *url,
     nsString failed_msg, dialogTitle;
 
     bundle->FormatStringFromID(NS_ERROR_GET_CODE(aExitCode), params, 1, getter_Copies(failed_msg));
-    bundle->GetStringFromName(MOZ_UTF16("sendMessageErrorTitle"), getter_Copies(dialogTitle));
+    bundle->GetStringFromID(NS_MSG_SEND_ERROR_TITLE, getter_Copies(dialogTitle));
 
     nsCOMPtr<nsIPrompt> dialog;
     rv = m_window->GetPromptDialog(getter_AddRefs(dialog));

suite/locales/en-US/chrome/mailnews/compose/composeMsgs.properties

@@ -16,9 +16,24 @@ unableToOpenTmpFile=Unable to open the temporary file %S. Check your 'Temporary
 ## @name NS_MSG_UNABLE_TO_SAVE_DRAFT
 12503=Unable to save your message as draft.
 
+## @name NS_MSG_LOAD_ATTACHMNTS
+12504=Loading attachments…
+
+## @name NS_MSG_LOAD_ATTACHMNT
+12505=Loading attachment…
+
 ## @name NS_MSG_COULDNT_OPEN_FCC_FOLDER
 12506=Couldn't open Sent mail folder. Please verify that your Mail preferences are correct.
 
+## @name NS_MSG_CANT_POST_TO_MULTIPLE_NEWS_HOSTS
+12507=Can't post to multiple news hosts. Try again.
+
+## @name NS_MSG_ASSEMB_DONE_MSG
+12508=Assembling message…Done
+
+## @name NS_MSG_ASSEMBLING_MSG
+12509=Assembling message…
+
 ## @name NS_MSG_NO_SENDER
 12510=No sender was specified. Please fill in your email address in the Mail & Newsgroups account settings.
 
@@ -29,15 +44,12 @@ unableToOpenTmpFile=Unable to open the temporary file %S. Check your 'Temporary
 12512=Error writing temporary file.
 
 ## @name NS_ERROR_SENDING_FROM_COMMAND
-## LOCALIZATION NOTE (12514): argument %s is SMTP server response
 12514=An error occurred while sending mail. The mail server responded:  %s.  Please verify that your email address is correct in your Mail preferences and try again.
 
 ## @name NS_ERROR_SENDING_DATA_COMMAND
-## LOCALIZATION NOTE (12516): argument %s is SMTP server response
 12516=An (SMTP) error occurred while sending mail. The server responded:  %s.
 
 ## @name NS_ERROR_SENDING_MESSAGE
-## LOCALIZATION NOTE (12517): argument %s is SMTP server response
 12517=An error occurred while sending mail. The mail server responded:  %s. Please check the message and try again.
 
 ## @name NS_ERROR_POST_FAILED
@@ -49,15 +61,22 @@ unableToOpenTmpFile=Unable to open the temporary file %S. Check your 'Temporary
 ## @name NS_ERROR_SEND_FAILED
 12520=Sending of message failed.
 
+## @name SMTP_DELIV_MAIL
+12521=Delivering mail…
+
+## @name SMTP_MESSAGE_SENT_WAITING_MAIL_REPLY
+12522=Mail: Message sent; waiting for reply…
+
+## @name SMTP_PROGRESS_MAILSENT
+12523=Mail sent successfully
+
 ## @name NS_ERROR_SMTP_SERVER_ERROR
-## LOCALIZATION NOTE (12524): argument %s is SMTP server response
 12524=An error occurred sending mail: SMTP server error. The server responded:  %s\n Contact your mail administrator for assistance.
 
 ## @name NS_MSG_UNABLE_TO_SEND_LATER
 12525=Unable to save your message in order to send it later.
 
 ## @name NS_ERROR_COMMUNICATIONS_ERROR
-## LOCALIZATION NOTE (12526): argument %d is error code
 12526=A communications error occurred: %d.  Please try again.
 
 ## @name NS_ERROR_BUT_DONT_SHOW_ALERT
@@ -75,70 +94,112 @@ unableToOpenTmpFile=Unable to open the temporary file %S. Check your 'Temporary
 ## @name NS_MSG_FAILED_COPY_OPERATION
 12532=The message was sent successfully, but could not be copied to your Sent folder.
 
+## @name NS_MSG_FAILURE_ON_OBJ_EMBED_WHILE_SAVING
+12533=There was a problem including the file %.200s in the message. Would you like to continue saving the message without this file?
+
+## @name NS_MSG_ASSEMBLING_MESSAGE
+12534=Assembling mail information…
+
+## @name NS_MSG_GATHERING_ATTACHMENT
+12535=Attaching %s…
+
+## @name NS_MSG_CREATING_MESSAGE
+12536=Creating mail message…
+
+## @name NS_MSG_FAILURE_ON_OBJ_EMBED_WHILE_SENDING
+12537=There was a problem including the file %.200s in the message. Would you like to continue sending the message without this file?
+
+## @name NS_MSG_START_COPY_MESSAGE
+12538=Copying message to %S folder…
+
+## @name NS_MSG_START_COPY_MESSAGE_COMPLETE
+12539=Copy complete.
+
+## @name NS_MSG_START_COPY_MESSAGE_FAILED
+12540=Copy failed.
+
+## @name NS_MSG_LARGE_MESSAGE_WARNING
+12541=Warning! You are about to send a %d byte message. Are you sure that you want to do this?
+
+## @name NS_MSG_SENDING_MESSAGE
+12550=Sending message…
+
+## @name NS_MSG_POSTING_MESSAGE
+12551=Posting message…
+
 ## @name NS_ERROR_NNTP_NO_CROSS_POSTING
 12554=You can only send a message to one news server at a time.
 
 ## @name NS_MSG_CANCELLING
 12555=Cancelling…
 
+## @name NS_MSG_SEND_ERROR_TITLE
+12556=Send Message Error
+
+## @name NS_MSG_SENDLATER_ERROR_TITLE
+12557=Send Later Error
+
+## @name NS_MSG_SAVE_DRAFT_TITLE
+12558=Save Draft Error
+
+## @name NS_MSG_SAVE_TEMPLATE_TITLE
+12559=Save Template Error
+
 ## @name NS_ERROR_SEND_FAILED_BUT_NNTP_OK
 12560=Your message has been posted to the newsgroup but has not been sent to other recipient.
 
+## @name NS_MSG_ASK_TO_COMEBACK_TO_COMPOSE
+12561=Would you like to return to the compose window?
+
+## @name NS_MSG_GENERIC_FAILURE_EXPLANATION
+12562=Please verify that your Mail & Newsgroups account settings are correct and try again.
+
 ## @name NS_MSG_ERROR_READING_FILE
 12563=Error reading file.
 
 followupToSenderMessage=The author of this message has requested that responses be sent only to the author. If you also want to reply to the newsgroup, add a new row to the addressing area, choose Newsgroup from the recipients list, and enter the name of the newsgroup.
 
+## @name NS_MSG_UNDISCLOSED_RECIPIENTS
+## LOCALIZATION NOTE: this string must be using only US_ASCII characters
+12566=undisclosed-recipients
+
 ## @name NS_MSG_ERROR_ATTACHING_FILE
-## LOCALIZATION NOTE (12570): argument %S is file name/URI of object to be attached
 12570=There was an error attaching %S. Please check if you have access to the file.
 
 ## @name NS_ERROR_SMTP_GREETING
-## LOCALIZATION NOTE (12572): argument %s is SMTP server greeting
 12572=An error occurred sending mail: The mail server sent an incorrect greeting:  %s.
 
 ## @name NS_ERROR_SENDING_RCPT_COMMAND
-## LOCALIZATION NOTE (12575): argument %1$s is SMTP server response, argument %2$s is intended message recipient.
 12575=An error occurred while sending mail. The mail server responded:  %1$s. Please check the message recipient %2$s and try again.
 
 ## @name NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS
-## LOCALIZATION NOTE (12582): argument %s is SMTP server
 12582=An error occurred sending mail: Unable to establish a secure link with SMTP server %S using STARTTLS since it doesn't advertise that feature. Switch off STARTTLS for that server or contact your service provider.
 
 ## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
-## LOCALIZATION NOTE (12584): argument %S is SMTP account
 12584=An error occurred sending mail: Could not get password for %S. The message was not sent.
 
 ## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
-## LOCALIZATION NOTE (12586): argument %s is SMTP server response
 12586=The size of the message you are trying to send exceeds a temporary size limit of the server. The message was not sent; try to reduce the message size or wait some time and try again. The server responded:  %s.
 
 ## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1
-## LOCALIZATION NOTE (12587): argument %d is SMTP server size limit
 12587=The size of the message you are trying to send exceeds the global size limit (%d bytes) of the server. The message was not sent; reduce the message size and try again.
 
 ## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2
-## LOCALIZATION NOTE (12588): argument %s is SMTP server response
 12588=The size of the message you are trying to send exceeds the global size limit of the server. The message was not sent; reduce the message size and try again. The server responded:  %s.
 
 ## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER
-## LOCALIZATION NOTE (12589): argument %S is SMTP server
 12589=An error occurred sending mail: SMTP server %S is unknown. The server may be incorrectly configured. Please verify that your SMTP server settings are correct and try again.
 
 ## @name NS_ERROR_SMTP_SEND_FAILED_REFUSED
-## LOCALIZATION NOTE (12590): argument %S is SMTP server
 12590=The message could not be sent because connecting to SMTP server %S failed. The server may be unavailable or is refusing SMTP connections. Please verify that your SMTP server settings are correct and try again, or contact the server administrator.
 
 ## @name NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED
-## LOCALIZATION NOTE (12591): argument %S is SMTP server
 12591=The message could not be sent because the connection to SMTP server %S was lost in the middle of the transaction. Try again or contact your network administrator.
 
 ## @name NS_ERROR_SMTP_SEND_FAILED_TIMEOUT
-## LOCALIZATION NOTE (12592): argument %S is SMTP server
 12592=The message could not be sent because the connection to SMTP server %S timed out. Try again or contact your network administrator.
 
 ## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON
-## LOCALIZATION NOTE (12593): argument %S is SMTP server
 12593=The message could not be sent using SMTP server %S for an unknown reason. Please verify that your SMTP server settings are correct and try again, or contact your network administrator.
 
 ## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
@@ -193,14 +254,8 @@ subjectDlogMessage=You did not specify a subject for this message. If you would
 recipientDlogMessage=This account only supports email recipients. Continuing will ignore newsgroups.
 
 #String used by the alert that tells the user an e-mail address is invalid
-## LOCALIZATION NOTE (addressInvalid): $S is email address
 addressInvalid=%1$S is not a valid e-mail address because it is not of the form user@host. You must correct it before sending the e-mail.
 
-genericFailureExplanation=Please verify that your Mail & Newsgroups account settings are correct and try again.
-
-## LOCALIZATION NOTE (undisclosedRecipients): this string must use only US_ASCII characters
-undisclosedRecipients=undisclosed-recipients
-
 ## String used for attachment pretty name, when attachment is a message
 messageAttachmentSafeName=Attached Message
 ## String used for attachment pretty name, when attachment is message part
@@ -234,43 +289,9 @@ sendMessageCheckWindowTitle=Send Message
 sendMessageCheckLabel=Are you sure you are ready to send this message?
 sendMessageCheckSendButtonLabel=Send
 
-assemblingMessageDone=Assembling message…Done
-assemblingMessage=Assembling message…
-
-smtpDeliveringMail=Delivering mail…
-smtpMailSent=Mail sent successfully
-
-assemblingMailInformation=Assembling mail information…
-## LOCALIZATION NOTE (gatheringAttachment): argument %S is file name/URI of attachment
-gatheringAttachment=Attaching %S…
-creatingMailMessage=Creating mail message…
-
-## LOCALIZATION NOTE (copyMessageStart): argument %S is folder name
-copyMessageStart=Copying message to %S folder…
-copyMessageComplete=Copy complete.
-copyMessageFailed=Copy failed.
-
-sendLargeMessageWarning=Warning! You are about to send a %d byte message. Are you sure that you want to do this?
-
-sendingMessage=Sending message…
-sendMessageErrorTitle=Send Message Error
-postingMessage=Posting message…
-
-sendLaterErrorTitle=Send Later Error
-saveDraftErrorTitle=Save Draft Error
-saveTemplateErrorTitle=Save Template Error
-
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is file name/URI of object to be embedded
-failureOnObjectEmbeddingWhileSaving=There was a problem including the file %.200S in the message. Would you like to continue saving the message without this file?
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is file name/URI of object to be embedded
-failureOnObjectEmbeddingWhileSending=There was a problem including the file %.200S in the message. Would you like to continue sending the message without this file?
-returnToComposeWindowQuestion=Would you like to return to the compose window?
-
 ## reply header in composeMsg
 ## <author> wrote:
-## LOCALIZATION NOTE (mailnews.reply_header_authorwrote): %s is name of person replying to
 mailnews.reply_header_authorwrote=%s wrote
-## LOCALIZATION NOTE (mailnews.reply_header_ondate): %s is date
 mailnews.reply_header_ondate=On %s
 
 ## reply header in composeMsg