]>
Commit | Line | Data |
---|---|---|
aaf0282d | 1 | --- mozilla/calendar/lightning/install.rdf~ 2011-08-12 15:52:04.000000000 +0200 |
2 | +++ mozilla/calendar/lightning/install.rdf 2011-09-17 15:22:37.326572866 +0200 | |
3 | @@ -28,7 +28,7 @@ | |
4 | <em:id>@XPI_EM_ID@</em:id> | |
7c84544b | 5 | <em:name>Lightning</em:name> |
6 | <em:version>@LIGHTNING_VERSION@</em:version> <!-- BuildID=@GRE_BUILDID@ --> | |
7 | - <em:description>An integrated calendar for Thunderbird</em:description> | |
8 | + <em:description>An integrated calendar for Icedove</em:description> | |
9 | #ifdef LIGHTNING_PRERELEASE_VERSION | |
10 | <em:developer>Build ID: @GRE_BUILDID@</em:developer> | |
11 | #endif | |
aaf0282d | 12 | --- mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties~ 2011-08-12 15:52:04.000000000 +0200 |
13 | +++ mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties 2011-09-17 15:23:40.476566690 +0200 | |
7c84544b | 14 | @@ -39,7 +39,7 @@ |
15 | ||
16 | # addon description: | |
17 | extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.name=Lightning | |
18 | -extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Thunderbird | |
19 | +extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Icedove | |
20 | extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.creator=Mozilla Calendar Project | |
21 | ||
22 | # Lightning branding | |
3a30e2d7 JR |
23 | --- mozilla/im/app/application.ini~ 2011-08-12 15:52:04.000000000 +0200 |
24 | +++ mozilla/im/app/application.ini 2011-09-17 15:24:45.833226544 +0200 | |
33107162 | 25 | @@ -37,7 +37,7 @@ |
26 | ||
27 | #filter substitution | |
28 | [App] | |
3a30e2d7 | 29 | -Name=Instantbird |
33107162 | 30 | +Name=Icedove |
31 | Version=@APP_VERSION@ | |
32 | BuildID=@GRE_BUILDID@ | |
33 | #ifdef MOZ_SOURCE_REPO | |
64b4570d JB |
34 | --- mozilla/mail/app/profile/all-thunderbird.js.orig 2012-03-13 03:37:11.000000000 +0100 |
35 | +++ mozilla/mail/app/profile/all-thunderbird.js 2012-03-24 21:42:35.608437888 +0100 | |
a367af64 | 36 | @@ -84,7 +84,7 @@ |
3a30e2d7 | 37 | pref("app.update.certs.2.commonName", "aus4.mozilla.org"); |
33107162 | 38 | |
39 | // Whether or not app updates are enabled | |
3a30e2d7 JR |
40 | -pref("app.update.enabled", true); |
41 | +pref("app.update.enabled", false); | |
33107162 | 42 | |
43 | // This preference turns on app.update.mode and allows automatic download and | |
3a30e2d7 JR |
44 | // install to take place. We use a separate boolean toggle for this to make |
45 | @@ -120,7 +119,7 @@ pref("app.update.url", "https://aus4.mozilla.org/update/3/%PRODUCT%/%VERSION%/%B | |
aaf0282d | 46 | pref("app.update.url.manual", "http://www.getthunderbird.com"); |
33107162 | 47 | // A default value for the "More information about this update" link |
3a30e2d7 | 48 | // supplied in the "An update is available" page of the update wizard. |
84f8583c JR |
49 | -pref("app.update.url.details", "http://www.mozilla.org/%LOCALE%/%APP%/releases/"); |
50 | +pref("app.update.url.details", "http://www.mozilla.org/%LOCALE%/thunderbird/releases/"); | |
33107162 | 51 | // User-settable override to app.update.url for testing purposes. |
52 | //pref("app.update.url.override", ""); | |
53 | ||
3a30e2d7 JR |
54 | @@ -149,7 +148,7 @@ pref("toolkit.crashreporter.infoURL", |
55 | "http://www.mozilla.org/thunderbird/legal/privacy/#crash-reporter");"); | |
33107162 | 56 | |
57 | // Base URL for web-based support pages. | |
58 | -pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/"); | |
59 | +pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/thunderbird/%APPBUILDID%/"); | |
60 | ||
3a30e2d7 JR |
61 | // Show error messages in error console. |
62 | pref("javascript.options.showInConsole", true); | |
63 | @@ -178,18 +177,18 @@ pref("extensions.autoDisableScopes", 15); | |
aaf0282d | 64 | // Preferences for AMO integration |
65 | pref("extensions.getAddons.cache.enabled", true); | |
66 | pref("extensions.getAddons.maxResults", 15); | |
64b4570d JB |
67 | -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%"); |
68 | -pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); | |
aaf0282d | 69 | -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%"); |
6864d0a2 | 70 | -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); |
aaf0282d | 71 | -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%"); |
64b4570d JB |
72 | +pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%"); |
73 | +pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); | |
aaf0282d | 74 | +pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%"); |
6864d0a2 | 75 | +pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); |
aaf0282d | 76 | +pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%"); |
64b4570d | 77 | |
33107162 | 78 | // Blocklist preferences |
79 | pref("extensions.blocklist.enabled", true); | |
a367af64 | 80 | pref("extensions.blocklist.interval", 86400); |
3a30e2d7 | 81 | pref("extensions.blocklist.url", "https://blocklist.addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/"); |
a367af64 | 82 | -pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/"); |
3a30e2d7 | 83 | -pref("extensions.blocklist.itemURL", "https://blocklist.addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%"); |
a367af64 | 84 | +pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/blocked/"); |
3a30e2d7 | 85 | +pref("extensions.blocklist.itemURL", "https://blocklist.addons.mozilla.org/%LOCALE%/thunderbird/blocked/%blockID%"); |
a367af64 | 86 | |
3a30e2d7 JR |
87 | // Enables some extra Extension System Logging (can reduce performance) |
88 | pref("extensions.logging.enabled", false); | |
89 | @@ -209,7 +208,8 @@ pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla | |
590c075b JR |
90 | pref("extensions.update.interval", 86400); // Check for updates to Extensions and |
91 | // Themes every day | |
92 | ||
3a30e2d7 | 93 | -pref("extensions.dss.enabled", false); // Dynamic Skin Switching |
590c075b | 94 | +pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/"); |
3a30e2d7 | 95 | +pref("extensions.dss.enabled", false); // Dynamic Skin Switching |
590c075b JR |
96 | pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next |
97 | ||
3a30e2d7 JR |
98 | pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://messenger/locale/messenger.properties"); |
99 | @@ -424,7 +424,7 @@ pref("browser.helperApps.deleteTempFileOnExit", true); | |
33107162 | 100 | |
33107162 | 101 | pref("spellchecker.dictionary", ""); |
102 | // Dictionary download preference | |
3ad9bb18 | 103 | -pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries/"); |
3a30e2d7 | 104 | +pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.com/%LOCALE%/thunderbird/dictionaries/"); |
33107162 | 105 | |
106 | // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular | |
3a30e2d7 JR |
107 | // mail application without any user intervention. Possible values are: |
108 | @@ -559,7 +559,7 @@ pref("mailnews.database.global.logging.console", true); | |
109 | pref("mailnews.database.global.search.msg.limit", 1000); | |
33107162 | 110 | |
111 | // page to load to find good header add-ons | |
112 | -pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/%APP%/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%"); | |
113 | +pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/thunderbird/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%"); | |
114 | ||
7876e8ff | 115 | // Serif fonts look dated. Switching those language families to sans-serif |
116 | // where we think it makes sense. Worth investigating for other font families | |
3a30e2d7 | 117 | @@ -751,7 +751,7 @@ pref("plugins.hide_infobar_for_carbon_failure_plugin", false); |
a367af64 | 118 | |
3a30e2d7 | 119 | pref("plugins.update.url", "https://www.mozilla.org/%LOCALE%/plugincheck/"); |
a367af64 JB |
120 | pref("plugins.update.notifyUser", false); |
121 | -pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/%APP%/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); | |
122 | +pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/thunderbird/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); | |
123 | ||
3a30e2d7 JR |
124 | // Click-to-play has not been ported for TB yet, see bug 814168. |
125 | // The default plugin state should be changed to "ask to activate" when this | |
590c075b JR |
126 | --- mozilla/mail/locales/en-US/chrome/messenger/accountCreation.dtd~ |
127 | +++ mozilla/mail/locales/en-US/chrome/messenger/accountCreation.dtd | |
128 | @@ -78,7 +78,7 @@ | |
129 | <!ENTITY changeSettings.label "Change Settings"> | |
130 | <!ENTITY changeSettings.accesskey "S"> | |
131 | ||
132 | -<!ENTITY contactYourProvider.description "&brandShortName; can allow you to get to your mail using the provided configurations. However, you should contact your administrator or email provider regarding these improper connections. See the Thunderbird FAQ for more information."> | |
133 | +<!ENTITY contactYourProvider.description "&brandShortName; can allow you to get to your mail using the provided configurations. However, you should contact your administrator or email provider regarding these improper connections. See the Icedove FAQ for more information."> | |
134 | ||
135 | <!ENTITY insecureServer.tooltip.title "Warning! This is an insecure server."> | |
136 | <!ENTITY insecureServer.tooltip.details "Click circle for more details."> | |
aaf0282d | 137 | --- mozilla/mail/confvars.sh~ 2011-08-12 15:52:05.000000000 +0200 |
138 | +++ mozilla/mail/confvars.sh 2011-09-17 15:34:33.613167078 +0200 | |
090220f6 | 139 | @@ -6,8 +6,8 @@ |
03be87a5 JR |
140 | # License, v. 2.0. If a copy of the MPL was not distributed with this |
141 | # file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
7766e26f | 142 | |
03be87a5 | 143 | -MOZ_APP_BASENAME=Thunderbird |
7766e26f | 144 | -MOZ_APP_NAME=thunderbird |
03be87a5 | 145 | +MOZ_APP_BASENAME=Icedove |
7766e26f SP |
146 | +MOZ_APP_NAME=icedove |
147 | MOZ_UPDATER=1 | |
148 | MOZ_THUNDERBIRD=1 | |
aaf0282d | 149 | MOZ_CHROME_FILE_FORMAT=omni |
090220f6 JR |
150 | @@ -30,7 +30,7 @@ |
151 | ||
152 | MOZ_UA_BUILDID=20100101 | |
153 | ||
154 | -MOZ_BRANDING_DIRECTORY=mail/branding/aurora | |
155 | +MOZ_BRANDING_DIRECTORY=icedove/branding | |
156 | MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/thunderbird | |
157 | MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6} | |
158 | # This should usually be the same as the value MAR_CHANNEL_ID. |