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