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/mail/app/application.ini~   2011-08-12 15:52:04.000000000 +0200
  24 +++ mozilla/mail/app/application.ini    2011-09-17 15:24:45.833226544 +0200
  25 @@ -37,7 +37,7 @@
  26
  27  #filter substitution
  28  [App]
  29 -Name=Thunderbird
  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", "aus3.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 @@ -117,7 +117,7 @@
  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 @@ -139,7 +139,7 @@
  55  #endif
  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  // Controls enabling of the extension system logging (can reduce performance)
  62  pref("extensions.logging.enabled", false);
  63 @@ -161,18 +161,18 @@
  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.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
  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");
  71 -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
  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%");
  74 +pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%");
  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");
  76 +pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%");
  77
  78  // Blocklist preferences
  79  pref("extensions.blocklist.enabled", true);
  80  pref("extensions.blocklist.interval", 86400);
  81  pref("extensions.blocklist.url", "https://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%/");
  82 -pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/");
  83 -pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%");
  84 +pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/blocked/");
  85 +pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/blocked/%blockID%");
  86
  87  // Enables some extra Extension System Logging (can reduce performance)
  88  pref("extensions.logging.enabled", false);
  89 @@ -208,6 +207,7 @@ pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/Ve
  90  pref("extensions.update.interval", 86400);  // Check for updates to Extensions and
  91                                              // Themes every day
  92
  93 +pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/");
  94  pref("extensions.dss.enabled", false);          // Dynamic Skin Switching
  95  pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
  96
  97 @@ -391,7 +391,7 @@
  98
  99  pref("spellchecker.dictionary", "");
 100  // Dictionary download preference
 101 -pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries/");
 102 +pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/thunderbird/dictionaries/");
 103
 104  // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular
 105  // mail application without any user intervention. Possible values are:
 106 @@ -540,7 +540,7 @@
 107  pref("mailnews.database.global.logging.console", true);
 108
 109  // page to load to find good header add-ons
 110 -pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/%APP%/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
 111 +pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/thunderbird/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
 112
 113  // Serif fonts look dated.  Switching those language families to sans-serif
 114  // where we think it makes sense.  Worth investigating for other font families
 115 @@ -764,7 +764,7 @@
 116
 117  pref("plugins.update.url", "https://www.mozilla.com/%LOCALE%/plugincheck/");
 118  pref("plugins.update.notifyUser", false);
 119 -pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/%APP%/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 120 +pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/thunderbird/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 121
 122  // Windows taskbar support
 123  #ifdef XP_WIN
 124 --- mozilla/mail/locales/en-US/chrome/messenger/accountCreation.dtd~
 125 +++ mozilla/mail/locales/en-US/chrome/messenger/accountCreation.dtd
 126 @@ -78,7 +78,7 @@
 127  <!ENTITY changeSettings.label            "Change Settings">
 128  <!ENTITY changeSettings.accesskey        "S">
 129
 130 -<!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.">
 131 +<!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.">
 132
 133  <!ENTITY insecureServer.tooltip.title    "Warning! This is an insecure server.">
 134  <!ENTITY insecureServer.tooltip.details  "Click circle for more details.">
 135 --- mozilla/mail/confvars.sh~   2011-08-12 15:52:05.000000000 +0200
 136 +++ mozilla/mail/confvars.sh    2011-09-17 15:34:33.613167078 +0200
 137 @@ -36,8 +36,8 @@
 138  # License, v. 2.0. If a copy of the MPL was not distributed with this
 139  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 140
 141 -MOZ_APP_BASENAME=Thunderbird
 142 -MOZ_APP_NAME=thunderbird
 143 +MOZ_APP_BASENAME=Icedove
 144 +MOZ_APP_NAME=icedove
 145  MOZ_UPDATER=1
 146  MOZ_THUNDERBIRD=1
 147  MOZ_CHROME_FILE_FORMAT=omni