Commit b2538907 authored by Brian R. Bondy's avatar Brian R. Bondy
Browse files

Bug 725155 - Move MozillaMaintenance service description string to Strings... 

Bug 725155 - Move MozillaMaintenance service description string to Strings section of ini file. r=rstrong
parent 82c4eec7

browser/locales/en-US/updater/updater.ini

+1 −3
Original line number Diff line number Diff line
@@ -3,6 +3,4 @@ 
[Strings]

TitleText=%MOZ_APP_DISPLAYNAME% Update

InfoText=%MOZ_APP_DISPLAYNAME% is installing your updates and will start in a few moments…



[MaintenanceServiceStrings]

ServiceDescription=The Mozilla Maintenance Service ensures that you have the latest and most secure version of Mozilla Firefox on your computer. Keeping Firefox up to date is very important for your online security, and Mozilla strongly recommends that you keep this service enabled.
 
MozillaMaintenanceDescription=The Mozilla Maintenance Service ensures that you have the latest and most secure version of Mozilla Firefox on your computer. Keeping Firefox up to date is very important for your online security, and Mozilla strongly recommends that you keep this service enabled.

toolkit/components/maintenanceservice/serviceinstall.cpp

+2 −3
Original line number Diff line number Diff line
@@ -69,11 +69,10 @@ ReadMaintenanceServiceStrings(LPCWSTR path, 
{

  // Read in the maintenance service description string if specified.

  const unsigned int kNumStrings = 1;

  const char *kServiceKeys = "ServiceDescription\0";

  const char *kServiceKeys = "MozillaMaintenanceDescription\0";

  char serviceStrings[kNumStrings][MAX_TEXT_LEN];

  int result = ReadStrings(path, kServiceKeys, 

                           kNumStrings, serviceStrings, 

                           "MaintenanceServiceStrings");

                           kNumStrings, serviceStrings);

  if (result != OK) {

    serviceStrings[0][0] = '\0';

  }