icedove-branding.patch

   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>
   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
  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
  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
  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
  25 @@ -37,7 +37,7 @@
  26
  27  #filter substitution
  28  [App]
  29 -Name=Instantbird
  30 +Name=Icedove
  31  Version=@APP_VERSION@
  32  BuildID=@GRE_BUILDID@
  33  #ifdef MOZ_SOURCE_REPO
  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
  36 @@ -84,7 +84,7 @@
  37  pref("app.update.certs.2.commonName", "aus4.mozilla.org");
  38
  39  // Whether or not app updates are enabled
  40 -pref("app.update.enabled", true);
  41 +pref("app.update.enabled", false);
  42
  43  // This preference turns on app.update.mode and allows automatic download and
  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
  46  pref("app.update.url.manual", "http://www.getthunderbird.com");
  47  // A default value for the "More information about this update" link
  48  // supplied in the "An update is available" page of the update wizard.
  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/");
  51  // User-settable override to app.update.url for testing purposes.
  52  //pref("app.update.url.override", "");
  53
  54 @@ -149,7 +148,7 @@ pref("toolkit.crashreporter.infoURL",
  55       "http://www.mozilla.org/thunderbird/legal/privacy/#crash-reporter");");
  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
  61  // Show error messages in error console.
  62  pref("javascript.options.showInConsole", true);
  63 @@ -178,20 +177,20 @@ pref("extensions.autoDisableScopes", 15);
  64  // Preferences for AMO integration
  65  pref("extensions.getAddons.cache.enabled", true);
  66  pref("extensions.getAddons.maxResults", 15);
  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%");
  69 -pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/%APP%/");
  70 -pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird");
  71 -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
  72 -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");
  73 -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
  74 +pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%");
  75 +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%");
  76 +pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/thunderbird/");
  77 +pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird");
  78 +pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%");
  79 +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");
  80 +pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%");
  81
  82  // Blocklist preferences
  83  pref("extensions.blocklist.enabled", true);
  84  pref("extensions.blocklist.interval", 86400);
  85  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%/");
  86 -pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/");
  87 -pref("extensions.blocklist.itemURL", "https://blocklist.addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%");
  88 +pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/blocked/");
  89 +pref("extensions.blocklist.itemURL", "https://blocklist.addons.mozilla.org/%LOCALE%/thunderbird/blocked/%blockID%");
  90
  91  // Enables some extra Extension System Logging (can reduce performance)
  92  pref("extensions.logging.enabled", false);
  93 @@ -209,7 +208,8 @@ pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla
  94  pref("extensions.update.interval", 86400);  // Check for updates to Extensions and
  95                                              // Themes every day
  96
  97 -pref("extensions.dss.enabled", false);          // Dynamic Skin Switching
  98 +pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/");
  99 +pref("extensions.dss.enabled", false);          // Dynamic Skin Switching
 100  pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
 101
 102  pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://messenger/locale/messenger.properties");
 103 @@ -424,7 +424,7 @@ pref("browser.helperApps.deleteTempFileOnExit", true);
 104
 105  pref("spellchecker.dictionary", "");
 106  // Dictionary download preference
 107 -pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries/");
 108 +pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.com/%LOCALE%/thunderbird/dictionaries/");
 109
 110  // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular
 111  // mail application without any user intervention. Possible values are:
 112 @@ -559,7 +559,7 @@ pref("mailnews.database.global.logging.console", true);
 113  pref("mailnews.database.global.search.msg.limit", 1000);
 114
 115  // page to load to find good header add-ons
 116 -pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/%APP%/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
 117 +pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/thunderbird/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
 118
 119  // Serif fonts look dated.  Switching those language families to sans-serif
 120  // where we think it makes sense.  Worth investigating for other font families
 121 @@ -751,7 +751,7 @@ pref("plugins.hide_infobar_for_carbon_failure_plugin", false);
 122
 123  pref("plugins.update.url", "https://www.mozilla.org/%LOCALE%/plugincheck/");
 124  pref("plugins.update.notifyUser", false);
 125 -pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/%APP%/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 126 +pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/thunderbird/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 127
 128  // Click-to-play has not been ported for TB yet, see bug 814168.
 129  // The default plugin state should be changed to "ask to activate" when this
 130 --- mozilla/mail/locales/en-US/chrome/messenger/accountCreation.dtd~
 131 +++ mozilla/mail/locales/en-US/chrome/messenger/accountCreation.dtd
 132 @@ -78,7 +78,7 @@
 133  <!ENTITY changeSettings.label            "Change Settings">
 134  <!ENTITY changeSettings.accesskey        "S">
 135
 136 -<!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.">
 137 +<!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.">
 138
 139  <!ENTITY insecureServer.tooltip.title    "Warning! This is an insecure server.">
 140  <!ENTITY insecureServer.tooltip.details  "Click circle for more details.">
 141 --- mozilla/mail/confvars.sh~   2011-08-12 15:52:05.000000000 +0200
 142 +++ mozilla/mail/confvars.sh    2011-09-17 15:34:33.613167078 +0200
 143 @@ -6,8 +6,8 @@
 144  # License, v. 2.0. If a copy of the MPL was not distributed with this
 145  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 146
 147 -MOZ_APP_BASENAME=Thunderbird
 148 -MOZ_APP_NAME=thunderbird
 149 +MOZ_APP_BASENAME=Icedove
 150 +MOZ_APP_NAME=icedove
 151  MOZ_UPDATER=1
 152  MOZ_THUNDERBIRD=1
 153  MOZ_CHROME_FILE_FORMAT=omni
 154 @@ -30,7 +30,7 @@
 155
 156  MOZ_UA_BUILDID=20100101
 157
 158 -MOZ_BRANDING_DIRECTORY=mail/branding/aurora
 159 +MOZ_BRANDING_DIRECTORY=icedove/branding
 160  MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/thunderbird
 161  MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6}
 162  # This should usually be the same as the value MAR_CHANNEL_ID.