Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-control-center/ChangeLog,v
retrieving revision 1.599
diff -u -w -r1.599 ChangeLog
--- ChangeLog	1 Jan 2004 22:35:15 -0000	1.599
+++ ChangeLog	5 Jan 2004 19:41:32 -0000
@@ -1,3 +1,12 @@
+2004-01-05  Carlos Perelló Marín <carlos@gnome.org>
+
+	* configure.in: Added a check for libicu and the needed lines to add
+	the localization capplet.
+	* capplets/Makefile.am: Added the localization dir.
+	* capplets/localization: Added the localization capplet to change
+	the locales.
+	* po/POTFILES.in: Added new files from localization capplet.
+	
 2004-01-01  Rodney Dawes  <dobey@ximian.com>
 
 	* configure.in: Require GTK+ 2.3.0
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-control-center/configure.in,v
retrieving revision 1.410
diff -u -w -r1.410 configure.in
--- configure.in	1 Jan 2004 22:35:16 -0000	1.410
+++ configure.in	5 Jan 2004 19:41:32 -0000
@@ -111,6 +111,14 @@
 
 DISPLAY_CAPPLET_LIBS="$DISPLAY_CAPPLET_LIBS $RANDR_LIBS"
 
+dnl
+dnl Check for libicu, needed for localization capplet
+dnl
+
+AC_CHECK_LIB(icuuc, u_cleanup_2_1, LOCALIZATION_CAPPLET_LIBS="-licuuc",
+  [AC_CHECK_HEADER(unicode/uloc.h, , AC_MSG_ERROR([[
+*** Couldn't find icu. Please download and install from
+*** http://oss.software.ibm.com/icu/ and try again.]]))])
 				   
 CAPPLET_LIBS="$CAPPLET_LIBS $x_libs"
 GNOMECC_LIBS="$GNOMECC_LIBS $x_libs"
@@ -128,7 +136,6 @@
 				       :, [#include <X11/Xlib.h>])
 AM_CONDITIONAL(HAVE_XCURSOR, [test $have_xcursor=yes])
 
-
 dnl
 dnl Check for gtk+ with multihead support
 dnl
@@ -308,6 +315,8 @@
 AC_SUBST(DISPLAY_CAPPLET_CFLAGS)
 AC_SUBST(DISPLAY_CAPPLET_LIBS)
 
+AC_SUBST(LOCALIZATION_CAPPLET_LIBS)
+
 AC_SUBST(GNOMECC_CFLAGS)
 AC_SUBST(GNOMECC_LIBS)
 
@@ -401,7 +410,8 @@
 capplets/file-types/Makefile
 capplets/file-types/libuuid/Makefile
 capplets/font/Makefile
 capplets/keybindings/Makefile
+capplets/localization/Makefile
 capplets/keyboard/Makefile
 capplets/mouse/Makefile
 capplets/sound/Makefile
Index: capplets/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/Makefile.am,v
retrieving revision 1.66
diff -u -w -r1.66 Makefile.am
--- capplets/Makefile.am	25 Jun 2003 17:37:11 -0000	1.66
+++ capplets/Makefile.am	5 Jan 2004 19:41:32 -0000
@@ -3,7 +3,7 @@
 	default-applications desktop-links font		\
 	background keyboard mouse sound			\
 	file-types theme-switcher ui-properties		\
-	keybindings network windows
+	keybindings localization network windows
 
 if HAVE_RANDR
 randr_SUBDIRS = display
Index: po/POTFILES.in
===================================================================
RCS file: /cvs/gnome/gnome-control-center/po/POTFILES.in,v
retrieving revision 1.149
diff -u -w -r1.149 POTFILES.in
--- po/POTFILES.in	21 Dec 2003 22:00:00 -0000	1.149
+++ po/POTFILES.in	5 Jan 2004 19:41:35 -0000
@@ -56,6 +56,9 @@
 capplets/keyboard/gnome-keyboard-properties.c
 capplets/keyboard/gnome-keyboard-properties.glade
 capplets/keyboard/keyboard.desktop.in
+capplets/localization/gnome-localization-properties.c
+capplets/localization/gnome-localization-properties.glade
+capplets/localization/localization.desktop.in
 capplets/mouse/gnome-mouse-properties.c
 capplets/mouse/gnome-mouse-properties.glade
 capplets/mouse/gnome-settings-mouse.desktop.in
