Bug 1147006 - TB shows instructions with [File] - [Offline] - [Synchronize] instead of [Download/Sync Now]. r=bwinton,Neil a=Ratty for SeaMonkey CLOSED TREE
authorTim P <pollti@gmx.net>
Sun, 19 Apr 2015 09:55:32 +0200
changeset 17798 bb995f40ce818fd9c01e6d771984fff486f5de79
parent 17797 d674ea621dbfe9a7357df66e5147ed8b9b6bf178
child 17799 78bb8b6e5c5d5b03935dbc5528468eabc1109541
push id10947
push userarchaeopteryx@coole-files.de
push dateSun, 19 Apr 2015 07:55:54 +0000
treeherdercomm-central@bb995f40ce81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbwinton, Neil, Ratty
bugs1147006
Bug 1147006 - TB shows instructions with [File] - [Offline] - [Synchronize] instead of [Download/Sync Now]. r=bwinton,Neil a=Ratty for SeaMonkey CLOSED TREE
mail/locales/en-US/chrome/messenger/messenger.properties
mailnews/base/util/nsMsgIncomingServer.cpp
suite/locales/en-US/chrome/mailnews/messenger.properties
--- a/mail/locales/en-US/chrome/messenger/messenger.properties
+++ b/mail/locales/en-US/chrome/messenger/messenger.properties
@@ -297,23 +297,24 @@ mail.addr_book.show_phonetic_fields=fals
 #
 mailnews.search_date_format=0
 # separator for search date (e.g. "/", "-"), or empty when search_date_format is zero
 mailnews.search_date_separator=
 # leading zeros for day and month values, not used if mailnews.search_date_format is not zero
 mailnews.search_date_leading_zeros=true
 
 # offline msg
-nocachedbodybody=The body of this message has not been downloaded from \
+nocachedbodybody2=The body of this message has not been downloaded from \
 the server for reading offline. To read this message, \
 you must reconnect to the network, choose Offline from \
 the File menu and then uncheck Work Offline. \
 In the future, you can select which messages or folders to read offline. To do \
-this, choose Offline from the file menu and then select Synchronize. You can \
-adjust the Disk Space preference to prevent the downloading of large messages.
+this, choose Offline from the file menu and then select Download/Sync Now. \
+You can adjust the Disk Space preference to prevent the downloading of large \
+messages.
 
 # accountCentral
 mailnews.account_central_page.url=chrome://messenger/content/msgAccountCentral.xul
 # LOCALIZATION NOTE(acctCentralTitleFormat): %1$S is brand, %2$S is account type, %3$S is account name
 acctCentralTitleFormat=%1$S %2$S - %3$S
 mailAcctType=Mail
 newsAcctType=News
 feedsAcctType=Feeds
--- a/mailnews/base/util/nsMsgIncomingServer.cpp
+++ b/mailnews/base/util/nsMsgIncomingServer.cpp
@@ -1615,17 +1615,17 @@ NS_IMETHODIMP nsMsgIncomingServer::Displ
 
   nsCOMPtr<nsIStringBundle> bundle;
   nsresult rv = bundleService->CreateBundle(BASE_MSGS_URL, getter_AddRefs(bundle));
   NS_ENSURE_SUCCESS(rv, rv);
   if (bundle)
   {
     nsString errorMsgTitle;
     nsString errorMsgBody;
-    bundle->GetStringFromName(MOZ_UTF16("nocachedbodybody"), getter_Copies(errorMsgBody));
+    bundle->GetStringFromName(MOZ_UTF16("nocachedbodybody2"), getter_Copies(errorMsgBody));
     bundle->GetStringFromName(MOZ_UTF16("nocachedbodytitle"), getter_Copies(errorMsgTitle));
     aMsgWindow->DisplayHTMLInMessagePane(errorMsgTitle, errorMsgBody, true);
   }
 
   return NS_OK;
 }
 
 // Called only during the migration process. A unique name is generated for the
--- a/suite/locales/en-US/chrome/mailnews/messenger.properties
+++ b/suite/locales/en-US/chrome/mailnews/messenger.properties
@@ -284,23 +284,24 @@ mail.addr_book.show_phonetic_fields=fals
 #
 mailnews.search_date_format=0
 # separator for search date (e.g. "/", "-"), or empty when search_date_format is zero
 mailnews.search_date_separator=
 # leading zeros for day and month values, not used if mailnews.search_date_format is not zero
 mailnews.search_date_leading_zeros=true
 
 # offline msg 
-nocachedbodybody=The body of this message has not been downloaded from \
+nocachedbodybody2=The body of this message has not been downloaded from \
 the server for reading offline. To read this message, \
 you must reconnect to the network, choose Offline from \
-the File menu and then uncheck Work Offline.\
+the File menu and then uncheck Work Offline. \
 In the future, you can select which messages or folders to read offline. To do \
-this, choose Offline from the file menu and then select Synchronize. You can \
-adjust the Disk Space preference to prevent the downloading of large messages.
+this, choose Offline from the file menu and then select Download/Sync Now. \
+You can adjust the Disk Space preference to prevent the downloading of large \
+messages.
 
 # accountCentral
 mailnews.account_central_page.url=chrome://messenger/content/msgAccountCentral.xul
 # LOCALIZATION NOTE(acctCentralTitleFormat): %1$S is brand, %2$S is account type, %3$S is account name
 acctCentralTitleFormat=%1$S %2$S - %3$S
 mailAcctType=Mail
 newsAcctType=News
 feedsAcctType=Feeds