diff -urN mozilla.orig//calendar/lightning/install.rdf mozilla/calendar/lightning/install.rdf
--- mozilla.orig//calendar/lightning/install.rdf 2010-07-05 21:35:28.425408088 +0200
+++ mozilla/calendar/lightning/install.rdf 2010-07-05 21:39:36.114349634 +0200
@@ -46,7 +46,7 @@
{e2fda1a4-762b-4020-b5ad-a41df1933103}
Lightning
@LIGHTNING_VERSION@
- An integrated calendar for Thunderbird
+ An integrated calendar for Icedove
#ifdef LIGHTNING_PRERELEASE_VERSION
Build ID: @GRE_BUILDID@
#endif
diff -urN mozilla.orig//calendar/locales/en-US/chrome/lightning/lightning.properties mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties
--- mozilla.orig//calendar/locales/en-US/chrome/lightning/lightning.properties 2010-07-05 21:35:28.495173642 +0200
+++ mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties 2010-07-05 21:39:36.114349634 +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
diff -urN mozilla.orig//mail/app/application.ini mozilla/mail/app/application.ini
--- mozilla.orig//mail/app/application.ini 2010-07-05 21:35:29.238749304 +0200
+++ mozilla/mail/app/application.ini 2010-07-05 21:39:36.141016423 +0200
@@ -37,7 +37,7 @@
#filter substitution
[App]
-Name=Thunderbird
+Name=Icedove
Version=@APP_VERSION@
BuildID=@GRE_BUILDID@
#ifdef MOZ_SOURCE_REPO
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 2010-07-05 21:35:29.331249108 +0200
+++ mozilla/mail/app/profile/all-thunderbird.js 2010-07-05 21:39:36.164349628 +0200
@@ -74,7 +74,7 @@
// App-specific update preferences
// 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
@@ -99,10 +99,10 @@
// URL user can browse to manually if for some reason all update installation
// attempts fail. TODO: Change this URL
-pref("app.update.url.manual", "http://www.mozillamessaging.com/%LOCALE%/%APP%/");
+pref("app.update.url.manual", "http://www.mozillamessaging.com/%LOCALE%/thunderbird/");
// 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.mozillamessaging.com/%LOCALE%/%APP%/releases/");
+pref("app.update.url.details", "http://www.mozillamessaging.com/%LOCALE%/thunderbird/releases/");
// User-settable override to app.update.url for testing purposes.
//pref("app.update.url.override", "");
@@ -125,10 +125,10 @@
pref("app.update.showInstalledUI", false);
// Release notes URL
-pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+pref("app.releaseNotesURL", "http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
// 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%/");
// Blocklist preferences
pref("extensions.blocklist.enabled", true);
@@ -156,9 +156,9 @@
pref("extensions.update.interval", 86400); // Check for updates to Extensions and
// Themes every day
// Non-symmetric (not shared by extensions) extension-specific [update] preferences
-pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/");
-pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/");
-pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/plugins/");
+pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/extensions/");
+pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/themes/");
+pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/plugins/");
pref("extensions.dss.enabled", false); // Dynamic Skin Switching
pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
@@ -167,12 +167,12 @@
// Preferences for the Get Add-ons pane
pref("extensions.getAddons.showPane", true);
-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/%APP%");
+pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/thunderbird");
pref("extensions.getAddons.maxResults", 5);
-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/recommended");
-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
-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/10/%OS%/%VERSION%");
+pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/recommended");
+pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
+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/10/%OS%/%VERSION%");
pref("xpinstall.whitelist.add", "update.mozilla.org");
pref("xpinstall.whitelist.add.36", "getpersonas.com");
@@ -364,7 +364,7 @@
pref("news.directory", "");
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:
@@ -499,7 +499,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
diff -urN mozilla.orig//mail/base/content/baseMenuOverlay.xul mozilla/mail/base/content/baseMenuOverlay.xul
--- mozilla.orig//mail/base/content/baseMenuOverlay.xul 2010-07-05 21:35:29.344789211 +0200
+++ mozilla/mail/base/content/baseMenuOverlay.xul 2010-07-05 21:39:36.174349684 +0200
@@ -70,9 +70,6 @@
oncommand="openSupportURL();"
key="key_openHelp"/>
#endif
-
diff -urN mozilla.orig//mail/base/content/credits.xhtml mozilla/mail/base/content/credits.xhtml
--- mozilla.orig//mail/base/content/credits.xhtml 2010-07-05 21:35:29.344789211 +0200
+++ mozilla/mail/base/content/credits.xhtml 2010-07-05 21:44:34.520940060 +0200
@@ -198,7 +198,7 @@
-
&brandFullName;™
+ &brandFullName;
&brandMotto;
@@ -312,12 +312,6 @@
&credit.poweredByGecko;
-
-