23 files changed, 135 insertions, 153 deletions

diff --git a/panels/Makefile.am b/panels/Makefile.am
index 945270e69..62041ec87 100644
--- a/panels/Makefile.am
+++ b/panels/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS= \
 	background \
 	display \
 	mouse \
-	keyboard \
+	region \
 	network \
 	sound \
 	default-applications \
diff --git a/panels/keyboard/Makefile.am b/panels/keyboard/Makefile.am
deleted file mode 100644
index b5ba46cb6..000000000
--- a/panels/keyboard/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-# This is used in GNOMECC_CAPPLETS_CFLAGS
-cappletname = keyboard
-
-INCLUDES = 						\
-	$(PANEL_CFLAGS)					\
-	$(GNOMECC_CAPPLETS_CFLAGS)			\
-	$(LIBGNOMEKBDUI_CFLAGS)				\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
-	-DGNOMECC_UI_DIR="\"$(uidir)\""
-	$(NULL)
-
-ccpanelsdir = $(PANELS_DIR)
-ccpanels_LTLIBRARIES = libkeyboard-properties.la
-
-libkeyboard_properties_la_SOURCES =	\
-	keyboard-module.c \
-	cc-keyboard-panel.c \
-	cc-keyboard-panel.h \
-	gnome-keyboard-properties.c \
-	gnome-keyboard-properties.h \
-	gnome-keyboard-properties-xkb.c \
-	gnome-keyboard-properties-xkbmc.c \
-	gnome-keyboard-properties-xkblt.c \
-	gnome-keyboard-properties-xkbltadd.c \
-	gnome-keyboard-properties-xkbot.c \
-	gnome-keyboard-properties-xkbpv.c \
-	gnome-keyboard-properties-xkb.h
-
-libkeyboard_properties_la_LIBADD = $(PANEL_LIBS) $(LIBGNOMEKBDUI_LIBS)
-
-libkeyboard_properties_la_LDFLAGS = $(PANEL_LDFLAGS)
-
-@INTLTOOL_DESKTOP_RULE@
-
-uidir   = $(pkgdatadir)/ui
-ui_DATA = \
-	gnome-keyboard-properties-dialog.ui \
-	gnome-keyboard-properties-layout-chooser.ui \
-	gnome-keyboard-properties-model-chooser.ui \
-	gnome-keyboard-properties-options-dialog.ui
-
-desktopdir = $(datadir)/applications
-Desktop_in_files = gnome-keyboard-panel.desktop.in
-desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
-
-CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
-EXTRA_DIST = $(ui_DATA)
-
-
--include $(top_srcdir)/git.mk
diff --git a/panels/keyboard/gnome-keyboard-panel.desktop.in.in b/panels/keyboard/gnome-keyboard-panel.desktop.in.in
deleted file mode 100644
index 8494e6af8..000000000
--- a/panels/keyboard/gnome-keyboard-panel.desktop.in.in
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-_Name=Keyboard
-_Comment=Set your keyboard preferences
-Exec=gnome-control-center keyboard
-Icon=preferences-desktop-keyboard
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
-OnlyShowIn=GNOME;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-control-center
-X-GNOME-Bugzilla-Component=keyboard
-X-GNOME-Bugzilla-Version=@VERSION@
-X-GNOME-Settings-Panel=keyboard
diff --git a/panels/keyboard/.indent.pro b/panels/region/.indent.pro
index bdff07415..bdff07415 100644
--- a/panels/keyboard/.indent.pro
+++ b/panels/region/.indent.pro
diff --git a/panels/region/Makefile.am b/panels/region/Makefile.am
new file mode 100644
index 000000000..a655ed8e1
--- /dev/null
+++ b/panels/region/Makefile.am
@@ -0,0 +1,51 @@
+# This is used in GNOMECC_CAPPLETS_CFLAGS
+cappletname = region
+
+INCLUDES = 						\
+	$(PANEL_CFLAGS)					\
+	$(GNOMECC_CAPPLETS_CFLAGS)			\
+	$(LIBGNOMEKBDUI_CFLAGS)				\
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
+	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
+	-DGNOMECC_UI_DIR="\"$(uidir)\""
+	$(NULL)
+
+ccpanelsdir = $(PANELS_DIR)
+ccpanels_LTLIBRARIES = libregion.la
+
+libregion_la_SOURCES =	\
+	region-module.c \
+	cc-region-panel.c \
+	cc-region-panel.h \
+	gnome-region-panel.c \
+	gnome-region-panel.h \
+	gnome-region-panel-xkb.c \
+	gnome-region-panel-xkbmc.c \
+	gnome-region-panel-xkblt.c \
+	gnome-region-panel-xkbltadd.c \
+	gnome-region-panel-xkbot.c \
+	gnome-region-panel-xkbpv.c \
+	gnome-region-panel-xkb.h
+
+libregion_la_LIBADD = $(PANEL_LIBS) $(LIBGNOMEKBDUI_LIBS)
+
+libregion_la_LDFLAGS = $(PANEL_LDFLAGS)
+
+@INTLTOOL_DESKTOP_RULE@
+
+uidir   = $(pkgdatadir)/ui
+ui_DATA = \
+	gnome-region-panel.ui \
+	gnome-region-panel-layout-chooser.ui \
+	gnome-region-panel-model-chooser.ui \
+	gnome-region-panel-options-dialog.ui
+
+desktopdir = $(datadir)/applications
+Desktop_in_files = gnome-region-panel.desktop.in
+desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
+
+CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
+EXTRA_DIST = $(ui_DATA)
+
+
+-include $(top_srcdir)/git.mk
diff --git a/panels/keyboard/cc-keyboard-panel.c b/panels/region/cc-region-panel.c
index b0c17de7d..bc0721c91 100644
--- a/panels/keyboard/cc-keyboard-panel.c
+++ b/panels/region/cc-region-panel.c
@@ -19,19 +19,19 @@
  *
  */
 
