Merge commit 'upstream/3.2.1'

1 files changed, 81 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 4cd07a9..f246643 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,86 @@
 # Generated by Makefile. Do not edit.
 
+commit f7414096623e564d9d26794b7cc1cb3ab680929d
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Oct 16 18:41:00 2011 +0200
+
+    Bump version to 3.2.1
+
+ NEWS         |   13 +++++++++++++
+ configure.ac |    2 +-
+ 2 files changed, 14 insertions(+), 1 deletions(-)
+
+commit 9f435e2c60a8bea0c196be393125f6f8767e7afd
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Oct 16 18:51:18 2011 +0200
+
+    Remove cc-panel/
+
+ cc-panel/.gitignore |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit aba3a821e5ea990701ca060bcc1ee40eb0d884ca
+Author: Zdeněk Hataš <zdenek.hatas@gmail.com>
+Date:   Tue Oct 4 11:38:35 2011 +0200
+
+    Updated Czech translation
+
+ po/cs.po |  501 +++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 252 insertions(+), 249 deletions(-)
+
+commit 5096ce0e7364523e85ccee9da224133a7a5354bf
+Author: Claude Paroz <claude@2xlibre.net>
+Date:   Sat Oct 1 23:20:37 2011 +0200
+
+    Updated French translation
+
+ po/fr.po |  353 +++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 176 insertions(+), 177 deletions(-)
+
+commit feea4b3e8b0ac9a2b7d61653f13dd7531245584e
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:   Sat Oct 1 11:48:06 2011 +0200
+
+    Updated Spanish translation
+
+ help/es/es.po |   31 ++++++++++++++-----------------
+ 1 files changed, 14 insertions(+), 17 deletions(-)
+
+commit 7f943685c00ea659b732c81e56ff5e5b831db5eb
+Author: Zdenek Hatas <zdenek.hatas@gmail.com>
+Date:   Thu Sep 29 16:12:19 2011 +0200
+
+    Fixed typo in documentation: applet doesn't have --always option
+    
+    Signed-off-by: Zdeněk Hataš <zdenek.hatas@gmail.com>
+    Signed-off-by: Guido Günther <agx@sigxcpu.org>
+
+ help/C/krb5-auth-dialog.xml |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 15fde0ec01fd3c55e886e077e3a8dcd2c24fd02c
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Tue Sep 27 20:47:54 2011 +0200
+
+    Register org.gnome.KrbAuthDialog early
+    
+    and get the bus via g_bus_get_sync unbreak DBus activation.
+
+ src/ka-applet.c |    6 ++----
+ src/ka-dbus.c   |   20 +++++++++-----------
+ 2 files changed, 11 insertions(+), 15 deletions(-)
+
+commit 256cd8abe47a7d762d738295e1c8f3ca90ab7590
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Tue Sep 27 11:52:37 2011 +0200
+
+    Add categories to desktop file
+    
+    BZ: #660227
+
+ src/krb5-auth-dialog.desktop.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
 commit 1c89fe8b203c85dcb4ff06fb8da34e411eb56730
 Author: Guido Günther <agx@sigxcpu.org>
 Date:   Mon Sep 26 22:13:36 2011 +0200