icedove-branding.patch

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