Throw xfce_textdomain() in lots of places to fix translations. Hopefully.

(Old svn revision: 4139)

37 files changed, 101 insertions, 619 deletions

diff --git a/Makefile.in b/Makefile.in
index 41a0e724..f5b1f125 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -226,6 +226,7 @@ conf_DATA = \
 	contents.xml.ar							\
 	contents.xml.az							\
 	contents.xml.ca							\
+	contents.xml.eu							\
 	contents.xml.he							\
 	contents.xml.hu							\
 	contents.xml.it							\
diff --git a/configure b/configure
index 3df0631b..467073d4 100755
--- a/configure
+++ b/configure
@@ -24543,7 +24543,7 @@ echo "${ECHO_T}yes" >&6
   fi
 
 
-                                                                                                                                                                                                                                      ac_config_files="$ac_config_files xfce4.spec Makefile doc/Makefile doc/C/Makefile doc/C/images/Makefile doc/fr/Makefile doc/fr/images/Makefile doc/it/Makefile doc/it/images/Makefile po/Makefile.in icons/Makefile panel/Makefile panel/xfce4-panel-1.0.pc plugins/Makefile plugins/mailcheck/Makefile plugins/clock/Makefile plugins/switcher/Makefile plugins/systembuttons/Makefile plugins/pager/Makefile plugins/sample-plugin/Makefile plugins/separator/Makefile settings/Makefile themes/Makefile"
+                                                                                                                                                                                                                            ac_config_files="$ac_config_files xfce4.spec Makefile doc/Makefile doc/C/Makefile doc/C/images/Makefile doc/fr/Makefile doc/fr/images/Makefile doc/it/Makefile doc/it/images/Makefile po/Makefile.in icons/Makefile panel/Makefile panel/xfce4-panel-1.0.pc plugins/Makefile plugins/mailcheck/Makefile plugins/clock/Makefile plugins/switcher/Makefile plugins/systembuttons/Makefile plugins/pager/Makefile plugins/sample-plugin/Makefile plugins/separator/Makefile settings/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -25144,7 +25144,6 @@ do
   "plugins/sample-plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/sample-plugin/Makefile" ;;
   "plugins/separator/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/separator/Makefile" ;;
   "settings/Makefile" ) CONFIG_FILES="$CONFIG_FILES settings/Makefile" ;;
-  "themes/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
diff --git a/configure.ac b/configure.ac
index 4b274502..f3593d5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,5 @@ plugins/pager/Makefile
 plugins/sample-plugin/Makefile
 plugins/separator/Makefile
 settings/Makefile
-themes/Makefile
 ])
 
diff --git a/panel/Makefile.am b/panel/Makefile.am
index decb792b..6df860b2 100644
--- a/panel/Makefile.am
+++ b/panel/Makefile.am
@@ -84,5 +84,5 @@ if HAVE_CYGWIN
 panel.def: $(xfce4_panel_SOURCES) create-def-file.sh
 	sh create-def-file.sh $(xfce4_panel_SOURCES)
 
-EXTRA_DIST += $(devel_DATA) create-def-file.sh
+EXTRA_DIST = $(devel_DATA) create-def-file.sh
 endif
diff --git a/panel/add-control-dialog.c b/panel/add-control-dialog.c
index b4c29995..944a4cfa 100644
--- a/panel/add-control-dialog.c
+++ b/panel/add-control-dialog.c
@@ -30,12 +30,6 @@
 
 #include "add-control-dialog.h"
 
-/* Make sure translations are taken from the panel and not from some plugin */
-#ifdef ENABLE_NLS
-#undef _
-#define _(s) dgettext (PACKAGE, s)
-#endif
-
 typedef struct
 {
     Panel *panel;
@@ -85,6 +79,8 @@ add_control_dialog (Panel * panel, int position)
 	return;
     }
 
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     panel_block_autohide (panel);
 
     dlg = gtk_dialog_new_with_buttons (_("Add new item"),
diff --git a/panel/controls.c b/panel/controls.c
index 81dac1b2..d71f1908 100644
--- a/panel/controls.c
+++ b/panel/controls.c
@@ -62,12 +62,6 @@
 
 #define UNLOAD_TIMEOUT  30000	/* 30 secs */
 
-/* Make sure translations are taken from the panel and not from some plugin */
-#ifdef ENABLE_NLS
-#undef _
-#define _(s) dgettext (PACKAGE, s)
-#endif
-
 typedef struct _ControlClassInfo ControlClassInfo;
 
 struct _ControlClassInfo
@@ -755,38 +749,6 @@ add_control (GtkWidget * w, ControlClassInfo * info)
 	panel_set_autohide (TRUE);
 }
 
