1 diff -urN mozilla.orig/calendar/lightning/install.rdf mozilla/calendar/lightning/install.rdf
2 --- mozilla.orig/calendar/lightning/install.rdf 2010-01-11 18:40:34.000000000 +0100
3 +++ mozilla/calendar/lightning/install.rdf 2010-02-13 01:56:44.000000000 +0100
5 <em:id>{e2fda1a4-762b-4020-b5ad-a41df1933103}</em:id>
6 <em:name>Lightning</em:name>
7 <em:version>@LIGHTNING_VERSION@</em:version> <!-- BuildID=@GRE_BUILDID@ -->
8 - <em:description>An integrated calendar for Thunderbird</em:description>
9 + <em:description>An integrated calendar for Icedove</em:description>
10 #ifdef LIGHTNING_PRERELEASE_VERSION
11 <em:developer>Build ID: @GRE_BUILDID@</em:developer>
13 diff -urN mozilla.orig/calendar/locales/en-US/chrome/lightning/lightning.properties mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties
14 --- mozilla.orig/calendar/locales/en-US/chrome/lightning/lightning.properties 2010-01-11 18:40:34.000000000 +0100
15 +++ mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties 2010-02-13 01:56:30.000000000 +0100
19 extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.name=Lightning
20 -extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Thunderbird
21 +extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Icedove
22 extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.creator=Mozilla Calendar Project
25 diff -urN mozilla.orig/mail/app/application.ini mozilla/mail/app/application.ini
26 --- mozilla.orig/mail/app/application.ini 2010-01-11 18:40:34.000000000 +0100
27 +++ mozilla/mail/app/application.ini 2010-02-13 01:55:35.000000000 +0100
36 #ifdef MOZ_SOURCE_REPO
37 diff -urN mozilla.orig/mail/app/profile/all-thunderbird.js mozilla/mail/app/profile/all-thunderbird.js
38 --- mozilla.orig/mail/app/profile/all-thunderbird.js 2010-01-11 18:40:34.000000000 +0100
39 +++ mozilla/mail/app/profile/all-thunderbird.js 2010-02-13 01:55:35.000000000 +0100
41 // App-specific update preferences
43 // Whether or not app updates are enabled
44 -pref("app.update.enabled", true);
45 +pref("app.update.enabled", false);
47 // This preference turns on app.update.mode and allows automatic download and
48 // install to take place. We use a separate boolean toggle for this to make
51 // URL user can browse to manually if for some reason all update installation
52 // attempts fail. TODO: Change this URL
53 -pref("app.update.url.manual", "http://www.mozillamessaging.com/%LOCALE%/%APP%/");
54 +pref("app.update.url.manual", "http://www.mozillamessaging.com/%LOCALE%/thunderbird/");
55 // A default value for the "More information about this update" link
56 // supplied in the "An update is available" page of the update wizard.
57 -pref("app.update.url.details", "http://www.mozillamessaging.com/%LOCALE%/%APP%/releases/");
58 +pref("app.update.url.details", "http://www.mozillamessaging.com/%LOCALE%/thunderbird/releases/");
59 // User-settable override to app.update.url for testing purposes.
60 //pref("app.update.url.override", "");
63 pref("app.update.showInstalledUI", false);
66 -pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
67 +pref("app.releaseNotesURL", "http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
69 // Base URL for web-based support pages.
70 -pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/");
71 +pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/thunderbird/%APPBUILDID%/");
73 // Blocklist preferences
74 pref("extensions.blocklist.enabled", true);
76 pref("extensions.update.interval", 86400); // Check for updates to Extensions and
78 // Non-symmetric (not shared by extensions) extension-specific [update] preferences
79 -pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/");
80 -pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/");
81 -pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/plugins/");
82 +pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/extensions/");
83 +pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/themes/");
84 +pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/plugins/");
85 pref("extensions.dss.enabled", false); // Dynamic Skin Switching
86 pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
90 // Preferences for the Get Add-ons pane
91 pref("extensions.getAddons.showPane", true);
92 -pref("extensions.getAddons.browseAddons", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%");
93 +pref("extensions.getAddons.browseAddons", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird");
94 pref("extensions.getAddons.maxResults", 5);
95 -pref("extensions.getAddons.recommended.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/recommended");
96 -pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
97 -pref("extensions.getAddons.search.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/search?q=%TERMS%");
98 -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
99 +pref("extensions.getAddons.recommended.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/recommended");
100 +pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
101 +pref("extensions.getAddons.search.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/search?q=%TERMS%");
102 +pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
104 pref("xpinstall.whitelist.add", "update.mozilla.org");
105 pref("xpinstall.whitelist.add.103", "addons.mozilla.org");
107 pref("news.directory", "");
108 pref("spellchecker.dictionary", "");
109 // Dictionary download preference
110 -pref("spellchecker.dictionaries.download.url", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/dictionaries/");
111 +pref("spellchecker.dictionaries.download.url", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/dictionaries/");
113 // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular
114 // mail application without any user intervention. Possible values are:
116 pref("mailnews.database.global.logging.console", true);
118 // page to load to find good header add-ons
119 -pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/%APP%/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
120 +pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/thunderbird/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
122 // What level of warning should we send to the error console?
123 pref("mail.wizard.logging.console", "None");
124 diff -urN mozilla.orig/mail/base/content/baseMenuOverlay.xul mozilla/mail/base/content/baseMenuOverlay.xul
125 --- mozilla.orig/mail/base/content/baseMenuOverlay.xul 2010-01-11 18:40:34.000000000 +0100
126 +++ mozilla/mail/base/content/baseMenuOverlay.xul 2010-02-13 01:55:35.000000000 +0100
128 oncommand="openSupportURL();"
131 - <menuitem id="releaseNotes"
132 - label="&releaseCmd.label;" accesskey="&releaseCmd.accesskey;"
133 - oncommand="openFormattedURL('app.releaseNotesURL');"/>
134 <menuitem id="whatsNew"
135 label="&whatsNewCmd.label;" accesskey="&whatsNewCmd.accesskey;"
136 oncommand="openWhatsNew();"/>
137 diff -urN mozilla.orig/mail/base/content/credits.xhtml mozilla/mail/base/content/credits.xhtml
138 --- mozilla.orig/mail/base/content/credits.xhtml 2010-01-11 18:40:34.000000000 +0100
139 +++ mozilla/mail/base/content/credits.xhtml 2010-02-13 01:55:35.000000000 +0100
143 <div id="creditsBox">
144 - <h2 class="title">&brandFullName;™
145 + <h2 class="title">&brandFullName;
146 <div class="motto">&brandMotto;</div>
149 @@ -329,19 +329,13 @@
150 <p id="gecko" class="center">&credit.poweredByGecko;</p>
153 - &brandFullName;™ &license.part0; ©1998-2010 &license.part1;
154 + &brandFullName; &license.part0; ©1998-2010 &license.part1;
155 <a href="" link="http://www.mozilla.org/credits/" onclick="visitLink(event); event.preventDefault();">&license.contrib;</a>,
157 <a href="" onclick="openLicense(); event.preventDefault();">license</a>
161 - Mozilla Thunderbird™ and the Thunderbird logo are trademarks of the Mozilla
162 - Foundation. You are not granted rights or licenses to the trademarks
163 - of the Mozilla Foundation or any party, including without limitation the
164 - Thunderbird name or logo.</p>
166 - <p class="footnote">
167 U.S. GOVERNMENT END USERS. The Software is a “commercial item,”
168 as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of
169 “commercial computer software” and “commercial computer software
170 diff -urN mozilla.orig/mail/build.mk mozilla/mail/build.mk
171 --- mozilla.orig/mail/build.mk 2010-01-11 18:40:34.000000000 +0100
172 +++ mozilla/mail/build.mk 2010-02-13 01:55:35.000000000 +0100
173 @@ -112,11 +112,11 @@
174 APP_NAME := $(APP_NAME)Debug
176 PROGRAM_LOCATION = ../../../$(DIST)/$(APP_NAME).app/Contents/MacOS/
177 -PROGRAM = $(PROGRAM_LOCATION)thunderbird-bin$(BIN_SUFFIX)
178 +PROGRAM = $(PROGRAM_LOCATION)$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
181 PROGRAM_LOCATION = ../../../$(DIST)/bin/
182 -PROGRAM = $(PROGRAM_LOCATION)thunderbird$(BIN_SUFFIX)
183 +PROGRAM = $(PROGRAM_LOCATION)$(MOZ_APP_NAME)$(BIN_SUFFIX)
187 diff -urN mozilla.orig/mail/components/shell/nsMailGNOMEIntegration.cpp mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp
188 --- mozilla.orig/mail/components/shell/nsMailGNOMEIntegration.cpp 2010-01-11 18:40:34.000000000 +0100
189 +++ mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp 2010-02-13 01:55:35.000000000 +0100
191 getter_AddRefs(appPath));
192 NS_ENSURE_SUCCESS(rv, rv);
194 - rv = appPath->AppendNative(NS_LITERAL_CSTRING("thunderbird"));
195 + rv = appPath->AppendNative(NS_LITERAL_CSTRING("icedove"));
196 NS_ENSURE_SUCCESS(rv, rv);
198 rv = appPath->GetNativePath(mAppPath);
199 diff -urN mozilla.orig/mail/confvars.sh mozilla/mail/confvars.sh
200 --- mozilla.orig/mail/confvars.sh 2010-01-11 18:40:34.000000000 +0100
201 +++ mozilla/mail/confvars.sh 2010-02-13 01:55:35.000000000 +0100
204 # ***** END LICENSE BLOCK *****
206 -MOZ_APP_NAME=thunderbird
207 +MOZ_APP_NAME=icedove
210 MOZ_NO_ACTIVEX_SUPPORT=1
211 diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger/aboutDialog.dtd mozilla/mail/locales/en-US/chrome/messenger/aboutDialog.dtd
212 --- mozilla.orig/mail/locales/en-US/chrome/messenger/aboutDialog.dtd 2010-01-11 18:40:34.000000000 +0100
213 +++ mozilla/mail/locales/en-US/chrome/messenger/aboutDialog.dtd 2010-02-13 01:55:35.000000000 +0100
215 <!ENTITY aboutButton.label "< Back">
216 <!ENTITY aboutButton.accesskey "B">
217 <!ENTITY aboutVersion "version">
218 -<!ENTITY copyrightText "©1998-2010 Contributors. All Rights Reserved. Mozilla Thunderbird and the
219 - Thunderbird logos are trademarks of the Mozilla Foundation. All rights
221 +<!ENTITY copyrightText "©1998-2010 Contributors. All Rights Reserved.">
222 <!ENTITY aboutMenu.label "About">
223 <!ENTITY aboutMenu.accesskey "A">
224 <!ENTITY aboutCredits.label "Credits">
225 diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger/credits.dtd mozilla/mail/locales/en-US/chrome/messenger/credits.dtd
226 --- mozilla.orig/mail/locales/en-US/chrome/messenger/credits.dtd 2010-01-11 18:40:34.000000000 +0100
227 +++ mozilla/mail/locales/en-US/chrome/messenger/credits.dtd 2010-02-13 01:55:35.000000000 +0100
229 <!ENTITY credit.title "&brandFullName; Credits">
230 -<!ENTITY brandMotto "Thunderbirds Are Go!">
231 +<!ENTITY brandMotto "Icedoves Are Free!">
232 <!ENTITY credit.thanks "Special Thanks To">
234 <!-- localization credits look like this: -->
235 diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger/featureConfigurator.dtd mozilla/mail/locales/en-US/chrome/messenger/featureConfigurator.dtd
236 --- mozilla.orig/mail/locales/en-US/chrome/messenger/featureConfigurator.dtd 2010-01-11 18:40:34.000000000 +0100
237 +++ mozilla/mail/locales/en-US/chrome/messenger/featureConfigurator.dtd 2010-02-13 12:57:07.000000000 +0100
239 <!ENTITY featureConfigurator.title "Migration Assistant">
241 <!-- LOCALIZATION NOTE (featureConfigurator.heading): Heading for the page -->
242 -<!ENTITY featureConfigurator.heading "Thunderbird 3 features worth knowing about">
243 +<!ENTITY featureConfigurator.heading "Icedove 3 features worth knowing about">
245 <!-- LOCALIZATION NOTE (featureConfigurator.para1): The tone of this paragraph
246 is important: we tried for a tone that promotes the new features (which we
247 believe are good and worth users learning about), but also emphasizing that we
248 think it's important to preserve user choice. -->
249 -<!ENTITY featureConfigurator.para1 "Thunderbird 3 includes powerful new features which we're quite proud of, and think most people will love. People's tastes and needs vary, so we made it easy to control and customize Thunderbird.">
250 +<!ENTITY featureConfigurator.para1 "Icedove 3 includes powerful new features which we're quite proud of, and think most people will love. People's tastes and needs vary, so we made it easy to control and customize Icedove.">
252 <!-- LOCALIZATION NOTE (featureConfigurator.para2): This paragraph explains
253 that this page is active (the buttons change the UI), and that they can get
255 <!ENTITY featureConfigurator.alternative.label "Alternative">
257 <!ENTITY featureConfigurator.syncBenefits.para "Lets you read your mail when you're not connected to the internet, and lets you find messages based on the words they contain, not just the subjects and names.">
258 -<!ENTITY featureConfigurator.syncAlternative.para "Thunderbird will download all your mail onto this computer. Turn it off if you're low on disk space, or you have to pay for network traffic.">
259 +<!ENTITY featureConfigurator.syncAlternative.para "Icedove will download all your mail onto this computer. Turn it off if you're low on disk space, or you have to pay for network traffic.">
261 <!-- LOCALIZATION NOTE (featureConfigurator.syncAll.button): The choice of
262 lower case is intentional, but may be overriden if that doesn't make sense
265 <!-- LOCALIZATION NOTE (featureConfigurator.headerParaBeforeLink): The part
266 of the paragraph before the beginning of the link to the AMO search page.-->
267 -<!ENTITY featureConfigurator.headerParaBeforeLink "Thunderbird 3 has improved the detailed message header view, including buttons for message-related actions. There are alternative designs available as ">
268 +<!ENTITY featureConfigurator.headerParaBeforeLink "Icedove 3 has improved the detailed message header view, including buttons for message-related actions. There are alternative designs available as ">
270 <!-- LOCALIZATION NOTE (featureConfigurator.headerParaLinkName): The name of
271 the link to the AMO search page.-->
272 diff -urN mozilla.orig/mozilla/toolkit/xre/nsAppRunner.cpp mozilla/mozilla/toolkit/xre/nsAppRunner.cpp
273 --- mozilla.orig/mozilla/toolkit/xre/nsAppRunner.cpp 2010-01-11 18:43:15.000000000 +0100
274 +++ mozilla/mozilla/toolkit/xre/nsAppRunner.cpp 2010-02-13 01:55:35.000000000 +0100
275 @@ -1236,8 +1236,7 @@
280 - gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version);
281 + printf("%s %s", gAppData->name, gAppData->version);
282 if (gAppData->copyright)
283 printf(", %s", gAppData->copyright);