-#include "cc-keyboard-panel.h"
+#include "cc-region-panel.h"
 #include <gtk/gtk.h>
 
-G_DEFINE_DYNAMIC_TYPE (CcKeyboardPanel, cc_keyboard_panel, CC_TYPE_PANEL)
-#define KEYBOARD_PANEL_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_KEYBOARD_PANEL, CcKeyboardPanelPrivate))
-struct _CcKeyboardPanelPrivate {
+G_DEFINE_DYNAMIC_TYPE (CcRegionPanel, cc_region_panel, CC_TYPE_PANEL)
+#define REGION_PANEL_PRIVATE(o) \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_REGION_PANEL, CcRegionPanelPrivate))
+struct _CcRegionPanelPrivate {
 	GtkBuilder *builder;
 };
 
 
 static void
-cc_keyboard_panel_get_property (GObject * object,
+cc_region_panel_get_property (GObject * object,
 				guint property_id,
 				GValue * value, GParamSpec * pspec)
 {
@@ -43,7 +43,7 @@ cc_keyboard_panel_get_property (GObject * object,
 }
 
 static void
-cc_keyboard_panel_set_property (GObject * object,
+cc_region_panel_set_property (GObject * object,
 				guint property_id,
 				const GValue * value, GParamSpec * pspec)
 {
@@ -55,77 +55,77 @@ cc_keyboard_panel_set_property (GObject * object,
 }
 
 static void
-cc_keyboard_panel_dispose (GObject * object)
+cc_region_panel_dispose (GObject * object)
 {
-	CcKeyboardPanelPrivate *priv = CC_KEYBOARD_PANEL (object)->priv;
+	CcRegionPanelPrivate *priv = CC_REGION_PANEL (object)->priv;
 
 	if (priv->builder) {
 		g_object_unref (priv->builder);
 		priv->builder = NULL;
 	}
 
-	G_OBJECT_CLASS (cc_keyboard_panel_parent_class)->dispose (object);
+	G_OBJECT_CLASS (cc_region_panel_parent_class)->dispose (object);
 }
 
 static void
-cc_keyboard_panel_finalize (GObject * object)
+cc_region_panel_finalize (GObject * object)
 {
-	G_OBJECT_CLASS (cc_keyboard_panel_parent_class)->finalize (object);
+	G_OBJECT_CLASS (cc_region_panel_parent_class)->finalize (object);
 }
 
 static void
-cc_keyboard_panel_class_init (CcKeyboardPanelClass * klass)
+cc_region_panel_class_init (CcRegionPanelClass * klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	g_type_class_add_private (klass, sizeof (CcKeyboardPanelPrivate));
+	g_type_class_add_private (klass, sizeof (CcRegionPanelPrivate));
 
-	object_class->get_property = cc_keyboard_panel_get_property;
-	object_class->set_property = cc_keyboard_panel_set_property;
-	object_class->dispose = cc_keyboard_panel_dispose;
-	object_class->finalize = cc_keyboard_panel_finalize;
+	object_class->get_property = cc_region_panel_get_property;
+	object_class->set_property = cc_region_panel_set_property;
+	object_class->dispose = cc_region_panel_dispose;
+	object_class->finalize = cc_region_panel_finalize;
 }
 
 static void
-cc_keyboard_panel_class_finalize (CcKeyboardPanelClass * klass)
+cc_region_panel_class_finalize (CcRegionPanelClass * klass)
 {
 }
 
-GtkWidget *gnome_keyboard_properties_init (GtkBuilder * dialog);
+GtkWidget *gnome_region_properties_init (GtkBuilder * dialog);
 
 static void
-cc_keyboard_panel_init (CcKeyboardPanel * self)
+cc_region_panel_init (CcRegionPanel * self)
 {
-	CcKeyboardPanelPrivate *priv;
+	CcRegionPanelPrivate *priv;
 	GtkWidget *prefs_widget;
 	GError *error = NULL;
 
-	priv = self->priv = KEYBOARD_PANEL_PRIVATE (self);
+	priv = self->priv = REGION_PANEL_PRIVATE (self);
 
 	priv->builder = gtk_builder_new ();
 
 	gtk_builder_add_from_file (priv->builder,
 				   GNOMECC_UI_DIR
-				   "/gnome-keyboard-properties-dialog.ui",
+				   "/gnome-region-panel.ui",
 				   &error);
 	if (error != NULL) {
 		g_warning ("Error loading UI file: %s", error->message);
 		return;
 	}
 
-	gnome_keyboard_properties_init (priv->builder);
+	gnome_region_properties_init (priv->builder);
 
 	prefs_widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
-							     "keyboard_notebook");
+							     "region_notebook");
 
 	gtk_widget_reparent (prefs_widget, GTK_WIDGET (self));
 }
 
 void
-cc_keyboard_panel_register (GIOModule * module)
+cc_region_panel_register (GIOModule * module)
 {
-	cc_keyboard_panel_register_type (G_TYPE_MODULE (module));
+	cc_region_panel_register_type (G_TYPE_MODULE (module));
 	g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT,
-					CC_TYPE_KEYBOARD_PANEL,
-					"keyboard", 0);
+					CC_TYPE_REGION_PANEL,
+					"region", 0);
 }
diff --git a/panels/keyboard/cc-keyboard-panel.h b/panels/region/cc-region-panel.h
index 28deab202..00b2d18e9 100644
--- a/panels/keyboard/cc-keyboard-panel.h
+++ b/panels/region/cc-region-panel.h
@@ -20,55 +20,55 @@
  */
 
 
-#ifndef _CC_KEYBOARD_PANEL_H
-#define _CC_KEYBOARD_PANEL_H
+#ifndef _CC_REGION_PANEL_H
+#define _CC_REGION_PANEL_H
 
 #include <libgnome-control-center/cc-panel.h>
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_KEYBOARD_PANEL cc_keyboard_panel_get_type()
+#define CC_TYPE_REGION_PANEL cc_region_panel_get_type()
 
-#define CC_KEYBOARD_PANEL(obj) \
+#define CC_REGION_PANEL(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-  CC_TYPE_KEYBOARD_PANEL, CcKeyboardPanel))
+  CC_TYPE_REGION_PANEL, CcRegionPanel))
 