-G_MODULE_EXPORT /* EXPORT:get_controls_submenu */
-GtkWidget *
-get_controls_submenu (void)
-{
-    static GtkWidget *menu = NULL;
-    GSList *li;
-
-    if (menu)
-	gtk_widget_destroy (menu);
-
-    menu = gtk_menu_new ();
-
-    for (li = control_class_info_list; li != NULL; li = li->next)
-    {
-	ControlClassInfo *info = li->data;
-	GtkWidget *item;
-
-	DBG ("info: %s (%s)", info->caption, info->name);
-
-	item = gtk_menu_item_new_with_label (info->caption);
-	gtk_widget_show (item);
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-	g_signal_connect (item, "activate", G_CALLBACK (add_control), info);
-
-	if (info->unique && info->refcount > 0)
-	    gtk_widget_set_sensitive (item, FALSE);
-    }
-
-    return menu;
-}
-
 static GtkWidget *
 get_control_menu (void)
 {
@@ -795,6 +757,8 @@ get_control_menu (void)
 
     if (!menu)
     {
+        xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
 	menu = gtk_menu_new ();
 
 	/* replaced with actual name */
diff --git a/panel/controls.h b/panel/controls.h
index 59279c0b..55791b01 100644
--- a/panel/controls.h
+++ b/panel/controls.h
@@ -101,9 +101,6 @@ G_MODULE_IMPORT void control_class_set_unique (ControlClass * cclass, gboolean u
 G_MODULE_IMPORT void control_class_set_unloadable (ControlClass * cclass,
 				   gboolean unloadable);
 
-/* add controls menu */
-G_MODULE_IMPORT GtkWidget *get_controls_submenu (void);
-
 /* controls */
 G_MODULE_IMPORT Control *control_new (int index);
 
diff --git a/panel/controls_dialog.c b/panel/controls_dialog.c
index 2a36a844..f30b6e34 100644
--- a/panel/controls_dialog.c
+++ b/panel/controls_dialog.c
@@ -42,12 +42,6 @@
 
 #define BORDER 6
 
-/* Make sure translations are taken from the panel and not from some plugin */
-#ifdef ENABLE_NLS
-#undef _
-#define _(s) dgettext (PACKAGE, s)
-#endif
-
 static GtkWidget *cdialog = NULL;
 
 /* container for control options */
@@ -145,6 +139,8 @@ controls_dialog (Control * control)
 	return;
     }
 
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     cdialog = gtk_dialog_new ();
     dlg = GTK_DIALOG (cdialog);
 
@@ -187,34 +183,38 @@ controls_dialog (Control * control)
 
     add_spacer (GTK_BOX (dlg->vbox), BORDER);
 
+    gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
+    
     /* run dialog until 'Close' or 'Remove' */
-retry:
-    response = GTK_RESPONSE_NONE;
+    while (1)
+    {
+        response = GTK_RESPONSE_NONE;
 
-    gtk_widget_grab_default (close);
-    gtk_widget_grab_focus (close);
+        gtk_widget_grab_default (close);
+        gtk_widget_grab_focus (close);
 
-    gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
-    response = gtk_dialog_run (dlg);
+        response = gtk_dialog_run (dlg);
 
-    if (response == GTK_RESPONSE_CANCEL)
-    {
-	PanelPopup *pp;
-
-	gtk_widget_hide (cdialog);
-
-	pp = groups_get_popup (control->index);
-
-	if (!(control->with_popup) || !pp || pp->items == NULL ||
-	    xfce_confirm (_("Removing the item will also remove "
-			    "its popup menu."), GTK_STOCK_REMOVE, NULL))
-	{
-	    groups_remove (control->index);
-	}
-	else
-	{
-	    goto retry;
-	}
+        gtk_widget_hide (cdialog);
+
+        if (response == GTK_RESPONSE_CANCEL)
+        {
+            PanelPopup *pp;
+
+            pp = groups_get_popup (control->index);
+
+            if (!(control->with_popup) || !pp || pp->items == NULL ||
+                xfce_confirm (_("Removing the item will also remove "
+                                "its popup menu."), GTK_STOCK_REMOVE, NULL))
+            {
+                groups_remove (control->index);
+                break;
+            }
+        }
+        else
+        {
+            break;
+        }
     }
 
     gtk_widget_destroy (cdialog);
diff --git a/panel/item.c b/panel/item.c
index a40caf6d..75c5c690 100644
--- a/panel/item.c
+++ b/panel/item.c
@@ -44,12 +44,6 @@
 #include "item_dialog.h"
 #include "settings.h"
 
-/* Make sure translations are taken from the panel and not from some plugin */
-#ifdef ENABLE_NLS
-#undef _
-#define _(s) dgettext (PACKAGE, s)
-#endif
-
 static gboolean popup_from_timeout = FALSE;
 static int popup_timeout_id = 0;
 
diff --git a/panel/item_dialog.c b/panel/item_dialog.c
index 3e2ea9ff..06612c4c 100644
--- a/panel/item_dialog.c
+++ b/panel/item_dialog.c
@@ -50,12 +50,6 @@
 #define BORDER          6
 #define PREVIEW_SIZE    48
 
-/* Make sure translations are taken from the panel and not from some plugin */
-#ifdef ENABLE_NLS
-#undef _
-#define _(s) dgettext (PACKAGE, s)
-#endif
-
 typedef struct _ItemDialog ItemDialog;
 
 struct _ItemDialog
@@ -1051,6 +1045,8 @@ create_item_dialog (Control * control, Item * item,
     GtkWidget *vbox;
     GtkSizeGroup *sg;
 
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     idlg = g_new0 (ItemDialog, 1);
 
     if (control)
@@ -1190,6 +1186,8 @@ edit_menu_item_dialog (Item * mi)
     GtkDialog *dlg;
     int response, num_items;
 
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     menudialog = gtk_dialog_new ();
     dlg = GTK_DIALOG (menudialog);
 
diff --git a/panel/main.c b/panel/main.c
index ce92f73c..ad0c2ef3 100644
--- a/panel/main.c
+++ b/panel/main.c
@@ -63,12 +63,6 @@
     "style \"popupbutton\" { GtkWidget::focus-padding = 0 }\n" \
     "class \"XfceTogglebutton\" style \"popupbutton\"\n"
 
-/* Make sure translations are taken from the panel and not from some plugin */
-#ifdef ENABLE_NLS
-#undef _
-#define _(s) dgettext (PACKAGE, s)
-#endif
-
 /* signal handling */
 typedef enum
 {
diff --git a/panel/panel.c b/panel/panel.c
index 44d4a66c..bf14260f 100644
--- a/panel/panel.c
+++ b/panel/panel.c
@@ -46,12 +46,6 @@
 #define SNAP_WIDTH	25
 
 
-/* Make sure translations are taken from the panel and not from some plugin */
-#ifdef ENABLE_NLS
-#undef _
-#define _(s) dgettext (PACKAGE, s)
-#endif
-
 /* typedefs *
  * -------- */
 
@@ -542,6 +536,8 @@ get_handle_menu (void)
     {
 	GtkWidget *mi;
 
+        xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
 	menu = gtk_menu_new ();
 
 	mi = gtk_menu_item_new_with_label (_("Xfce Panel"));
diff --git a/panel/popup.c b/panel/popup.c
index 634d884b..c42c75d3 100644
--- a/panel/popup.c
+++ b/panel/popup.c
@@ -307,6 +307,8 @@ create_panel_popup (void)
     GtkArrowType at;
     gboolean vertical = settings.orientation == VERTICAL;
 
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     /* the button */
     if (vertical)
     {
diff --git a/panel/xfce_support.c b/panel/xfce_support.c
index 582c60a3..f1a0255c 100644
--- a/panel/xfce_support.c
+++ b/panel/xfce_support.c
@@ -555,6 +555,8 @@ G_MODULE_EXPORT /* EXPORT:select_file_name */
 char *
 select_file_name (const char *title, const char *path, GtkWidget * parent)
 {
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     return real_select_file (title, path, parent, FALSE);
 }
 
@@ -563,6 +565,8 @@ char *
 select_file_with_preview (const char *title, const char *path,
 			  GtkWidget * parent)
 {
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     return real_select_file (title, path, parent, TRUE);
 }
 
diff --git a/plugins/clock/Makefile.am b/plugins/clock/Makefile.am
index bb7d790f..a00cc768 100644
--- a/plugins/clock/Makefile.am
+++ b/plugins/clock/Makefile.am
@@ -12,7 +12,8 @@ libclock_la_SOURCES =							\
 libclock_la_CFLAGS =							\
 	-I$(top_srcdir)							\
 	@LIBXFCEGUI4_CFLAGS@						\
-	@LIBXML_CFLAGS@
+	@LIBXML_CFLAGS@							\
+	-DLOCALEDIR=\"$(localedir)\"
 
 libclock_la_LIBADD = 							\
 	@LIBS@
diff --git a/plugins/clock/Makefile.in b/plugins/clock/Makefile.in
index 56e62f29..22c0e491 100644
--- a/plugins/clock/Makefile.in
+++ b/plugins/clock/Makefile.in
@@ -238,7 +238,8 @@ libclock_la_SOURCES = \
 libclock_la_CFLAGS = \
 	-I$(top_srcdir)							\
 	@LIBXFCEGUI4_CFLAGS@						\
-	@LIBXML_CFLAGS@
+	@LIBXML_CFLAGS@							\
+	-DLOCALEDIR=\"$(localedir)\"
 
 libclock_la_LIBADD = \
 	@LIBS@\
diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index e2fb10ff..68fe44cc 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -623,13 +623,13 @@ clock_create_options (Control * control, GtkContainer * container,
     GtkSizeGroup *sg = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
     ClockDialog *cd;
 
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     cd = g_new0 (ClockDialog, 1);
 
     cd->clock = control->data;
     cd->dialog = gtk_widget_get_toplevel (done);
 
-/*    clock_create_backup (cd);*/
-
     g_signal_connect_swapped (cd->dialog, "destroy-event",
 			      G_CALLBACK (g_free), cd);
 
@@ -670,6 +670,8 @@ create_clock_control (Control * control)
 G_MODULE_EXPORT void
 xfce_control_class_init (ControlClass * cc)
 {
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     cc->name = "clock";
     cc->caption = _("Xfce Clock");
 
diff --git a/plugins/mailcheck/Makefile.am b/plugins/mailcheck/Makefile.am
index f996071b..d042bae1 100644
--- a/plugins/mailcheck/Makefile.am
+++ b/plugins/mailcheck/Makefile.am
@@ -13,7 +13,8 @@ libmailcheck_la_CFLAGS =						\
 	-I$(top_srcdir)							\
 	@LIBSTARTUP_NOTIFICATION_CFLAGS@				\
 	@LIBXFCEGUI4_CFLAGS@						\
-	@LIBXML_CFLAGS@
+	@LIBXML_CFLAGS@							\
+	-DLOCALEDIR=\"$(localedir)\"
 
 libmailcheck_la_LIBADD =						\
 	@LIBS@
diff --git a/plugins/mailcheck/Makefile.in b/plugins/mailcheck/Makefile.in
index e7526395..937fac97 100644
--- a/plugins/mailcheck/Makefile.in
+++ b/plugins/mailcheck/Makefile.in
@@ -239,7 +239,8 @@ libmailcheck_la_CFLAGS = \
 	-I$(top_srcdir)							\
 	@LIBSTARTUP_NOTIFICATION_CFLAGS@				\
 	@LIBXFCEGUI4_CFLAGS@						\
-	@LIBXML_CFLAGS@
+	@LIBXML_CFLAGS@							\
+	-DLOCALEDIR=\"$(localedir)\"
 
 libmailcheck_la_LIBADD = \
 	@LIBS@\
diff --git a/plugins/mailcheck/mailcheck.c b/plugins/mailcheck/mailcheck.c
index 6fd2ef5a..25ac80c2 100644
--- a/plugins/mailcheck/mailcheck.c
+++ b/plugins/mailcheck/mailcheck.c
@@ -911,6 +911,8 @@ mailcheck_create_options (Control * control, GtkContainer * container,
     GtkSizeGroup *sg = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
     MailDialog *md;
 
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     md = g_new0 (MailDialog, 1);
 
     md->mc = (t_mailcheck *) control->data;
@@ -957,6 +959,8 @@ create_mailcheck_control (Control * control)
 G_MODULE_EXPORT void
 xfce_control_class_init (ControlClass * cc)
 {
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     cc->name = "mailcheck";
     cc->caption = _("Mail checker");
 
diff --git a/plugins/pager/Makefile.am b/plugins/pager/Makefile.am
index 84e79d7d..763a789f 100644
--- a/plugins/pager/Makefile.am
+++ b/plugins/pager/Makefile.am
@@ -12,7 +12,8 @@ libpager_la_SOURCES = 							\
 libpager_la_CFLAGS =							\
 	-I$(top_srcdir)							\
 	@LIBXFCEGUI4_CFLAGS@						\
-	@LIBXML_CFLAGS@
+	@LIBXML_CFLAGS@							\
+	-DLOCALEDIR=\"$(localedir)\"
 
 libpager_la_LIBADD =							\
 	@LIBS@
diff --git a/plugins/pager/Makefile.in b/plugins/pager/Makefile.in
index d533704e..8e53c7b9 100644
--- a/plugins/pager/Makefile.in
+++ b/plugins/pager/Makefile.in
@@ -238,7 +238,8 @@ libpager_la_SOURCES = \
 libpager_la_CFLAGS = \
 	-I$(top_srcdir)							\
 	@LIBXFCEGUI4_CFLAGS@						\
-	@LIBXML_CFLAGS@
+	@LIBXML_CFLAGS@							\
+	-DLOCALEDIR=\"$(localedir)\"
 
 libpager_la_LIBADD = \
 	@LIBS@\
diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c
index f6dc23f5..029b8ddd 100644
--- a/plugins/pager/pager.c
+++ b/plugins/pager/pager.c
@@ -301,6 +301,8 @@ pager_create_options (Control * control, GtkContainer * container,
     int max;
     t_pager *pager = control->data;
 
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     hbox = gtk_hbox_new (FALSE, 6);
     gtk_widget_show (hbox);
     gtk_container_add (container, hbox);
@@ -352,6 +354,8 @@ create_pager_control (Control * control)
 G_MODULE_EXPORT void
 xfce_control_class_init (ControlClass * cc)
 {
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     cc->name = "pager";
     cc->caption = _("Graphical pager");
 
diff --git a/plugins/sample-plugin/Makefile.am b/plugins/sample-plugin/Makefile.am
index bfd4e9ea..daa00968 100644
--- a/plugins/sample-plugin/Makefile.am
+++ b/plugins/sample-plugin/Makefile.am
@@ -10,7 +10,8 @@ libsample_la_SOURCES = 						\
 libsample_la_CFLAGS =						\
 	-I$(top_srcdir)						\
 	@LIBXFCEGUI4_CFLAGS@					\
-	@LIBXML_CFLAGS@
+	@LIBXML_CFLAGS@						\
+	-DLOCALEDIR=\"$(localedir)\"
 
 libsample_la_LIBADD =						\
 	@LIBS@
diff --git a/plugins/sample-plugin/Makefile.in b/plugins/sample-plugin/Makefile.in
index 8a78286f..e992f67d 100644
--- a/plugins/sample-plugin/Makefile.in
+++ b/plugins/sample-plugin/Makefile.in
@@ -235,7 +235,8 @@ libsample_la_SOURCES = \
 libsample_la_CFLAGS = \
 	-I$(top_srcdir)						\
 	@LIBXFCEGUI4_CFLAGS@					\
-	@LIBXML_CFLAGS@
+	@LIBXML_CFLAGS@						\
+	-DLOCALEDIR=\"$(localedir)\"
 
 libsample_la_LIBADD = \
 	@LIBS@\
diff --git a/plugins/sample-plugin/sample.c b/plugins/sample-plugin/sample.c
index f0d67bd0..65d6238e 100644
--- a/plugins/sample-plugin/sample.c
+++ b/plugins/sample-plugin/sample.c
@@ -386,6 +386,8 @@ sample_create_options (Control * control, GtkContainer * container,
     SampleDialog *sd;
     t_sample *sample;
 
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     sd = g_new0 (SampleDialog, 1);
 
     sd->sample = sample = (t_sample *) control->data;
@@ -525,6 +527,8 @@ create_sample_control (Control * control)
 G_MODULE_EXPORT void
 xfce_control_class_init (ControlClass * cc)
 {
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     /* Must be present: 
        - name            : unique id 
        - caption         : display name 
diff --git a/plugins/separator/Makefile.am b/plugins/separator/Makefile.am
index d5a11cd9..051e4838 100644
--- a/plugins/separator/Makefile.am
+++ b/plugins/separator/Makefile.am
@@ -12,7 +12,8 @@ libseparator_la_SOURCES = 						\
 libseparator_la_CFLAGS =						\
 	-I$(top_srcdir)							\
 	@LIBXFCEGUI4_CFLAGS@						\
-	@LIBXML_CFLAGS@
+	@LIBXML_CFLAGS@							\
+	-DLOCALEDIR=\"$(localedir)\"
 
 libseparator_la_LIBADD =						\
 	@LIBS@
diff --git a/plugins/separator/Makefile.in b/plugins/separator/Makefile.in
index 7332f952..dbbd2c48 100644
--- a/plugins/separator/Makefile.in
+++ b/plugins/separator/Makefile.in
@@ -238,7 +238,8 @@ libseparator_la_SOURCES = \
 libseparator_la_CFLAGS = \
 	-I$(top_srcdir)							\
 	@LIBXFCEGUI4_CFLAGS@						\
-	@LIBXML_CFLAGS@
+	@LIBXML_CFLAGS@							\
+	-DLOCALEDIR=\"$(localedir)\"
 
 libseparator_la_LIBADD = \
 	@LIBS@\
diff --git a/plugins/separator/separator.c b/plugins/separator/separator.c
index 6205a3a3..a13c93fb 100644
--- a/plugins/separator/separator.c
+++ b/plugins/separator/separator.c
@@ -149,6 +149,8 @@ create_separator_control (Control * control)
 G_MODULE_EXPORT void
 xfce_control_class_init (ControlClass * cc)
 {
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     cc->name = "separator";
     cc->caption = _("Separator");
 
diff --git a/plugins/switcher/Makefile.am b/plugins/switcher/Makefile.am
index e2e992c1..72174fb2 100644
--- a/plugins/switcher/Makefile.am
+++ b/plugins/switcher/Makefile.am
@@ -13,7 +13,8 @@ libswitcher_la_CFLAGS =							\
 	-I$(top_srcdir)							\
 	@LIBX11_CFLAGS@							\
 	@LIBXFCEGUI4_CFLAGS@						\
-	@LIBXML_CFLAGS@
+	@LIBXML_CFLAGS@							\
+	-DLOCALEDIR=\"$(localedir)\"
 
 libswitcher_la_LIBADD =							\
 	@LIBS@
diff --git a/plugins/switcher/Makefile.in b/plugins/switcher/Makefile.in
index 10116cc2..44a8ba23 100644
--- a/plugins/switcher/Makefile.in
+++ b/plugins/switcher/Makefile.in
@@ -239,7 +239,8 @@ libswitcher_la_CFLAGS = \
 	-I$(top_srcdir)							\
 	@LIBX11_CFLAGS@							\
 	@LIBXFCEGUI4_CFLAGS@						\
-	@LIBXML_CFLAGS@
+	@LIBXML_CFLAGS@							\
+	-DLOCALEDIR=\"$(localedir)\"
 
 libswitcher_la_LIBADD = \
 	@LIBS@\
diff --git a/plugins/switcher/switcher.c b/plugins/switcher/switcher.c
index ba0f3a15..3c8eadcc 100644
--- a/plugins/switcher/switcher.c
+++ b/plugins/switcher/switcher.c
@@ -692,6 +692,8 @@ create_switcher_control (Control * control)
 G_MODULE_EXPORT void
 xfce_control_class_init (ControlClass * cc)
 {
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     cc->name = "switcher";
     cc->caption = _("Desktop switcher");
 
diff --git a/plugins/systembuttons/Makefile.am b/plugins/systembuttons/Makefile.am
index 72245e73..58bf3f6b 100644
--- a/plugins/systembuttons/Makefile.am
+++ b/plugins/systembuttons/Makefile.am
@@ -12,7 +12,8 @@ libsystembuttons_la_SOURCES = 						\
 libsystembuttons_la_CFLAGS =						\
 	-I$(top_srcdir)							\
 	@LIBXFCEGUI4_CFLAGS@						\
-	@LIBXML_CFLAGS@
+	@LIBXML_CFLAGS@							\
+	-DLOCALEDIR=\"$(localedir)\"
 
 libsystembuttons_la_LIBADD =						\
 	@LIBS@
diff --git a/plugins/systembuttons/Makefile.in b/plugins/systembuttons/Makefile.in
index fe36a55c..4d4573ff 100644
--- a/plugins/systembuttons/Makefile.in
+++ b/plugins/systembuttons/Makefile.in
@@ -239,7 +239,8 @@ libsystembuttons_la_SOURCES = \
 libsystembuttons_la_CFLAGS = \
 	-I$(top_srcdir)							\
 	@LIBXFCEGUI4_CFLAGS@						\
-	@LIBXML_CFLAGS@
+	@LIBXML_CFLAGS@							\
+	-DLOCALEDIR=\"$(localedir)\"
 
 libsystembuttons_la_LIBADD = \
 	@LIBS@\
diff --git a/plugins/systembuttons/systembuttons.c b/plugins/systembuttons/systembuttons.c
index 52059a91..af779a41 100644
--- a/plugins/systembuttons/systembuttons.c
+++ b/plugins/systembuttons/systembuttons.c
@@ -497,6 +497,8 @@ systembuttons_create_options (Control * control, GtkContainer * container,
     t_systembuttons_dialog *sbd;
     GtkSizeGroup *sg1, *sg2;
 
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     sg1 = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
     sg2 = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
@@ -608,6 +610,8 @@ create_systembuttons_control (Control * control)
 G_MODULE_EXPORT void
 xfce_control_class_init (ControlClass * cc)
 {
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
     cc->name = "systembuttons";
     cc->caption = _("System buttons");
 
diff --git a/themes/Makefile.am b/themes/Makefile.am
deleted file mode 100644
index 0fdd130c..00000000
--- a/themes/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = 
-
diff --git a/themes/Makefile.in b/themes/Makefile.in
deleted file mode 100644
index 56ba7327..00000000
--- a/themes/Makefile.in
+++ /dev/null
@@ -1,496 +0,0 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = @host@
-subdir = themes
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \
-	$(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \
-	$(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-HAVE_CYGWIN_FALSE = @HAVE_CYGWIN_FALSE@
-HAVE_CYGWIN_TRUE = @HAVE_CYGWIN_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
-LIBSTARTUP_NOTIFICATION_LIBS = @LIBSTARTUP_NOTIFICATION_LIBS@
-LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@
-LIBTOOL = @LIBTOOL@
-LIBX11_CFLAGS = @LIBX11_CFLAGS@
-LIBX11_LDFLAGS = @LIBX11_LDFLAGS@
-LIBX11_LIBS = @LIBX11_LIBS@
-LIBXFCE4MCS_CLIENT_CFLAGS = @LIBXFCE4MCS_CLIENT_CFLAGS@
-LIBXFCE4MCS_CLIENT_LIBS = @LIBXFCE4MCS_CLIENT_LIBS@
-LIBXFCE4MCS_CLIENT_REQUIRED_VERSION = @LIBXFCE4MCS_CLIENT_REQUIRED_VERSION@
-LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@
-LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@
-LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@
-LIBXFCEGUI4_CFLAGS = @LIBXFCEGUI4_CFLAGS@
-LIBXFCEGUI4_LIBS = @LIBXFCEGUI4_LIBS@
-LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@
-LIBXML_CFLAGS = @LIBXML_CFLAGS@
-LIBXML_LIBS = @LIBXML_LIBS@
-LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XFCE_MCS_MANAGER_CFLAGS = @XFCE_MCS_MANAGER_CFLAGS@
-XFCE_MCS_MANAGER_LIBS = @XFCE_MCS_MANAGER_LIBS@
-XFCE_MCS_MANAGER_PLUGINSDIR = @XFCE_MCS_MANAGER_PLUGINSDIR@
-XFCE_MCS_MANAGER_REQUIRED_VERSION = @XFCE_MCS_MANAGER_REQUIRED_VERSION@
-XGETTEXT = @XGETTEXT@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-SUBDIRS = 
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  themes/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  themes/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	else \
-	  include_option=--include; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || mkdir "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="../$(top_distdir)" \
-	        distdir="../$(distdir)/$$subdir" \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT: