]> git.pld-linux.org Git - packages/icedove.git/blame - icedove-branding.patch
projects / packages / icedove.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- disable auto updates, they don't work anyway, disable phishing URL scanning
[packages/icedove.git] / icedove-branding.patch
CommitLineData
7b575f7f 1diff -urN mozilla.orig/configure mozilla/configure
2--- mozilla.orig/configure 2008-06-23 14:04:11.000000000 +0200
3+++ mozilla/configure 2008-06-23 20:44:56.000000000 +0200
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
16--- mozilla.orig/configure.in 2008-06-23 14:04:04.000000000 +0200
17+++ mozilla/configure.in 2008-06-23 19:50:01.000000000 +0200
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=
624e061f 29diff -urN mozilla.orig/mail/app/profile/all-thunderbird.js mozilla/mail/app/profile/all-thunderbird.js
30--- mozilla.orig/mail/app/profile/all-thunderbird.js 2008-06-23 14:04:11.000000000 +0200
31+++ mozilla/mail/app/profile/all-thunderbird.js 2008-06-24 13:09:21.000000000 +0200
32@@ -35,7 +35,7 @@
33 *
34 * ***** END LICENSE BLOCK ***** */
35
36-#expand pref("general.useragent.extra.thunderbird", "Thunderbird/__APP_VERSION__");
37+#expand pref("general.useragent.extra.thunderbird", "Icedove/__APP_VERSION__");
38
39 #expand pref("general.useragent.locale", "__AB_CD__");
40 pref("general.skins.selectedSkin", "classic/1.0");
7b575f7f 41diff -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
42--- mozilla.orig/mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in 2008-06-23 14:04:11.000000000 +0200
43+++ mozilla/mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in 2008-06-23 19:38:21.000000000 +0200
44@@ -20,7 +20,7 @@
45 </em:targetApplication>
46
47 <!-- Front End MetaData -->
48- <em:name>Thunderbird (default)</em:name>
49+ <em:name>Icedove (default)</em:name>
50 <em:description>The default theme</em:description>
51
52 <!-- EXTENSION AUTHORS!
53diff -urN mozilla.orig/mail/base/content/credits.xhtml mozilla/mail/base/content/credits.xhtml
54--- mozilla.orig/mail/base/content/credits.xhtml 2008-06-23 14:04:11.000000000 +0200
55+++ mozilla/mail/base/content/credits.xhtml 2008-06-24 11:50:55.000000000 +0200
56@@ -216,7 +216,7 @@
57 </div>
58
59 <div id="creditsBox">
60- <h2 class="title">&brandFullName;&trade;
61+ <h2 class="title">&brandFullName;
62 <div class="motto">&brandMotto;</div>
63 </h2>
64
65@@ -348,19 +348,13 @@
66 <p id="gecko" class="center">&credit.poweredByGecko;</p>
67
68 <p class="footnote">
69- &brandFullName;&trade; &license.part0; &copy;1998-2008 &license.part1;
70+ &brandFullName; &license.part0; &copy;1998-2008 &license.part1;
71 <a href="" link="http://www.mozilla.org/credits/" onclick="visitLink(event); event.preventDefault();">&license.contrib;</a>,
72 &license.part2;
73 <a href="" onclick="openLicense(); event.preventDefault();">license</a>
74 &license.part3;</p>
75
76 <p class="footnote">
77- Mozilla Thunderbird&trade; and the Thunderbird logo are trademarks of the Mozilla
78- Foundation. You are not granted rights or licenses to the trademarks
79- of the Mozilla Foundation or any party, including without limitation the
80- Thunderbird name or logo.</p>
81-
82- <p class="footnote">
83 U.S. GOVERNMENT END USERS. The Software is a &ldquo;commercial item,&rdquo;
84 as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of
85 &ldquo;commercial computer software&rdquo; and &ldquo;commercial computer software
86diff -urN mozilla.orig/mail/base/content/mailWindowOverlay.xul mozilla/mail/base/content/mailWindowOverlay.xul
87--- mozilla.orig/mail/base/content/mailWindowOverlay.xul 2008-06-23 14:04:11.000000000 +0200
88+++ mozilla/mail/base/content/mailWindowOverlay.xul 2008-06-24 12:05:34.000000000 +0200
89@@ -1879,17 +1879,10 @@
90 <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">
91 #ifdef XP_MACOSX
92 <menuitem id="hintsAndTips" label="&hintsAndTips.label;" key="key_macHelp" oncommand="openRegionURL('mailnews.hints_and_tips.url');"/>
93- <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="openFormattedRegionURL('app.releaseNotesURL');"/>
94 #else
95- <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="openFormattedRegionURL('app.releaseNotesURL');"/>
96 <menuitem id="hintsAndTips" accesskey="&hintsAndTips.accesskey;" label="&hintsAndTips.label;" oncommand="openRegionURL('mailnews.hints_and_tips.url');"/>
97 #endif
98 <menuseparator id="menu_HelpAboutSeparator"/>
99- <menuitem id="checkForUpdates" accesskey="&updateCmd.accesskey;" class="menuitem-iconic"
100- label="&updateCmd.label;" oncommand="checkForUpdates();"/>
101-#ifndef XP_MACOSX
102- <menuseparator/>
103-#endif
104 <menuitem id="aboutName" accesskey="&aboutCmd.accesskey;"
105 label="&aboutCmd.label;"
106 #ifdef XP_MACOSX
107diff -urN mozilla.orig/mail/base/content/start.xhtml mozilla/mail/base/content/start.xhtml
108--- mozilla.orig/mail/base/content/start.xhtml 2008-06-23 14:04:11.000000000 +0200
109+++ mozilla/mail/base/content/start.xhtml 2008-06-23 19:57:54.000000000 +0200
110@@ -145,7 +145,6 @@
111
112 <h2>&startpage.moreInfo;</h2>
113 <p>&startpage.helpInfo; <a href="&startpage.helpURL;">&startpage.help;</a>.</p>
114-<p>&startpage.pageInfo; <a href="&startpage.pageURL;">&startpage.page;</a>.</p>
115
116 <!-- Localization-specific information, i.e. how to download a dictionary. -->
117 &startpage.extra;
118diff -urN mozilla.orig/mail/components/compose/content/messengercompose.xul mozilla/mail/components/compose/content/messengercompose.xul
119--- mozilla.orig/mail/components/compose/content/messengercompose.xul 2008-06-23 14:04:11.000000000 +0200
120+++ mozilla/mail/components/compose/content/messengercompose.xul 2008-06-24 11:58:00.000000000 +0200
121@@ -542,9 +542,7 @@
122 <menupopup id="menu_HelpPopup">
123 #ifdef XP_MACOSX
124 <menuitem id="hintsAndTips" label="&hintsAndTips.label;" key="key_macHelp" oncommand="openRegionURL('mailnews.hints_and_tips.url');"/>
125- <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="openFormattedRegionURL('app.releaseNotesURL');"/>
126 #else
127- <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="openFormattedRegionURL('app.releaseNotesURL');"/>
128 <menuitem id="hintsAndTips" accesskey="&hintsAndTips.accesskey;" label="&hintsAndTips.label;" oncommand="openRegionURL('mailnews.hints_and_tips.url');"/>
129 <menuseparator id="menu_HelpAboutSeparator"/>
130 #endif
131diff -urN mozilla.orig/mail/components/preferences/advanced.xul mozilla/mail/components/preferences/advanced.xul
132--- mozilla.orig/mail/components/preferences/advanced.xul 2008-06-23 14:04:11.000000000 +0200
133+++ mozilla/mail/components/preferences/advanced.xul 2008-06-23 19:29:27.000000000 +0200
134@@ -200,11 +200,6 @@
135 <tabpanel orient="vertical" align="start">
136 <label>&autoCheck.label;</label>
137 <vbox class="indent">
138- <checkbox id="enableAppUpdate"
139- label="&enableAppUpdate.label;"
140- accesskey="&enableAppUpdate.accesskey;"
141- preference="app.update.enabled"
142- xhtml2:role="wairole:checkbox" aaa:describedby="updateInfo"/>
143 <checkbox id="enableAddonUpdate"
144 label="&enableAddonsUpdate.label;"
145 accesskey="&enableAddonsUpdate.accesskey;"
146diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger/aboutDialog.dtd mozilla/mail/locales/en-US/chrome/messenger/aboutDialog.dtd
147--- mozilla.orig/mail/locales/en-US/chrome/messenger/aboutDialog.dtd 2008-06-23 14:04:11.000000000 +0200
148+++ mozilla/mail/locales/en-US/chrome/messenger/aboutDialog.dtd 2008-06-23 19:17:25.000000000 +0200
149@@ -2,6 +2,4 @@
150 <!ENTITY credits "Credits">
151 <!ENTITY aboutLink "&lt; About &brandFullName;">
152 <!ENTITY aboutVersion "version">
153-<!ENTITY copyrightText "&#169;1998-2008 Contributors. All Rights Reserved. Mozilla Thunderbird and the
154- Thunderbird logos are trademarks of the Mozilla Foundation. All rights
155- reserved.">
156+<!ENTITY copyrightText "&#169;1998-2008 Contributors. All Rights Reserved.">
157diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger/credits.dtd mozilla/mail/locales/en-US/chrome/messenger/credits.dtd
158--- mozilla.orig/mail/locales/en-US/chrome/messenger/credits.dtd 2008-06-23 14:04:11.000000000 +0200
159+++ mozilla/mail/locales/en-US/chrome/messenger/credits.dtd 2008-06-23 19:36:44.000000000 +0200
160@@ -1,5 +1,5 @@
161 <!ENTITY credit.title "&brandFullName; Credits">
162-<!ENTITY brandMotto "Thunderbirds Are Go!">
163+<!ENTITY brandMotto "Icedoves Are Free!">
164 <!ENTITY credit.leads "Engineering Leads">
165 <!ENTITY credit.core "Core Development Posse">
166 <!ENTITY credit.gecko "Gecko Layout Engine">
167diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger/start.dtd mozilla/mail/locales/en-US/chrome/messenger/start.dtd
168--- mozilla.orig/mail/locales/en-US/chrome/messenger/start.dtd 2008-06-23 14:04:11.000000000 +0200
169+++ mozilla/mail/locales/en-US/chrome/messenger/start.dtd 2008-06-23 19:46:25.000000000 +0200
170@@ -19,11 +19,11 @@
171
172 <!ENTITY startpage.moreInfo "More Information">
173
174-<!ENTITY startpage.help "Thunderbird Help">
175+<!ENTITY startpage.help "Icedove Help">
176 <!ENTITY startpage.helpInfo "For frequently asked questions, tips and general help, visit">
177 <!ENTITY startpage.helpURL "http://www.mozilla.org/support/thunderbird/">
178
179-<!ENTITY startpage.page "Thunderbird Product Page">
180+<!ENTITY startpage.page "Icedove Product Page">
181 <!ENTITY startpage.pageInfo "For product information, visit the">
182 <!ENTITY startpage.pageURL "http://www.mozilla.org/products/thunderbird/">
183
184diff -urN mozilla.orig/mail/locales/en-US/chrome/messenger-newsblog/newsblog.properties mozilla/mail/locales/en-US/chrome/messenger-newsblog/newsblog.properties
185--- mozilla.orig/mail/locales/en-US/chrome/messenger-newsblog/newsblog.properties 2008-06-23 14:04:11.000000000 +0200
186+++ mozilla/mail/locales/en-US/chrome/messenger-newsblog/newsblog.properties 2008-06-23 19:52:09.000000000 +0200
187@@ -9,7 +9,7 @@
188
189 subscribe-OPMLImportTitle=Select OPML file to import
190 subscribe-OPMLExportTitle=Export feeds as an OPML file
191-subscribe-OPMLExportFileTitle=Thunderbird OPML Export
192+subscribe-OPMLExportFileTitle=Icedove OPML Export
193 subscribe-OPMLExportFileName=MyThunderbirdFeeds.opml
194 #LOCALIZATION NOTE: %S is the name of the OPML file the user tried to import.
195 subscribe-errorInvalidOPMLFile=Either %S is not a valid OPML file or there was an error importing the file.
196diff -urN mozilla.orig/mail/locales/en-US/installer/installer.inc mozilla/mail/locales/en-US/installer/installer.inc
197--- mozilla.orig/mail/locales/en-US/installer/installer.inc 2008-06-23 14:04:11.000000000 +0200
198+++ mozilla/mail/locales/en-US/installer/installer.inc 2008-06-23 19:47:15.000000000 +0200
199@@ -19,7 +19,7 @@
200 Type_Message0=Choose the type of Setup you prefer, then click Next.
201
202 Standard_Short=&Standard
203-Standard_Long=Thunderbird will be installed with the most common options.
204+Standard_Long=Icedove will be installed with the most common options.
205
206 Custom_Short=&Custom
207 Custom_Long=You may choose individual options to be installed. Recommended for experienced users.
208diff -urN mozilla.orig/mail/locales/en-US/updater/updater.ini mozilla/mail/locales/en-US/updater/updater.ini
209--- mozilla.orig/mail/locales/en-US/updater/updater.ini 2008-06-23 14:04:11.000000000 +0200
210+++ mozilla/mail/locales/en-US/updater/updater.ini 2008-06-23 19:47:27.000000000 +0200
211@@ -1,4 +1,4 @@
212 ; This file is in the UTF-8 encoding
213 [Strings]
214 Title=Software Update
215-Info=Thunderbird is installing your updates and will start in a few moments...
216+Info=Icedove is installing your updates and will start in a few moments...
Icedove - email client
This page took 0.061134 seconds and 4 git commands to generate.