[gnome-keyring/gck-work: 15/18] Merge branch 'master' into gck-work

[Stefan Walter <stefw src gnome org>]

commit 88fa3a11c5ad14c24ce3247c6f2ca45f9dfc6c01
Merge: cea36ad 201ad31
Author: Stef Walter <stef memberwebs com>
Date:   Sun Aug 8 09:43:10 2010 +0200

    Merge branch 'master' into gck-work

 .gitignore                                 |    3 +-
 configure.in                               |    2 -
 daemon/control/gkd-control-client.c        |   30 ++
 daemon/control/gkd-control-codes.h         |    1 +
 daemon/control/gkd-control-server.c        |   13 +
 daemon/control/gkd-control.h               |    2 +
 daemon/control/tests/.gitignore            |    1 +
 daemon/control/tests/Makefile.am           |   12 +-
 daemon/control/tests/test-control-quit.c   |   25 ++
 daemon/data/Makefile.am                    |   24 +--
 daemon/data/gnome-keyring.schemas.in       |   46 ---
 daemon/dbus/gkd-dbus.c                     |    9 +-
 daemon/gkd-main.c                          |   69 +++-
 daemon/gnome-keyring-gpg.desktop.in.in     |    1 -
 daemon/gnome-keyring-pkcs11.desktop.in.in  |    1 -
 daemon/gnome-keyring-secrets.desktop.in.in |    1 -
 daemon/gnome-keyring-ssh.desktop.in.in     |    1 -
 pkcs11/gkm/gkm-module.c                    |    4 +-
 po/es.po                                   |  126 +++----
 po/et.po                                   |   26 +-
 po/gl.po                                   |    9 +-
 po/he.po                                   |  122 +++---
 po/nb.po                                   |    8 +-
 po/pa.po                                   |  559 ++++++++++++++--------------
 po/sl.po                                   |  124 +++---
 po/sv.po                                   |  479 +++++++++++++-----------
 po/ta.po                                   |  522 ++++++++++++++------------
 27 files changed, 1171 insertions(+), 1049 deletions(-)
---