]> git.pld-linux.org Git - packages/thunderbird.git/blame - icedove-branding.patch
projects / packages / thunderbird.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- release 3
[packages/thunderbird.git] / icedove-branding.patch
CommitLineData
7b575f7f 1diff -urN mozilla.orig/configure mozilla/configure
fee2f3e6 2--- mozilla.orig/configure 2008-07-29 13:28:47.000000000 +0200
3+++ mozilla/configure 2008-07-29 13:34:31.000000000 +0200
7b575f7f 4@@ -13155,8 +13155,8 @@
5 ;;
6
7 mail)
8- MOZ_APP_NAME=thunderbird
9- MOZ_APP_DISPLAYNAME=Thunderbird
10+ MOZ_APP_NAME=icedove
11+ MOZ_APP_DISPLAYNAME=Icedove
12 MOZ_XUL_APP=1
13 MOZ_THUNDERBIRD=1
14 MOZ_MATHML=
15diff -urN mozilla.orig/configure.in mozilla/configure.in
fee2f3e6 16--- mozilla.orig/configure.in 2008-07-29 13:28:20.000000000 +0200
17+++ mozilla/configure.in 2008-07-29 13:34:31.000000000 +0200
7b575f7f 18@@ -4378,8 +4378,8 @@
19 ;;
20
21 mail)
22- MOZ_APP_NAME=thunderbird
23- MOZ_APP_DISPLAYNAME=Thunderbird
24+ MOZ_APP_NAME=icedove
25+ MOZ_APP_DISPLAYNAME=Icedove
26 MOZ_XUL_APP=1
27 MOZ_THUNDERBIRD=1
28 MOZ_MATHML=
8fb5ca2b 29diff -urN mozilla.orig/mail/app/nsMailApp.cpp mozilla/mail/app/nsMailApp.cpp
fee2f3e6 30--- mozilla.orig/mail/app/nsMailApp.cpp 2008-07-29 13:28:46.000000000 +0200
31+++ mozilla/mail/app/nsMailApp.cpp 2008-07-29 13:34:31.000000000 +0200
8fb5ca2b 32@@ -48,7 +48,7 @@
33 sizeof(nsXREAppData),
34 nsnull,
35 nsnull,
36- "Thunderbird",
37+ "Icedove",
38 NS_STRINGIFY(APP_VERSION),
39 NS_STRINGIFY(BUILD_ID),
40 "{3550f703-e582-4d05-9a08-453d09bdfdc6}",
624e061f 41diff -urN mozilla.orig/mail/app/profile/all-thunderbird.js mozilla/mail/app/profile/all-thunderbird.js
fee2f3e6 42--- mozilla.orig/mail/app/profile/all-thunderbird.js 2008-07-29 13:28:46.000000000 +0200
43+++ mozilla/mail/app/profile/all-thunderbird.js 2008-07-29 14:02:08.000000000 +0200
624e061f 44@@ -35,7 +35,7 @@
45 *
46 * ***** END LICENSE BLOCK ***** */
47
48-#expand pref("general.useragent.extra.thunderbird", "Thunderbird/__APP_VERSION__");
49+#expand pref("general.useragent.extra.thunderbird", "Icedove/__APP_VERSION__");
50
51 #expand pref("general.useragent.locale", "__AB_CD__");
52 pref("general.skins.selectedSkin", "classic/1.0");
fee2f3e6 53@@ -74,10 +74,10 @@
54
55 // URL user can browse to manually if for some reason all update installation
56 // attempts fail. TODO: Change this URL
57-pref("app.update.url.manual", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/");
58+pref("app.update.url.manual", "http://%LOCALE%.www.mozilla.com/%LOCALE%/thunderbird/");
59 // A default value for the "More information about this update" link
60 // supplied in the "An update is available" page of the update wizard.
61-pref("app.update.url.details", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/releases/");
62+pref("app.update.url.details", "http://%LOCALE%.www.mozilla.com/%LOCALE%/thunderbird/releases/");
63 // User-settable override to app.update.url for testing purposes.
64 //pref("app.update.url.override", "");
65
66@@ -102,7 +102,7 @@
67 pref("app.update.showInstalledUI", false);
68
69 // Release notes URL
70-pref("app.releaseNotesURL", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/releasenotes/");
71+pref("app.releaseNotesURL", "http://%LOCALE%.www.mozilla.com/%LOCALE%/thunderbird/%VERSION%/releasenotes/");
72
73 // Blocklist preferences
74 pref("extensions.blocklist.enabled", true);
75@@ -130,8 +130,8 @@
76 pref("extensions.update.interval", 86400); // Check for updates to Extensions and
77 // Themes every week
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.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/extensions/");
82+pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/themes/");
83 pref("extensions.dss.enabled", false); // Dynamic Skin Switching
84 pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
85
7b575f7f 86diff -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
fee2f3e6 87--- mozilla.orig/mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in 2008-07-29 13:28:46.000000000 +0200
88+++ mozilla/mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in 2008-07-29 13:34:31.000000000 +0200
7b575f7f 89@@ -20,7 +20,7 @@
90 </em:targetApplication>
91
92 <!-- Front End MetaData -->
93- <em:name>Thunderbird (default)</em:name>
94+ <em:name>Icedove (default)</em:name>
95 <em:description>The default theme</em:description>
96
97 <!-- EXTENSION AUTHORS!
98diff -urN mozilla.orig/mail/base/content/credits.xhtml mozilla/mail/base/content/credits.xhtml
fee2f3e6 99--- mozilla.orig/mail/base/content/credits.xhtml 2008-07-29 13:28:46.000000000 +0200
100+++ mozilla/mail/base/content/credits.xhtml 2008-07-29 13:34:31.000000000 +0200
7b575f7f 101@@ -216,7 +216,7 @@
102 </div>
103
104 <div id="creditsBox">
105- <h2 class="title">&brandFullName;&trade;
106+ <h2 class="title">&brandFullName;
107 <div class="motto">&brandMotto;</div>
108 </h2>
109
110@@ -348,19 +348,13 @@
111 <p id="gecko" class="center">&credit.poweredByGecko;</p>
112
113 <p class="footnote">
114- &brandFullName;&trade; &license.part0; &copy;1998-2008 &license.part1;
115+ &brandFullName; &license.part0; &copy;1998-2008 &license.part1;
116 <a href="" link="http://www.mozilla.org/credits/" onclick="visitLink(event); event.preventDefault();">&license.contrib;</a>,
117 &license.part2;
118 <a href="" onclick="openLicense(); event.preventDefault();">license</a>
119 &license.part3;</p>
120
121 <p class="footnote">
122- Mozilla Thunderbird&trade; and the Thunderbird logo are trademarks of the Mozilla
123- Foundation. You are not granted rights or licenses to the trademarks
124- of the Mozilla Foundation or any party, including without limitation the
125- Thunderbird name or logo.</p>
126-
127- <p class="footnote">
128 U.S. GOVERNMENT END USERS. The Software is a &ldquo;commercial item,&rdquo;
129 as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of
130 &ldquo;commercial computer software&rdquo; and &ldquo;commercial computer software
131diff -urN mozilla.orig/mail/base/content/mailWindowOverlay.xul mozilla/mail/base/content/mailWindowOverlay.xul
fee2f3e6 132--- mozilla.orig/mail/base/content/mailWindowOverlay.xul 2008-07-29 13:28:46.000000000 +0200
133+++ mozilla/mail/base/content/mailWindowOverlay.xul 2008-07-29 13:34:31.000000000 +0200
8c9c08b4 134@@ -1893,17 +1893,10 @@
7b575f7f 135 <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">
136 #ifdef XP_MACOSX
137 <menuitem id="hintsAndTips" label="&hintsAndTips.label;" key="key_macHelp" oncommand="openRegionURL('mailnews.hints_and_tips.url');"/>
138- <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="openFormattedRegionURL('app.releaseNotesURL');"/>
139 #else
140- <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="openFormattedRegionURL('app.releaseNotesURL');"/>
141 <menuitem id="hintsAndTips" accesskey="&hintsAndTips.accesskey;" label="&hintsAndTips.label;" oncommand="openRegionURL('mailnews.hints_and_tips.url');"/>
142 #endif
143 <menuseparator id="menu_HelpAboutSeparator"/>
144- <menuitem id="checkForUpdates" accesskey="&updateCmd.accesskey;" class="menuitem-iconic"
145- label="&updateCmd.label;" oncommand="checkForUpdates();"/>
146-#ifndef XP_MACOSX
8c9c08b4 147- <menuseparator id="menu_HelpAfterUpdatesSeparator"/>
7b575f7f 148-#endif
149 <menuitem id="aboutName" accesskey="&aboutCmd.accesskey;"
150 label="&aboutCmd.label;"
151 #ifdef XP_MACOSX
152diff -urN mozilla.orig/mail/base/content/start.xhtml mozilla/mail/base/content/start.xhtml
fee2f3e6 153--- mozilla.orig/mail/base/content/start.xhtml 2008-07-29 13:28:46.000000000 +0200
154+++ mozilla/mail/base/content/start.xhtml 2008-07-29 13:34:31.000000000 +0200
7b575f7f 155@@ -145,7 +145,6 @@
156
157 <h2>&startpage.moreInfo;</h2>
158 <p>&startpage.helpInfo; <a href="&startpage.helpURL;">&startpage.help;</a>.</p>
159-<p>&startpage.pageInfo; <a href="&startpage.pageURL;">&startpage.page;</a>.</p>
160
161 <!-- Localization-specific information, i.e. how to download a dictionary. -->
162 &startpage.extra;
163diff -urN mozilla.orig/mail/components/compose/content/messengercompose.xul mozilla/mail/components/compose/content/messengercompose.xul
fee2f3e6 164--- mozilla.orig/mail/components/compose/content/messengercompose.xul 2008-07-29 13:28:47.000000000 +0200
165+++ mozilla/mail/components/compose/content/messengercompose.xul 2008-07-29 13:34:31.000000000 +0200
7b575f7f 166@@ -542,9 +542,7 @@
167 <menupopup id="menu_HelpPopup">
168 #ifdef XP_MACOSX
169 <menuitem id="hintsAndTips" label="&hintsAndTips.label;" key="key_macHelp" oncommand="openRegionURL('mailnews.hints_and_tips.url');"/>
170- <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="openFormattedRegionURL('app.releaseNotesURL');"/>
171 #else
172- <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="openFormattedRegionURL('app.releaseNotesURL');"/>
173 <menuitem id="hintsAndTips" accesskey="&hintsAndTips.accesskey;" label="&hintsAndTips.label;" oncommand="openRegionURL('mailnews.hints_and_tips.url');"/>
174 <menuseparator id="menu_HelpAboutSeparator"/>
175 #endif
176diff -urN mozilla.orig/mail/components/preferences/advanced.xul mozilla/mail/components/preferences/advanced.xul
fee2f3e6 177--- mozilla.orig/mail/components/preferences/advanced.xul 2008-07-29 13:28:47.000000000 +0200
178+++ mozilla/mail/components/preferences/advanced.xul 2008-07-29 13:34:31.000000000 +0200
7b575f7f 179@@ -200,11 +200,6 @@
180 <tabpanel orient="vertical" align="start">
181 <label>&autoCheck.label;</label>
182 <vbox class="indent">
183- <checkbox id="enableAppUpdate"
184- label="&enableAppUpdate.label;"
185- accesskey="&enableAppUpdate.accesskey;"
186- preference="app.update.enabled"
187- xhtml2:role="wairole:checkbox" aaa:describedby="updateInfo"/>
188 <checkbox id="enableAddonUpdate"
189 label="&enableAddonsUpdate.label;"
190 accesskey="&enableAddonsUpdate.accesskey;"
191diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger/aboutDialog.dtd mozilla/mail/locales/en-US/chrome/messenger/aboutDialog.dtd
fee2f3e6 192--- mozilla.orig/mail/locales/en-US/chrome/messenger/aboutDialog.dtd 2008-07-29 13:28:46.000000000 +0200
193+++ mozilla/mail/locales/en-US/chrome/messenger/aboutDialog.dtd 2008-07-29 13:34:31.000000000 +0200
7b575f7f 194@@ -2,6 +2,4 @@
195 <!ENTITY credits "Credits">
196 <!ENTITY aboutLink "&lt; About &brandFullName;">
197 <!ENTITY aboutVersion "version">
198-<!ENTITY copyrightText "&#169;1998-2008 Contributors. All Rights Reserved. Mozilla Thunderbird and the
199- Thunderbird logos are trademarks of the Mozilla Foundation. All rights
200- reserved.">
201+<!ENTITY copyrightText "&#169;1998-2008 Contributors. All Rights Reserved.">
202diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger/credits.dtd mozilla/mail/locales/en-US/chrome/messenger/credits.dtd
fee2f3e6 203--- mozilla.orig/mail/locales/en-US/chrome/messenger/credits.dtd 2008-07-29 13:28:46.000000000 +0200
204+++ mozilla/mail/locales/en-US/chrome/messenger/credits.dtd 2008-07-29 13:34:31.000000000 +0200
7b575f7f 205@@ -1,5 +1,5 @@
206 <!ENTITY credit.title "&brandFullName; Credits">
207-<!ENTITY brandMotto "Thunderbirds Are Go!">
208+<!ENTITY brandMotto "Icedoves Are Free!">
209 <!ENTITY credit.leads "Engineering Leads">
210 <!ENTITY credit.core "Core Development Posse">
211 <!ENTITY credit.gecko "Gecko Layout Engine">
212diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger/start.dtd mozilla/mail/locales/en-US/chrome/messenger/start.dtd
fee2f3e6 213--- mozilla.orig/mail/locales/en-US/chrome/messenger/start.dtd 2008-07-29 13:28:46.000000000 +0200
214+++ mozilla/mail/locales/en-US/chrome/messenger/start.dtd 2008-07-29 13:34:31.000000000 +0200
7b575f7f 215@@ -19,11 +19,11 @@
216
217 <!ENTITY startpage.moreInfo "More Information">
218
219-<!ENTITY startpage.help "Thunderbird Help">
220+<!ENTITY startpage.help "Icedove Help">
221 <!ENTITY startpage.helpInfo "For frequently asked questions, tips and general help, visit">
222 <!ENTITY startpage.helpURL "http://www.mozilla.org/support/thunderbird/">
223
224-<!ENTITY startpage.page "Thunderbird Product Page">
225+<!ENTITY startpage.page "Icedove Product Page">
226 <!ENTITY startpage.pageInfo "For product information, visit the">
227 <!ENTITY startpage.pageURL "http://www.mozilla.org/products/thunderbird/">
228
229diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger-newsblog/newsblog.properties mozilla/mail/locales/en-US/chrome/messenger-newsblog/newsblog.properties
fee2f3e6 230--- mozilla.orig/mail/locales/en-US/chrome/messenger-newsblog/newsblog.properties 2008-07-29 13:28:46.000000000 +0200
231+++ mozilla/mail/locales/en-US/chrome/messenger-newsblog/newsblog.properties 2008-07-29 13:34:31.000000000 +0200
05a0e69e 232@@ -9,8 +9,8 @@
7b575f7f 233
234 subscribe-OPMLImportTitle=Select OPML file to import
235 subscribe-OPMLExportTitle=Export feeds as an OPML file
236-subscribe-OPMLExportFileTitle=Thunderbird OPML Export
05a0e69e 237-subscribe-OPMLExportFileName=MyThunderbirdFeeds.opml
7b575f7f 238+subscribe-OPMLExportFileTitle=Icedove OPML Export
05a0e69e 239+subscribe-OPMLExportFileName=MyIcedoveFeeds.opml
7b575f7f 240 #LOCALIZATION NOTE: %S is the name of the OPML file the user tried to import.
241 subscribe-errorInvalidOPMLFile=Either %S is not a valid OPML file or there was an error importing the file.
05a0e69e 242
7b575f7f 243diff -urN mozilla.orig/mail/locales/en-US/installer/installer.inc mozilla/mail/locales/en-US/installer/installer.inc
fee2f3e6 244--- mozilla.orig/mail/locales/en-US/installer/installer.inc 2008-07-29 13:28:46.000000000 +0200
245+++ mozilla/mail/locales/en-US/installer/installer.inc 2008-07-29 13:34:31.000000000 +0200
7b575f7f 246@@ -19,7 +19,7 @@
247 Type_Message0=Choose the type of Setup you prefer, then click Next.
248
249 Standard_Short=&Standard
250-Standard_Long=Thunderbird will be installed with the most common options.
251+Standard_Long=Icedove will be installed with the most common options.
252
253 Custom_Short=&Custom
254 Custom_Long=You may choose individual options to be installed. Recommended for experienced users.
255diff -urN mozilla.orig/mail/locales/en-US/updater/updater.ini mozilla/mail/locales/en-US/updater/updater.ini
fee2f3e6 256--- mozilla.orig/mail/locales/en-US/updater/updater.ini 2008-07-29 13:28:46.000000000 +0200
257+++ mozilla/mail/locales/en-US/updater/updater.ini 2008-07-29 13:34:32.000000000 +0200
7b575f7f 258@@ -1,4 +1,4 @@
259 ; This file is in the UTF-8 encoding
260 [Strings]
261 Title=Software Update
262-Info=Thunderbird is installing your updates and will start in a few moments...
263+Info=Icedove is installing your updates and will start in a few moments...
fee2f3e6 264diff -urN mozilla.orig/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties mozilla/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
265--- mozilla.orig/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties 2008-07-29 13:29:02.000000000 +0200
266+++ mozilla/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties 2008-07-29 14:01:58.000000000 +0200
267@@ -32,8 +32,8 @@
268 disableQueryMessage=Do you want to disable %S?
269
270 extensions.update.url=https://addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%
271-extensions.getMoreExtensionsURL=http://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/
272-extensions.getMoreThemesURL=http://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/
273+extensions.getMoreExtensionsURL=http://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/extensions/
274+extensions.getMoreThemesURL=http://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/themes/
275
276 themesTitle=Themes
277 extensionsTitle=Extensions
f1796073 278diff -urN mozilla.orig/toolkit/xre/nsAppRunner.cpp mozilla/toolkit/xre/nsAppRunner.cpp
fee2f3e6 279--- mozilla.orig/toolkit/xre/nsAppRunner.cpp 2008-07-29 13:29:02.000000000 +0200
280+++ mozilla/toolkit/xre/nsAppRunner.cpp 2008-07-29 13:34:32.000000000 +0200
f1796073 281@@ -1121,7 +1121,7 @@
282 static void
283 DumpVersion()
284 {
285- printf("%s %s %s, %s\n", gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version, gAppData->copyright);
286+ printf("%s %s, %s\n", gAppData->name, gAppData->version, gAppData->copyright);
287 }
288
289 #ifdef MOZ_ENABLE_XREMOTE
Thunderbird - email client
This page took 0.10161 seconds and 4 git commands to generate.