-diff -urN mozilla.orig/configure mozilla/configure
---- mozilla.orig/configure 2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/configure 2008-06-23 20:44:56.000000000 +0200
-@@ -13155,8 +13155,8 @@
- ;;
-
- mail)
-- MOZ_APP_NAME=thunderbird
-- MOZ_APP_DISPLAYNAME=Thunderbird
-+ MOZ_APP_NAME=icedove
-+ MOZ_APP_DISPLAYNAME=Icedove
- MOZ_XUL_APP=1
- MOZ_THUNDERBIRD=1
- MOZ_MATHML=
-diff -urN mozilla.orig/configure.in mozilla/configure.in
---- mozilla.orig/configure.in 2008-06-23 14:04:04.000000000 +0200
-+++ mozilla/configure.in 2008-06-23 19:50:01.000000000 +0200
-@@ -4378,8 +4378,8 @@
- ;;
-
- mail)
-- MOZ_APP_NAME=thunderbird
-- MOZ_APP_DISPLAYNAME=Thunderbird
-+ MOZ_APP_NAME=icedove
-+ MOZ_APP_DISPLAYNAME=Icedove
- MOZ_XUL_APP=1
- MOZ_THUNDERBIRD=1
- MOZ_MATHML=
-diff -urN mozilla.orig/mail/app/nsMailApp.cpp mozilla/mail/app/nsMailApp.cpp
---- mozilla.orig/mail/app/nsMailApp.cpp 2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/mail/app/nsMailApp.cpp 2008-06-25 23:00:43.000000000 +0200
-@@ -48,7 +48,7 @@
- sizeof(nsXREAppData),
- nsnull,
- nsnull,
-- "Thunderbird",
-+ "Icedove",
- NS_STRINGIFY(APP_VERSION),
- NS_STRINGIFY(BUILD_ID),
- "{3550f703-e582-4d05-9a08-453d09bdfdc6}",
-diff -urN mozilla.orig/mail/app/profile/all-thunderbird.js mozilla/mail/app/profile/all-thunderbird.js
---- mozilla.orig/mail/app/profile/all-thunderbird.js 2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/mail/app/profile/all-thunderbird.js 2008-06-25 23:09:51.000000000 +0200
-@@ -35,7 +35,7 @@
- *
- * ***** END LICENSE BLOCK ***** */
-
--#expand pref("general.useragent.extra.thunderbird", "Thunderbird/__APP_VERSION__");
-+#expand pref("general.useragent.extra.thunderbird", "Icedove/__APP_VERSION__");
-
- #expand pref("general.useragent.locale", "__AB_CD__");
- pref("general.skins.selectedSkin", "classic/1.0");
-diff -urN mozilla.orig/mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in mozilla/mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in
---- mozilla.orig/mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in 2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in 2008-06-23 19:38:21.000000000 +0200
-@@ -20,7 +20,7 @@
- </em:targetApplication>
-
- <!-- Front End MetaData -->
-- <em:name>Thunderbird (default)</em:name>
-+ <em:name>Icedove (default)</em:name>
- <em:description>The default theme</em:description>
-
- <!-- EXTENSION AUTHORS!
-diff -urN mozilla.orig/mail/base/content/credits.xhtml mozilla/mail/base/content/credits.xhtml
---- mozilla.orig/mail/base/content/credits.xhtml 2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/mail/base/content/credits.xhtml 2008-06-24 11:50:55.000000000 +0200
-@@ -216,7 +216,7 @@
- </div>
-
- <div id="creditsBox">
-- <h2 class="title">&brandFullName;™
-+ <h2 class="title">&brandFullName;
- <div class="motto">&brandMotto;</div>
- </h2>
-
-@@ -348,19 +348,13 @@
- <p id="gecko" class="center">&credit.poweredByGecko;</p>
-
- <p class="footnote">
-- &brandFullName;™ &license.part0; ©1998-2008 &license.part1;
-+ &brandFullName; &license.part0; ©1998-2008 &license.part1;
- <a href="" link="http://www.mozilla.org/credits/" onclick="visitLink(event); event.preventDefault();">&license.contrib;</a>,
- &license.part2;
- <a href="" onclick="openLicense(); event.preventDefault();">license</a>
- &license.part3;</p>
-
- <p class="footnote">
-- Mozilla Thunderbird™ and the Thunderbird logo are trademarks of the Mozilla
-- Foundation. You are not granted rights or licenses to the trademarks
-- of the Mozilla Foundation or any party, including without limitation the
-- Thunderbird name or logo.</p>
--
-- <p class="footnote">
- U.S. GOVERNMENT END USERS. The Software is a “commercial item,”
- as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of
- “commercial computer software” and “commercial computer software
-diff -urN mozilla.orig/mail/base/content/mailWindowOverlay.xul mozilla/mail/base/content/mailWindowOverlay.xul
---- mozilla.orig/mail/base/content/mailWindowOverlay.xul 2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/mail/base/content/mailWindowOverlay.xul 2008-06-24 12:05:34.000000000 +0200
-@@ -1893,17 +1893,10 @@
- <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">
- #ifdef XP_MACOSX
- <menuitem id="hintsAndTips" label="&hintsAndTips.label;" key="key_macHelp" oncommand="openRegionURL('mailnews.hints_and_tips.url');"/>
-- <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="openFormattedRegionURL('app.releaseNotesURL');"/>
- #else
-- <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="openFormattedRegionURL('app.releaseNotesURL');"/>
- <menuitem id="hintsAndTips" accesskey="&hintsAndTips.accesskey;" label="&hintsAndTips.label;" oncommand="openRegionURL('mailnews.hints_and_tips.url');"/>
+--- mozilla/calendar/lightning/install.rdf~ 2011-08-12 15:52:04.000000000 +0200
++++ mozilla/calendar/lightning/install.rdf 2011-09-17 15:22:37.326572866 +0200
+@@ -28,7 +28,7 @@
+ <em:id>@XPI_EM_ID@</em:id>
+ <em:name>Lightning</em:name>
+ <em:version>@LIGHTNING_VERSION@</em:version> <!-- BuildID=@GRE_BUILDID@ -->
+- <em:description>An integrated calendar for Thunderbird</em:description>
++ <em:description>An integrated calendar for Icedove</em:description>
+ #ifdef LIGHTNING_PRERELEASE_VERSION
+ <em:developer>Build ID: @GRE_BUILDID@</em:developer>
#endif
- <menuseparator id="menu_HelpAboutSeparator"/>
-- <menuitem id="checkForUpdates" accesskey="&updateCmd.accesskey;" class="menuitem-iconic"
-- label="&updateCmd.label;" oncommand="checkForUpdates();"/>
--#ifndef XP_MACOSX
-- <menuseparator id="menu_HelpAfterUpdatesSeparator"/>
--#endif
- <menuitem id="aboutName" accesskey="&aboutCmd.accesskey;"
- label="&aboutCmd.label;"
- #ifdef XP_MACOSX
-diff -urN mozilla.orig/mail/base/content/start.xhtml mozilla/mail/base/content/start.xhtml
---- mozilla.orig/mail/base/content/start.xhtml 2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/mail/base/content/start.xhtml 2008-06-23 19:57:54.000000000 +0200
-@@ -145,7 +145,6 @@
-
- <h2>&startpage.moreInfo;</h2>
- <p>&startpage.helpInfo; <a href="&startpage.helpURL;">&startpage.help;</a>.</p>
--<p>&startpage.pageInfo; <a href="&startpage.pageURL;">&startpage.page;</a>.</p>
-
- <!-- Localization-specific information, i.e. how to download a dictionary. -->
- &startpage.extra;
-diff -urN mozilla.orig/mail/components/compose/content/messengercompose.xul mozilla/mail/components/compose/content/messengercompose.xul
---- mozilla.orig/mail/components/compose/content/messengercompose.xul 2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/mail/components/compose/content/messengercompose.xul 2008-06-24 11:58:00.000000000 +0200
-@@ -542,9 +542,7 @@
- <menupopup id="menu_HelpPopup">
- #ifdef XP_MACOSX
- <menuitem id="hintsAndTips" label="&hintsAndTips.label;" key="key_macHelp" oncommand="openRegionURL('mailnews.hints_and_tips.url');"/>
-- <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="openFormattedRegionURL('app.releaseNotesURL');"/>
- #else
-- <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="openFormattedRegionURL('app.releaseNotesURL');"/>
- <menuitem id="hintsAndTips" accesskey="&hintsAndTips.accesskey;" label="&hintsAndTips.label;" oncommand="openRegionURL('mailnews.hints_and_tips.url');"/>
- <menuseparator id="menu_HelpAboutSeparator"/>
+--- mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties~ 2011-08-12 15:52:04.000000000 +0200
++++ mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties 2011-09-17 15:23:40.476566690 +0200
+@@ -39,7 +39,7 @@
+
+ # addon description:
+ extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.name=Lightning
+-extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Thunderbird
++extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Icedove
+ extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.creator=Mozilla Calendar Project
+
+ # Lightning branding
+--- mozilla/mail/app/application.ini~ 2011-08-12 15:52:04.000000000 +0200
++++ mozilla/mail/app/application.ini 2011-09-17 15:24:45.833226544 +0200
+@@ -37,7 +37,7 @@
+
+ #filter substitution
+ [App]
+-Name=Thunderbird
++Name=Icedove
+ Version=@APP_VERSION@
+ BuildID=@GRE_BUILDID@
+ #ifdef MOZ_SOURCE_REPO
+--- mozilla/mail/app/profile/all-thunderbird.js.orig 2012-03-13 03:37:11.000000000 +0100
++++ mozilla/mail/app/profile/all-thunderbird.js 2012-03-24 21:42:35.608437888 +0100
+@@ -84,7 +84,7 @@
+ pref("app.update.certs.2.commonName", "aus3.mozilla.org");
+
+ // Whether or not app updates are enabled
+-pref("app.update.enabled", true);
++pref("app.update.enabled", false);
+
+ // This preference turns on app.update.mode and allows automatic download and
+ // install to take place. We use a separate boolean toggle for this to make
+@@ -117,7 +117,7 @@
+ pref("app.update.url.manual", "http://www.getthunderbird.com");
+ // A default value for the "More information about this update" link
+ // supplied in the "An update is available" page of the update wizard.
+-pref("app.update.url.details", "http://www.mozilla.org/%LOCALE%/%APP%/releases/");
++pref("app.update.url.details", "http://www.mozilla.org/%LOCALE%/thunderbird/releases/");
+ // User-settable override to app.update.url for testing purposes.
+ //pref("app.update.url.override", "");
+
+@@ -139,7 +139,7 @@
#endif
-diff -urN mozilla.orig/mail/components/preferences/advanced.xul mozilla/mail/components/preferences/advanced.xul
---- mozilla.orig/mail/components/preferences/advanced.xul 2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/mail/components/preferences/advanced.xul 2008-06-23 19:29:27.000000000 +0200
-@@ -200,11 +200,6 @@
- <tabpanel orient="vertical" align="start">
- <label>&autoCheck.label;</label>
- <vbox class="indent">
-- <checkbox id="enableAppUpdate"
-- label="&enableAppUpdate.label;"
-- accesskey="&enableAppUpdate.accesskey;"
-- preference="app.update.enabled"
-- xhtml2:role="wairole:checkbox" aaa:describedby="updateInfo"/>
- <checkbox id="enableAddonUpdate"
- label="&enableAddonsUpdate.label;"
- accesskey="&enableAddonsUpdate.accesskey;"
-diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger/aboutDialog.dtd mozilla/mail/locales/en-US/chrome/messenger/aboutDialog.dtd
---- mozilla.orig/mail/locales/en-US/chrome/messenger/aboutDialog.dtd 2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/mail/locales/en-US/chrome/messenger/aboutDialog.dtd 2008-06-23 19:17:25.000000000 +0200
-@@ -2,6 +2,4 @@
- <!ENTITY credits "Credits">
- <!ENTITY aboutLink "< About &brandFullName;">
- <!ENTITY aboutVersion "version">
--<!ENTITY copyrightText "©1998-2008 Contributors. All Rights Reserved. Mozilla Thunderbird and the
-- Thunderbird logos are trademarks of the Mozilla Foundation. All rights
-- reserved.">
-+<!ENTITY copyrightText "©1998-2008 Contributors. All Rights Reserved.">
-diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger/credits.dtd mozilla/mail/locales/en-US/chrome/messenger/credits.dtd
---- mozilla.orig/mail/locales/en-US/chrome/messenger/credits.dtd 2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/mail/locales/en-US/chrome/messenger/credits.dtd 2008-06-23 19:36:44.000000000 +0200
-@@ -1,5 +1,5 @@
- <!ENTITY credit.title "&brandFullName; Credits">
--<!ENTITY brandMotto "Thunderbirds Are Go!">
-+<!ENTITY brandMotto "Icedoves Are Free!">
- <!ENTITY credit.leads "Engineering Leads">
- <!ENTITY credit.core "Core Development Posse">
- <!ENTITY credit.gecko "Gecko Layout Engine">
-diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger/start.dtd mozilla/mail/locales/en-US/chrome/messenger/start.dtd
---- mozilla.orig/mail/locales/en-US/chrome/messenger/start.dtd 2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/mail/locales/en-US/chrome/messenger/start.dtd 2008-06-23 19:46:25.000000000 +0200
-@@ -19,11 +19,11 @@
-
- <!ENTITY startpage.moreInfo "More Information">
-
--<!ENTITY startpage.help "Thunderbird Help">
-+<!ENTITY startpage.help "Icedove Help">
- <!ENTITY startpage.helpInfo "For frequently asked questions, tips and general help, visit">
- <!ENTITY startpage.helpURL "http://www.mozilla.org/support/thunderbird/">
-
--<!ENTITY startpage.page "Thunderbird Product Page">
-+<!ENTITY startpage.page "Icedove Product Page">
- <!ENTITY startpage.pageInfo "For product information, visit the">
- <!ENTITY startpage.pageURL "http://www.mozilla.org/products/thunderbird/">
-
-diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger-newsblog/newsblog.properties mozilla/mail/locales/en-US/chrome/messenger-newsblog/newsblog.properties
---- mozilla.orig/mail/locales/en-US/chrome/messenger-newsblog/newsblog.properties 2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/mail/locales/en-US/chrome/messenger-newsblog/newsblog.properties 2008-06-26 11:57:36.000000000 +0200
-@@ -9,8 +9,8 @@
-
- subscribe-OPMLImportTitle=Select OPML file to import
- subscribe-OPMLExportTitle=Export feeds as an OPML file
--subscribe-OPMLExportFileTitle=Thunderbird OPML Export
--subscribe-OPMLExportFileName=MyThunderbirdFeeds.opml
-+subscribe-OPMLExportFileTitle=Icedove OPML Export
-+subscribe-OPMLExportFileName=MyIcedoveFeeds.opml
- #LOCALIZATION NOTE: %S is the name of the OPML file the user tried to import.
- subscribe-errorInvalidOPMLFile=Either %S is not a valid OPML file or there was an error importing the file.
-
-diff -urN mozilla.orig/mail/locales/en-US/installer/installer.inc mozilla/mail/locales/en-US/installer/installer.inc
---- mozilla.orig/mail/locales/en-US/installer/installer.inc 2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/mail/locales/en-US/installer/installer.inc 2008-06-23 19:47:15.000000000 +0200
-@@ -19,7 +19,7 @@
- Type_Message0=Choose the type of Setup you prefer, then click Next.
-
- Standard_Short=&Standard
--Standard_Long=Thunderbird will be installed with the most common options.
-+Standard_Long=Icedove will be installed with the most common options.
-
- Custom_Short=&Custom
- Custom_Long=You may choose individual options to be installed. Recommended for experienced users.
-diff -urN mozilla.orig/mail/locales/en-US/updater/updater.ini mozilla/mail/locales/en-US/updater/updater.ini
---- mozilla.orig/mail/locales/en-US/updater/updater.ini 2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/mail/locales/en-US/updater/updater.ini 2008-06-23 19:47:27.000000000 +0200
-@@ -1,4 +1,4 @@
- ; This file is in the UTF-8 encoding
- [Strings]
- Title=Software Update
--Info=Thunderbird is installing your updates and will start in a few moments...
-+Info=Icedove is installing your updates and will start in a few moments...
-diff -urN mozilla.orig/toolkit/xre/nsAppRunner.cpp mozilla/toolkit/xre/nsAppRunner.cpp
---- mozilla.orig/toolkit/xre/nsAppRunner.cpp 2008-06-23 14:04:17.000000000 +0200
-+++ mozilla/toolkit/xre/nsAppRunner.cpp 2008-06-26 09:57:12.000000000 +0200
-@@ -1121,7 +1121,7 @@
- static void
+
+ // Base URL for web-based support pages.
+-pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/");
++pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/thunderbird/%APPBUILDID%/");
+
+ // Controls enabling of the extension system logging (can reduce performance)
+ pref("extensions.logging.enabled", false);
+@@ -161,18 +161,18 @@
+ // Preferences for AMO integration
+ pref("extensions.getAddons.cache.enabled", true);
+ pref("extensions.getAddons.maxResults", 15);
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird");
+-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
++pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%");
++pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
++pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%");
++pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird");
++pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%");
+
+ // Blocklist preferences
+ pref("extensions.blocklist.enabled", true);
+ pref("extensions.blocklist.interval", 86400);
+ pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/");
+-pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/");
+-pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%");
++pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/blocked/");
++pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/blocked/%blockID%");
+
+ // Enables some extra Extension System Logging (can reduce performance)
+ pref("extensions.logging.enabled", false);
+@@ -190,7 +190,7 @@
+ pref("extensions.update.interval", 86400); // Check for updates to Extensions and
+ // Themes every day
+
+-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/themes/");
++pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/");
+ pref("extensions.dss.enabled", false); // Dynamic Skin Switching
+ pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
+
+@@ -391,7 +391,7 @@
+
+ pref("spellchecker.dictionary", "");
+ // Dictionary download preference
+-pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries/");
++pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/thunderbird/dictionaries/");
+
+ // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular
+ // mail application without any user intervention. Possible values are:
+@@ -540,7 +540,7 @@
+ pref("mailnews.database.global.logging.console", true);
+
+ // page to load to find good header add-ons
+-pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/%APP%/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
++pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/thunderbird/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
+
+ // Serif fonts look dated. Switching those language families to sans-serif
+ // where we think it makes sense. Worth investigating for other font families
+@@ -764,7 +764,7 @@
+
+ pref("plugins.update.url", "https://www.mozilla.com/%LOCALE%/plugincheck/");
+ pref("plugins.update.notifyUser", false);
+-pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/%APP%/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
++pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/thunderbird/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+
+ // Windows taskbar support
+ #ifdef XP_WIN
+--- mozilla/mail/base/content/baseMenuOverlay.xul~ 2011-08-12 15:52:04.000000000 +0200
++++ mozilla/mail/base/content/baseMenuOverlay.xul 2011-09-17 15:29:32.946531066 +0200
+@@ -73,9 +73,6 @@
+ <menuitem id="whatsNew"
+ label="&whatsNewCmd.label;" accesskey="&whatsNewCmd.accesskey;"
+ oncommand="openWhatsNew();"/>
+- <menuitem id="releaseNotes"
+- label="&releaseCmd2.label;" accesskey="&releaseCmd2.accesskey;"
+- oncommand="openFormattedURL('app.releaseNotesURL');"/>
+ <menuseparator id="functionsSeparator"/>
+ <menuitem id="featureConfigurator"
+ label="&featureConfiguratorCmd.label;"
+--- mozilla/mail/confvars.sh~ 2011-08-12 15:52:05.000000000 +0200
++++ mozilla/mail/confvars.sh 2011-09-17 15:34:33.613167078 +0200
+@@ -36,8 +36,8 @@
+ # 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/.
+
+-MOZ_APP_BASENAME=Thunderbird
+-MOZ_APP_NAME=thunderbird
++MOZ_APP_BASENAME=Icedove
++MOZ_APP_NAME=icedove
+ MOZ_UPDATER=1
+ MOZ_THUNDERBIRD=1
+ MOZ_CHROME_FILE_FORMAT=omni
+--- mozilla/mozilla/toolkit/xre/nsAppRunner.cpp~ 2011-08-12 16:16:45.000000000 +0200
++++ mozilla/mozilla/toolkit/xre/nsAppRunner.cpp 2011-09-17 15:36:16.599823973 +0200
+@@ -1324,8 +1324,7 @@
+ static inline void
DumpVersion()
{
-- printf("%s %s %s, %s\n", gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version, gAppData->copyright);
-+ printf("%s %s, %s\n", gAppData->name, gAppData->version, gAppData->copyright);
- }
-
- #ifdef MOZ_ENABLE_XREMOTE
+- printf("%s %s %s",
+- gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version);
++ printf("%s %s", gAppData->name, gAppData->version);
+ if (gAppData->copyright)
+ printf(", %s", gAppData->copyright);
+ printf("\n");
projects / packages / icedove.git / blobdiff