~ubuntu-branches/ubuntu/precise/enigmail/precise-security

« back to all changes in this revision

Viewing changes to extensions/enigmail/ui/locale/en-US/enigmail.dtd

  • Committer: Bazaar Package Importer
  • Author(s): Micah Gersten
  • Date: 2010-08-20 11:45:10 UTC
  • mfrom: (0.10.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100820114510-h3cfzn2k0k5z01t5
Tags: 2:1.1.2-0ubuntu1
* New upstream release

* Merge from debian unstable.  Remaining changes:
  - Drop versioned mozilla-devscripts dependency since we don't build on
    mips or mipsel
  - Add back thunderbird-dev build depends
    - update debian/control
  - fixes LP: #565014 - No signature detected in emails signed using pgp/mime

* Update build-depends on thunderbird or icedove to >= 3.1~
  - update debian/control
* Drop frozen_api patch as changes were accepted upstream
  - drop debian/patches/frozen_api.diff
  - update debian/patches/series
* Use system NSPR in Ubuntu as well
  - update debian/rules
* Build with -fshort-wchar for now to make the build succeed
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
604
604
                                                      <a class='enigmailLink'><html:a
605
605
                                                      href='mailto:enigmail@mozdev.org'>emailing us</html:a></a>.
606
606
                                                      <html:br/><html:br/>
607
 
                                                      This wizard is automatically invoked when you first install Enigmail. If you want to use the wizard again, you can launch it again from the OpenPGP menu.
 
607
                                                      This wizard is automatically invoked when you first install Enigmail. You can also launch it
 
608
                                                      manually from the OpenPGP menu.
608
609
                                                      <html:br/><html:br/>
609
610
                                                      Thank you for choosing Enigmail OpenPGP!">
610
611
<!ENTITY enigmail.setupWiz.pgWelcome.startNow        "Would you like to use the wizard now?">