-#define CC_KEYBOARD_PANEL_CLASS(klass) \
+#define CC_REGION_PANEL_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_CAST ((klass), \
-  CC_TYPE_KEYBOARD_PANEL, CcKeyboardPanelClass))
+  CC_TYPE_REGION_PANEL, CcRegionPanelClass))
 
-#define CC_IS_KEYBOARD_PANEL(obj) \
+#define CC_IS_REGION_PANEL(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-  CC_TYPE_KEYBOARD_PANEL))
+  CC_TYPE_REGION_PANEL))
 
-#define CC_IS_KEYBOARD_PANEL_CLASS(klass) \
+#define CC_IS_REGION_PANEL_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-  CC_TYPE_KEYBOARD_PANEL))
+  CC_TYPE_REGION_PANEL))
 
-#define CC_KEYBOARD_PANEL_GET_CLASS(obj) \
+#define CC_REGION_PANEL_GET_CLASS(obj) \
   (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-  CC_TYPE_KEYBOARD_PANEL, CcKeyboardPanelClass))
+  CC_TYPE_REGION_PANEL, CcRegionPanelClass))
 
-typedef struct _CcKeyboardPanel CcKeyboardPanel;
-typedef struct _CcKeyboardPanelClass CcKeyboardPanelClass;
-typedef struct _CcKeyboardPanelPrivate CcKeyboardPanelPrivate;
+typedef struct _CcRegionPanel CcRegionPanel;
+typedef struct _CcRegionPanelClass CcRegionPanelClass;
+typedef struct _CcRegionPanelPrivate CcRegionPanelPrivate;
 
