Bug 802266 - Remove unused definitions in nsComposeStrings.h and composeMsgs.properties. r=mkmelin, r=Neil
authorJohannes Buchner <johannes.buchner.acad@gmx.com>
Tue, 25 Mar 2014 11:45:24 -0400
changeset 20242 bf99513cdccd01140a9c07577476fa80a8f36b4e
parent 20241 0434372166021c79db19ca4198456aaebf1a45ab
child 20243 30d91b2583f15a6a9a149f1e90495573f2992678
push id194
push usermbanner@mozilla.com
push dateThu, 17 Jul 2014 13:25:17 +0000
reviewersmkmelin, Neil
bugs802266
Bug 802266 - Remove unused definitions in nsComposeStrings.h and composeMsgs.properties. r=mkmelin, r=Neil Initially by Moritz Beller <moritzbeller@gmx.de>
mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties
mailnews/compose/src/nsComposeStrings.h
suite/locales/en-US/chrome/mailnews/compose/composeMsgs.properties
--- a/mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties
@@ -11,28 +11,19 @@ unableToOpenFile=Unable to open the file
 unableToOpenTmpFile=Unable to open the temporary file %S. Check your 'Temporary Directory' setting.
 
 ## @name NS_MSG_UNABLE_TO_SAVE_TEMPLATE
 12502=Unable to save your message as template.
 
 ## @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.
@@ -59,19 +50,16 @@ 12518=The message could not be posted be
 12519=An error occurred delivering unsent messages.
 
 ## @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.
 
 ## @name NS_MSG_UNABLE_TO_SEND_LATER
 12525=Unable to save your message in order to send it later.
--- a/mailnews/compose/src/nsComposeStrings.h
+++ b/mailnews/compose/src/nsComposeStrings.h
@@ -1,51 +1,47 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
   String Ids used by mailnews\compose
-  To Do: Conver the callers to use names instead of ids and then make this file obsolete.
+  To Do: Convert the callers to use names instead of ids and then make this file obsolete.
  */
  
 #ifndef _nsComposeStrings_H__
 #define _nsComposeStrings_H__
 
 #define NS_MSG_UNABLE_TO_OPEN_FILE                  NS_MSG_GENERATE_FAILURE(12500)
 #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)
 #define NS_ERROR_SENDING_FROM_COMMAND               NS_MSG_GENERATE_FAILURE(12514)
 #define NS_ERROR_SENDING_DATA_COMMAND               NS_MSG_GENERATE_FAILURE(12516)
 #define NS_ERROR_SENDING_MESSAGE                    NS_MSG_GENERATE_FAILURE(12517)
 #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)
 #define NS_ERROR_BUT_DONT_SHOW_ALERT                NS_MSG_GENERATE_FAILURE(12527)
 #define NS_ERROR_TCP_READ_ERROR                     NS_MSG_GENERATE_FAILURE(12528)
 #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...
+// 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
@@ -53,17 +49,17 @@
 
 #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)
--- a/suite/locales/en-US/chrome/mailnews/compose/composeMsgs.properties
+++ b/suite/locales/en-US/chrome/mailnews/compose/composeMsgs.properties
@@ -11,28 +11,19 @@ unableToOpenFile=Unable to open the file
 unableToOpenTmpFile=Unable to open the temporary file %S. Check your 'Temporary Directory' setting.
 
 ## @name NS_MSG_UNABLE_TO_SAVE_TEMPLATE
 12502=Unable to save your message as template.
 
 ## @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.
@@ -59,19 +50,16 @@ 12518=The message could not be posted be
 12519=An error occurred delivering unsent messages.
 
 ## @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\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.