From ba06a8c7e537a4543885b8108159ca93c9675318 Mon Sep 17 00:00:00 2001
From: "Sergey V. Udaltsov" <svu@src.gnome.org>
Date: Thu, 20 Dec 2007 23:01:10 +0000
Subject: [PATCH] Preparing 2.21.4

svn path=/trunk/; revision=8338
---
 ChangeLog    |  5 ++++
 NEWS         | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.in |  2 +-
 3 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5324c2176..b806b08e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-20  Sergey Udaltsov <svu@gnome.org>
+
+	* configure.in:
+	* NEWS: prepare for 2.21.4.
+
 2007-12-17  Sergey Udaltsov <svu@gnome.org>
 
 	* configure.in: the changes require new API, so bump the
diff --git a/NEWS b/NEWS
index 13ba10fc0..9651c91dc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,73 @@
+gnome-control-center 2.21.4
+
+about-me:
+- Add a translation hint (Jens Granseuer)
+- Don't mark empty and padding strings for translation (Jens Granseuer) 
+  (bug #502087)
+- Remove non-functional Help button (Matthias Clasen) (bug #497803)
+
+accessibility:
+- Don't mark padding strings for translation and add translation comments for
+  the pixel order strings (Jens Granseuer) (bug #502087)
+- Enable the preferred applications button (Chris Jones) (bug #499332)
+
+appearance:
+- Free metacity theme after use (Jens Granseuer)
+- Don't mark padding string as translatable (Jens Granseuer) (bug #502087)
+- Make "Open" the default action for the file choosers (Jens Granseuer) 
+  (bug #500091)
+- Fix .desktop to be valid (Frederic Crozat) (bug #434956)
+- Fix detection of image mimetype (Frederic Crozat) (bug #498980)
+- Add shortcut for /usr/share/backgrounds to background file chooser and also
+  consider it when setting the initial directory (Jens Granseuer) (bug #497807)
+
+default applications:
+- Add support for Midori web browser (Jakub Rusinek) (bug #500274)
+- Don't list the oudated evolution versions nor the text web browsers 
+  (Sebastien Bacher) (bug #499327)
+
+keyboard:
+- Implement layout printing (Sergey Udaltsov) (bug #502961)
+- Don't mark padding strings and stock items for translation (Jens Granseuer) 
+  (bug #502087)
+
+mouse:
+- Don't mark padding string as translatable (Jens Granseuer) (bug #502087)
+
+network:
+- Add 48x48 PNG icon version (Andreas Nilsson) (bug #503035)
+
+settings daemon:
+- Prefer beagle and tracker to gnome-search-tool (Jens Granseuer)
+- Use new setting from libgnome to make toolbar icon size setting work 
+  (Jens Granseuer) (bug #401030)
+- Launch Nautilus with --no-desktop for the home key so we don't mess up the 
+  desktop for people using something else to manage the background (Jens 
+  Granseuer) (bug #500085)
+- Move display settings here from gnome-session (Dan Winship, Lucas Rocha) 
+  (bug #434982)
+- Allow key bindings using Super and Meta combinations (Bastien Nocera) (bug #165343)
+
+window:
+- Add a comment for translators (Jens Granseuer) (bug #502087)
+
+common:
+- Don't even try to open NULL filenames, and don't leak filenames when 
+  detecting recursions (Jens Granseuer)
+- Printing NULL strings crashes on Solaris so don't do that (Brian Cameron) (bug #501391)
+
+updated translations:
+- be@latin (Ihar Hrachyshka)
+- el (Kostas Papadimas)
+- es (Jorge Gonzalez)
+- gl (Ignacio Casal Quinteiro)
+- ml (Ani Peter)
+- nb (Kjartan Maraas)
+- oc (Yannig Marchegay)
+- ru (Nickolay V. Shmyrev)
+- sl (Matej Urbancic)
+- sv (Daniel Nylander)
+
 gnome-control-center 2.21.2
 
 about-me:
diff --git a/configure.in b/configure.in
index 50a020df2..27a10cb41 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT([gnome-control-center], [2.21.2],
+AC_INIT([gnome-control-center], [2.21.4],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center])
 
 AC_CONFIG_MACRO_DIR([m4])