update for 2.13.2.

2005-11-14  Rodrigo Moya <rodrigo@novell.com>

	* configure.in:
	* NEWS: update for 2.13.2.

ChangeLog

@@ -1,3 +1,8 @@
+2005-11-14  Rodrigo Moya <rodrigo@novell.com>
+
+	* configure.in:
+	* NEWS: update for 2.13.2.
+
 2005-11-14  Jürg Billeter  <j@bitron.ch>
 
 	* schemas/Makefile.am:

NEWS

@@ -1,3 +1,33 @@
+gnome-control-center 2.13.2
+
+background:
+- Sanity check on GConf string values (Alexis Robert) (320647)
+
+themus:
+- 15-20% speedup in theme thumbnailer startup (Sebastien Bacher)
+
+shell:
+- Respond correctly to theme changes (Carlos Garnacho)
+
+other:
+- Compilation fixes (Kjartan Maraas, Rodrigo Moya)
+
+translations:
+- bg (Alexander Shopov)
+- cs (Miroslav Trmac)
+- en_CA (Adam Weinberger)
+- es (Francisco Javier F. Serrador)
+- eu (Iñaki Larrañaga)
+- fa (Roozbeh Pournader)
+- fi (Ilkka Tuohela)
+- ja (Takeshi AIHANA)
+- lt (Zygimantas Berucka )
+- nl (Vincent van Adrighem)
+- ro (Dan Damian)
+- sk (Marcel Telka)
+- th (Theppitak Karoonboonyanan)
+
+------------------------------------------------------------------------------
 gnome-control-center 2.13.1
 
 default-applications:

configure.in

@@ -1,4 +1,4 @@
-AC_INIT([control-center], [2.13.1],
+AC_INIT([control-center], [2.13.2],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=control-center])
 
 AC_CONFIG_MACRO_DIR([m4])

po/ChangeLog

@@ -71,7 +71,6 @@
 
 	* fi.po: Updated Finnish translation.
 
->>>>>>> 1.1807
 2005-10-13  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated by Ivar Smolin.

po/POTFILES.in

@@ -92,7 +92,6 @@ libwindow-settings/metacity-window-manager.c
 schemas/apps_gnome_settings_daemon_default_editor.schemas.in
 schemas/apps_gnome_settings_daemon_keybindings.schemas.in
 schemas/apps_gnome_settings_daemon_screensaver.schemas.in
-schemas/desktop_gnome_peripherals_keyboard_numlock.schemas.in
 schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in
 typing-break/drw-break-window.c
 typing-break/drwright.c