]>
Commit | Line | Data |
---|---|---|
7876e8ff | 1 | diff -urN mozilla.orig//calendar/lightning/install.rdf mozilla/calendar/lightning/install.rdf |
2 | --- mozilla.orig//calendar/lightning/install.rdf 2010-07-05 21:35:28.425408088 +0200 | |
3 | +++ mozilla/calendar/lightning/install.rdf 2010-07-05 21:39:36.114349634 +0200 | |
4 | @@ -46,7 +46,7 @@ | |
7c84544b | 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> | |
12 | #endif | |
7876e8ff | 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-07-05 21:35:28.495173642 +0200 | |
15 | +++ mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties 2010-07-05 21:39:36.114349634 +0200 | |
7c84544b | 16 | @@ -39,7 +39,7 @@ |
17 | ||
18 | # addon description: | |
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 | |
23 | ||
24 | # Lightning branding | |
7876e8ff | 25 | diff -urN mozilla.orig//mail/app/application.ini mozilla/mail/app/application.ini |
26 | --- mozilla.orig//mail/app/application.ini 2010-07-05 21:35:29.238749304 +0200 | |
27 | +++ mozilla/mail/app/application.ini 2010-07-05 21:39:36.141016423 +0200 | |
33107162 | 28 | @@ -37,7 +37,7 @@ |
29 | ||
30 | #filter substitution | |
31 | [App] | |
32 | -Name=Thunderbird | |
33 | +Name=Icedove | |
34 | Version=@APP_VERSION@ | |
35 | BuildID=@GRE_BUILDID@ | |
36 | #ifdef MOZ_SOURCE_REPO | |
7876e8ff | 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-07-05 21:35:29.331249108 +0200 | |
39 | +++ mozilla/mail/app/profile/all-thunderbird.js 2010-07-05 21:39:36.164349628 +0200 | |
40 | @@ -74,7 +74,7 @@ | |
33107162 | 41 | // App-specific update preferences |
42 | ||
43 | // Whether or not app updates are enabled | |
44 | -pref("app.update.enabled", true); | |
45 | +pref("app.update.enabled", false); | |
46 | ||
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 | |
7876e8ff | 49 | @@ -99,10 +99,10 @@ |
33107162 | 50 | |
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", ""); | |
61 | ||
7876e8ff | 62 | @@ -125,10 +125,10 @@ |
33107162 | 63 | pref("app.update.showInstalledUI", false); |
64 | ||
65 | // Release notes URL | |
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%"); | |
68 | ||
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%/"); | |
72 | ||
73 | // Blocklist preferences | |
74 | pref("extensions.blocklist.enabled", true); | |
7876e8ff | 75 | @@ -156,9 +156,9 @@ |
33107162 | 76 | pref("extensions.update.interval", 86400); // Check for updates to Extensions and |
77 | // Themes every day | |
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 | |
87 | ||
7876e8ff | 88 | @@ -167,12 +167,12 @@ |
33107162 | 89 | |
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%"); | |
103 | ||
104 | pref("xpinstall.whitelist.add", "update.mozilla.org"); | |
7876e8ff | 105 | pref("xpinstall.whitelist.add.36", "getpersonas.com"); |
106 | @@ -364,7 +364,7 @@ | |
33107162 | 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/"); | |
112 | ||
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: | |
7876e8ff | 115 | @@ -499,7 +499,7 @@ |
33107162 | 116 | pref("mailnews.database.global.logging.console", true); |
117 | ||
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%"); | |
121 | ||
7876e8ff | 122 | // Serif fonts look dated. Switching those language families to sans-serif |
123 | // where we think it makes sense. Worth investigating for other font families | |
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-07-05 21:35:29.344789211 +0200 | |
126 | +++ mozilla/mail/base/content/baseMenuOverlay.xul 2010-07-05 21:39:36.174349684 +0200 | |
33107162 | 127 | @@ -70,9 +70,6 @@ |
128 | oncommand="openSupportURL();" | |
129 | key="key_openHelp"/> | |
130 | #endif | |
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();"/> | |
7876e8ff | 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-07-05 21:35:29.344789211 +0200 | |
139 | +++ mozilla/mail/base/content/credits.xhtml 2010-07-05 21:44:34.520940060 +0200 | |
140 | @@ -198,7 +198,7 @@ | |
33107162 | 141 | </div> |
142 | ||
143 | <div id="creditsBox"> | |
144 | - <h2 class="title">&brandFullName;™ | |
145 | + <h2 class="title">&brandFullName; | |
146 | <div class="motto">&brandMotto;</div> | |
147 | </h2> | |
148 | ||
7876e8ff | 149 | @@ -312,12 +312,6 @@ |
33107162 | 150 | <p id="gecko" class="center">&credit.poweredByGecko;</p> |
151 | ||
33107162 | 152 | <p class="footnote"> |
153 | - Mozilla Thunderbird™ and the Thunderbird logo are trademarks of the Mozilla | |
154 | - Foundation. You are not granted rights or licenses to the trademarks | |
155 | - of the Mozilla Foundation or any party, including without limitation the | |
156 | - Thunderbird name or logo.</p> | |
157 | - | |
158 | - <p class="footnote"> | |
159 | U.S. GOVERNMENT END USERS. The Software is a “commercial item,” | |
160 | as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of | |
161 | “commercial computer software” and “commercial computer software | |
7876e8ff | 162 | diff -urN mozilla.orig//mail/build.mk mozilla/mail/build.mk |
163 | --- mozilla.orig//mail/build.mk 2010-07-05 21:35:29.562082558 +0200 | |
164 | +++ mozilla/mail/build.mk 2010-07-05 21:39:36.174349684 +0200 | |
165 | @@ -117,11 +117,11 @@ | |
33107162 | 166 | APP_NAME := $(APP_NAME)Debug |
167 | endif | |
168 | PROGRAM_LOCATION = ../../../$(DIST)/$(APP_NAME).app/Contents/MacOS/ | |
169 | -PROGRAM = $(PROGRAM_LOCATION)thunderbird-bin$(BIN_SUFFIX) | |
170 | +PROGRAM = $(PROGRAM_LOCATION)$(MOZ_APP_NAME)-bin$(BIN_SUFFIX) | |
171 | else | |
172 | # Non-mac options | |
173 | PROGRAM_LOCATION = ../../../$(DIST)/bin/ | |
174 | -PROGRAM = $(PROGRAM_LOCATION)thunderbird$(BIN_SUFFIX) | |
175 | +PROGRAM = $(PROGRAM_LOCATION)$(MOZ_APP_NAME)$(BIN_SUFFIX) | |
176 | endif | |
177 | ||
178 | mozmill:: | |
7876e8ff | 179 | diff -urN mozilla.orig//mail/confvars.sh mozilla/mail/confvars.sh |
180 | --- mozilla.orig//mail/confvars.sh 2010-07-05 21:35:29.801718821 +0200 | |
181 | +++ mozilla/mail/confvars.sh 2010-07-05 21:39:36.174349684 +0200 | |
7766e26f SP |
182 | @@ -36,7 +36,7 @@ |
183 | # | |
184 | # ***** END LICENSE BLOCK ***** | |
185 | ||
186 | -MOZ_APP_NAME=thunderbird | |
187 | +MOZ_APP_NAME=icedove | |
188 | MOZ_UPDATER=1 | |
189 | MOZ_THUNDERBIRD=1 | |
190 | MOZ_NO_ACTIVEX_SUPPORT=1 | |
7876e8ff | 191 | diff -urN mozilla.orig//mail/locales/en-US/chrome/messenger/credits.dtd mozilla/mail/locales/en-US/chrome/messenger/credits.dtd |
192 | --- mozilla.orig//mail/locales/en-US/chrome/messenger/credits.dtd 2010-07-05 21:35:30.087529062 +0200 | |
193 | +++ mozilla/mail/locales/en-US/chrome/messenger/credits.dtd 2010-07-05 21:39:36.174349684 +0200 | |
33107162 | 194 | @@ -1,5 +1,5 @@ |
195 | <!ENTITY credit.title "&brandFullName; Credits"> | |
196 | -<!ENTITY brandMotto "Thunderbirds Are Go!"> | |
197 | +<!ENTITY brandMotto "Icedoves Are Free!"> | |
198 | <!ENTITY credit.thanks "Special Thanks To"> | |
199 | ||
200 | <!-- localization credits look like this: --> | |
7876e8ff | 201 | diff -urN mozilla.orig//mozilla/toolkit/xre/nsAppRunner.cpp mozilla/mozilla/toolkit/xre/nsAppRunner.cpp |
202 | --- mozilla.orig//mozilla/toolkit/xre/nsAppRunner.cpp 2010-07-05 21:36:51.774157698 +0200 | |
203 | +++ mozilla/mozilla/toolkit/xre/nsAppRunner.cpp 2010-07-05 21:39:36.177475358 +0200 | |
204 | @@ -1334,8 +1334,7 @@ | |
33107162 | 205 | static inline void |
206 | DumpVersion() | |
207 | { | |
208 | - printf("%s %s %s", | |
209 | - gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version); | |
210 | + printf("%s %s", gAppData->name, gAppData->version); | |
211 | if (gAppData->copyright) | |
212 | printf(", %s", gAppData->copyright); | |
213 | printf("\n"); |