[pan2/xzver_support: 43/43] Merge branch 'master' into xzver_support

[Heinrich MÃller <henmull src gnome org>]

commit 44830f4badc8986baeb8ea4714828b298ae99ef6
Merge: 2040c16 cfc0392
Author: Heinrich MÃller <henmull src gnome org>
Date:   Sun Jun 10 19:18:15 2012 +0200

    Merge branch 'master' into xzver_support
    
    Conflicts:
    	pan/tasks/Makefile.am

 README                            |  119 +++--
 configure.in                      |    4 +-
 pan/data-impl/Makefile.am         |    4 +-
 pan/data-impl/add-server.cc       |    2 +-
 pan/data-impl/data-impl.cc        |    7 +-
 pan/data-impl/data-impl.h         |   12 +-
 pan/data-impl/server.cc           |   53 ++-
 pan/data/cert-store.cc            |   52 ++-
 pan/data/data.h                   |    6 +-
 pan/data/server-info.h            |    6 +-
 pan/gui/actions.cc                |    9 +-
 pan/gui/body-pane.cc              |   28 +-
 pan/gui/body-pane.h               |    4 +-
 pan/gui/group-pane.cc             |   16 +-
 pan/gui/group-pane.h              |    3 +
 pan/gui/group-prefs-dialog.cc     |   25 +-
 pan/gui/group-prefs-dialog.h      |    2 -
 pan/gui/gui.cc                    |   54 ++-
 pan/gui/gui.h                     |    9 +-
 pan/gui/header-pane.cc            |    3 +-
 pan/gui/pan.cc                    |    6 +-
 pan/gui/pan.ui.h                  |    2 +
 pan/gui/pan.ui.ssl.h              |    2 +
 pan/gui/post-ui.cc                |   22 +-
 pan/gui/prefs-ui.cc               |   13 +-
 pan/gui/save-attach-ui.cc         |    2 +-
 pan/gui/save-ui.cc                |    2 +-
 pan/gui/server-ui.cc              |   32 +-
 pan/gui/server-ui.h               |    6 +-
 pan/gui/task-pane.cc              |    4 +-
 pan/tasks/Makefile.am             |    2 +-
 pan/tasks/nntp-pool.cc            |   16 +-
 pan/tasks/nntp-pool.h             |    4 +-
 pan/tasks/nzb.cc                  |   12 +-
 pan/tasks/queue.cc                |   30 +-
 pan/tasks/queue.h                 |    4 +-
 pan/tasks/socket-impl-main.cc     |    1 -
 pan/tasks/task-article.cc         |    3 +-
 pan/tasks/task-article.h          |   16 +-
 pan/tasks/task.h                  |    2 +
 pan/usenet-utils/text-massager.cc |    2 +-
 po/cs.po                          |  856 +++++++++++++++++++---------------
 po/es.po                          |  710 +++++++++++++++--------------
 po/fr.po                          |  667 ++++++++++++++-------------
 po/sl.po                          |  934 ++++++++++++++++++++-----------------
 uulib/uunconc.c                   |    2 +-
 46 files changed, 2085 insertions(+), 1685 deletions(-)
---
diff --cc pan/tasks/Makefile.am
index edf1e1b,f120e77..9841de8
--- a/pan/tasks/Makefile.am
+++ b/pan/tasks/Makefile.am
@@@ -1,6 -1,6 +1,6 @@@
 -AM_CPPFLAGS = -I top_srcdir@ @GMIME_CFLAGS@ @GLIB_CFLAGS@ @GNUTLS_CFLAGS@ @GTK_CFLAGS@
 +AM_CPPFLAGS = -I top_srcdir@ @GMIME_CFLAGS@ @GLIB_CFLAGS@ @GNUTLS_CFLAGS@ @GTK_CFLAGS@ @ZLIB_CFLAGS@
  
- AM_LDFLAGS = ../../uulib/libuu.a @GNUTLS_LIBS@ @ZLIB_LIBS@
 -AM_LDFLAGS = ../../uulib/libuu.a @GNUTLS_LIBS@ @GTK_LIBS@
++AM_LDFLAGS = ../../uulib/libuu.a @GNUTLS_LIBS@ @ZLIB_LIBS@ @GTK_LIBS@
  
  noinst_LIBRARIES = libtasks.a