-struct _CcKeyboardPanel
+struct _CcRegionPanel
 {
   CcPanel parent;
 
-  CcKeyboardPanelPrivate *priv;
+  CcRegionPanelPrivate *priv;
 };
 
-struct _CcKeyboardPanelClass
+struct _CcRegionPanelClass
 {
   CcPanelClass parent_class;
 };
 
-GType cc_keyboard_panel_get_type (void) G_GNUC_CONST;
+GType cc_region_panel_get_type (void) G_GNUC_CONST;
 
-void  cc_keyboard_panel_register (GIOModule *module);
+void  cc_region_panel_register (GIOModule *module);
 
 G_END_DECLS
 
-#endif /* _CC_KEYBOARD_PANEL_H */
+#endif /* _CC_REGION_PANEL_H */
diff --git a/panels/keyboard/gnome-keyboard-properties-layout-chooser.ui b/panels/region/gnome-region-panel-layout-chooser.ui
index 2beb56d0f..2beb56d0f 100644
--- a/panels/keyboard/gnome-keyboard-properties-layout-chooser.ui
+++ b/panels/region/gnome-region-panel-layout-chooser.ui
diff --git a/panels/keyboard/gnome-keyboard-properties-model-chooser.ui b/panels/region/gnome-region-panel-model-chooser.ui
index 3fe7d4e1c..3fe7d4e1c 100644
--- a/panels/keyboard/gnome-keyboard-properties-model-chooser.ui
+++ b/panels/region/gnome-region-panel-model-chooser.ui
diff --git a/panels/keyboard/gnome-keyboard-properties-options-dialog.ui b/panels/region/gnome-region-panel-options-dialog.ui
index f92c4cd22..f92c4cd22 100644
--- a/panels/keyboard/gnome-keyboard-properties-options-dialog.ui
+++ b/panels/region/gnome-region-panel-options-dialog.ui
diff --git a/panels/keyboard/gnome-keyboard-properties-xkb.c b/panels/region/gnome-region-panel-xkb.c
index d5abc3750..01dd44975 100644
--- a/panels/keyboard/gnome-keyboard-properties-xkb.c
+++ b/panels/region/gnome-region-panel-xkb.c
@@ -1,5 +1,3 @@
-/* -*- mode: c; style: linux -*- */
-
 /* gnome-keyboard-properties-xkb.c
  * Copyright (C) 2003-2007 Sergey V. Udaltsov
  *
@@ -29,7 +27,7 @@
 #include <gdk/gdkx.h>
 #include <glib/gi18n.h>
 
-#include "gnome-keyboard-properties-xkb.h"
+#include "gnome-region-panel-xkb.h"
 
 #include <libgnomekbd/gkbd-desktop-config.h>
 
diff --git a/panels/keyboard/gnome-keyboard-properties-xkb.h b/panels/region/gnome-region-panel-xkb.h
index 4d1071582..5f840d753 100644
--- a/panels/keyboard/gnome-keyboard-properties-xkb.h
+++ b/panels/region/gnome-region-panel-xkb.h
@@ -1,5 +1,3 @@
-/* -*- mode: c; style: linux -*- */
-
 /* gnome-keyboard-properties-xkb.h
  * Copyright (C) 2003-2007 Sergey V Udaltsov
  *
diff --git a/panels/keyboard/gnome-keyboard-properties-xkblt.c b/panels/region/gnome-region-panel-xkblt.c
index 1f026151e..d7ac639ab 100644
--- a/panels/keyboard/gnome-keyboard-properties-xkblt.c
+++ b/panels/region/gnome-region-panel-xkblt.c
@@ -1,5 +1,3 @@
-/* -*- mode: c; style: linux -*- */
-
 /* gnome-keyboard-properties-xkblt.c
  * Copyright (C) 2003-2007 Sergey V. Udaltsov
  *
@@ -31,7 +29,7 @@
 #include <libgnomekbd/gkbd-desktop-config.h>
 #include <libgnomekbd/gkbd-keyboard-drawing.h>
 
-#include "gnome-keyboard-properties-xkb.h"
+#include "gnome-region-panel-xkb.h"
 
 
 #define SEL_LAYOUT_TREE_COL_DESCRIPTION 0
diff --git a/panels/keyboard/gnome-keyboard-properties-xkbltadd.c b/panels/region/gnome-region-panel-xkbltadd.c
index 8e7a57ab1..736aad4bc 100644
--- a/panels/keyboard/gnome-keyboard-properties-xkbltadd.c
+++ b/panels/region/gnome-region-panel-xkbltadd.c
@@ -1,5 +1,3 @@
-/* -*- mode: c; style: linux -*- */
-
 /* gnome-keyboard-properties-xkbltadd.c
  * Copyright (C) 2007 Sergey V. Udaltsov
  *
@@ -30,7 +28,7 @@
 #include <libgnomekbd/gkbd-keyboard-drawing.h>
 #include <libgnomekbd/gkbd-util.h>
 
-#include "gnome-keyboard-properties-xkb.h"
+#include "gnome-region-panel-xkb.h"
 
 enum {
 	COMBO_BOX_MODEL_COL_SORT,
diff --git a/panels/keyboard/gnome-keyboard-properties-xkbmc.c b/panels/region/gnome-region-panel-xkbmc.c
index f99bf2321..d6b6a2dfe 100644
--- a/panels/keyboard/gnome-keyboard-properties-xkbmc.c
+++ b/panels/region/gnome-region-panel-xkbmc.c
@@ -1,5 +1,3 @@
-/* -*- mode: c; style: linux -*- */
-
 /* gnome-keyboard-properties-xkbmc.c
  * Copyright (C) 2003-2007 Sergey V. Udaltsov
  *
@@ -28,7 +26,7 @@
 #include <gdk/gdkx.h>
 #include <glib/gi18n.h>
 
-#include "gnome-keyboard-properties-xkb.h"
+#include "gnome-region-panel-xkb.h"
 
 static gchar *current_model_name = NULL;
 static gchar *current_vendor_name = NULL;
diff --git a/panels/keyboard/gnome-keyboard-properties-xkbot.c b/panels/region/gnome-region-panel-xkbot.c
index cd7a02f98..6e076154e 100644
--- a/panels/keyboard/gnome-keyboard-properties-xkbot.c
+++ b/panels/region/gnome-region-panel-xkbot.c
@@ -1,5 +1,3 @@
-/* -*- mode: c; style: linux -*- */
-
 /* gnome-keyboard-properties-xkbot.c
  * Copyright (C) 2003-2007 Sergey V. Udaltsov
  *
@@ -29,7 +27,7 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-#include "gnome-keyboard-properties-xkb.h"
+#include "gnome-region-panel-xkb.h"
 
 static GtkBuilder *chooser_dialog = NULL;
 static const char *current1st_level_id = NULL;
diff --git a/panels/keyboard/gnome-keyboard-properties-xkbpv.c b/panels/region/gnome-region-panel-xkbpv.c
index 48e1f6c33..809163bfe 100644
--- a/panels/keyboard/gnome-keyboard-properties-xkbpv.c
+++ b/panels/region/gnome-region-panel-xkbpv.c
@@ -1,5 +1,3 @@
-/* -*- mode: c; style: linux -*- */
-
 /* gnome-keyboard-properties-xkbpv.c
  * Copyright (C) 2003-2007 Sergey V. Udaltsov
  *
@@ -27,7 +25,7 @@
 
 #include <libgnomekbd/gkbd-keyboard-drawing.h>
 
-#include "gnome-keyboard-properties-xkb.h"
+#include "gnome-region-panel-xkb.h"
 
 #ifdef HAVE_X11_EXTENSIONS_XKB_H
 #include "X11/XKBlib.h"
diff --git a/panels/keyboard/gnome-keyboard-properties.c b/panels/region/gnome-region-panel.c
index b4f4c34a9..aef4fa914 100644
--- a/panels/keyboard/gnome-keyboard-properties.c
+++ b/panels/region/gnome-region-panel.c
@@ -1,5 +1,3 @@
-/* -*- mode: c; style: linux -*- */
-
 /* keyboard-properties.c
  * Copyright (C) 2000-2001 Ximian, Inc.
  * Copyright (C) 2001 Jonathan Blandford
@@ -32,8 +30,8 @@
 #include <gio/gio.h>
 #include <gconf/gconf-client.h>
 
-#include "gnome-keyboard-properties.h"
-#include "gnome-keyboard-properties-xkb.h"
+#include "gnome-region-panel.h"
+#include "gnome-region-panel-xkb.h"
 
 enum {
 	RESPONSE_APPLY = 1,
@@ -111,14 +109,14 @@ setup_dialog (GtkBuilder * dialog)
 			 gtk_range_get_adjustment (GTK_RANGE (WID ("cursor_blink_time_scale"))), "value",
 			 G_SETTINGS_BIND_DEFAULT);
 
-	g_signal_connect (WID ("keyboard_dialog"), "response",
+	g_signal_connect (WID ("region_dialog"), "response",
 			  (GCallback) dialog_response, NULL);
 
 	setup_xkb_tabs (dialog);
 }
 
 GtkWidget *
-gnome_keyboard_properties_init (GtkBuilder * dialog)
+gnome_region_properties_init (GtkBuilder * dialog)
 {
 	GtkWidget *dialog_win = NULL;
 
diff --git a/panels/region/gnome-region-panel.desktop.in.in b/panels/region/gnome-region-panel.desktop.in.in
new file mode 100644
index 000000000..09aa84cba
--- /dev/null
+++ b/panels/region/gnome-region-panel.desktop.in.in
@@ -0,0 +1,15 @@
+[Desktop Entry]
+_Name=Region and Language
+_Comment=Change your region and language settings
+Exec=gnome-control-center region
+Icon=preferences-desktop-locale
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;
+OnlyShowIn=GNOME;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-control-center
+X-GNOME-Bugzilla-Component=region
+X-GNOME-Bugzilla-Version=@VERSION@
+X-GNOME-Settings-Panel=region
diff --git a/panels/keyboard/gnome-keyboard-properties.h b/panels/region/gnome-region-panel.h
index 7b7b0acd8..4382461a7 100644
--- a/panels/keyboard/gnome-keyboard-properties.h
+++ b/panels/region/gnome-region-panel.h
@@ -1,5 +1,3 @@
-/* -*- mode: c; style: linux -*- */
-
 /* keyboard-properties.c
  * Copyright (C) 2000-2001 Ximian, Inc.
  * Copyright (C) 2001 Jonathan Blandford
@@ -26,5 +24,5 @@
 
 #include <gtk/gtk.h>
 
-GtkWidget *gnome_keyboard_properties_init (GtkBuilder * dialog);
+GtkWidget *gnome_region_properties_init (GtkBuilder * dialog);
 
diff --git a/panels/keyboard/gnome-keyboard-properties-dialog.ui b/panels/region/gnome-region-panel.ui
index 8c5c5bdad..458aaf397 100644
--- a/panels/keyboard/gnome-keyboard-properties-dialog.ui
+++ b/panels/region/gnome-region-panel.ui
@@ -69,9 +69,9 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkDialog" id="keyboard_dialog">
+  <object class="GtkDialog" id="region_dialog">
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Keyboard Preferences</property>
+    <property name="title" translatable="yes">Region and Language</property>
     <property name="default_width">450</property>
     <property name="default_height">430</property>
     <property name="type_hint">dialog</property>
@@ -88,7 +88,7 @@
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
-              <object class="GtkNotebook" id="keyboard_notebook">
+              <object class="GtkNotebook" id="region_notebook">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <child>
diff --git a/panels/keyboard/keyboard-module.c b/panels/region/region-module.c
index 84d1d0987..da1bad201 100644
--- a/panels/keyboard/keyboard-module.c
+++ b/panels/region/region-module.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include "cc-keyboard-panel.h"
+#include "cc-region-panel.h"
 
 #include <glib/gi18n-lib.h>
 
@@ -32,7 +32,7 @@ g_io_module_load (GIOModule * module)
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
 	/* register the panel */
-	cc_keyboard_panel_register (module);
+	cc_region_panel_register (module);
 }
 
 void
diff --git a/panels/keyboard/use_cases.txt b/panels/region/use_cases.txt
index 33637eb35..33637eb35 100644
--- a/panels/keyboard/use_cases.txt
+++ b/panels/region/use_cases.txt