← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/evolution/oneiric-proposed

« back to all changes in this revision

Viewing changes to mail/mail.error.xml

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-08-18 11:10:01 UTC
  • mfrom: (1.1.83 upstream)
  • Revision ID: james.westby@ubuntu.com-20110818111001-559uzyuqsoyj7xjg
Tags: 3.1.5-0ubuntu1
https://launchpad.net/bugs/828693
* New upstream release.
* debian/control: bump e-d-s Build-Depends to 3.1.5.
* debian/patches/03_lpi.patch: refreshed.
* debian/patches/11_remove_upstream_submit_bugreport.patch: refreshed.
* debian/patches/bogofilter_init_903b8e6.patch,
  debian/patches/evo_fbee43e_to_f4505a2.patch,
  debian/patches/spamassassin_init_4fc04af.patch: dropped, included upstream.
* debian/patches/spamd_sbin_path.patch: correct the path to spamd as
  /usr/sbin/spamd, which is the correct path in Ubuntu. (LP: #828693)

Show diffs side-by-side

added added

removed removed

Lines of Context:
mail/mail.error.xml
404
404
    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
405
405
  </error>
406
406
 
 
407
  <error id="checking-service-error" type="error">
 
408
    <_primary>Failed to query server for a list of supported authentication mechanisms.</_primary>
 
409
    <secondary xml:space="preserve">{0}</secondary>
 
410
  </error>
 
411
 
407
412
  <error id="gw-accountsetup-error" type="error">
408
413
    <_primary>Unable to connect to the GroupWise server.</_primary>
409
414
    <_secondary xml:space="preserve">Please check your account settings and try again.</_secondary>