Packman Build Service PMBS

Changes of Revision 2

gentoo.changes Changed

gentoo.spec Changed

@@ -17,16 +17,17 @@
 
 Summary:	A light-weight, two-window file manager based on GTK+
 Name:		gentoo	
-Version:	0.15.6
+Version:	0.19.9
 Release:	1
 License:	GPL v2
 Group:		Productivity/File utilities
 URL:		http://www.obsession.se/gentoo
-Source:		ftp://ftp.obsession.se/gentoo/%{name}-%{version}.tar.bz2
+#		ftp://ftp.obsession.se/gentoo/
+Source:		%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source100:	%{name}.changes
-Patch0:		%{name}-0.15.6-fix_deprecated_GTK_macros.patch
+#Patch0:		%{name}-0.15.6-fix_deprecated_GTK_macros.patch
 BuildRequires:	gtk2-devel pango-devel atk-devel cairo-devel glib2-devel freetype2-devel libpng-devel fdupes
 BuildRoot:	%{_tmppath}/%{name}-%{version}
 Autoreqprov:	on
@@ -62,9 +63,9 @@
 %prep
 %setup -q
 
-%if 0%{?suse_version} >= 1130
-%patch0 -p0
-%endif
+#%if 0%{?suse_version} >= 1130
+#%patch0 -p0
+#%endif
 
 %build
 autoreconf -fiv
@@ -95,20 +96,20 @@
 %{_bindir}/%{name}
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/icons
-%dir %{_datadir}/locale/ja_JP.UTF-8
-%dir %{_datadir}/locale/ja_JP.UTF-8/LC_MESSAGES
-%dir %{_datadir}/locale/ru_RU.CP1251
-%dir %{_datadir}/locale/ru_RU.CP1251/LC_MESSAGES
-%dir %{_datadir}/locale/ru_RU.KOI8-R
-%dir %{_datadir}/locale/ru_RU.KOI8-R/LC_MESSAGES
-%dir %{_datadir}/locale/ru_RU.UTF-8
-%dir %{_datadir}/locale/ru_RU.UTF-8/LC_MESSAGES
-%dir %{_datadir}/locale/ru_RU.cp1251
-%dir %{_datadir}/locale/ru_RU.cp1251/LC_MESSAGES
-%dir %{_datadir}/locale/ru_RU.koi8r
-%dir %{_datadir}/locale/ru_RU.koi8r/LC_MESSAGES
-%dir %{_datadir}/locale/ru_RU.utf8
-%dir %{_datadir}/locale/ru_RU.utf8/LC_MESSAGES
+#%dir %{_datadir}/locale/ja_JP.UTF-8
+#%dir %{_datadir}/locale/ja_JP.UTF-8/LC_MESSAGES
+#%dir %{_datadir}/locale/ru_RU.CP1251
+#%dir %{_datadir}/locale/ru_RU.CP1251/LC_MESSAGES
+#%dir %{_datadir}/locale/ru_RU.KOI8-R
+#%dir %{_datadir}/locale/ru_RU.KOI8-R/LC_MESSAGES
+#%dir %{_datadir}/locale/ru_RU.UTF-8
+#%dir %{_datadir}/locale/ru_RU.UTF-8/LC_MESSAGES
+#%dir %{_datadir}/locale/ru_RU.cp1251
+#%dir %{_datadir}/locale/ru_RU.cp1251/LC_MESSAGES
+#%dir %{_datadir}/locale/ru_RU.koi8r
+#%dir %{_datadir}/locale/ru_RU.koi8r/LC_MESSAGES
+#%dir %{_datadir}/locale/ru_RU.utf8
+#%dir %{_datadir}/locale/ru_RU.utf8/LC_MESSAGES
 %{_datadir}/%{name}/icons/*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png

gentoo-0.15.6-fix_deprecated_GTK_macros.patch Deleted

@@ -1,63 +0,0 @@
---- src/odmultibutton.c.orig	2009-06-23 22:57:22.000000000 +0200
-+++ src/odmultibutton.c	2010-07-21 20:21:44.000000000 +0200
-@@ -73,8 +73,8 @@
- 		}
- 		if(p != NULL)
- 		{
--			if(GTK_WIDGET_STATE(widget) != GTK_WIDGET_STATE(p))
--				gtk_widget_set_state(p, GTK_WIDGET_STATE(widget));
-+			if(gtk_widget_get_state(widget) != gtk_widget_get_state(p))
-+				gtk_widget_set_state(p, gtk_widget_get_state(widget));
- 			gtk_widget_show(p);
- 			if(gtk_widget_get_parent(p) != NULL)
- 				gtk_widget_reparent(p, widget);
-@@ -86,7 +86,7 @@
- 		}
- 		mb->last_index = index;
- 	}
--	if(GTK_WIDGET_DRAWABLE(widget))
-+	if(gtk_widget_is_drawable(widget))
- 		gtk_widget_queue_draw(widget);
- }
- 
-@@ -144,9 +144,9 @@
- {
- 	GtkStateType	state;
- 
--	state = GTK_WIDGET_STATE(widget);
-+	state = gtk_widget_get_state(widget);
- 
--	if(GTK_WIDGET_DRAWABLE(widget) && state != GTK_STATE_ACTIVE)
-+	if(gtk_widget_is_drawable(widget) && state != GTK_STATE_ACTIVE)
- 	{
- 		GtkStyle	*style = gtk_widget_get_style(widget);
- 		const guint	EARSIZE = 5;
-@@ -209,7 +209,7 @@
- 	g_return_if_fail(area != NULL);
- 	g_return_if_fail(OD_IS_MULTIBUTTON(widget));
- 
--	if(GTK_WIDGET_DRAWABLE(widget))
-+	if(gtk_widget_is_drawable(widget))
- 	{
- 		ODMultiButton	*mb = OD_MULTIBUTTON(widget);
- 
-@@ -449,7 +449,7 @@
- 			od_multibutton_reset_label(mb, index, GTK_LABEL(w), text, bg, fg);
- 			if(GTK_WIDGET(mb)->parent)
- 				gtk_widget_queue_resize(GTK_WIDGET(mb));
--			if(GTK_WIDGET_DRAWABLE(mb))
-+			if(gtk_widget_is_drawable(mb))
- 				gtk_widget_queue_draw(GTK_WIDGET(mb));
- 		}
- 	}
---- src/mntent_wrap.c.orig	2009-06-24 22:30:38.000000000 +0200
-+++ src/mntent_wrap.c	2010-07-21 20:21:44.000000000 +0200
-@@ -24,7 +24,7 @@
- 
- /* ----------------------------------------------------------------------------------------- */
- 
--#if defined __CYGWIN__ || defined __linux__ || defined __sgi	/* Linux and IRIX implementation. */
-+#if defined __CYGWIN__ || defined __linux__ || defined __sgi || defined __GLIBC__	/* Linux and IRIX implementation. */
- 
- #include <mntent.h>
-

gentoo-0.15.6.tar.bz2/src/cfg_mount.c Deleted

@@ -1,309 +0,0 @@
-/*
-** 1999-01-28 -	Configuration of the automounting system. Pretty straight forward.
-**		Note: part of the configuration data (paths to database files) is
-**		handled by the paths config.
-*/
-
-#include "gentoo.h"
-
-#include "guiutil.h"
-#include "strutil.h"
-#include "configure.h"
-#include "cfg_module.h"
-
-#include "cfg_mount.h"
-
-#define	NODE	"Mounting"
-
-/* ----------------------------------------------------------------------------------------- */
-
-typedef struct {
-	GtkWidget	*vbox;
-
-	GtkWidget	*mframe;		/* Mode frame. */
-	GtkWidget	*mmode2;		/* Mode radio buttons. */
-	GSList		*mgroup;		/* Grouping list for radio buttons. */
-
-	GtkWidget	*oframe;		/* Options frame. */
-	GtkWidget	*octab;			/* Command table. */
-	GtkWidget	*ocmount, *ocumount;	/* Entry widgets for mount & umount command names. */
-	GtkWidget	*oflag3;		/* Flag check buttons. */
-
-	MainInfo	*main;
-	gboolean	modified;
-	MountInfo	mount;
-} P_Mount;
-
-static P_Mount	the_page;
-
-static gchar	*mode_name = { "never", "always" };
-static MntMode	mode_mode = { MNT_NEVER, MNT_ALWAYS };
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1999-01-28 -	Convert an internal name of a mounting mode to the numeral code for it. */
-static MntMode string_to_mode(const gchar *str)
-{
-	guint	i;
-
-	for(i = 0; i < sizeof mode_name / sizeof mode_name0; i++)
-	{
-		if(strcmp(str, mode_namei) == 0)
-			return mode_modei;
-	}
-	return MNT_ALWAYS;	/* If in doubt, mount freely. */
-}
-
-/* 1999-01-28 -	Convert a numeric mode to a string. */
-static gchar * mode_to_str(MntMode mode)
-{
-	return mode_namemode;
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-static void set_widgets(P_Mount *page)
-{
-	GtkWidget	*mw = NULL, *dw = NULL;
-
-	switch(page->mount.mode)
-	{
-		case MNT_NEVER:
-			mw = page->mmode0;
-			dw = page->oframe;
-			break;
-		case MNT_ALWAYS:
-			mw = page->mmode1;
-			break;
-		default:
-			fprintf(stderr, "CFGMOUNT: Unsupported mode %d!\n", page->mount.mode);
-	}
-	if(mw != NULL)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mw), TRUE);
-	if(dw != NULL)
-		gtk_widget_set_sensitive(dw, FALSE);
-
-	gtk_entry_set_text(GTK_ENTRY(page->ocmount), page->mount.cmd_mount);
-	gtk_entry_set_text(GTK_ENTRY(page->ocumount), page->mount.cmd_umount);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->oflag0), page->mount.check_nlink);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->oflag1), page->mount.show_stderr);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->oflag2), page->mount.umount_exit);
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1999-01-28 -	User changed the mounting mode. Let the world know. */
-static gint evt_mode_clicked(GtkWidget *wid, gpointer user)
-{
-	P_Mount	*page = gtk_object_get_user_data(GTK_OBJECT(wid));
-
-	page->mount.mode = GPOINTER_TO_INT(user);
-	gtk_widget_set_sensitive(page->oframe, page->mount.mode != MNT_NEVER);
-	page->modified = TRUE;
-
-	return TRUE;
-}
-
-/* 1999-01-28 -	User is editing the mount command. Get new string. */
-static gint evt_cmd_mount_changed(GtkWidget *wid, gpointer user)
-{
-	P_Mount	*page = user;
-
-	stu_strncpy(page->mount.cmd_mount, gtk_entry_get_text(GTK_ENTRY(wid)), sizeof page->mount.cmd_mount);
-	page->modified = TRUE;
-
-	return TRUE;
-}
-
-/* 1999-01-28 -	User is editing the umount command. Get new string. */
-static gint evt_cmd_umount_changed(GtkWidget *wid, gpointer user)
-{
-	P_Mount	*page = user;
-
-	stu_strncpy(page->mount.cmd_umount, gtk_entry_get_text(GTK_ENTRY(wid)), sizeof page->mount.cmd_umount);
-	page->modified = TRUE;
-
-	return TRUE;
-}
-
-/* 1999-01-28 -	Grab a flag. */
-static gint evt_nlink_changed(GtkWidget *wid, gpointer user)
-{
-	P_Mount	*page = user;
-
-	page->mount.check_nlink = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wid));
-
-	page->modified = TRUE;
-
-	return TRUE;
-}
-
-/* 1999-01-28 -	Grab a flag. */
-static gint evt_stderr_changed(GtkWidget *wid, gpointer user)
-{
-	P_Mount	*page = user;
-
-	page->mount.show_stderr = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wid));
-
-	page->modified = TRUE;
-
-	return TRUE;
-}
-
-/* 1999-01-28 -	Grab a flag. */
-static gint evt_umount_changed(GtkWidget *wid, gpointer user)
-{
-	P_Mount	*page = user;
-
-	page->mount.umount_exit = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wid));
-
-	page->modified = TRUE;
-
-	return TRUE;
-}
-
-/* 1999-01-28 -	Open up the mount configuration GUI. */
-static GtkWidget * cmn_init(MainInfo *min, gchar **name)
-{
-	const gchar	*mlab = { N_("Never"), N_("On Every Access") };
-	MntMode		mmode = { MNT_NEVER, MNT_ALWAYS };
-	P_Mount	*page = &the_page;
-	GtkWidget	*vbox, *label;
-	guint		i;
-
-	if(name == NULL)
-		return NULL;
-
-	*name = _("Mounting");
-
-	page->main = min;
-	page->modified = FALSE;
-
-	page->vbox = gtk_vbox_new(FALSE, 0);
-
-	page->mframe = gtk_frame_new(_("Mount When?"));
-	vbox = gtk_vbox_new(FALSE, 0);
-	page->mgroup = gui_radio_group_new(sizeof mlab / sizeof mlab0, mlab, page->mmode);
-	for(i = 0; i < sizeof mlab / sizeof mlab0; i++)
-	{
-		gtk_object_set_user_data(GTK_OBJECT(page->mmodei), page);
-		g_signal_connect(G_OBJECT(page->mmodei), "clicked", G_CALLBACK(evt_mode_clicked), GINT_TO_POINTER(mmodei));
-		gtk_box_pack_start(GTK_BOX(vbox), page->mmodei, FALSE, FALSE, 0);
-	}
-	gtk_container_add(GTK_CONTAINER(page->mframe), vbox);
-	gtk_box_pack_start(GTK_BOX(page->vbox), page->mframe, FALSE, FALSE, 0);
-
-	page->oframe = gtk_frame_new(_("Mount Options"));
-	vbox = gtk_vbox_new(FALSE, 0);
-	page->octab = gtk_table_new(2, 2, FALSE);
-	label = gtk_label_new(_("Mount Command"));
-	gtk_table_attach(GTK_TABLE(page->octab), label, 0, 1, 0, 1,  0,0,0,0);
-	page->ocmount = gtk_entry_new_with_max_length(sizeof page->mount.cmd_mount - 1);
-	g_signal_connect(G_OBJECT(page->ocmount), "changed", G_CALLBACK(evt_cmd_mount_changed), page);
-	gtk_table_attach(GTK_TABLE(page->octab), page->ocmount, 1, 2, 0, 1,  GTK_FILL|GTK_EXPAND,0,0,0);
-	label = gtk_label_new(_("Unmount Command"));
-	gtk_table_attach(GTK_TABLE(page->octab), label, 0, 1, 1, 2,  0,0,0,0);
-	page->ocumount = gtk_entry_new_with_max_length(sizeof page->mount.cmd_umount - 1);
-	g_signal_connect(G_OBJECT(page->ocumount), "changed", G_CALLBACK(evt_cmd_umount_changed), page);
-	gtk_table_attach(GTK_TABLE(page->octab), page->ocumount, 1, 2, 1, 2,  GTK_FILL|GTK_EXPAND,0,0,0);
-	gtk_box_pack_start(GTK_BOX(vbox), page->octab, FALSE, FALSE, 0);
-
-	page->oflag0 = gtk_check_button_new_with_label(_("Only Mount on Toplevel Directories?"));
-	g_signal_connect(G_OBJECT(page->oflag0), "clicked", G_CALLBACK(evt_nlink_changed), page);
-	gtk_box_pack_start(GTK_BOX(vbox), page->oflag0, TRUE, TRUE, 0);
-	page->oflag1 = gtk_check_button_new_with_label(_("Use Command Error Dialog?"));
-	g_signal_connect(G_OBJECT(page->oflag1), "clicked", G_CALLBACK(evt_stderr_changed), page);
-	gtk_box_pack_start(GTK_BOX(vbox), page->oflag1, TRUE, TRUE, 0);
-	page->oflag2 = gtk_check_button_new_with_label(_("Unmount When gentoo Quits?"));
-	g_signal_connect(G_OBJECT(page->oflag2), "clicked", G_CALLBACK(evt_umount_changed), page);
-	gtk_box_pack_start(GTK_BOX(vbox), page->oflag2, TRUE, TRUE, 0);
-
-	gtk_container_add(GTK_CONTAINER(page->oframe), vbox);
-	gtk_box_pack_start(GTK_BOX(page->vbox), page->oframe, FALSE, FALSE, 10);
-
-	gtk_widget_show_all(page->vbox);
-	return page->vbox;
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1999-01-28 -	Grab current mount settings and update GUI accordingly. */
-static void cmn_update(MainInfo *min)
-{
-	P_Mount	*page = &the_page;
-
-	/* Mount config data is fully static, and easy to copy. */
-	page->mount = min->cfg.mount;
-	set_widgets(page);
-
-	page->modified = FALSE;		/* Keep this last! */
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1999-01-28 -	Accept current mount settings. If anything changed, tell the mounting module
-**		that it needs to clear its caches of the databases. This is done via the flags
-**		managed by the main config module (configure.c).
-*/
-static void cmn_accept(MainInfo *min)
-{
-	P_Mount	*page = &the_page;
-
-	if(page->modified)
-	{
-		min->cfg.mount = page->mount;
-		cfg_set_flags(CFLG_RESET_MOUNT);
-		page->modified = FALSE;
-	}
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1999-01-28 -	Save out the mount config data, using the XML module. Nothing special. */
-static gint cmn_save(MainInfo *min, FILE *out)
-{
-	xml_put_node_open(out, NODE);
-
-	xml_put_text(out, "mode", mode_to_str(min->cfg.mount.mode));
-
-	xml_put_text(out, "cmd_mount", min->cfg.mount.cmd_mount);
-	xml_put_text(out, "cmd_umount", min->cfg.mount.cmd_umount);
-
-	xml_put_boolean(out, "check_nlink", min->cfg.mount.check_nlink);
-	xml_put_boolean(out, "show_stderr", min->cfg.mount.show_stderr);
-	xml_put_boolean(out, "umount_exit", min->cfg.mount.umount_exit);
-
-	xml_put_node_close(out, NODE);
-
-	return TRUE;
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1999-01-28 -	Load configuration data back in. Trivial. */
-static void cmn_load(MainInfo *min, const XmlNode *node)
-{
-	const gchar	*str;
-	gint		tmp;
-
-	if(xml_get_text(node, "mode", &str))
-		min->cfg.mount.mode = string_to_mode(str);
-	xml_get_text_copy(node, "cmd_mount", min->cfg.mount.cmd_mount, sizeof min->cfg.mount.cmd_mount);
-	xml_get_text_copy(node, "cmd_umount", min->cfg.mount.cmd_umount, sizeof min->cfg.mount.cmd_umount);
-
-	if(xml_get_boolean(node, "check_nlink", &tmp))
-		min->cfg.mount.check_nlink = tmp;
-	if(xml_get_boolean(node, "show_stderr", &tmp))
-		min->cfg.mount.show_stderr = tmp;
-	if(xml_get_boolean(node, "umount_exit", &tmp))
-		min->cfg.mount.umount_exit = tmp;
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-const CfgModule * cmn_describe(MainInfo *min)
-{
-	static const CfgModule	desc = { NODE, cmn_init, cmn_update, cmn_accept, cmn_save, cmn_load, NULL };
-
-	return &desc;
-}

gentoo-0.15.6.tar.bz2/src/cfg_mount.h Deleted

gentoo-0.15.6.tar.bz2/src/convutil.c Deleted

@@ -1,158 +0,0 @@
-/*
- * 2006-11-11 -	Conversion utilities, for creating filenames from GTK+'s UTF-8 strings. Tries to
- *		establish a simplistic "scope", in which filesystem versions of a set of strings
- *		is made available. Don't forget to call conv_end() when going out of the scope
- *		though, as failure to do so will cause memory leaks. Optimized for a single string,
- *		but will handle any number.
-*/
-
-#include <errno.h>
-#include <stdio.h>
-
-#include "convutil.h"
-
-/* ----------------------------------------------------------------------------------------- */
-
-static void item_set(CItem *ci, const gchar *display, gchar *disk)
-{
-	ci->in  = display;
-	ci->out = disk;
-}
-
-static void item_free(CItem *ci)
-{
-	if(ci == NULL || ci->in == ci->out)	/* Conveniently captures the case when display and disk are NULL. */
-		return;
-	g_free(ci->out);			/* The output is always the dynamic one. */
-}
-
-/* Don't call this on a non-freed item, or memory will be lost. */
-static void item_clear(CItem *ci)
-{
-	ci->in = ci->out = NULL;
-}
-
-void conv_init(Conv *c)
-{
-	if(c == NULL)
-		return;
-	item_clear(&c->item0);
-	c->items = NULL;
-	c->size = 0;
-}
-
-gchar * conv_begin(Conv *c, const gchar *display)
-{
-	c->item0.in  = display;
-	c->item0.out = g_filename_from_utf8(display, -1, NULL, NULL, NULL);
-	c->items = NULL;
-	c->size = 1;
-	return c->item0.out;
-}
-
-gchar * conv_begin_reverse(Conv *c, const gchar *disk)
-{
-	c->item0.in = disk;
-	c->item0.out = g_filename_to_utf8(disk, -1, NULL, NULL, NULL);
-	c->items = NULL;
-	c->size = 1;
-	return c->item0.out;
-}
-
-static gchar * item_add(Conv *c, const CItem *item)
-{
-	if(c->size == 0)
-		c->item0 = *item;
-	else
-	{
-		CItem	*n = g_malloc(sizeof *n);
-		*n = *item;
-		c->items = g_slist_append(c->items, n);
-	}
-	c->size++;
-	return item->out;
-}
-
-gchar * conv_add(Conv *c, const gchar *display)
-{
-	gchar	*disk;
-	CItem	item;
-
-	if(c == NULL || display == NULL)
-		return NULL;
-	if((disk = g_filename_from_utf8(display, -1, NULL, NULL, NULL)) == NULL)
-		return NULL;
-	item.in = display;
-	item.out = disk;
-	return item_add(c, &item);
-}
-
-gchar * conv_add_reverse(Conv *c, const gchar *disk)
-{
-	gchar	*display;
-	CItem	item;
-	int	errno_cache;
-
-	if(c == NULL || disk == NULL)
-		return NULL;
-	errno_cache = errno;	/* FIXME: g_filename_to_utf() seems to trash errno to 7 even on success. */
-	if((display = g_filename_to_utf8(disk, -1, NULL, NULL, NULL)) == NULL)
-		return NULL;
-	errno = errno_cache;
-	item.in = disk;
-	item.out = display;
-	return item_add(c, &item);
-}
-
-gchar * conv_set(Conv *c, guint index, const gchar *display)
-{
-	gchar	*disk;
-
-	if(c == NULL || index >= c->size || display == NULL)
-		return NULL;
-	if((disk = g_filename_from_utf8(display, -1, NULL, NULL, NULL)) == NULL)
-		return NULL;
-	if(index == 0)
-	{
-		item_free(&c->item0);
-		c->item0.in = display;
-		c->item0.out = disk;
-	}
-	else
-	{
-		GSList	*iter = g_slist_nth(c->items, --index);
-		item_free(iter->data);
-		item_set(iter->data, display, disk);
-	}
-	return disk;
-}
-
-gchar * conv_get(const Conv *c, guint index)
-{
-	GSList	*iter;
-
-	if(c == NULL || index >= c->size)
-		return NULL;
-	if(index == 0)
-		return c->item0.out;
-	iter = g_slist_nth(c->items, --index);
-	return ((CItem *) iter->data)->out;
-}
-
-void conv_end(Conv *c)
-{
-	GSList	*iter;
-
-	if(c == NULL)
-		return;
-	item_free(&c->item0);
-	item_clear(&c->item0);
-	if(c->items != NULL)
-	{
-		for(iter = c->items; iter != NULL; iter = g_slist_next(iter))
-			item_free(iter->data);
-		g_slist_free(c->items);
-		c->items = NULL;
-	}
-	c->size = 0;
-}

gentoo-0.15.6.tar.bz2/src/convutil.h Deleted

@@ -1,55 +0,0 @@
-/*
- * 2006-11-11 -	Handy (?) module to help keep track of strings in UTF-8 ("display",
- *		the one used internally by GLib/GTK+) and whatever the local file-
- *		system uses. It's just a context, to help simplify the code. Should
- *		also handle the case when the external and internal representations
- *		are the same, which can happen.
-*/
-
-#if !defined CONVUTIL_H
-#define	CONVUTIL_H
-
-#include <glib.h>
-
-/* These are here only so it can be conveniently put on the stack. Do not meddle with
- * these fields directly, because they are subtle and quick to corrupt filenames.
-*/
-typedef struct {
-	const gchar	*in;
-	gchar		*out;
-} CItem;
-
-typedef struct {
-	CItem	item0;
-	GSList	*items;
-	gsize	size;
-} Conv;
-
-/* Initialize Conv to empty state. If you are going to immediately be using it, conv_begin()
- * is the way to go.
-*/
-extern void	conv_init(Conv *v);
-
-/* Begin using a Conv, by adding the display (UTF-8) version of a string. Returns the string
- * converted to filesystem encoding, and stores the pair for later reference.
-*/
-extern gchar *	conv_begin(Conv *c, const gchar *display);
-
-extern gchar *	conv_begin_reverse(Conv *c, const gchar *disk);
-
-/* Adds another string, in display (UTF-8) format, and returns the filesystem version. */
-extern gchar *	conv_add(Conv *c, const gchar *display);
-
-/* Adds a string in filesystem encoding, and returns it in display encoding. */
-extern gchar *	conv_add_reverse(Conv *, const gchar *disk);
-
-/* Changes the string at the given index. If the index is out of bounds, does nothing. */
-extern gchar *	conv_set(Conv *c, guint index, const gchar *display);
-
-/* Returns the filesystem encoding version of a previously added string. */
-extern gchar *	conv_get(const Conv *c, guint index);
-
-/* Ends use of a Conv, freeing all the added strings. */
-extern void	conv_end(Conv *c);
-
-#endif		/* CONVUTIL_H */

gentoo-0.15.6.tar.bz2/src/graphics/icon_dirparent-old.xpm Deleted

gentoo-0.15.6.tar.bz2/src/graphics/icon_dirparent.xpm Deleted

gentoo-0.15.6.tar.bz2/src/graphics/icon_iconify.xpm Deleted

@@ -1,155 +0,0 @@
-/* XPM */
-static char * icon_iconify_xpm = {
-"32 32 120 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #010200",
-"@ 	c #152208",
-"# 	c #1E310B",
-"$ 	c #142108",
-"% 	c #000100",
-"& 	c #040601",
-"* 	c #325213",
-"= 	c #49761B",
-"- 	c #6EB329",
-"; 	c #7FCF30",
-"> 	c #51831E",
-", 	c #263E0E",
-"' 	c #010100",
-") 	c #020301",
-"! 	c #121D07",
-"~ 	c #5E9923",
-"{ 	c #7BC82E",
-" 	c #80D030",
-"^ 	c #77C12C",
-"/ 	c #48751B",
-"( 	c #050902",
-"_ 	c #253C0E",
-": 	c #6FB52A",
-"< 	c #7CC92E",
-" 	c #273F0E",
-"} 	c #28420F",
-"| 	c #1A2B0A",
-"1 	c #6DB229",
-"2 	c #78C32D",
-"3 	c #2B4510",
-"4 	c #030501",
-"5 	c #101A06",
-"6 	c #68AA27",
-"7 	c #78C22D",
-"8 	c #68A927",
-"9 	c #1B2B0A",
-"0 	c #7DCB2F",
-"a 	c #385C15",
-"b 	c #345413",
-"c 	c #74BD2C",
-"d 	c #365914",
-"e 	c #1D300B",
-"f 	c #0B1304",
-"g 	c #4D7D1D",
-"h 	c #080D03",
-"i 	c #0C1304",
-"j 	c #77C12D",
-"k 	c #71B82B",
-"l 	c #3F6617",
-"m 	c #67A726",
-"n 	c #101906",
-"o 	c #0A1104",
-"p 	c #629F25",
-"q 	c #050802",
-"r 	c #4D7C1D",
-"s 	c #79C42D",
-"t 	c #2D4A11",
-"u 	c #7DCC2F",
-"v 	c #131F07",
-"w 	c #619E25",
-"x 	c #73BB2B",
-"y 	c #060902",
-"z 	c #68A827",
-"A 	c #49771C",
-"B 	c #030401",
-"C 	c #162308",
-"D 	c #4E7F1D",
-"E 	c #273F0F",
-"F 	c #63A125",
-"G 	c #0F1805",
-"H 	c #172509",
-"I 	c #335213",
-"J 	c #436C19",
-"K 	c #416A19",
-"L 	c #5F9B24",
-"M 	c #0F1806",
-"N 	c #253D0E",
-"O 	c #5A9222",
-"P 	c #3A5F16",
-"Q 	c #0B1204",
-"R 	c #5C9522",
-"S 	c #6DB129",
-"T 	c #416A18",
-"U 	c #4A781C",
-"V 	c #385B15",
-"W 	c #7CCA2F",
-"X 	c #76C02C",
-"Y 	c #070C03",
-"Z 	c #72BA2B",
-"` 	c #142007",
-" .	c #53871F",
-"..	c #599021",
-"+.	c #040702",
-"@.	c #446F1A",
-"#.	c #7FCE30",
-"$.	c #4B7B1C",
-"%.	c #1B2C0A",
-"&.	c #47731B",
-"*.	c #66A526",
-"=.	c #355614",
-"-.	c #0C1405",
-";.	c #5F9A24",
-">.	c #243A0D",
-",.	c #72B92B",
-"'.	c #23380D",
-").	c #75BE2C",
-"!.	c #578D21",
-"~.	c #010201",
-"{.	c #5C9623",
-".	c #406718",
-"^.	c #5D9723",
-"/.	c #70B52A",
-"(.	c #6FB42A",
-"_.	c #355714",
-":.	c #080E03",
-"<.	c #192909",
-".	c #568C20",
-"}.	c #192809",
-"                          . . . . . .                           ",
-"                  . . . . . . . . . . . . . .                   ",
-"              . . . . . . . . . . . . . . . . . .               ",
-"            . . . . . . . . . . . . . . . . . . . .             ",
-"          . . . . . . . + @ # # $ % . . . . . . . . .           ",
-"        . . . . . . & * = - ; > , ' . . . . . . . . . .         ",
-"      . . . . . ) ! ~ {  ^ / ( . . . . . . . . . . . . .       ",
-"    . . . . . . _ :   <  . . . . } | . . . . . . . . . .     ",
-"    . . . . ) _ 1   2 3 . . 4 5 6 7 8 9 . . . . . . . . .     ",
-"  . . . . . ! :   0 a . . ' b c    d . . . e f . . . . .   ",
-"  . . . . & ~    g h . . i j    k # . . . l ~ & . . . .   ",
-"  . . . . * {   m n . . o p     g . . . q r { * . . . .   ",
-"  . . . + =   s 3 . . . t {    u v . . . i w  = + . . .   ",
-". . . . @ -   x @ . . y z     A B . . . C   - @ . . . . ",
-". . . . #    D . . . E     F G . . . . H    # . . . . ",
-". . . . #    I . . . J    F ) . . . . . K    # . . . . ",
-". . . . #    C . . . L   F M . . . . . . ~    # . . . . ",
-". . . . #    C . . . N O P ) . Q R h . . . S    # . . . . ",
-". . . . @ -   C . . . . . . . . T  h . . @ x   - @ . . . . ",
-"  . . . + =   U . . . . . . y V W X Y . . 3 s   = + . . .   ",
-"  . . . . * {  Z ` . . . . )  .j  ..+.. . @.  { * . . . .   ",
-"  . . . . & ~  #.X $.%.# &.*.   =.% . -.;.  ~ & . . . .   ",
-"  . . . . . ! :          X >.. . @ ,. : ! . . . . .   ",
-"    . . . . ) _ 1         D & . . '. )._ ) . . . .     ",
-"    . . . . . . _ :       !.~.. . . {. .. . . . . .     ",
-"      . . . . . ) ! ^./././.(._.:.. . . <..}.& . . . . .       ",
-"        . . . . . . . . . . . . . . . . . . . . . . . .         ",
-"          . . . . . . . . . . . . . . . . . . . . . .           ",
-"            . . . . . . . . . . . . . . . . . . . .             ",
-"              . . . . . . . . . . . . . . . . . .               ",
-"                  . . . . . . . . . . . . . .                   ",
-"                          . . . . . .                           "};

gentoo-0.15.6.tar.bz2/src/mount.c Deleted

@@ -1,359 +0,0 @@
-/*
-** 1999-01-20 -	This module contains gentoo's support for automounting devices. It's really
-**		quite simple; we just buffer the contents of some number of fs tables (on
-**		my system, /etc/fstab is the only one). A hook in the DirEnter command then
-**		calls this module as we enter a dir, and we check if the directory to be
-**		entered is known to be a mountpoint. If it is, we issue a mount(8) command.
-** 1999-01-27 -	Removed use of Linux <mntent> API, now uses a wrapper in the new mntent
-**		module to better cope with different systems. I hope.
-*/
-
-#include "gentoo.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include "errors.h"
-#include "strutil.h"
-#include "dialog.h"
-#include "fileutil.h"
-#include "mntent_wrap.h"
-#include "mount.h"
-
-/* ----------------------------------------------------------------------------------------- */
-
-typedef struct {
-	GList	*mdir;		/* System list of fstab entries, sorted alphabetically. */
-	GList	*mntlist;	/* List of names of mounted devices; umount at exit. */
-} MntInfo;
-
-static MntInfo	the_info = { NULL, NULL };
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1999-01-20 -	Scan through entries in <mtab> (opened by setmntent()) for an entry whose
-**		mnt_dir component matches <path>. Returns TRUE if found, FALSE otherwise.
-*/
-static gboolean scan_for_dir(FILE *mtab, const gchar *path)
-{
-	const MntEnt	*me;
-
-	while((me = mne_getmntent(mtab)) != NULL)
-	{
-		if(strcmp(mne_get_mountpoint(me), G_DIR_SEPARATOR_S) == 0)	/* Ignore root. */
-			continue;
-		if(strncmp(mne_get_mountpoint(me), path, strlen(mne_get_mountpoint(me))) == 0)
-			return TRUE;
-	}
-	return FALSE;
-}
-
-/* 1999-01-21 -	Find out whether <path> is already mounted or not. Does this by inspecting
-**		(using everybody's fav setmntent() API) the mount table. On Linux (and any
-**		other systems having a compatible "/proc/mounts" file), using that is highly
-**		recommended for performance reasons (it's an in-memory file, then).
-*/
-static gboolean dir_is_mounted(MainInfo *min, const gchar *path)
-{
-	FILE		*mtab;
-	gchar		*mplist = min->cfg.path.pathPTID_MTAB->str, mpPATH_MAX;
-	gboolean	ret = FALSE;
-	gint		old_errno = errno;
-
-	for(; !ret && fut_path_component(mplist, mp); mplist = NULL)
-	{
-		if((mtab = mne_setmntent(mp)) != NULL)
-		{
-			ret = scan_for_dir(mtab, path);
-			mne_endmntent(mtab);
-		}
-	}
-	errno = old_errno;
-	return ret;
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1999-01-20 -	A GHashTable callback to free a mount entry. Pretty simple. */
-static void free_mntent(gpointer data, gpointer user)
-{
-	mne_destroy(data);
-}
-
-/* 1999-01-20 -	Clear the internal information about available mountpoints. */
-static void clear_info(MainInfo *min, MntInfo *mni)
-{
-	if(mni == NULL)
-		return;
-
-	if(mni->mdir != NULL)
-	{
-		g_list_foreach(mni->mdir, free_mntent, NULL);
-		g_list_free(mni->mdir);
-		mni->mdir = NULL;
-	}
-}
-
-static gint cmp_mntent(gconstpointer a, gconstpointer b)
-{
-	return strcmp(mne_get_mountpoint(a), mne_get_mountpoint(b));
-}
-
-/* 1999-01-20 -	Initialize information about available file systems. This must have been called
-**		once before any attempt to automount is made, or the mounting will fail. This can
-**		also be called at a later time, to refresh the data.
-** 1999-01-27 -	Now actually traverses the entire path list.
-*/
-gint mnt_init(MainInfo *min)
-{
-	gchar		*fplist, fpPATH_MAX;
-	FILE		*fstab;
-	MntInfo		*mni = &the_info;
-	const MntEnt	*me;
-	MntEnt		*ne;
-	GList		*iter, *next;
-
-	clear_info(min, mni);
-	for(fplist = min->cfg.path.pathPTID_FSTAB->str; fut_path_component(fplist, fp); fplist = NULL)
-	{
-		if((fstab = mne_setmntent(fp)) != NULL)
-		{
-			while((me = mne_getmntent(fstab)) != NULL)
-			{
-				if(g_strcasecmp(mne_get_mountpoint(me), "none") == 0)	/* Linux-ism, perhaps, but safe? */
-					continue;
-				ne = mne_copy(me);
-				mni->mdir = g_list_insert_sorted(mni->mdir, ne, cmp_mntent);
-			}
-			mne_endmntent(fstab);
-		}
-	}
-	/* Now that we have a list of mountpoints, prune away the ones that are already
-	** in use, since we don't want gentoo interfering with the system's state like
-	** that. This can't be done while building; mne_setmntent() doesn't nest.
-	*/
-	for(iter = mni->mdir; iter != NULL; iter = next)
-	{
-		next = g_list_next(iter);
-		if(strcmp(mne_get_mountpoint(iter->data), G_DIR_SEPARATOR_S) == 0 ||
-		   dir_is_mounted(min, mne_get_mountpoint(iter->data)))
-		{
-			mni->mdir = g_list_remove_link(mni->mdir, iter);
-			mne_destroy(iter->data);
-			g_list_free_1(iter);
-		}
-	}
-	return mni->mdir != NULL;
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1999-01-20 -	Initialize default values of configuration. */
-void mnt_init_defaults(CfgInfo *cfg)
-{
-	MountInfo	*mi;
-
-	if(cfg != NULL)
-	{
-		mi = &cfg->mount;
-
-		mi->mode	  = MNT_NEVER;
-		mi->check_nlink	  = TRUE;
-		mi->show_stderr   = TRUE;
-		mi->umount_exit	  = TRUE;
-		stu_strncpy(mi->cmd_mount,  "/bin/mount",  sizeof mi->cmd_mount);
-		stu_strncpy(mi->cmd_umount, "/bin/umount", sizeof mi->cmd_umount);
-	}
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1999-01-20 -	Envoke the command whose full name is in <cmd>, with the single string argument
-**		of <arg>. Set up a pipe to capture command's stderr. If <show_err> is TRUE, the
-**		stderr text is shown in a dialog, if it's FALSE, it is simply dropped.
-**		Returns 1 if command succeeded, 0 if it failed somehow.
-*/
-static gint run_cmd(MainInfo *min, const gchar *cmd, const gchar *arg, gboolean show_err)
-{
-	const gchar	*cname;
-	gint		child, fd_err2, ret = 0;
-
-	if((cname = strrchr(cmd, G_DIR_SEPARATOR)) != NULL)
-		cname++;
-	else
-		cname = cmd;
-
-	if(pipe(fd_err) != 0)
-		return 0;
-
-	if((child = fork()) == 0)
-	{
-		if(close(STDERR_FILENO) == 0)
-		{
-			if(dup(fd_errSTDOUT_FILENO) == STDERR_FILENO)
-			{
-				if(close(fd_errSTDIN_FILENO) == 0)
-					execl(cmd, cname, arg, NULL);
-			}
-		}
-		perror("");
-		exit(EXIT_FAILURE);
-	}
-	else if(child > 0)
-	{
-		gint	status;
-
-		close(fd_errSTDOUT_FILENO);
-		if(waitpid(child, &status, 0) == child)
-		{
-			if(WIFEXITED(status))
-			{
-				if(WEXITSTATUS(status) == 0)		/* Mount went OK? */
-					ret = 1;
-				else if(show_err)			/* Nope. Do we care enough? */
-				{
-					gchar	buf1024;
-					gint	togo, got, offs = 0;
-
-					offs = g_snprintf(buf, sizeof buf, _("Execution of \"%s %s\" failed:\n"), cmd, arg);
-					for(togo = sizeof buf - 1 - offs; togo > 0 && (got = read(fd_errSTDIN_FILENO, buf + offs, togo)) > 0;)
-					{
-						offs += got;
-						togo -= got;
-					}
-					bufoffs = '\0';
-					while(bufoffs - 1 == '\n')
-						buf--offs = '\0';
-					dlg_dialog_async_new_error(buf);
-				}
-			}
-			else
-				perror("MOUNT: Command execution failed");
-		}
-		close(fd_errSTDIN_FILENO);
-	}
-	else if(child == -1)
-		perror("MOUNT: Couldn't fork");
-
-	if(errno)
-		err_set(min, errno, cmd, arg);
-	else
-		err_clear(min);
-
-	return ret && (errno == 0);
-}
-
-/* 2002-06-11 -	Look up <path> in list of known mountpoints. Will return if prefix of <path>
-**		is a mountpoint, since that makes sense. No recursion, yet, though.
-*/
-static const MntEnt * mount_lookup(const MntInfo *mni, const gchar *path)
-{
-	const GList	*iter;
-	const gchar	*mp;
-
-	for(iter = g_list_last(mni->mdir); iter != NULL; iter = g_list_previous(iter))
-	{
-		mp = mne_get_mountpoint(iter->data);
-		if(strncmp(mp, path, strlen(mp)) == 0)
-			return iter->data;
-	}
-	return NULL;
-}
-
-/* 1999-01-20 -	We are about to enter the directory whose full path is <path>. If necessary,
-**		mount it. Returns 1 if the dir was mounted, 0 if not. Note that a return value
-**		of 0 doesn't signal an error; perhaps <path> wasn't a mount point.
-** 1999-01-21 -	Added support for checking the 'nlink' field of <path> before mounting, and
-**		abandon attempt if it's not 2 (<=> the path is not an empty dir).
-** 1999-01-28 -	Added the <ref> argument, which needs to be == the current mounting mode in
-**		order for the mount to be attempted.
-** 2002-06-11 -	Added alternate-trailer version. Nice.
-*/
-gint mnt_entering(MainInfo *min, const gchar *path, MntMode ref)
-{
-	MntInfo		*mni = &the_info;
-	const MntEnt	*ment;
-
-	if((ref != min->cfg.mount.mode) || (mni->mdir == NULL))
-		return 0;
-	if(min->cfg.mount.check_nlink)
-	{
-		struct stat	st;
-
-		if((stat(path, &st) == 0) && (st.st_nlink != 2))
-			return 0;
-	}
-	/* If <path> is below known already used mountpoint, get outa here. */
-	if(dir_is_mounted(min, path))
-		return 0;
-
-	/* Look up mount point. If it fails, try again with (or without, depending on input)
-	** a trailing directory separator. This makes us a bit less dependant upon the exact
-	** format of the system's fstab file (or equivalent).
-	*/
-	if((ment = mount_lookup(mni, path)) == NULL)
-	{
-		gchar	bufPATH_MAX;
-		gssize	len = strlen(path);
-
-		if(len <= strlen(G_DIR_SEPARATOR_S))
-			return 0;
-
-		if(strcmp(path + len - strlen(G_DIR_SEPARATOR_S), G_DIR_SEPARATOR_S) == 0)
-		{
-			/* Create version without trailing dir separator. */
-			g_snprintf(buf, sizeof buf, "%s", path);
-			buflen - strlen(G_DIR_SEPARATOR_S) = '\0';
-		}
-		else	/* Create version with trailing dir separator. */
-			g_snprintf(buf, sizeof buf, "%s%s", path, G_DIR_SEPARATOR_S);
-		ment = mount_lookup(mni, buf);
-	}
-	if(ment != NULL)
-	{
-		err_printf(min, _("Mounting \"%s\" on \"%s\"..."), mne_get_device(ment), mne_get_mountpoint(ment));
-		if(run_cmd(min, min->cfg.mount.cmd_mount, (gchar *) mne_get_mountpoint(ment), min->cfg.mount.show_stderr))
-		{
-			mni->mntlist = g_list_append(mni->mntlist, g_strdup((gchar *) mne_get_mountpoint(ment)));
-			return 1;
-		}
-		err_show(min);
-	}
-	return 0;
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1999-01-20 -	Clear away all internally buffered information. When this has been called,
-**		all attempts to mount will fail until mnt_init() has been called. Note that
-**		this will NOT unmount any filesystems mounted by this module up till now.
-*/
-void mnt_clear(MainInfo *min)
-{
-	clear_info(min, &the_info);
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1999-01-21 -	Shut down the mounting system. This unmounts all mounted volumes. */
-void mnt_shutdown(MainInfo *min)
-{
-	MntInfo	*mni = &the_info;
-
-	if(chdir("/") == 0)	/* Avoids having a mounted dir current, I hope. */
-	{
-		GList	*iter;
-
-		for(iter = mni->mntlist; iter != NULL; iter = g_list_next(iter))
-		{
-			run_cmd(min, min->cfg.mount.cmd_umount, iter->data, FALSE);
-			g_free(iter->data);
-		}
-		g_list_free(mni->mntlist);
-		mni->mntlist = NULL;
-	}
-}

gentoo-0.15.6.tar.bz2/src/mount.h Deleted

gentoo-0.15.6.tar.bz2/src/options.c Deleted

@@ -1,282 +0,0 @@
-/*
-** 2002-02-17 -	A brand-new options parser.
-*/
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
-
-#include "options.h"
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* Slightly hysterical function to print indented text, with word-wrapping. */
-static void print_wrapped_and_indented(const gchar *text, gint indent, gint wrap)
-{
-	gchar	word1024, *put;
-	gint	len, wlen;
-
-	printf("%*s", indent, "");
-	for(len = indent; *text;)
-	{
-		while(isspace((guchar) *text))
-			text++;
-		for(put = word; *text && !isspace((guchar) *text) && (put - word + 1) < sizeof word;)
-			*put++ = *text++;
-		*put = '\0';
-		wlen = strlen(word);
-		if(len + wlen >= wrap)
-		{
-			printf("\n%*s", indent, "");
-			len = indent;
-		}
-		printf("%s ", word);
-		len += wlen + 1;
-	}
-	if(len != indent)
-		printf("\n");
-}
-
-/* Print out as detailed usage information as we can possibly construct based on <desc>. */
-static void show_usage(const OptDesc *desc, gsize num_desc)
-{
-	gchar		opt1024, ns2 = "?";
-	const gchar	*nl;
-	gsize		i, len;
-
-	printf("Usage:\n");
-	for(i = 0; i < num_desc; i++)
-	{
-		opt0 = '\0';
-		ns0 = desci.name_short;
-		nl    = desci.name_long;
-		if(desci.arg_mode == OPT_ARG_NONE)
-			g_snprintf(opt, sizeof opt, "%s%s%s%s%s", ns0 ? "-" : "", ns, ns0 && nl ? ", " : "", nl ? "--" : "", nl ? nl : "");
-		else if(desci.arg_mode == OPT_ARG_OPT)
-		{
-			len = g_snprintf(opt, sizeof opt, "%s%s%s%s%s%s%s",
-					ns0 ? "-" : "", ns, ns0 ? " ARG" : "", ns0 && nl ? ", " : "",
-					nl ? "--" : "", nl ? nl : "", nl ? "=ARG" : "");
-			if(desci.arg)
-				g_snprintf(opt + len, sizeof opt - len, " (default: %s)", (const gchar *) desci.arg);
-		}
-		else
-			g_snprintf(opt, sizeof opt, "%s%s%s%s%s%s%s",
-					ns0 ? "-" : "", ns, ns0 ? " ARG" : "", ns0 && nl ? ", " : "",
-					nl ? "--" : "", nl ? nl : "", nl ? "=ARG" : "");
-		printf(" %s\n", opt);
-		print_wrapped_and_indented(desci.help, 4, 70);
-	}
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* Delete <index>:th element of <argv>, moving all other elements downward. */
-static void argv_delete(gchar **argv, gint index)
-{
-	for(; argvindex != NULL; index++)
-		argvindex = argvindex + 1;
-}
-
-/* Return index of first element in <argv> that looks like an option. Returns -1 if none found. */
-static gint argv_find_option(gchar **argv)
-{
-	gint	i;
-
-	for(i = 1; argvi != NULL; i++)
-	{
-		if(strcmp(argvi, "--") == 0)
-			return -1;
-		else if(argvi0 == '-')
-			return i;
-	}
-	return -1;
-}
-
-/* Return the next word after <index>, as long as it doesn't start with '-'. */
-static gchar * get_next_nonoption_word(gchar **argv, gint index)
-{
-	gchar	*arg;
-
-	if((arg = argv++index) != NULL)
-	{
-		if(arg0 != '-')
-			argv_delete(argv, index);
-		else
-			arg = NULL;
-	}
-	return arg;
-}
-
-/* Get argument to short option. Either rest of string, if it exists, or the next word. */
-static const gchar * short_get_arg(gchar **argv, gint index, const gchar *ptr)
-{
-	if(ptr1)
-		return ptr + 1;
-	return get_next_nonoption_word(argv, index);
-}
-
-/* Store argument, taking care to build list if needed. */
-static gboolean arg_store(const gchar *name, OptDesc *desc, const gchar *arg, gboolean is_short)
-{
-	if(arg)
-	{
-		if(desc->arg_mode == OPT_ARG_REQ_LIST)
-			desc->arg = g_list_append(desc->arg, (gpointer) arg);
-		else
-			desc->arg = (gpointer) arg;
-		return TRUE;
-	}
-	else if(desc->arg_mode == OPT_ARG_REQ || desc->arg_mode == OPT_ARG_REQ_LIST)
-	{
-		gchar	opt64;
-
-		if(is_short)
-			g_snprintf(opt, sizeof opt, "-%c", desc->name_short);
-		else
-			g_snprintf(opt, sizeof opt, "--%s", desc->name_long);
-		fprintf(stderr, "%s: Missing argument to option %s; try -h or --help for usage\n", name, opt);
-		return FALSE;
-	}
-	return FALSE;
-}
-
-/* Handle a (bunch of) short option(s). */
-static guint32 handle_short_options(gchar **argv, gint index, OptDesc *desc, gsize num_desc, guint32 *flags)
-{
-	const gchar	*ptr;
-	gsize		i;
-
-	for(ptr = argvindex + 1; *ptr; ptr++)
-	{
-		for(i = 0; i < num_desc; i++)
-		{
-			if(*ptr == desci.name_short)
-				break;
-		}
-		if(i < num_desc)
-		{
-			*flags |= desci.flag;
-			if(desci.arg_mode)
-			{
-				const gchar	*arg;
-
-				arg = short_get_arg(argv, index, ptr);
-				if(!arg_store(argv0, desc + i, arg, TRUE))
-					return 0;
-				break;
-			}
-		}
-		else
-		{
-			fprintf(stderr, "%s: Unknown option -%c; try -h or --help for usage info\n", argv0, *ptr);
-			return 0;
-		}
-	}
-	return 1;
-}
-
-/* Handle a single --long option. */
-static gint handle_long_option(gchar **argv, gint index, OptDesc *desc, gsize num_desc, guint32 *flags)
-{
-	gchar		*opt = argvindex + 2, *ptr;
-	const gchar	*arg = NULL;
-	gsize		i;
-
-	/* If there's an equals sign, remove it so option is recognizable. */
-	if((ptr = strchr(opt, '=')) != NULL)
-	{
-		*ptr = '\0';
-		arg  = ptr + 1;
-		if(*arg == '\0')
-		{
-			fprintf(stderr, "%s: Missing value after = in %s\n", argv0, argvindex);
-			return 0;
-		}
-	}
-	for(i = 0; i < num_desc; i++)
-	{
-		if(desci.name_long && strcmp(opt, desci.name_long) == 0)
-		{
-			if(desci.arg_mode)
-			{
-				arg = arg ? arg : get_next_nonoption_word(argv, index);
-				if(!arg_store(argv0, desc + i, arg, FALSE))
-					return 0;
-			}
-			else if(arg != NULL)
-				fprintf(stderr, "%s: Superfluous argument to option --%s: \"%s\"", argv0, desci.name_long, arg);
-			*flags |= desci.flag;
-			return 1;
-		}
-	}
-	fprintf(stderr, "%s: Unknown option '--%s'; try -h or --help for usage info\n", argv0, opt);
-	return 0;
-}
-
-/* Parse command line options, as described by <argc> and <argv>, using information in
-** <desc>. Returns mask of seen flags, and also modifies <desc>->arg members by filling
-** in option arguments when encountered. On error, <argc> will be set to something < 0.
-*/
-guint32 opt_parse(gint *argc, gchar **argv, OptDesc *desc, gsize num_desc)
-{
-	guint32	flags = 0U;
-	gint	i, ok, index;
-
-	/* First check for "-h" or "--help", and handle them specially. */
-	for(i = 1; argvi != NULL; i++)
-	{
-		if(strcmp(argvi, "--") == 0)
-			break;
-		if(strcmp(argvi, "-h") == 0 || strcmp(argvi, "--help") == 0)
-		{
-			show_usage(desc, num_desc);
-			*argc = -1;
-			return 0U;
-		}
-	}
-	/* Now handle all option-looking arguments. */
-	for(ok = 1; ok && (index = argv_find_option(argv)) > 0;)
-	{
-		if(argvindex1 != '-')
-			ok = handle_short_options(argv, index, desc, num_desc, &flags);
-		else
-			ok = handle_long_option(argv, index, desc, num_desc, &flags);
-		argv_delete(argv, index);
-	}
-	/* Finally, clean up the argv vector and adjust the length. */
-	for(i = 1; argvi != NULL;)
-	{
-		if(strcmp(argvi, "--") == 0)
-			argv_delete(argv, i);
-		else
-			i++;
-	}
-	*argc = ok ? i : -2;
-
-	return flags;
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* Return the argument for option <name>, if found. If <name> is single-character, it's
-** interpreted as a short name; otherwise it's long. No leading hyphens, please.
-*/
-gconstpointer opt_arg_get(const gchar *name, const OptDesc *desc, gsize num_desc)
-{
-	gsize	i;
-
-	if(name == NULL)
-		return NULL;
-
-	for(i = 0; i < num_desc; i++)
-	{
-		if((name1 == '\0' && desci.name_short == name0) || strcmp(name, desci.name_long) == 0)
-			return desci.arg;
-	}
-	fprintf(stderr, "opt_arg_get() called with unknown option \"%s\"\n", name);
-	return NULL;
-}

gentoo-0.15.6.tar.bz2/src/options.h Deleted

gentoo-0.15.6.tar.bz2/ChangeLog -> gentoo-0.19.9.tar.gz/ChangeLog Changed

@@ -1,35 +1,3 @@
 (This file is largely ignored, it's just included because it has to
 be, to comply with autoconf's expectations. See NEWS for actual info
-on changes   /Emil)
-
-2008-07-09  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* m4/codeset.m4: Upgrade to gettext-0.16.1.
-	* m4/glibc2.m4: New file, from gettext-0.16.1.
-	* m4/glibc21.m4: Upgrade to gettext-0.16.1.
-	* m4/intdiv0.m4: Upgrade to gettext-0.16.1.
-	* m4/intl.m4: New file, from gettext-0.16.1.
-	* m4/intldir.m4: New file, from gettext-0.16.1.
-	* m4/intmax.m4: New file, from gettext-0.16.1.
-	* m4/inttypes_h.m4: Upgrade to gettext-0.16.1.
-	* m4/inttypes-pri.m4: Upgrade to gettext-0.16.1.
-	* m4/lcmessage.m4: Upgrade to gettext-0.16.1.
-	* m4/lock.m4: New file, from gettext-0.16.1.
-	* m4/longdouble.m4: New file, from gettext-0.16.1.
-	* m4/longlong.m4: New file, from gettext-0.16.1.
-	* m4/printf-posix.m4: New file, from gettext-0.16.1.
-	* m4/size_max.m4: New file, from gettext-0.16.1.
-	* m4/stdint_h.m4: Upgrade to gettext-0.16.1.
-	* m4/uintmax_t.m4: Upgrade to gettext-0.16.1.
-	* m4/ulonglong.m4: Upgrade to gettext-0.16.1.
-	* m4/visibility.m4: New file, from gettext-0.16.1.
-	* m4/wchar_t.m4: New file, from gettext-0.16.1.
-	* m4/wint_t.m4: New file, from gettext-0.16.1.
-	* m4/xsize.m4: New file, from gettext-0.16.1.
-	* m4/Makefile.am (EXTRA_DIST): Add the new files.
-	* Makefile.am (SUBDIRS): Add intl.
-	* configure.in (AC_OUTPUT): Add intl/Makefile.
-2001-04-30  Emil Brink <emil@obsession.se>
-	* Incorporated autoconf/automake patch from Andreas Kloeckner
-2001-04-29  Andreas Kloeckner  <ak@ixion.net>
-	* added autoconf/automake support
+on changes. /Emil)

gentoo-0.15.6.tar.bz2/Makefile.am -> gentoo-0.19.9.tar.gz/Makefile.am Changed

gentoo-0.15.6.tar.bz2/Makefile.in -> gentoo-0.19.9.tar.gz/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -68,6 +70,7 @@
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = gentoorc gentoogtkrc gentoo.spec intl/Makefile
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -82,12 +85,29 @@
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
+  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
+    if (++n$$2 == $(am__install_max)) \
+      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
+    END { for (dir in files) print dir, filesdir }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(sysconfdir)"
-sysconfDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(sysconf_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -95,9 +115,34 @@
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$^/*$/.*$$,\1,'; \
+  sed_rest='s,^^/*/*,,'; \
+  sed_last='s,^.*/$^/*$$$,\1,'; \
+  sed_butlast='s,/*^/*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
@@ -176,6 +221,8 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+MODULES_CFLAGS = @MODULES_CFLAGS@
+MODULES_LIBS = @MODULES_LIBS@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -185,9 +232,12 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 RANLIB = @RANLIB@
@@ -267,15 +317,15 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -291,9 +341,10 @@
 	$(SHELL) ./config.status --recheck
 
 $(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
 
 config.h: stamp-h1
 	@if test ! -f $@; then \
@@ -305,7 +356,7 @@
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
 $(srcdir)/config.h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
 
@@ -322,20 +373,23 @@
 install-sysconfDATA: $(sysconf_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
-	@list='$(sysconf_DATA)'; for p in $$list; do \
+	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
-	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
 	done
 
 uninstall-sysconfDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(sysconf_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
-	done
+	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(sysconfdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(sysconfdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -344,7 +398,7 @@
 #     (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):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --!k*);; \
@@ -361,7 +415,7 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -369,7 +423,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --!k*);; \
@@ -395,16 +449,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -419,7 +473,7 @@
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -431,7 +485,7 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
@@ -440,36 +494,41 @@
 	  done | \
 	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(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; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -485,29 +544,44 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -515,11 +589,13 @@
 	$(MAKE) $(AM_MAKEFLAGS) \
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
+	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
@@ -532,6 +608,10 @@
 	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
 	$(am__remove_distdir)
 
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -555,15 +635,17 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
@@ -571,9 +653,11 @@
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^^:\\/:\\/,/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    --with-included-gettext \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
@@ -596,13 +680,15 @@
 	  && rm -rf "$$dc_destdir" \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
+	@$(am__cd) '$(distuninstallcheck_dir)' \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
@@ -647,6 +733,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -666,6 +753,8 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -674,18 +763,28 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am: install-sysconfDATA
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -708,24 +807,24 @@
 
 uninstall-am: uninstall-sysconfDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+	ctags-recursive install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \
-	distclean distclean-generic distclean-hdr distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip install-sysconfDATA \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-sysconfDATA
+	dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-generic distclean-hdr \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	install-sysconfDATA installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am uninstall-sysconfDATA
 
 
 # Get my personal config, and massage it into a gentoorc.in template. This should
@@ -738,6 +837,7 @@
 	    -e 's/<defpath>\"-0-9.a-zA-Z_~/*\"<\/defpath>/<defpath>"~"<\/defpath>/' \
 	    -e 's/<w>$8-90-9*$/<w>800/' \
 	    -e 's/<h>$6-90-9*$/<h>600/' \
+	    -e 's/<ignore>$"a-z-*"$<\/ignore>//' \
 	    < ~/.gentoorc >gentoorc.in
 
 #
@@ -745,6 +845,7 @@
 #
 dist-hook:
 	find $(top_distdir) -name .svn -type d | xargs rm -rf
+
 # 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:

gentoo-0.15.6.tar.bz2/NEWS -> gentoo-0.19.9.tar.gz/NEWS Changed

@@ -1,129 +1,157 @@
 This file documents additions, changes, and fixes made to gentoo.
 	Entries are grouped by the version of gentoo they apply to.
 The most recent fixes appear closer to the top of the file.
-	Entries for older versions of gentoo (the 0.11.x and 0.9.x
-series) have been dropped from the distribution.
-
-0.15.6
-* Resurrected the --locale-info command-line option, which seems to
-  have been lost in translation, from gentoo 0.11.x. While I was at
-  it, I added a couple of more lines of information to it.
-* Redid much of how the tracking and handling of the pane split was
-  done. It now works properly with a vertical split mode, which it
-  certainly didn't do before bug #2803149.
-* Made the default pane split mode, if no config is present, lock
-  the ratio at 50%. Should make new users less frightened. :)
-* Made the default settings for the Configuration and Text Viewer
-  windows leave the positions alone. Trust the window manager.
-* Touched up the error handling in the ChOwn command, hoping to make
-  it work more, and fail less.
-* Fixed a couple of bugs in the Types configuration code, that caused
-  it to act a bit randomly. If you saw empty-named Types, this might
-  have been the reason bug #2816423?.
-
-
-0.15.5
-* Removed use of the dreaded GtkCList widgets on the DirPane config
-  pages. Currently this also removed support for drag-and-drop in
-  the right (selected) list; I might fix that later on. For now,
-  just use the pretty arrow buttons below the list.
-* Bug-fix: the DpFocusISrch command, which was suffering from some
-  bad porting (to GTK+ 2.0) issues bug #2786313.
-* Bug-fix: the overwrite confirm dialog, which did not convert its
-  filenames to UTF-8 for display, and thus showed gibberish for any
-  names with non-ASCII characters in them.
-* Bug-fix: the textviewer also didn't convert filenames to UTF-8
-  before display, causing warnings from Pango (and gibberish).
-
-
-0.15.4
-* Fixed a bug that made the File Type configuration become totally
-  confused if you used arrow keys to step around in the list a few
-  times and then tried editing bug #2728738.
-* Removed yet another GtkCList, this time in the Styles config page's
-  Action part. The entire Action editing was totally remodelled and
-  modernized. It now uses in-place editing right in the list view,
-  and uses text styling (overridden properties are bold) for clarity.
-* Made the configure script require glib 2.14 or greater, for GRegex.
-* Fixed a bug #2716890 that caused gentoo to crash with a "memory
-  freed twice" error by just changing a pane's path.
-* Fixed a bug that caused sizes shown in e.g. the status bar to be
-  formatted with the wrong unit. KB and MB both showed up as GB.
-* Changed a couple of small helper buttons (the magnifying glass
-  meaning "pick from dialog" and the "Clr" button in the buttons
-  config) to use standard GTK+ 2.0 stock images instead. The glass is
-  now a pair of binoculars, the "Clr" is a ... uh ... paintbrush? 
-
-
-0.15.3
-* Rewrote the "Types" config page to no longer use GtkCList. It should
-  also be a bit quicker now. Drawback is that GtkTreeView uses about
-  10% more vertical space for the same number of rows. But you could
-  call that a "readability enhancement",too. :)
-* The obsolete GtkCList widgets on the Controls config page have been
-  replaced by the GTK+ 2.0 replacement, proper GtkTreeViews. This is
-  totally invisible to casual users. The widget used to pick a mouse
-  button when editing a mouse binding has also been upgraded.
-* GtkCList widgets on the Commands/Definitions config page have also
-  been replaced with GTK+ 2.0-flavored replacements. Slightly better
-  direct-manipulation support: use drag-and-drop to reorder the "rows"
-  of a command definition instead of the old up/down arrow buttons.
-* Added "Window Borders" frame on the Windows config page. This lets
-  you tell gentoo how to compensate for your window manager's border
-  around windows. There is no way for GTK+ to know this, which is why
-  it is a user option.
-* Resurrected the position-tracking of windows on the Windows config
-  page. Thanks to the new "Borders" setting above, it is now far more
-  stable than before (assuming you have the proper border settings).
-* Plugged a memory leak in the command argument parser. Not sure how
-  frequently it leaked.
-* Plugged a memory leak in path entry handling, due to GTK+ 2.0 API
-  behaving differently from 1.2. 
-* Minor improvements on the Styles config page. It now expands the
-  parent style when adding a new style, should be less confusing.
-* The ChMod command now shows textual (a string like "-rw-r--r--")
-  and octal representations of the current modes. These are currently
-  read-only, included for reference, you cannot edit them directly.
-* The Configure window no longer has a hardcoded "good" height set;
-  it was unnecessary and messed up GTK+'s handling of resizing.
-* Properly register most (all?) dialogs and popups (including the
-  text reader and config windows) as "transients" of the main
-  window, which groups them when minimizing and so on.
-* Fixed a bug that caused glib to spew out massive amounts of signal-
-  related warnings if you enabled a 'Huge Parent Button' and then
-  moved the main window.
-
-
-0.15.2
-* Rewrote guts of "file"-driven file type identification to use glib's
-  process spawning API. No longer uses a temporary file, but simply uses
-  pipes instead. This removes a potential security hole (in temporary
-  file name generation) and should also be quicker.
-* The code that runs "file" to identify file types now also catches the
-  SIGPIPE signal, and checks for bad pipes when writing to the child
-  process. This should hopefully help prevent gentoo from crashing if
-  the "file" program exits prematurely (or doesn't exist).
-* All calls to the obsolete gtk_signal_connect() function have been
-  replaced with the g_signal_connect() function. Feels a bit fresher.
-
-
-0.15.1 first release using GTK+ 2.x
-* Integrated new OdMultiButton widget.
-* Ported command selection dialog (seen in Run command and when
-  picking in config) to GTK+ 2.0 tree widget.
-* Removed main (left) GtkCList in Configuration window, replaced
-  with proper GTK+ 2.0 tree widget.
-* SelectSuffix now acts a bit like SelectExt if there is no
-  current mouse click, no focus, and at least one selected row. It
-  will only process the first selected row though.
-* Added a "Upper Case Initial" mode to RenameRE's Case page, that
-  is not in gentoo 0.11.x.
-* This release does not include the mmap buffer size setting added
-  in gentoo 0.11.x; it seems to work just fine without it.
-* Fixed very secretive bug that caused seemingly spurious "error 34"
-  when entering a directory. This was caused by overflow in the
-  numerical-comparison routines, trying to strtol() very long runs
-  of digits. Fixed by implementing a comparison that does not
-  convert to binary. Reported by "Trilobit", thanks a lot!
-* Applied lots of other safeguards against spurious errors from the
-  same Trilobit.
+	Entries for older versions of gentoo (the 0.15.x, 0.11.x
+and 0.9.x series) have been dropped from this document.
+
+0.19.9
+* Bug fix: the introduction of rename in-place in 0.19.8 managed to
+  break double-click on directory and file names. Oops.
+* Made gentoo's configure.in script explicitly require a more recent
+  version of GTK+, to match the code. You need 2.18 or higher.
+* Added translations into Catalan (ca.po) and Spanish (es.po), from
+  (and by) Innocent De Marchi. Thanks a lot!
+* Added a previously forgotten string (the check button text of the
+  "nag" dialog that warns for some issues) translatable. Reported
+  as missing from the PO files by Mr De Marchi. 
+* Incorporated a couple of spelling fixes to the German translation,
+  by Jens Seidel, sent in my Mr De Marchi. Thanks.
+* Fixed a few markup bugs in the manual page, reported by the ever-
+  vigilant Debian folks (again, through Mr De Marchi).
+
+
+0.19.8
+* Bug fix: gentoo sometimes failed to rescan directories in response
+  to change notifications from the GIO file-monitoring system. One
+  easily-triggered failure occurred when moving a file from the left
+  to the right pane; only the left would rescan.
+* Added a helpful dialog to the Split command that shows the various
+  codes available in the Name text entry box.
+* Added an option to the Rename command to make it support renaming
+  "in-place", i.e. by just editing the name directly in the pane.
+  This only works if there is exactly one selected item when Rename
+  is called.
+* Made the various sizes for command options display without useless
+  ".000" decimal part.
+* Fixed a bug that made some combo box labels not appear translated.
+* Fixes and improvements in the Swedish translation.
+
+
+0.19.7
+* The Split command was massively improved, now features a real-time
+  preview that shows the first and last names that will be generated.
+* Made error display a bit more flexible; now you can select that
+  all error (and status) messages be shown in the main window's
+  title bar, which suppresses the status bar altogether and thus will
+  let you save some vertical space. This addresses bug #3121230.
+* Improved window icon-setting, trying to make even more sure that all
+  gentoo windows have the same icon. Specifically, this makes the
+  command output capture window have an icon. See bug #3128013.
+* Moved the "CD Source?" and "CD Destination?" check boxes so they are
+  next to each other, saving some vertical space in the Commands config.
+* Re-implement "CD Source?" and "CD Destination?" using glib's spawn
+  API, but only for local paths. This addresses bug #3124829.
+* Bug fix: the RenameSeq command's UI code was a bit broken which
+  caused it to generate GTK+ warnings on the console.
+* Bug fix: the GetSize command's error handling was a bit shaky, it
+  often failed to properly report what went wrong.
+* The configuration window can now be shrunk to a lot smaller size than
+  before, and the right-hand side content will scroll as needed. This
+  addresses bug #3121235.
+* The "Nagging" configuration page was not hooked up to the gettext
+  system so it was untranslatable. Fixed, and translated to Swedish.
+
+
+0.19.6
+* Fixed a bug that caused position and size numbers to track badly on
+  the Window configuration page; especially typing values in went bad.
+* Add explicit GTK+ geometry hinting code to ensure that it's possible
+  to shrink the main window down to a very small (postage stamp) size.
+* Bug fix: the "Link Clone" command was broken, and generated a GIO
+  error to the console when used.
+* Bug fix: made the SymLinkEdit command behave properly if called with
+  no selection (it opens a dialog, letting you create a new link).
+* The ChOwn and ChMod commands now do an explicit refresh of the source
+  directory pane, since they failed to refresh automatically. This
+  addresses bug #3097322.
+* Converted a bunch of old constants from #defines into enums. Fresh.
+* Reworked handling of symbolic links, they should now work a whole
+  lot better (more like 0.15.x series). Links now behave more like their
+  targets when it comes to styling, sorting and so on.
+* The Information command shows a "yes" (green circle) or "no" (red)
+  icon next to the text box that holds the link target name, indicating
+  whether or not the target exists or not.
+
+
+0.19.5
+* Tweaked the command button layout a bit, so that buttons can now be
+  more narrow. See bug #3101048.
+* Fixed a bug that disabled the button row edit buttons, and made
+  them behave a bit erratically.
+* Fixed a bug that made it impossible to edit the "General" flags for
+  External-type command rows in the GUI.
+
+
+0.19.4
+* Replaced gentoo's custom command line parser with the one provided
+  by the glib library. This means much better support for help on the
+  options, and also for sub-group options for GTK+ itself.
+* Added support for the "changed" time content type. See for instance
+  man stat(2) for information about the differences between "changed"
+  and "modified", which are somewhat subtle. Also note that "created"
+  doesn't seem to work on regular EXT3 filesystems in Linux.
+* Implemented support for setting the font of the dir panes, with GUI
+  font picker and all. Maybe a bit late, but better late than never.
+* When expanding the {P} command code, hide any "file://" prefix that
+  might be present, since they confuse typical shell commands.
+
+
+0.19.3
+* A few build improvements that should make it easier to either figure
+  out why gentoo won't build, or simply make it work. Check for glib
+  version 2.24 or greater; check if -lm needed to find pow() function.
+* Remove use of GtkNotebookPage, helps building on GTK+ 2.22+.
+* Rewrote dirpane formatting for date (accessed, created, modified)
+  content, since it was completely broken. See Bug #3085097.
+* Translations actually work now, a very silly typo in the code had
+  accidentally disabled the gettext initialization code.
+* Added a few strings to the Swedish translation.
+
+
+0.19.2
+* Removed the "right click on path" command binding, since it didn't
+  actually work and I had forgotten it existed. Let's un-bloat a bit.
+* Added a DpMaximize builtin, which simply maximizes the current pane
+  (or the one given with the index=N argument).
+* Removed some uses of old GTK_WIDGET macros that have been finally
+  removed in GTK+ 2.20.0, preventing gentoo 0.19.1 from building.
+* The manual page (in docs/gentoo.1x in the source archive) is now
+  more correct regarding gentoo's command-line options.
+
+
+0.19.1
+* Ported gentoo to use GIO, a virtualizing file system layer that
+  is part of the GTK+/glib family of APIs. Note that there is no
+  mounting support in this release, mounting and auto-mounting are
+  in need of an overhaul, and there didn't seem to be any point in
+  keeping the legacy /etc/fstab-driven support.
+* gentoo is now totally GTK+ 2.x clean, there are no GTK+ 1.2 widgets
+  being used. This means the main panes are now GtkTreeViews.
+* Because of the port to GIO, case-sensitive sorting is weaker now.
+* Block sizes for files have been deemed legacy, and support is
+  largely removed.
+* Double-clicking the status bar at the top opens the About window.
+* There are new strings, but the translators have not been contacted
+  prior to the release. If you run gentoo in a non-English langauge,
+  feel free to get in touch with me about translation issues. Maybe
+  you can help out?
+* The built-in text viewer has been made encoding-aware; see the new
+  ViewText 'encoding' argument to specify source encoding. Note that
+  gentoo does not contain code to auto-detect encoding; that's hard.
+* The Information command has gained a secondary page, that shows all
+  GIO properties for the selected file.
+* There is a new Rerun command which re-runs the last command executed
+  by the Run command.
+* The Split command finally has had its missing other mode (fixed
+  number of parts) implemented, after ~12 years without it. The
+  other mode has also gained a few more built-in part sizes.

gentoo-0.15.6.tar.bz2/README -> gentoo-0.19.9.tar.gz/README Changed

@@ -1,7 +1,7 @@
-							2009-07-11
+							2011-01-29
 							Emil Brink
 
-		    gentoo v0.15.6
+		    gentoo v0.19.9
 
 INTRODUCTION
 gentoo is a graphical file management program, written from
@@ -22,7 +22,7 @@
 
 
 LICENSING
-This software is Copyright (c) 1998-2009 by Emil Brink.
+This software is Copyright (c) 1998-2010 by Emil Brink.
 	You are free to distribute this software under the terms
 of the GNU General Public License, version 2. You should have
 received a copy of this license together with the software (in a
@@ -36,11 +36,7 @@
 gentoo was written by Emil Brink. It is my first program to use
 GTK+, my first major Linux application, and my first program
 released in source form under the GPL, but it's absolutely _not_
-my first program. ;^) I've been hacking since the late eighties,
-and am currently a studying for a Master of Science in computer
-science at the Royal Institute of Technology ("RIoT") here in
-Stockholm, Sweden. I now seem to have graduated, and even managed
-to land a great job. Whee.
+my first program. ;^)
 	Work on gentoo started in May 1998, when I decided it
 would be fun to learn the GTK+ interface toolkit. The first
 actual release of gentoo was called version 0.9.0, and made
@@ -52,27 +48,32 @@
 
 
 RELEASE NOTES
-This is a minor bugfix release. The pane split should work much
-better in vertical mode now. A couple of bugs in the type config
-were squashed. The ChOwn command should work better when applied
-recursively.
+Horrible bug that prevented double-click on the Name column from
+doing was fixed. Also some random translation love, with two new
+languages supported.
+	See the NEWS file for many more details. Thanks to all
+users who have provided feedback and bug reports on the Source-
+Forge tracker, it's very much appreciated.
 
 
 FOR INTERNATIONAL USERS
-There have been some changes to gentoo's strings, which means that the
-translations made for 0.11.x are not necessarily accurate for 0.15.x.
-This means that the only two languages recommeded for use right now
-are English, which is built-in, and Swedish, which is translated by me
-and kept up to date.
+There have been a few new strings introduced since the last release,
+which means many translations are broken or at least out of date. My
+apologies for this. It's not possible to do coordinated translations
+prior to releases for gentoo, it's simply not predicatble enough when
+there is going to be a release to ask translators to commit.
+	This means that the only two languages recommeded for use right
+now are English, which is built-in, and Swedish, which is translated by
+me and kept up to date.
 	Feel free to contact the translators, or perhaps pick up the
-gauntlet yourself, it's not very hard.
+gauntlet yourself, it's not exactly hard work.
 
 
 FOR MORE INFORMATION...
 * If you are a new user, *please* read the man page.
 * Instructions about how to build an executable are provided in
   the file INSTALL, as usual.
-* For (sometimes very technical and source-centric) notes on
+* For (sometimes very technical and code-centric) notes on
   exactly what's happened in this release, check out the NEWS
   file. I recommend reading it on each new release.
 * Details about gentoo's support for GUI customization through

gentoo-0.15.6.tar.bz2/TODO -> gentoo-0.19.9.tar.gz/TODO Changed

@@ -1,4 +1,4 @@
-							2002-07-31
+							2010-10-03
 
 							Emil Brink
 
@@ -24,28 +24,7 @@
 1. IDEAS
 Here are the ideas, presented in one subsection each. Enjoy!
 
-1.1 Virtualize the File Access
-I have an initial implementation of a file system abstraction
-layer, which allows neaty stuff like viewing the contents of
-an archive as a directory, or using gentoo to get and put files
-on an FTP site. The code I've written is based on a URL-like
-access scheme, where individual access-schemes (ftp, tgz etc)
-cause plug-ins to be dynamically loaded to handle the access.
-	Integrating such a system with gentoo is quite a big
-task though, and I've been putting it off for almost a year
-now... I'm also afraid that implementing virtualized file
-access will slow the program down for local accesses. Further,
-I think some commands might need to be rewritten, and have
-some "intelligence" added that makes them avoid running on
-certain access schemes (doing a GetSize on a remote FTP site
-might take a while and be difficult to abort, for example).
-	On second (or third) thought, it seems like a waste of
-work to re-invent a virtual file system layer. I briefly looked
-at the one used in GNOME Midnight Commander, but had problems
-understanding it. :) That typically triggers my "rewrite it!"-
-instincts, but I suppressed them.
-
-1.2 Write a Menu Editor
+1.1 Write a Menu Editor
 The buttons used in the button bank below the panes support
 individual pop-up menus; but there is currently no way of
 defining and attaching menus to them. Writing a fully-fledged
@@ -68,14 +47,14 @@
 	though... I find I have conceptual problems with de-
 	ciding on just what a menu really *is*. Weird, huh?
 
-1.3 Generalize Buttons
+1.2 Generalize Buttons
 The command buttons displayed under the panes are very general
 internally, where they are represented as a specific "sheet"
 of buttons. I plan to add ways to add and delete button sheets,
 and also lay out the sheets in the window. The layout interface
 is what's currently holding this off.
 
-1.4 Drag and Drop
+1.3 Drag and Drop
 This is perhaps the #1 requested feature, and it's still not
 there. This is because of several things. One is that I'm not
 at all sure how it should work. Should gentoo support DnD only

gentoo-0.15.6.tar.bz2/aclocal.m4 -> gentoo-0.19.9.tar.gz/aclocal.m4 Changed

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file 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.
@@ -13,8 +13,8 @@
 
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.63,,
-m4_warning(this file was generated for autoconf 2.63.
+m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.67,,
+m4_warning(this file was generated for autoconf 2.67.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.))
@@ -114,9 +114,8 @@
 {
   int major, minor, micro;
   char *tmp_version;
-  int ignored;
 
-  ignored = system ("touch conf.glibtest");
+  fclose (fopen ("conf.glibtest", "w"));
 
   /* HP/UX 9 (%@#!) writes to sscanf strings */
   tmp_version = g_strdup("$min_glib_version");
@@ -319,7 +318,7 @@
   int major, minor, micro;
   char *tmp_version;
 
-  system ("touch conf.gtktest");
+  fclose (fopen ("conf.gtktest", "w"));
 
   /* HP/UX 9 (%@#!) writes to sscanf strings */
   tmp_version = g_strdup("$min_gtk_version");
@@ -430,6 +429,7 @@
 )
 
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
 # 
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #
@@ -457,7 +457,10 @@
 AC_DEFUN(PKG_PROG_PKG_CONFIG,
 m4_pattern_forbid(^_?PKG_A-Z_+$)
 m4_pattern_allow(^PKG_CONFIG(_PATH)?$)
-AC_ARG_VAR(PKG_CONFIG, path to pkg-config utility)dnl
+AC_ARG_VAR(PKG_CONFIG, path to pkg-config utility)
+AC_ARG_VAR(PKG_CONFIG_PATH, directories to add to pkg-config's search path)
+AC_ARG_VAR(PKG_CONFIG_LIBDIR, path overriding pkg-config's built-in search path)
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	AC_PATH_TOOL(PKG_CONFIG, pkg-config)
 fi
@@ -470,7 +473,6 @@
 		AC_MSG_RESULT(no)
 		PKG_CONFIG=""
 	fi
-		
 fidnl
 )# PKG_PROG_PKG_CONFIG
 
@@ -479,34 +481,31 @@
 # Check to see whether a particular set of modules exists.  Similar
 # to PKG_CHECK_MODULES(), but does not set variables or print errors.
 #
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
+# Please remember that m4 expands AC_REQUIRE(PKG_PROG_PKG_CONFIG)
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
 # --------------------------------------------------------------
 AC_DEFUN(PKG_CHECK_EXISTS,
 AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
 if test -n "$PKG_CONFIG" && \
     AC_RUN_LOG($PKG_CONFIG --exists --print-errors "$1"); then
-  m4_ifval($2, $2, :)
+  m4_default($2, :)
 m4_ifvaln($3, else
   $3)dnl
 fi)
 
-
 # _PKG_CONFIG(VARIABLE, COMMAND, MODULES)
 # ---------------------------------------------
 m4_define(_PKG_CONFIG,
-if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_$1="$$1"
-    else
-        PKG_CHECK_EXISTS($3,
-                         pkg_cv_$1=`$PKG_CONFIG --$2 "$3" 2>/dev/null`,
-			 pkg_failed=yes)
-    fi
-else
-	pkg_failed=untried
+if test -n "$$1"; then
+    pkg_cv_$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS($3,
+                     pkg_cv_$1=`$PKG_CONFIG --$2 "$3" 2>/dev/null`,
+		     pkg_failed=yes)
+ else
+    pkg_failed=untried
 fidnl
 )# _PKG_CONFIG
 
@@ -548,16 +547,17 @@
 See the pkg-config man page for more details.)
 
 if test $pkg_failed = yes; then
+   	AC_MSG_RESULT(no)
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+	        $1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
         else 
-	        $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+	        $1_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-	ifelse($4, , AC_MSG_ERROR(dnl
+	m4_default($4, AC_MSG_ERROR(
 Package requirements ($2) were not met:
 
 $$1_PKG_ERRORS
@@ -565,25 +565,24 @@
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT
-),
-		AC_MSG_RESULT(no)
-                $4)
+_PKG_TEXT)dnl
+        )
 elif test $pkg_failed = untried; then
-	ifelse($4, , AC_MSG_FAILURE(dnl
+     	AC_MSG_RESULT(no)
+	m4_default($4, AC_MSG_FAILURE(
 The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.),
-		$4)
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.)dnl
+        )
 else
 	$1_CFLAGS=$pkg_cv_$1_CFLAGS
 	$1_LIBS=$pkg_cv_$1_LIBS
         AC_MSG_RESULT(yes)
-	ifelse($3, , :, $3)
+	$3
 fidnl
 )# PKG_CHECK_MODULES
 
@@ -599,10 +598,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN(AM_AUTOMAKE_VERSION,
-am__api_version='1.10'
+am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if($1, 1.10.2, ,
+m4_if($1, 1.11.1, ,
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -618,7 +617,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION,
-AM_AUTOMAKE_VERSION(1.10.2)dnl
+AM_AUTOMAKE_VERSION(1.11.1)dnl
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
 _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
@@ -678,14 +677,14 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
 # Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 8
+# serial 9
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -698,6 +697,7 @@
 AC_SUBST($1_FALSE)dnl
 _AM_SUBST_NOTMAKE($1_TRUE)dnl
 _AM_SUBST_NOTMAKE($1_FALSE)dnl
+m4_define(_AM_COND_VALUE_$1, $2)dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -711,14 +711,14 @@
 Usually this means the macro was only invoked conditionally.)
 fi))
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
 # Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 9
+# serial 10
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -775,6 +775,16 @@
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*$a-zA-Z0-9*$)$/\1/p' < ./depcomp`
   fi
+  am__universal=false
+  m4_case($1, CC,
+    case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac,
+    CXX,
+    case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac)
+
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
     # like to wrap large dependency lists on column 80 (with \), and
@@ -792,7 +802,17 @@
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
     case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -802,19 +822,23 @@
 	break
       fi
       ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
     none) break ;;
     esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
          >/dev/null 2>conftest.err &&
        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
@@ -964,13 +988,13 @@
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 13
+# serial 16
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -987,7 +1011,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN(AM_INIT_AUTOMAKE,
-AC_PREREQ(2.60)dnl
+AC_PREREQ(2.62)dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow(^AM_A-Z+FLAGS$)dnl
@@ -1038,8 +1062,8 @@
 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
+AC_REQUIRE(AM_PROG_INSTALL_SH)dnl
+AC_REQUIRE(AM_PROG_INSTALL_STRIP)dnl
 AC_REQUIRE(AM_PROG_MKDIR_P)dnl
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -1047,24 +1071,37 @@
 AC_REQUIRE(AC_PROG_MAKE_SET)dnl
 AC_REQUIRE(AM_SET_LEADING_DOT)dnl
 _AM_IF_OPTION(tar-ustar, _AM_PROG_TAR(ustar),
-              _AM_IF_OPTION(tar-pax, _AM_PROG_TAR(pax),
-	      		     _AM_PROG_TAR(v7)))
+	      _AM_IF_OPTION(tar-pax, _AM_PROG_TAR(pax),
+			     _AM_PROG_TAR(v7)))
 _AM_IF_OPTION(no-dependencies,,
 AC_PROVIDE_IFELSE(AC_PROG_CC,
-                  _AM_DEPENDENCIES(CC),
-                  define(AC_PROG_CC,
-                          defn(AC_PROG_CC)_AM_DEPENDENCIES(CC)))dnl
+		  _AM_DEPENDENCIES(CC),
+		  define(AC_PROG_CC,
+			  defn(AC_PROG_CC)_AM_DEPENDENCIES(CC)))dnl
 AC_PROVIDE_IFELSE(AC_PROG_CXX,
-                  _AM_DEPENDENCIES(CXX),
-                  define(AC_PROG_CXX,
-                          defn(AC_PROG_CXX)_AM_DEPENDENCIES(CXX)))dnl
+		  _AM_DEPENDENCIES(CXX),
+		  define(AC_PROG_CXX,
+			  defn(AC_PROG_CXX)_AM_DEPENDENCIES(CXX)))dnl
 AC_PROVIDE_IFELSE(AC_PROG_OBJC,
-                  _AM_DEPENDENCIES(OBJC),
-                  define(AC_PROG_OBJC,
-                          defn(AC_PROG_OBJC)_AM_DEPENDENCIES(OBJC)))dnl
+		  _AM_DEPENDENCIES(OBJC),
+		  define(AC_PROG_OBJC,
+			  defn(AC_PROG_OBJC)_AM_DEPENDENCIES(OBJC)))dnl
 )
+_AM_IF_OPTION(silent-rules, AC_REQUIRE(AM_SILENT_RULES))dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+m4_provide_if(_AM_COMPILER_EXEEXT,
+  AM_CONDITIONAL(am__EXEEXT, test -n "$EXEEXT")))dnl
 )
 
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define(_AC_COMPILER_EXEEXT,
+m4_defn(_AC_COMPILER_EXEEXT)m4_provide(_AM_COMPILER_EXEEXT))
+
 
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
@@ -1087,7 +1124,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME("$_am_arg")`/stamp-h$_am_stamp_count)
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1098,7 +1135,14 @@
 # Define $install_sh.
 AC_DEFUN(AM_PROG_INSTALL_SH,
 AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
 AC_SUBST(install_sh))
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -1124,13 +1168,13 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 3
+# serial 4
 
 # AM_MAKE_INCLUDE()
 # -----------------
@@ -1139,7 +1183,7 @@
 am_make=${MAKE-make}
 cat > confinc << 'END'
 am__doit:
-	@echo done
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
@@ -1149,24 +1193,24 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
 # Now try BSD make style include.
 if test "$am__include" = "#"; then
    echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
 fi
 AC_SUBST(am__include)
 AC_SUBST(am__quote)
@@ -1176,14 +1220,14 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 5
+# serial 6
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -1200,7 +1244,14 @@
 AC_DEFUN(AM_MISSING_HAS_RUN,
 AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
 AC_REQUIRE_AUX_FILE(missing)dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
@@ -1271,14 +1322,14 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 4
+# serial 5
 
 # AM_SANITY_CHECK
 # ---------------
@@ -1287,16 +1338,29 @@
 # Just in case
 sleep 1
 echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *\\\"\#\$\&\'\`$am_lf*)
+    AC_MSG_ERROR(unsafe absolute working directory name);;
+esac
+case $srcdir in
+  *\\\"\#\$\&\'\`$am_lf\ \	*)
+    AC_MSG_ERROR(unsafe srcdir value: `$srcdir');;
+esac
+
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
    if test "$*" = "X"; then
       # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
+      set X `ls -t "$srcdir/configure" conftest.file`
    fi
    rm -f conftest.file
    if test "$*" != "X $srcdir/configure conftest.file" \
@@ -1349,18 +1413,25 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST(INSTALL_STRIP_PROGRAM))
 
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
 #
 # This file 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.
 
+# serial 2
+
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN(_AM_SUBST_NOTMAKE)
 
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN(AM_SUBST_NOTMAKE, _AM_SUBST_NOTMAKE($@))
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.

gentoo-0.15.6.tar.bz2/config.h.in -> gentoo-0.19.9.tar.gz/config.h.in Changed

@@ -15,17 +15,11 @@
    language is requested. */
 #undef ENABLE_NLS
 
-/* Major version. */
-#undef GENTOO_MAJOR_VERSION
+/* Makes GTK+ disable old 1.0.6 compatibility. */
+#undef GTK_DISABLE_COMPAT_H
 
-/* Minor version. */
-#undef GENTOO_MICRO_VERSION
-
-/* Minor version. */
-#undef GENTOO_MINOR_VERSION
-
-/* "Makes GTK+ bring in obsolete/broken widgets such as GtkTree */
-#undef GTK_ENABLE_BROKEN
+/* Makes GTK+ disable all backward support for old widgets and API:s. */
+#undef GTK_DISABLE_DEPRECATED
 
 /* Define to 1 if you have `alloca', as a function or macro. */
 #undef HAVE_ALLOCA
@@ -84,9 +78,6 @@
    don't. */
 #undef HAVE_DECL__SNWPRINTF
 
-/* Whether the host supports SGI's FAM technology. */
-#undef HAVE_FAM
-
 /* Define to 1 if you have the `fwprintf' function. */
 #undef HAVE_FWPRINTF
 
@@ -133,6 +124,9 @@
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 #undef HAVE_LC_MESSAGES
 
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
@@ -207,12 +201,6 @@
 /* Define to 1 if you have the `strtoul' function. */
 #undef HAVE_STRTOUL
 
-/* Whether host supports <sys/statfs.h> and struct statfs. */
-#undef HAVE_STRUCT_STATFS
-
-/* Whether host supports <sys/statvfs.h> and struct statvfs. */
-#undef HAVE_STRUCT_STATVFS
-
 /* Define to 1 if you have the <sys/param.h> header file. */
 #undef HAVE_SYS_PARAM_H
 
@@ -271,6 +259,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION

gentoo-0.15.6.tar.bz2/configure -> gentoo-0.19.9.tar.gz/configure Changed

@@ -1,18 +1,24 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63.
+# Generated by GNU Autoconf 2.67 for gentoo 0.19.9.
+#
+# Report bugs to <emil@obsession.se>.
+#
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -20,23 +26,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -44,7 +42,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -55,7 +59,7 @@
     as_echo_body='eval expr "X$1" : "X\$.*\$"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\$.*\$$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
@@ -78,13 +82,6 @@
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -94,15 +91,15 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
   *\\/* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -114,12 +111,16 @@
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -131,330 +132,300 @@
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
-if expr a : '$a$' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*$...$'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/$^/^/*$\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
 # CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
 else
-  as_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
-
-  if test $as_have_required = yes &&	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
 
 exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_have_required=no
 fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
 else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  case $as_dir in
+  as_found=:
+  case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
 	   done;;
        esac
+  as_found=false
 done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
 IFS=$as_save_IFS
 
 
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-	done
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
 	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and emil@obsession.se
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
+  fi
+  exit 1
 fi
-
-
 fi
-
 fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
 
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
 
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X$.*^/$//*^/^/*/*$' \| \
+	 X"$as_dir" : 'X$//$^/' \| \
+	 X"$as_dir" : 'X$//$$' \| \
+	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X$.*^/$\/\/*^/^/*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$^/.*/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
 
-exitcode=0
-if as_func_success; then
-  :
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
 else
-  exitcode=1
-  echo as_func_success failed.
-fi
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
 
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
 
-if as_func_ret_success; then
-  :
+
+# as_fn_error STATUS ERROR LINENO LOG_FD
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '$a$' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*$...$'`" = X001; then
+  as_expr=expr
 else
-  exitcode=1
-  echo as_func_ret_success failed.
+  as_expr=false
 fi
 
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
 fi
 
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_dirname=false
 fi
 
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell bug-autoconf@gnu.org about your system,
-  echo including any error possibly output before this message.
-  echo This can help us improve future autoconf versions.
-  echo Configuration will now proceed without shell functions.
-}
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
+	 X"$0" : 'X$//$$' \| \
+	 X"$0" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/$^/^/*$\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /$LINENO/=
@@ -471,8 +442,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # Don't try to exec as it changes $0, causing all sort of problems
   # (the dirname of $0 is not the place where we might find the
@@ -482,29 +452,18 @@
   exit
 }
 
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '$a$' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*$...$'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -534,7 +493,7 @@
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -553,10 +512,10 @@
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???sx*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -570,11 +529,11 @@
 as_tr_sh="eval sed 'y%*+%pp%;s%^_$as_cr_alnum%_%g'"
 
 
-
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -589,14 +548,14 @@
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='gentoo'
+PACKAGE_TARNAME='gentoo'
+PACKAGE_VERSION='0.19.9'
+PACKAGE_STRING='gentoo 0.19.9'
+PACKAGE_BUGREPORT='emil@obsession.se'
+PACKAGE_URL='http://obsession.se/gentoo/'
 
 ac_unique_file="src/gentoo.c"
 # Factoring default headers for most tests.
@@ -636,7 +595,10 @@
 #endif"
 
 gt_needs=
-ac_subst_vars='LTLIBOBJS
+ac_header_list=
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
 LIBOBJS
 POSUB
 LTLIBINTL
@@ -693,6 +655,8 @@
 MSGFMT
 GETTEXT_MACRO_VERSION
 USE_NLS
+MODULES_LIBS
+MODULES_CFLAGS
 GTK_LIBS
 GTK_CFLAGS
 GLIB_MKENUMS
@@ -700,10 +664,15 @@
 GLIB_GENMARSHAL
 GLIB_LIBS
 GLIB_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
 PKG_CONFIG
 RANLIB
 GENTOO_CFLAGS
 DATE
+EGREP
+GREP
+CPP
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
@@ -713,6 +682,13 @@
 am__quote
 am__include
 DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
 am__untar
 am__tar
 AMTAR
@@ -736,16 +712,6 @@
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
-EGREP
-GREP
-CPP
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
 target_alias
 host_alias
 build_alias
@@ -776,6 +742,7 @@
 program_transform_name
 prefix
 exec_prefix
+PACKAGE_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
@@ -790,7 +757,6 @@
 enable_debug
 enable_glibtest
 enable_gtktest
-enable_fam
 enable_nls
 enable_threads
 with_gnu_ld
@@ -809,7 +775,11 @@
 LIBS
 CPPFLAGS
 CPP
-PKG_CONFIG'
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+MODULES_CFLAGS
+MODULES_LIBS'
 
 
 # Initialize some variables set by options.
@@ -850,7 +820,7 @@
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -872,8 +842,9 @@
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '^=*=$.*$'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '^=*=$.*$'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -918,8 +889,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
@@ -945,8 +915,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-$^=*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
@@ -1150,8 +1119,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-$^=*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
@@ -1167,8 +1135,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
@@ -1198,17 +1165,17 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x$^=*$='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*^_$as_cr_alnum" >/dev/null &&
-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
+    case $ac_envvar in #(
+      '' | 0-9* | *!_$as_cr_alnum* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
@@ -1225,15 +1192,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-   { (exit 1); exit 1; }; } ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1256,8 +1221,7 @@
     \\/$* | ?:\\/* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1271,8 +1235,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1287,11 +1251,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1330,13 +1292,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1362,7 +1322,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures gentoo 0.19.9 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1376,7 +1336,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE disabled
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1410,7 +1370,7 @@
   --infodir=DIR           info documentation DATAROOTDIR/info
   --localedir=DIR         locale-dependent data DATAROOTDIR/locale
   --mandir=DIR            man documentation DATAROOTDIR/man
-  --docdir=DIR            documentation root DATAROOTDIR/doc/PACKAGE
+  --docdir=DIR            documentation root DATAROOTDIR/doc/gentoo
   --htmldir=DIR           html documentation DOCDIR
   --dvidir=DIR            dvi documentation DOCDIR
   --pdfdir=DIR            pdf documentation DOCDIR
@@ -1431,7 +1391,9 @@
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of gentoo 0.19.9:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
@@ -1443,8 +1405,6 @@
   --enable-debug          have debug info compiled in
   --disable-glibtest      do not try to compile and run a test GLIB program
   --disable-gtktest       do not try to compile and run a test GTK+ program
-  --disable-fam           do not look for FAM (File Alteration Monitor)
-                          (default is to use FAM if found)
   --disable-nls           do not use Native Language Support
   --enable-threads={posix|solaris|pth|win32}
                           specify multithreading API
@@ -1469,14 +1429,24 @@
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
+  MODULES_CFLAGS
+              C compiler flags for MODULES, overriding pkg-config
+  MODULES_LIBS
+              linker flags for MODULES, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
+Report bugs to <emil@obsession.se>.
+gentoo home page: <http://obsession.se/gentoo/>.
 _ACEOF
 ac_status=$?
 fi
@@ -1539,22 +1509,609 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.63
+gentoo configure 0.19.9
+generated by GNU Autoconf 2.67
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval "test \"\${$3+set}\"" = set; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## -------------------------------- ##
+## Report this to emil@obsession.se ##
+## -------------------------------- ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+# --------------------------------------------
+# Tries to find the compile-time value of EXPR in a program that includes
+# INCLUDES, setting VAR accordingly. Returns whether the value could be
+# computed
+ac_fn_c_compute_int ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if test "$cross_compiling" = yes; then
+    # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array 1 - 2 * !(($2) >= 0);
+test_array 0 = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array 1 - 2 * !(($2) <= $ac_mid);
+test_array 0 = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid; break
+else
+  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array 1 - 2 * !(($2) < 0);
+test_array 0 = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array 1 - 2 * !(($2) >= $ac_mid);
+test_array 0 = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=$ac_mid; break
+else
+  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array 1 - 2 * !(($2) <= $ac_mid);
+test_array 0 = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid
+else
+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in #((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+  else
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (($2) < 0)
+    {
+      long int i = longval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+  ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+  fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_compute_int
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+It was created by gentoo $as_me 0.19.9, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
 
@@ -1590,8 +2147,8 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  $as_echo "PATH: $as_dir"
-done
+    $as_echo "PATH: $as_dir"
+  done
 IFS=$as_save_IFS
 
 } >&5
@@ -1628,9 +2185,9 @@
       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -1646,13 +2203,13 @@
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -1664,11 +2221,9 @@
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -1677,13 +2232,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -1702,11 +2257,9 @@
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -1719,11 +2272,9 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -1737,11 +2288,9 @@
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -1755,46 +2304,53 @@
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
+$as_echo "/* confdefs.h */" > confdefs.h
+
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -1805,19 +2361,23 @@
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5 ; }
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       \\/* | ?:\\/* ) . "$cache_file";;
@@ -1825,12 +2385,15 @@
     esac
   fi
 else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
 gt_needs="$gt_needs "
+as_fn_append ac_header_list " stdlib.h"
+as_fn_append ac_header_list " unistd.h"
+as_fn_append ac_header_list " sys/param.h"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -1841,11 +2404,11 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
@@ -1855,17 +2418,17 @@
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
 $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
 $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
@@ -1877,42 +2440,597 @@
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+am__api_version='1.11'
+
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /cC/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
 
+  done
+IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *\\\"\#\$\&\'\`$am_lf*)
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+esac
+case $srcdir in
+  *\\\"\#\$\&\'\`$am_lf\ \	*)
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+esac
 
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
 
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
+   fi
 
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/\\$/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
 
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
 
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  \\/$* | ?:\\/*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make1: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='gentoo'
+ VERSION='0.19.9'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
+
+
+
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
 
 
 ac_ext=c
@@ -1923,9 +3041,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -1936,24 +3054,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -1963,9 +3081,9 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -1976,24 +3094,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2002,7 +3120,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2016,9 +3134,9 @@
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2029,24 +3147,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2056,9 +3174,9 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2070,18 +3188,18 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
@@ -2100,10 +3218,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2115,9 +3233,9 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2128,24 +3246,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2159,9 +3277,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2172,24 +3290,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2202,7 +3320,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2213,57 +3331,37 @@
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2279,8 +3377,8 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest^ *//'`
 
 # The possible output files:
@@ -2296,17 +3394,17 @@
 done
 rm -f $ac_rmfiles
 
-if { (ac_try="$ac_link_default"
+if { { ac_try="$ac_link_default"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -2323,7 +3421,7 @@
 	# certainly right.
 	break;;
     *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '^.*$\..*$'`
 	fi
@@ -2342,84 +3440,41 @@
 else
   ac_file=''
 fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
-  $as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5 ; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
+if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -2434,32 +3489,83 @@
   esac
 done
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
-
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5 ; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
+if test "${ac_cv_objext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2471,17 +3577,17 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -2494,31 +3600,23 @@
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
-
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2532,37 +3630,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
@@ -2571,20 +3648,16 @@
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
+if test "${ac_cv_prog_cc_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2595,35 +3668,11 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2634,36 +3683,12 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
 
-	ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2674,42 +3699,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 $as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -2726,18 +3726,14 @@
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -2794,32 +3790,9 @@
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
@@ -2830,17 +3803,19 @@
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -2848,20 +3823,147 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*$a-zA-Z0-9*$)$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 $as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
+  if test "${ac_cv_prog_CPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -2876,11 +3978,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -2889,78 +3987,34 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -2972,7 +4026,7 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
 $as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2983,11 +4037,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -2996,87 +4046,40 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
@@ -3086,9 +4089,9 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
+if test "${ac_cv_path_GREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -3099,7 +4102,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
+    for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
@@ -3119,7 +4122,7 @@
     $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_GREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_GREP="$ac_path_GREP"
@@ -3134,26 +4137,24 @@
       $ac_path_GREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
 $as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
+if test "${ac_cv_path_EGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -3167,7 +4168,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
+    for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
@@ -3187,7 +4188,7 @@
     $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_EGREP="$ac_path_EGREP"
@@ -3202,12 +4203,10 @@
       $ac_path_EGREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -3215,21 +4214,17 @@
 
    fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
 $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+if test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3244,48 +4239,23 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -3295,18 +4265,14 @@
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -3316,14 +4282,10 @@
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -3350,118 +4312,33 @@
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -3472,134 +4349,8 @@
 
 
 
-  if test "${ac_cv_header_minix_config_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
-$as_echo_n "checking for minix/config.h... " >&6; }
-if test "${ac_cv_header_minix_config_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-$as_echo "$ac_cv_header_minix_config_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
-$as_echo_n "checking minix/config.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <minix/config.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
-$as_echo_n "checking minix/config.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <minix/config.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
-$as_echo_n "checking for minix/config.h... " >&6; }
-if test "${ac_cv_header_minix_config_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_minix_config_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-$as_echo "$ac_cv_header_minix_config_h" >&6; }
-
-fi
-if test "x$ac_cv_header_minix_config_h" = x""yes; then
+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+if test "x$ac_cv_header_minix_config_h" = x""yes; then :
   MINIX=yes
 else
   MINIX=
@@ -3608,34 +4359,23 @@
 
   if test "$MINIX" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define _POSIX_SOURCE 1
-_ACEOF
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define _POSIX_1_SOURCE 2
-_ACEOF
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define _MINIX 1
-_ACEOF
+$as_echo "#define _MINIX 1" >>confdefs.h
 
   fi
 
 
-
-  { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #	  define __EXTENSIONS__ 1
@@ -3648,744 +4388,33 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_safe_to_define___extensions__=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_safe_to_define___extensions__=no
+  ac_cv_safe_to_define___extensions__=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
 $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
   test $ac_cv_safe_to_define___extensions__ = yes &&
-    cat >>confdefs.h <<\_ACEOF
-#define __EXTENSIONS__ 1
-_ACEOF
-
-  cat >>confdefs.h <<\_ACEOF
-#define _ALL_SOURCE 1
-_ACEOF
-
-  cat >>confdefs.h <<\_ACEOF
-#define _GNU_SOURCE 1
-_ACEOF
-
-  cat >>confdefs.h <<\_ACEOF
-#define _POSIX_PTHREAD_SEMANTICS 1
-_ACEOF
-
-  cat >>confdefs.h <<\_ACEOF
-#define _TANDEM_SOURCE 1
-_ACEOF
-
-
-
-gentoo_major_version=0
-gentoo_minor_version=15
-gentoo_micro_version=6
-
-am__api_version='1.10'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/\\$/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
 
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
 
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-done
-IFS=$as_save_IFS
+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
-fi
+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
 
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  \\/$* | ?:\\/*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
 
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+$as_echo "#define GTK_DISABLE_DEPRECATED 1" >>confdefs.h
 
 
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make1: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE=gentoo
- VERSION=$gentoo_major_version.$gentoo_minor_version.$gentoo_micro_version
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*$a-zA-Z0-9*$)$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define GENTOO_MAJOR_VERSION $gentoo_major_version
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define GENTOO_MINOR_VERSION $gentoo_minor_version
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define GENTOO_MICRO_VERSION $gentoo_micro_version
-_ACEOF
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define GTK_ENABLE_BROKEN /**/
-_ACEOF
+$as_echo "#define GTK_DISABLE_COMPAT_H 1" >>confdefs.h
 
 
 DATE=`date +%Y-%m-%d`
@@ -4404,9 +4433,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4417,24 +4446,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4444,9 +4473,9 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4457,24 +4486,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4483,7 +4512,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -4497,9 +4526,9 @@
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4510,24 +4539,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4537,9 +4566,9 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4551,18 +4580,18 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
@@ -4581,10 +4610,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4596,9 +4625,9 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4609,24 +4638,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4640,9 +4669,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4653,24 +4682,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4683,7 +4712,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -4694,62 +4723,42 @@
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4763,37 +4772,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
@@ -4802,20 +4790,16 @@
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
+if test "${ac_cv_prog_cc_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4826,35 +4810,11 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4865,36 +4825,12 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
 
-	ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4905,42 +4841,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 $as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -4957,18 +4868,14 @@
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -5025,32 +4932,9 @@
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
@@ -5061,17 +4945,19 @@
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -5079,23 +4965,146 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*$a-zA-Z0-9*$)$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
 
 GENTOO_CFLAGS="-Wall -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Werror-implicit-function-declaration"
 
 # Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
+if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug;  if test "x$enableval" = "xyes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define DEBUG 1
-_ACEOF
+$as_echo "#define DEBUG 1" >>confdefs.h
 
       GENTOO_CFLAGS="$GENTOO_CFLAGS -g -pg"
     else
 
-cat >>confdefs.h <<\_ACEOF
-#define DEBUG 0
-_ACEOF
+$as_echo "#define DEBUG 0" >>confdefs.h
 
       GENTOO_CFLAGS="$GENTOO_CFLAGS -O2"
     fi
@@ -5109,14 +5118,14 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 $as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
+  if test "${ac_cv_prog_CPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -5131,11 +5140,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -5144,78 +5149,34 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -5227,7 +5188,7 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
 $as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -5238,11 +5199,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -5251,87 +5208,40 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
@@ -5343,9 +5253,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -5356,24 +5266,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
 $as_echo "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5383,9 +5293,9 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -5396,24 +5306,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
 $as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5422,7 +5332,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -5433,7 +5343,7 @@
 fi
 
 # Check whether --enable-glibtest was given.
-if test "${enable_glibtest+set}" = set; then
+if test "${enable_glibtest+set}" = set; then :
   enableval=$enable_glibtest;
 else
   enable_glibtest=yes
@@ -5464,13 +5374,17 @@
 
 
 
+
+
+
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -5483,14 +5397,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -5498,10 +5412,10 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5511,9 +5425,9 @@
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
@@ -5526,14 +5440,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -5541,10 +5455,10 @@
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
 $as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5553,7 +5467,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -5566,17 +5480,16 @@
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.16
-	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	else
-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
-
 fi
 
   no_glib=""
@@ -5586,8 +5499,8 @@
     PKG_CONFIG=no
   fi
 
-  min_glib_version=2.14.0
-  { $as_echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
+  min_glib_version=2.24.0
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5
 $as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }
 
   if test x$PKG_CONFIG != xno ; then
@@ -5623,14 +5536,10 @@
       CFLAGS="$CFLAGS $GLIB_CFLAGS"
       LIBS="$GLIB_LIBS $LIBS"
       rm -f conf.glibtest
-      if test "$cross_compiling" = yes; then
+      if test "$cross_compiling" = yes; then :
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <glib.h>
@@ -5642,9 +5551,8 @@
 {
   int major, minor, micro;
   char *tmp_version;
-  int ignored;
 
-  ignored = system ("touch conf.glibtest");
+  fclose (fopen ("conf.glibtest", "w"));
 
   /* HP/UX 9 (%@#!) writes to sscanf strings */
   tmp_version = g_strdup("$min_glib_version");
@@ -5706,52 +5614,25 @@
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-no_glib=yes
+else
+  no_glib=yes
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_glib" = x ; then
-     { $as_echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
 $as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }
      :
   else
-     { $as_echo "$as_me:$LINENO: result: no" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
      if test "$PKG_CONFIG" = "no" ; then
        echo "*** A new enough version of pkg-config was not found."
@@ -5765,11 +5646,7 @@
           ac_save_LIBS="$LIBS"
           CFLAGS="$CFLAGS $GLIB_CFLAGS"
           LIBS="$LIBS $GLIB_LIBS"
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <glib.h>
@@ -5783,27 +5660,7 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GLIB or finding the wrong"
           echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
@@ -5814,16 +5671,11 @@
           echo "*** If you have an old version installed, it is best to remove it, although"
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	 echo "*** The test program failed to compile or link. See the file config.log for the"
+   echo "*** The test program failed to compile or link. See the file config.log for the"
           echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi
@@ -5833,9 +5685,7 @@
      GLIB_GENMARSHAL=""
      GOBJECT_QUERY=""
      GLIB_MKENUMS=""
-     { { $as_echo "$as_me:$LINENO: error: Bad glib version" >&5
-$as_echo "$as_me: error: Bad glib version" >&2;}
-   { (exit 1); exit 1; }; }
+     as_fn_error $? "Bad GLIB version" "$LINENO" 5
   fi
 
 
@@ -5845,7 +5695,7 @@
   rm -f conf.glibtest
 
 # Check whether --enable-gtktest was given.
-if test "${enable_gtktest+set}" = set; then
+if test "${enable_gtktest+set}" = set; then :
   enableval=$enable_gtktest;
 else
   enable_gtktest=yes
@@ -5866,9 +5716,9 @@
 
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -5881,14 +5731,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
@@ -5897,10 +5747,10 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5918,8 +5768,8 @@
     no_gtk=yes
   fi
 
-  min_gtk_version=2.2.0
-  { $as_echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
+  min_gtk_version=2.18.0
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5
 $as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
 
   if test x$PKG_CONFIG != xno ; then
@@ -5951,14 +5801,10 @@
       CFLAGS="$CFLAGS $GTK_CFLAGS"
       LIBS="$GTK_LIBS $LIBS"
       rm -f conf.gtktest
-      if test "$cross_compiling" = yes; then
+      if test "$cross_compiling" = yes; then :
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <gtk/gtk.h>
@@ -5971,7 +5817,7 @@
   int major, minor, micro;
   char *tmp_version;
 
-  system ("touch conf.gtktest");
+  fclose (fopen ("conf.gtktest", "w"));
 
   /* HP/UX 9 (%@#!) writes to sscanf strings */
   tmp_version = g_strdup("$min_gtk_version");
@@ -6033,52 +5879,25 @@
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-no_gtk=yes
+else
+  no_gtk=yes
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then
-     { $as_echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
 $as_echo "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; }
      :
   else
-     { $as_echo "$as_me:$LINENO: result: no" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
      if test "$PKG_CONFIG" = "no" ; then
        echo "*** A new enough version of pkg-config was not found."
@@ -6092,11 +5911,7 @@
 	  ac_save_LIBS="$LIBS"
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <gtk/gtk.h>
@@ -6110,27 +5925,7 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
           echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
@@ -6141,225 +5936,249 @@
           echo "*** If you have an old version installed, it is best to remove it, although"
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	 echo "*** The test program failed to compile or link. See the file config.log for the"
+   echo "*** The test program failed to compile or link. See the file config.log for the"
           echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi
      fi
      GTK_CFLAGS=""
      GTK_LIBS=""
-     { { $as_echo "$as_me:$LINENO: error: Bad GTK+ version" >&5
-$as_echo "$as_me: error: Bad GTK+ version" >&2;}
-   { (exit 1); exit 1; }; }
+     as_fn_error $? "Bad GTK+ version" "$LINENO" 5
   fi
 
 
   rm -f conf.gtktest
 
 
-{ $as_echo "$as_me:$LINENO: checking whether file understands -f - -n option combo" >&5
-$as_echo_n "checking whether file understands -f - -n option combo... " >&6; }
-if ( echo "." | file -f - -n >/dev/null 2>/dev/null ) ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GOOD_FILE 1
-_ACEOF
 
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  \\/* | ?:\\/*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-  { $as_echo "$as_me:$LINENO: WARNING: \"
-   This system's 'file' command (\`which file\`) doesn't seem to\"
-   support the '-f - -n' option combination. gentoo's 'file' usage\"
-   will be limited. Consider upgrading to the version of 'file'\"
-   from <ftp://ftp.astron.com/pub/file/>, version 3.35 or later.\"
-   At the moment, you will not lose any crucial functionality by\"
-   running gentoo with a different 'file' command, although this\"
-   may change in the future.\"" >&5
-$as_echo "$as_me: WARNING: \"
-   This system's 'file' command (\`which file\`) doesn't seem to\"
-   support the '-f - -n' option combination. gentoo's 'file' usage\"
-   will be limited. Consider upgrading to the version of 'file'\"
-   from <ftp://ftp.astron.com/pub/file/>, version 3.35 or later.\"
-   At the moment, you will not lose any crucial functionality by\"
-   running gentoo with a different 'file' command, although this\"
-   may change in the future.\"" >&2;}
 fi
 
 
-testfam=yes
-# Check whether --enable-fam was given.
-if test "${enable_fam+set}" = set; then
-  enableval=$enable_fam; if test "x$enableval" = "xno" ; then
-      testfam=no
-    fi
-else
-  testfam=yes
 fi
-
-if test "x$testfam" = "xyes" ; then
-  { $as_echo "$as_me:$LINENO: checking for library containing FAMOpen" >&5
-$as_echo_n "checking for library containing FAMOpen... " >&6; }
-if test "${ac_cv_search_FAMOpen+set}" = set; then
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char FAMOpen ();
-int
-main ()
-{
-return FAMOpen ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' fam; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  case $ac_pt_PKG_CONFIG in
+  \\/* | ?:\\/*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_search_FAMOpen=$ac_res
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_FAMOpen+set}" = set; then
-  break
 fi
-done
-if test "${ac_cv_search_FAMOpen+set}" = set; then
-  :
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MODULES" >&5
+$as_echo_n "checking for MODULES... " >&6; }
+
+if test -n "$MODULES_CFLAGS"; then
+    pkg_cv_MODULES_CFLAGS="$MODULES_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 gthread-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-2.0 gthread-2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_MODULES_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 gthread-2.0" 2>/dev/null`
 else
-  ac_cv_search_FAMOpen=no
+  pkg_failed=yes
 fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+ else
+    pkg_failed=untried
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_FAMOpen" >&5
-$as_echo "$ac_cv_search_FAMOpen" >&6; }
-ac_res=$ac_cv_search_FAMOpen
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  famlib=yes
+if test -n "$MODULES_LIBS"; then
+    pkg_cv_MODULES_LIBS="$MODULES_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 gthread-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-2.0 gthread-2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_MODULES_LIBS=`$PKG_CONFIG --libs "gio-2.0 gthread-2.0" 2>/dev/null`
 else
-  famlib=no
+  pkg_failed=yes
 fi
-
+ else
+    pkg_failed=untried
 fi
-if test "x$famlib" = "xyes" ; then
-   { $as_echo "$as_me:$LINENO: checking whether FAM test program compiles" >&5
-$as_echo_n "checking whether FAM test program compiles... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-    #include <fam.h>
-int
-main ()
-{
 
-    int main(void)
-    {
-     FAMConnection c;
-     return FAMOpen(&c) == 0;
-    }
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; };
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FAM 1
-_ACEOF
 
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        MODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 gthread-2.0" 2>&1`
+        else
+	        MODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 gthread-2.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$MODULES_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+	as_fn_error $? "GIO and gthread are both required" "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+	as_fn_error $? "GIO and gthread are both required" "$LINENO" 5
+else
+	MODULES_CFLAGS=$pkg_cv_MODULES_CFLAGS
+	MODULES_LIBS=$pkg_cv_MODULES_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	dummy=yes
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether file understands -f - -n option combo" >&5
+$as_echo_n "checking whether file understands -f - -n option combo... " >&6; }
+if ( echo "." | file -f - -n >/dev/null 2>/dev/null ) ; then
+
+$as_echo "#define HAVE_GOOD_FILE 1" >>confdefs.h
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"
+   This system's 'file' command (\`which file\`) doesn't seem to\"
+   support the '-f - -n' option combination. gentoo's 'file' usage\"
+   will be limited. Consider upgrading to the version of 'file'\"
+   from <ftp://ftp.astron.com/pub/file/>, version 3.35 or later.\"
+   At the moment, you will not lose any crucial functionality by\"
+   running gentoo with a different 'file' command, although this\"
+   may change in the future.\"" >&5
+$as_echo "$as_me: WARNING: \"
+   This system's 'file' command (\`which file\`) doesn't seem to\"
+   support the '-f - -n' option combination. gentoo's 'file' usage\"
+   will be limited. Consider upgrading to the version of 'file'\"
+   from <ftp://ftp.astron.com/pub/file/>, version 3.35 or later.\"
+   At the moment, you will not lose any crucial functionality by\"
+   running gentoo with a different 'file' command, although this\"
+   may change in the future.\"" >&2;}
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking number of bits in st_size field" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking number of bits in st_size field" >&5
 $as_echo_n "checking number of bits in st_size field... " >&6; }
 bits="test failed"
 bitstest=`cat <<TESTPROG_EOF
@@ -6383,344 +6202,109 @@
    exit(out != NULL ? EXIT_SUCCESS : EXIT_FAILURE);
  }
 TESTPROG_EOF`
-if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+if test "$cross_compiling" = yes; then :
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $bitstest
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   bits=`cat conftest.statbits`
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
-{ $as_echo "$as_me:$LINENO: result: $bits" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bits" >&5
 $as_echo "$bits" >&6; }
 if test "x$bits" = "x32" ; then
-  { $as_echo "$as_me:$LINENO: checking again, with -D_FILE_OFFSET_BITS=64" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking again, with -D_FILE_OFFSET_BITS=64" >&5
 $as_echo_n "checking again, with -D_FILE_OFFSET_BITS=64... " >&6; }
   oldflags=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
   bits="test failed"
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   CPPFLAGS=$oldflags
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $bitstest
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   bits=`cat conftest.statbits`
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
-  { $as_echo "$as_me:$LINENO: result: $bits" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bits" >&5
 $as_echo "$bits" >&6; }
 fi
 
-
-{ $as_echo "$as_me:$LINENO: checking for struct statvfs.f_bsize" >&5
-$as_echo_n "checking for struct statvfs.f_bsize... " >&6; }
-if test "${ac_cv_member_struct_statvfs_f_bsize+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
+$as_echo_n "checking for pow in -lm... " >&6; }
+if test "${ac_cv_lib_m_pow+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/statvfs.h>
-
-int
-main ()
-{
-static struct statvfs ac_aggr;
-if (ac_aggr.f_bsize)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_statvfs_f_bsize=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <sys/statvfs.h>
 
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pow ();
 int
 main ()
 {
-static struct statvfs ac_aggr;
-if (sizeof ac_aggr.f_bsize)
-return 0;
+return pow ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_statvfs_f_bsize=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_pow=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_statvfs_f_bsize=no
+  ac_cv_lib_m_pow=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_statvfs_f_bsize" >&5
-$as_echo "$ac_cv_member_struct_statvfs_f_bsize" >&6; }
-if test "x$ac_cv_member_struct_statvfs_f_bsize" = x""yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_STATVFS 1
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
+$as_echo "$ac_cv_lib_m_pow" >&6; }
+if test "x$ac_cv_lib_m_pow" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
 _ACEOF
 
-   statfs=statvfs
-else
-  { $as_echo "$as_me:$LINENO: checking for struct statfs.f_bsize" >&5
-$as_echo_n "checking for struct statfs.f_bsize... " >&6; }
-if test "${ac_cv_member_struct_statfs_f_bsize+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/statfs.h>
+  LIBS="-lm $LIBS"
 
-int
-main ()
-{
-static struct statfs ac_aggr;
-if (ac_aggr.f_bsize)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_statfs_f_bsize=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/statfs.h>
-
-int
-main ()
-{
-static struct statfs ac_aggr;
-if (sizeof ac_aggr.f_bsize)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_statfs_f_bsize=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_statfs_f_bsize=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_bsize" >&5
-$as_echo "$ac_cv_member_struct_statfs_f_bsize" >&6; }
-if test "x$ac_cv_member_struct_statfs_f_bsize" = x""yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_STATFS 1
-_ACEOF
-
-      statfs=statfs
-else
-  statfs=failed
 fi
 
-fi
 
 
 
 ALL_LINGUAS=`grep -v \# po/LINGUAS`
 
-  { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
     # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then
+if test "${enable_nls+set}" = set; then :
   enableval=$enable_nls; USE_NLS=$enableval
 else
   USE_NLS=yes
 fi
 
-  { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
 $as_echo "$USE_NLS" >&6; }
 
 
@@ -6761,9 +6345,9 @@
 
 # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
@@ -6793,18 +6377,18 @@
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
 $as_echo "$MSGFMT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -6817,14 +6401,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
@@ -6833,10 +6417,10 @@
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
 $as_echo "$GMSGFMT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6884,9 +6468,9 @@
 
 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
@@ -6916,10 +6500,10 @@
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
 $as_echo "$XGETTEXT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6962,9 +6546,9 @@
 
 # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGMERGE" in
@@ -6993,10 +6577,10 @@
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
 $as_echo "$MSGMERGE" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7012,35 +6596,27 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
+if test "${ac_cv_build+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -7056,28 +6632,24 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
+if test "${ac_cv_host+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -7094,16 +6666,12 @@
 
 
 
-    { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2 or newer" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2 or newer" >&5
 $as_echo_n "checking whether we are using the GNU C Library 2 or newer... " >&6; }
-if test "${ac_cv_gnu_library_2+set}" = set; then
+if test "${ac_cv_gnu_library_2+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <features.h>
@@ -7115,7 +6683,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky GNU user" >/dev/null 2>&1; then
+  $EGREP "Lucky GNU user" >/dev/null 2>&1; then :
   ac_cv_gnu_library_2=yes
 else
   ac_cv_gnu_library_2=no
@@ -7125,7 +6693,7 @@
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2" >&5
 $as_echo "$ac_cv_gnu_library_2" >&6; }
 
     GLIBC2="$ac_cv_gnu_library_2"
@@ -7136,19 +6704,15 @@
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
-    { $as_echo "$as_me:$LINENO: checking for simple visibility declarations" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
 $as_echo_n "checking for simple visibility declarations... " >&6; }
-    if test "${gl_cv_cc_visibility+set}" = set; then
+    if test "${gl_cv_cc_visibility+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
       gl_save_CFLAGS="$CFLAGS"
       CFLAGS="$CFLAGS -fvisibility=hidden"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 extern __attribute__((__visibility__("hidden"))) int hiddenvar;
          extern __attribute__((__visibility__("default"))) int exportedvar;
@@ -7162,37 +6726,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   gl_cv_cc_visibility=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gl_cv_cc_visibility=no
+  gl_cv_cc_visibility=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       CFLAGS="$gl_save_CFLAGS"
 fi
 
-    { $as_echo "$as_me:$LINENO: result: $gl_cv_cc_visibility" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
 $as_echo "$gl_cv_cc_visibility" >&6; }
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
@@ -7207,18 +6750,14 @@
 _ACEOF
 
 
-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
+if test "${ac_cv_c_inline+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
@@ -7227,41 +6766,17 @@
 #endif
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_inline=$ac_kw
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
 $as_echo "$ac_cv_c_inline" >&6; }
 
-
 case $ac_cv_c_inline in
   inline | yes) ;;
   *)
@@ -7277,102 +6792,9 @@
     ;;
 esac
 
-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
-$as_echo_n "checking for size_t... " >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_type_size_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (size_t))
-       return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((size_t)))
-	  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_size_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-$as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -7382,16 +6804,12 @@
 fi
 
 
-  { $as_echo "$as_me:$LINENO: checking for stdint.h" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint.h" >&5
 $as_echo_n "checking for stdint.h... " >&6; }
-if test "${gl_cv_header_stdint_h+set}" = set; then
+if test "${gl_cv_header_stdint_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <stdint.h>
@@ -7403,35 +6821,14 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   gl_cv_header_stdint_h=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gl_cv_header_stdint_h=no
+  gl_cv_header_stdint_h=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_h" >&5
 $as_echo "$gl_cv_header_stdint_h" >&6; }
   if test $gl_cv_header_stdint_h = yes; then
 
@@ -7443,16 +6840,12 @@
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 $as_echo_n "checking for working alloca.h... " >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then
+if test "${ac_cv_working_alloca_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
@@ -7464,59 +6857,28 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_working_alloca_h=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_working_alloca_h=no
+  ac_cv_working_alloca_h=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
 $as_echo "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 $as_echo_n "checking for alloca... " >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then
+if test "${ac_cv_func_alloca_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -7548,47 +6910,20 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func_alloca_works=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_alloca_works=no
+  ac_cv_func_alloca_works=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
 $as_echo "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -7598,21 +6933,15 @@
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
 
 
-{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if test "${ac_cv_os_cray+set}" = set; then
+if test "${ac_cv_os_cray+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if defined CRAY && ! defined CRAY2
 webecray
@@ -7622,7 +6951,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then
+  $EGREP "webecray" >/dev/null 2>&1; then :
   ac_cv_os_cray=yes
 else
   ac_cv_os_cray=no
@@ -7630,101 +6959,13 @@
 rm -f conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
 $as_echo "$ac_cv_os_cray" >&6; }
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -7736,19 +6977,15 @@
   done
 fi
 
-{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 $as_echo_n "checking stack direction for C alloca... " >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then
+if test "${ac_cv_c_stack_direction+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_c_stack_direction=0
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -7771,46 +7008,18 @@
   return find_stack_direction () < 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_stack_direction=1
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
+  ac_cv_c_stack_direction=-1
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
 $as_echo "$ac_cv_c_stack_direction" >&6; }
-
 cat >>confdefs.h <<_ACEOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
 _ACEOF
@@ -7820,143 +7029,13 @@
 
 
 
-for ac_header in stdlib.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+  for ac_header in $ac_header_list
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -7966,119 +7045,32 @@
 done
 
 
-for ac_func in getpagesize
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
 
-#undef $ac_func
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval "$as_ac_var=no"
-fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+for ac_func in getpagesize
+do :
+  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+if test "x$ac_cv_func_getpagesize" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_GETPAGESIZE 1
 _ACEOF
 
 fi
 done
 
-{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
 $as_echo_n "checking for working mmap... " >&6; }
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_mmap_fixed_mapped=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 /* malloc might have been renamed as rpl_malloc. */
@@ -8115,11 +7107,6 @@
 
 /* This mess was copied from the GNU getpagesize.h.  */
 #ifndef HAVE_GETPAGESIZE
-/* Assume that all systems that can run configure have sys/param.h.  */
-# ifndef HAVE_SYS_PARAM_H
-#  define HAVE_SYS_PARAM_H 1
-# endif
-
 # ifdef _SC_PAGESIZE
 #  define getpagesize() sysconf(_SC_PAGESIZE)
 # else /* no _SC_PAGESIZE */
@@ -8154,8 +7141,9 @@
 main ()
 {
   char *data, *data2, *data3;
+  const char *cdata2;
   int i, pagesize;
-  int fd;
+  int fd, fd2;
 
   pagesize = getpagesize ();
 
@@ -8168,27 +7156,41 @@
   umask (0);
   fd = creat ("conftest.mmap", 0600);
   if (fd < 0)
-    return 1;
+    return 2;
   if (write (fd, data, pagesize) != pagesize)
-    return 1;
+    return 3;
   close (fd);
 
+  /* Next, check that the tail of a page is zero-filled.  File must have
+     non-zero length, otherwise we risk SIGBUS for entire page.  */
+  fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
+  if (fd2 < 0)
+    return 4;
+  cdata2 = "";
+  if (write (fd2, cdata2, 1) != 1)
+    return 5;
+  data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
+  if (data2 == MAP_FAILED)
+    return 6;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data2 + i))
+      return 7;
+  close (fd2);
+  if (munmap (data2, pagesize))
+    return 8;
+
   /* Next, try to mmap the file at a fixed address which already has
      something else allocated at it.  If we can, also make sure that
      we see the same garbage.  */
   fd = open ("conftest.mmap", O_RDWR);
   if (fd < 0)
-    return 1;
-  data2 = (char *) malloc (2 * pagesize);
-  if (!data2)
-    return 1;
-  data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
+    return 9;
   if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
 		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
-    return 1;
+    return 10;
   for (i = 0; i < pagesize; ++i)
     if (*(data + i) != *(data2 + i))
-      return 1;
+      return 11;
 
   /* Finally, make sure that changes to the mapped area do not
      percolate back to the file as seen by read().  (This is a bug on
@@ -8197,69 +7199,40 @@
     *(data2 + i) = *(data2 + i) + 1;
   data3 = (char *) malloc (pagesize);
   if (!data3)
-    return 1;
+    return 12;
   if (read (fd, data3, pagesize) != pagesize)
-    return 1;
+    return 13;
   for (i = 0; i < pagesize; ++i)
     if (*(data + i) != *(data3 + i))
-      return 1;
+      return 14;
   close (fd);
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_mmap_fixed_mapped=yes
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_mmap_fixed_mapped=no
+  ac_cv_func_mmap_fixed_mapped=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
 $as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MMAP 1
-_ACEOF
+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
 
 fi
-rm -f conftest.mmap
+rm -f conftest.mmap conftest.txt
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether integer division by zero raises SIGFPE" >&5
 $as_echo_n "checking whether integer division by zero raises SIGFPE... " >&6; }
-if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then
+if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -8276,7 +7249,7 @@
           ;;
       esac
       if test -z "$gt_cv_int_divbyzero_sigfpe"; then
-        if test "$cross_compiling" = yes; then
+        if test "$cross_compiling" = yes; then :
 
             # Guess based on the CPU.
             case "$host_cpu" in
@@ -8287,11 +7260,7 @@
             esac
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdlib.h>
@@ -8327,46 +7296,19 @@
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   gt_cv_int_divbyzero_sigfpe=yes
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gt_cv_int_divbyzero_sigfpe=no
+  gt_cv_int_divbyzero_sigfpe=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
       fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_int_divbyzero_sigfpe" >&5
 $as_echo "$gt_cv_int_divbyzero_sigfpe" >&6; }
   case "$gt_cv_int_divbyzero_sigfpe" in
     *yes) value=1;;
@@ -8379,16 +7321,12 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking for inttypes.h" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5
 $as_echo_n "checking for inttypes.h... " >&6; }
-if test "${gl_cv_header_inttypes_h+set}" = set; then
+if test "${gl_cv_header_inttypes_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <inttypes.h>
@@ -8400,35 +7338,14 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   gl_cv_header_inttypes_h=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gl_cv_header_inttypes_h=no
+  gl_cv_header_inttypes_h=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_inttypes_h" >&5
 $as_echo "$gl_cv_header_inttypes_h" >&6; }
   if test $gl_cv_header_inttypes_h = yes; then
 
@@ -8439,16 +7356,12 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking for unsigned long long int" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
 $as_echo_n "checking for unsigned long long int... " >&6; }
-if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then
+if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 unsigned long long int ull = 18446744073709551615ULL;
 	    typedef int a(18446744073709551615ULL <= (unsigned long long int) -1
@@ -8464,46 +7377,19 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_type_unsigned_long_long_int=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_unsigned_long_long_int=no
+  ac_cv_type_unsigned_long_long_int=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5
 $as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }
   if test $ac_cv_type_unsigned_long_long_int = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UNSIGNED_LONG_LONG_INT 1
-_ACEOF
+$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
 
   fi
 
@@ -8522,153 +7408,17 @@
 
   else
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UINTMAX_T 1
-_ACEOF
+$as_echo "#define HAVE_UINTMAX_T 1" >>confdefs.h
 
   fi
 
 
-
-for ac_header in inttypes.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+  for ac_header in inttypes.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default"
+if test "x$ac_cv_header_inttypes_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_INTTYPES_H 1
 _ACEOF
 
 fi
@@ -8676,17 +7426,13 @@
 done
 
   if test $ac_cv_header_inttypes_h = yes; then
-    { $as_echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the inttypes.h PRIxNN macros are broken" >&5
 $as_echo_n "checking whether the inttypes.h PRIxNN macros are broken... " >&6; }
-if test "${gt_cv_inttypes_pri_broken+set}" = set; then
+if test "${gt_cv_inttypes_pri_broken+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <inttypes.h>
 #ifdef PRId32
@@ -8701,36 +7447,15 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   gt_cv_inttypes_pri_broken=no
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_inttypes_pri_broken=yes
+  gt_cv_inttypes_pri_broken=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_inttypes_pri_broken" >&5
 $as_echo "$gt_cv_inttypes_pri_broken" >&6; }
   fi
   if test "$gt_cv_inttypes_pri_broken" = yes; then
@@ -8750,7 +7475,7 @@
 
 
     # Check whether --enable-threads was given.
-if test "${enable_threads+set}" = set; then
+if test "${enable_threads+set}" = set; then :
   enableval=$enable_threads; gl_use_threads=$enableval
 else
   case "$host_os" in
@@ -8803,7 +7528,7 @@
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
+if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
@@ -8825,7 +7550,7 @@
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
 $as_echo_n "checking for ld used by GCC... " >&6; }
   case $host in
   *-*-mingw*)
@@ -8855,13 +7580,13 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${acl_cv_path_LD+set}" = set; then
+if test "${acl_cv_path_LD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -8889,18 +7614,16 @@
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${acl_cv_prog_gnu_ld+set}" = set; then
+if test "${acl_cv_prog_gnu_ld+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
@@ -8911,16 +7634,16 @@
   acl_cv_prog_gnu_ld=no ;;
 esac
 fi
-{ $as_echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
 $as_echo "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
 
-                                                { $as_echo "$as_me:$LINENO: checking for shared library run path origin" >&5
+                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
 $as_echo_n "checking for shared library run path origin... " >&6; }
-if test "${acl_cv_rpath+set}" = set; then
+if test "${acl_cv_rpath+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -8931,7 +7654,7 @@
     acl_cv_rpath=done
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
 $as_echo "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
   acl_libext="$acl_cv_libext"
@@ -8943,7 +7666,7 @@
   acl_hardcode_direct="$acl_cv_hardcode_direct"
   acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
     # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then
+if test "${enable_rpath+set}" = set; then :
   enableval=$enable_rpath; :
 else
   enable_rpath=yes
@@ -8977,14 +7700,10 @@
   LIBMULTITHREAD=
   LTLIBMULTITHREAD=
   if test "$gl_use_threads" != no; then
-        { $as_echo "$as_me:$LINENO: checking whether imported symbols can be declared weak" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5
 $as_echo_n "checking whether imported symbols can be declared weak... " >&6; }
     gl_have_weak=no
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 extern void xyzzy ();
 #pragma weak xyzzy
@@ -8996,171 +7715,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   gl_have_weak=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-    { $as_echo "$as_me:$LINENO: result: $gl_have_weak" >&5
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_have_weak" >&5
 $as_echo "$gl_have_weak" >&6; }
     if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
       # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
       # it groks <pthread.h>. It's added above, in gl_LOCK_EARLY_BODY.
-      if test "${ac_cv_header_pthread_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for pthread.h" >&5
-$as_echo_n "checking for pthread.h... " >&6; }
-if test "${ac_cv_header_pthread_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
-$as_echo "$ac_cv_header_pthread_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking pthread.h usability" >&5
-$as_echo_n "checking pthread.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <pthread.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking pthread.h presence" >&5
-$as_echo_n "checking pthread.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <pthread.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: pthread.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: pthread.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: pthread.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: pthread.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for pthread.h" >&5
-$as_echo_n "checking for pthread.h... " >&6; }
-if test "${ac_cv_header_pthread_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_pthread_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
-$as_echo "$ac_cv_header_pthread_h" >&6; }
-
-fi
-if test "x$ac_cv_header_pthread_h" = x""yes; then
+      ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+if test "x$ac_cv_header_pthread_h" = x""yes; then :
   gl_have_pthread_h=yes
 else
   gl_have_pthread_h=no
@@ -9175,11 +7741,7 @@
         # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
         # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
         # the second one only in libpthread, and lock.c needs it.
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
@@ -9191,55 +7753,24 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   gl_have_pthread=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
         # Test for libpthread by looking for pthread_kill. (Not pthread_self,
         # since it is defined as a macro on OSF/1.)
         if test -n "$gl_have_pthread"; then
           # The program links fine without libpthread. But it may actually
           # need to link with libpthread in order to create multiple threads.
-          { $as_echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
 $as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then
+if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -9257,43 +7788,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pthread_pthread_kill=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pthread_pthread_kill=no
+  ac_cv_lib_pthread_pthread_kill=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_kill" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
 $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then
+if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then :
   LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
              # On Solaris and HP-UX, most pthread functions exist also in libc.
              # Therefore pthread_in_use() needs to actually try to create a
@@ -9302,9 +7808,7 @@
              case "$host_os" in
                solaris* | hpux*)
 
-cat >>confdefs.h <<\_ACEOF
-#define PTHREAD_IN_USE_DETECTION_HARD 1
-_ACEOF
+$as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
 
              esac
 
@@ -9312,18 +7816,14 @@
 
         else
           # Some library is needed. Try libpthread and libc_r.
-          { $as_echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
 $as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then
+if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -9341,43 +7841,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pthread_pthread_kill=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pthread_pthread_kill=no
+  ac_cv_lib_pthread_pthread_kill=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_kill" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
 $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then
+if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then :
   gl_have_pthread=yes
              LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
              LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
@@ -9385,18 +7860,14 @@
 
           if test -z "$gl_have_pthread"; then
             # For FreeBSD 4.
-            { $as_echo "$as_me:$LINENO: checking for pthread_kill in -lc_r" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5
 $as_echo_n "checking for pthread_kill in -lc_r... " >&6; }
-if test "${ac_cv_lib_c_r_pthread_kill+set}" = set; then
+if test "${ac_cv_lib_c_r_pthread_kill+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_r  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -9414,43 +7885,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_c_r_pthread_kill=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_c_r_pthread_kill=no
+  ac_cv_lib_c_r_pthread_kill=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_kill" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5
 $as_echo "$ac_cv_lib_c_r_pthread_kill" >&6; }
-if test "x$ac_cv_lib_c_r_pthread_kill" = x""yes; then
+if test "x$ac_cv_lib_c_r_pthread_kill" = x""yes; then :
   gl_have_pthread=yes
                LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
                LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r
@@ -9461,16 +7907,12 @@
         if test -n "$gl_have_pthread"; then
           gl_threads_api=posix
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_POSIX_THREADS 1
-_ACEOF
+$as_echo "#define USE_POSIX_THREADS 1" >>confdefs.h
 
           if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
             if test $gl_have_weak = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_POSIX_THREADS_WEAK 1
-_ACEOF
+$as_echo "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h
 
               LIBTHREAD=
               LTLIBTHREAD=
@@ -9478,116 +7920,16 @@
           fi
           # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
           # pthread_rwlock_* functions.
-          { $as_echo "$as_me:$LINENO: checking for pthread_rwlock_t" >&5
-$as_echo_n "checking for pthread_rwlock_t... " >&6; }
-if test "${ac_cv_type_pthread_rwlock_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_type_pthread_rwlock_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <pthread.h>
-
-int
-main ()
-{
-if (sizeof (pthread_rwlock_t))
-       return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <pthread.h>
-
-int
-main ()
-{
-if (sizeof ((pthread_rwlock_t)))
-	  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_pthread_rwlock_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pthread_rwlock_t" >&5
-$as_echo "$ac_cv_type_pthread_rwlock_t" >&6; }
-if test "x$ac_cv_type_pthread_rwlock_t" = x""yes; then
+          ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "#include <pthread.h>
+"
+if test "x$ac_cv_type_pthread_rwlock_t" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTHREAD_RWLOCK 1
-_ACEOF
+$as_echo "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h
 
 fi
 
           # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
@@ -9603,36 +7945,11 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-_ACEOF
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
 
+$as_echo "#define HAVE_PTHREAD_MUTEX_RECURSIVE 1" >>confdefs.h
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         fi
       fi
@@ -9642,11 +7959,7 @@
         gl_have_solaristhread=
         gl_save_LIBS="$LIBS"
         LIBS="$LIBS -lthread"
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <thread.h>
 #include <synch.h>
@@ -9658,38 +7971,11 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   gl_have_solaristhread=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
         LIBS="$gl_save_LIBS"
         if test -n "$gl_have_solaristhread"; then
           gl_threads_api=solaris
@@ -9698,15 +7984,11 @@
           LIBMULTITHREAD="$LIBTHREAD"
           LTLIBMULTITHREAD="$LTLIBTHREAD"
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_SOLARIS_THREADS 1
-_ACEOF
+$as_echo "#define USE_SOLARIS_THREADS 1" >>confdefs.h
 
           if test $gl_have_weak = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_SOLARIS_THREADS_WEAK 1
-_ACEOF
+$as_echo "#define USE_SOLARIS_THREADS_WEAK 1" >>confdefs.h
 
             LIBTHREAD=
             LTLIBTHREAD=
@@ -9721,9 +8003,9 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking how to link with libpth" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libpth" >&5
 $as_echo_n "checking how to link with libpth... " >&6; }
-if test "${ac_cv_libpth_libs+set}" = set; then
+if test "${ac_cv_libpth_libs+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9746,7 +8028,7 @@
 
 
 # Check whether --with-libpth-prefix was given.
-if test "${with_libpth_prefix+set}" = set; then
+if test "${with_libpth_prefix+set}" = set; then :
   withval=$with_libpth_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -10168,7 +8450,7 @@
     ac_cv_libpth_prefix="$LIBPTH_PREFIX"
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_libpth_libs" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libpth_libs" >&5
 $as_echo "$ac_cv_libpth_libs" >&6; }
   LIBPTH="$ac_cv_libpth_libs"
   LTLIBPTH="$ac_cv_libpth_ltlibs"
@@ -10207,11 +8489,7 @@
       gl_have_pth=
       gl_save_LIBS="$LIBS"
       LIBS="$LIBS -lpth"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pth.h>
 int
@@ -10222,38 +8500,11 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   gl_have_pth=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
       LIBS="$gl_save_LIBS"
       if test -n "$gl_have_pth"; then
         gl_threads_api=pth
@@ -10262,16 +8513,12 @@
         LIBMULTITHREAD="$LIBTHREAD"
         LTLIBMULTITHREAD="$LTLIBTHREAD"
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_PTH_THREADS 1
-_ACEOF
+$as_echo "#define USE_PTH_THREADS 1" >>confdefs.h
 
         if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
           if test $gl_have_weak = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_PTH_THREADS_WEAK 1
-_ACEOF
+$as_echo "#define USE_PTH_THREADS_WEAK 1" >>confdefs.h
 
             LIBTHREAD=
             LTLIBTHREAD=
@@ -10290,17 +8537,15 @@
            }; then
           gl_threads_api=win32
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_WIN32_THREADS 1
-_ACEOF
+$as_echo "#define USE_WIN32_THREADS 1" >>confdefs.h
 
         fi
       fi
     fi
   fi
-  { $as_echo "$as_me:$LINENO: checking for multithread API to use" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for multithread API to use" >&5
 $as_echo_n "checking for multithread API to use... " >&6; }
-  { $as_echo "$as_me:$LINENO: result: $gl_threads_api" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_threads_api" >&5
 $as_echo "$gl_threads_api" >&6; }
 
 
@@ -10337,7 +8582,7 @@
 
 
 # Check whether --with-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then
+if test "${with_libiconv_prefix+set}" = set; then :
   withval=$with_libiconv_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -10757,11 +9002,7 @@
 
 
 
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }
 int
@@ -10772,185 +9013,19 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BUILTIN_EXPECT 1
-_ACEOF
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-
-
-
-
-
-
-for ac_header in argz.h inttypes.h limits.h unistd.h sys/param.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
+if ac_fn_c_try_link "$LINENO"; then :
 
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+$as_echo "#define HAVE_BUILTIN_EXPECT 1" >>confdefs.h
 
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+  for ac_header in argz.h inttypes.h limits.h unistd.h sys/param.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -10959,117 +9034,13 @@
 
 done
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in getcwd getegid geteuid getgid getuid mempcpy munmap \
+  for ac_func in getcwd getegid geteuid getgid getuid mempcpy munmap \
     stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \
     argz_next __fsetlocking
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -11079,16 +9050,12 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether feof_unlocked is declared" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether feof_unlocked is declared" >&5
 $as_echo_n "checking whether feof_unlocked is declared... " >&6; }
-if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then
+if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
@@ -11103,35 +9070,14 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_have_decl_feof_unlocked=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_feof_unlocked=no
+  ac_cv_have_decl_feof_unlocked=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_feof_unlocked" >&5
 $as_echo "$ac_cv_have_decl_feof_unlocked" >&6; }
   if test $ac_cv_have_decl_feof_unlocked = yes; then
     gt_value=1
@@ -11145,16 +9091,12 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fgets_unlocked is declared" >&5
 $as_echo_n "checking whether fgets_unlocked is declared... " >&6; }
-if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then
+if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
@@ -11169,35 +9111,14 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_have_decl_fgets_unlocked=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_fgets_unlocked=no
+  ac_cv_have_decl_fgets_unlocked=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_fgets_unlocked" >&5
 $as_echo "$ac_cv_have_decl_fgets_unlocked" >&6; }
   if test $ac_cv_have_decl_fgets_unlocked = yes; then
     gt_value=1
@@ -11241,19 +9162,15 @@
   done
 
 
-  { $as_echo "$as_me:$LINENO: checking for iconv" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 $as_echo_n "checking for iconv... " >&6; }
-if test "${am_cv_func_iconv+set}" = set; then
+if test "${am_cv_func_iconv+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <iconv.h>
@@ -11267,46 +9184,15 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_func_iconv=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <iconv.h>
@@ -11320,49 +9206,22 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
 $as_echo "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
-    { $as_echo "$as_me:$LINENO: checking for working iconv" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 $as_echo_n "checking for working iconv... " >&6; }
-if test "${am_cv_func_iconv_works+set}" = set; then
+if test "${am_cv_func_iconv_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -11370,17 +9229,13 @@
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
-      if test "$cross_compiling" = yes; then
+      if test "$cross_compiling" = yes; then :
   case "$host_os" in
            aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
            *)            am_cv_func_iconv_works="guessing yes" ;;
          esac
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <iconv.h>
@@ -11440,46 +9295,19 @@
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   am_cv_func_iconv_works=yes
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-am_cv_func_iconv_works=no
+  am_cv_func_iconv_works=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
       LIBS="$am_save_LIBS"
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_func_iconv_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
 $as_echo "$am_cv_func_iconv_works" >&6; }
     case "$am_cv_func_iconv_works" in
       *no) am_func_iconv=no am_cv_lib_iconv=no ;;
@@ -11490,15 +9318,13 @@
   fi
   if test "$am_func_iconv" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV 1
-_ACEOF
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { $as_echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
 $as_echo_n "checking how to link with libiconv... " >&6; }
-    { $as_echo "$as_me:$LINENO: result: $LIBICONV" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
 $as_echo "$LIBICONV" >&6; }
   else
             CPPFLAGS="$am_save_CPPFLAGS"
@@ -11509,17 +9335,13 @@
 
 
   if test "$am_cv_func_iconv" = yes; then
-    { $as_echo "$as_me:$LINENO: checking for iconv declaration" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
 $as_echo_n "checking for iconv declaration... " >&6; }
-    if test "${am_cv_proto_iconv+set}" = set; then
+    if test "${am_cv_proto_iconv+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdlib.h>
@@ -11542,38 +9364,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   am_cv_proto_iconv_arg1=""
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	am_cv_proto_iconv_arg1="const"
+  am_cv_proto_iconv_arg1="const"
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
 fi
 
     am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    { $as_echo "$as_me:$LINENO: result: ${ac_t:-
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
          }$am_cv_proto_iconv" >&5
 $as_echo "${ac_t:-
          }$am_cv_proto_iconv" >&6; }
@@ -11585,16 +9386,12 @@
   fi
 
 
-      { $as_echo "$as_me:$LINENO: checking for NL_LOCALE_NAME macro" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NL_LOCALE_NAME macro" >&5
 $as_echo_n "checking for NL_LOCALE_NAME macro... " >&6; }
-if test "${gt_cv_nl_locale_name+set}" = set; then
+if test "${gt_cv_nl_locale_name+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <langinfo.h>
 #include <locale.h>
@@ -11608,47 +9405,20 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   gt_cv_nl_locale_name=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_nl_locale_name=no
+  gt_cv_nl_locale_name=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_nl_locale_name" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_nl_locale_name" >&5
 $as_echo "$gt_cv_nl_locale_name" >&6; }
   if test $gt_cv_nl_locale_name = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NL_LOCALE_NAME 1
-_ACEOF
+$as_echo "#define HAVE_NL_LOCALE_NAME 1" >>confdefs.h
 
   fi
 
@@ -11656,9 +9426,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_INTLBISON+set}" = set; then
+if test "${ac_cv_prog_INTLBISON+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$INTLBISON"; then
@@ -11669,24 +9439,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_INTLBISON="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  { $as_echo "$as_me:$LINENO: result: $INTLBISON" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLBISON" >&5
 $as_echo "$INTLBISON" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -11697,7 +9467,7 @@
   if test -z "$INTLBISON"; then
     ac_verc_fail=yes
   else
-        { $as_echo "$as_me:$LINENO: checking version of bison" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of bison" >&5
 $as_echo_n "checking version of bison... " >&6; }
     ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* $0-9*\.0-9.*$.*$/\1/p'`
     case $ac_prog_version in
@@ -11706,7 +9476,7 @@
          ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
       *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
     esac
-    { $as_echo "$as_me:$LINENO: result: $ac_prog_version" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5
 $as_echo "$ac_prog_version" >&6; }
   fi
   if test $ac_verc_fail = yes; then
@@ -11714,19 +9484,15 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking for long long int" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
 $as_echo_n "checking for long long int... " >&6; }
-if test "${ac_cv_type_long_long_int+set}" = set; then
+if test "${ac_cv_type_long_long_int+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-  /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-/* Test preprocessor.  */
+
+  /* Test preprocessor.  */
       #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
         error in preprocessor;
       #endif
@@ -11758,35 +9524,11 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  			if test "$cross_compiling" = yes; then
+if ac_fn_c_try_link "$LINENO"; then :
+  			if test "$cross_compiling" = yes; then :
   ac_cv_type_long_long_int=yes
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
 	       #ifndef LLONG_MAX
@@ -11812,74 +9554,36 @@
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_type_long_long_int=yes
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_type_long_long_int=no
+  ac_cv_type_long_long_int=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long_long_int=no
+  ac_cv_type_long_long_int=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
 $as_echo "$ac_cv_type_long_long_int" >&6; }
   if test $ac_cv_type_long_long_int = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LONG_LONG_INT 1
-_ACEOF
+$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
 
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking for wchar_t" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
 $as_echo_n "checking for wchar_t... " >&6; }
-if test "${gt_cv_c_wchar_t+set}" = set; then
+if test "${gt_cv_c_wchar_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
        wchar_t foo = (wchar_t)'\0';
@@ -11891,55 +9595,28 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   gt_cv_c_wchar_t=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_c_wchar_t=no
+  gt_cv_c_wchar_t=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
 $as_echo "$gt_cv_c_wchar_t" >&6; }
   if test $gt_cv_c_wchar_t = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WCHAR_T 1
-_ACEOF
+$as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
 
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking for wint_t" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
 $as_echo_n "checking for wint_t... " >&6; }
-if test "${gt_cv_c_wint_t+set}" = set; then
+if test "${gt_cv_c_wint_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -11959,57 +9636,30 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   gt_cv_c_wint_t=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_c_wint_t=no
+  gt_cv_c_wint_t=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
 $as_echo "$gt_cv_c_wint_t" >&6; }
   if test $gt_cv_c_wint_t = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WINT_T 1
-_ACEOF
+$as_echo "#define HAVE_WINT_T 1" >>confdefs.h
 
   fi
 
 
 
 
-  { $as_echo "$as_me:$LINENO: checking for intmax_t" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intmax_t" >&5
 $as_echo_n "checking for intmax_t... " >&6; }
-if test "${gt_cv_c_intmax_t+set}" = set; then
+if test "${gt_cv_c_intmax_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stddef.h>
@@ -12030,59 +9680,32 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   gt_cv_c_intmax_t=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_c_intmax_t=no
+  gt_cv_c_intmax_t=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_intmax_t" >&5
 $as_echo "$gt_cv_c_intmax_t" >&6; }
   if test $gt_cv_c_intmax_t = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_INTMAX_T 1
-_ACEOF
+$as_echo "#define HAVE_INTMAX_T 1" >>confdefs.h
 
   fi
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether printf() supports POSIX/XSI format strings" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether printf() supports POSIX/XSI format strings" >&5
 $as_echo_n "checking whether printf() supports POSIX/XSI format strings... " >&6; }
-if test "${gt_cv_func_printf_posix+set}" = set; then
+if test "${gt_cv_func_printf_posix+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-      if test "$cross_compiling" = yes; then
+      if test "$cross_compiling" = yes; then :
 
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
@@ -12091,7 +9714,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "notposix" >/dev/null 2>&1; then
+  $EGREP "notposix" >/dev/null 2>&1; then :
   gt_cv_func_printf_posix="guessing no"
 else
   gt_cv_func_printf_posix="guessing yes"
@@ -12100,11 +9723,7 @@
 
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -12119,67 +9738,34 @@
   return (strcmp (buf, "55 33") != 0);
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   gt_cv_func_printf_posix=yes
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gt_cv_func_printf_posix=no
+  gt_cv_func_printf_posix=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
-
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_printf_posix" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_printf_posix" >&5
 $as_echo "$gt_cv_func_printf_posix" >&6; }
   case $gt_cv_func_printf_posix in
     *yes)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_POSIX_PRINTF 1
-_ACEOF
+$as_echo "#define HAVE_POSIX_PRINTF 1" >>confdefs.h
 
       ;;
   esac
 
 
-    { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2.1 or newer" >&5
 $as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; }
-if test "${ac_cv_gnu_library_2_1+set}" = set; then
+if test "${ac_cv_gnu_library_2_1+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <features.h>
@@ -12191,7 +9777,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky GNU user" >/dev/null 2>&1; then
+  $EGREP "Lucky GNU user" >/dev/null 2>&1; then :
   ac_cv_gnu_library_2_1=yes
 else
   ac_cv_gnu_library_2_1=no
@@ -12201,171 +9787,33 @@
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5
 $as_echo "$ac_cv_gnu_library_2_1" >&6; }
 
     GLIBC21="$ac_cv_gnu_library_2_1"
 
 
 
-
-for ac_header in stdint.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+  for ac_header in stdint.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdint_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_STDINT_H 1
 _ACEOF
 
 fi
 
 done
 
-    { $as_echo "$as_me:$LINENO: checking for SIZE_MAX" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5
 $as_echo_n "checking for SIZE_MAX... " >&6; }
-  if test "${gl_cv_size_max+set}" = set; then
+  if test "${gl_cv_size_max+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
     gl_cv_size_max=
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <limits.h>
@@ -12378,663 +9826,28 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Found it" >/dev/null 2>&1; then
+  $EGREP "Found it" >/dev/null 2>&1; then :
   gl_cv_size_max=yes
 fi
 rm -f conftest*
 
     if test -z "$gl_cv_size_max"; then
-                        if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-#include <limits.h>
-int
-main ()
-{
-static int test_array 1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) >= 0);
-test_array 0 = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-#include <limits.h>
-int
-main ()
-{
-static int test_array 1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) <= $ac_mid);
-test_array 0 = 0
+                        if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) * CHAR_BIT - 1" "size_t_bits_minus_1"        "#include <stddef.h>
+#include <limits.h>"; then :
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
+  size_t_bits_minus_1=
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-#include <limits.h>
-int
-main ()
-{
-static int test_array 1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) < 0);
-test_array 0 = 0
+      if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) <= sizeof (unsigned int)" "fits_in_uint"        "#include <stddef.h>"; then :
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-#include <limits.h>
-int
-main ()
-{
-static int test_array 1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) >= $ac_mid);
-test_array 0 = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
+  fits_in_uint=
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-#include <limits.h>
-int
-main ()
-{
-static int test_array 1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) <= $ac_mid);
-test_array 0 = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) size_t_bits_minus_1=$ac_lo;;
-'') size_t_bits_minus_1= ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-#include <limits.h>
-static long int longval () { return sizeof (size_t) * CHAR_BIT - 1; }
-static unsigned long int ulongval () { return sizeof (size_t) * CHAR_BIT - 1; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if ((sizeof (size_t) * CHAR_BIT - 1) < 0)
-    {
-      long int i = longval ();
-      if (i != (sizeof (size_t) * CHAR_BIT - 1))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != (sizeof (size_t) * CHAR_BIT - 1))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  size_t_bits_minus_1=`cat conftest.val`
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-size_t_bits_minus_1=
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-      if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array 1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= 0);
-test_array 0 = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array 1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid);
-test_array 0 = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array 1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) < 0);
-test_array 0 = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array 1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= $ac_mid);
-test_array 0 = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array 1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid);
-test_array 0 = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) fits_in_uint=$ac_lo;;
-'') fits_in_uint= ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stddef.h>
-static long int longval () { return sizeof (size_t) <= sizeof (unsigned int); }
-static unsigned long int ulongval () { return sizeof (size_t) <= sizeof (unsigned int); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if ((sizeof (size_t) <= sizeof (unsigned int)) < 0)
-    {
-      long int i = longval ();
-      if (i != (sizeof (size_t) <= sizeof (unsigned int)))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != (sizeof (size_t) <= sizeof (unsigned int)))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  fits_in_uint=`cat conftest.val`
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-fits_in_uint=
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
       if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
         if test $fits_in_uint = 1; then
-                              cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
             extern size_t foo;
@@ -13048,32 +9861,9 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   fits_in_uint=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         fi
                                 if test $fits_in_uint = 1; then
@@ -13088,7 +9878,7 @@
 
 fi
 
-  { $as_echo "$as_me:$LINENO: result: $gl_cv_size_max" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_size_max" >&5
 $as_echo "$gl_cv_size_max" >&6; }
   if test "$gl_cv_size_max" != yes; then
 
@@ -13101,146 +9891,12 @@
 
 
 
-
-for ac_header in stdint.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+  for ac_header in stdint.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdint_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_STDINT_H 1
 _ACEOF
 
 fi
@@ -13249,18 +9905,14 @@
 
 
 
-    { $as_echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
+if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <CoreFoundation/CFPreferences.h>
 int
@@ -13271,61 +9923,30 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   gt_cv_func_CFPreferencesCopyAppValue=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_func_CFPreferencesCopyAppValue=no
+  gt_cv_func_CFPreferencesCopyAppValue=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
      LIBS="$gt_save_LIBS"
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
 $as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
-_ACEOF
+$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
 
   fi
-    { $as_echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
 $as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
+if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <CoreFoundation/CFLocale.h>
 int
@@ -13336,47 +9957,20 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   gt_cv_func_CFLocaleCopyCurrent=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_func_CFLocaleCopyCurrent=no
+  gt_cv_func_CFLocaleCopyCurrent=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
      LIBS="$gt_save_LIBS"
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
 $as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
   if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CFLOCALECOPYCURRENT 1
-_ACEOF
+$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
 
   fi
   INTL_MACOSX_LIBS=
@@ -13390,251 +9984,21 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
-$as_echo_n "checking for ptrdiff_t... " >&6; }
-if test "${ac_cv_type_ptrdiff_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_type_ptrdiff_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (ptrdiff_t))
-       return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((ptrdiff_t)))
-	  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_ptrdiff_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
-$as_echo "$ac_cv_type_ptrdiff_t" >&6; }
-if test "x$ac_cv_type_ptrdiff_t" = x""yes; then
-  :
-else
-
-cat >>confdefs.h <<\_ACEOF
-#define ptrdiff_t long
-_ACEOF
-
-
-fi
-
-
-
-
-for ac_header in stddef.h stdlib.h string.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+  ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
+if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
 
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-  ac_header_preproc=no
-fi
+$as_echo "#define ptrdiff_t long" >>confdefs.h
 
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
 
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+  for ac_header in stddef.h stdlib.h string.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -13643,106 +10007,11 @@
 
 done
 
-
-
-
-
-
-
-
-for ac_func in asprintf fwprintf putenv setenv setlocale snprintf wcslen
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+  for ac_func in asprintf fwprintf putenv setenv setlocale snprintf wcslen
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -13752,16 +10021,12 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether _snprintf is declared" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _snprintf is declared" >&5
 $as_echo_n "checking whether _snprintf is declared... " >&6; }
-if test "${ac_cv_have_decl__snprintf+set}" = set; then
+if test "${ac_cv_have_decl__snprintf+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
@@ -13776,35 +10041,14 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_have_decl__snprintf=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl__snprintf=no
+  ac_cv_have_decl__snprintf=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl__snprintf" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl__snprintf" >&5
 $as_echo "$ac_cv_have_decl__snprintf" >&6; }
   if test $ac_cv_have_decl__snprintf = yes; then
     gt_value=1
@@ -13818,16 +10062,12 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether _snwprintf is declared" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _snwprintf is declared" >&5
 $as_echo_n "checking whether _snwprintf is declared... " >&6; }
-if test "${ac_cv_have_decl__snwprintf+set}" = set; then
+if test "${ac_cv_have_decl__snwprintf+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
@@ -13842,35 +10082,14 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_have_decl__snwprintf=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl__snwprintf=no
+  ac_cv_have_decl__snwprintf=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl__snwprintf" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl__snwprintf" >&5
 $as_echo "$ac_cv_have_decl__snwprintf" >&6; }
   if test $ac_cv_have_decl__snwprintf = yes; then
     gt_value=1
@@ -13885,16 +10104,12 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getc_unlocked is declared" >&5
 $as_echo_n "checking whether getc_unlocked is declared... " >&6; }
-if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
+if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
@@ -13909,35 +10124,14 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_have_decl_getc_unlocked=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_getc_unlocked=no
+  ac_cv_have_decl_getc_unlocked=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_getc_unlocked" >&5
 $as_echo "$ac_cv_have_decl_getc_unlocked" >&6; }
   if test $ac_cv_have_decl_getc_unlocked = yes; then
     gt_value=1
@@ -13976,16 +10170,12 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
 $as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
-if test "${am_cv_langinfo_codeset+set}" = set; then
+if test "${am_cv_langinfo_codeset+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <langinfo.h>
 int
@@ -13996,61 +10186,30 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_langinfo_codeset=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	am_cv_langinfo_codeset=no
+  am_cv_langinfo_codeset=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
 $as_echo "$am_cv_langinfo_codeset" >&6; }
   if test $am_cv_langinfo_codeset = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LANGINFO_CODESET 1
-_ACEOF
+$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
 
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
 $as_echo_n "checking for LC_MESSAGES... " >&6; }
-if test "${gt_cv_val_LC_MESSAGES+set}" = set; then
+if test "${gt_cv_val_LC_MESSAGES+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <locale.h>
 int
@@ -14061,46 +10220,19 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   gt_cv_val_LC_MESSAGES=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_val_LC_MESSAGES=no
+  gt_cv_val_LC_MESSAGES=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_val_LC_MESSAGES" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_val_LC_MESSAGES" >&5
 $as_echo "$gt_cv_val_LC_MESSAGES" >&6; }
   if test $gt_cv_val_LC_MESSAGES = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LC_MESSAGES 1
-_ACEOF
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
 
   fi
 
@@ -14126,9 +10258,9 @@
         if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_WINDRES+set}" = set; then
+if test "${ac_cv_prog_WINDRES+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$WINDRES"; then
@@ -14139,24 +10271,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 WINDRES=$ac_cv_prog_WINDRES
 if test -n "$WINDRES"; then
-  { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
 $as_echo "$WINDRES" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -14166,9 +10298,9 @@
   ac_ct_WINDRES=$WINDRES
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
+if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_WINDRES"; then
@@ -14179,24 +10311,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_WINDRES="windres"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
 if test -n "$ac_ct_WINDRES"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
 $as_echo "$ac_ct_WINDRES" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -14205,7 +10337,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -14247,19 +10379,14 @@
 
 
 
-
-    { $as_echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
+if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <CoreFoundation/CFPreferences.h>
 int
@@ -14270,61 +10397,30 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   gt_cv_func_CFPreferencesCopyAppValue=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_func_CFPreferencesCopyAppValue=no
+  gt_cv_func_CFPreferencesCopyAppValue=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
      LIBS="$gt_save_LIBS"
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
 $as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
-_ACEOF
+$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
 
   fi
-    { $as_echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
 $as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
+if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <CoreFoundation/CFLocale.h>
 int
@@ -14335,47 +10431,20 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   gt_cv_func_CFLocaleCopyCurrent=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_func_CFLocaleCopyCurrent=no
+  gt_cv_func_CFLocaleCopyCurrent=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
      LIBS="$gt_save_LIBS"
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
 $as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
   if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CFLOCALECOPYCURRENT 1
-_ACEOF
+$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
 
   fi
   INTL_MACOSX_LIBS=
@@ -14406,17 +10475,17 @@
     if test "$USE_NLS" = "yes"; then
     gt_use_preinstalled_gnugettext=no
 
-      { $as_echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether included gettext is requested" >&5
 $as_echo_n "checking whether included gettext is requested... " >&6; }
 
 # Check whether --with-included-gettext was given.
-if test "${with_included_gettext+set}" = set; then
+if test "${with_included_gettext+set}" = set; then :
   withval=$with_included_gettext; nls_cv_force_use_gnu_gettext=$withval
 else
   nls_cv_force_use_gnu_gettext=no
 fi
 
-      { $as_echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $nls_cv_force_use_gnu_gettext" >&5
 $as_echo "$nls_cv_force_use_gnu_gettext" >&6; }
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
@@ -14439,16 +10508,12 @@
           gt_expression_test_code=
         fi
 
-        { $as_echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
 $as_echo_n "checking for GNU gettext in libc... " >&6; }
-if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then
+if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <libintl.h>
 $gt_revision_test_code
@@ -14463,42 +10528,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$gt_func_gnugettext_libc=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$gt_func_gnugettext_libc=no"
+  eval "$gt_func_gnugettext_libc=no"
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval 'as_val=${'$gt_func_gnugettext_libc'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+eval ac_res=\$$gt_func_gnugettext_libc
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 
         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
@@ -14522,7 +10561,7 @@
 
 
 # Check whether --with-libintl-prefix was given.
-if test "${with_libintl_prefix+set}" = set; then
+if test "${with_libintl_prefix+set}" = set; then :
   withval=$with_libintl_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -14938,20 +10977,16 @@
     done
   fi
 
-          { $as_echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
 $as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then
+if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
-                        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <libintl.h>
 $gt_revision_test_code
@@ -14970,45 +11005,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$gt_func_gnugettext_libintl=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$gt_func_gnugettext_libintl=no"
+  eval "$gt_func_gnugettext_libintl=no"
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
                         if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
-              cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <libintl.h>
 $gt_revision_test_code
@@ -15027,48 +11033,20 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
                 eval "$gt_func_gnugettext_libintl=yes"
 
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS"
 fi
-ac_res=`eval 'as_val=${'$gt_func_gnugettext_libintl'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+eval ac_res=\$$gt_func_gnugettext_libintl
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
         fi
 
@@ -15115,21 +11093,19 @@
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_NLS 1
-_ACEOF
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
 
     else
       USE_NLS=no
     fi
   fi
 
-  { $as_echo "$as_me:$LINENO: checking whether to use NLS" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
 $as_echo_n "checking whether to use NLS... " >&6; }
-  { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
 $as_echo "$USE_NLS" >&6; }
   if test "$USE_NLS" = "yes"; then
-    { $as_echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
 $as_echo_n "checking where the gettext function comes from... " >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
@@ -15140,7 +11116,7 @@
     else
       gt_source="included intl directory"
     fi
-    { $as_echo "$as_me:$LINENO: result: $gt_source" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
 $as_echo "$gt_source" >&6; }
   fi
 
@@ -15148,9 +11124,9 @@
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        { $as_echo "$as_me:$LINENO: checking how to link with libintl" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
 $as_echo_n "checking how to link with libintl... " >&6; }
-        { $as_echo "$as_me:$LINENO: result: $LIBINTL" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
 $as_echo "$LIBINTL" >&6; }
 
   for element in $INCINTL; do
@@ -15178,14 +11154,10 @@
       fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETTEXT 1
-_ACEOF
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DCGETTEXT 1
-_ACEOF
+$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
 
     fi
 
@@ -15266,13 +11238,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -15280,8 +11252,8 @@
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\$_$as_cr_alnum*_cv__$as_cr_alnum*\$=\$.*\$/\\1='\\2'/p"
@@ -15304,11 +11276,11 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -15322,42 +11294,50 @@
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
 LTLIBOBJS=$ac_ltlibobjs
 
 
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -15367,17 +11347,18 @@
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -15385,23 +11366,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -15409,7 +11382,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -15420,7 +11399,7 @@
     as_echo_body='eval expr "X$1" : "X\$.*\$"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\$.*\$$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
@@ -15443,13 +11422,6 @@
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -15459,15 +11431,15 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
   *\\/* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -15479,12 +11451,16 @@
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -15496,7 +11472,89 @@
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR LINENO LOG_FD
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
 if expr a : '$a$' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*$...$'`" = X001; then
   as_expr=expr
@@ -15510,8 +11568,12 @@
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
 	 X"$0" : 'X$//$$' \| \
@@ -15531,76 +11593,25 @@
 	  }
 	  s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /$LINENO/=
-  ' <$as_myself |
-    sed '
-      s/$LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/$LINENO$^'$as_cr_alnum'_.*\n$$.*$/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $0, causing all sort of problems
-  # (the dirname of $0 is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '$a$' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*$...$'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -15629,8 +11640,56 @@
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X$.*^/$//*^/^/*/*$' \| \
+	 X"$as_dir" : 'X$//$^/' \| \
+	 X"$as_dir" : 'X$//$$' \| \
+	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X$.*^/$\/\/*^/^/*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$^/.*/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -15649,10 +11708,10 @@
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???sx*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -15667,13 +11726,19 @@
 
 
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-# Save the log message, to keep $0 and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+This file was extended by gentoo $as_me 0.19.9, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -15705,13 +11770,15 @@
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 OPTION... FILE...
+Usage: $0 OPTION... TAG...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -15730,16 +11797,18 @@
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to <emil@obsession.se>.
+gentoo home page: <http://obsession.se/gentoo/>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
 ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.63,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`\\"
+gentoo config.status 0.19.9
+configured by $0, generated by GNU Autoconf 2.67,
+  with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -15757,11 +11826,16 @@
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X$^=*$='`
     ac_optarg=`expr "X$1" : 'X^=*=$.*$'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X$^=*$='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -15775,27 +11849,29 @@
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -15803,11 +11879,10 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1"
+  *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
 
   esac
@@ -15878,9 +11953,7 @@
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
 
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
   esac
 done
 
@@ -15907,7 +11980,7 @@
   trap 'exit_status=$?
   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
@@ -15918,11 +11991,7 @@
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -15930,7 +11999,13 @@
 if test -n "$CONFIG_FILES"; then
 
 
-ac_cr='
'
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
   ac_cs_awk_cr='\\r'
@@ -15947,24 +12022,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -15986,7 +12055,7 @@
 t delim
 :nl
 h
-s/$.\{148\}$.*/\1/
+s/$.\{148\}$..*/\1/
 t more1
 s/"\\/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -16000,7 +12069,7 @@
 t nl
 :delim
 h
-s/$.\{148\}$.*/\1/
+s/$.\{148\}$..*/\1/
 t more2
 s/"\\/\\&/g; s/^/"/; s/$/"/
 p
@@ -16053,22 +12122,28 @@
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^	 *VPATH	 *=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^$^=*=	 *$:*/\1/
+  ac_vpsub='/^	 *VPATH	 *=	 */{
+h
+s///
+s/^/:/
+s/	 *$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/$=	 *$.*/\1/
+G
+s/\n//
 s/^^=*=	 *$//
 }'
 fi
@@ -16096,9 +12171,7 @@
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -16183,9 +12256,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -16198,9 +12269,7 @@
   esac
   case $ac_mode$ac_tag in
   :FHL*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-   { (exit 1); exit 1; }; };;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
   :FH-) ac_tag=-:-;;
   :FH*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -16228,12 +12297,10 @@
 	   \\/$*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
+      as_fn_append ac_file_inputs " '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -16244,7 +12311,7 @@
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
@@ -16257,9 +12324,7 @@
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
     esac
     ;;
   esac
@@ -16287,47 +12352,7 @@
 	    q
 	  }
 	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$as_dir" : 'X$//$^/' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$^/.*/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
@@ -16384,7 +12409,6 @@
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
-
 ac_sed_dataroot='
 /datarootdir/ {
   p
@@ -16394,12 +12418,11 @@
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p
-'
+/@mandir@/p'
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -16409,7 +12432,7 @@
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
+  s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
@@ -16438,26 +12461,22 @@
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^	 *datarootdir	 *:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -16468,25 +12487,19 @@
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -16524,7 +12537,7 @@
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
 $as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
@@ -16619,47 +12632,7 @@
 	    q
 	  }
 	  s/.*/./; q'`
-      { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$as_dir" : 'X$//$^/' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$^/.*/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
       # echo "creating $dirpart/$file"
       echo '# dummy' > "$dirpart/$file"
     done
@@ -16784,15 +12757,12 @@
 done # for ac_tag
 
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _ACEOF
-chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -16813,10 +12783,11 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+

gentoo-0.15.6.tar.bz2/configure.in -> gentoo-0.19.9.tar.gz/configure.in Changed

@@ -2,21 +2,14 @@
 # Initialize everything
 # -----------------------------------------------------------------------------
 
-AC_INIT(src/gentoo.c)
+AC_INIT(gentoo, 0.19.9, emil@obsession.se, , http://obsession.se/gentoo/)
+AC_CONFIG_SRCDIR(src/gentoo.c)
+AM_INIT_AUTOMAKE
+          
+AC_USE_SYSTEM_EXTENSIONS
 
-AC_GNU_SOURCE
-
-gentoo_major_version=0
-gentoo_minor_version=15
-gentoo_micro_version=6
-
-AM_INIT_AUTOMAKE(gentoo,$gentoo_major_version.$gentoo_minor_version.$gentoo_micro_version)
-
-AC_DEFINE_UNQUOTED(GENTOO_MAJOR_VERSION,$gentoo_major_version,Major version.)
-AC_DEFINE_UNQUOTED(GENTOO_MINOR_VERSION,$gentoo_minor_version,Minor version.)
-AC_DEFINE_UNQUOTED(GENTOO_MICRO_VERSION,$gentoo_micro_version,Minor version.)
-
-AC_DEFINE_UNQUOTED(GTK_ENABLE_BROKEN, , "Makes GTK+ bring in obsolete/broken widgets such as GtkTree)
+AC_DEFINE(GTK_DISABLE_DEPRECATED, 1, Makes GTK+ disable all backward support for old widgets and API:s.)
+AC_DEFINE(GTK_DISABLE_COMPAT_H, 1, Makes GTK+ disable old 1.0.6 compatibility.)
 
 DATE=`date +%Y-%m-%d`
 
@@ -47,8 +40,16 @@
 
 AC_PROG_CPP
 AC_PROG_RANLIB
-AM_PATH_GLIB_2_0(2.14.0,,AC_MSG_ERROR(Bad glib version))
-AM_PATH_GTK_2_0(2.2.0,,AC_MSG_ERROR(Bad GTK+ version))
+AM_PATH_GLIB_2_0(2.24.0,,AC_MSG_ERROR(Bad GLIB version))
+AM_PATH_GTK_2_0(2.18.0,,AC_MSG_ERROR(Bad GTK+ version))
+
+
+PKG_PROG_PKG_CONFIG()
+
+PKG_CHECK_MODULES(MODULES, gio-2.0 gthread-2.0, dummy=yes, AC_MSG_ERROR(GIO and gthread are both required))
+AC_SUBST(MODULES_CFLAGS)
+AC_SUBST(MODULES_LIBS)
+
 
 dnl Let's try to test if the host supports "file -f - -n", i.e. if the file
 dnl command can read file names from stdin (-f -) and also flush (-n) its
@@ -72,34 +73,6 @@
 fi
 
 
-dnl Let's see if host supports FAM, so we can use it to automatically
-dnl refresh panes when things change. We do dual testing, just because
-dnl it feels safer: first investigate if -lfam contains the expected
-dnl stuff, then see if a #include <fam.h> works. Hand me that belt.
-testfam=yes
-AC_ARG_ENABLE(fam,
-   AC_HELP_STRING(--disable-fam, do not look for FAM (File Alteration Monitor) (default is to use FAM if found)),
-   if test "x$enableval" = "xno" ; then
-      testfam=no
-    fi,
-   testfam=yes)
-if test "x$testfam" = "xyes" ; then
-  AC_SEARCH_LIBS(FAMOpen, fam, famlib=yes, famlib=no, , C)
-fi
-if test "x$famlib" = "xyes" ; then
-   AC_MSG_CHECKING(whether FAM test program compiles)
-   AC_TRY_COMPILE(
-    #include <fam.h>, 
-    int main(void)
-    {
-     FAMConnection c;
-     return FAMOpen(&c) == 0;
-    },
-    AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FAM, 1, Whether the host supports SGI's FAM technology.),
-    AC_MSG_RESULT(no))
-fi
-
-
 dnl For my next trick, let's see if _FILE_OFFSET_BITS can be played with for large file support.
 dnl We do this in two steps: first figure out struct stat's st_size member's size for a "plain
 dnl compile, and it that's just 32 we try again with _FILE_OFFSET_BITS=64 defined. If that works,
@@ -139,22 +112,11 @@
   AC_MSG_RESULT($bits)
 fi
 
+dnl Check if the math library needs to be linked to explicitly in order to
+dnl get the pow() function.
+AC_CHECK_LIB(m, pow)
 
-dnl Let's try and get a grip on the host's idea of statvfs() vs statfs(),
-dnl and the related structure name. Should help clean out platform-specific
-dnl tests in the actual code, and thus approach The Point of Autoconf.
-AC_CHECK_MEMBER(struct statvfs.f_bsize,
-  AC_DEFINE(HAVE_STRUCT_STATVFS, 1, Whether host supports <sys/statvfs.h> and struct statvfs.)
-   statfs=statvfs,
-  AC_CHECK_MEMBER(struct statfs.f_bsize,
-     AC_DEFINE(HAVE_STRUCT_STATFS, 1, Whether host supports <sys/statfs.h> and struct statfs.)
-      statfs=statfs,
-      statfs=failed,
-     #include <sys/statfs.h>),
-  #include <sys/statvfs.h>)
 
-dnl Tests are missing here. It would be nice to have tests to check
-dnl the mntent_wrap.c stuff.
 
 dnl Kick the gettext subsystem into action.
 dnl We include an obsolete ALL_LINGUAS setting to keep Automake quiet, but
@@ -169,3 +131,4 @@
 AM_CONFIG_HEADER(config.h)
 AC_OUTPUT(gentoorc gentoogtkrc gentoo.spec Makefile icons/Makefile \
 	   src/Makefile intl/Makefile po/Makefile.in m4/Makefile)
+

gentoo-0.15.6.tar.bz2/docs/FAQ -> gentoo-0.19.9.tar.gz/docs/FAQ Changed

@@ -1,4 +1,4 @@
-							2003-12-22
+							2010-10-03
 							Emil Brink
 
 
@@ -41,47 +41,24 @@
     kernel sources, since <errno.h> relies on kernel headers.
 
 
-Q4: What about a port to GTK+ 2.0? It's out, you know...
-A4: Yeah, I know. And no, I don't expect a port to be out any time
-    soon. For the following reasons:
-    1. GTK+ 2 is slow. It's unhurrying, slow-going, slow-paced,
-       leaden, sluggish, and generally unhasty. This has two direct
-       consequences: it makes me not want to work with it, since
-       it's simply less fun, and it makes me worry about ruining
-       gentoo's reputation of being a quick file manager. Perhaps
-       it's all my fault, for running it on such a slow machine,
-       but I have problems understanding the 10X slowdown compared
-       to 1.2.x. I just don't want to. I love the speed of 1.2.x!
-    2. Differences. GTK+ 2 is largely reworked compared to the 1.2
-       series, many of the main widgets gentoo rely on (such as the
-       GtkCLists used for the panes) are deprecated. Porting gentoo
-       to native, current, GTK+ 2 widgets could be a lot of work.
-    3. Spiral effect. If I get started redoing core parts of the
-       application, that could be contagious and I might end up re-
-       designing major parts of it. Which would be fun and good, but
-       could take up a lot of time. Especially considering all the
-       time I'd have to spend waiting for GUI redraws. Did I mention
-       there's a performance problem with GTK+ 2?
-
-
-Q5. I get a weird warning about case sensitivity and ASCII?!
-A5. Yes. This indicates that you have successfully built gentoo in a
+Q4. I get a weird warning about case sensitivity and ASCII?!
+A4. Yes. This indicates that you have successfully built gentoo in a
     localizable manner. It also indicates that gentoo has performed
     tests on your host's strcoll(3) string comparison function, and is
     letting you know of any limitations found.
 
 
-Q6. The selection mouse handling is all weird, why can't it just behave
+Q5. The selection mouse handling is all weird, why can't it just behave
     like the rest of the world does it?
-A6. It behaves in the way it does since that's how DirOpus on the Amiga
+A5. It behaves in the way it does since that's how DirOpus on the Amiga
     did it, and the author happens to like being able to click and drag
     and always add to the selection without having to touch the keyboard.
     If you disagree, change the "Modify 'Control' Key State" dirpane
     setting to "System Default".
 
 
-Q7. What is "Click-M-Click"? It doesn't do anything?! Aargh!
-A7. Sure it does, but it is a bit sneaky and hard to find by "mistake".
+Q6. What is "Click-M-Click"? It doesn't do anything?! Aargh!
+A6. Sure it does, but it is a bit sneaky and hard to find by "mistake".
     Basically, it's a simple mouse gesture. It stands for "click, then
     move, and click again". It triggers if you click a file in one pane,
     then move the mouse to the other pane and click again, all within
@@ -97,13 +74,13 @@
     Actions in the appropriate Styles.
 
 
-Q8. How do I set the background color of the panes? The bright white is
+Q7. How do I set the background color of the panes? The bright white is
     hurting my eeeyes!
-A8. You need to go through the .gentoogtkrc file, and set the "base"
+A7. You need to go through the .gentoogtkrc file, and set the "base"
     element in a style which then gets used by the "*mainPane0" and
     "*mainPane1" widgets. See this page for more details:
     http://developer.gnome.org/doc/API/gtk/gtk-resource-files.html.
 
 
-Q9. Any further questions?
-A9. No, it doesn't seem so. If you disagree, get in touch.
+Q8. Any further questions?
+A8. No, it doesn't seem so. If you disagree, get in touch.

gentoo-0.15.6.tar.bz2/docs/gentoo.1x -> gentoo-0.19.9.tar.gz/docs/gentoo.1x Changed

@@ -5,18 +5,18 @@
 .\" As with all other documentation in the gentoo project, it might
 .\" end up being outdated pretty quickly...
 .\"
-.\" gentoo is (c) 1998-2009 by Emil Brink, Obsession Development.
+.\" gentoo is (c) 1998-2011 by Emil Brink, Obsession Development.
 .\"
 .\" gentoo is freely distributable under the terms of the GNU General
 .\" Public License as specified in the COPYING file included with the
 .\" distribution.
 .\"
-.TH "gentoo" "1x" "July, 2009" "Obsession Development" ""
+.TH "gentoo" "1x" "January, 2011" "Obsession Development" ""
 .SH NAME
 gentoo \- A highly configurable file manager for X
 .\"
 .SH "SYNOPSIS"
-gentoo \-\-version \-\-root\-ok \-\-no\-rc \-\-no\-gtkrc \-\-no\-fam \-\-left=path \-\-right=path
+gentoo \-\-version \-\-locale-info \-\-root\-ok \-\-no\-rc \-\-no\-gtkrc \-\-left=path \-\-right=path \-\-run=ARG 
 .\"
 .SH "DESCRIPTION"
 gentoo is a file manager for Linux and compatible systems. It allows you
@@ -74,7 +74,7 @@
 .TP
 .B \-\-version
 Causes gentoo to print its version number (a string on the form MAJOR.MINOR.MICRO,
-like 0.15.6) to the standard output, and then exit successfully. Numbers having an
+like 0.19.9) to the standard output, and then exit successfully. Numbers having an
 odd MINOR component indicate development versions of the program.
 .\"
 .TP
@@ -110,12 +110,6 @@
 and forces all widgets to use the default GTK+ look.
 .\"
 .TP
-.B \-\-no\-fam
-Disables use of FAM (File Alteration Monitor) to detect when contents of a
-displayed pane change. Option only available if gentoo was built with FAM
-support to begin with.
-.\"
-.TP
 .B \-\-left, \-\-right (or \-1, \-2)
 Sets the initial path for the left and right pane, respectively. If present,
 the path specified with one of these options overrides any other path for
@@ -131,8 +125,8 @@
 begin with a capital letter.
 \"
 .PP
-Any non-option command arguments will be silently ignored. If an argument "-h" or
-"--help" is given, gentoo will give a summary of its supported command line options
+Any non-option command arguments will be silently ignored. If an argument "\-h" or
+"\-\-help" is given, gentoo will give a summary of its supported command line options
 and exit successfully. If an unknown option is given, or a option is missing a
 required argument, gentoo will whine and exit with a failure.
 .\"
@@ -149,7 +143,7 @@
 priority, they are:
 .TP
 1. Command-line Argument
-Using the --left and --right (or their short forms, -1 and -2) command-line arguments
+Using the \-\-left and \-\-right (or their short forms, \-1 and \-2) command-line arguments
 overrides any other setting.
 .TP
 2. Configured Default Directory
@@ -327,7 +321,7 @@
 user, you typically won't need to access this file manually.
 .\"
 .TP
-.I "~/.gentoo-history"
+.I "~/.gentoo\-history"
 This file contains lists of the most recently visited directories, for both
 panes. These are the lists that appear in the drop-down menu when the arrow
 next to the path entry box is clicked. Can be disabled in the Dir Pane configuration.
@@ -335,7 +329,7 @@
 .I "~/.gentoogtkrc"
 This file allows you to control the look of the widgets used by gentoo,
 through the GTK+ style system. This file must be present in the user's
-home directory \- there is no site-wide GTK+ configuration file.
+home directory -- there is no site-wide GTK+ configuration file.
 .\"
 .TP
 .I "/etc/passwd," "/etc/group"
@@ -466,7 +460,7 @@
 .\"
 .\"
 .SH "COPYRIGHT"
-gentoo is released as free, open\-source software, under the terms of the
+gentoo is released as free, open-source software, under the terms of the
 GNU General Public License (GNU GPL), version 2. This license is included in the
 distribution under the traditional name of
 .B

gentoo-0.15.6.tar.bz2/docs/scratch/command_args.txt -> gentoo-0.19.9.tar.gz/docs/scratch/command_args.txt Changed

@@ -1,4 +1,4 @@
-							2005-06-04
+							2010-10-06
 							Emil Brink
 
 		Arguments to Built-In Commands
@@ -144,10 +144,8 @@
 
 
 DpFocusISrch
+This command has new semantics; use arrow up/down to move between hits.
 Keyword		Type	Description
-nocase		bool	If TRUE, incremental searching is done witout
-			regard for case. Default is to be case sensitive.
-select		bool	If TRUE, search hits will be selected.
 start		string	The string is interpreted as an integer, and the
 			search will then require that the given string
 			occurs for the *first* time at that offset in a
@@ -190,6 +188,12 @@
 			will be selected in addition to focused.
 
 
+DpMaximize
+Keyword		Type	Description
+index		int	Maximizes the pane with the given index. If the
+			index is negative, the current pane is maximized.
+
+
 FileAction
 Keyword		Type	Description
 action		string	The FileAction is used to operate upon files
@@ -318,13 +322,14 @@
 
 ViewText
 Keyword		Type	Description
+encoding	string	Name of the encoding to expect text to be in.
 mode		enum	Controls how ViewText will view the contents of
 			a given file. If absent or set to "auto", it will
-			inspect the beginning of the file; if it looks
-			like plain ASCII text, it will be viewed as such.
+			inspect the beginning of the file; if it looks like
+			text in the given encoding, it's viewed as such.
 			If not, or if mode is set to "hex", it will be
 			viewed as hexadecimal data. You can also set the
-			mode to "text" to force ASCII viewing.
+			mode to "text" to force text viewing.
 
 
 Quit

gentoo-0.15.6.tar.bz2/docs/scratch/command_options.txt -> gentoo-0.19.9.tar.gz/docs/scratch/command_options.txt Changed

@@ -109,25 +109,6 @@
 commands, have the following options in common (not all are used by
 all commands):
 
-Use mmap() To Speed Loading?
-	This option causes the ViewText command to issue a mmap()
-	system call on the file being viewed. This gives very good
-	performance, both in file viewing and the GTK+ display of
-	the loaded text. The downside is that it might use up a lot
-	of memory, and possibly fail on large files.
-		ViewText will only mmap() files that have a size
-	larger than 0. 0-length files will be opened and read seq-
-	uentially. This is mainly useful for the special files found
-	in the /proc filesystem on Linux, since they have 0 length.
-
-Buffer Size for mmap()
-	This lets you control how many bytes of the mmap()ed text
-	will be fed to the GTK+ widget at a time, at the most. This
-	used to be "all of them", meaning the entire mmap()ed region
-	was passed at once. I've seen a case where this lead to some
-	kind of bug within GTK+, resulting in a no text showing up,
-	and this is intended as a work-around.
-
 Buffer Size
 	This lets you set the size of the read buffer used by the
 	ViewText command when mmap() (see above) is NOT being used.

gentoo-0.15.6.tar.bz2/gentoo.spec -> gentoo-0.19.9.tar.gz/gentoo.spec Changed

gentoo-0.15.6.tar.bz2/gentoorc.in -> gentoo-0.19.9.tar.gz/gentoorc.in Changed

@@ -5,348 +5,221 @@
  <DirPanes>
   <count>2</count>
   <DirPaneLeft>
-   <columns>15</columns>
+   <columns>9</columns>
    <DPColumn>
     <index>0</index>
+    <title>"I"</title>
+    <content>"icon"</content>
+    <DPExtra>
+    </DPExtra>
+    <justification>2</justification>
+    <width>20</width>
+   </DPColumn>
+   <DPColumn>
+    <index>1</index>
     <title>"Name"</title>
     <content>"name"</content>
     <DPExtra>
      <show_type>FALSE</show_type>
-     <show_linkname>FALSE</show_linkname>
+     <show_linkname>TRUE</show_linkname>
     </DPExtra>
     <justification>0</justification>
     <width>250</width>
    </DPColumn>
    <DPColumn>
-    <index>1</index>
+    <index>2</index>
     <title>"Size"</title>
     <content>"size"</content>
     <DPExtra>
-     <type>"bytes"</type>
-     <ticks>FALSE</ticks>
+     <unit>"bytesnounit"</unit>
+     <ticks>TRUE</ticks>
      <tick>","</tick>
-     <digits>0</digits>
+     <digits>3</digits>
      <dir_fs>TRUE</dir_fs>
     </DPExtra>
     <justification>1</justification>
-    <width>50</width>
-   </DPColumn>
-   <DPColumn>
-    <index>2</index>
-    <title>"Blocks"</title>
-    <content>"blocks"</content>
-    <DPExtra>
-     <numformat>"%lu"</numformat>
-    </DPExtra>
-    <justification>0</justification>
-    <width>50</width>
+    <width>110</width>
    </DPColumn>
    <DPColumn>
     <index>3</index>
-    <title>"BSize"</title>
-    <content>"blocksize"</content>
-    <DPExtra>
-     <numformat>"%lu"</numformat>
-    </DPExtra>
-    <justification>1</justification>
-    <width>50</width>
-   </DPColumn>
-   <DPColumn>
-    <index>4</index>
     <title>"Mode"</title>
     <content>"modenum"</content>
     <DPExtra>
      <numformat>"%o"</numformat>
     </DPExtra>
-    <justification>0</justification>
-    <width>50</width>
+    <justification>1</justification>
+    <width>57</width>
    </DPColumn>
    <DPColumn>
-    <index>5</index>
-    <title>"Mode"</title>
+    <index>4</index>
+    <title>"Mode2"</title>
     <content>"modestr"</content>
     <DPExtra>
     </DPExtra>
-    <justification>0</justification>
-    <width>50</width>
+    <justification>2</justification>
+    <width>96</width>
    </DPColumn>
    <DPColumn>
-    <index>6</index>
+    <index>5</index>
     <title>"Nlink"</title>
     <content>"nlink"</content>
     <DPExtra>
-     <numformat>"%u"</numformat>
-    </DPExtra>
-    <justification>0</justification>
-    <width>75</width>
-   </DPColumn>
-   <DPColumn>
-    <index>7</index>
-    <title>"Uid"</title>
-    <content>"uid"</content>
-    <DPExtra>
-     <numformat>"%u"</numformat>
+     <numformat>"%d"</numformat>
     </DPExtra>
-    <justification>0</justification>
-    <width>75</width>
+    <justification>2</justification>
+    <width>40</width>
    </DPColumn>
    <DPColumn>
-    <index>8</index>
-    <title>"Uname"</title>
+    <index>6</index>
+    <title>"User"</title>
     <content>"uname"</content>
     <DPExtra>
     </DPExtra>
-    <justification>0</justification>
-    <width>50</width>
-   </DPColumn>
-   <DPColumn>
-    <index>9</index>
-    <title>"Gid"</title>
-    <content>"gid"</content>
-    <DPExtra>
-     <numformat>"%u"</numformat>
-    </DPExtra>
-    <justification>0</justification>
-    <width>75</width>
+    <justification>2</justification>
+    <width>80</width>
    </DPColumn>
    <DPColumn>
-    <index>10</index>
-    <title>"Gname"</title>
+    <index>7</index>
+    <title>"Group"</title>
     <content>"gname"</content>
     <DPExtra>
     </DPExtra>
-    <justification>0</justification>
-    <width>50</width>
-   </DPColumn>
-   <DPColumn>
-    <index>11</index>
-    <title>"Device"</title>
-    <content>"device"</content>
-    <DPExtra>
-     <numformat>"%u"</numformat>
-    </DPExtra>
-    <justification>0</justification>
-    <width>75</width>
-   </DPColumn>
-   <DPColumn>
-    <index>12</index>
-    <title>"DevMaj"</title>
-    <content>"devmaj"</content>
-    <DPExtra>
-     <numformat>"%u"</numformat>
-    </DPExtra>
-    <justification>0</justification>
-    <width>75</width>
-   </DPColumn>
-   <DPColumn>
-    <index>13</index>
-    <title>"DevMin"</title>
-    <content>"devmin"</content>
-    <DPExtra>
-     <numformat>"%u"</numformat>
-    </DPExtra>
-    <justification>0</justification>
-    <width>75</width>
+    <justification>2</justification>
+    <width>64</width>
    </DPColumn>
    <DPColumn>
-    <index>14</index>
-    <title>"Accessed"</title>
-    <content>"atime"</content>
+    <index>8</index>
+    <title>"Modified"</title>
+    <content>"mtime"</content>
     <DPExtra>
-     <dateformat>"%Y-%m-%d %H:%M:%S"</dateformat>
+     <dateformat>"%Y-%m-%d %H:%M.%S"</dateformat>
     </DPExtra>
-    <justification>0</justification>
-    <width>184</width>
+    <justification>2</justification>
+    <width>180</width>
    </DPColumn>
    <DPSort>
     <content>"name"</content>
     <mode>"dirs_first"</mode>
     <invert>FALSE</invert>
     <nocase>FALSE</nocase>
-    <numerical>FALSE</numerical>
    </DPSort>
-   <defpath>"~"</defpath>
+   <defpath>"@history0"</defpath>
    <path_above>FALSE</path_above>
    <hide_allowed>TRUE</hide_allowed>
-   <scrollbar_always>FALSE</scrollbar_always>
+   <scrollbar_always>TRUE</scrollbar_always>
    <huge_parent>FALSE</huge_parent>
+   <set_font>TRUE</set_font>
+   <font_name>"Monospace 8"</font_name>
    <sbar_pos>"system"</sbar_pos>
-   <ctrl_mode>1</ctrl_mode>
   </DirPaneLeft>
   <DirPaneRight>
-   <columns>15</columns>
+   <columns>9</columns>
    <DPColumn>
     <index>0</index>
+    <title>"I"</title>
+    <content>"icon"</content>
+    <DPExtra>
+    </DPExtra>
+    <justification>2</justification>
+    <width>20</width>
+   </DPColumn>
+   <DPColumn>
+    <index>1</index>
     <title>"Name"</title>
     <content>"name"</content>
     <DPExtra>
-     <show_type>FALSE</show_type>
-     <show_linkname>FALSE</show_linkname>
+     <show_type>TRUE</show_type>
+     <show_linkname>TRUE</show_linkname>
     </DPExtra>
     <justification>0</justification>
-    <width>250</width>
+    <width>274</width>
    </DPColumn>
    <DPColumn>
-    <index>1</index>
+    <index>2</index>
     <title>"Size"</title>
     <content>"size"</content>
     <DPExtra>
-     <type>"bytes"</type>
-     <ticks>FALSE</ticks>
+     <unit>"native"</unit>
+     <ticks>TRUE</ticks>
      <tick>","</tick>
-     <digits>0</digits>
+     <digits>3</digits>
      <dir_fs>TRUE</dir_fs>
     </DPExtra>
     <justification>1</justification>
-    <width>50</width>
-   </DPColumn>
-   <DPColumn>
-    <index>2</index>
-    <title>"Blocks"</title>
-    <content>"blocks"</content>
-    <DPExtra>
-     <numformat>"%lu"</numformat>
-    </DPExtra>
-    <justification>0</justification>
-    <width>50</width>
+    <width>99</width>
    </DPColumn>
    <DPColumn>
     <index>3</index>
-    <title>"BSize"</title>
-    <content>"blocksize"</content>
-    <DPExtra>
-     <numformat>"%lu"</numformat>
-    </DPExtra>
-    <justification>1</justification>
-    <width>50</width>
-   </DPColumn>
-   <DPColumn>
-    <index>4</index>
     <title>"Mode"</title>
     <content>"modenum"</content>
     <DPExtra>
      <numformat>"%o"</numformat>
     </DPExtra>
-    <justification>0</justification>
-    <width>50</width>
+    <justification>1</justification>
+    <width>57</width>
    </DPColumn>
    <DPColumn>
-    <index>5</index>
-    <title>"Mode"</title>
+    <index>4</index>
+    <title>"Mode2"</title>
     <content>"modestr"</content>
     <DPExtra>
     </DPExtra>
-    <justification>0</justification>
-    <width>50</width>
+    <justification>2</justification>
+    <width>96</width>
    </DPColumn>
    <DPColumn>
-    <index>6</index>
+    <index>5</index>
     <title>"Nlink"</title>
     <content>"nlink"</content>
     <DPExtra>
-     <numformat>"%u"</numformat>
-    </DPExtra>
-    <justification>0</justification>
-    <width>75</width>
-   </DPColumn>
-   <DPColumn>
-    <index>7</index>
-    <title>"Uid"</title>
-    <content>"uid"</content>
-    <DPExtra>
-     <numformat>"%u"</numformat>
+     <numformat>"%d"</numformat>
     </DPExtra>
-    <justification>0</justification>
-    <width>75</width>
+    <justification>2</justification>
+    <width>40</width>
    </DPColumn>
    <DPColumn>
-    <index>8</index>
-    <title>"Uname"</title>
+    <index>6</index>
+    <title>"User"</title>
     <content>"uname"</content>
     <DPExtra>
     </DPExtra>
-    <justification>0</justification>
-    <width>50</width>
-   </DPColumn>
-   <DPColumn>
-    <index>9</index>
-    <title>"Gid"</title>
-    <content>"gid"</content>
-    <DPExtra>
-     <numformat>"%u"</numformat>
-    </DPExtra>
-    <justification>0</justification>
-    <width>75</width>
+    <justification>2</justification>
+    <width>80</width>
    </DPColumn>
    <DPColumn>
-    <index>10</index>
-    <title>"Gname"</title>
+    <index>7</index>
+    <title>"Group"</title>
     <content>"gname"</content>
     <DPExtra>
     </DPExtra>
-    <justification>0</justification>
-    <width>50</width>
-   </DPColumn>
-   <DPColumn>
-    <index>11</index>
-    <title>"Device"</title>
-    <content>"device"</content>
-    <DPExtra>
-     <numformat>"%u"</numformat>
-    </DPExtra>
-    <justification>0</justification>
-    <width>75</width>
-   </DPColumn>
-   <DPColumn>
-    <index>12</index>
-    <title>"DevMaj"</title>
-    <content>"devmaj"</content>
-    <DPExtra>
-     <numformat>"%u"</numformat>
-    </DPExtra>
-    <justification>0</justification>
-    <width>75</width>
-   </DPColumn>
-   <DPColumn>
-    <index>13</index>
-    <title>"DevMin"</title>
-    <content>"devmin"</content>
-    <DPExtra>
-     <numformat>"%u"</numformat>
-    </DPExtra>
-    <justification>0</justification>
-    <width>75</width>
+    <justification>2</justification>
+    <width>64</width>
    </DPColumn>
    <DPColumn>
-    <index>14</index>
-    <title>"Accessed"</title>
-    <content>"atime"</content>
+    <index>8</index>
+    <title>"Modified"</title>
+    <content>"mtime"</content>
     <DPExtra>
-     <dateformat>"%Y-%m-%d %H:%M:%S"</dateformat>
+     <dateformat>"%Y-%m-%d %H:%M.%S"</dateformat>
     </DPExtra>
-    <justification>0</justification>
-    <width>184</width>
+    <justification>2</justification>
+    <width>180</width>
    </DPColumn>
    <DPSort>
     <content>"name"</content>
     <mode>"dirs_first"</mode>
     <invert>FALSE</invert>
     <nocase>FALSE</nocase>
-    <numerical>FALSE</numerical>
    </DPSort>
-   <defpath>"~"</defpath>
+   <defpath>"@history0"</defpath>
    <path_above>FALSE</path_above>
    <hide_allowed>TRUE</hide_allowed>
-   <scrollbar_always>FALSE</scrollbar_always>
+   <scrollbar_always>TRUE</scrollbar_always>
    <huge_parent>FALSE</huge_parent>
-   <sbar_pos>"system"</sbar_pos>
-   <ctrl_mode>1</ctrl_mode>
+   <set_font>TRUE</set_font>
+   <font_name>"Monospace 8"</font_name>
+   <sbar_pos>"left"</sbar_pos>
   </DirPaneRight>
-  <DirPaneColors>
-   <pane_selected>CEFBE,EBAD,FFFF</pane_selected>
-   <focus_unselected>CAEBA,0000,F7DE</focus_unselected>
-   <focus_selected>CAEBA,0000,9E79</focus_selected>
-  </DirPaneColors>
   <DirPanePaning>
    <orientation>"horizontal"</orientation>
    <mode>"ratio"</mode>
@@ -358,6 +231,885 @@
   </DirPaneHistory>
  </DirPanes>
  <CmdSeqs>
+  <CmdSeq>
+   <name>"play_sid"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"sidplay {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>1</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"unmount"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"umount  {fpu}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"test_pipe"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"bash -c &apos;echo {Fup} | wc&apos;"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"view_man"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"groff -man -Tascii -P-b -P-u {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"run_calculator"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"gnome-calculator"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>3</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"view_tar_bzip2"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"tar -tvf {fpu} --use-compress-prog=bunzip2"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"view_deb"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"dpkg-deb -c {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"test_uri"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"echo {uq}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"mouse_right"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"Built-In"</type>
+     <def>"SelectRow action=select"</def>
+     <flags>0</flags>
+    </CmdRow>
+    <CmdRow>
+     <type>"Built-In"</type>
+     <def>"MenuPopup"</def>
+     <flags>0</flags>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"test_call"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"Built-In"</type>
+     <def>"wrap_about"</def>
+     <flags>0</flags>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"view_rfc"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"less {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"play_mp3"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"xmms {Fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>1</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"convert_mp3"</name>
+   <flags>1</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"bash -c &apos;mpg123 -q -w $(basename {f} .mp3).wav {fup}&apos;"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>4</bflags>
+      <aflags>1</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"mkdir_and_enter_selected"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"Built-In"</type>
+     <def>"MkDir 1"</def>
+     <flags>0</flags>
+    </CmdRow>
+    <CmdRow>
+     <type>"Built-In"</type>
+     <def>"DirEnter dir={fpu}"</def>
+     <flags>0</flags>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"open_other"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"Built-In"</type>
+     <def>"DirToOther"</def>
+     <flags>0</flags>
+    </CmdRow>
+    <CmdRow>
+     <type>"Built-In"</type>
+     <def>"ActivateOther"</def>
+     <flags>0</flags>
+    </CmdRow>
+    <CmdRow>
+     <type>"Built-In"</type>
+     <def>"DirEnter"</def>
+     <flags>0</flags>
+    </CmdRow>
+    <CmdRow>
+     <type>"Built-In"</type>
+     <def>"ActivateOther"</def>
+     <flags>0</flags>
+    </CmdRow>
+    <CmdRow>
+     <type>"Built-In"</type>
+     <def>"UnselectFirst"</def>
+     <flags>0</flags>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"view_tar_gzip"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"tar -tvzf {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"view_html"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"lynx -dump {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"view_video"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"mplayer -quiet -vo x11 {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"echo_selection"</name>
+   <flags>1</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"echo {Fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"diff"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"diff -pu {fpu} {fdup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>16</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"view_tar"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"tar -tvf {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"uncompress_tar_bzip2"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"tar --use-compress-program=bzip2 -xf {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>8</bflags>
+      <aflags>2</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"view_gzip"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"zcat {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"view_rpm"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"rpm -SOME_SMART_OPTION {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"play_sample"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"aplay {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"play_mod"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"xmp {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>3</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"view_image"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"gliv {Fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>4</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"tar_extract"</name>
+   <flags>1</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"echo Extracting {fp} to {Pd}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"tar xzf {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>16</gflags>
+      <bflags>8</bflags>
+      <aflags>2</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"test_dirparent"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"Built-In"</type>
+     <def>"DirParent"</def>
+     <flags>0</flags>
+    </CmdRow>
+    <CmdRow>
+     <type>"Built-In"</type>
+     <def>"About"</def>
+     <flags>0</flags>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"edit_image"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"gimp {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>3</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"run_script"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"/usr/bin/env bash {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>16</gflags>
+      <bflags>20</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"test_exec"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"nonexistant {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"test_input"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"echo {It:&quot;String input defaults to first selected filename:&quot;} {It:&quot;-&quot;} {Is:&quot;Name:&quot;=&quot;prefix-{fQ}-postfix&quot;}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"edit_text"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"{$EDITOR} {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>1</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"uncompress_rar"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"unrar x -inul {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>8</bflags>
+      <aflags>2</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"compress_gzip"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"gzip -9 {Fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>0</bflags>
+      <aflags>1</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"view_pdf"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>" evince {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"test_menu"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"echo {Im:&quot;First&quot;=&quot;Hello,:1&quot;,&quot;Good day,:2&quot;,&quot;Good evening,:3&quot;,&quot;Hi,:4&quot;,&quot;Yo:5&quot;} {Im:&quot;Second&quot;=&quot;person&quot;,&quot;dude&quot;,&quot;geek&quot;}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"uncompress_zip"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"unzip -qq -o {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>8</bflags>
+      <aflags>2</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"print_selected"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"echo {Fpu}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"test_grab"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"{$HOME}/data/src/C/spew --delay=5000000"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"view_bzip2"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"bzcat {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"uncompress_tar_gzip"</name>
+   <flags>1</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"tar xzf {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>8</bflags>
+      <aflags>2</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"compress_tar"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"tar {It:&quot;Create tar archive&quot;}{Ic:&quot;Mode&quot;=&quot;-cf&quot;,&quot;-czf&quot;,&quot;-cyf&quot;} {Pd}/{Is:&quot;Archive Name&quot;} {Ix:&quot;Dereference links?&quot;=&quot;-h&quot;,&quot;&quot;}{Ix:&quot;Compress?&quot;=&quot;-z&quot;,&quot;&quot;} {Fu}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>16</gflags>
+      <bflags>4</bflags>
+      <aflags>2</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"wrap_about"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"Built-In"</type>
+     <def>"About"</def>
+     <flags>0</flags>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"uncompress_gzip"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"gunzip {Fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>0</bflags>
+      <aflags>1</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"new_shell"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"xterm"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>1</gflags>
+      <bflags>4</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"view_rar"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"unrar lt {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"run_file"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"/usr/bin/env bash -c {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"view_howto"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"less {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"view_ps"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"gv {fut}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>1</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"view_zip"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"unzip -v {fup}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>4</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"test_checkbox"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"echo {It:&quot;Testing checkboxes&quot;} {Ix:&quot;One&quot;} {Ix:&quot;Two&quot;} {Ix:&quot;Three&quot;}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
+  <CmdSeq>
+   <name>"run_missing"</name>
+   <flags>0</flags>
+   <CmdRows>
+    <CmdRow>
+     <type>"External"</type>
+     <def>"whatever {Fpu}"</def>
+     <flags>0</flags>
+     <CX_External>
+      <gflags>0</gflags>
+      <bflags>0</bflags>
+      <aflags>0</aflags>
+     </CX_External>
+    </CmdRow>
+   </CmdRows>
+  </CmdSeq>
  </CmdSeqs>
  <CommandConfig>
   <Configure>
@@ -365,23 +1117,22 @@
   </Configure>
   <Copy>
    <copy_dates>TRUE</copy_dates>
-   <ignore_attrib_err>FALSE</ignore_attrib_err>
+   <ignore_attrib_err>TRUE</ignore_attrib_err>
    <leave_fullsize>TRUE</leave_fullsize>
    <buf_size>u262144</buf_size>
   </Copy>
   <Delete>
-   <set_mode>u0</set_mode>
+   <set_mode>u1</set_mode>
   </Delete>
   <DpFocus>
-   <edge_wrap>FALSE</edge_wrap>
    <fake_select>FALSE</fake_select>
    <focus_select>FALSE</focus_select>
   </DpFocus>
   <GetSize>
-   <unselect>TRUE</unselect>
+   <unselect>FALSE</unselect>
   </GetSize>
   <Information>
-   <use_file>FALSE</use_file>
+   <use_file>TRUE</use_file>
    <recurse_dirs>TRUE</recurse_dirs>
    <df_access>"%Y-%m-%d %H:%M.%S"</df_access>
    <df_modify>"%Y-%m-%d %H:%M.%S"</df_modify>
@@ -389,12 +1140,14 @@
    <tick>","</tick>
   </Information>
   <MkDir>
-   <cd_new>FALSE</cd_new>
+   <cd_new>TRUE</cd_new>
    <focus_new>FALSE</focus_new>
   </MkDir>
+  <Rename>
+   <inplace>TRUE</inplace>
+  </Rename>
   <ViewText>
-   <use_mmap>TRUE</use_mmap>
-   <buf_size>u262144</buf_size>
+   <buf_size>u1048576</buf_size>
    <check_size>u512</check_size>
    <exit_left>TRUE</exit_left>
   </ViewText>
@@ -405,52 +1158,1310 @@
    <expand>TRUE</expand>
    <Properties>
     <Property>
+     <name>"View"</name>
+     <action>"ViewText mode=Auto"</action>
+    </Property>
+    <Property>
      <name>"uIcon"</name>
      <icon>"Document.xpm"</icon>
     </Property>
     <Property>
+     <name>"Default"</name>
+     <action>"FileAction action=View"</action>
+    </Property>
+    <Property>
      <name>"uFG"</name>
      <color>C0000,0000,0000</color>
     </Property>
     <Property>
      <name>"uBG"</name>
-     <color>CDCDC,DCDC,DCDC</color>
+     <color>CE665,E665,E665</color>
     </Property>
    </Properties>
   </Style>
   <Style>
-   <name>"Directory"</name>
+   <name>"Data"</name>
    <parent>"Root"</parent>
    <expand>TRUE</expand>
+  </Style>
+  <Style>
+   <name>"Archive"</name>
+   <parent>"Data"</parent>
+   <expand>TRUE</expand>
    <Properties>
     <Property>
      <name>"uIcon"</name>
-     <icon>"Directory2.xpm"</icon>
+     <icon>"Package.xpm"</icon>
     </Property>
     <Property>
      <name>"uFG"</name>
-     <color>CFFFF,4000,2000</color>
+     <color>C8080,0000,6666</color>
+    </Property>
+    <Property>
+     <name>"ClickMClick"</name>
+     <action>"FileAction action=extract"</action>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Package"</name>
+   <parent>"Archive"</parent>
+   <expand>FALSE</expand>
+  </Style>
+  <Style>
+   <name>"DEB"</name>
+   <parent>"Package"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"view_deb"</action>
+    </Property>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"deb.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"RPM"</name>
+   <parent>"Package"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"view_rpm"</action>
+    </Property>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"rpm.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Rar"</name>
+   <parent>"Archive"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"view_rar"</action>
+    </Property>
+    <Property>
+     <name>"extract"</name>
+     <action>"uncompress_rar"</action>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Tar"</name>
+   <parent>"Archive"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"view_tar"</action>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Tar BZip2"</name>
+   <parent>"Archive"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"view_tar_bzip2"</action>
+    </Property>
+    <Property>
+     <name>"extract"</name>
+     <action>"uncompress_tar_bzip2"</action>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Tar GZip"</name>
+   <parent>"Archive"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"view_tar_gzip"</action>
+    </Property>
+    <Property>
+     <name>"extract"</name>
+     <action>"uncompress_tar_gzip"</action>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"ZIP"</name>
+   <parent>"Archive"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"view_zip"</action>
+    </Property>
+    <Property>
+     <name>"extract"</name>
+     <action>"uncompress_zip"</action>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Compressed"</name>
+   <parent>"Data"</parent>
+   <expand>FALSE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"Package.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"BZip2"</name>
+   <parent>"Compressed"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"view_bzip2"</action>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"GZip"</name>
+   <parent>"Compressed"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"view_gzip"</action>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Image"</name>
+   <parent>"Data"</parent>
+   <expand>FALSE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"view_image"</action>
+    </Property>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"Image.xpm"</icon>
+    </Property>
+    <Property>
+     <name>"Edit"</name>
+     <action>"edit_image"</action>
     </Property>
     <Property>
      <name>"Default"</name>
-     <action>"DirEnter"</action>
+     <action>"FileAction action=View"</action>
+    </Property>
+    <Property>
+     <name>"uFG"</name>
+     <color>C8080,0000,3333</color>
     </Property>
    </Properties>
   </Style>
- </FileStyles>
- <FileTypes>
-  <FileType>
-   <name>"Directory"</name>
-   <mode>16384</mode>
-   <style>"Directory"</style>
-  </FileType>
-  <FileType>
-   <name>"Unknown"</name>
-   <mode>0</mode>
-   <style>"Root"</style>
-  </FileType>
- </FileTypes>
- <ButtonSheets>
+  <Style>
+   <name>"BMP"</name>
+   <parent>"Image"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"Windows.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"GIF"</name>
+   <parent>"Image"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"gif.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"IFF-ILBM"</name>
+   <parent>"Image"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"iff.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"JPEG"</name>
+   <parent>"Image"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"jpeg.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"PNG"</name>
+   <parent>"Image"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"png.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"TARGA"</name>
+   <parent>"Image"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"targa.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"TIFF"</name>
+   <parent>"Image"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"tiff.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"XPM"</name>
+   <parent>"Image"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"xpm.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Sound"</name>
+   <parent>"Data"</parent>
+   <expand>FALSE</expand>
+   <Properties>
+    <Property>
+     <name>"Default"</name>
+     <action>"FileAction action=Play"</action>
+    </Property>
+    <Property>
+     <name>"uFG"</name>
+     <color>C4848,4848,6868</color>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Music"</name>
+   <parent>"Sound"</parent>
+   <expand>FALSE</expand>
+  </Style>
+  <Style>
+   <name>"MP3"</name>
+   <parent>"Music"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"mp3.xpm"</icon>
+    </Property>
+    <Property>
+     <name>"Play"</name>
+     <action>"play_mp3"</action>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Module"</name>
+   <parent>"Music"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"mod.xpm"</icon>
+    </Property>
+    <Property>
+     <name>"Play"</name>
+     <action>"play_mod"</action>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"SID"</name>
+   <parent>"Music"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"sid.xpm"</icon>
+    </Property>
+    <Property>
+     <name>"Play"</name>
+     <action>"play_sid"</action>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Sample"</name>
+   <parent>"Sound"</parent>
+   <expand>FALSE</expand>
+   <Properties>
+    <Property>
+     <name>"Play"</name>
+     <action>"play_sample"</action>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"WAV"</name>
+   <parent>"Sample"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"wav.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"au"</name>
+   <parent>"Sample"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"au.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Text"</name>
+   <parent>"Data"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"ViewText encoding=ISO-8859-1"</action>
+    </Property>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"txt.xpm"</icon>
+    </Property>
+    <Property>
+     <name>"Edit"</name>
+     <action>"edit_text"</action>
+    </Property>
+    <Property>
+     <name>"uFG"</name>
+     <color>C0000,6666,3333</color>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"COPYING"</name>
+   <parent>"Text"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"License.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Config"</name>
+   <parent>"Text"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"conf.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"HOWTO"</name>
+   <parent>"Text"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"view_howto"</action>
+    </Property>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"Readme.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"HTML"</name>
+   <parent>"Text"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"view_html"</action>
+    </Property>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"html.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"MS Word"</name>
+   <parent>"Text"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"MSWordDoc.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Makefile"</name>
+   <parent>"Text"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"Makefile.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Man Page"</name>
+   <parent>"Text"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"view_man"</action>
+    </Property>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"man.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"PDF"</name>
+   <parent>"Text"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"view_pdf"</action>
+    </Property>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"pdf.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Package Info"</name>
+   <parent>"Text"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"Readme.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Plain"</name>
+   <parent>"Text"</parent>
+   <expand>TRUE</expand>
+  </Style>
+  <Style>
+   <name>"PostScript"</name>
+   <parent>"Text"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"view_ps"</action>
+    </Property>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"ps.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"RFC"</name>
+   <parent>"Text"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"view_rfc"</action>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Source Code"</name>
+   <parent>"Text"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"Source.xpm"</icon>
+    </Property>
+    <Property>
+     <name>"uFG"</name>
+     <color>C0000,3333,0000</color>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Assembly Source"</name>
+   <parent>"Source Code"</parent>
+   <expand>TRUE</expand>
+  </Style>
+  <Style>
+   <name>"C Header"</name>
+   <parent>"Source Code"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"h.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"C Source"</name>
+   <parent>"Source Code"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"c.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Java Source"</name>
+   <parent>"Source Code"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"java.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"M4"</name>
+   <parent>"Source Code"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"Source.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Perl"</name>
+   <parent>"Source Code"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"pl.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Python"</name>
+   <parent>"Source Code"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"py.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Video"</name>
+   <parent>"Data"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"View"</name>
+     <action>"view_video"</action>
+    </Property>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"Animation.xpm"</icon>
+    </Property>
+    <Property>
+     <name>"uFG"</name>
+     <color>CA665,0000,428F</color>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"3GP"</name>
+   <parent>"Video"</parent>
+   <expand>TRUE</expand>
+  </Style>
+  <Style>
+   <name>"AVI"</name>
+   <parent>"Video"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"avi.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"MPEG"</name>
+   <parent>"Video"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"mpeg.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Directory"</name>
+   <parent>"Root"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"OpenOther"</name>
+     <action>"open_other"</action>
+    </Property>
+    <Property>
+     <name>"uFG"</name>
+     <color>CFFFF,3333,3333</color>
+    </Property>
+    <Property>
+     <name>"ClickMClick"</name>
+     <action>"FileAction action=OpenOther"</action>
+    </Property>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"Directory.xpm"</icon>
+    </Property>
+    <Property>
+     <name>"unmount"</name>
+     <action>"unmount"</action>
+    </Property>
+    <Property>
+     <name>"View"</name>
+     <action>""</action>
+    </Property>
+    <Property>
+     <name>"Default"</name>
+     <action>"DirEnter"</action>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Executable"</name>
+   <parent>"Root"</parent>
+   <expand>FALSE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"Executable.xpm"</icon>
+    </Property>
+    <Property>
+     <name>"Default"</name>
+     <action>"run_file"</action>
+    </Property>
+    <Property>
+     <name>"uFG"</name>
+     <color>C8080,8080,0000</color>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Java Class"</name>
+   <parent>"Executable"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"class.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Object"</name>
+   <parent>"Executable"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"o.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Shared Object"</name>
+   <parent>"Executable"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"so.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Windows"</name>
+   <parent>"Executable"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"exe.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Special"</name>
+   <parent>"Root"</parent>
+   <expand>FALSE</expand>
+  </Style>
+  <Style>
+   <name>"FIFO"</name>
+   <parent>"Special"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"FIFO.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+  <Style>
+   <name>"Socket"</name>
+   <parent>"Special"</parent>
+   <expand>TRUE</expand>
+   <Properties>
+    <Property>
+     <name>"uIcon"</name>
+     <icon>"Port.xpm"</icon>
+    </Property>
+   </Properties>
+  </Style>
+ </FileStyles>
+ <FileTypes>
+  <FileType>
+   <name>"Directory"</name>
+   <mode>16384</mode>
+   <style>"Directory"</style>
+  </FileType>
+  <FileType>
+   <name>"Archive, Tar"</name>
+   <mode>32768</mode>
+   <suffix>".tar"</suffix>
+   <style>"Tar"</style>
+  </FileType>
+  <FileType>
+   <name>"Archive, Rar"</name>
+   <mode>32768</mode>
+   <suffix>".rar"</suffix>
+   <style>"Rar"</style>
+  </FileType>
+  <FileType>
+   <name>"Archive, Tar BZip2"</name>
+   <mode>32768</mode>
+   <name_re>"^.+\\.(tbz|tar\\.bz2)$"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"Tar BZip2"</style>
+  </FileType>
+  <FileType>
+   <name>"Archive, Tar Gzip"</name>
+   <mode>32768</mode>
+   <name_re>".+\\.(tar\\.gz|tgz)"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"Tar GZip"</style>
+  </FileType>
+  <FileType>
+   <name>"Archive, ZIP"</name>
+   <mode>32768</mode>
+   <suffix>".zip"</suffix>
+   <style>"ZIP"</style>
+  </FileType>
+  <FileType>
+   <name>"Archive, Package, Debian"</name>
+   <mode>32768</mode>
+   <suffix>".deb"</suffix>
+   <style>"DEB"</style>
+  </FileType>
+  <FileType>
+   <name>"Archive, Package, RPM"</name>
+   <mode>32768</mode>
+   <suffix>".rpm"</suffix>
+   <style>"RPM"</style>
+  </FileType>
+  <FileType>
+   <name>"Image, BMP"</name>
+   <mode>32768</mode>
+   <suffix>".bmp"</suffix>
+   <style>"BMP"</style>
+  </FileType>
+  <FileType>
+   <name>"Image, GIF"</name>
+   <mode>32768</mode>
+   <suffix>".gif"</suffix>
+   <style>"GIF"</style>
+  </FileType>
+  <FileType>
+   <name>"Image, JPEG"</name>
+   <mode>32768</mode>
+   <name_re>"^.+\\.jpe?g$"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>TRUE</name_nocase>
+   <style>"JPEG"</style>
+  </FileType>
+  <FileType>
+   <name>"Image, IFF-ILBM"</name>
+   <mode>32768</mode>
+   <name_re>"\\.(lbm|iff)$"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"IFF-ILBM"</style>
+  </FileType>
+  <FileType>
+   <name>"Image, TARGA"</name>
+   <mode>32768</mode>
+   <suffix>".tga"</suffix>
+   <style>"TARGA"</style>
+  </FileType>
+  <FileType>
+   <name>"Image, TIFF"</name>
+   <mode>32768</mode>
+   <name_re>"\\.tiff?$"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"TIFF"</style>
+  </FileType>
+  <FileType>
+   <name>"Image, PNG"</name>
+   <mode>32768</mode>
+   <suffix>".png"</suffix>
+   <style>"PNG"</style>
+  </FileType>
+  <FileType>
+   <name>"Image, XPM"</name>
+   <mode>32768</mode>
+   <suffix>".xpm"</suffix>
+   <style>"XPM"</style>
+  </FileType>
+  <FileType>
+   <name>"Sound, Music, Module"</name>
+   <mode>32768</mode>
+   <name_re>"(^mod\\..+)|(.+\\.mod$)"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"Module"</style>
+  </FileType>
+  <FileType>
+   <name>"Sound, Music, MP3"</name>
+   <mode>32768</mode>
+   <suffix>".mp3"</suffix>
+   <style>"MP3"</style>
+  </FileType>
+  <FileType>
+   <name>"Sound, Music, SID"</name>
+   <mode>32768</mode>
+   <suffix>".sid"</suffix>
+   <style>"SID"</style>
+  </FileType>
+  <FileType>
+   <name>"Sound, Sample, WAV"</name>
+   <mode>32768</mode>
+   <file_re>"WAVE audio"</file_re>
+   <file_glob>FALSE</file_glob>
+   <file_nocase>FALSE</file_nocase>
+   <style>"WAV"</style>
+  </FileType>
+  <FileType>
+   <name>"Sound, Sample, au"</name>
+   <mode>32768</mode>
+   <suffix>".au"</suffix>
+   <style>"au"</style>
+  </FileType>
+  <FileType>
+   <name>"Source Code, Assembly, ASM-One"</name>
+   <mode>32768</mode>
+   <name_re>"\\.(s|S)$"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"Root"</style>
+  </FileType>
+  <FileType>
+   <name>"Source Code, Assembly"</name>
+   <mode>32768</mode>
+   <name_re>"\\.(s|asm)$"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"Assembly Source"</style>
+  </FileType>
+  <FileType>
+   <name>"Source Code, C Header"</name>
+   <mode>32768</mode>
+   <suffix>".h"</suffix>
+   <style>"C Header"</style>
+  </FileType>
+  <FileType>
+   <name>"Source Code, C Source"</name>
+   <mode>32768</mode>
+   <suffix>".c"</suffix>
+   <style>"C Source"</style>
+  </FileType>
+  <FileType>
+   <name>"Source Code, C++ Source"</name>
+   <mode>32768</mode>
+   <name_re>"\\.(cpp|cc)$"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"C Source"</style>
+  </FileType>
+  <FileType>
+   <name>"Source Code, Java"</name>
+   <mode>32768</mode>
+   <suffix>".java"</suffix>
+   <style>"Java Source"</style>
+  </FileType>
+  <FileType>
+   <name>"Source Code, M4"</name>
+   <mode>32768</mode>
+   <suffix>".m4"</suffix>
+   <style>"M4"</style>
+  </FileType>
+  <FileType>
+   <name>"Source Code, Perl"</name>
+   <mode>32768</mode>
+   <suffix>".pl"</suffix>
+   <style>"Perl"</style>
+  </FileType>
+  <FileType>
+   <name>"Source Code, PHP"</name>
+   <mode>32768</mode>
+   <suffix>".php"</suffix>
+   <style>"Source Code"</style>
+  </FileType>
+  <FileType>
+   <name>"Source Code, Python"</name>
+   <mode>32768</mode>
+   <suffix>".py"</suffix>
+   <style>"Python"</style>
+  </FileType>
+  <FileType>
+   <name>"Text, COPYING"</name>
+   <mode>32768</mode>
+   <name_re>"^(COPYING|COPYRIGHT|LICENSE)$"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"COPYING"</style>
+  </FileType>
+  <FileType>
+   <name>"Text, Config"</name>
+   <mode>32768</mode>
+   <name_re>"^\\..+rc$"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"Config"</style>
+  </FileType>
+  <FileType>
+   <name>"Text, HOWTO"</name>
+   <mode>32768</mode>
+   <name_re>"-HOWTO(\\.gz)?$"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"HOWTO"</style>
+  </FileType>
+  <FileType>
+   <name>"Text, MS Word"</name>
+   <mode>32768</mode>
+   <suffix>".doc"</suffix>
+   <style>"MS Word"</style>
+  </FileType>
+  <FileType>
+   <name>"Text, HTML"</name>
+   <mode>32768</mode>
+   <name_re>".+\\.html?$"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"HTML"</style>
+  </FileType>
+  <FileType>
+   <name>"Text, Makefile"</name>
+   <mode>32768</mode>
+   <name_re>"^Makefile"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"Makefile"</style>
+  </FileType>
+  <FileType>
+   <name>"Text, Man Page"</name>
+   <mode>32768</mode>
+   <name_re>"^^.+^0-9\\.0-9A-Za-z?(\\.gz)?$"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"Man Page"</style>
+  </FileType>
+  <FileType>
+   <name>"Text, Package Information"</name>
+   <mode>32768</mode>
+   <name_re>"^(BUGS|ChangeLog|INSTALL|README|TODO)"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"Package Info"</style>
+  </FileType>
+  <FileType>
+   <name>"Text, PDF"</name>
+   <mode>32768</mode>
+   <suffix>".pdf"</suffix>
+   <style>"PDF"</style>
+  </FileType>
+  <FileType>
+   <name>"Text, Plain"</name>
+   <mode>32768</mode>
+   <suffix>".txt"</suffix>
+   <file_re>"ASCII text"</file_re>
+   <file_glob>FALSE</file_glob>
+   <file_nocase>FALSE</file_nocase>
+   <style>"Plain"</style>
+  </FileType>
+  <FileType>
+   <name>"Text, PostScript"</name>
+   <mode>32768</mode>
+   <suffix>".ps"</suffix>
+   <style>"PostScript"</style>
+  </FileType>
+  <FileType>
+   <name>"Text, RFC"</name>
+   <mode>32768</mode>
+   <name_re>"^rfc0-9+(\\.gz)?$"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"RFC"</style>
+  </FileType>
+  <FileType>
+   <name>"Video, 3GP"</name>
+   <mode>32768</mode>
+   <suffix>".3gp"</suffix>
+   <style>"3GP"</style>
+  </FileType>
+  <FileType>
+   <name>"Video, AVI"</name>
+   <mode>32768</mode>
+   <suffix>".avi"</suffix>
+   <style>"AVI"</style>
+  </FileType>
+  <FileType>
+   <name>"Video, MPEG"</name>
+   <mode>32768</mode>
+   <name_re>"\\.mpe?g$"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"MPEG"</style>
+  </FileType>
+  <FileType>
+   <name>"Video, MOV"</name>
+   <mode>32768</mode>
+   <suffix>".mov"</suffix>
+   <style>"3GP"</style>
+  </FileType>
+  <FileType>
+   <name>"Video, WMV"</name>
+   <mode>32768</mode>
+   <suffix>".wmv"</suffix>
+   <style>"3GP"</style>
+  </FileType>
+  <FileType>
+   <name>"Video, RealMedia"</name>
+   <mode>32768</mode>
+   <suffix>".rm"</suffix>
+   <style>"3GP"</style>
+  </FileType>
+  <FileType>
+   <name>"Executable, Shared Object"</name>
+   <mode>32768</mode>
+   <name_re>"^lib.+\\.so(\\.0-9.+)?"</name_re>
+   <name_glob>FALSE</name_glob>
+   <name_nocase>FALSE</name_nocase>
+   <style>"Shared Object"</style>
+  </FileType>
+  <FileType>
+   <name>"Executable"</name>
+   <mode>32768</mode>
+   <perm>32</perm>
+   <style>"Executable"</style>
+  </FileType>
+  <FileType>
+   <name>"Executable, Java Class"</name>
+   <mode>32768</mode>
+   <suffix>".class"</suffix>
+   <style>"Java Class"</style>
+  </FileType>
+  <FileType>
+   <name>"Executable, Object"</name>
+   <mode>32768</mode>
+   <suffix>".o"</suffix>
+   <style>"Object"</style>
+  </FileType>
+  <FileType>
+   <name>"Executable, Windows"</name>
+   <mode>32768</mode>
+   <suffix>".exe"</suffix>
+   <style>"Windows"</style>
+  </FileType>
+  <FileType>
+   <name>"Data, Compressed, GZip"</name>
+   <mode>32768</mode>
+   <suffix>".gz"</suffix>
+   <style>"GZip"</style>
+  </FileType>
+  <FileType>
+   <name>"Data, Compressed, BZip2"</name>
+   <mode>32768</mode>
+   <suffix>".bz2"</suffix>
+   <style>"BZip2"</style>
+  </FileType>
+  <FileType>
+   <name>"Special, Link"</name>
+   <mode>40960</mode>
+   <style>"FIFO"</style>
+  </FileType>
+  <FileType>
+   <name>"Special, Socket"</name>
+   <mode>49152</mode>
+   <style>"Socket"</style>
+  </FileType>
+  <FileType>
+   <name>"Special, FIFO"</name>
+   <mode>4096</mode>
+   <style>"FIFO"</style>
+  </FileType>
+  <FileType>
+   <name>"Unknown"</name>
+   <mode>0</mode>
+   <style>"Root"</style>
+  </FileType>
+ </FileTypes>
+ <ButtonSheets>
+  <ButtonSheet>
+   <label>"Shortcuts"</label>
+   <ButtonSheetRows>
+    <ButtonRow>
+     <width>1</width>
+     <ButtonRowButtons>
+      <Button>
+       <pos>u0</pos>
+       <BFaces>
+	<BFace>
+	 <face>u0</face>
+	 <label>"Home"</label>
+	 <cmdseq>"DirEnter &apos;dir=$HOME&apos;"</cmdseq>
+	</BFace>
+	<BFace>
+	 <face>u1</face>
+	 <label>"~root"</label>
+	 <cmdseq>"DirEnter &apos;dir=~root&apos;"</cmdseq>
+	</BFace>
+       </BFaces>
+       <flags>u0</flags>
+      </Button>
+     </ButtonRowButtons>
+    </ButtonRow>
+    <ButtonRow>
+     <width>1</width>
+     <ButtonRowButtons>
+      <Button>
+       <pos>u0</pos>
+       <BFaces>
+	<BFace>
+	 <face>u0</face>
+	 <label>"Local"</label>
+	 <cmdseq>"DirEnter &apos;dir=/usr/local/&apos;"</cmdseq>
+	</BFace>
+       </BFaces>
+       <flags>u0</flags>
+      </Button>
+     </ButtonRowButtons>
+    </ButtonRow>
+    <ButtonRow>
+     <width>1</width>
+     <ButtonRowButtons>
+      <Button>
+       <pos>u0</pos>
+       <BFaces>
+	<BFace>
+	 <face>u0</face>
+	 <label>"/"</label>
+	 <cmdseq>"DirEnter &apos;dir=/&apos;"</cmdseq>
+	</BFace>
+       </BFaces>
+       <flags>u0</flags>
+      </Button>
+     </ButtonRowButtons>
+    </ButtonRow>
+    <ButtonRow>
+     <width>1</width>
+     <ButtonRowButtons>
+      <Button>
+       <pos>u0</pos>
+       <BFaces>
+	<BFace>
+	 <face>u0</face>
+	 <label>"CD-ROM"</label>
+	 <cmdseq>"DirEnter &apos;dir=/cdrom/&apos;"</cmdseq>
+	</BFace>
+	<BFace>
+	 <face>u1</face>
+	 <label>"CD-RW"</label>
+	 <cmdseq>"DirEnter &apos;dir=/cdrw/&apos;"</cmdseq>
+	</BFace>
+       </BFaces>
+       <flags>u0</flags>
+      </Button>
+     </ButtonRowButtons>
+    </ButtonRow>
+   </ButtonSheetRows>
+  </ButtonSheet>
   <ButtonSheet>
    <label>"Default"</label>
    <ButtonSheetRows>
@@ -464,11 +2475,13 @@
 	 <face>u0</face>
 	 <label>"All"</label>
 	 <cmdseq>"SelectAll"</cmdseq>
+	 <key>"&lt;Control&gt;a"</key>
 	</BFace>
 	<BFace>
 	 <face>u1</face>
 	 <label>"None"</label>
 	 <cmdseq>"SelectNone"</cmdseq>
+	 <key>"&lt;Shift&gt;&lt;Control&gt;a"</key>
 	</BFace>
        </BFaces>
        <flags>u0</flags>
@@ -480,6 +2493,7 @@
 	 <face>u0</face>
 	 <label>"Copy"</label>
 	 <cmdseq>"Copy"</cmdseq>
+	 <key>"F3"</key>
 	</BFace>
 	<BFace>
 	 <face>u1</face>
@@ -494,13 +2508,13 @@
        <BFaces>
 	<BFace>
 	 <face>u0</face>
-	 <label>"Move"</label>
-	 <cmdseq>"Move"</cmdseq>
+	 <label>"Make Link"</label>
+	 <cmdseq>"SymLink"</cmdseq>
 	</BFace>
 	<BFace>
 	 <face>u1</face>
-	 <label>"Move As"</label>
-	 <cmdseq>"MoveAs"</cmdseq>
+	 <label>"Link As"</label>
+	 <cmdseq>"SymLinkAs"</cmdseq>
 	</BFace>
        </BFaces>
        <flags>u0</flags>
@@ -510,9 +2524,13 @@
        <BFaces>
 	<BFace>
 	 <face>u0</face>
-	 <label>"Delete"</label>
-	 <cmdseq>"Delete"</cmdseq>
-	 <key>"Delete"</key>
+	 <label>"Move"</label>
+	 <cmdseq>"Move"</cmdseq>
+	</BFace>
+	<BFace>
+	 <face>u1</face>
+	 <label>"Move As"</label>
+	 <cmdseq>"MoveAs"</cmdseq>
 	</BFace>
        </BFaces>
        <flags>u0</flags>
@@ -522,9 +2540,10 @@
        <BFaces>
 	<BFace>
 	 <face>u0</face>
-	 <label>"Rename"</label>
-	 <cmdseq>"Rename"</cmdseq>
-	 <key>"F2"</key>
+	 <label>"Delete"</label>
+	 <cmdseq>"Delete"</cmdseq>
+	 <key>"Delete"</key>
+	 <fg>CE2FB,14C2,14C2</fg>
 	</BFace>
        </BFaces>
        <flags>u0</flags>
@@ -534,7 +2553,7 @@
        <BFaces>
 	<BFace>
 	 <face>u0</face>
-	 <label>"MkDir"</label>
+	 <label>"Make Dir"</label>
 	 <cmdseq>"MkDir"</cmdseq>
 	</BFace>
        </BFaces>
@@ -561,9 +2580,10 @@
        <BFaces>
 	<BFace>
 	 <face>u0</face>
-	 <label>"Configure"</label>
+	 <label>"_Configure..."</label>
 	 <cmdseq>"Configure"</cmdseq>
 	 <key>"c"</key>
+	 <fg>C21F3,88D9,D580</fg>
 	</BFace>
        </BFaces>
        <flags>u0</flags>
@@ -573,72 +2593,102 @@
     <ButtonRow>
      <width>8</width>
      <ButtonRowButtons>
-     </ButtonRowButtons>
-    </ButtonRow>
-    <ButtonRow>
-     <width>8</width>
-     <ButtonRowButtons>
       <Button>
-       <pos>u7</pos>
+       <pos>u0</pos>
        <BFaces>
 	<BFace>
 	 <face>u0</face>
-	 <label>"Quit"</label>
-	 <cmdseq>"Quit"</cmdseq>
-	 <key>"&lt;Mod2&gt;q"</key>
+	 <label>"Toggle"</label>
+	 <cmdseq>"SelectToggle"</cmdseq>
+	 <key>"&lt;Alt&gt;a"</key>
+	</BFace>
+	<BFace>
+	 <face>u1</face>
+	 <cmdseq>""</cmdseq>
 	</BFace>
        </BFaces>
        <flags>u0</flags>
       </Button>
-     </ButtonRowButtons>
-    </ButtonRow>
-   </ButtonSheetRows>
-  </ButtonSheet>
-  <ButtonSheet>
-   <label>"Shortcuts"</label>
-   <ButtonSheetRows>
-    <ButtonRow>
-     <width>1</width>
-     <ButtonRowButtons>
       <Button>
-       <pos>u0</pos>
+       <pos>u1</pos>
        <BFaces>
 	<BFace>
 	 <face>u0</face>
-	 <label>"Home"</label>
-	 <cmdseq>"DirEnter &apos;dir=$HOME&apos;"</cmdseq>
+	 <label>"Clone"</label>
+	 <cmdseq>"Clone"</cmdseq>
 	</BFace>
        </BFaces>
        <flags>u0</flags>
       </Button>
-     </ButtonRowButtons>
-    </ButtonRow>
-    <ButtonRow>
-     <width>1</width>
-     <ButtonRowButtons>
       <Button>
-       <pos>u0</pos>
+       <pos>u2</pos>
        <BFaces>
 	<BFace>
 	 <face>u0</face>
-	 <label>"Local"</label>
-	 <cmdseq>"DirEnter &apos;dir=/usr/local/&apos;"</cmdseq>
+	 <label>"Link Clone"</label>
+	 <cmdseq>"SymLinkClone"</cmdseq>
+	</BFace>
+	<BFace>
+	 <face>u1</face>
+	 <label>"Link Edit"</label>
+	 <cmdseq>"SymLinkEdit"</cmdseq>
 	</BFace>
        </BFaces>
        <flags>u0</flags>
       </Button>
-     </ButtonRowButtons>
-    </ButtonRow>
-    <ButtonRow>
-     <width>1</width>
-     <ButtonRowButtons>
       <Button>
-       <pos>u0</pos>
+       <pos>u3</pos>
        <BFaces>
 	<BFace>
 	 <face>u0</face>
-	 <label>"/"</label>
-	 <cmdseq>"DirEnter &apos;dir=/&apos;"</cmdseq>
+	 <label>"Rename"</label>
+	 <cmdseq>"Rename"</cmdseq>
+	 <key>"F2"</key>
+	</BFace>
+	<BFace>
+	 <face>u1</face>
+	 <label>"RenameRE"</label>
+	 <cmdseq>"RenameRE"</cmdseq>
+	 <key>"&lt;Shift&gt;F2"</key>
+	</BFace>
+       </BFaces>
+       <flags>u0</flags>
+      </Button>
+      <Button>
+       <pos>u4</pos>
+       <BFaces>
+	<BFace>
+	 <face>u0</face>
+	 <label>"_Information"</label>
+	 <cmdseq>"Information"</cmdseq>
+	 <key>"i"</key>
+	</BFace>
+       </BFaces>
+       <flags>u0</flags>
+      </Button>
+      <Button>
+       <pos>u5</pos>
+       <BFaces>
+	<BFace>
+	 <face>u0</face>
+	 <label>"Get Size"</label>
+	 <cmdseq>"GetSize"</cmdseq>
+	</BFace>
+	<BFace>
+	 <face>u1</face>
+	 <label>"ClearSize"</label>
+	 <cmdseq>"ClearSize"</cmdseq>
+	</BFace>
+       </BFaces>
+       <flags>u0</flags>
+      </Button>
+      <Button>
+       <pos>u6</pos>
+       <BFaces>
+	<BFace>
+	 <face>u0</face>
+	 <label>"XTerm"</label>
+	 <cmdseq>"new_shell"</cmdseq>
 	</BFace>
        </BFaces>
        <flags>u0</flags>
@@ -646,15 +2696,107 @@
      </ButtonRowButtons>
     </ButtonRow>
     <ButtonRow>
-     <width>1</width>
+     <width>8</width>
      <ButtonRowButtons>
       <Button>
        <pos>u0</pos>
        <BFaces>
 	<BFace>
 	 <face>u0</face>
-	 <label>"CD-ROM"</label>
-	 <cmdseq>"DirEnter &apos;dir=/cdrom/&apos;"</cmdseq>
+	 <label>"SelectRE"</label>
+	 <cmdseq>"SelectRE"</cmdseq>
+	</BFace>
+	<BFace>
+	 <face>u1</face>
+	 <label>"SelectShell"</label>
+	 <cmdseq>"SelectShell"</cmdseq>
+	</BFace>
+       </BFaces>
+       <flags>u2</flags>
+      </Button>
+      <Button>
+       <pos>u1</pos>
+       <BFaces>
+	<BFace>
+	 <face>u0</face>
+	 <label>"tar..."</label>
+	 <cmdseq>"compress_tar"</cmdseq>
+	</BFace>
+	<BFace>
+	 <face>u1</face>
+	 <label>"untar"</label>
+	 <cmdseq>"uncompress_tar_gzip"</cmdseq>
+	</BFace>
+       </BFaces>
+       <flags>u0</flags>
+      </Button>
+      <Button>
+       <pos>u2</pos>
+       <BFaces>
+	<BFace>
+	 <face>u0</face>
+	 <label>"gzip"</label>
+	 <cmdseq>"compress_gzip"</cmdseq>
+	</BFace>
+	<BFace>
+	 <face>u1</face>
+	 <label>"gunzip"</label>
+	 <cmdseq>"uncompress_gzip"</cmdseq>
+	</BFace>
+       </BFaces>
+       <flags>u2</flags>
+      </Button>
+      <Button>
+       <pos>u3</pos>
+       <BFaces>
+	<BFace>
+	 <face>u0</face>
+	 <label>"RenameSeq"</label>
+	 <cmdseq>"RenameSeq"</cmdseq>
+	</BFace>
+       </BFaces>
+       <flags>u0</flags>
+      </Button>
+      <Button>
+       <pos>u4</pos>
+       <BFaces>
+	<BFace>
+	 <face>u0</face>
+	 <label>"Split"</label>
+	 <cmdseq>"Split"</cmdseq>
+	</BFace>
+	<BFace>
+	 <face>u1</face>
+	 <label>"Join"</label>
+	 <cmdseq>"Join"</cmdseq>
+	</BFace>
+       </BFaces>
+       <flags>u0</flags>
+      </Button>
+      <Button>
+       <pos>u5</pos>
+       <BFaces>
+	<BFace>
+	 <face>u0</face>
+	 <label>"SelectRE"</label>
+	 <cmdseq>"SelectRE {It:&quot;Home-grown RE Selection&quot;} set={Im:&quot;Set&quot;=&quot;All rows&quot;,&quot;Selected&quot;,&quot;Unselected&quot;} type={Im:&quot;Type&quot;=&quot;All types&quot;,&quot;Directories only&quot;,&quot;Non-directories only&quot;} action={Im:&quot;Action&quot;=&quot;Select&quot;,&quot;Unselect&quot;,&quot;Toggle&quot;} full={Ix:&quot;Require full match?&quot;*} {Is:&quot;RE&quot;}"</cmdseq>
+	</BFace>
+	<BFace>
+	 <face>u1</face>
+	 <cmdseq>""</cmdseq>
+	</BFace>
+       </BFaces>
+       <tooltip>"This uses command arguments to &quot;fake&quot; the SelectRE command"</tooltip>
+       <flags>u2</flags>
+      </Button>
+      <Button>
+       <pos>u7</pos>
+       <BFaces>
+	<BFace>
+	 <face>u0</face>
+	 <label>"_Quit"</label>
+	 <cmdseq>"Quit"</cmdseq>
+	 <key>"q"</key>
 	</BFace>
        </BFaces>
        <flags>u0</flags>
@@ -674,11 +2816,11 @@
   <PathList>
    <Path>
     <index>0</index>
-    <path>"/usr/local/share/gentoo/icons"</path>
+    <path>"icons:/usr/share/icons/gnome/16x16/mimetypes"</path>
    </Path>
    <Path>
     <index>1</index>
-    <path>"/home/emil/"</path>
+    <path>"~"</path>
    </Path>
    <Path>
     <index>2</index>
@@ -690,48 +2832,40 @@
    </Path>
   </PathList>
   <HideInfo>
-   <mode>0</mode>
-   <re>""</re>
+   <mode>1</mode>
+   <re>"^\\."</re>
    <re_nocase>FALSE</re_nocase>
   </HideInfo>
  </Paths>
- <Mounting>
-  <mode>"never"</mode>
-  <cmd_mount>"/bin/mount"</cmd_mount>
-  <cmd_umount>"/bin/umount"</cmd_umount>
-  <check_nlink>TRUE</check_nlink>
-  <show_stderr>TRUE</show_stderr>
-  <umount_exit>TRUE</umount_exit>
- </Mounting>
  <Windows>
   <Window>
    <id>u0</id>
-   <x>32</x>
-   <y>32</y>
-   <w>764</w>
-   <h>600</h>
+   <x>619</x>
+   <y>123</y>
+   <w>800</w>
+   <h>1100</h>
    <pos_use>FALSE</pos_use>
    <pos_update>FALSE</pos_update>
    <size_use>TRUE</size_use>
-   <size_update>TRUE</size_update>
+   <size_update>FALSE</size_update>
   </Window>
   <Window>
    <id>u1</id>
    <x>32</x>
    <y>32</y>
-   <w>660</w>
-   <h>530</h>
+   <w>680</w>
+   <h>540</h>
    <pos_use>FALSE</pos_use>
    <pos_update>FALSE</pos_update>
    <size_use>TRUE</size_use>
-   <size_update>TRUE</size_update>
+   <size_update>FALSE</size_update>
   </Window>
   <Window>
    <id>u2</id>
    <x>32</x>
    <y>32</y>
-   <w>640</w>
-   <h>480</h>
+   <w>1040</w>
+   <h>600</h>
    <pos_use>FALSE</pos_use>
    <pos_update>FALSE</pos_update>
    <size_use>TRUE</size_use>
@@ -739,15 +2873,87 @@
   </Window>
   <Borders>
    <width>4</width>
-   <height>24</height>
+   <height>-24</height>
   </Borders>
  </Windows>
  <Dialogs>
-  <pos>"none"</pos>
+  <pos>"mouse"</pos>
  </Dialogs>
  <Controls>
   <Keys>
    <Key>
+    <keyname>"&lt;Alt&gt;&lt;Mod2&gt;1"</keyname>
+    <cmdseq>"ActivateLeft"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"&lt;Alt&gt;&lt;Mod2&gt;2"</keyname>
+    <cmdseq>"ActivateRight"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"&lt;Alt&gt;Down"</keyname>
+    <cmdseq>"DpFocus next"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"&lt;Alt&gt;Page_Down"</keyname>
+    <cmdseq>"DpFocus pagenext"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"&lt;Alt&gt;Page_Up"</keyname>
+    <cmdseq>"DpFocus pageprev"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"&lt;Alt&gt;Return"</keyname>
+    <cmdseq>"DpFocus select=true same"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"&lt;Alt&gt;Up"</keyname>
+    <cmdseq>"DpFocus prev"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"&lt;Control&gt;&lt;Mod2&gt;F8"</keyname>
+    <cmdseq>"Rerun"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"&lt;Control&gt;Tab"</keyname>
+    <cmdseq>"DirFromOther"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"&lt;Control&gt;g"</keyname>
+    <cmdseq>"DpGotoRow {It:&quot;Jump To Row Matching&quot;} re=^{Is:&quot;Regular Expression&quot;} focus={Ix:&quot;Focus Destination?&quot;}"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"&lt;Control&gt;l"</keyname>
+    <cmdseq>"DpFocusPath select=true"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"&lt;Control&gt;r"</keyname>
+    <cmdseq>"DpReorient"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"&lt;Control&gt;s"</keyname>
+    <cmdseq>"DpFocusISrch text="</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"&lt;Control&gt;space"</keyname>
+    <cmdseq>"MenuPopup"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"&lt;Mod2&gt;c"</keyname>
+    <cmdseq>"Configure"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"&lt;Mod2&gt;q"</keyname>
+    <cmdseq>"Quit"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"&lt;Shift&gt;&lt;Mod2&gt;r"</keyname>
+    <cmdseq>"DpMaximize"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"&lt;Shift&gt;Return"</keyname>
+    <cmdseq>"DpFocusPath select=true"</cmdseq>
+   </Key>
+   <Key>
     <keyname>"BackSpace"</keyname>
     <cmdseq>"DirParent"</cmdseq>
    </Key>
@@ -756,25 +2962,37 @@
     <cmdseq>"Delete"</cmdseq>
    </Key>
    <Key>
-    <keyname>"F2"</keyname>
-    <cmdseq>"Rename"</cmdseq>
+    <keyname>"F1"</keyname>
+    <cmdseq>"About"</cmdseq>
    </Key>
    <Key>
     <keyname>"F5"</keyname>
     <cmdseq>"DirRescan"</cmdseq>
    </Key>
    <Key>
-    <keyname>"h"</keyname>
-    <cmdseq>"DpHide"</cmdseq>
+    <keyname>"F8"</keyname>
+    <cmdseq>"Run"</cmdseq>
    </Key>
    <Key>
-    <keyname>"r"</keyname>
-    <cmdseq>"DpRecenter"</cmdseq>
+    <keyname>"Left"</keyname>
+    <cmdseq>"DirParent"</cmdseq>
    </Key>
    <Key>
-    <keyname>"space"</keyname>
+    <keyname>"Tab"</keyname>
     <cmdseq>"ActivateOther"</cmdseq>
    </Key>
+   <Key>
+    <keyname>"c"</keyname>
+    <cmdseq>"Configure"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"h"</keyname>
+    <cmdseq>"DpHide"</cmdseq>
+   </Key>
+   <Key>
+    <keyname>"r"</keyname>
+    <cmdseq>"DpRecenter value=50"</cmdseq>
+   </Key>
   </Keys>
   <MouseButtons>
    <MouseButton>
@@ -788,40 +3006,48 @@
     <cmdseq>"SelectType action=toggle"</cmdseq>
    </MouseButton>
    <MouseButton>
-    <button>u1</button>
-    <state>u9</state>
-    <cmdseq>"SelectType action=select"</cmdseq>
-   </MouseButton>
-   <MouseButton>
-    <button>u1</button>
-    <state>u12</state>
-    <cmdseq>"SelectType action=unselect"</cmdseq>
-   </MouseButton>
-   <MouseButton>
     <button>u2</button>
     <state>u0</state>
     <cmdseq>"DirParent"</cmdseq>
    </MouseButton>
    <MouseButton>
+    <button>u2</button>
+    <state>u1</state>
+    <cmdseq>"SelectRow"</cmdseq>
+   </MouseButton>
+   <MouseButton>
     <button>u3</button>
     <state>u0</state>
     <cmdseq>"MenuPopup"</cmdseq>
    </MouseButton>
+   <MouseButton>
+    <button>u3</button>
+    <state>u1</state>
+    <cmdseq>"mouse_right"</cmdseq>
+   </MouseButton>
+   <MouseButton>
+    <button>u3</button>
+    <state>u4</state>
+    <cmdseq>"MenuPopup menu=&lt;ActionMenu&gt;"</cmdseq>
+   </MouseButton>
   </MouseButtons>
   <ClickMClick>
-   <cmdseq>""</cmdseq>
+   <cmdseq>"FileAction action=ClickMClick"</cmdseq>
    <delay>0.400000</delay>
   </ClickMClick>
   <Generals>
    <General>
     <context>"evt-path-rmb"</context>
-    <cmdseq>"MenuPopup menu=&lt;ParentsMenu&gt;"</cmdseq>
+    <cmdseq>"About"</cmdseq>
    </General>
   </Generals>
-  <ignore_numlock>FALSE</ignore_numlock>
+  <ignore_numlock>TRUE</ignore_numlock>
  </Controls>
  <Errors>
-  <dialog>FALSE</dialog>
+  <display>0</display>
   <beep>FALSE</beep>
  </Errors>
+ <Nagging>
+  
+ </Nagging>
 </GentooConfig>

gentoo-0.15.6.tar.bz2/icons/Makefile -> gentoo-0.19.9.tar.gz/icons/Makefile Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # icons/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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.
@@ -20,8 +21,9 @@
 
 
 pkgdatadir = $(datadir)/gentoo
-pkglibdir = $(libdir)/gentoo
 pkgincludedir = $(includedir)/gentoo
+pkglibdir = $(libdir)/gentoo
+pkglibexecdir = $(libexecdir)/gentoo
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -61,6 +63,7 @@
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -68,18 +71,32 @@
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
+  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
+    if (++n$$2 == $(am__install_max)) \
+      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
+    END { for (dir in files) print dir, filesdir }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(pixmapdir)"
-pixmapDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(pixmap_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/emil/data/workspace/gentoo/missing --run aclocal-1.10
+ACLOCAL = ${SHELL} /home/emil/data/workspace/gentoo/missing --run aclocal-1.11
 ALLOCA = 
 AMTAR = ${SHELL} /home/emil/data/workspace/gentoo/missing --run tar
 AUTOCONF = ${SHELL} /home/emil/data/workspace/gentoo/missing --run autoconf
 AUTOHEADER = ${SHELL} /home/emil/data/workspace/gentoo/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/emil/data/workspace/gentoo/missing --run automake-1.10
-AWK = mawk
+AUTOMAKE = ${SHELL} /home/emil/data/workspace/gentoo/missing --run automake-1.11
+AWK = gawk
 BUILD_INCLUDED_LIBINTL = no
 CATOBJEXT = .gmo
 CC = gcc
@@ -90,7 +107,7 @@
 CPPFLAGS = 
 CYGPATH_W = echo
 DATADIRNAME = share
-DATE = 2009-06-23
+DATE = 2011-01-26
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
 ECHO_C = 
@@ -111,8 +128,8 @@
 GMSGFMT_015 = /usr/bin/msgfmt
 GOBJECT_QUERY = gobject-query
 GREP = /bin/grep
-GTK_CFLAGS = -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0  
+GTK_CFLAGS = -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12  
+GTK_LIBS = -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lm -lcairo -lpng12 -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0  
 HAVE_ASPRINTF = 1
 HAVE_POSIX_PRINTF = 1
 HAVE_SNPRINTF = 1
@@ -136,7 +153,7 @@
 LIBOBJS = 
 LIBPTH = 
 LIBPTH_PREFIX = 
-LIBS = 
+LIBS = -lm 
 LIBTHREAD = 
 LTLIBC = -lc
 LTLIBICONV = 
@@ -147,18 +164,23 @@
 LTLIBTHREAD = 
 MAKEINFO = ${SHELL} /home/emil/data/workspace/gentoo/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
+MODULES_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+MODULES_LIBS = -pthread -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0  
 MSGFMT = /usr/bin/msgfmt
 MSGFMT_015 = /usr/bin/msgfmt
 MSGMERGE = /usr/bin/msgmerge
 OBJEXT = o
 PACKAGE = gentoo
-PACKAGE_BUGREPORT = 
-PACKAGE_NAME = 
-PACKAGE_STRING = 
-PACKAGE_TARNAME = 
-PACKAGE_VERSION = 
+PACKAGE_BUGREPORT = emil@obsession.se
+PACKAGE_NAME = gentoo
+PACKAGE_STRING = gentoo 0.19.9
+PACKAGE_TARNAME = gentoo
+PACKAGE_URL = http://obsession.se/gentoo/
+PACKAGE_VERSION = 0.19.9
 PATH_SEPARATOR = :
 PKG_CONFIG = /usr/bin/pkg-config
+PKG_CONFIG_LIBDIR = 
+PKG_CONFIG_PATH = 
 POSUB = po
 PRI_MACROS_BROKEN = 0
 RANLIB = ranlib
@@ -167,7 +189,7 @@
 STRIP = 
 USE_INCLUDED_LIBINTL = no
 USE_NLS = yes
-VERSION = 0.15.6
+VERSION = 0.19.9
 WINDRES = 
 WOE32 = no
 WOE32DLL = no
@@ -192,8 +214,8 @@
 build_vendor = unknown
 builddir = .
 datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE}
+datarootdir = /usr/share
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
 host = x86_64-unknown-linux-gnu
@@ -204,7 +226,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/emil/data/workspace/gentoo/install-sh
+install_sh = ${SHELL} /home/emil/data/workspace/gentoo/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -361,9 +383,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  icons/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  icons/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign icons/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign icons/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -381,23 +403,27 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-pixmapDATA: $(pixmap_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
-	@list='$(pixmap_DATA)'; for p in $$list; do \
+	@list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pixmapDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pixmapdir)/$$f'"; \
-	  $(pixmapDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pixmapdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pixmapdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pixmapdir)" || exit $$?; \
 	done
 
 uninstall-pixmapDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pixmap_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pixmapdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pixmapdir)/$$f"; \
-	done
+	@list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pixmapdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pixmapdir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -421,13 +447,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -458,6 +488,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -476,6 +507,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -484,18 +517,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -529,6 +572,7 @@
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
 	uninstall-am uninstall-pixmapDATA
 
+
 # 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:

gentoo-0.15.6.tar.bz2/icons/Makefile.in -> gentoo-0.19.9.tar.gz/icons/Makefile.in Changed

gentoo-0.15.6.tar.bz2/m4/Makefile.in -> gentoo-0.19.9.tar.gz/m4/Makefile.in Changed

gentoo-0.15.6.tar.bz2/po/LINGUAS -> gentoo-0.19.9.tar.gz/po/LINGUAS Changed

gentoo-0.15.6.tar.bz2/po/Makevars -> gentoo-0.19.9.tar.gz/po/Makevars Changed

gentoo-0.15.6.tar.bz2/po/POTFILES.in -> gentoo-0.19.9.tar.gz/po/POTFILES.in Changed

gentoo-0.19.9.tar.gz/po/ca.gmo Added

gentoo-0.19.9.tar.gz/po/ca.po Added

@@ -0,0 +1,2858 @@
+# translation of de.po to Spanish
+# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Emil Brink.
+# Innocent De Marchi <tangram.peces@gmail.com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gentoo\n"
+"Report-Msgid-Bugs-To: Emil Brink\n"
+"POT-Creation-Date: 2011-01-26 21:54+0100\n"
+"PO-Revision-Date: 2011-01-26 19:13+0100\n"
+"Last-Translator: Innocent De Marchi <tangram.peces@gmail.com>\n"
+"Language-Team: Innocent De Marchi <tangram.peces@gmail.com>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Catalan\n"
+"X-Poedit-Country: SPAIN\n"
+
+#: src/cfg_buttonlayout.c:65
+msgid "Left of Command Buttons"
+msgstr "A l'esquerra dels botons d'ordres"
+
+#: src/cfg_buttonlayout.c:65
+msgid "Right of Command Buttons"
+msgstr "A dreta dels botons d'ordres"
+
+#: src/cfg_buttonlayout.c:66
+msgid "No Padding"
+msgstr "Estàtic (sense separació)"
+
+#: src/cfg_buttonlayout.c:66
+msgid "Paned"
+msgstr "Panell"
+
+#: src/cfg_buttonlayout.c:66
+msgid "Static"
+msgstr "Estàtic"
+
+#: src/cfg_buttonlayout.c:75
+msgid ""
+"This page lets you control how the Shortcuts button sheet is positioned "
+"relative to\n"
+"the one holding the main Command Buttons. It is more or less a place-holder; "
+"the plan\n"
+"is to provide a lot more flexibility in the button management, and also to "
+"support the\n"
+"creation of more than these two built-in sheets of buttons. But that has yet "
+"to happen.\n"
+"\n"
+"In the meantime, this provides the functionality that was present when the "
+"Shortcuts\n"
+"were a special feature with their own configuration page (up to and "
+"including version\n"
+"0.11.24 of gentoo), for your convenience.\n"
+"\n"
+"To find the Shortcut sheet, switch to the Definitions page, and use the "
+"option menu widget\n"
+"in the top left corner of the page."
+msgstr ""
+"Aquesta pàgina no permet controlar la forma d'ubicació del panell de "
+"Funcions Ràpides en relació al\n"
+"panell que conté els Botons d'Ordres. És una casta  d'anclatge; la idea\n"
+"és proporcionar una major flexibilitat en l'administració dels botons i "
+"permetre la\n"
+"creació de més panells de botons integrats en el programa. Però això encara "
+"està per fer.\n"
+"\n"
+"Fins el moment, es proporciona la funcionalitat semblat a quan les funcions "
+"ràpides\n"
+"eren una funció especial amb la seva pàgina pròpia de configuració (fins a "
+"la versió 0.11.24 de gentoo), per el seu acomod.\n"
+"Per trobar un panell de funcions ràpides, canviau a la pàgina de Definicions "
+"i feu servir l'opció d'entrada del menú\n"
+"del cantó superior esquerra de la pàgina."
+
+#: src/cfg_buttonlayout.c:88
+msgid "Shortcut Sheet Position"
+msgstr "Posició del panell de Funcions Ràpides"
+
+#: src/cfg_buttonlayout.c:102
+msgid "Separation Style"
+msgstr "Estil d'espaiat mitjançer"
+
+#: src/cfg_buttonlayout.c:116
+msgid "Layout"
+msgstr "Posició"
+
+#: src/cfg_buttons.c:308
+msgid "Set Row Width"
+msgstr "Establir l'ample de Fila"
+
+#: src/cfg_buttons.c:326 src/cfg_buttons.c:748
+msgid "Default"
+msgstr "Predeterminat"
+
+#: src/cfg_buttons.c:439 src/overwrite.c:49
+msgid "Please Confirm"
+msgstr "Si us plau, Confirmeu"
+
+#: src/cfg_buttons.c:439
+msgid "Really delete current button row?"
+msgstr "De debò voleu eliminar la fila de botons seleccionada?"
+
+#: src/cfg_buttons.c:439 src/cfg_styles.c:680
+msgid "_Delete|_Cancel"
+msgstr "_Borrar|_Cancelar"
+
+#: src/cfg_buttons.c:463
+msgid "Select Width for New Row"
+msgstr "Seleccionar l'amplada de la nova fila"
+
+#: src/cfg_buttons.c:466
+msgid "Change Width of Row"
+msgstr "Canviar l'amplada de la fila"
+
+#: src/cfg_buttons.c:609
+msgid "Edit Background Color"
+msgstr "Editar el color del fons"
+
+#: src/cfg_buttons.c:653
+msgid "Edit Foreground Color"
+msgstr "Editar el color del primer pla"
+
+#: src/cfg_buttons.c:678
+msgid "Label"
+msgstr "Etiqueta"
+
+#: src/cfg_buttons.c:686 src/cfg_controls.c:612 src/cfg_controls.c:663
+#: src/cfg_controls.c:685
+msgid "Command"
+msgstr "Ordre"
+
+#: src/cfg_buttons.c:697 src/cfg_controls.c:606
+msgid "Key"
+msgstr "Tecla"
+
+#: src/cfg_buttons.c:712
+msgid "Colors"
+msgstr "Colors"
+
+#: src/cfg_buttons.c:716
+msgid "Background..."
+msgstr "Fons..."
+
+#: src/cfg_buttons.c:717 src/cfg_buttons.c:723
+msgid "Reset to Default"
+msgstr "Restablir predeterminat"
+
+#: src/cfg_buttons.c:722
+msgid "Foreground..."
+msgstr "Primer pla..."
+
+#: src/cfg_buttons.c:748
+msgid "Shortcuts"
+msgstr "Dreceres"
+
+#: src/cfg_buttons.c:749
+msgid "Clear"
+msgstr "Netejar"
+
+#: src/cfg_buttons.c:749
+msgid "Copy Colors To"
+msgstr "Copiar colors a"
+
+#: src/cfg_buttons.c:749
+msgid "Copy To"
+msgstr "Copiar a"
+
+#: src/cfg_buttons.c:749
+msgid "Swap With"
+msgstr "Canviar amb"
+
+#: src/cfg_buttons.c:750
+msgid "Add Row..."
+msgstr "Afegir fila..."
+
+#: src/cfg_buttons.c:750 src/cfg_cmdseq.c:966
+msgid "Delete Row"
+msgstr "Eliminar fila"
+
+#: src/cfg_buttons.c:750
+msgid "Down"
+msgstr "Abaix"
+
+#: src/cfg_buttons.c:750
+msgid "Row Width..."
+msgstr "Amplada de fila"
+
+#: src/cfg_buttons.c:750
+msgid "Up"
+msgstr "Amunt"
+
+#: src/cfg_buttons.c:761
+msgid "Sheet"
+msgstr "Panell"
+
+#: src/cfg_buttons.c:775
+msgid "Primary"
+msgstr "Principal"
+
+#: src/cfg_buttons.c:777
+msgid "Secondary"
+msgstr "Secundari"
+
+#: src/cfg_buttons.c:782
+msgid "Tooltip"
+msgstr "Consell"
+
+#: src/cfg_buttons.c:790 src/cfg_dirpane.c:1107
+msgid "Flags"
+msgstr "Banderes"
+
+#: src/cfg_buttons.c:792
+msgid "Narrow?"
+msgstr "¿Refinar?"
+
+#: src/cfg_buttons.c:796
+msgid "Show Tooltip?"
+msgstr "¿Mostrar consell?"
+
+#: src/cfg_buttons.c:831
+msgid "Buttons"
+msgstr "Botons"
+
+#: src/cfg_buttons.c:832 src/cfg_cmdseq.c:1081
+msgid "Definitions"
+msgstr "Definicions"
+
+#: src/cfg_cmdcfg.c:66
+msgid "Options"
+msgstr "Opcions"
+
+#: src/cfg_cmdseq.c:611
+msgid "Select Builtin"
+msgstr "Seleccionar predeterminat"
+
+#: src/cfg_cmdseq.c:627
+msgid "Opening brace"
+msgstr "Obrint clau"
+
+#: src/cfg_cmdseq.c:628
+msgid "Closing brace"
+msgstr "Tancant clau"
+
+#: src/cfg_cmdseq.c:629
+msgid "First selected"
+msgstr "El primer seleccionat"
+
+#: src/cfg_cmdseq.c:630
+msgid "First selected, unselect"
+msgstr "Primer seleccionat, desseleccionat"
+
+#: src/cfg_cmdseq.c:631
+msgid "First selected, with path"
+msgstr "El primer seleccionat, amb l'adreça"
+
+#: src/cfg_cmdseq.c:632
+msgid "First selected, with path, unselect"
+msgstr "El primer selecciona, amb l'adreça, desseleccionat"
+
+#: src/cfg_cmdseq.c:633
+msgid "First selected (destination pane)"
+msgstr "El primer seleccionat (panell de desti)"
+
+#: src/cfg_cmdseq.c:634
+msgid "First selected, no quotes"
+msgstr "El primer selecciona sense cometes"
+
+#: src/cfg_cmdseq.c:635
+msgid "All selected"
+msgstr "Tos els seleccionats"
+
+#: src/cfg_cmdseq.c:636
+msgid "All selected, unselect"
+msgstr "Tots els seleccionats, desseleccionar"
+
+#: src/cfg_cmdseq.c:637
+msgid "All selected, with paths"
+msgstr "Tots els seleccionats amb l'adreça"
+
+#: src/cfg_cmdseq.c:638
+msgid "All selected, with paths, unselect"
+msgstr "Tots els seleccionats, amb les adreces, desseleccionar"
+
+#: src/cfg_cmdseq.c:639
+msgid "All selected (destination pane)"
+msgstr "Tots els seleccionats (panell de desti)"
+
+#: src/cfg_cmdseq.c:640
+msgid "All selected, no quotes"
+msgstr "Tots els seleccionats, sense cometes"
+
+#: src/cfg_cmdseq.c:641
+msgid "Path to source pane's directory"
+msgstr "Adreça al directori del panell d'origen"
+
+#: src/cfg_cmdseq.c:642
+msgid "Path to destination pane's directory"
+msgstr "Adreça al directori del panell de desti"
+
+#: src/cfg_cmdseq.c:643
+msgid "Path to home directory"
+msgstr "Adreça al directori personal"
+
+#: src/cfg_cmdseq.c:644
+msgid "Path of left pane"
+msgstr "Adreça del panell de l'esquerra"
+
+#: src/cfg_cmdseq.c:645
+msgid "Path of right pane"
+msgstr "Adreça del panell de la dreta"
+
+#: src/cfg_cmdseq.c:646
+msgid "URI of first selected"
+msgstr "URI del primer seleccionat"
+
+#: src/cfg_cmdseq.c:647
+msgid "URI of first selected, unselect"
+msgstr "URI del primer seleccionat, desseleccionar"
+
+#: src/cfg_cmdseq.c:648
+msgid "URI of first selected, no quotes"
+msgstr "URI del primer seleccionat sense cometes"
+
+#: src/cfg_cmdseq.c:649
+msgid "URIs of all selected"
+msgstr "URI de tots els seleccionats"
+
+#: src/cfg_cmdseq.c:650
+msgid "URIs of all selected, unselect"
+msgstr "URI de tots els seleccionats, desseleccionar"
+
+#: src/cfg_cmdseq.c:651
+msgid "URIs of all selected, no quotes"
+msgstr "URI de tots els seleccionats, sense cometes"
+
+#: src/cfg_cmdseq.c:652
+msgid "URIs of all selected, unselect, no quotes"
+msgstr "URI de tots els seleccionats, sense cometes"
+
+#: src/cfg_cmdseq.c:653
+msgid "URI of first selected (destination pane)"
+msgstr "URI del primer seleccionat (panell de desti)"
+
+#: src/cfg_cmdseq.c:654
+msgid "Input combo box"
+msgstr "Caixa de selecció"
+
+#: src/cfg_cmdseq.c:655
+msgid "Input using menu"
+msgstr "Entrada fent servir menú"
+
+#: src/cfg_cmdseq.c:656
+msgid "Input string"
+msgstr "Textw d'entrada"
+
+#: src/cfg_cmdseq.c:657
+msgid "Input check button (gives TRUE or FALSE)"
+msgstr "Botó d'opció d'entrada (dona VERTADER o FALS)"
+
+#: src/cfg_cmdseq.c:658
+msgid "Add label to input window"
+msgstr "Agregar etiqueta a la finestra d'entrada"
+
+#: src/cfg_cmdseq.c:659
+msgid "Add a separator bar to input window"
+msgstr "Agregar una barra de separació a la finestra d'entrada"
+
+#: src/cfg_cmdseq.c:660
+msgid "$NAME"
+msgstr "$NAME"
+
+#: src/cfg_cmdseq.c:660
+msgid "Value of $NAME (environment)"
+msgstr "Valor de $NAME (entorn)"
+
+#: src/cfg_cmdseq.c:661
+msgid "gentoo's PID"
+msgstr "PID de gentoo"
+
+#: src/cfg_cmdseq.c:662
+msgid "Home directory for user NAME"
+msgstr "Directori arrel del usuari <NOM>"
+
+#: src/cfg_cmdseq.c:662
+msgid "~NAME"
+msgstr "~NOM"
+
+#: src/cfg_cmdseq.c:686 src/cmd_split.c:536
+msgid "Pick Code"
+msgstr "Seleccionar codi"
+
+#: src/cfg_cmdseq.c:778
+msgid "(No Options Available)"
+msgstr "(No hi ha opcions disponibles)"
+
+#: src/cfg_cmdseq.c:814
+msgid "Run in Background?"
+msgstr "Executar en segon pla?"
+
+#: src/cfg_cmdseq.c:818
+msgid "Kill Previous Instance?"
+msgstr "Matar instància anterior?"
+
+#: src/cfg_cmdseq.c:822
+msgid "Survive Quit?"
+msgstr "Sobreviu tancar?"
+
+#: src/cfg_cmdseq.c:828
+msgid "Capture Output?"
+msgstr "Capturar sortida?"
+
+#: src/cfg_cmdseq.c:913
+msgid "Before Execution"
+msgstr "Abans de l'execució"
+
+#: src/cfg_cmdseq.c:916
+msgid "Require Source Selection?"
+msgstr "Requereix selecció d'origen?"
+
+#: src/cfg_cmdseq.c:920
+msgid "Require Destination Selection?"
+msgstr "Requereix selecció de destí?"
+
+#: src/cfg_cmdseq.c:926
+msgid "CD Source?"
+msgstr "CD origen?"
+
+#: src/cfg_cmdseq.c:929
+msgid "CD Destination?"
+msgstr "CD destí?"
+
+#: src/cfg_cmdseq.c:937
+msgid "After Execution"
+msgstr "Posterior a la execució"
+
+#: src/cfg_cmdseq.c:939
+msgid "Rescan Source?"
+msgstr "Actualitzar l'origen?"
+
+#: src/cfg_cmdseq.c:943
+msgid "Rescan Destination?"
+msgstr "Actualitzar destí?"
+
+#: src/cfg_cmdseq.c:957
+msgid "General"
+msgstr "General"
+
+#: src/cfg_cmdseq.c:960
+msgid "Before&After"
+msgstr "Abans&Després"
+
+#: src/cfg_cmdseq.c:965
+msgid "Built-In"
+msgstr "Predefinits"
+
+#: src/cfg_cmdseq.c:965
+msgid "External"
+msgstr "Externs"
+
+#: src/cfg_cmdseq.c:966
+msgid "Add Row"
+msgstr "Afegir fila"
+
+#: src/cfg_cmdseq.c:966
+msgid "Duplicate"
+msgstr "Duplicar"
+
+#: src/cfg_cmdseq.c:993 src/cfg_styles.c:596 src/cfg_styles.c:823
+#: src/cfg_types.c:678 src/cmd_info.c:151 src/cmd_split.c:648
+#: src/cmd_symlink.c:213 src/dpformat.c:36
+msgid "Name"
+msgstr "Nom"
+
+#: src/cfg_cmdseq.c:1004
+msgid "Definition"
+msgstr "Definició"
+
+#: src/cfg_cmdseq.c:1058
+msgid "Repeat Sequence Until No Source Selection?"
+msgstr "Repetir la seqüència fins acabar amb la selecció original?"
+
+#: src/cfg_cmdseq.c:1070 src/cfg_controls.c:622 src/cfg_controls.c:673
+#: src/cfg_styles.c:853 src/cfg_types.c:776
+msgid "Add"
+msgstr "Afegir"
+
+#: src/cfg_cmdseq.c:1073 src/cfg_controls.c:625 src/cfg_controls.c:676
+#: src/cfg_styles.c:856 src/cfg_types.c:789
+msgid "Delete"
+msgstr "Eliminar"
+
+#: src/cfg_cmdseq.c:1080
+msgid "Commands"
+msgstr "Ordres"
+
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1288 src/cfg_dirpane.c:1293
+msgid "Left"
+msgstr "Esquerra"
+
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
+msgid "Middle"
+msgstr "Centre"
+
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1287 src/cfg_dirpane.c:1294
+msgid "Right"
+msgstr "Dreta"
+
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
+msgid "Wheel Down"
+msgstr "Baixar"
+
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
+msgid "Wheel Up"
+msgstr "Pujar"
+
+#: src/cfg_controls.c:378
+msgid ""
+"The following modifier key(s) must\n"
+"be held down when the mouse button\n"
+"is clicked to trigger the command"
+msgstr ""
+"Les tecles següents de modificació cal\n"
+"mantenir-les pitjades en clicar amb el ratolí\n"
+"per executar l'ordre."
+
+#: src/cfg_controls.c:391
+msgid "Edit Modifiers"
+msgstr "Editar modificadors"
+
+#: src/cfg_controls.c:580
+msgid "Controls"
+msgstr "Controls"
+
+#: src/cfg_controls.c:587
+msgid "Global Keyboard Shortcuts"
+msgstr "Funcions globals ràpides del teclat"
+
+#: src/cfg_controls.c:632
+msgid "Dirpane Mouse Buttons"
+msgstr "Panell de control dels icones del ratolí"
+
+#: src/cfg_controls.c:657
+msgid "Button"
+msgstr "Botó"
+
+#: src/cfg_controls.c:660
+msgid "Edit Modifiers..."
+msgstr "Editar modificadors..."
+
+#: src/cfg_controls.c:683
+msgid "Click-M-Click Gesture"
+msgstr "Click-M-Click combinació"
+
+#: src/cfg_controls.c:693
+msgid "Time Limit"
+msgstr "Límit de temps"
+
+#: src/cfg_controls.c:704
+msgid "Ignore Num Lock For All Bindings?"
+msgstr "Ignorar el bloqueig numèric (tecla Bloq Num) per a tots els enllaços?"
+
+#: src/cfg_controls.c:734
+msgid ""
+"Note: The mouse button control settings\n"
+"are ambiguous: the same button+modifier\n"
+"is used for more than one function. This\n"
+"might make their behaviour pretty weird..."
+msgstr ""
+"Nota: Les opcions per a la configuració del botó del ratolí\n"
+"son ambigües: el mateix botó+modificador\n"
+"es fa servir per a més d'una funció. Aixó\n"
+"pot fer que se comportin d'una manera una mica estranya..."
+
+#: src/cfg_controls.c:738
+msgid "Warning"
+msgstr "Advertència"
+
+#: src/cfg_controls.c:738 src/children.c:89 src/cmd_info.c:320
+msgid "_OK"
+msgstr "_d'Acord"
+
+#: src/cfg_dirpane.c:333
+msgid "Append Type Character?"
+msgstr "Afegir caràcter de tipus?"
+
+#: src/cfg_dirpane.c:336
+msgid "Append \"→ destination\" on Links?"
+msgstr "Afegir \"→ desti\" en els enllaços?"
+
+#: src/cfg_dirpane.c:358
+msgid "Place Tick Every 3 Digits?"
+msgstr "Marca cada 3 dígits?"
+
+#: src/cfg_dirpane.c:369
+msgid "Digits of Precision"
+msgstr "Dígits de precisió"
+
+#: src/cfg_dirpane.c:382
+msgid "Show Dir's File System Size?"
+msgstr "Mostrar la mida del directori del sistema d'arxius"
+
+#: src/cfg_dirpane.c:388 src/cfg_dirpane.c:392 src/cfg_dirpane.c:396
+#: src/cfg_dirpane.c:400 src/cfg_dirpane.c:404 src/cfg_dirpane.c:408
+#: src/cfg_dirpane.c:412 src/cfg_dirpane.c:416 src/cfg_dirpane.c:420
+#: src/cfg_dirpane.c:428
+msgid "Format"
+msgstr "Format"
+
+#: src/cfg_dirpane.c:454
+#, c-format
+msgid "%s Settings"
+msgstr "%s Opcions"
+
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:970 src/cfg_dirpane.c:971
+#: src/cmd_select.c:381
+msgid "Content"
+msgstr "Contingut"
+
+#: src/cfg_dirpane.c:571
+msgid "Justification"
+msgstr "Justificació"
+
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:971
+msgid "Title"
+msgstr "Títol"
+
+#: src/cfg_dirpane.c:571 src/window.c:200
+msgid "Width"
+msgstr "Amplada"
+
+#: src/cfg_dirpane.c:572
+msgid "Center"
+msgstr "Centre"
+
+#: src/cfg_dirpane.c:581
+msgid "Basic Settings"
+msgstr "Opcions bàsiques"
+
+#: src/cfg_dirpane.c:628
+msgid "Edit Column Content"
+msgstr "Editar el contingut de la columna"
+
+#: src/cfg_dirpane.c:970
+msgid "Default Title"
+msgstr "Títol predeterminat"
+
+#: src/cfg_dirpane.c:996
+msgid "Directories First"
+msgstr "Directoris primer"
+
+#: src/cfg_dirpane.c:996
+msgid "Directories Last"
+msgstr "Directoris al final"
+
+#: src/cfg_dirpane.c:996
+msgid "Directories Mixed"
+msgstr "Mesclar directoris"
+
+#: src/cfg_dirpane.c:997
+msgid "Left of List"
+msgstr "A l'esquerra de la llista"
+
+#: src/cfg_dirpane.c:997
+msgid "Right of List"
+msgstr "A la dreta de la llista"
+
+#: src/cfg_dirpane.c:997
+msgid "System Default"
+msgstr "Predeterminat del sistema"
+
+#: src/cfg_dirpane.c:998
+#, c-format
+msgid "Copy From %s"
+msgstr "Copiar des de %s"
+
+#: src/cfg_dirpane.c:998
+#, c-format
+msgid "Copy To %s"
+msgstr "Copiar a %s"
+
+#: src/cfg_dirpane.c:998
+#, c-format
+msgid "Swap With %s"
+msgstr "Intercanviar amb %s"
+
+#: src/cfg_dirpane.c:1015
+msgid "Columns"
+msgstr "Columnes"
+
+#: src/cfg_dirpane.c:1020
+msgid "Available Content Types"
+msgstr "Tipus de continguts disponibles"
+
+#: src/cfg_dirpane.c:1037
+msgid "Selected Content Types"
+msgstr "Tipus de continguts seleccionats"
+
+#: src/cfg_dirpane.c:1049 src/cfg_styles.c:741
+msgid "Edit..."
+msgstr "Editar..."
+
+#: src/cfg_dirpane.c:1050 src/cmd_renamere.c:481
+msgid "Remove"
+msgstr "Eliminar"
+
+#: src/cfg_dirpane.c:1064
+msgid "Sorting"
+msgstr "Ordenar"
+
+#: src/cfg_dirpane.c:1067
+msgid "Sort On"
+msgstr "Ordenar per"
+
+#: src/cfg_dirpane.c:1071 src/cmd_split.c:590 src/dpformat.c:40
+#: src/dpformat.c:41
+msgid "Mode"
+msgstr "Mode"
+
+#: src/cfg_dirpane.c:1077
+msgid "Inverse Sorting?"
+msgstr "Ordre Invers?"
+
+#: src/cfg_dirpane.c:1080 src/cfg_paths.c:228 src/cfg_types.c:744
+#: src/cmd_renamere.c:432 src/cmd_renamere.c:459 src/cmd_select.c:478
+#: src/textview.c:604
+msgid "Ignore Case?"
+msgstr "Ignorar majúscules/minúscules"
+
+#: src/cfg_dirpane.c:1088
+msgid "Default Directory"
+msgstr "Directori predeterminat"
+
+#: src/cfg_dirpane.c:1094
+msgid "Grab Current"
+msgstr "Obtindre l'actual"
+
+#: src/cfg_dirpane.c:1097
+msgid "From History"
+msgstr "Des de historial"
+
+#: src/cfg_dirpane.c:1110
+msgid "Path Above?"
+msgstr "Ruta superior?"
+
+#: src/cfg_dirpane.c:1114
+msgid "Hide Allowed?"
+msgstr "És possible amagar?"
+
+#: src/cfg_dirpane.c:1118
+msgid "Scrollbar Always?"
+msgstr "Sempre amb barres de desplazamient?"
+
+#: src/cfg_dirpane.c:1122
+msgid "Huge Parent Button?"
+msgstr "Botó pujar gran?"
+
+#: src/cfg_dirpane.c:1127
+msgid "Set Custom Font?"
+msgstr "Voleu establir la font personalitzada?"
+
+#: src/cfg_dirpane.c:1140
+msgid "Scrollbar Position"
+msgstr "Posició de la barra de desplaçament"
+
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
+msgid "Horizontal"
+msgstr "Horitzontal"
+
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
+msgid "Vertical"
+msgstr "Vertical"
+
+#: src/cfg_dirpane.c:1194
+msgid "Don't Track"
+msgstr "No rastretjar"
+
+#: src/cfg_dirpane.c:1194
+msgid "Ratio"
+msgstr "Proporció"
+
+#: src/cfg_dirpane.c:1194
+msgid "Size, Left Pane"
+msgstr "Mida, panell esquerre"
+
+#: src/cfg_dirpane.c:1194
+msgid "Size, Right Pane"
+msgstr "Mida, panell dreta"
+
+#: src/cfg_dirpane.c:1198
+msgid "Pane Orientation"
+msgstr "Orientació del panell"
+
+#: src/cfg_dirpane.c:1212
+msgid "Split Tracking"
+msgstr "Rastrejar Divisió"
+
+#: src/cfg_dirpane.c:1235
+msgid "pixels"
+msgstr "pixeles"
+
+#: src/cfg_dirpane.c:1263
+msgid "Remember Selected Rows?"
+msgstr "Recordar les files seleccionades?"
+
+#: src/cfg_dirpane.c:1266
+msgid "Save History Lists?"
+msgstr "Desar les llistes d'historial?"
+
+#: src/cfg_dirpane.c:1283 src/cfg_dirpane.c:1292
+msgid "Dir Panes"
+msgstr "Panells de directoris"
+
+#: src/cfg_dirpane.c:1295
+msgid "Pane Split"
+msgstr "Divisió de panells"
+
+#: src/cfg_dirpane.c:1296
+msgid "History"
+msgstr "Historial"
+
+#: src/cfg_dirpane.c:1725
+msgid "'Blocks' Content Deprecated"
+msgstr "Contingut 'Blocs' obsoletes"
+
+#: src/cfg_dirpane.c:1726
+msgid ""
+"The 'Blocks' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
+"La columna de \"Blocs\" ja no s'admet, \n"
+"però la configuració en fa us. S'eliminarà \n"
+"automàticament."
+
+#: src/cfg_dirpane.c:1732
+msgid "'Block Size' Content Deprecated"
+msgstr "Contingut 'Mida de Bloc' obsolet."
+
+#: src/cfg_dirpane.c:1733
+msgid ""
+"The 'Block Size' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
+"La columna 'Mida de bloc'  ja no es fa servir, \n"
+"però la seva configuració personalitzada la fa servir.\n"
+"S'eliminarà automàticament."
+
+#: src/cfg_errors.c:48
+msgid "Errors"
+msgstr "Errors"
+
+#: src/cfg_errors.c:55
+msgid "Error and Status Message Display"
+msgstr "Presentació de missatges d'error i d'estat."
+
+#: src/cfg_errors.c:57
+msgid "Status Bar, Above Panes"
+msgstr "Barra d'estat per sobre dels panells"
+
+#: src/cfg_errors.c:60
+msgid "Main Window's Title Bar"
+msgstr "Barra de títol de la finestra principal."
+
+#: src/cfg_errors.c:63
+msgid "Separate Dialog"
+msgstr "Finestra de diàleg separada"
+
+#: src/cfg_errors.c:69
+msgid "Cause Console Beep on Error?"
+msgstr "Alarma en cas d'error?"
+
+#: src/cfg_menus.c:44
+msgid "Menus"
+msgstr "Menús"
+
+#: src/cfg_nag.c:78
+#, c-format
+msgid ""
+"Click the button below to reset the %zu stored 'Don't show this dialog "
+"again' responses."
+msgstr ""
+"Faci clic en el botó per restablir el %zu emmagatzemat \"No tornar a mostrar "
+"aquest quadre de diàleg de nou\" resposta."
+
+#: src/cfg_nag.c:100
+msgid "Nagging"
+msgstr "Persistent"
+
+#: src/cfg_nag.c:110
+msgid "Reset All"
+msgstr "Restablir tot"
+
+#: src/cfg_paths.c:78
+msgid "Edit path"
+msgstr "Editar l'adreça de directori"
+
+#: src/cfg_paths.c:152
+msgid "Icons"
+msgstr "Icons"
+
+#: src/cfg_paths.c:153
+msgid "GTK+ RC"
+msgstr "GTK+ RC"
+
+#: src/cfg_paths.c:154
+msgid "fstab"
+msgstr "fstab"
+
+#: src/cfg_paths.c:155
+msgid "mtab"
+msgstr "mtab"
+
+#: src/cfg_paths.c:157
+msgid "Beginning With Dot (.)"
+msgstr "Iniciant amb punto (.)"
+
+#: src/cfg_paths.c:157
+msgid "Matching RE"
+msgstr "Coincidències en ER"
+
+#: src/cfg_paths.c:157 src/cmd_chmod.c:252 src/menus.c:519
+msgid "None"
+msgstr "Cap"
+
+#: src/cfg_paths.c:163
+msgid "Paths & Hide"
+msgstr "Adreces i amagar"
+
+#: src/cfg_paths.c:170
+msgid "Paths"
+msgstr "Adreces"
+
+#: src/cfg_paths.c:209
+msgid "Hide Entries"
+msgstr "Amagar entrades"
+
+#: src/cfg_styles.c:178 src/cfg_types.c:233 src/iconutil.c:31 src/menus.c:19
+msgid "(None)"
+msgstr "(Cap)"
+
+#: src/cfg_styles.c:199 src/cfg_styles.c:436 src/cfg_styles.c:785
+msgid "Delete Action"
+msgstr "Acció eliminar"
+
+#: src/cfg_styles.c:419 src/color_dialog.c:47
+msgid "Edit Color"
+msgstr "Editar color"
+
+#: src/cfg_styles.c:436
+msgid "Revert to Inherited Command"
+msgstr "Retornar a l'ordre heretada"
+
+#: src/cfg_styles.c:537
+msgid "Select Command ..."
+msgstr "Seleccionar ordre ..."
+
+#: src/cfg_styles.c:601
+msgid "New Action Property"
+msgstr "Nova propietat de l'acció"
+
+#: src/cfg_styles.c:609
+msgid "something"
+msgstr "alguna cosa"
+
+#: src/cfg_styles.c:679
+msgid ""
+"Deleting this style will also delete\n"
+"all its children. Are you sure?"
+msgstr ""
+"Eliminar aquest estil eliminarà també\n"
+"tots els derivats. N'estau segur?"
+
+#: src/cfg_styles.c:680
+msgid "Confirm Delete"
+msgstr "Confirmar eliminar"
+
+#: src/cfg_styles.c:703
+msgid "Background Color"
+msgstr "Color de fons"
+
+#: src/cfg_styles.c:703
+msgid "Foreground Color"
+msgstr "Color de primer pla"
+
+#: src/cfg_styles.c:703 src/dpformat.c:55
+msgid "Icon"
+msgstr "Icone"
+
+#: src/cfg_styles.c:705
+msgid "(Row Style Preview Text)"
+msgstr "(Text per pre-visualitzar estil de fila)"
+
+#: src/cfg_styles.c:713 src/cmd_renameseq.c:358 src/cmd_split.c:656
+msgid "Preview"
+msgstr "Pre-visualitzar"
+
+#: src/cfg_styles.c:737
+msgid "Override Parent's?"
+msgstr "Sobreescriure els pares?"
+
+#: src/cfg_styles.c:741
+msgid "Pick..."
+msgstr "Elegir..."
+
+#: src/cfg_styles.c:782
+msgid "Add Action..."
+msgstr "Afegir acció..."
+
+#: src/cfg_styles.c:829 src/menus.c:532
+msgid "Parent"
+msgstr "Pare"
+
+#: src/cfg_styles.c:840
+msgid "Inherited Properties"
+msgstr "Propietats heretades"
+
+#: src/cfg_styles.c:844
+msgid "Visual"
+msgstr "Visual"
+
+#: src/cfg_styles.c:846
+msgid "Actions"
+msgstr "Accions"
+
+#: src/cfg_styles.c:863
+msgid "File Recognition"
+msgstr "Tipus d'arxius"
+
+#: src/cfg_styles.c:864
+msgid "Styles"
+msgstr "Estils"
+
+#: src/cfg_types.c:192
+#, c-format
+msgid "%s - Click to Change..."
+msgstr "%s - Clic per canviar..."
+
+#: src/cfg_types.c:507
+msgid "(New Type)"
+msgstr "(Nou Tipus)"
+
+#: src/cfg_types.c:646
+msgid "B-Dev"
+msgstr "B-Dev"
+
+#: src/cfg_types.c:646
+msgid "C-Dev"
+msgstr "C-Dev"
+
+#: src/cfg_types.c:646
+msgid "Dir"
+msgstr "Dir"
+
+#: src/cfg_types.c:646
+msgid "FIFO"
+msgstr "FIFO"
+
+#: src/cfg_types.c:646
+msgid "File"
+msgstr "Arxius"
+
+#: src/cfg_types.c:646
+msgid "Link"
+msgstr "Enllaç"
+
+#: src/cfg_types.c:646
+msgid "Socket"
+msgstr "Sòcol"
+
+#: src/cfg_types.c:647
+msgid "Readable"
+msgstr "Lectura"
+
+#: src/cfg_types.c:647
+msgid "SetGID"
+msgstr "Establir GID"
+
+#: src/cfg_types.c:647
+msgid "SetUID"
+msgstr "Establir UID"
+
+#: src/cfg_types.c:647 src/cmd_chmod.c:200
+msgid "Sticky"
+msgstr "Estàtic (Sticky)"
+
+#: src/cfg_types.c:648
+msgid "Executable"
+msgstr "Executable"
+
+#: src/cfg_types.c:648
+msgid "Writable"
+msgstr "Modificable"
+
+#: src/cfg_types.c:649
+msgid "Match 'file' (RE)"
+msgstr "Identificar 'arxiu' (ER)"
+
+#: src/cfg_types.c:649
+msgid "Match Name (RE)"
+msgstr "Identificar nom (ER)"
+
+#: src/cfg_types.c:649
+msgid "Require Suffix"
+msgstr "Requereix extensió"
+
+#: src/cfg_types.c:687
+msgid "Identification"
+msgstr "Identificació"
+
+#: src/cfg_types.c:689
+msgid "Require Type"
+msgstr "Requerir tipus"
+
+#: src/cfg_types.c:703
+msgid "Require Protection"
+msgstr "Requerir protecció"
+
+#: src/cfg_types.c:739
+msgid "Glob?"
+msgstr "Glob?"
+
+#: src/cfg_types.c:755
+msgid "Type's Style"
+msgstr "Estil del tipus"
+
+#: src/cfg_types.c:757
+msgid "Style"
+msgstr "Estil"
+
+#: src/cfg_types.c:797
+msgid "Types"
+msgstr "Tipus"
+
+#: src/cfg_windows.c:86
+msgid "Dialog Windows Center On Screen"
+msgstr "Finestres de diàleg al centre de la pantalla"
+
+#: src/cfg_windows.c:86
+msgid "Dialog Windows Follow Mouse"
+msgstr "Finestres de diàleg segueixen el ratolí"
+
+#: src/cfg_windows.c:86
+msgid "Dialog Windows Positioned by Window Manager"
+msgstr "Finestres de diàleg situades per l'administrador de finestra"
+
+#: src/cfg_windows.c:94
+msgid "Windows"
+msgstr "Finestres"
+
+#: src/cfg_windows.c:102
+msgid "Window Borders"
+msgstr "Limits de finestra"
+
+#: src/cfg_windows.c:118
+msgid "Dialog Positioning"
+msgstr "Posició de diàlegs "
+
+#: src/children.c:88
+#, c-format
+msgid "Execution of \"%s\" Failed"
+msgstr "Ha fallat l'execució de \"%s\""
+
+#: src/children.c:89 src/dialog.c:290
+msgid "Error"
+msgstr "Error"
+
+#: src/children.c:227
+#, c-format
+msgid "Couldn't terminate child \"%s\" (pid=%d)--zombie alert"
+msgstr ""
+"No ha estat possible finalitzar el procés fill  \"%s\" (pid=%d)--alerta de "
+"zombie"
+
+#: src/cmd_about.c:54
+#, c-format
+msgid "Native CHARSET: \"%s\"."
+msgstr "CHARSET natiu: \"%s\"."
+
+#: src/cmd_about.c:68
+#, c-format
+msgid "Filename encoding: \"%s\"."
+msgstr "Nom de l'arxiu de codificació: \"%s\"."
+
+#: src/cmd_about.c:85
+#, c-format
+msgid "Version %s (GTK+ version %d.%d.%d)."
+msgstr "Versió %s (GTK+ versió %d.%d.%d)."
+
+#: src/cmd_about.c:97
+msgid "(c) 1998-2011 by Emil Brink, Obsession Development.\n"
+msgstr "(c) 1998-2011 per Emil Brink, Obsession Development.\n"
+
+#: src/cmd_about.c:99
+msgid ""
+"This is free software, and there is ABSOLUTELY NO\n"
+"WARRANTY. Read the file COPYING for more details.\n"
+msgstr ""
+"Aquest programa es programari lliure i no hi ha ABSOLUTAMENT CAP\n"
+"GARANTÍA. Llegeixi l'arxiu COPYING per a més detalls.\n"
+
+#: src/cmd_about.c:105
+msgid "NLS: Supported, using built-in English strings."
+msgstr "NLS: Suportat,  fent servir cadenes de text integrades en anglès"
+
+#: src/cmd_about.c:118
+#, c-format
+msgid ""
+"The author of gentoo can be reached via Internet\n"
+"e-mail at <a href=\"mailto:%s\">%s</a>; feel free to let\n"
+"me know what you think of this software, give\n"
+"suggestions/bug reports, and so on.\n"
+"\n"
+"The latest release of gentoo can always be down-\n"
+"loaded from the official gentoo project homepage at\n"
+"<a href=\"%s\">%s</a>. New releases are\n"
+"typically announced on the Freshmeat service at\n"
+"<a href=\"http://freshmeat.net/\">freshmeat.net</a>."
+msgstr ""
+"Podeu contactar amb l'autor de gentoo per Internet\n"
+"Corre electrònico: <a href=\"mailto:%s\">%s</a>; s'agraeixen \n"
+"opinions, suggeriments/informes d'errors i d'altres.\n"
+"\n"
+"Podeu obtenir la darrera versió del programa\n"
+"a la web oficial del projecte gentoo a\n"
+"<a href=\"%s\">%s</a>. Les actualitzacions\n"
+"s'anuncien en el servei Freshmeat a\n"
+"<a href=\"http://freshmeat.net/\">freshmeat.net</a>.."
+
+#: src/cmd_about.c:135
+msgid "About gentoo"
+msgstr "Quant a gentoo"
+
+#: src/cmd_about.c:135
+msgid "_OK (Wait for More)"
+msgstr "_d'Acord (Espera per més)"
+
+#: src/cmd_chmod.c:98
+#, c-format
+msgid "Set protection bits for \"%s\":"
+msgstr "Establir bits de protecció per a \"%s\":"
+
+#: src/cmd_chmod.c:199 src/cmd_chown.c:176 src/cmd_info.c:274
+msgid "Group"
+msgstr "Grup"
+
+#: src/cmd_chmod.c:199
+msgid "Others"
+msgstr "Altres"
+
+#: src/cmd_chmod.c:199 src/cmd_info.c:267
+msgid "Owner"
+msgstr "Propietari"
+
+#: src/cmd_chmod.c:199
+msgid "Special"
+msgstr "Especial"
+
+#: src/cmd_chmod.c:200
+msgid "Execute"
+msgstr "Execució"
+
+#: src/cmd_chmod.c:200
+msgid "Read"
+msgstr "Lectura"
+
+#: src/cmd_chmod.c:200
+msgid "Set GID"
+msgstr "Establir GID"
+
+#: src/cmd_chmod.c:200
+msgid "Set UID"
+msgstr "Establir UID"
+
+#: src/cmd_chmod.c:200
+msgid "Write"
+msgstr "Escriptura"
+
+#: src/cmd_chmod.c:222
+msgid "Protection Bits"
+msgstr "Bits de protecció"
+
+#: src/cmd_chmod.c:233
+msgid "Textual"
+msgstr "Literals"
+
+#: src/cmd_chmod.c:246
+msgid "Octal"
+msgstr "Octal"
+
+#: src/cmd_chmod.c:251 src/menus.c:518
+msgid "All"
+msgstr "Tot"
+
+#: src/cmd_chmod.c:253 src/menus.c:520
+msgid "Toggle"
+msgstr "Activar"
+
+#: src/cmd_chmod.c:254
+msgid "Revert"
+msgstr "Restablir"
+
+#: src/cmd_chmod.c:266 src/cmd_chown.c:201 src/cmd_info.c:372
+msgid "Recurse Directories?"
+msgstr "Recursiu en els directoris?"
+
+#: src/cmd_chmod.c:269
+msgid "Don't Touch Directories?"
+msgstr "No tocar directoris?"
+
+#: src/cmd_chmod.c:274
+msgid "Change Mode"
+msgstr "Canviar mode"
+
+#: src/cmd_chown.c:57
+#, c-format
+msgid "Set Ownership for '%s':"
+msgstr "Establir propietari per a '%s'"
+
+#: src/cmd_chown.c:176
+msgid "User"
+msgstr "Usuari"
+
+#: src/cmd_chown.c:206
+msgid "Change Ownership"
+msgstr "Canviar pertinença"
+
+#: src/cmd_configure.c:50
+msgid "Automatically Save Changed Configuration on Exit?"
+msgstr "Desar els canvis en la configuració en sortir?"
+
+#: src/cmd_copy.c:175 src/cmd_copyas.c:62
+#, c-format
+msgid "\"%s\" Already Exists - Proceed With Copy?"
+msgstr "\"%s\" Existeix - Seguir amb la còpia?"
+
+#: src/cmd_copy.c:176
+msgid "Copying..."
+msgstr "Copiant..."
+
+#: src/cmd_copy.c:217
+msgid "Preserve Dates During Copy?"
+msgstr "Preservar dates en copiar?"
+
+#: src/cmd_copy.c:218
+msgid "Ignore Failure to Copy Attributes (Date, Owner, Mode)?"
+msgstr "Ignorar errades de còpia d'atributs (Date, propietari, mode)?"
+
+#: src/cmd_copy.c:219
+msgid "Leave Failed Destination if Full Size?"
+msgstr "Ignorar destinació fallida si la mida és igual?"
+
+#: src/cmd_copy.c:220 src/cmd_viewtext.c:204
+msgid "Buffer Size"
+msgstr "Mida del buffer"
+
+#: src/cmd_copyas.c:49
+#, c-format
+msgid "Enter Name for Copy of \"%s\""
+msgstr "Escriviu el nom per a la còpia de \"%s\""
+
+#: src/cmd_copyas.c:51
+#, c-format
+msgid "Enter Name for Clone of \"%s\""
+msgstr "Escriviu el nom per a el clon de \"%s\""
+
+#: src/cmd_copyas.c:64
+#, c-format
+msgid "\"%s\" Already Exists - Continue With Clone?"
+msgstr "\"%s\" Ja existeix - Continuar amb la clonacio?"
+
+#: src/cmd_copyas.c:65
+msgid "Cloning..."
+msgstr "Clonant..."
+
+#: src/cmd_copyas.c:65
+msgid "Copying As..."
+msgstr "Copiant com..."
+
+#: src/cmd_copyas.c:79
+#, c-format
+msgid "Enter Name to Link \"%s\" As"
+msgstr "Escriviu el nom per a l'enllaç \"%s\" com"
+
+#: src/cmd_copyas.c:81
+#, c-format
+msgid "Enter Name for Link Clone of \"%s\""
+msgstr "Escriviu el nom per a el clon de l'enllaç de \"%s\""
+
+#: src/cmd_copyas.c:91
+#, c-format
+msgid "\"%s\" Already Exists - Proceed With Symlink?"
+msgstr "\"%s\" Ja existeix - Procedir amb l'enllaç simbòlic?"
+
+#: src/cmd_copyas.c:200 src/cmd_copyas.c:207
+msgid "Copy As"
+msgstr "Copiar com"
+
+#: src/cmd_copyas.c:209
+msgid "Clone"
+msgstr "Clonar"
+
+#: src/cmd_copyas.c:211
+msgid "Symbolic Link As"
+msgstr "Enllaç simbòlica com"
+
+#: src/cmd_copyas.c:213
+msgid "Symbolic Link Clone"
+msgstr "Clonar enllaç simbòlic"
+
+#: src/cmd_delete.c:56
+#, c-format
+msgid ""
+"%s\n"
+"could not be deleted due to access restrictions.\n"
+"Attempt to change protection and retry?"
+msgstr ""
+"%s\n"
+"no s'ha pogut eliminar degut a restriccions d'accés.\n"
+"Intentar canviar la protecció i tornar a provar?"
+
+#: src/cmd_delete.c:59
+msgid "Remember the answer (alters config)"
+msgstr "Recordar resposta (canvia la configuració)"
+
+#: src/cmd_delete.c:61
+msgid "Access Problem"
+msgstr "Problema d'accés"
+
+#: src/cmd_delete.c:61
+msgid "Change|Leave Alone"
+msgstr "Canviar|Abandonar"
+
+#: src/cmd_delete.c:215
+#, c-format
+msgid "Really Delete \"%s\"?"
+msgstr "Segur que voleu eliminar \"%s\"?"
+
+#: src/cmd_delete.c:216
+msgid "Deleting..."
+msgstr "Eliminant..."
+
+#: src/cmd_delete.c:279
+msgid "On Access Failure"
+msgstr "Errada d'accés"
+
+#: src/cmd_delete.c:280
+msgid "Ask User|Automatically Try Changing, and Retry|Fail"
+msgstr "Preguntar al usuari|Intentar Canviar permisos i tornar a provar|Errada"
+
+#: src/cmd_dpfocus.c:33
+msgid "DpFocus Command is Deprecated"
+msgstr "L'orde DpFocus és obsoleta"
+
+#: src/cmd_dpfocus.c:34
+msgid ""
+"The <tt>DpFocus</tt> command has been deprecated and is no longer supported. "
+"Please remove any keyboard or mouse bindings that use it and look into using "
+"the default GTK+ list view's cursor controls."
+msgstr ""
+"L'orde <tt>DpFocus</tt> s'ha eliminat i ja no es fa servir. Si us plau, "
+"elimineu els enllaços de teclat o del ratolí que la fan servir i feu servir "
+"la llista GTK+ predeterminada per al control del cursor."
+
+#: src/cmd_dpfocus.c:64
+msgid "Treat Focused Row As Selection If No \"Real\" Selection Exists?"
+msgstr ""
+"Tomar la fila amb el focus com seleccionada si no existeix una selecció "
+"\"real\"?"
+
+#: src/cmd_dpfocus.c:66
+msgid "Move Focus to Last Selected/Deselected Row?"
+msgstr "Moure el focus a la darrera fila seleccionada/No seleccionada"
+
+#: src/cmd_dpfocusisrch.c:163
+msgid "ISearch"
+msgstr "|Buscar"
+
+#: src/cmd_generic.c:143
+msgid "_OK|A_ll|_Skip|_Cancel"
+msgstr "_d'Acord|To_ts|_Saltar|_Cancel·lar"
+
+#: src/cmd_generic.c:144
+msgid "_OK|_Skip|_Cancel"
+msgstr "_d'Acord|_Saltar|_Cancel·lar"
+
+#: src/cmd_getsize.c:51
+msgid "Getting sizes..."
+msgstr "Obtenint mides..."
+
+#: src/cmd_getsize.c:134
+msgid "Unselect Rows When Done?"
+msgstr "Eliminar selecció en acabar?"
+
+#: src/cmd_info.c:68 src/errors.c:84
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: src/cmd_info.c:72
+#, c-format
+msgid ""
+"%u dirs, %u files,\n"
+"%u symlinks, %u special files"
+msgstr ""
+"%u directoris, %u arxius,\n"
+"%u enllaços simbòlics, %u arxius especials"
+
+#: src/cmd_info.c:153
+msgid "Value"
+msgstr "Valor"
+
+#: src/cmd_info.c:198
+msgid "Link To"
+msgstr "Enllaç a"
+
+#: src/cmd_info.c:213 src/cmd_select.c:368 src/dpformat.c:54
+msgid "Type"
+msgstr "Tipus"
+
+#: src/cmd_info.c:216
+msgid "Location"
+msgstr "Localització"
+
+#: src/cmd_info.c:219 src/cmd_split.c:653 src/dpformat.c:37 src/window.c:199
+msgid "Size"
+msgstr "Mida"
+
+#: src/cmd_info.c:229
+#, c-format
+msgid "%s (%s bytes)"
+msgstr "%s (%s bytes)"
+
+#: src/cmd_info.c:240
+msgid "Contains"
+msgstr "Conté"
+
+#: src/cmd_info.c:257
+msgid "'File' Info"
+msgstr "Informació d' 'Arxiu'"
+
+#: src/cmd_info.c:285 src/dpformat.c:50
+msgid "Accessed"
+msgstr "Accedit"
+
+#: src/cmd_info.c:286 src/dpformat.c:51
+msgid "Modified"
+msgstr "Modificat"
+
+#: src/cmd_info.c:287 src/dpformat.c:53
+msgid "Changed"
+msgstr "Canviat"
+
+#: src/cmd_info.c:288 src/dpformat.c:52
+msgid "Created"
+msgstr "Generat"
+
+#: src/cmd_info.c:290
+msgid "Basic"
+msgstr "Bàsic"
+
+#: src/cmd_info.c:294
+msgid "Attributes"
+msgstr "Atributs"
+
+#: src/cmd_info.c:338
+msgid "Getting Information..."
+msgstr "Obtenint Informació..."
+
+#: src/cmd_info.c:370
+msgid "Show 'file' Output?"
+msgstr "Mostrar sortida d' 'arxiu'?"
+
+#: src/cmd_info.c:373
+msgid "Access Date Format"
+msgstr "Format de la date d'accés"
+
+#: src/cmd_info.c:374
+msgid "Modify Date Format"
+msgstr "Modificar el format de la data"
+
+#: src/cmd_info.c:375
+msgid "Change Date Format"
+msgstr "Canviar el format de la data"
+
+#: src/cmd_info.c:376
+msgid "Size Tick Mark"
+msgstr "Mida de la marca de separació"
+
+#: src/cmd_join.c:46
+#, c-format
+msgid "\"%s\" Already Exists - Continue With Join?"
+msgstr "\"%s\" Ja existeix - Continuar amb afegir?"
+
+#: src/cmd_join.c:73
+msgid "Joining..."
+msgstr "Afegint..."
+
+#: src/cmd_join.c:167
+msgid "Click and Drag Files to Reorder, Then Click Join."
+msgstr "Feu clic i arrossegar arxius per ordenar, després feu clic en afegir."
+
+#: src/cmd_join.c:175
+#, c-format
+msgid "The total size is %s (%lu bytes)."
+msgstr "La mida total és %s (%lu bytes)."
+
+#: src/cmd_join.c:178
+#, c-format
+msgid "The total size is %lu bytes."
+msgstr "La mida total és %lu bytes."
+
+#: src/cmd_join.c:220
+msgid "Enter Destination File Name"
+msgstr "Escriviu el nom de l'arxiu de destí"
+
+#: src/cmd_join.c:235
+msgid "Join"
+msgstr "Afegir"
+
+#: src/cmd_join.c:235
+msgid "_Join|_Cancel"
+msgstr "_Afegir|_Cancel·lar"
+
+#: src/cmd_mkdir.c:65
+#, c-format
+msgid "\"%s\" Already Exists - Proceed With MkDir?"
+msgstr "\"%s\" Ja existeix - Seguir amb MkDir"
+
+#: src/cmd_mkdir.c:119
+msgid "Enter Name of Directory to Create"
+msgstr "Escriviu el nom del nou directori"
+
+#: src/cmd_mkdir.c:128
+msgid "Make Directory"
+msgstr "Generar directori"
+
+#: src/cmd_mkdir.c:151
+msgid "CD Into New Directory?"
+msgstr "Accedir (cd) al nou directori?"
+
+#: src/cmd_mkdir.c:152
+msgid "Focus New Directory?"
+msgstr "Enfocar el directori nou?"
+
+#: src/cmd_move.c:128 src/cmd_moveas.c:51
+#, c-format
+msgid "\"%s\" Already Exists - Continue With Move?"
+msgstr "\"%s\" Ja existeix - Continuar amb moure?"
+
+#: src/cmd_move.c:129
+msgid "Moving..."
+msgstr "Traslladant..."
+
+#: src/cmd_moveas.c:41
+#, c-format
+msgid "Enter Name to Move \"%s\" As"
+msgstr "Escriviu el nom a moure \"%s\" com"
+
+#: src/cmd_moveas.c:66
+msgid "Invalid destination name for MoveAs"
+msgstr "Nom de destinació incorrecte per a \"Moure com\""
+
+#: src/cmd_moveas.c:74
+msgid "Moving As..."
+msgstr "Moure com..."
+
+#: src/cmd_moveas.c:105 src/cmd_moveas.c:113
+msgid "Move As"
+msgstr "Moure com"
+
+#: src/cmd_quit.c:40
+msgid ""
+"You may have some unsaved configuration changes.\n"
+"Quitting without saving will lose them. Really quit?"
+msgstr ""
+"És possible que hi hagi canvis pendents de desar en la configuració.\n"
+"Els canvis es perdran en sortir sense dasar-los. De debó voleu sortir?"
+
+#: src/cmd_quit.c:42 src/cmd_quit.c:54
+msgid "Confirm Quitting"
+msgstr "Confirmar Sortir"
+
+#: src/cmd_quit.c:42
+msgid "_Quit|_Save, then Quit|_Cancel"
+msgstr "_Tanca|_Desar, llavors Tanca|_Cancel·lar"
+
+#: src/cmd_quit.c:54
+msgid "Are you sure you want to quit?"
+msgstr "De debò voleu sortir?"
+
+#: src/cmd_rename.c:57
+#, c-format
+msgid "Enter New Name For \"%s\""
+msgstr "Escriviu el nou nom per a \"%s\""
+
+#: src/cmd_rename.c:67 src/cmd_renamere.c:142 src/cmd_renamere.c:225
+#: src/cmd_renamere.c:268 src/cmd_renamere.c:367 src/cmd_renameseq.c:152
+#, c-format
+msgid "\"%s\" Already Exists - Proceed With Rename?"
+msgstr "\"%s\" Ja existeix - Seguir amb canviar el nom?"
+
+#: src/cmd_rename.c:245
+msgid "Rename"
+msgstr "Canviar el nom"
+
+#: src/cmd_rename.c:261
+msgid "Rename Single File In-Place (Without Dialog)?"
+msgstr "Canviar el nom d'arxiu únic en context (sense diàlegs)?"
+
+#: src/cmd_renamere.c:419
+msgid ""
+"Look for substring in all filenames, and replace\n"
+"it with another string."
+msgstr ""
+"Buscar una cadena de text en tots els arxius i caniar-la\n"
+"amb una altra cadena de text."
+
+#: src/cmd_renamere.c:422
+msgid "Replace"
+msgstr "Reemplaçar"
+
+#: src/cmd_renamere.c:426
+msgid "With"
+msgstr "Con"
+
+#: src/cmd_renamere.c:434
+msgid "Replace All?"
+msgstr "Reemplaçar tot?"
+
+#: src/cmd_renamere.c:438
+msgid "Simple"
+msgstr "Simple"
+
+#: src/cmd_renamere.c:442
+msgid ""
+"Execute the 'From' RE on each filename, storing\n"
+"parenthesised subexpression matches. Then replace\n"
+"any occurance of $n in 'To', where n is the index\n"
+"(counting from 1) of a subexpression, with the text\n"
+"that matched, and use the result as a new filename."
+msgstr ""
+"Executar 'Des de' ER en cada arxiu, desant\n"
+"les coincidències d'expressions entre parèntesi. Després canviar\n"
+"qualsevol ocurrència de $n en 'A', on n és l'índex \n"
+"(comptant a partir de l'1) d'una sub-expressió, amb el text\n"
+"que coincideixi i fer servir el resultat com a un nou nom d'arxiu."
+
+#: src/cmd_renamere.c:450 src/cmd_renamere.c:473
+msgid "From"
+msgstr "De"
+
+#: src/cmd_renamere.c:454 src/cmd_renamere.c:477
+msgid "To"
+msgstr "A"
+
+#: src/cmd_renamere.c:462
+msgid "Reg Exp"
+msgstr "Expressió regular"
+
+#: src/cmd_renamere.c:467
+msgid ""
+"Look for each character in the 'From' string, and replace\n"
+"any hits with the corresponding character in the 'To' string.\n"
+"Then, any characters in the 'Remove' string are removed from\n"
+"the filename, and the result used as the new name for each file."
+msgstr ""
+"Busca cada caràcter en el text 'De', i reemplaça\n"
+"qualsevol ocurrència pel caràcter corresponent en el text 'A'\n"
+"Després, qualsevol caràcter en el text 'Treure' és eliminat del\n"
+"nom de l'arxiu, i el resultat es fa servir com a nou nom per a cada arxiu."
+
+#: src/cmd_renamere.c:486
+msgid "Map"
+msgstr "Mapa"
+
+#: src/cmd_renamere.c:490
+msgid ""
+"Changes the case (upper/lower) of the characters\n"
+"in the selected filename(s)."
+msgstr ""
+"Canviar el tipus de lletra (majúscula/minúscula)\n"
+"del nom d'arxiu(s) seleccionat(s)."
+
+#: src/cmd_renamere.c:492
+msgid "Lower Case?"
+msgstr "Minúscules?"
+
+#: src/cmd_renamere.c:494
+msgid "Upper Case?"
+msgstr "Majúscules?"
+
+#: src/cmd_renamere.c:496
+msgid "Upper Case Initial?"
+msgstr "Majúscules inicials?"
+
+#: src/cmd_renamere.c:499
+msgid "Case"
+msgstr "Tipus de lletra"
+
+#: src/cmd_renamere.c:501
+msgid "RenameRE"
+msgstr "Canviar el nom ER"
+
+#: src/cmd_renameseq.c:281
+msgid "10, Decimal"
+msgstr "10, decimal"
+
+#: src/cmd_renameseq.c:281
+msgid "16, Hex (A-F)"
+msgstr "16, Hex (A-F)"
+
+#: src/cmd_renameseq.c:281
+msgid "16, Hex (a-f)"
+msgstr "16, Hex (a-f)"
+
+#: src/cmd_renameseq.c:281
+msgid "8, Octal"
+msgstr "8, Octal"
+
+#: src/cmd_renameseq.c:306
+msgid ""
+"This command renames all selected files\n"
+"into a numbered sequence. The controls\n"
+"below let you define how the names are\n"
+"formed."
+msgstr ""
+"Aquesta ordre canvia el nom de tots els arxius seleccionats\n"
+"a una seqüència numèrica. Els controls d'abaix permeten\n"
+"definir com son generats els noms."
+
+#: src/cmd_renameseq.c:313
+msgid "Start At"
+msgstr "Començar a"
+
+#: src/cmd_renameseq.c:323 src/cmd_split.c:609
+msgid "Base"
+msgstr "Base"
+
+#: src/cmd_renameseq.c:333
+msgid "Precision"
+msgstr "Precisió"
+
+#: src/cmd_renameseq.c:340
+msgid "Head"
+msgstr "Cap"
+
+#: src/cmd_renameseq.c:347
+msgid "Tail"
+msgstr "Coa"
+
+#: src/cmd_renameseq.c:354
+msgid "Guess"
+msgstr "Suposa"
+
+#: src/cmd_renameseq.c:369
+msgid "Sequential Rename"
+msgstr "Canviar el nom sequencialment"
+
+#: src/cmd_select.c:365
+msgid "All rows|Selected|Unselected|"
+msgstr "Totes les files|Seleccionats|No seleccionats"
+
+#: src/cmd_select.c:366
+msgid "All types|Directories only|Non-directories only|"
+msgstr "Tots els tipus|Només directoris|Tot menys els directoris|"
+
+#: src/cmd_select.c:367
+msgid "Select|Unselect|Toggle|"
+msgstr "Seleccionar|Des-seleccionar|Activar|"
+
+#: src/cmd_select.c:368 src/menus.c:537
+msgid "Action"
+msgstr "Acció"
+
+#: src/cmd_select.c:368
+msgid "Set"
+msgstr "Grup"
+
+#: src/cmd_select.c:469
+msgid "Treat RE as Glob Pattern?"
+msgstr "Tractar ER com a patró global"
+
+#: src/cmd_select.c:472
+msgid "Invert RE Matching?"
+msgstr "Invertir coincidència de ER?"
+
+#: src/cmd_select.c:475
+msgid "Require Match on Full Name?"
+msgstr "Requerir coincidència en el nom complet?"
+
+#: src/cmd_select.c:489
+msgid "Select Using RE"
+msgstr "Seleccionar fent servir ER"
+
+#: src/cmd_select.c:727
+msgid ""
+"Enter shell command to run. The command\n"
+"will have the selected content appended.\n"
+"Action is performed on successful exit."
+msgstr ""
+"Escriviu l'ordre shell a executar. El contingut\n"
+"seleccionat serà afegit al final de l'ordre.\n"
+"L'acció es realitza a la sortida exitosa."
+
+#: src/cmd_select.c:734
+msgid "OK|Cancel"
+msgstr "d'Acord|Cancel·lar"
+
+#: src/cmd_select.c:734
+msgid "Select using shell command"
+msgstr "Seleccionar fent servir una ordre shell"
+
+#: src/cmd_split.c:269
+#, c-format
+msgid ""
+"Split \"%s\".\n"
+"File is %s (%s)."
+msgstr ""
+"Dividir \"%s\".\n"
+"L'arxiu és %s (%s)."
+
+#: src/cmd_split.c:271
+#, c-format
+msgid ""
+"Split \"%s\".\n"
+"File is %s."
+msgstr ""
+"Dividir \"%s\".\n"
+"L'arxiu és %s"
+
+#: src/cmd_split.c:348
+#, c-format
+msgid "\"%s\" Already Exists - Continue With Split?"
+msgstr "\"%s\" Ja existeix - Continuar amb dividir?"
+
+#: src/cmd_split.c:422
+msgid "Fixed Size Split"
+msgstr "Dividir a mida fixa"
+
+#: src/cmd_split.c:424
+msgid "Segment Size"
+msgstr "Mida del segment"
+
+#: src/cmd_split.c:427
+msgid "1457000 bytes (3.5\" floppy)"
+msgstr "1457000 bytes (3.5\" disquetera)"
+
+#: src/cmd_split.c:428
+msgid "10485760 bytes (10 MB)"
+msgstr "10485760 bytes (10 Mb)"
+
+#: src/cmd_split.c:429
+msgid "26214400 bytes (25 MB)"
+msgstr "26214400 bytes (25 Mb)"
+
+#: src/cmd_split.c:430
+msgid "52428800 bytes (50 MB)"
+msgstr "52428800 bytes (50 Mb)"
+
+#: src/cmd_split.c:431
+msgid "78643200 bytes (75 MB)"
+msgstr "78643200 bytes (75 Mb)"
+
+#: src/cmd_split.c:432
+msgid "100431360 bytes (95 MB, Zip disk)"
+msgstr "100431360 bytes (95 Mb, unitat de disc Zip)"
+
+#: src/cmd_split.c:454
+msgid "Fixed Count Split"
+msgstr "Dividir a mida fixa"
+
+#: src/cmd_split.c:457
+msgid "Segment Count"
+msgstr "Mida del segment"
+
+#: src/cmd_split.c:503
+msgid "Current part number, unique for every created file"
+msgstr "Nombre actual, únic per a cada arxiu creat"
+
+#: src/cmd_split.c:504
+msgid "The value from the Base box"
+msgstr "El valor de la caixa de la base"
+
+#: src/cmd_split.c:505
+msgid "The amount that index will change for each file"
+msgstr "La quantitat que l'índex canviarà per a cada arxiu"
+
+#: src/cmd_split.c:506
+msgid "The total number of files that will be created"
+msgstr "El nombre total d'arxius que seran generats"
+
+#: src/cmd_split.c:507
+msgid "The value of index for the last file to be created"
+msgstr "El valor de l'índex per al darrer arxiu que serà generat"
+
+#: src/cmd_split.c:570
+msgid "Fixed size, variable number of parts"
+msgstr "Mida fixa, nombre variable de trossos"
+
+#: src/cmd_split.c:571
+msgid "Fixed number of parts, variable sizes"
+msgstr "Nombre fix de trossos, mides variables"
+
+#: src/cmd_split.c:580 src/cmd_split.c:663
+msgid "Split"
+msgstr "Dividir"
+
+#: src/cmd_split.c:599
+msgid "Name Format"
+msgstr "Format del nom"
+
+#: src/cmd_split.c:615
+msgid "Step"
+msgstr "Pas"
+
+#: src/cmd_split.c:624
+msgid "Zero-Fill Numbers?"
+msgstr "Emplenar els nombres amb zero?"
+
+#: src/cmd_split.c:645
+msgid "Offset"
+msgstr "Desplaçament"
+
+#: src/cmd_symlink.c:68 src/cmd_symlink.c:252
+#, c-format
+msgid "\"%s\" Already Exists - Continue With Link?"
+msgstr "\"%s\" Ja existeix - Continuar generant l'enllaç?"
+
+#: src/cmd_symlink.c:161 src/configure.c:239 src/icon_dialog.c:59
+#: src/progress.c:220
+msgid "Cancel"
+msgstr "Cancel·lar"
+
+#: src/cmd_symlink.c:161 src/configure.c:233 src/dialog.c:290
+#: src/nag_dialog.c:36
+msgid "OK"
+msgstr "d'Acord"
+
+#: src/cmd_symlink.c:161
+msgid "Select Link Target"
+msgstr "Seleccioneu la destinació de l'enllaç"
+
+#: src/cmd_symlink.c:218
+msgid "Contents"
+msgstr "Contingut"
+
+#: src/cmd_symlink.c:231
+msgid "Edit Symbolic Link"
+msgstr "Editar l'enllaç simbòlic"
+
+#: src/cmd_symlink.c:236
+msgid "Create Symbolic Link"
+msgstr "Generar enllaç simbòlic"
+
+#: src/cmd_viewtext.c:205
+msgid "Hex-Check First"
+msgstr "Primer comprovació hexadecimal"
+
+#: src/cmd_viewtext.c:206
+msgid "Exit on Left Arrow Key?"
+msgstr "Tancar amb la tecla de la fletxa esquerra?"
+
+#: src/cmdarg.c:201
+msgid "on"
+msgstr "actiu"
+
+#: src/cmdarg.c:201
+msgid "true"
+msgstr "cert"
+
+#: src/cmdarg.c:201
+msgid "yes"
+msgstr "si"
+
+#: src/cmdgrab.c:177
+#, c-format
+msgid "Output of %s (pid %d)"
+msgstr "Sortida de %s (pid %d)"
+
+#: src/cmdseq.c:354 src/cmdseq.c:369
+#, c-format
+msgid ""
+"Unable to execute unknown\n"
+"command \"%s\"."
+msgstr ""
+"No és possible executar l'ordre \"%s\"\n"
+"No es reconeix aquesta ordre,"
+
+#: src/cmdseq_dialog.c:134
+#, c-format
+msgid "Built-Ins (%u)"
+msgstr "Predefinits (%u)"
+
+#: src/cmdseq_dialog.c:139
+#, c-format
+msgid "User Defined (%u)"
+msgstr "Definits per l'usuari (%u)"
+
+#: src/cmdseq_dialog.c:313
+msgid ""
+"Select a command, or type start\n"
+"of name and press TAB."
+msgstr ""
+"Seleccioni una ordre o teclegi el començament\n"
+"del nom i pressioni la tecla TAB."
+
+#: src/cmdseq_dialog.c:330
+msgid "Select Command"
+msgstr "Seleccionar ordre"
+
+#: src/configure.c:197
+msgid "Couldn't open configuration file for output"
+msgstr "No és possible obrir l'arxiu de configuració per escriure"
+
+#: src/configure.c:236
+msgid "Save"
+msgstr "Desar"
+
+#: src/configure.c:463
+#, c-format
+msgid "Config file version (%s) doesn't match program version (%s)"
+msgstr ""
+"La versió de l'arxiu de configuració (%s) no coincideix\n"
+"amb la versió del programa(%s)"
+
+#: src/configure.c:475
+#, c-format
+msgid ""
+"Couldn't find any configuration file; checked\n"
+"both \"%s\" and \"%s\".\n"
+"Using built-in minimal configuration."
+msgstr ""
+"No s'ha trobat cap arxiu de configuració; s'ha cercat\n"
+"a \"%s\" i \"%s\".\n"
+"S'ha fet servir la configuració mínima pre-definida."
+
+#: src/dialog.c:124 src/dialog.c:260
+msgid "_OK|_Cancel"
+msgstr "_d'Acord|Cancel·lar"
+
+#: src/dirpane.c:541
+#, c-format
+msgid "%u/%u dirs, %u/%u files"
+msgstr "i%u/%u directoris, %u/%u arxius"
+
+#: src/dirpane.c:546
+#, c-format
+msgid " (%s/%s)"
+msgstr " (%s/%s)"
+
+#: src/dirpane.c:557
+#, c-format
+msgid ", %s (%s) used"
+msgstr ", %s (%s) utilitzats"
+
+#: src/dirpane.c:559
+#, c-format
+msgid ", %s free"
+msgstr ", %s lliure"
+
+#: src/dirpane.c:2084 src/dirpane.c:2131
+msgid "Move up to the parent directory"
+msgstr "Pujar al directori superior"
+
+#: src/dirpane.c:2106
+msgid "Enter path, then press Return to go there"
+msgstr "Escriviu la ruta, a continuació, premeu Intro per anar-hi"
+
+#: src/dirpane.c:2107
+msgid "H"
+msgstr "H"
+
+#: src/dirpane.c:2111
+msgid ""
+"Click to enable/disable Hide rule (When pressed in, the hide rule is active, "
+"and matching entries are hidden)"
+msgstr ""
+"Feu clic per habilitar/deshabilitar la regla Amaga (quan ho\n"
+"premi, la regla amagar està activada i les coincidències estan ocultes.)"
+
+#: src/dpformat.c:38
+msgid "Blocks"
+msgstr "Blocs"
+
+#: src/dpformat.c:39
+msgid "BSize"
+msgstr "BMida"
+
+#: src/dpformat.c:39
+msgid "Block Size"
+msgstr "Mida del bloc"
+
+#: src/dpformat.c:40
+msgid "Mode, numerical"
+msgstr "Mode, numèric"
+
+#: src/dpformat.c:41
+msgid "Mode, string"
+msgstr "Mode, text"
+
+#: src/dpformat.c:42
+msgid "Nlink"
+msgstr "NEnllaç"
+
+#: src/dpformat.c:42
+msgid "Number of links"
+msgstr "Nombre d'enllaços"
+
+#: src/dpformat.c:43
+msgid "Owner ID"
+msgstr "ID del propietari"
+
+#: src/dpformat.c:43
+msgid "Uid"
+msgstr "Uid"
+
+#: src/dpformat.c:44
+msgid "Owner Name"
+msgstr "Nom del propietari"
+
+#: src/dpformat.c:44
+msgid "Uname"
+msgstr "Propietari"
+
+#: src/dpformat.c:45
+msgid "Gid"
+msgstr "Gid"
+
+#: src/dpformat.c:45
+msgid "Group ID"
+msgstr "ID de grup"
+
+#: src/dpformat.c:46
+msgid "Gname"
+msgstr "Grup"
+
+#: src/dpformat.c:46
+msgid "Group Name"
+msgstr "Nom del grup"
+
+#: src/dpformat.c:47
+msgid "Device"
+msgstr "Dispositiu"
+
+#: src/dpformat.c:47
+msgid "Device Number"
+msgstr "Nombre de dispositiu"
+
+#: src/dpformat.c:48
+msgid "DevMaj"
+msgstr "DispMaj"
+
+#: src/dpformat.c:48
+msgid "Device Number, major"
+msgstr "Nombre del dispositiu, més gran"
+
+#: src/dpformat.c:49
+msgid "DevMin"
+msgstr "DispMen"
+
+#: src/dpformat.c:49
+msgid "Device Number, minor"
+msgstr "Nombre del dispositiu, el menor"
+
+#: src/dpformat.c:50
+msgid "Time of Last Access"
+msgstr "Data del darrer acces"
+
+#: src/dpformat.c:51
+msgid "Time of Last Modification"
+msgstr "Data de la darrera modificació"
+
+#: src/dpformat.c:52
+msgid "Time of Creation"
+msgstr "Data de generació"
+
+#: src/dpformat.c:53
+msgid "Time of Last Change"
+msgstr "Data del darrer canvi"
+
+#: src/dpformat.c:54
+msgid "Type Name"
+msgstr "Escriviu el nom"
+
+#: src/dpformat.c:55
+msgid "I"
+msgstr "I"
+
+#: src/dpformat.c:56
+msgid "URI"
+msgstr "URI"
+
+#: src/dpformat.c:56
+msgid "URI (without file prefix)"
+msgstr "URI (sense prefixe de l'arxiu)"
+
+#: src/errors.c:59
+#, c-format
+msgid "Couldn't %s \"%s\": %s (code %d)"
+msgstr "Impossible %s \"%s\": %s (codi %d)"
+
+#: src/errors.c:61
+#, c-format
+msgid "Couldn't %s \"%s\" (code %d)"
+msgstr "Impossible %s \"%s\" (codi %d)"
+
+#: src/errors.c:66
+#, c-format
+msgid "Couldn't %s \"%s\""
+msgstr "Impossible %s \"%s\""
+
+#: src/errors.c:68
+#, c-format
+msgid "Couldn't %s"
+msgstr "Impossible %s"
+
+#: src/errors.c:88
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: src/gentoo.c:427
+msgid "Report the version to standard output, and exit."
+msgstr "Informe de la versió en la sortida estàndard i sortida."
+
+#: src/gentoo.c:429
+msgid "Report internal locale details, and exit."
+msgstr "Informe dels detalls interns de configuració regional, i sortir."
+
+#: src/gentoo.c:431
+msgid "Allows gentoo to be run by the root user. Could be dangerous."
+msgstr "Permet l'execució de gentoo per l'usuari root. Podria ser perillós."
+
+#: src/gentoo.c:432
+msgid ""
+"Do not load the ~/.gentoorc configuration file; instead, use default values."
+msgstr ""
+"No carregar l'arxiu de configuració ~/.gentoorc; fer servir\n"
+"els valors predeterminats."
+
+#: src/gentoo.c:433
+msgid ""
+"Do not load the ~/.gentoogtkrc GTK+ configuration file; instead, use system "
+"defaults."
+msgstr ""
+"No carregar l'arxiu de configuració GTK+ ~/.gentoogtkrc; fer servir els\n"
+"valores predeterminats del sistema."
+
+#: src/gentoo.c:434
+msgid ""
+"Run COMMAND, a gentoo command. Done before user interaction allowed, but "
+"after configuration file has been read in. Can be used many times to run "
+"several commands in sequence."
+msgstr ""
+"Executar COMMAND, una ordre de gentoo. Fet abans de permetre la interacció "
+"de l'usuari, però després de llegir el fitxer de configuració. Es possible "
+"fer-ho servir moltes vegades per tal d'executar diverses ordres en seqüència."
+
+#: src/gentoo.c:435
+msgid "COMMAND"
+msgstr "COMMAND"
+
+#: src/gentoo.c:436 src/gentoo.c:437
+msgid "DIR"
+msgstr "DIR"
+
+#: src/gentoo.c:436
+msgid ""
+"Use DIR as path for the left directory pane. Overrides default (and history)."
+msgstr ""
+"Fer servir DIR com a camí per al panell esquerre. Reescriu el predeterminat "
+"(i el historial)"
+
+#: src/gentoo.c:437
+msgid ""
+"Use DIR as path for the right directory pane. Overrides default (and "
+"history)."
+msgstr ""
+"Fer servir DIR com a camí per al panell dret. Reescriu el predeterminat (i "
+"el historial)"
+
+#: src/gentoo.c:461
+msgid "- a graphical file manager using GTK+"
+msgstr "- gestor d'arxius gràfic amb GTK+"
+
+#: src/gentoo.c:466
+#, c-format
+msgid "Failed to parse command line options: %s\n"
+msgstr "No s'ha pogut analitzar les opcions de línia d'ordres: %s\n"
+
+#: src/gentoo.c:506
+#, c-format
+msgid "%s: To run as root, envoke with the '--root-ok' option\n"
+msgstr "%s: Per executar com a root, afegiu les opcions '--root-ok'\n"
+
+#: src/gentoo.c:538
+msgid "Couldn't initialize userinfo module - username resolving won't work"
+msgstr ""
+"Impossible iniciar el modul userinfo - no serà possible resoldre noms\n"
+"d'usuari"
+
+#: src/gentoo.c:570
+#, c-format
+msgid "gentoo v%s by Emil Brink <emil@obsession.se>"
+msgstr "gentoo v %s per Emil Brink <emil@obsession.se>"
+
+#: src/gentoo.c:577
+msgid "Development Version Warning"
+msgstr "Advertència de versió en desenvolupament"
+
+#: src/gentoo.c:577
+msgid ""
+"This version of gentoo is considered somewhat new and untested. There have "
+"been major changes to almost all parts of the program since the previous "
+"version. Please be a bit careful, and make sure you report any problem to "
+"the author. Thanks."
+msgstr ""
+"Aquesta versió de gentoo és molt recent i poc provada. Hi ha hagut canvis "
+"importants en bona part de les funcions del programa des de la versió "
+"anterior. Si us plau, sigueu prudents en l'ús d'aquesta versió i assegureu-"
+"vos d'informar de les errades al autor. Gràcies."
+
+#: src/guiutil.c:124
+msgid "Progress"
+msgstr "Progrés"
+
+#: src/icon_dialog.c:52
+msgid "Pick Icon"
+msgstr "Elegir icone"
+
+#: src/icon_dialog.c:59
+msgid "Loading Icon Graphics..."
+msgstr "Carregant imatges dels icones"
+
+#: src/menus.c:284
+msgid "(No Selection)"
+msgstr "(No hi ha selecció)"
+
+#: src/menus.c:521
+msgid "RegExp..."
+msgstr "ExpReg..."
+
+#: src/menus.c:533
+msgid "Other"
+msgstr "Altres"
+
+#: src/menus.c:534
+msgid "Rescan"
+msgstr "Tornar a examinar"
+
+#: src/menus.c:535
+msgid "Select"
+msgstr "Seleccionar"
+
+#: src/menus.c:539
+msgid "Run..."
+msgstr "Executar..."
+
+#: src/menus.c:541
+msgid "Configure..."
+msgstr "Configuració..."
+
+#: src/menus.c:618
+msgid "Select Menu"
+msgstr "Seleccionar Menú"
+
+#: src/nag_dialog.c:37
+msgid "_Don't show this dialog again"
+msgstr ""
+
+#: src/overwrite.c:49
+msgid "_OK|A_ll|_Skip|Skip _All|_Cancel"
+msgstr "_d'Acord|T_ot|_Saltar|Saltar T_ot|_Cancel·lar"
+
+#: src/progress.c:196
+#, c-format
+msgid "Total (%s)"
+msgstr "Total (%s)"
+
+#: src/progress.c:305
+#, c-format
+msgid "Elapsed %02d:%02d  Speed %s/s  ETA %02u:%02u"
+msgstr "Transcorregut %02d:%02d  Velocitat %s/s  ETA %02u:%02u"
+
+#: src/sizeutil.c:31
+msgid "Unformatted Size"
+msgstr "Mida sense format"
+
+#: src/sizeutil.c:32
+msgid "Formatted Size, Without Unit"
+msgstr "Mida amb format, sense unitat."
+
+#: src/sizeutil.c:33
+msgid "Formatted Size, in Bytes"
+msgstr "Mida amb format, en bytes"
+
+#: src/sizeutil.c:33 src/sizeutil.c:159
+msgid "bytes"
+msgstr "bytes"
+
+#: src/sizeutil.c:34
+msgid "Formatted Size, in Kilobytes"
+msgstr "Mida amb format, en kilobytes"
+
+#: src/sizeutil.c:34 src/sizeutil.c:163
+msgid "KB"
+msgstr "Kb"
+
+#: src/sizeutil.c:35
+msgid "Formatted Size, in Megabytes"
+msgstr "Mida amb format, en megabytes"
+
+#: src/sizeutil.c:35 src/sizeutil.c:167
+msgid "MB"
+msgstr "Mb"
+
+#: src/sizeutil.c:36
+msgid "Formatted Size, in Gigabytes"
+msgstr "Mida amb format, en gigabytes"
+
+#: src/sizeutil.c:36 src/sizeutil.c:171
+msgid "GB"
+msgstr "Gb"
+
+#: src/sizeutil.c:37
+msgid "Formatted Size, in Terabytes"
+msgstr "Mida amb format, en megabytes"
+
+#: src/sizeutil.c:37 src/sizeutil.c:175
+msgid "TB"
+msgstr "Tb"
+
+#: src/sizeutil.c:38
+msgid "Formatted Size, Automatic Unit"
+msgstr "Mida amb format, unitats automàtiques"
+
+#: src/style_dialog.c:40
+msgid "Select Style"
+msgstr "Seleccionar estil"
+
+#: src/styles.c:114
+msgid "Root"
+msgstr "Arrel"
+
+#: src/styles.c:120 src/types.c:292 src/types.c:295
+msgid "Directory"
+msgstr "Directori"
+
+#: src/styles.c:889
+msgid "New Style"
+msgstr "Nou estil"
+
+#: src/styles.c:889
+#, c-format
+msgid "New Style %u"
+msgstr "Nou estil %u"
+
+#: src/textview.c:190
+#, c-format
+msgid ""
+"\n"
+"** Text conversion from charset '%s' failed, aborting."
+msgstr ""
+"\n"
+"** La conversió del text des del joc de caràcters '%s' ha fallat: avortar."
+
+#: src/textview.c:405
+#, c-format
+msgid "Line %d (%.0f%%)"
+msgstr "Línia %d (%.0f%%)"
+
+#: src/textview.c:455
+msgid "Enter Line Number or Percentage:"
+msgstr "Escriviu el nombre de línia o percentatge:"
+
+#: src/textview.c:461
+msgid "Goto"
+msgstr "Anar a"
+
+#: src/textview.c:596
+msgid "Enter Text to Search For (RE)"
+msgstr "Escriviu el text a buscar (ER)"
+
+#: src/textview.c:607
+msgid "Don't Span Newlines?"
+msgstr "No rompre línies noves?"
+
+#: src/textview.c:613
+msgid "Search"
+msgstr "Cerca"
+
+#: src/types.c:287
+msgid "Unknown"
+msgstr "Desconegut"
+
+#: src/types.c:572
+#, c-format
+msgid ""
+"Got SIGPIPE when writing to 'file' process (%s), it seems to have terminated "
+"prematurely."
+msgstr ""
+"Tens SIGPIPE en escriure en el procés 'file' (%s), sembla haver acabat abans "
+"d'hora."
+
+#: src/types.c:578
+msgid "Unable to run spawn 'file' command: "
+msgstr "Impossible executar l'ordre 'file' :"
+
+#: src/window.c:83
+msgid "Configure gentoo"
+msgstr "Configurar gentoo"
+
+#: src/window.c:90
+msgid "Text Viewer"
+msgstr "Visualitzador de text"
+
+#: src/window.c:199
+msgid "Position"
+msgstr "Posició"
+
+#: src/window.c:200
+msgid "Height"
+msgstr "Alçada"
+
+#: src/window.c:200
+msgid "X"
+msgstr "X"
+
+#: src/window.c:200
+msgid "Y"
+msgstr "Y"
+
+#: src/window.c:207
+msgid "Set on Open?"
+msgstr "Establir en obrir?"
+
+#: src/window.c:213
+msgid "Update on Close?"
+msgstr "Actualitzar en tancar?"
+
+#: src/window.c:244
+msgid "Grab"
+msgstr "Obtindre"
+
+#: src/xmlutil.c:225
+msgid "XML module emitted locale-dependant real number"
+msgstr "El mòdul XML ha emes un nombre real depenent de la configuració local"
+
+#~ msgid "Use Dialog to Report Errors?"
+#~ msgstr "Usar Diálogo para Reportar Errores?"
+
+#~ msgid "Raw Size, in Bytes"
+#~ msgstr "Tamaño sin Formato en Bytes"
+
+#~ msgid "Always Set"
+#~ msgstr "Siempre Establecer"
+
+#~ msgid "Modify 'Control' Key State"
+#~ msgstr "Estado de la Tecla 'Control'"
+
+#~ msgid "Active Pane Titles"
+#~ msgstr "Títulos de Paneles Activos"
+
+#~ msgid "Focused Row, Unselected"
+#~ msgstr "Fila en Foco, No Seleccionada"
+
+#~ msgid "Focused Row, Selected"
+#~ msgstr "Fila en Foco, Seleccionada"
+
+#~ msgid "Beta Software"
+#~ msgstr "Software Beta"
+
+#~ msgid "Next Version?"
+#~ msgstr "Siguiente Versión?"
+
+#~ msgid ""
+#~ "This splitting mode has not been\n"
+#~ "implemented yet... Sorry."
+#~ msgstr ""
+#~ "Este modo dividir no ha sido\n"
+#~ "implementado aún... Lo sentimos."
+
+#~ msgid ""
+#~ "Case-sensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr ""
+#~ "Ordenamiento sensible a mayúsculas/minúsculas no funcionará\n"
+#~ "correctamente con caracteres no ASCII"
+
+#~ msgid ""
+#~ "Case-insensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr ""
+#~ "Ordenamiento no sensible a mayúsculas/minúsculas no funcionará\n"
+#~ "correctamente con caracteres no ASCII"
+
+#~ msgid "Numerical Mode?"
+#~ msgstr "Modo Numérico?"
+
+#~ msgid "Never"
+#~ msgstr "Nunca"
+
+#~ msgid "On Every Access"
+#~ msgstr "Cada vez que Accese"
+
+#~ msgid "Mounting"
+#~ msgstr "Montar"
+
+#~ msgid "Mount When?"
+#~ msgstr "Cuándo Montar?"
+
+#~ msgid "Mount Options"
+#~ msgstr "Opciones de Montaje"
+
+#~ msgid "Mount Command"
+#~ msgstr "Comando para Montar"
+
+#~ msgid "Unmount Command"
+#~ msgstr "Comando para Desmontar"
+
+#~ msgid "Only Mount on Toplevel Directories?"
+#~ msgstr "Solo Montar en los Directorios del Nivel más Alto?"
+
+#~ msgid "Use Command Error Dialog?"
+#~ msgstr "Usar Diálogo de Error de Comando?"
+
+#~ msgid "Unmount When gentoo Quits?"
+#~ msgstr "Desmontar al Salir de gentoo?"
+
+#~ msgid "FAM: Supported and active."
+#~ msgstr "FAM: Soportado y activo."
+
+#~ msgid "FAM: Supported, but not active."
+#~ msgstr "FAM: Soportado, pero no activado."
+
+#~ msgid "FAM: Not supported."
+#~ msgstr "FAM: No soportado."
+
+#~ msgid ""
+#~ "Can't copy directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "No se puede copiar el directorio \"%s\"\n"
+#~ "a \"%s\":\n"
+#~ "el directorio fuente contiene al de destino."
+
+#~ msgid "Wrap Around At Top And Bottom?"
+#~ msgstr "Envolver Arriba y Abajo?"
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "No es posible mover el directorio \"%s\"\n"
+#~ "a \"%s\":\n"
+#~ "el directorio fuente contiene al de destino."
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the destination contains the source."
+#~ msgstr ""
+#~ "No es posible mover el directorio \"%s\"\n"
+#~ "a \"%s\":\n"
+#~ "El directorio destino contiene al fuente."
+
+#~ msgid "Regular expression error:\n"
+#~ msgstr "Error en la expresión regular:\n"
+
+#~ msgid "Use mmap() to Speed Loading?"
+#~ msgstr "Usar mmap() para Acelerar Carga?"
+
+#, fuzzy
+#~ msgid " (%%s/%%s, %%%s/%%%s blocks)"
+#~ msgstr " (%s/%s, %Lu/%Lu bloques)"
+
+#~ msgid ""
+#~ "Do not use FAM to automatically detect changes in viewed directories."
+#~ msgstr "No usar FAM para detectar cambios en directorios vistos."
+
+#~ msgid "Couldn't initialize mount data - automounting won't work"
+#~ msgstr "No fue posible iniciar montaje de datos - automontaje no funcionará"
+
+#~ msgid "FAM open failed, error %d--FAM will not be used"
+#~ msgstr "Abrir FAM falló, error %d--FAM no será usado"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, "
+#~ "perhaps)"
+#~ msgstr ""
+#~ "No es posible agregar monitor FAM a \"%s\", error %s\n"
+#~ "(reiniciar con --no-fam\n"
+#~ " podría evitar este problema)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go "
+#~ "around, perhaps)"
+#~ msgstr ""
+#~ "No es posible agregar monitor FAM a \"%s\", error %s\n"
+#~ "(reiniciar con --no-fam\n"
+#~ " podría evitar este problema)"
+
+#~ msgid "Execution of \"%s %s\" failed:\n"
+#~ msgstr "La ejecución de \"%s %s\" falló:\n"
+
+#~ msgid "Mounting \"%s\" on \"%s\"..."
+#~ msgstr "Montando \"%s\" en \"%s\"..."
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Old: %%%s bytes, changed on %%s,\n"
+#~ "New: %%%s bytes, changed on %%s."
+#~ msgstr ""
+#~ "\n"
+#~ "Anterior: %llu bytes, modificado en %s.\n"
+#~ "Nuevo: %llu bytes, modificado en %s."
+
+#~ msgid "File reading"
+#~ msgstr "Lectura de Archivo"
+
+#, fuzzy
+#~ msgid "Pick Command ..."
+#~ msgstr "Seleccionar Código"
+
+#, fuzzy
+#~ msgid "Clr"
+#~ msgstr "Limpiar"
+
+#, fuzzy
+#~ msgid "Buffer Size for mmap()"
+#~ msgstr "Tamaño del Buffer"
+
+#~ msgid "%s: Couldn't set text domain to \"%s\"\n"
+#~ msgstr "%s: No fue posible establecer el dominio del texto a \"%s\"\n"
+
+#~ msgid "Top"
+#~ msgstr "Inicio"
+
+#~ msgid "Bottom"
+#~ msgstr "Fin"
+
+#~ msgid "_Goto..."
+#~ msgstr "_Ir a..."
+
+#~ msgid "_Search..."
+#~ msgstr "_Buscar"
+
+#~ msgid "_Quit"
+#~ msgstr "_Salir"

gentoo-0.15.6.tar.bz2/po/de.gmo -> gentoo-0.19.9.tar.gz/po/de.gmo Changed

gentoo-0.15.6.tar.bz2/po/de.po -> gentoo-0.19.9.tar.gz/po/de.po Changed

@@ -5,28 +5,30 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR Emil Brink.
 # Christoph Neuroth <delmonico@gmx.net>, 2004.
+# Jens Seidel <jensseidel@users.sf.net>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: Emil Brink\n"
-"POT-Creation-Date: 2009-07-11 19:05+0200\n"
+"POT-Creation-Date: 2011-01-26 21:54+0100\n"
 "PO-Revision-Date: 2004-02-16 20:13+0100\n"
 "Last-Translator: Christoph Neuroth <delmonico@gmx.net>\n"
 "Language-Team:  <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: src/cfg_buttonlayout.c:65
 msgid "Left of Command Buttons"
-msgstr "Links der Befehls-Knöpfe"
+msgstr "Links der Befehls-KnÃ¶pfe"
 
 #: src/cfg_buttonlayout.c:65
 msgid "Right of Command Buttons"
-msgstr "Rechts der Befehls-Knöpfe"
+msgstr "Rechts der Befehls-KnÃ¶pfe"
 
 #: src/cfg_buttonlayout.c:66
 msgid "No Padding"
@@ -62,24 +64,24 @@
 "option menu widget\n"
 "in the top left corner of the page."
 msgstr ""
-"Diese Seite lässt Sie einstellen wie die Tastenkürzel-Leiste in Relation zu "
+"Diese Seite lÃ¤sst Sie einstellen wie die TastenkÃ¼rzel-Leiste in Relation zu "
 "der mit\n"
 "den Kommando-Buttons angeordnet ist. Sie ist mehr oder weniger ein "
 "Platzhalter;\n"
-"geplant ist, viel mehr Flexibilität in der Tasten-Verwaltung zur Verfügung "
+"geplant ist, viel mehr FlexibilitÃ¤t in der Tasten-Verwaltung zur VerfÃ¼gung "
 "zu stellen.\n"
 "\n"
-"In der Zwischenzeit bietet dies die Funktionalität die vorhanden war, als "
-"die Tastenkürzel\n"
+"In der Zwischenzeit bietet dies die FunktionalitÃ¤t die vorhanden war, als "
+"die TastenkÃ¼rzel\n"
 "ein Spezial-Feature mit eigener Konfigurations-Seite waren (bis "
-"einschließlich Vesion\n"
+"einschlieÃlich Vesion\n"
 "0.11.24 von gentoo).\n"
 "\n"
-"(Nicht übersetzt weil es da links oben irgendwie nichts gibt?)"
+"(Nicht Ã¼bersetzt weil es da links oben irgendwie nichts gibt?)"
 
 #: src/cfg_buttonlayout.c:88
 msgid "Shortcut Sheet Position"
-msgstr "Position der Tastenkürzel-Leiste"
+msgstr "Position der TastenkÃ¼rzel-Leiste"
 
 #: src/cfg_buttonlayout.c:102
 msgid "Separation Style"
@@ -93,141 +95,141 @@
 msgid "Set Row Width"
 msgstr "Reihen-Breite einstellen"
 
-#: src/cfg_buttons.c:326 src/cfg_buttons.c:749
+#: src/cfg_buttons.c:326 src/cfg_buttons.c:748
 msgid "Default"
 msgstr "Standard"
 
 #: src/cfg_buttons.c:439 src/overwrite.c:49
 msgid "Please Confirm"
-msgstr "Bitte bestätigen"
+msgstr "Bitte bestÃ¤tigen"
 
 #: src/cfg_buttons.c:439
 msgid "Really delete current button row?"
-msgstr "Die aktuelle Knopf-Reihe wirklich löschen?"
+msgstr "Die aktuelle Knopf-Reihe wirklich lÃ¶schen?"
 
-#: src/cfg_buttons.c:439 src/cfg_styles.c:671
+#: src/cfg_buttons.c:439 src/cfg_styles.c:680
 msgid "_Delete|_Cancel"
-msgstr "_Löschen|_Abbrechen"
+msgstr "_LÃ¶schen|_Abbrechen"
 
 #: src/cfg_buttons.c:463
 msgid "Select Width for New Row"
-msgstr "Breite für neue Reihe wählen"
+msgstr "Breite fÃ¼r neue Reihe wÃ¤hlen"
 
 #: src/cfg_buttons.c:466
 msgid "Change Width of Row"
-msgstr "Breite der Reihe ändern"
+msgstr "Breite der Reihe Ã¤ndern"
 
 #: src/cfg_buttons.c:609
 msgid "Edit Background Color"
-msgstr "Hintergrundfarbe ändern"
+msgstr "Hintergrundfarbe Ã¤ndern"
 
 #: src/cfg_buttons.c:653
 msgid "Edit Foreground Color"
-msgstr "Vordergrundfarbe ändern"
+msgstr "Vordergrundfarbe Ã¤ndern"
 
 #: src/cfg_buttons.c:678
 msgid "Label"
 msgstr "Beschriftung"
 
-#: src/cfg_buttons.c:685 src/cfg_controls.c:645 src/cfg_controls.c:696
-#: src/cfg_controls.c:718 src/cfg_controls.c:739
+#: src/cfg_buttons.c:686 src/cfg_controls.c:612 src/cfg_controls.c:663
+#: src/cfg_controls.c:685
 msgid "Command"
 msgstr "Befehl"
 
-#: src/cfg_buttons.c:696 src/cfg_controls.c:639
+#: src/cfg_buttons.c:697 src/cfg_controls.c:606
 msgid "Key"
 msgstr "Taste"
 
-#: src/cfg_buttons.c:711 src/cfg_dirpane.c:1373
+#: src/cfg_buttons.c:712
 msgid "Colors"
 msgstr "Farben"
 
-#: src/cfg_buttons.c:715
+#: src/cfg_buttons.c:716
 msgid "Background..."
 msgstr "Hintergrund..."
 
-#: src/cfg_buttons.c:716 src/cfg_buttons.c:722
+#: src/cfg_buttons.c:717 src/cfg_buttons.c:723
 msgid "Reset to Default"
-msgstr "Auf Standard zurücksetzen"
+msgstr "Auf Standard zurÃ¼cksetzen"
 
-#: src/cfg_buttons.c:721
+#: src/cfg_buttons.c:722
 msgid "Foreground..."
 msgstr "Vordergrund..."
 
-#: src/cfg_buttons.c:749
+#: src/cfg_buttons.c:748
 msgid "Shortcuts"
-msgstr "Tastenkürzel"
+msgstr "TastenkÃ¼rzel"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Clear"
-msgstr "Löschen"
+msgstr "LÃ¶schen"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy Colors To"
 msgstr "Farben kopieren nach"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy To"
 msgstr "Kopieren nach"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Swap With"
 msgstr "Tauschen mit"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Add Row..."
-msgstr "Reihe hinzufügen..."
+msgstr "Reihe hinzufÃ¼gen..."
 
-#: src/cfg_buttons.c:751 src/cfg_cmdseq.c:951
+#: src/cfg_buttons.c:750 src/cfg_cmdseq.c:966
 msgid "Delete Row"
-msgstr "Reihe löschen"
+msgstr "Reihe lÃ¶schen"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Down"
 msgstr "Nach unten"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Row Width..."
 msgstr "Reihen-Breite..."
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Up"
 msgstr "Nach oben"
 
-#: src/cfg_buttons.c:762
+#: src/cfg_buttons.c:761
 msgid "Sheet"
 msgstr "Leiste"
 
-#: src/cfg_buttons.c:778
+#: src/cfg_buttons.c:775
 msgid "Primary"
-msgstr "Primär"
+msgstr "PrimÃ¤r"
 
-#: src/cfg_buttons.c:780
+#: src/cfg_buttons.c:777
 msgid "Secondary"
-msgstr "Sekundär"
+msgstr "SekundÃ¤r"
 
-#: src/cfg_buttons.c:785
+#: src/cfg_buttons.c:782
 msgid "Tooltip"
 msgstr "Kurzinfo"
 
-#: src/cfg_buttons.c:792 src/cfg_dirpane.c:1145
+#: src/cfg_buttons.c:790 src/cfg_dirpane.c:1107
 #, fuzzy
 msgid "Flags"
 msgstr "Einstellungen"
 
-#: src/cfg_buttons.c:794
+#: src/cfg_buttons.c:792
 msgid "Narrow?"
 msgstr "Schmal?"
 
-#: src/cfg_buttons.c:798
+#: src/cfg_buttons.c:796
 msgid "Show Tooltip?"
 msgstr "Kurzinfo anzeigen?"
 
-#: src/cfg_buttons.c:833
+#: src/cfg_buttons.c:831
 msgid "Buttons"
 msgstr "Tasten"
 
-#: src/cfg_buttons.c:834 src/cfg_cmdseq.c:1067
+#: src/cfg_buttons.c:832 src/cfg_cmdseq.c:1081
 msgid "Definitions"
 msgstr "Definitionen"
 
@@ -235,317 +237,354 @@
 msgid "Options"
 msgstr "Optionen"
 
-#: src/cfg_cmdseq.c:610
+#: src/cfg_cmdseq.c:611
 msgid "Select Builtin"
-msgstr "Eingebaute auswählen"
+msgstr "Eingebaute auswÃ¤hlen"
 
-#: src/cfg_cmdseq.c:626
+#: src/cfg_cmdseq.c:627
 msgid "Opening brace"
-msgstr "Öffnende Klammer"
+msgstr "Ãffnende Klammer"
 
-#: src/cfg_cmdseq.c:627
+#: src/cfg_cmdseq.c:628
 msgid "Closing brace"
-msgstr "Schließende Klammer"
+msgstr "SchlieÃende Klammer"
 
-#: src/cfg_cmdseq.c:628
+#: src/cfg_cmdseq.c:629
 msgid "First selected"
-msgstr "Erstes ausgewähltes Objekt"
+msgstr "Erstes ausgewÃ¤hltes Objekt"
 
-#: src/cfg_cmdseq.c:629
+#: src/cfg_cmdseq.c:630
 msgid "First selected, unselect"
-msgstr "Erstes ausgewähltes Objekt, abwählen"
+msgstr "Erstes ausgewÃ¤hltes Objekt, abwÃ¤hlen"
 
-#: src/cfg_cmdseq.c:630
+#: src/cfg_cmdseq.c:631
 msgid "First selected, with path"
-msgstr "Erstes ausgewähltes Objekt mit Pfad"
+msgstr "Erstes ausgewÃ¤hltes Objekt mit Pfad"
 
-#: src/cfg_cmdseq.c:631
+#: src/cfg_cmdseq.c:632
 msgid "First selected, with path, unselect"
-msgstr "Erstes ausgewähltes Objekt mit Pfad, abwählen"
+msgstr "Erstes ausgewÃ¤hltes Objekt mit Pfad, abwÃ¤hlen"
 
-#: src/cfg_cmdseq.c:632
+#: src/cfg_cmdseq.c:633
 msgid "First selected (destination pane)"
-msgstr "Erstes ausgewähltes Objekt (Ziel-Fenster)"
+msgstr "Erstes ausgewÃ¤hltes Objekt (Ziel-Fenster)"
 
-#: src/cfg_cmdseq.c:633
+#: src/cfg_cmdseq.c:634
 msgid "First selected, no quotes"
-msgstr "Erstes ausgewähltes Objekt, keine Anführungszeichen"
+msgstr "Erstes ausgewÃ¤hltes Objekt, keine AnfÃ¼hrungszeichen"
 
-#: src/cfg_cmdseq.c:634
+#: src/cfg_cmdseq.c:635
 msgid "All selected"
-msgstr "Alle ausgewählten"
+msgstr "Alle ausgewÃ¤hlten"
 
-#: src/cfg_cmdseq.c:635
+#: src/cfg_cmdseq.c:636
 msgid "All selected, unselect"
-msgstr "Alle ausgewählten, abwählen"
+msgstr "Alle ausgewÃ¤hlten, abwÃ¤hlen"
 
-#: src/cfg_cmdseq.c:636
+#: src/cfg_cmdseq.c:637
 msgid "All selected, with paths"
-msgstr "Alle ausgewählten mit Pfaden"
+msgstr "Alle ausgewÃ¤hlten mit Pfaden"
 
-#: src/cfg_cmdseq.c:637
+#: src/cfg_cmdseq.c:638
 msgid "All selected, with paths, unselect"
-msgstr "Alle ausgewählten mit Pfaden, abwählen"
+msgstr "Alle ausgewÃ¤hlten mit Pfaden, abwÃ¤hlen"
 
-#: src/cfg_cmdseq.c:638
+#: src/cfg_cmdseq.c:639
 msgid "All selected (destination pane)"
-msgstr "Alle ausgewählten (Ziel-Fenster)"
+msgstr "Alle ausgewÃ¤hlten (Ziel-Fenster)"
 
-#: src/cfg_cmdseq.c:639
+#: src/cfg_cmdseq.c:640
 msgid "All selected, no quotes"
-msgstr "Alle ausgewählten, keine Anführungszeichen"
+msgstr "Alle ausgewÃ¤hlten, keine AnfÃ¼hrungszeichen"
 
-#: src/cfg_cmdseq.c:640
+#: src/cfg_cmdseq.c:641
 msgid "Path to source pane's directory"
 msgstr "Pfad zum Verzeichnis des Quell-Fensters"
 
-#: src/cfg_cmdseq.c:641
+#: src/cfg_cmdseq.c:642
 msgid "Path to destination pane's directory"
 msgstr "Pfad zum Verzeichnis des Ziel-Fensters"
 
-#: src/cfg_cmdseq.c:642
+#: src/cfg_cmdseq.c:643
 msgid "Path to home directory"
 msgstr "Pfad zum \"home\"-Verzeichnis"
 
-#: src/cfg_cmdseq.c:643
+#: src/cfg_cmdseq.c:644
 msgid "Path of left pane"
 msgstr "Pfad des linken Fensters"
 
-#: src/cfg_cmdseq.c:644
+#: src/cfg_cmdseq.c:645
 msgid "Path of right pane"
 msgstr "Pfad des rechten Fensters"
 
-#: src/cfg_cmdseq.c:645
+#: src/cfg_cmdseq.c:646
+#, fuzzy
+msgid "URI of first selected"
+msgstr "Erstes ausgewÃ¤hltes Objekt"
+
+#: src/cfg_cmdseq.c:647
+#, fuzzy
+msgid "URI of first selected, unselect"
+msgstr "Erstes ausgewÃ¤hltes Objekt, abwÃ¤hlen"
+
+#: src/cfg_cmdseq.c:648
+#, fuzzy
+msgid "URI of first selected, no quotes"
+msgstr "Erstes ausgewÃ¤hltes Objekt, keine AnfÃ¼hrungszeichen"
+
+#: src/cfg_cmdseq.c:649
+#, fuzzy
+msgid "URIs of all selected"
+msgstr "Alle ausgewÃ¤hlten"
+
+#: src/cfg_cmdseq.c:650
+#, fuzzy
+msgid "URIs of all selected, unselect"
+msgstr "Alle ausgewÃ¤hlten, abwÃ¤hlen"
+
+#: src/cfg_cmdseq.c:651
+#, fuzzy
+msgid "URIs of all selected, no quotes"
+msgstr "Alle ausgewÃ¤hlten, keine AnfÃ¼hrungszeichen"
+
+#: src/cfg_cmdseq.c:652
+#, fuzzy
+msgid "URIs of all selected, unselect, no quotes"
+msgstr "Alle ausgewÃ¤hlten, keine AnfÃ¼hrungszeichen"
+
+#: src/cfg_cmdseq.c:653
+#, fuzzy
+msgid "URI of first selected (destination pane)"
+msgstr "Erstes ausgewÃ¤hltes Objekt (Ziel-Fenster)"
+
+#: src/cfg_cmdseq.c:654
 #, fuzzy
 msgid "Input combo box"
 msgstr "Eingabe combo-box"
 
-#: src/cfg_cmdseq.c:646
+#: src/cfg_cmdseq.c:655
 #, fuzzy
 msgid "Input using menu"
-msgstr "Eingabe mit Menü"
+msgstr "Eingabe mit MenÃ¼"
 
-#: src/cfg_cmdseq.c:647
+#: src/cfg_cmdseq.c:656
 #, fuzzy
 msgid "Input string"
 msgstr "Zeichenkette eingeben"
 
-#: src/cfg_cmdseq.c:648
+#: src/cfg_cmdseq.c:657
 #, fuzzy
 msgid "Input check button (gives TRUE or FALSE)"
 msgstr "Eingabe Auswahl-Knopf (Ergebnis: TRUE/FALSE)"
 
-#: src/cfg_cmdseq.c:649
+#: src/cfg_cmdseq.c:658
 msgid "Add label to input window"
-msgstr "Beschriftung zum Eingabefenster hinzufügen"
+msgstr "Beschriftung zum Eingabefenster hinzufÃ¼gen"
 
-#: src/cfg_cmdseq.c:650
+#: src/cfg_cmdseq.c:659
 #, fuzzy
 msgid "Add a separator bar to input window"
-msgstr "Einen Separator zum Eingabefenster hinzufügen"
+msgstr "Einen Separator zum Eingabefenster hinzufÃ¼gen"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "$NAME"
 msgstr "$NAME"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "Value of $NAME (environment)"
 msgstr "Wert von $NAME (Umgebung)"
 
-#: src/cfg_cmdseq.c:652
+#: src/cfg_cmdseq.c:661
 msgid "gentoo's PID"
 msgstr "gentoo's PID"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "Home directory for user NAME"
-msgstr "Heim-Verzeichnis für Benutzer NAME"
+msgstr "Heim-Verzeichnis fÃ¼r Benutzer NAME"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "~NAME"
 msgstr "~NAME"
 
-#: src/cfg_cmdseq.c:677
+#: src/cfg_cmdseq.c:686 src/cmd_split.c:536
 msgid "Pick Code"
-msgstr "Code auswählen"
+msgstr "Code auswÃ¤hlen"
 
-#: src/cfg_cmdseq.c:765
+#: src/cfg_cmdseq.c:778
 msgid "(No Options Available)"
-msgstr "(Keine Optionen verfügbar)"
+msgstr "(Keine Optionen verfÃ¼gbar)"
 
-#: src/cfg_cmdseq.c:801
+#: src/cfg_cmdseq.c:814
 msgid "Run in Background?"
 msgstr "Im Hintergrund starten?"
 
-#: src/cfg_cmdseq.c:805
+#: src/cfg_cmdseq.c:818
 msgid "Kill Previous Instance?"
 msgstr "Vorherige Instanz beenden?"
 
-#: src/cfg_cmdseq.c:809
+#: src/cfg_cmdseq.c:822
 msgid "Survive Quit?"
-msgstr "Beenden überleben?"
+msgstr "Beenden Ã¼berleben?"
 
-#: src/cfg_cmdseq.c:815
+#: src/cfg_cmdseq.c:828
 msgid "Capture Output?"
 msgstr "Ausgabe abfangen?"
 
-#: src/cfg_cmdseq.c:900
+#: src/cfg_cmdseq.c:913
 msgid "Before Execution"
-msgstr "Vor dem Ausführen"
+msgstr "Vor dem AusfÃ¼hren"
 
-#: src/cfg_cmdseq.c:903
+#: src/cfg_cmdseq.c:916
 #, fuzzy
 msgid "Require Source Selection?"
-msgstr "Vorrausgesetzter Schutz"
+msgstr "Vorausgesetzter Schutz"
 
-#: src/cfg_cmdseq.c:907
+#: src/cfg_cmdseq.c:920
 #, fuzzy
 msgid "Require Destination Selection?"
-msgstr "Vorrausgesetzter Schutz"
+msgstr "Vorausgesetzter Schutz"
 
-#: src/cfg_cmdseq.c:912
+#: src/cfg_cmdseq.c:926
 msgid "CD Source?"
 msgstr "In Quellverzeichnis wechseln?"
 
-#: src/cfg_cmdseq.c:915
+#: src/cfg_cmdseq.c:929
 msgid "CD Destination?"
 msgstr "In Zielverzeichnis wechseln?"
 
-#: src/cfg_cmdseq.c:922
+#: src/cfg_cmdseq.c:937
 msgid "After Execution"
-msgstr "Nach der Ausführung"
+msgstr "Nach der AusfÃ¼hrung"
 
-#: src/cfg_cmdseq.c:924
+#: src/cfg_cmdseq.c:939
 msgid "Rescan Source?"
 msgstr "Quelle erneut laden?"
 
-#: src/cfg_cmdseq.c:928
+#: src/cfg_cmdseq.c:943
 msgid "Rescan Destination?"
 msgstr "Ziel erneut laden?"
 
-#: src/cfg_cmdseq.c:942
+#: src/cfg_cmdseq.c:957
 msgid "General"
 msgstr "Allgemein"
 
-#: src/cfg_cmdseq.c:945
+#: src/cfg_cmdseq.c:960
 msgid "Before&After"
-msgstr "Vorher&Nacher"
+msgstr "Vorher&Nachher"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "Built-In"
 msgstr "Eingebaut"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "External"
 msgstr "Extern"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Add Row"
-msgstr "Reihe hinzufügen"
+msgstr "Reihe hinzufÃ¼gen"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Duplicate"
 msgstr "Duplikat"
 
-#: src/cfg_cmdseq.c:978 src/cfg_styles.c:588 src/cfg_styles.c:805
-#: src/cfg_types.c:679 src/cmd_symlink.c:209 src/dpformat.c:35
+#: src/cfg_cmdseq.c:993 src/cfg_styles.c:596 src/cfg_styles.c:823
+#: src/cfg_types.c:678 src/cmd_info.c:151 src/cmd_split.c:648
+#: src/cmd_symlink.c:213 src/dpformat.c:36
 msgid "Name"
 msgstr "Name"
 
-#: src/cfg_cmdseq.c:988
+#: src/cfg_cmdseq.c:1004
 msgid "Definition"
 msgstr "Definition"
 
-#: src/cfg_cmdseq.c:1044
+#: src/cfg_cmdseq.c:1058
 msgid "Repeat Sequence Until No Source Selection?"
-msgstr "Sequenz wiederholen bis keine Quelle mehr ausgewählt?"
+msgstr "Sequenz wiederholen bis keine Quelle mehr ausgewÃ¤hlt?"
 
-#: src/cfg_cmdseq.c:1056 src/cfg_controls.c:655 src/cfg_controls.c:706
-#: src/cfg_styles.c:833 src/cfg_types.c:775
+#: src/cfg_cmdseq.c:1070 src/cfg_controls.c:622 src/cfg_controls.c:673
+#: src/cfg_styles.c:853 src/cfg_types.c:776
 msgid "Add"
-msgstr "Hinzufügen"
+msgstr "HinzufÃ¼gen"
 
-#: src/cfg_cmdseq.c:1059 src/cfg_controls.c:658 src/cfg_controls.c:709
-#: src/cfg_styles.c:836 src/cfg_types.c:788
+#: src/cfg_cmdseq.c:1073 src/cfg_controls.c:625 src/cfg_controls.c:676
+#: src/cfg_styles.c:856 src/cfg_types.c:789
 msgid "Delete"
-msgstr "Löschen"
+msgstr "LÃ¶schen"
 
-#: src/cfg_cmdseq.c:1066
+#: src/cfg_cmdseq.c:1080
 msgid "Commands"
 msgstr "Befehle"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1365 src/cfg_dirpane.c:1371
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1288 src/cfg_dirpane.c:1293
 msgid "Left"
 msgstr "Links"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Middle"
 msgstr "Mitte"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1364 src/cfg_dirpane.c:1372
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1287 src/cfg_dirpane.c:1294
 msgid "Right"
 msgstr "Rechts"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Down"
 msgstr "Mausrad nach unten"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Up"
 msgstr "Mausrad nach oben"
 
-#: src/cfg_controls.c:382
+#: src/cfg_controls.c:378
 msgid ""
 "The following modifier key(s) must\n"
 "be held down when the mouse button\n"
 "is clicked to trigger the command"
 msgstr ""
-"Die folgenden Modifizierungs-Tasten müssen\n"
-"gedrückt gehalten werden, wenn die Maustaste\n"
-"geklickt wird, um den Befehl auszuführen"
+"Die folgenden Modifizierungs-Tasten mÃ¼ssen\n"
+"gedrÃ¼ckt gehalten werden, wenn die Maustaste\n"
+"geklickt wird, um den Befehl auszufÃ¼hren"
 
-#: src/cfg_controls.c:395
+#: src/cfg_controls.c:391
 msgid "Edit Modifiers"
 msgstr "Modifizierer bearbeiten"
 
-#: src/cfg_controls.c:613
+#: src/cfg_controls.c:580
 msgid "Controls"
 msgstr "Steuerung"
 
-#: src/cfg_controls.c:620
+#: src/cfg_controls.c:587
 msgid "Global Keyboard Shortcuts"
-msgstr "Globale Tastenkürzel"
+msgstr "Globale TastenkÃ¼rzel"
 
-#: src/cfg_controls.c:665
+#: src/cfg_controls.c:632
 msgid "Dirpane Mouse Buttons"
 msgstr "Verzeichnis-Fenster Maustasten"
 
-#: src/cfg_controls.c:690
+#: src/cfg_controls.c:657
 msgid "Button"
 msgstr "Taste"
 
-#: src/cfg_controls.c:693
+#: src/cfg_controls.c:660
 msgid "Edit Modifiers..."
 msgstr "Modifizierer bearbeiten..."
 
-#: src/cfg_controls.c:716
+#: src/cfg_controls.c:683
 msgid "Click-M-Click Gesture"
 msgstr "Click-M-Click Geste"
 
-#: src/cfg_controls.c:726
+#: src/cfg_controls.c:693
 msgid "Time Limit"
-msgstr "Zeit-Beschränkung"
-
-#: src/cfg_controls.c:737
-msgid "Path Right Click"
-msgstr "Pfad für Rechtsklick"
+msgstr "Zeit-BeschrÃ¤nkung"
 
-#: src/cfg_controls.c:750
+#: src/cfg_controls.c:704
 msgid "Ignore Num Lock For All Bindings?"
-msgstr "Num Lock für alle ignorieren?"
+msgstr "Num Lock fÃ¼r alle ignorieren?"
 
-#: src/cfg_controls.c:780
+#: src/cfg_controls.c:734
 msgid ""
 "Note: The mouse button control settings\n"
 "are ambiguous: the same button+modifier\n"
@@ -554,573 +593,540 @@
 msgstr ""
 "Achtung: Die Maustasten-Einstellungen\\ sind mehrdeutig: die selbe Taste"
 "+Modifizierer\n"
-"wird für mehr als eine Funktion benutzt.\n"
-"Dies könnte in einem merkwürdigen\n"
+"wird fÃ¼r mehr als eine Funktion benutzt.\n"
+"Dies kÃ¶nnte in einem merkwÃ¼rdigen\n"
 "Verhalten resultieren..."
 
-#: src/cfg_controls.c:784
+#: src/cfg_controls.c:738
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/cfg_controls.c:784 src/children.c:95 src/cmd_info.c:246
+#: src/cfg_controls.c:738 src/children.c:89 src/cmd_info.c:320
 msgid "_OK"
 msgstr "_OK"
 
-#: src/cfg_dirpane.c:365
-msgid "Formatted Size, in bytes"
-msgstr "Formatierte Größe, in Bytes"
-
-#: src/cfg_dirpane.c:365
-msgid "Raw Size, in Bytes"
-msgstr "Rohgröße, in Bytes"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in kilobytes"
-msgstr "Formatierte Größe, in Kilobytes"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in megabytes"
-msgstr "Formatierte Größe, in Megabytes"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, \"Smart\" Unit"
-msgstr "Formatierte Größe, \"Schlaue\" Einheit"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, in gigabytes"
-msgstr "Formatierte Größe, in Gigabytes"
-
-#: src/cfg_dirpane.c:383
+#: src/cfg_dirpane.c:333
 msgid "Append Type Character?"
-msgstr "Typ-Zeichen hinzufügen?"
+msgstr "Typ-Zeichen hinzufÃ¼gen?"
 
-#: src/cfg_dirpane.c:386
-msgid "Append \"-> destination\" on Links?"
-msgstr "Bei Verknüpfung \"-> Ziel\" anhängen?"
+#: src/cfg_dirpane.c:336
+#, fuzzy
+msgid "Append \"â destination\" on Links?"
+msgstr "Bei VerknÃ¼pfung \"-> Ziel\" anhÃ¤ngen?"
 
-#: src/cfg_dirpane.c:406
+#: src/cfg_dirpane.c:358
 #, fuzzy
 msgid "Place Tick Every 3 Digits?"
 msgstr "Punkt alle 3 Zeichen setzen?"
 
-#: src/cfg_dirpane.c:416
+#: src/cfg_dirpane.c:369
 msgid "Digits of Precision"
 msgstr "Nachkommastellen"
 
-#: src/cfg_dirpane.c:429
+#: src/cfg_dirpane.c:382
 msgid "Show Dir's File System Size?"
-msgstr "Dateisystem-Größe vom Verzeichnis anzeigen?"
+msgstr "Dateisystem-GrÃ¶Ãe vom Verzeichnis anzeigen?"
 
-#: src/cfg_dirpane.c:435 src/cfg_dirpane.c:439 src/cfg_dirpane.c:443
-#: src/cfg_dirpane.c:447 src/cfg_dirpane.c:451 src/cfg_dirpane.c:455
-#: src/cfg_dirpane.c:459 src/cfg_dirpane.c:463 src/cfg_dirpane.c:467
-#: src/cfg_dirpane.c:474
+#: src/cfg_dirpane.c:388 src/cfg_dirpane.c:392 src/cfg_dirpane.c:396
+#: src/cfg_dirpane.c:400 src/cfg_dirpane.c:404 src/cfg_dirpane.c:408
+#: src/cfg_dirpane.c:412 src/cfg_dirpane.c:416 src/cfg_dirpane.c:420
+#: src/cfg_dirpane.c:428
 msgid "Format"
 msgstr "Format"
 
-#: src/cfg_dirpane.c:497
+#: src/cfg_dirpane.c:454
 #, c-format
 msgid "%s Settings"
 msgstr "%s Einstellungen"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1002 src/cfg_dirpane.c:1003
-#: src/cmd_select.c:414
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:970 src/cfg_dirpane.c:971
+#: src/cmd_select.c:381
 msgid "Content"
 msgstr "Inhalt"
 
-#: src/cfg_dirpane.c:611
+#: src/cfg_dirpane.c:571
 msgid "Justification"
 msgstr "Ausrichtung"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1003
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:971
 msgid "Title"
 msgstr "Titel"
 
-#: src/cfg_dirpane.c:611 src/window.c:201
+#: src/cfg_dirpane.c:571 src/window.c:200
 msgid "Width"
 msgstr "Breite"
 
-#: src/cfg_dirpane.c:612
+#: src/cfg_dirpane.c:572
 msgid "Center"
 msgstr "Zentriert"
 
-#: src/cfg_dirpane.c:621
+#: src/cfg_dirpane.c:581
 msgid "Basic Settings"
 msgstr "Basis-Einstellungen"
 
-#: src/cfg_dirpane.c:669
+#: src/cfg_dirpane.c:628
 msgid "Edit Column Content"
-msgstr "Spalten-Inhalt ändern"
+msgstr "Spalten-Inhalt Ã¤ndern"
 
-#: src/cfg_dirpane.c:1002
+#: src/cfg_dirpane.c:970
 msgid "Default Title"
 msgstr "Standard-Titel"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories First"
 msgstr "Verzeichnisse zuerst"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Last"
 msgstr "Verzeichnisse zuletzt"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Mixed"
 msgstr "Verzeichnisse gemischt"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Left of List"
 msgstr "Links der Liste"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Right of List"
 msgstr "Rechts der Liste"
 
-#: src/cfg_dirpane.c:1029 src/cfg_dirpane.c:1030
+#: src/cfg_dirpane.c:997
 msgid "System Default"
 msgstr "System-Standard"
 
-#: src/cfg_dirpane.c:1030
-msgid "Always Set"
-msgstr "Immer gesetzt"
-
-#: src/cfg_dirpane.c:1030 src/cmd_chmod.c:260 src/menus.c:513
-msgid "Toggle"
-msgstr "Umschalten"
-
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy From %s"
 msgstr "Kopieren von %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy To %s"
 msgstr "Kopieren nach %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Swap With %s"
 msgstr "Tauschen mit %s"
 
-#: src/cfg_dirpane.c:1048
+#: src/cfg_dirpane.c:1015
 msgid "Columns"
 msgstr "Spalten"
 
-#: src/cfg_dirpane.c:1053
+#: src/cfg_dirpane.c:1020
 msgid "Available Content Types"
-msgstr "Verfügbare Inhalts-Typen"
+msgstr "VerfÃ¼gbare Inhalts-Typen"
 
-#: src/cfg_dirpane.c:1070
+#: src/cfg_dirpane.c:1037
 msgid "Selected Content Types"
-msgstr "Ausgewählte Inhalts-Typen"
+msgstr "AusgewÃ¤hlte Inhalts-Typen"
 
-#: src/cfg_dirpane.c:1081 src/cfg_styles.c:723
+#: src/cfg_dirpane.c:1049 src/cfg_styles.c:741
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#: src/cfg_dirpane.c:1082 src/cmd_renamere.c:508
+#: src/cfg_dirpane.c:1050 src/cmd_renamere.c:481
 msgid "Remove"
 msgstr "Entfernen"
 
-#: src/cfg_dirpane.c:1096
+#: src/cfg_dirpane.c:1064
 msgid "Sorting"
 msgstr "Sortieren"
 
-#: src/cfg_dirpane.c:1099
+#: src/cfg_dirpane.c:1067
 msgid "Sort On"
 msgstr "Sortieren nach"
 
-#: src/cfg_dirpane.c:1106 src/cmd_split.c:233 src/dpformat.c:39
-#: src/dpformat.c:40
+#: src/cfg_dirpane.c:1071 src/cmd_split.c:590 src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode"
 msgstr "Modus"
 
-#: src/cfg_dirpane.c:1113
+#: src/cfg_dirpane.c:1077
 msgid "Inverse Sorting?"
-msgstr "Rückwärts sortieren?"
+msgstr "RÃ¼ckwÃ¤rts sortieren?"
 
-#: src/cfg_dirpane.c:1116 src/cfg_paths.c:187 src/cfg_types.c:743
-#: src/cmd_renamere.c:459 src/cmd_renamere.c:486 src/cmd_select.c:520
-#: src/textview.c:620
+#: src/cfg_dirpane.c:1080 src/cfg_paths.c:228 src/cfg_types.c:744
+#: src/cmd_renamere.c:432 src/cmd_renamere.c:459 src/cmd_select.c:478
+#: src/textview.c:604
 msgid "Ignore Case?"
-msgstr "Groß-/Kleinschreibung ignorieren?"
+msgstr "GroÃ-/Kleinschreibung ignorieren?"
 
-#: src/cfg_dirpane.c:1119
-msgid "Numerical Mode?"
-msgstr "Numerischer Modus?"
-
-#: src/cfg_dirpane.c:1127
+#: src/cfg_dirpane.c:1088
 msgid "Default Directory"
 msgstr "Standard-Verzeichnis"
 
-#: src/cfg_dirpane.c:1132
+#: src/cfg_dirpane.c:1094
 msgid "Grab Current"
-msgstr "Aktuelles wählen"
+msgstr "Aktuelles wÃ¤hlen"
 
-#: src/cfg_dirpane.c:1135
+#: src/cfg_dirpane.c:1097
 #, fuzzy
 msgid "From History"
 msgstr "Verlauf"
 
-#: src/cfg_dirpane.c:1148
+#: src/cfg_dirpane.c:1110
 msgid "Path Above?"
-msgstr "Pfad über Fenster?"
+msgstr "Pfad Ã¼ber Fenster?"
 
-#: src/cfg_dirpane.c:1152
+#: src/cfg_dirpane.c:1114
 msgid "Hide Allowed?"
 msgstr "Verstecken erlaubt?"
 
-#: src/cfg_dirpane.c:1156
+#: src/cfg_dirpane.c:1118
 msgid "Scrollbar Always?"
 msgstr "Scroll-Leiste immer sichtbar?"
 
-#: src/cfg_dirpane.c:1160
+#: src/cfg_dirpane.c:1122
 msgid "Huge Parent Button?"
-msgstr "Großer Verzeichnis-Hoch-Knopf?"
+msgstr "GroÃer Verzeichnis-Hoch-Knopf?"
 
-#: src/cfg_dirpane.c:1168
+#: src/cfg_dirpane.c:1127
+msgid "Set Custom Font?"
+msgstr ""
+
+#: src/cfg_dirpane.c:1140
 msgid "Scrollbar Position"
 msgstr "Position der Scroll-Leiste"
 
-#: src/cfg_dirpane.c:1180
-msgid "Modify 'Control' Key State"
-msgstr "Status der 'Steuerungs'-Taste"
-
-#: src/cfg_dirpane.c:1225
-msgid "Active Pane Titles"
-msgstr "Aktive Fenster-Titel"
-
-#: src/cfg_dirpane.c:1225
-msgid "Focused Row, Unselected"
-msgstr "Fokussierte, nicht-ausgewählte Reihe"
-
-#: src/cfg_dirpane.c:1226
-msgid "Focused Row, Selected"
-msgstr "Fokussierte, ausgewählte Reihe"
-
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Horizontal"
 msgstr "horizontal"
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Vertical"
 msgstr "vertikal"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 #, fuzzy
 msgid "Don't Track"
 msgstr "Nicht verfolgen"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Ratio"
-msgstr "Verhältnis"
+msgstr "VerhÃ¤ltnis"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Left Pane"
-msgstr "Größe des linken Fensters"
+msgstr "GrÃ¶Ãe des linken Fensters"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Right Pane"
-msgstr "Größe des rechten Fensters"
+msgstr "GrÃ¶Ãe des rechten Fensters"
 
-#: src/cfg_dirpane.c:1275
+#: src/cfg_dirpane.c:1198
 msgid "Pane Orientation"
 msgstr "Fenster-Ausrichtung"
 
-#: src/cfg_dirpane.c:1289
+#: src/cfg_dirpane.c:1212
 #, fuzzy
 msgid "Split Tracking"
 msgstr "Verfolgung aufteilen"
 
-#: src/cfg_dirpane.c:1312
+#: src/cfg_dirpane.c:1235
 msgid "pixels"
 msgstr "Pixel"
 
-#: src/cfg_dirpane.c:1340
+#: src/cfg_dirpane.c:1263
 msgid "Remember Selected Rows?"
-msgstr "ausgewählte Reihen merken?"
+msgstr "ausgewÃ¤hlte Reihen merken?"
 
-#: src/cfg_dirpane.c:1343
+#: src/cfg_dirpane.c:1266
 msgid "Save History Lists?"
 msgstr "Verlaufs-Listen speichern?"
 
-#: src/cfg_dirpane.c:1360 src/cfg_dirpane.c:1370
+#: src/cfg_dirpane.c:1283 src/cfg_dirpane.c:1292
 msgid "Dir Panes"
 msgstr "Verzeichnis-Fenster"
 
-#: src/cfg_dirpane.c:1374
+#: src/cfg_dirpane.c:1295
 msgid "Pane Split"
 msgstr "Fenster-Teilung"
 
-#: src/cfg_dirpane.c:1375
+#: src/cfg_dirpane.c:1296
 msgid "History"
 msgstr "Verlauf"
 
-#: src/cfg_errors.c:45
-msgid "Errors"
-msgstr "Fehler"
+#: src/cfg_dirpane.c:1725
+msgid "'Blocks' Content Deprecated"
+msgstr ""
 
-#: src/cfg_errors.c:52
-msgid "Use Dialog to Report Errors?"
-msgstr "Dialog benutzen um Fehler zu melden?"
+#: src/cfg_dirpane.c:1726
+msgid ""
+"The 'Blocks' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
 
-#: src/cfg_errors.c:56
-msgid "Cause Console Beep on Error?"
-msgstr "Bei Fehler Konsolen-Piep ertönen lassen?"
+#: src/cfg_dirpane.c:1732
+msgid "'Block Size' Content Deprecated"
+msgstr ""
 
-#: src/cfg_menus.c:44
-msgid "Menus"
-msgstr "Menüs"
+#: src/cfg_dirpane.c:1733
+msgid ""
+"The 'Block Size' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
 
-#: src/cfg_mount.c:168
-msgid "Never"
-msgstr "Nie"
+#: src/cfg_errors.c:48
+msgid "Errors"
+msgstr "Fehler"
 
-#: src/cfg_mount.c:168
-msgid "On Every Access"
-msgstr "Bei jedem Zugriff"
+#: src/cfg_errors.c:55
+msgid "Error and Status Message Display"
+msgstr ""
 
-#: src/cfg_mount.c:177
-msgid "Mounting"
-msgstr "Mounten"
+#: src/cfg_errors.c:57
+msgid "Status Bar, Above Panes"
+msgstr ""
 
-#: src/cfg_mount.c:184
-msgid "Mount When?"
-msgstr "Wann mounten?"
+#: src/cfg_errors.c:60
+msgid "Main Window's Title Bar"
+msgstr ""
 
-#: src/cfg_mount.c:196
-msgid "Mount Options"
-msgstr "Mount-Optionen"
+#: src/cfg_errors.c:63
+msgid "Separate Dialog"
+msgstr ""
 
-#: src/cfg_mount.c:199
-msgid "Mount Command"
-msgstr "Mount-Befehl"
+#: src/cfg_errors.c:69
+msgid "Cause Console Beep on Error?"
+msgstr "Bei Fehler Konsolen-Piep ertÃ¶nen lassen?"
 
-#: src/cfg_mount.c:204
-msgid "Unmount Command"
-msgstr "Unmount-Befehl"
+#: src/cfg_menus.c:44
+msgid "Menus"
+msgstr "MenÃ¼s"
 
-#: src/cfg_mount.c:211
-msgid "Only Mount on Toplevel Directories?"
-msgstr "Nur bei Verzeichnissen höchster Ebene mounten?"
+#: src/cfg_nag.c:78
+#, c-format
+msgid ""
+"Click the button below to reset the %zu stored 'Don't show this dialog "
+"again' responses."
+msgstr ""
 
-#: src/cfg_mount.c:214
-msgid "Use Command Error Dialog?"
-msgstr "Kommando-Fehler-Dialog benutzen?"
+#: src/cfg_nag.c:100
+msgid "Nagging"
+msgstr ""
 
-#: src/cfg_mount.c:217
-msgid "Unmount When gentoo Quits?"
-msgstr "Beim Beenden unmounten?"
+#: src/cfg_nag.c:110
+#, fuzzy
+msgid "Reset All"
+msgstr "Auf Standard zurÃ¼cksetzen"
 
-#: src/cfg_paths.c:128
-msgid "GTK+ RC"
-msgstr "GTK+ RC"
+#: src/cfg_paths.c:78
+msgid "Edit path"
+msgstr ""
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:152
 msgid "Icons"
 msgstr "Symbole"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:153
+msgid "GTK+ RC"
+msgstr "GTK+ RC"
+
+#: src/cfg_paths.c:154
 msgid "fstab"
 msgstr "fstab"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:155
 msgid "mtab"
 msgstr "mtab"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Beginning With Dot (.)"
 msgstr "Mit Punkt (.) beginnende"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Matching RE"
 msgstr "Auf R.A. passende"
 
-#: src/cfg_paths.c:129 src/cmd_chmod.c:259 src/menus.c:512
+#: src/cfg_paths.c:157 src/cmd_chmod.c:252 src/menus.c:519
 msgid "None"
 msgstr "Keine"
 
-#: src/cfg_paths.c:135
+#: src/cfg_paths.c:163
 msgid "Paths & Hide"
 msgstr "Pfade & verbergen"
 
-#: src/cfg_paths.c:142
+#: src/cfg_paths.c:170
 msgid "Paths"
 msgstr "Pfade"
 
-#: src/cfg_paths.c:169
+#: src/cfg_paths.c:209
 msgid "Hide Entries"
-msgstr "Einträge verbergen"
+msgstr "EintrÃ¤ge verbergen"
 
-#: src/cfg_styles.c:170 src/cfg_types.c:234 src/iconutil.c:29 src/menus.c:19
+#: src/cfg_styles.c:178 src/cfg_types.c:233 src/iconutil.c:31 src/menus.c:19
 msgid "(None)"
 msgstr "(Keine)"
 
-#: src/cfg_styles.c:191 src/cfg_styles.c:428 src/cfg_styles.c:767
+#: src/cfg_styles.c:199 src/cfg_styles.c:436 src/cfg_styles.c:785
 msgid "Delete Action"
-msgstr "Aktion löschen"
+msgstr "Aktion lÃ¶schen"
 
-#: src/cfg_styles.c:411 src/color_dialog.c:48
+#: src/cfg_styles.c:419 src/color_dialog.c:47
 msgid "Edit Color"
-msgstr "Farbe ändern"
+msgstr "Farbe Ã¤ndern"
 
-#: src/cfg_styles.c:428
+#: src/cfg_styles.c:436
 msgid "Revert to Inherited Command"
-msgstr "Zum geerbten Befehl zurückkehren"
+msgstr "Zum geerbten Befehl zurÃ¼ckkehren"
 
-#: src/cfg_styles.c:529
+#: src/cfg_styles.c:537
 #, fuzzy
 msgid "Select Command ..."
-msgstr "Befehl Auswählen"
+msgstr "Befehl AuswÃ¤hlen"
 
-#: src/cfg_styles.c:592
+#: src/cfg_styles.c:601
 msgid "New Action Property"
 msgstr "Eigenschaften neuer Aktion"
 
-#: src/cfg_styles.c:600
+#: src/cfg_styles.c:609
 msgid "something"
 msgstr "irgendetwas"
 
-#: src/cfg_styles.c:670
+#: src/cfg_styles.c:679
 #, fuzzy
 msgid ""
 "Deleting this style will also delete\n"
 "all its children. Are you sure?"
 msgstr ""
-"Diesen Stil zu löschen würde auch\n"
-"all seine Unterstile löschen. Sicher?"
+"Diesen Stil zu lÃ¶schen wÃ¼rde auch\n"
+"all seine Unterstile lÃ¶schen. Sicher?"
 
-#: src/cfg_styles.c:671
+#: src/cfg_styles.c:680
 msgid "Confirm Delete"
-msgstr "Löschen bestätigen"
+msgstr "LÃ¶schen bestÃ¤tigen"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Background Color"
 msgstr "Hintergrundfarbe"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Foreground Color"
 msgstr "Vordergrundfarbe"
 
-#: src/cfg_styles.c:694 src/dpformat.c:53
+#: src/cfg_styles.c:703 src/dpformat.c:55
 msgid "Icon"
 msgstr "Symbol"
 
-#: src/cfg_styles.c:696
+#: src/cfg_styles.c:705
 msgid "(Row Style Preview Text)"
 msgstr "(Vorschau-Text)"
 
-#: src/cfg_styles.c:702 src/cmd_renameseq.c:386
+#: src/cfg_styles.c:713 src/cmd_renameseq.c:358 src/cmd_split.c:656
 msgid "Preview"
 msgstr "Vorschau"
 
-#: src/cfg_styles.c:719
+#: src/cfg_styles.c:737
 msgid "Override Parent's?"
-msgstr "Übergeordnete umgehen?"
+msgstr "Ãbergeordnete umgehen?"
 
-#: src/cfg_styles.c:723
+#: src/cfg_styles.c:741
 msgid "Pick..."
-msgstr "Wählen..."
+msgstr "WÃ¤hlen..."
 
-#: src/cfg_styles.c:764
+#: src/cfg_styles.c:782
 msgid "Add Action..."
-msgstr "Aktion hinzufügen..."
+msgstr "Aktion hinzufÃ¼gen..."
 
-#: src/cfg_styles.c:810 src/menus.c:525
+#: src/cfg_styles.c:829 src/menus.c:532
 msgid "Parent"
-msgstr "Übergeordnetes Verzeichnis"
+msgstr "Ãbergeordnetes Verzeichnis"
 
-#: src/cfg_styles.c:820
+#: src/cfg_styles.c:840
 msgid "Inherited Properties"
-msgstr "Übernommene Eigenschaften"
+msgstr "Ãbernommene Eigenschaften"
 
-#: src/cfg_styles.c:824
+#: src/cfg_styles.c:844
 msgid "Visual"
 msgstr "Visuell"
 
-#: src/cfg_styles.c:826
+#: src/cfg_styles.c:846
 msgid "Actions"
 msgstr "Aktionen"
 
-#: src/cfg_styles.c:843
+#: src/cfg_styles.c:863
 msgid "File Recognition"
 msgstr "Datei-Erkennung"
 
-#: src/cfg_styles.c:844
+#: src/cfg_styles.c:864
 msgid "Styles"
 msgstr "Stile"
 
-#: src/cfg_types.c:193
+#: src/cfg_types.c:192
 #, c-format
 msgid "%s - Click to Change..."
-msgstr "%s - zum Ändern klicken..."
+msgstr "%s - zum Ãndern klicken..."
 
-#: src/cfg_types.c:508
+#: src/cfg_types.c:507
 msgid "(New Type)"
 msgstr "(Neuer Typ)"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "B-Dev"
 msgstr "B-Dev"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "C-Dev"
 msgstr "C-Dev"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Dir"
 msgstr "Verz"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "FIFO"
 msgstr "FIFO"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "File"
 msgstr "Datei"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Link"
 msgstr "Verkn."
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Socket"
 msgstr "Sockel"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "Readable"
 msgstr "Lesbar"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetGID"
 msgstr "SetGID"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetUID"
 msgstr "SetUID"
 
-#: src/cfg_types.c:648 src/cmd_chmod.c:209
+#: src/cfg_types.c:647 src/cmd_chmod.c:200
 msgid "Sticky"
 msgstr "Sticky"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Executable"
-msgstr "Ausführbar"
+msgstr "AusfÃ¼hrbar"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Writable"
 msgstr "Beschreibbar"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match 'file' (RE)"
 msgstr "Zutreffend auf 'datei' (R.A.)"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match Name (RE)"
 msgstr "Zutreffend auf Name (R.A.)"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Require Suffix"
 msgstr "vorrausgesetzte Endung"
 
@@ -1136,19 +1142,19 @@
 msgid "Require Protection"
 msgstr "Schutz erforderlich"
 
-#: src/cfg_types.c:738
+#: src/cfg_types.c:739
 msgid "Glob?"
 msgstr ""
 
-#: src/cfg_types.c:754
+#: src/cfg_types.c:755
 msgid "Type's Style"
 msgstr "Stil des Typs"
 
-#: src/cfg_types.c:756
+#: src/cfg_types.c:757
 msgid "Style"
 msgstr "Stil"
 
-#: src/cfg_types.c:796
+#: src/cfg_types.c:797
 msgid "Types"
 msgstr "Typen"
 
@@ -1178,16 +1184,16 @@
 msgid "Dialog Positioning"
 msgstr "Dialog-Positionierung"
 
-#: src/children.c:94
+#: src/children.c:88
 #, c-format
 msgid "Execution of \"%s\" Failed"
-msgstr "Ausführen von \"%s\" fehlgeschlagen"
+msgstr "AusfÃ¼hren von \"%s\" fehlgeschlagen"
 
-#: src/children.c:95 src/dialog.c:285
+#: src/children.c:89 src/dialog.c:290
 msgid "Error"
 msgstr "Fehler"
 
-#: src/children.c:274
+#: src/children.c:227
 #, fuzzy, c-format
 msgid "Couldn't terminate child \"%s\" (pid=%d)--zombie alert"
 msgstr "Konnte Kind \"%s\" nicht beenden (pid=%d)--zombie alert"
@@ -1209,7 +1215,7 @@
 
 #: src/cmd_about.c:97
 #, fuzzy
-msgid "(c) 1998-2009 by Emil Brink, Obsession Development.\n"
+msgid "(c) 1998-2011 by Emil Brink, Obsession Development.\n"
 msgstr "(c) 1998-2003 von Emil Brink, Obsession Development.\n"
 
 #: src/cmd_about.c:99
@@ -1218,197 +1224,178 @@
 "WARRANTY. Read the file COPYING for more details.\n"
 msgstr ""
 "Dies ist freie Software, und es gibt ABSOLUT KEINE\n"
-"GARANTIE. Lies die Datei COPYING für Einzelheiten.\n"
-
-#: src/cmd_about.c:106
-msgid "FAM: Supported and active."
-msgstr "FAM: Unterstüzt und aktiviert."
-
-#: src/cmd_about.c:108
-msgid "FAM: Supported, but not active."
-msgstr "FAM: Unterstützt, aber nicht aktiviert."
-
-#: src/cmd_about.c:110
-msgid "FAM: Not supported."
-msgstr "FAM: Nicht unterstützt."
+"GARANTIE. Lies die Datei COPYING fÃ¼r Einzelheiten.\n"
 
-#: src/cmd_about.c:116
+#: src/cmd_about.c:105
 msgid "NLS: Supported, using built-in English strings."
-msgstr "NLS: Unterstützt, benutze Deutsche Übersetzung."
+msgstr "NLS: UnterstÃ¼tzt, benutze Deutsche Ãbersetzung."
 
-#: src/cmd_about.c:129
-#, fuzzy
+#: src/cmd_about.c:118
+#, fuzzy, c-format
 msgid ""
 "The author of gentoo can be reached via Internet\n"
-"e-mail at <emil@obsession.se>; feel free to let\n"
+"e-mail at <a href=\"mailto:%s\">%s</a>; feel free to let\n"
 "me know what you think of this software, give\n"
 "suggestions/bug reports, and so on.\n"
 "\n"
 "The latest release of gentoo can always be down-\n"
 "loaded from the official gentoo project homepage at\n"
-"<http://www.obsession.se/gentoo/>. New releases are\n"
+"<a href=\"%s\">%s</a>. New releases are\n"
 "typically announced on the Freshmeat service at\n"
-"<http://freshmeat.net/>."
+"<a href=\"http://freshmeat.net/\">freshmeat.net</a>."
 msgstr ""
 "Der Autor von gentoo kann via E-Mail unter\n"
 "<emil@obsession.se> erreicht werden; bitte lass mich\n"
-"wissen, was du von diesem Programm hältst, sende\n"
-"Vorschläge, Fehlerberichte und so weiter.\n"
+"wissen, was du von diesem Programm hÃ¤ltst, sende\n"
+"VorschlÃ¤ge, Fehlerberichte und so weiter.\n"
 "\n"
 "Custom widgets by J. Hanson <johan@tiq.com>.\n"
 "\n"
-"Die aktuellste Veröffentlichung von gentoo kann immer von\n"
+"Die aktuellste VerÃ¶ffentlichung von gentoo kann immer von\n"
 "der offiziellen Homepage unter <http://www.obsession.se/gentoo/>\n"
 " heruntergeladen werden. Neue Versionen werden normalerweise\n"
-"über den Freshmeat Dienst bekanntgegeben (<http://freshmeat.net>)."
+"Ã¼ber den Freshmeat Dienst bekanntgegeben (<http://freshmeat.net>)."
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "About gentoo"
-msgstr "Über gentoo"
+msgstr "Ãber gentoo"
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "_OK (Wait for More)"
-msgstr "_OK (Warten für mehr)"
+msgstr "_OK (Warten fÃ¼r mehr)"
 
 #: src/cmd_chmod.c:98
 #, c-format
 msgid "Set protection bits for \"%s\":"
-msgstr "Schutz-Bits für \"%s\" setzen:"
+msgstr "Schutz-Bits fÃ¼r \"%s\" setzen:"
 
-#: src/cmd_chmod.c:208 src/cmd_chown.c:184 src/cmd_info.c:202
+#: src/cmd_chmod.c:199 src/cmd_chown.c:176 src/cmd_info.c:274
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 #, fuzzy
 msgid "Others"
-msgstr "Aus anderem Fenster übernehmen"
+msgstr "Aus anderem Fenster Ã¼bernehmen"
 
-#: src/cmd_chmod.c:208 src/cmd_info.c:195
+#: src/cmd_chmod.c:199 src/cmd_info.c:267
 msgid "Owner"
 msgstr "Besitzer"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Special"
 msgstr "Spezial"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Execute"
-msgstr "Ausführen"
+msgstr "AusfÃ¼hren"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Read"
 msgstr "Lesen"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set GID"
 msgstr "GID setzen"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set UID"
 msgstr "UID setzen"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Write"
 msgstr "Schreiben"
 
-#: src/cmd_chmod.c:231
+#: src/cmd_chmod.c:222
 msgid "Protection Bits"
 msgstr "Schutz-Bits"
 
-#: src/cmd_chmod.c:242
+#: src/cmd_chmod.c:233
 msgid "Textual"
 msgstr ""
 
-#: src/cmd_chmod.c:253
+#: src/cmd_chmod.c:246
 #, fuzzy
 msgid "Octal"
 msgstr "8, Oktal"
 
-#: src/cmd_chmod.c:258 src/menus.c:511
+#: src/cmd_chmod.c:251 src/menus.c:518
 msgid "All"
 msgstr "Alle"
 
-#: src/cmd_chmod.c:261
+#: src/cmd_chmod.c:253 src/menus.c:520
+msgid "Toggle"
+msgstr "Umschalten"
+
+#: src/cmd_chmod.c:254
 msgid "Revert"
-msgstr "Zurücksetzen"
+msgstr "ZurÃ¼cksetzen"
 
-#: src/cmd_chmod.c:273 src/cmd_chown.c:208 src/cmd_info.c:304
+#: src/cmd_chmod.c:266 src/cmd_chown.c:201 src/cmd_info.c:372
 msgid "Recurse Directories?"
 msgstr "Verzeichnis-Rekursion?"
 
-#: src/cmd_chmod.c:276
+#: src/cmd_chmod.c:269
 msgid "Don't Touch Directories?"
-msgstr "Verzeichnisse nicht ändern?"
+msgstr "Verzeichnisse nicht Ã¤ndern?"
 
-#: src/cmd_chmod.c:281
+#: src/cmd_chmod.c:274
 msgid "Change Mode"
-msgstr "Modus ändern"
+msgstr "Modus Ã¤ndern"
 
-#: src/cmd_chown.c:56
+#: src/cmd_chown.c:57
 #, c-format
 msgid "Set Ownership for '%s':"
-msgstr "Besitzer für '%s' setzen:"
+msgstr "Besitzer fÃ¼r '%s' setzen:"
 
-#: src/cmd_chown.c:184
+#: src/cmd_chown.c:176
 msgid "User"
 msgstr "Benutzer"
 
-#: src/cmd_chown.c:213
+#: src/cmd_chown.c:206
 msgid "Change Ownership"
-msgstr "Besitzer ändern"
+msgstr "Besitzer Ã¤ndern"
 
 #: src/cmd_configure.c:50
 msgid "Automatically Save Changed Configuration on Exit?"
-msgstr "Geänderte Einstellungen beim Beenden automatisch speichern?"
-
-#: src/cmd_copy.c:302
-#, c-format
-msgid ""
-"Can't copy directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"Konnte Verzeichnis \"%s\"\n"
-"nicht nach \"%s\" kopieren:\n"
-"die Quelle enthält das Ziel."
+msgstr "GeÃ¤nderte Einstellungen beim Beenden automatisch speichern?"
 
-#: src/cmd_copy.c:392 src/cmd_copyas.c:62
+#: src/cmd_copy.c:175 src/cmd_copyas.c:62
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Copy?"
 msgstr "\"%s\" existiert bereits - mit dem Kopieren fortfahren?"
 
-#: src/cmd_copy.c:393
+#: src/cmd_copy.c:176
 msgid "Copying..."
 msgstr "Kopiere..."
 
-#: src/cmd_copy.c:440
+#: src/cmd_copy.c:217
 msgid "Preserve Dates During Copy?"
 msgstr "Datum beim Kopieren beibehalten?"
 
-#: src/cmd_copy.c:441
+#: src/cmd_copy.c:218
 msgid "Ignore Failure to Copy Attributes (Date, Owner, Mode)?"
 msgstr ""
 "Fehler beim Kopieren der Attribute (Datum, Besitzer, Modus) ignorieren?"
 
-#: src/cmd_copy.c:442
+#: src/cmd_copy.c:219
 #, fuzzy
 msgid "Leave Failed Destination if Full Size?"
-msgstr "Fehlgeschlagenes Ziel lassen, wenn voll Größe?"
+msgstr "Fehlgeschlagenes Ziel lassen, wenn voll GrÃ¶Ãe?"
 
-#: src/cmd_copy.c:443 src/cmd_viewtext.c:207
+#: src/cmd_copy.c:220 src/cmd_viewtext.c:204
 msgid "Buffer Size"
-msgstr "Puffer-Größe"
+msgstr "Puffer-GrÃ¶Ãe"
 
-#: src/cmd_copyas.c:51
+#: src/cmd_copyas.c:49
 #, c-format
 msgid "Enter Name for Copy of \"%s\""
-msgstr "Name für Kopie von \"%s\" eingeben"
+msgstr "Name fÃ¼r Kopie von \"%s\" eingeben"
 
-#: src/cmd_copyas.c:53
+#: src/cmd_copyas.c:51
 #, c-format
 msgid "Enter Name for Clone of \"%s\""
-msgstr "Name für Klon von \"%s\" eingeben"
+msgstr "Name fÃ¼r Klon von \"%s\" eingeben"
 
 #: src/cmd_copyas.c:64
 #, c-format
@@ -1426,36 +1413,36 @@
 #: src/cmd_copyas.c:79
 #, c-format
 msgid "Enter Name to Link \"%s\" As"
-msgstr "Name für Verknüpfung von \"%s\""
+msgstr "Name fÃ¼r VerknÃ¼pfung von \"%s\""
 
 #: src/cmd_copyas.c:81
 #, fuzzy, c-format
 msgid "Enter Name for Link Clone of \"%s\""
-msgstr "Name für Klon-Verknüpfung von \"%s\""
+msgstr "Name fÃ¼r Klon-VerknÃ¼pfung von \"%s\""
 
-#: src/cmd_copyas.c:89
+#: src/cmd_copyas.c:91
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Symlink?"
-msgstr "\"%s\" existiert bereits - mit verknüpfen vortfahren?"
+msgstr "\"%s\" existiert bereits - mit verknÃ¼pfen vortfahren?"
 
-#: src/cmd_copyas.c:204 src/cmd_copyas.c:210
+#: src/cmd_copyas.c:200 src/cmd_copyas.c:207
 msgid "Copy As"
 msgstr "Kopieren als"
 
-#: src/cmd_copyas.c:212
+#: src/cmd_copyas.c:209
 msgid "Clone"
 msgstr "Klonen"
 
-#: src/cmd_copyas.c:214
+#: src/cmd_copyas.c:211
 msgid "Symbolic Link As"
-msgstr "Symbolisch verknüpfen als"
+msgstr "Symbolisch verknÃ¼pfen als"
 
-#: src/cmd_copyas.c:216
+#: src/cmd_copyas.c:213
 #, fuzzy
 msgid "Symbolic Link Clone"
-msgstr "Symoblischer Verküpfungs-Klon"
+msgstr "Symoblischer VerkÃ¼pfungs-Klon"
 
-#: src/cmd_delete.c:55
+#: src/cmd_delete.c:56
 #, c-format
 msgid ""
 "%s\n"
@@ -1463,246 +1450,255 @@
 "Attempt to change protection and retry?"
 msgstr ""
 "%s\n"
-"Konnte wegen Zugriffs-Einschränkungen nicht gelöscht werden.\n"
-"Versuchen, Rechte zu ändern und wiederholen?"
+"Konnte wegen Zugriffs-EinschrÃ¤nkungen nicht gelÃ¶scht werden.\n"
+"Versuchen, Rechte zu Ã¤ndern und wiederholen?"
 
-#: src/cmd_delete.c:58
+#: src/cmd_delete.c:59
 msgid "Remember the answer (alters config)"
-msgstr "Antwort merken (ändert Konfig.)"
+msgstr "Antwort merken (Ã¤ndert Konfig.)"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Access Problem"
 msgstr "Zugriffs-Problem"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Change|Leave Alone"
-msgstr "Ändern|Unberührt lassen"
+msgstr "Ãndern|UnberÃ¼hrt lassen"
 
-#: src/cmd_delete.c:236
+#: src/cmd_delete.c:215
 #, c-format
 msgid "Really Delete \"%s\"?"
-msgstr "\"%s\" wirklich löschen?"
+msgstr "\"%s\" wirklich lÃ¶schen?"
 
-#: src/cmd_delete.c:237
+#: src/cmd_delete.c:216
 msgid "Deleting..."
-msgstr "Lösche..."
+msgstr "LÃ¶sche..."
 
-#: src/cmd_delete.c:292
+#: src/cmd_delete.c:279
 msgid "On Access Failure"
 msgstr "Bei Zugriffsfehler"
 
-#: src/cmd_delete.c:293
+#: src/cmd_delete.c:280
 msgid "Ask User|Automatically Try Changing, and Retry|Fail"
-msgstr "Benutzer fragen|Automatisch ändern und erneut versuchen|Abbrechen"
+msgstr "Benutzer fragen|Automatisch Ã¤ndern und erneut versuchen|Abbrechen"
 
-#: src/cmd_dpfocus.c:183
-msgid "Wrap Around At Top And Bottom?"
-msgstr "Von oben nach unten springen und umgekehrt?"
+#: src/cmd_dpfocus.c:33
+msgid "DpFocus Command is Deprecated"
+msgstr ""
+
+#: src/cmd_dpfocus.c:34
+msgid ""
+"The <tt>DpFocus</tt> command has been deprecated and is no longer supported. "
+"Please remove any keyboard or mouse bindings that use it and look into using "
+"the default GTK+ list view's cursor controls."
+msgstr ""
 
-#: src/cmd_dpfocus.c:184
+#: src/cmd_dpfocus.c:64
 msgid "Treat Focused Row As Selection If No \"Real\" Selection Exists?"
 msgstr ""
-"Fokussierte Reihen als ausgewählte behandeln, wenn keine \"echte\" Auswahl "
+"Fokussierte Reihen als ausgewÃ¤hlte behandeln, wenn keine \"echte\" Auswahl "
 "existiert?"
 
-#: src/cmd_dpfocus.c:186
+#: src/cmd_dpfocus.c:66
 msgid "Move Focus to Last Selected/Deselected Row?"
-msgstr "Fokus auf letzte gewählte/abgewählte Reihe bewegen?"
+msgstr "Fokus auf letzte gewÃ¤hlte/abgewÃ¤hlte Reihe bewegen?"
 
-#: src/cmd_dpfocusisrch.c:220
+#: src/cmd_dpfocusisrch.c:163
 #, fuzzy
 msgid "ISearch"
 msgstr "ISuche"
 
-#: src/cmd_generic.c:136
+#: src/cmd_generic.c:143
 msgid "_OK|A_ll|_Skip|_Cancel"
-msgstr "_OK|A_lle|_Überspringen|_Abbrechen"
+msgstr "_OK|A_lle|_Ãberspringen|_Abbrechen"
 
-#: src/cmd_generic.c:137
+#: src/cmd_generic.c:144
 msgid "_OK|_Skip|_Cancel"
-msgstr "_OK|_Überspringen|_Abbrechen"
+msgstr "_OK|_Ãberspringen|_Abbrechen"
 
-#: src/cmd_getsize.c:49
+#: src/cmd_getsize.c:51
 msgid "Getting sizes..."
-msgstr "Hole Größen..."
+msgstr "Hole GrÃ¶Ãen..."
 
-#: src/cmd_getsize.c:141
+#: src/cmd_getsize.c:134
 msgid "Unselect Rows When Done?"
-msgstr "Reihen abwählen wenn fertig?"
+msgstr "Reihen abwÃ¤hlen wenn fertig?"
 
-#: src/cmd_info.c:71 src/cmd_info.c:163
-#, c-format
-msgid ""
-"%s (%s bytes,\n"
-"%s blocks)"
-msgstr ""
-"%s (%s Bytes,\n"
-"%s Blöcke)"
+#: src/cmd_info.c:68 src/errors.c:84
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr ", %s benutzt"
 
-#: src/cmd_info.c:75
-#, c-format
-msgid "%u dirs, %u files, %u symlinks"
+#: src/cmd_info.c:72
+#, fuzzy, c-format
+msgid ""
+"%u dirs, %u files,\n"
+"%u symlinks, %u special files"
 msgstr "%u Verz., %u Dateien, %u Sym. Verkn."
 
-#: src/cmd_info.c:134
+#: src/cmd_info.c:153
+msgid "Value"
+msgstr ""
+
+#: src/cmd_info.c:198
 msgid "Link To"
-msgstr "Verknüpfen mit"
+msgstr "VerknÃ¼pfen mit"
 
-#: src/cmd_info.c:145 src/cmd_select.c:399 src/dpformat.c:52
+#: src/cmd_info.c:213 src/cmd_select.c:368 src/dpformat.c:54
 msgid "Type"
 msgstr "Typ"
 
-#: src/cmd_info.c:148
+#: src/cmd_info.c:216
 msgid "Location"
 msgstr "Ort"
 
-#: src/cmd_info.c:151 src/dpformat.c:36 src/window.c:200
+#: src/cmd_info.c:219 src/cmd_split.c:653 src/dpformat.c:37 src/window.c:199
 msgid "Size"
-msgstr "Größe"
+msgstr "GrÃ¶Ãe"
+
+#: src/cmd_info.c:229
+#, fuzzy, c-format
+msgid "%s (%s bytes)"
+msgstr "%Lu Bytes"
 
-#: src/cmd_info.c:172
+#: src/cmd_info.c:240
 msgid "Contains"
-msgstr "enthält"
+msgstr "enthÃ¤lt"
 
-#: src/cmd_info.c:186
+#: src/cmd_info.c:257
 msgid "'File' Info"
 msgstr "'Datei' Info"
 
-#: src/cmd_info.c:213 src/dpformat.c:49
+#: src/cmd_info.c:285 src/dpformat.c:50
 msgid "Accessed"
 msgstr "Zugegriffen"
 
-#: src/cmd_info.c:214 src/dpformat.c:50
+#: src/cmd_info.c:286 src/dpformat.c:51
 msgid "Modified"
 msgstr "Modifiziert"
 
-#: src/cmd_info.c:215
+#: src/cmd_info.c:287 src/dpformat.c:53
 msgid "Changed"
-msgstr "Geändert"
+msgstr "GeÃ¤ndert"
+
+#: src/cmd_info.c:288 src/dpformat.c:52
+msgid "Created"
+msgstr "Erstellt"
+
+#: src/cmd_info.c:290
+#, fuzzy
+msgid "Basic"
+msgstr "Basis"
 
-#: src/cmd_info.c:263
+#: src/cmd_info.c:294
+msgid "Attributes"
+msgstr ""
+
+#: src/cmd_info.c:338
 msgid "Getting Information..."
 msgstr "Bekomme Informationen..."
 
-#: src/cmd_info.c:302
+#: src/cmd_info.c:370
 msgid "Show 'file' Output?"
 msgstr "'Datei'-Ausgabe anzeigen?"
 
-#: src/cmd_info.c:305
+#: src/cmd_info.c:373
 msgid "Access Date Format"
 msgstr "Format des Zugriffs-Datums"
 
-#: src/cmd_info.c:306
+#: src/cmd_info.c:374
 msgid "Modify Date Format"
 msgstr "Format des Modifizerungs-Datums"
 
-#: src/cmd_info.c:307
+#: src/cmd_info.c:375
 msgid "Change Date Format"
-msgstr "Format des Änderungs-Datums"
+msgstr "Format des Ãnderungs-Datums"
 
-#: src/cmd_info.c:308
+#: src/cmd_info.c:376
 #, fuzzy
 msgid "Size Tick Mark"
-msgstr "Größen-Unterteiler-Zeichen"
+msgstr "GrÃ¶Ãen-Unterteiler-Zeichen"
 
-#: src/cmd_join.c:47
+#: src/cmd_join.c:46
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Join?"
 msgstr "\"%s\" existiert bereits - mit Verbinden weitermachen?"
 
-#: src/cmd_join.c:76
+#: src/cmd_join.c:73
 msgid "Joining..."
 msgstr "Verbinde..."
 
-#: src/cmd_join.c:162
+#: src/cmd_join.c:167
 msgid "Click and Drag Files to Reorder, Then Click Join."
 msgstr ""
 "Dateien Klicken und Ziehen zum neu anordnen, dann klicken um zu verbinden."
 
-#: src/cmd_join.c:170
+#: src/cmd_join.c:175
 #, c-format
 msgid "The total size is %s (%lu bytes)."
-msgstr "Die Gesamtgröße beträgt %s (%lu Bytes)."
+msgstr "Die GesamtgrÃ¶Ãe betrÃ¤gt %s (%lu Bytes)."
 
-#: src/cmd_join.c:173
+#: src/cmd_join.c:178
 #, c-format
 msgid "The total size is %lu bytes."
-msgstr "Die Gesamtgröße beträgt %lu Bytes."
+msgstr "Die GesamtgrÃ¶Ãe betrÃ¤gt %lu Bytes."
 
-#: src/cmd_join.c:215
+#: src/cmd_join.c:220
 msgid "Enter Destination File Name"
 msgstr "Name der Ziel-Datei eingeben"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "Join"
 msgstr "Verbinden"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "_Join|_Cancel"
 msgstr "_Verbinden|_Abbrechen"
 
-#: src/cmd_mkdir.c:75
+#: src/cmd_mkdir.c:65
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With MkDir?"
 msgstr "\"%s\" existiert bereits - mit MkDir fortfahren?"
 
-#: src/cmd_mkdir.c:125
+#: src/cmd_mkdir.c:119
 msgid "Enter Name of Directory to Create"
 msgstr "Name des zu erstellenden Verzeichnisses eingeben"
 
-#: src/cmd_mkdir.c:133
+#: src/cmd_mkdir.c:128
 msgid "Make Directory"
 msgstr "Verzeichnis erstellen"
 
-#: src/cmd_mkdir.c:156
+#: src/cmd_mkdir.c:151
 msgid "CD Into New Directory?"
 msgstr "In neues Verzeichnis wechseln?"
 
-#: src/cmd_mkdir.c:157
+#: src/cmd_mkdir.c:152
 msgid "Focus New Directory?"
 msgstr "Neues Verzeichnis fokussieren?"
 
-#: src/cmd_move.c:81
-#, fuzzy, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"Konnte Verzeichnis \"%s\"\n"
-"nicht nach \"%s\" verschieben:\n"
-"die Quelle enthält das Ziel."
-
-#: src/cmd_move.c:92
-#, fuzzy, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the destination contains the source."
-msgstr ""
-"Konnte Verzeichnis \"%s\"\n"
-"nicht nach \"%s\" verschieben:\n"
-"die Quelle enthält das Ziel."
-
-#: src/cmd_move.c:188 src/cmd_moveas.c:48
+#: src/cmd_move.c:128 src/cmd_moveas.c:51
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Move?"
 msgstr "\"%s\" existiert bereits - mit verschieben fortfahren?"
 
-#: src/cmd_move.c:189
+#: src/cmd_move.c:129
 msgid "Moving..."
 msgstr "Verschiebe..."
 
-#: src/cmd_moveas.c:40
+#: src/cmd_moveas.c:41
 #, c-format
 msgid "Enter Name to Move \"%s\" As"
 msgstr "Name eingeben, um %s zu verschieben"
 
+#: src/cmd_moveas.c:66
+msgid "Invalid destination name for MoveAs"
+msgstr ""
+
 #: src/cmd_moveas.c:74
 msgid "Moving As..."
 msgstr "Verschiebe Als..."
 
-#: src/cmd_moveas.c:105 src/cmd_moveas.c:110
+#: src/cmd_moveas.c:105 src/cmd_moveas.c:113
 msgid "Move As"
 msgstr "Verschieben als"
 
@@ -1716,7 +1712,7 @@
 
 #: src/cmd_quit.c:42 src/cmd_quit.c:54
 msgid "Confirm Quitting"
-msgstr "Beenden bestätigen"
+msgstr "Beenden bestÃ¤tigen"
 
 #: src/cmd_quit.c:42
 msgid "_Quit|_Save, then Quit|_Cancel"
@@ -1726,26 +1722,26 @@
 msgid "Are you sure you want to quit?"
 msgstr "Wirklich beenden?"
 
-#: src/cmd_rename.c:44
+#: src/cmd_rename.c:57
 #, c-format
 msgid "Enter New Name For \"%s\""
-msgstr "Neuen Namen für \"%s\" eingeben"
+msgstr "Neuen Namen fÃ¼r \"%s\" eingeben"
 
-#: src/cmd_rename.c:52 src/cmd_renamere.c:147 src/cmd_renamere.c:243
-#: src/cmd_renamere.c:293 src/cmd_renamere.c:388 src/cmd_renameseq.c:161
+#: src/cmd_rename.c:67 src/cmd_renamere.c:142 src/cmd_renamere.c:225
+#: src/cmd_renamere.c:268 src/cmd_renamere.c:367 src/cmd_renameseq.c:152
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Rename?"
 msgstr "\"%s\" existiert bereits - mit umbenennen fortfahren?"
 
-#: src/cmd_rename.c:132
+#: src/cmd_rename.c:245
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: src/cmd_renamere.c:260
-msgid "Regular expression error:\n"
-msgstr "Fehler im Regulären Ausdruck:\n"
+#: src/cmd_rename.c:261
+msgid "Rename Single File In-Place (Without Dialog)?"
+msgstr ""
 
-#: src/cmd_renamere.c:446
+#: src/cmd_renamere.c:419
 msgid ""
 "Look for substring in all filenames, and replace\n"
 "it with another string."
@@ -1753,23 +1749,23 @@
 "Nach Zeichenkette in allen Dateinamen suchen und\n"
 "durch eine andere Kette ersetzen."
 
-#: src/cmd_renamere.c:449
+#: src/cmd_renamere.c:422
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: src/cmd_renamere.c:453
+#: src/cmd_renamere.c:426
 msgid "With"
 msgstr "Durch"
 
-#: src/cmd_renamere.c:461
+#: src/cmd_renamere.c:434
 msgid "Replace All?"
 msgstr "Alle ersetzen?"
 
-#: src/cmd_renamere.c:465
+#: src/cmd_renamere.c:438
 msgid "Simple"
 msgstr "Einfach"
 
-#: src/cmd_renamere.c:469
+#: src/cmd_renamere.c:442
 msgid ""
 "Execute the 'From' RE on each filename, storing\n"
 "parenthesised subexpression matches. Then replace\n"
@@ -1778,25 +1774,25 @@
 "that matched, and use the result as a new filename."
 msgstr ""
 "Jeder Dateiname wird auf den 'Von'-R.A. untersucht,\n"
-"wobei Teilausdruck-Übereinstimmungen gespeichert werden.\n"
+"wobei Teilausdruck-Ãbereinstimmungen gespeichert werden.\n"
 "Dann wird jedes Vorkommen von $n in 'Nach' durch den\n"
-"übereinstimmenden Text ersetzt, wobei n\n"
+"Ã¼bereinstimmenden Text ersetzt, wobei n\n"
 "der Index (mit 1 beginnend) eines Teilausdrucks ist.\n"
 "Das Ergebnis wird als neuer Dateiname benutzt."
 
-#: src/cmd_renamere.c:477 src/cmd_renamere.c:500
+#: src/cmd_renamere.c:450 src/cmd_renamere.c:473
 msgid "From"
 msgstr "Von"
 
-#: src/cmd_renamere.c:481 src/cmd_renamere.c:504
+#: src/cmd_renamere.c:454 src/cmd_renamere.c:477
 msgid "To"
 msgstr "Nach"
 
-#: src/cmd_renamere.c:489
+#: src/cmd_renamere.c:462
 msgid "Reg Exp"
 msgstr "Reg. Ausdr."
 
-#: src/cmd_renamere.c:494
+#: src/cmd_renamere.c:467
 msgid ""
 "Look for each character in the 'From' string, and replace\n"
 "any hits with the corresponding character in the 'To' string.\n"
@@ -1804,150 +1800,150 @@
 "the filename, and the result used as the new name for each file."
 msgstr ""
 
-#: src/cmd_renamere.c:513
+#: src/cmd_renamere.c:486
 msgid "Map"
 msgstr ""
 
-#: src/cmd_renamere.c:517
+#: src/cmd_renamere.c:490
 msgid ""
 "Changes the case (upper/lower) of the characters\n"
 "in the selected filename(s)."
 msgstr ""
 
-#: src/cmd_renamere.c:519
+#: src/cmd_renamere.c:492
 #, fuzzy
 msgid "Lower Case?"
-msgstr "Groß-/Kleinschreibung ignorieren?"
+msgstr "GroÃ-/Kleinschreibung ignorieren?"
 
-#: src/cmd_renamere.c:521
+#: src/cmd_renamere.c:494
 #, fuzzy
 msgid "Upper Case?"
-msgstr "Groß-/Kleinschreibung ignorieren?"
+msgstr "GroÃ-/Kleinschreibung ignorieren?"
 
-#: src/cmd_renamere.c:523
+#: src/cmd_renamere.c:496
 #, fuzzy
 msgid "Upper Case Initial?"
-msgstr "Groß-/Kleinschreibung ignorieren?"
+msgstr "GroÃ-/Kleinschreibung ignorieren?"
 
-#: src/cmd_renamere.c:526
+#: src/cmd_renamere.c:499
 #, fuzzy
 msgid "Case"
 msgstr "Basis"
 
-#: src/cmd_renamere.c:528
+#: src/cmd_renamere.c:501
 #, fuzzy
 msgid "RenameRE"
 msgstr "mit R.A. Umbenennen"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "10, Decimal"
 msgstr "10, Dezimal"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (A-F)"
 msgstr "16, Hex (A-F)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (a-f)"
 msgstr "16, Hex (a-f)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "8, Octal"
 msgstr "8, Oktal"
 
-#: src/cmd_renameseq.c:328
+#: src/cmd_renameseq.c:306
 msgid ""
 "This command renames all selected files\n"
 "into a numbered sequence. The controls\n"
 "below let you define how the names are\n"
 "formed."
 msgstr ""
-"Dieser Befehl ändert die Namen aller gewählten Dateien\n"
+"Dieser Befehl Ã¤ndert die Namen aller gewÃ¤hlten Dateien\n"
 "in eine Nummernfolge. Mit den Einstellungen unten\n"
-"lässt sich einstellen, wie die Namen geformt werden."
+"lÃ¤sst sich einstellen, wie die Namen geformt werden."
 
-#: src/cmd_renameseq.c:335
+#: src/cmd_renameseq.c:313
 msgid "Start At"
 msgstr "Starten bei"
 
-#: src/cmd_renameseq.c:343 src/cmd_split.c:247
+#: src/cmd_renameseq.c:323 src/cmd_split.c:609
 msgid "Base"
 msgstr "Basis"
 
-#: src/cmd_renameseq.c:359
+#: src/cmd_renameseq.c:333
 msgid "Precision"
-msgstr "Präzision"
+msgstr "PrÃ¤zision"
 
-#: src/cmd_renameseq.c:367
+#: src/cmd_renameseq.c:340
 msgid "Head"
 msgstr "Kopf"
 
-#: src/cmd_renameseq.c:374
+#: src/cmd_renameseq.c:347
 msgid "Tail"
 msgstr "Schwanz"
 
-#: src/cmd_renameseq.c:382
+#: src/cmd_renameseq.c:354
 msgid "Guess"
-msgstr "Schätzen"
+msgstr "SchÃ¤tzen"
 
-#: src/cmd_renameseq.c:396
+#: src/cmd_renameseq.c:369
 msgid "Sequential Rename"
 msgstr "Sequentielles Umbenennen"
 
-#: src/cmd_select.c:396
+#: src/cmd_select.c:365
 msgid "All rows|Selected|Unselected|"
-msgstr "Alle Reihen|Ausgewählte|Nicht ausgewählte"
+msgstr "Alle Reihen|AusgewÃ¤hlte|Nicht ausgewÃ¤hlte"
 
-#: src/cmd_select.c:397
+#: src/cmd_select.c:366
 msgid "All types|Directories only|Non-directories only|"
 msgstr "Alle Typen|Nur Verzeichnisse|Nur Nicht-Verzeichnisse"
 
-#: src/cmd_select.c:398
+#: src/cmd_select.c:367
 msgid "Select|Unselect|Toggle|"
-msgstr "Auswählen|Abwählen|Umkehren"
+msgstr "AuswÃ¤hlen|AbwÃ¤hlen|Umkehren"
 
-#: src/cmd_select.c:399 src/menus.c:530
+#: src/cmd_select.c:368 src/menus.c:537
 msgid "Action"
 msgstr "Aktion"
 
-#: src/cmd_select.c:399
+#: src/cmd_select.c:368
 msgid "Set"
 msgstr "Setzen"
 
-#: src/cmd_select.c:511
+#: src/cmd_select.c:469
 msgid "Treat RE as Glob Pattern?"
 msgstr "R.A. als Glob-Muster behandeln?"
 
-#: src/cmd_select.c:514
+#: src/cmd_select.c:472
 msgid "Invert RE Matching?"
 msgstr "R.A. Ergebnisse umkehren?"
 
-#: src/cmd_select.c:517
+#: src/cmd_select.c:475
 msgid "Require Match on Full Name?"
-msgstr "Übereinstimmung mit vollem Namen erforderlich?"
+msgstr "Ãbereinstimmung mit vollem Namen erforderlich?"
 
-#: src/cmd_select.c:531
+#: src/cmd_select.c:489
 msgid "Select Using RE"
-msgstr "Mit R.A. auswählen"
+msgstr "Mit R.A. auswÃ¤hlen"
 
-#: src/cmd_select.c:815
+#: src/cmd_select.c:727
 msgid ""
 "Enter shell command to run. The command\n"
 "will have the selected content appended.\n"
 "Action is performed on successful exit."
 msgstr ""
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 #, fuzzy
 msgid "OK|Cancel"
 msgstr "_OK|_Abbrechen"
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 #, fuzzy
 msgid "Select using shell command"
-msgstr "Befehl Auswählen"
+msgstr "Befehl AuswÃ¤hlen"
 
-#: src/cmd_split.c:68
+#: src/cmd_split.c:269
 #, c-format
 msgid ""
 "Split \"%s\".\n"
@@ -1956,7 +1952,7 @@
 "\"%s\" aufteilen.\n"
 "Datei ist %s (%s)."
 
-#: src/cmd_split.c:70
+#: src/cmd_split.c:271
 #, c-format
 msgid ""
 "Split \"%s\".\n"
@@ -1965,93 +1961,143 @@
 "\"%s\" aufteilen.\n"
 "Datei ist %s."
 
-#: src/cmd_split.c:106
+#: src/cmd_split.c:348
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Split?"
 msgstr "\"%s\" existiert bereits - mit Aufteilen fortfahren?"
 
-#: src/cmd_split.c:171
-msgid "Beta Software"
-msgstr "Beta Software"
+#: src/cmd_split.c:422
+msgid "Fixed Size Split"
+msgstr "FestgrÃ¶Ãen-Aufteilung"
 
-#: src/cmd_split.c:171
-msgid "Next Version?"
-msgstr "Nächste Version?"
+#: src/cmd_split.c:424
+msgid "Segment Size"
+msgstr "Teil-GrÃ¶Ãe"
 
-#: src/cmd_split.c:171
-msgid ""
-"This splitting mode has not been\n"
-"implemented yet... Sorry."
-msgstr ""
-"Dieser aufteilungs-Modus wurde noch\n"
-"nicht implementiert... Sorry."
+#: src/cmd_split.c:427
+#, fuzzy
+msgid "1457000 bytes (3.5\" floppy)"
+msgstr "  1457000 Dytes (3.5\" Diskette)"
+
+#: src/cmd_split.c:428
+#, fuzzy
+msgid "10485760 bytes (10 MB)"
+msgstr "  1457000 Dytes (3.5\" Diskette)"
+
+#: src/cmd_split.c:429
+#, fuzzy
+msgid "26214400 bytes (25 MB)"
+msgstr "  1457000 Dytes (3.5\" Diskette)"
+
+#: src/cmd_split.c:430
+#, fuzzy
+msgid "52428800 bytes (50 MB)"
+msgstr "  1457000 Dytes (3.5\" Diskette)"
 
-#: src/cmd_split.c:187
-msgid "  1457000 bytes (3.5\" floppy)"
+#: src/cmd_split.c:431
+#, fuzzy
+msgid "78643200 bytes (75 MB)"
 msgstr "  1457000 Dytes (3.5\" Diskette)"
 
-#: src/cmd_split.c:188
-msgid "100431360 bytes (Zip disk)"
+#: src/cmd_split.c:432
+#, fuzzy
+msgid "100431360 bytes (95 MB, Zip disk)"
 msgstr "100431360 Dytes (Zip Diskette)"
 
-#: src/cmd_split.c:190
-msgid "Fixed Size Split"
-msgstr "Festgrößen-Aufteilung"
+#: src/cmd_split.c:454
+#, fuzzy
+msgid "Fixed Count Split"
+msgstr "FestgrÃ¶Ãen-Aufteilung"
 
-#: src/cmd_split.c:193
-msgid "Segment Size"
-msgstr "Teil-Größe"
+#: src/cmd_split.c:457
+#, fuzzy
+msgid "Segment Count"
+msgstr "Teil-GrÃ¶Ãe"
+
+#: src/cmd_split.c:503
+msgid "Current part number, unique for every created file"
+msgstr ""
+
+#: src/cmd_split.c:504
+msgid "The value from the Base box"
+msgstr ""
+
+#: src/cmd_split.c:505
+msgid "The amount that index will change for each file"
+msgstr ""
+
+#: src/cmd_split.c:506
+msgid "The total number of files that will be created"
+msgstr ""
+
+#: src/cmd_split.c:507
+msgid "The value of index for the last file to be created"
+msgstr ""
 
-#: src/cmd_split.c:221
+#: src/cmd_split.c:570
 msgid "Fixed size, variable number of parts"
-msgstr "Feste Größe, variable Anzahl von Teilen"
+msgstr "Feste GrÃ¶Ãe, variable Anzahl von Teilen"
 
-#: src/cmd_split.c:222
+#: src/cmd_split.c:571
 msgid "Fixed number of parts, variable sizes"
-msgstr "Feste Anzahl von Teilen, variable Größe"
+msgstr "Feste Anzahl von Teilen, variable GrÃ¶Ãe"
 
-#: src/cmd_split.c:230 src/cmd_split.c:261
+#: src/cmd_split.c:580 src/cmd_split.c:663
 msgid "Split"
 msgstr "Teilung"
 
-#: src/cmd_split.c:243
+#: src/cmd_split.c:599
 msgid "Name Format"
 msgstr "Namens-Format"
 
-#: src/cmd_split.c:252
+#: src/cmd_split.c:615
 msgid "Step"
 msgstr "Schritt"
 
-#: src/cmd_symlink.c:77 src/cmd_symlink.c:246
+#: src/cmd_split.c:624
+msgid "Zero-Fill Numbers?"
+msgstr ""
+
+#: src/cmd_split.c:645
+msgid "Offset"
+msgstr ""
+
+#: src/cmd_symlink.c:68 src/cmd_symlink.c:252
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Link?"
-msgstr "\"%s\" existiert bereits - mit Verknüpfen fortfahren?"
+msgstr "\"%s\" existiert bereits - mit VerknÃ¼pfen fortfahren?"
+
+#: src/cmd_symlink.c:161 src/configure.c:239 src/icon_dialog.c:59
+#: src/progress.c:220
+msgid "Cancel"
+msgstr "Abbrechen"
 
-#: src/cmd_symlink.c:184
+#: src/cmd_symlink.c:161 src/configure.c:233 src/dialog.c:290
+#: src/nag_dialog.c:36
+msgid "OK"
+msgstr "OK"
+
+#: src/cmd_symlink.c:161
 msgid "Select Link Target"
-msgstr "Verknüpfungs-Ziel auswählen"
+msgstr "VerknÃ¼pfungs-Ziel auswÃ¤hlen"
 
-#: src/cmd_symlink.c:213
+#: src/cmd_symlink.c:218
 msgid "Contents"
 msgstr "Inhalte"
 
-#: src/cmd_symlink.c:225
+#: src/cmd_symlink.c:231
 msgid "Edit Symbolic Link"
-msgstr "Symbolische Verknüpfung bearbeiten"
+msgstr "Symbolische VerknÃ¼pfung bearbeiten"
 
-#: src/cmd_symlink.c:231
+#: src/cmd_symlink.c:236
 msgid "Create Symbolic Link"
-msgstr "Symbolische Verknüpfung erstellen"
-
-#: src/cmd_viewtext.c:206
-msgid "Use mmap() to Speed Loading?"
-msgstr "mmap() für schnelles Laden benutzen?"
+msgstr "Symbolische VerknÃ¼pfung erstellen"
 
-#: src/cmd_viewtext.c:208
+#: src/cmd_viewtext.c:205
 msgid "Hex-Check First"
-msgstr "Erst Hex-Prüfung"
+msgstr "Erst Hex-PrÃ¼fung"
 
-#: src/cmd_viewtext.c:209
+#: src/cmd_viewtext.c:206
 msgid "Exit on Left Arrow Key?"
 msgstr ""
 
@@ -2067,7 +2113,7 @@
 msgid "yes"
 msgstr "Ja"
 
-#: src/cmdgrab.c:222
+#: src/cmdgrab.c:177
 #, c-format
 msgid "Output of %s (pid %d)"
 msgstr "Ausgabe von %s (pid %d)"
@@ -2079,54 +2125,46 @@
 "command \"%s\"."
 msgstr ""
 "Konnte unbekannten Befehl\n"
-"\"%s\" nicht ausführen."
+"\"%s\" nicht ausfÃ¼hren."
 
-#: src/cmdseq_dialog.c:126
+#: src/cmdseq_dialog.c:134
 #, c-format
 msgid "Built-Ins (%u)"
 msgstr "Eingebaute (%u)"
 
-#: src/cmdseq_dialog.c:131
+#: src/cmdseq_dialog.c:139
 #, c-format
 msgid "User Defined (%u)"
 msgstr "Benutzerdefinierte (%u)"
 
-#: src/cmdseq_dialog.c:302
+#: src/cmdseq_dialog.c:313
 msgid ""
 "Select a command, or type start\n"
 "of name and press TAB."
 msgstr ""
-"Befehl wählen oder Anfang tippen\n"
-"und TAB drücken."
+"Befehl wÃ¤hlen oder Anfang tippen\n"
+"und TAB drÃ¼cken."
 
-#: src/cmdseq_dialog.c:319
+#: src/cmdseq_dialog.c:330
 msgid "Select Command"
-msgstr "Befehl Auswählen"
+msgstr "Befehl AuswÃ¤hlen"
 
-#: src/configure.c:198
+#: src/configure.c:197
 msgid "Couldn't open configuration file for output"
-msgstr "Konnte Konfigurations-Datei für Ausgabe nicht öffnen"
+msgstr "Konnte Konfigurations-Datei fÃ¼r Ausgabe nicht Ã¶ffnen"
 
-#: src/configure.c:234 src/dialog.c:285
-msgid "OK"
-msgstr "OK"
-
-#: src/configure.c:240
+#: src/configure.c:236
 msgid "Save"
 msgstr "Speichern"
 
-#: src/configure.c:244 src/icon_dialog.c:59 src/progress.c:219
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: src/configure.c:455
+#: src/configure.c:463
 #, c-format
 msgid "Config file version (%s) doesn't match program version (%s)"
 msgstr ""
 "Konfigurations-Datei-Version (%s) stimmt nicht mit Programm-Version (%s) "
-"überein"
+"Ã¼berein"
 
-#: src/configure.c:467
+#: src/configure.c:475
 #, c-format
 msgid ""
 "Couldn't find any configuration file; checked\n"
@@ -2137,238 +2175,218 @@
 "finden.\n"
 "Benutze eingebaute Minimal-Konfiguration."
 
-#: src/dialog.c:123 src/dialog.c:253
+#: src/dialog.c:124 src/dialog.c:260
 msgid "_OK|_Cancel"
 msgstr "_OK|_Abbrechen"
 
-#: src/dirpane.c:134
-#, fuzzy
-msgid ""
-"Case-sensitive sorting will not work correctly with non-ASCII characters"
-msgstr ""
-"Sortieren nach Groß-/Kleinschreibung wird mit nicht-ASCII-Symbolen nicht "
-"richtig funktionieren"
-
-#: src/dirpane.c:143
-#, fuzzy
-msgid ""
-"Case-insensitive sorting will not work correctly with non-ASCII characters"
-msgstr ""
-"Sortieren ohne Groß-/Kleinschreibung wird mit nicht-ASCII-Symbolen nicht "
-"richtig funktionieren"
-
-#: src/dirpane.c:1189
+#: src/dirpane.c:541
 #, c-format
 msgid "%u/%u dirs, %u/%u files"
 msgstr "%u/%u Verzeichnisse, %u/%u Dateien"
 
-#: src/dirpane.c:1197
-#, fuzzy, c-format
-msgid " (%%s/%%s, %%%s/%%%s blocks)"
-msgstr " (%s/%s, %Lu/%Lu Blöcke)"
+#: src/dirpane.c:546
+#, c-format
+msgid " (%s/%s)"
+msgstr ""
 
-#: src/dirpane.c:1210
+#: src/dirpane.c:557
 #, fuzzy, c-format
 msgid ", %s (%s) used"
 msgstr ", %s benutzt"
 
-#: src/dirpane.c:1212
+#: src/dirpane.c:559
 #, c-format
 msgid ", %s free"
 msgstr ", %s frei"
 
-#: src/dirpane.c:1560
-msgid "!!Invalid filename!!"
-msgstr ""
-
-#: src/dirpane.c:2004 src/dirpane.c:2053
+#: src/dirpane.c:2084 src/dirpane.c:2131
 msgid "Move up to the parent directory"
-msgstr "Zum übergeordneten Verzeichnis wechseln"
+msgstr "Zum Ã¼bergeordneten Verzeichnis wechseln"
 
-#: src/dirpane.c:2026
+#: src/dirpane.c:2106
 msgid "Enter path, then press Return to go there"
-msgstr "Pfad eingeben und Enter drücken, um dorthin zu gehen"
+msgstr "Pfad eingeben und Enter drÃ¼cken, um dorthin zu gehen"
 
-#: src/dirpane.c:2027
+#: src/dirpane.c:2107
 msgid "H"
 msgstr "V"
 
-#: src/dirpane.c:2031
+#: src/dirpane.c:2111
 msgid ""
 "Click to enable/disable Hide rule (When pressed in, the hide rule is active, "
 "and matching entries are hidden)"
 msgstr ""
 "Klicken, um Verberge-Regel zu (de)aktivieren (Regel ist aktiv und passende "
-"Einträge werden verborgen, wenn Knopf gedrückt)"
+"EintrÃ¤ge werden verborgen, wenn Knopf gedrÃ¼ckt)"
 
-#: src/dpformat.c:37
+#: src/dpformat.c:38
 msgid "Blocks"
-msgstr "Blöcke"
+msgstr "BlÃ¶cke"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "BSize"
-msgstr "BGröße"
+msgstr "BGrÃ¶Ãe"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "Block Size"
-msgstr "Block Größe"
+msgstr "Block GrÃ¶Ãe"
 
-#: src/dpformat.c:39
+#: src/dpformat.c:40
 msgid "Mode, numerical"
 msgstr "Modus, numerisch"
 
-#: src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode, string"
 msgstr "Modus, Zeichenkette"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Nlink"
-msgstr "NVerknüpfung"
+msgstr "NVerknÃ¼pfung"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Number of links"
-msgstr "Anzahl der Verknüpfungen"
+msgstr "Anzahl der VerknÃ¼pfungen"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Owner ID"
 msgstr "Besitzer ID"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Uid"
 msgstr ""
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Owner Name"
 msgstr "Besitzer-Name"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Uname"
 msgstr ""
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Gid"
 msgstr ""
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Group ID"
 msgstr "Gruppen ID"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Gname"
 msgstr ""
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Group Name"
 msgstr "Gruppen-Name"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device"
-msgstr "Gerät"
+msgstr "GerÃ¤t"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device Number"
-msgstr "Geräte-Nummer"
+msgstr "GerÃ¤te-Nummer"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "DevMaj"
 msgstr ""
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 #, fuzzy
 msgid "Device Number, major"
-msgstr "Gerätenummer, major"
+msgstr "GerÃ¤tenummer, major"
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "DevMin"
 msgstr ""
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 #, fuzzy
 msgid "Device Number, minor"
-msgstr "Gerätenummer, minor"
-
-#: src/dpformat.c:49
-msgid "Date of last Access"
-msgstr "Datum des letzten Zugriffs"
+msgstr "GerÃ¤tenummer, minor"
 
 #: src/dpformat.c:50
-msgid "Date of last Modification"
-msgstr "Datum der letzen Modifikation"
-
-#: src/dpformat.c:51
-msgid "Created"
-msgstr "Erstellt"
+#, fuzzy
+msgid "Time of Last Access"
+msgstr "Datum des letzten Zugriffs"
 
 #: src/dpformat.c:51
-msgid "Date of Creation"
-msgstr "Datum der Erstellung"
+#, fuzzy
+msgid "Time of Last Modification"
+msgstr "Datum der letzen Modifikation"
 
 #: src/dpformat.c:52
-msgid "Type Name"
-msgstr "Typen-Name"
+#, fuzzy
+msgid "Time of Creation"
+msgstr "Datum der Erstellung"
 
 #: src/dpformat.c:53
-msgid "I"
+msgid "Time of Last Change"
 msgstr ""
 
-#: src/dpformat.c:334
-msgid "B"
-msgstr ""
+#: src/dpformat.c:54
+msgid "Type Name"
+msgstr "Typen-Name"
 
-#: src/dpformat.c:338 src/sizeutil.c:32
-msgid "KB"
+#: src/dpformat.c:55
+msgid "I"
 msgstr ""
 
-#: src/dpformat.c:343 src/sizeutil.c:33
-msgid "MB"
+#: src/dpformat.c:56
+msgid "URI"
 msgstr ""
 
-#: src/dpformat.c:348 src/sizeutil.c:31
-msgid "GB"
+#: src/dpformat.c:56
+msgid "URI (without file prefix)"
 msgstr ""
 
-#: src/errors.c:69
+#: src/errors.c:59
 #, c-format
 msgid "Couldn't %s \"%s\": %s (code %d)"
 msgstr "Konnte nicht %s \"%s\": %s (code %d)"
 
-#: src/errors.c:71
+#: src/errors.c:61
 #, c-format
 msgid "Couldn't %s \"%s\" (code %d)"
 msgstr "Konnte nicht %s \"%s\" (code %d)"
 
-#: src/errors.c:76
+#: src/errors.c:66
 #, c-format
 msgid "Couldn't %s \"%s\""
 msgstr "Konnte nicht %s \"%s\""
 
-#: src/errors.c:78
+#: src/errors.c:68
 #, c-format
 msgid "Couldn't %s"
 msgstr "Konnte nicht %s"
 
-#: src/gentoo.c:421
+#: src/errors.c:88
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: src/gentoo.c:427
 msgid "Report the version to standard output, and exit."
 msgstr "Gib die Version auf der Standard-Ausgabe aus und beende."
 
-#: src/gentoo.c:423
+#: src/gentoo.c:429
 #, fuzzy
 msgid "Report internal locale details, and exit."
 msgstr "Berichtet interne lokale Details und beendet."
 
-#: src/gentoo.c:425
+#: src/gentoo.c:431
 msgid "Allows gentoo to be run by the root user. Could be dangerous."
 msgstr ""
-"Erlaubt gentoo, vom root-Benutzer gestartet zu werden. Könnte gefährlich "
+"Erlaubt gentoo, vom root-Benutzer gestartet zu werden. KÃ¶nnte gefÃ¤hrlich "
 "sein."
 
-#: src/gentoo.c:426
+#: src/gentoo.c:432
 msgid ""
 "Do not load the ~/.gentoorc configuration file; instead, use default values."
 msgstr ""
 "Benutze Standard-Werte, anstatt die Konfigurationsdatei ~/.gentoorc zu laden."
 
-#: src/gentoo.c:427
+#: src/gentoo.c:433
 msgid ""
 "Do not load the ~/.gentoogtkrc GTK+ configuration file; instead, use system "
 "defaults."
@@ -2376,308 +2394,304 @@
 "Benutze Standard-Werte, anstatt die GTK+ Konfigurationsdatei ~/.gentoogtkrc "
 "zu laden."
 
-#: src/gentoo.c:429
-msgid "Do not use FAM to automatically detect changes in viewed directories."
+#: src/gentoo.c:434
+#, fuzzy
+msgid ""
+"Run COMMAND, a gentoo command. Done before user interaction allowed, but "
+"after configuration file has been read in. Can be used many times to run "
+"several commands in sequence."
 msgstr ""
-"Kein FAM benutzen um automatisch Änderungen in angezeigten Verzeichnissen "
-"anzuzeigen."
+"FÃ¼hre ARG, einen gentoo-Befehl aus. Wird ausgefÃ¼hrt, bevor "
+"Benutzerinteraktion mÃ¶glich ist, aber nachdem die Konfigurationsdatei "
+"eingelesen wurde. Kann mehrfach benutzt werden, um verschiedene Kommandos in "
+"Folge auszufÃ¼hren."
 
-#: src/gentoo.c:431
+#: src/gentoo.c:435
+msgid "COMMAND"
+msgstr ""
+
+#: src/gentoo.c:436 src/gentoo.c:437
+msgid "DIR"
+msgstr ""
+
+#: src/gentoo.c:436
+#, fuzzy
 msgid ""
-"Use ARG as path for the left directory pane. Overrides default (and history)."
+"Use DIR as path for the left directory pane. Overrides default (and history)."
 msgstr ""
-"Benutze ARG als Pfad für das linke Verzeichniss-Fenster. Setzt Standard und "
-"Verlauf außer Kraft."
+"Benutze ARG als Pfad fÃ¼r das linke Verzeichnis-Fenster. Setzt Standard und "
+"Verlauf auÃer Kraft."
 
-#: src/gentoo.c:432
+#: src/gentoo.c:437
+#, fuzzy
 msgid ""
-"Use ARG as path for the right directory pane. Overrides default (and "
+"Use DIR as path for the right directory pane. Overrides default (and "
 "history)."
 msgstr ""
-"Benutze ARG als Pfad für das rechte Verzeichniss-Fenster. Setzt Standard und "
-"Verlauf außer Kraft."
+"Benutze ARG als Pfad fÃ¼r das rechte Verzeichnis-Fenster. Setzt Standard und "
+"Verlauf auÃer Kraft."
 
-#: src/gentoo.c:433
-msgid ""
-"Run ARG, a gentoo command. Done before user interaction allowed, but after "
-"configuration file has been read in. Can be used many times to run several "
-"commands in sequence."
+#: src/gentoo.c:461
+msgid "- a graphical file manager using GTK+"
+msgstr ""
+
+#: src/gentoo.c:466
+#, c-format
+msgid "Failed to parse command line options: %s\n"
 msgstr ""
-"Führe ARG, einen gentoo-Befehl aus. Wird ausgeführt, bevor "
-"Benutzerinteraktion möglich ist, aber nachdem die Konfigurationsdatei "
-"eingelesen wurde. Kann mehrfach benutzt werden, um verschiedene Kommandos in "
-"Folge auszuführen."
 
-#: src/gentoo.c:492
+#: src/gentoo.c:506
 #, c-format
 msgid "%s: To run as root, envoke with the '--root-ok' option\n"
-msgstr "%s: Um als root auszuführen mit der Option '--root-ok' aufrufen\n"
+msgstr "%s: Um als root auszufÃ¼hren mit der Option '--root-ok' aufrufen\n"
 
-#: src/gentoo.c:524
+#: src/gentoo.c:538
 msgid "Couldn't initialize userinfo module - username resolving won't work"
 msgstr ""
-"Konnte Benutzer-Info-Modul nicht initialisieren - Benutzernamen-Auflösung "
+"Konnte Benutzer-Info-Modul nicht initialisieren - Benutzernamen-AuflÃ¶sung "
 "wird nicht funktionieren"
 
-#: src/gentoo.c:529
-msgid "Couldn't initialize mount data - automounting won't work"
-msgstr ""
-"Konnte Mount-Daten nicht initialisieren - automounting wird nicht "
-"funktionieren"
-
-#: src/gentoo.c:560
+#: src/gentoo.c:570
 #, c-format
 msgid "gentoo v%s by Emil Brink <emil@obsession.se>"
 msgstr "gentoo v%s von Emil Brink <emil@obsession.se>"
 
-#: src/gfam.c:216
-#, c-format
-msgid "FAM open failed, error %d--FAM will not be used"
-msgstr "FAM öffnen fehlgeschlagen, Fehler %d--FAM wird nicht benutzt"
-
-#: src/gfam.c:235
-#, fuzzy, c-format
-msgid ""
-"Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, perhaps)"
+#: src/gentoo.c:577
+msgid "Development Version Warning"
 msgstr ""
-"Konnte FAM-Monitor nicht auf \"%s\" hinzufügen, Fehler %s (mit --no-fam um "
-"zu umgehen)"
 
-#: src/gfam.c:241
-#, fuzzy, c-format
+#: src/gentoo.c:577
 msgid ""
-"Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go around, "
-"perhaps)"
+"This version of gentoo is considered somewhat new and untested. There have "
+"been major changes to almost all parts of the program since the previous "
+"version. Please be a bit careful, and make sure you report any problem to "
+"the author. Thanks."
 msgstr ""
-"Konnte FAM-Monitor nicht auf \"%s\" hinzufügen, Fehler %s (mit --no-fam um "
-"zu umgehen)"
 
-#: src/guiutil.c:118
+#: src/guiutil.c:124
 msgid "Progress"
 msgstr "Fortschritt"
 
 #: src/icon_dialog.c:52
 msgid "Pick Icon"
-msgstr "Symbol wählen"
+msgstr "Symbol wÃ¤hlen"
 
 #: src/icon_dialog.c:59
 msgid "Loading Icon Graphics..."
 msgstr "Lade Symbol-Grafiken..."
 
-#: src/menus.c:278
+#: src/menus.c:284
 msgid "(No Selection)"
 msgstr "(Keine Auswahl)"
 
-#: src/menus.c:514
+#: src/menus.c:521
 msgid "RegExp..."
 msgstr "RegAusdr..."
 
-#: src/menus.c:526
+#: src/menus.c:533
 msgid "Other"
-msgstr "Aus anderem Fenster übernehmen"
+msgstr "Aus anderem Fenster Ã¼bernehmen"
 
-#: src/menus.c:527
+#: src/menus.c:534
 msgid "Rescan"
 msgstr "Aktualisieren"
 
-#: src/menus.c:528
+#: src/menus.c:535
 msgid "Select"
-msgstr "Auswählen"
+msgstr "AuswÃ¤hlen"
 
-#: src/menus.c:532
+#: src/menus.c:539
 msgid "Run..."
-msgstr "Ausführen..."
+msgstr "AusfÃ¼hren..."
 
-#: src/menus.c:534
+#: src/menus.c:541
 msgid "Configure..."
 msgstr "Konfigurieren..."
 
-#: src/menus.c:610
+#: src/menus.c:618
 msgid "Select Menu"
-msgstr "Menü auswählen"
-
-#: src/mount.c:222
-#, c-format
-msgid "Execution of \"%s %s\" failed:\n"
-msgstr "Ausführen von \"%s %s\" fehlgeschlagen:\n"
+msgstr "MenÃ¼ auswÃ¤hlen"
 
-#: src/mount.c:318
-#, c-format
-msgid "Mounting \"%s\" on \"%s\"..."
-msgstr "Mounte \"%s\" nach \"%s\"..."
+#: src/nag_dialog.c:37
+msgid "_Don't show this dialog again"
+msgstr ""
 
 #: src/overwrite.c:49
 msgid "_OK|A_ll|_Skip|Skip _All|_Cancel"
-msgstr "_OK|A_lle|_Überspringen|_Alle überspringen|A_bbrechen"
-
-#: src/overwrite.c:73
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Old: %%%s bytes, changed on %%s,\n"
-"New: %%%s bytes, changed on %%s."
-msgstr ""
-"\n"
-"Alt: %Lu Bytes, geändert %s.\n"
-"Neu: %Lu Bytes, geändert %s."
+msgstr "_OK|A_lle|_Ãberspringen|_Alle Ã¼berspringen|A_bbrechen"
 
-#: src/progress.c:195
+#: src/progress.c:196
 #, c-format
 msgid "Total (%s)"
 msgstr "Gesamt (%s)"
 
-#: src/progress.c:315
+#: src/progress.c:305
 #, c-format
 msgid "Elapsed %02d:%02d  Speed %s/s  ETA %02u:%02u"
 msgstr "Verstrichen %02d:%02d  Geschwindigkeit %s/s  GVZ %02u:%02u"
 
-#: src/sizeutil.c:30
-msgid "BYTES"
-msgstr ""
+#: src/sizeutil.c:31
+#, fuzzy
+msgid "Unformatted Size"
+msgstr "Formatierte GrÃ¶Ãe, in Bytes"
 
-#: src/sizeutil.c:69
-#, c-format
-msgid "%%%s"
-msgstr ""
+#: src/sizeutil.c:32
+#, fuzzy
+msgid "Formatted Size, Without Unit"
+msgstr "Formatierte GrÃ¶Ãe, \"Schlaue\" Einheit"
 
-#: src/sizeutil.c:70
-#, fuzzy, c-format
-msgid "%%%s bytes"
-msgstr "%Lu Bytes"
+#: src/sizeutil.c:33
+#, fuzzy
+msgid "Formatted Size, in Bytes"
+msgstr "Formatierte GrÃ¶Ãe, in Bytes"
 
-#: src/sizeutil.c:71
-#, c-format
-msgid "%%%s KB"
-msgstr ""
+#: src/sizeutil.c:33 src/sizeutil.c:159
+#, fuzzy
+msgid "bytes"
+msgstr "Ja"
 
-#: src/sizeutil.c:72
-#, c-format
-msgid "%%%s MB"
-msgstr ""
+#: src/sizeutil.c:34
+#, fuzzy
+msgid "Formatted Size, in Kilobytes"
+msgstr "Formatierte GrÃ¶Ãe, in Kilobytes"
 
-#: src/sizeutil.c:73
-#, c-format
-msgid "%%%s GB"
+#: src/sizeutil.c:34 src/sizeutil.c:163
+msgid "KB"
 msgstr ""
 
-#: src/sizeutil.c:164 src/sizeutil.c:211
-#, c-format
-msgid "%.2f KB"
+#: src/sizeutil.c:35
+#, fuzzy
+msgid "Formatted Size, in Megabytes"
+msgstr "Formatierte GrÃ¶Ãe, in Megabytes"
+
+#: src/sizeutil.c:35 src/sizeutil.c:167
+msgid "MB"
 msgstr ""
 
-#: src/sizeutil.c:170 src/sizeutil.c:217
-#, c-format
-msgid "%.2f MB"
+#: src/sizeutil.c:36
+#, fuzzy
+msgid "Formatted Size, in Gigabytes"
+msgstr "Formatierte GrÃ¶Ãe, in Gigabytes"
+
+#: src/sizeutil.c:36 src/sizeutil.c:171
+msgid "GB"
 msgstr ""
 
-#: src/sizeutil.c:176 src/sizeutil.c:223
-#, c-format
-msgid "%.2f GB"
+#: src/sizeutil.c:37
+#, fuzzy
+msgid "Formatted Size, in Terabytes"
+msgstr "Formatierte GrÃ¶Ãe, in Megabytes"
+
+#: src/sizeutil.c:37 src/sizeutil.c:175
+msgid "TB"
 msgstr ""
 
+#: src/sizeutil.c:38
+#, fuzzy
+msgid "Formatted Size, Automatic Unit"
+msgstr "Formatierte GrÃ¶Ãe, \"Schlaue\" Einheit"
+
 #: src/style_dialog.c:40
 msgid "Select Style"
-msgstr "Stil auswählen"
+msgstr "Stil auswÃ¤hlen"
 
-#: src/styles.c:112
+#: src/styles.c:114
 msgid "Root"
 msgstr ""
 
-#: src/styles.c:118 src/types.c:485 src/types.c:488
+#: src/styles.c:120 src/types.c:292 src/types.c:295
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: src/styles.c:961
+#: src/styles.c:889
 msgid "New Style"
 msgstr "Neuer Stil"
 
-#: src/styles.c:961
+#: src/styles.c:889
 #, c-format
 msgid "New Style %u"
 msgstr "Neuer Stil %u"
 
-#: src/textview.c:152
+#: src/textview.c:190
 #, c-format
-msgid "Unable to convert text from native character set (%s) to UTF-8: %s"
+msgid ""
+"\n"
+"** Text conversion from charset '%s' failed, aborting."
 msgstr ""
 
-#: src/textview.c:252 src/textview.c:353
-msgid "File reading"
-msgstr "Datei lesen"
-
-#: src/textview.c:419
+#: src/textview.c:405
 #, c-format
 msgid "Line %d (%.0f%%)"
 msgstr "Zeile %d (%.0f%%)"
 
-#: src/textview.c:472
+#: src/textview.c:455
 msgid "Enter Line Number or Percentage:"
 msgstr "Zeilennummer oder Prozent eingeben:"
 
-#: src/textview.c:478
+#: src/textview.c:461
 msgid "Goto"
 msgstr "Gehe zu"
 
-#: src/textview.c:613
+#: src/textview.c:596
 msgid "Enter Text to Search For (RE)"
 msgstr "Such-Text eingeben (RE)"
 
-#: src/textview.c:623
+#: src/textview.c:607
 msgid "Don't Span Newlines?"
 msgstr ""
 
-#: src/textview.c:629
+#: src/textview.c:613
 msgid "Search"
 msgstr "Suchen"
 
-#: src/types.c:454
+#: src/types.c:287
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: src/types.c:572
 #, c-format
 msgid ""
 "Got SIGPIPE when writing to 'file' process (%s), it seems to have terminated "
 "prematurely."
 msgstr ""
 
-#: src/types.c:461
+#: src/types.c:578
 msgid "Unable to run spawn 'file' command: "
 msgstr ""
 
-#: src/types.c:480
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: src/window.c:82
+#: src/window.c:83
 msgid "Configure gentoo"
 msgstr "gentoo konfigurieren"
 
-#: src/window.c:89
+#: src/window.c:90
 msgid "Text Viewer"
 msgstr "Text-Anzeiger"
 
-#: src/window.c:200
+#: src/window.c:199
 msgid "Position"
 msgstr "Position"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Height"
-msgstr "Höhe"
+msgstr "HÃ¶he"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "X"
 msgstr "X"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Y"
 msgstr "Y"
 
-#: src/window.c:208
+#: src/window.c:207
 msgid "Set on Open?"
-msgstr "Beim Öffnen setzen?"
+msgstr "Beim Ãffnen setzen?"
 
-#: src/window.c:214
+#: src/window.c:213
 msgid "Update on Close?"
-msgstr "Beim schließen aktualisieren?"
+msgstr "Beim schlieÃen aktualisieren?"
 
-#: src/window.c:245
+#: src/window.c:244
 msgid "Grab"
 msgstr "Aktuelle"
 
@@ -2685,19 +2699,214 @@
 msgid "XML module emitted locale-dependant real number"
 msgstr ""
 
+#~ msgid "Use Dialog to Report Errors?"
+#~ msgstr "Dialog benutzen um Fehler zu melden?"
+
+#~ msgid "Path Right Click"
+#~ msgstr "Pfad fÃ¼r Rechtsklick"
+
+#~ msgid "Raw Size, in Bytes"
+#~ msgstr "RohgrÃ¶Ãe, in Bytes"
+
+#~ msgid "Always Set"
+#~ msgstr "Immer gesetzt"
+
+#~ msgid "Modify 'Control' Key State"
+#~ msgstr "Status der 'Steuerungs'-Taste"
+
+#~ msgid "Active Pane Titles"
+#~ msgstr "Aktive Fenster-Titel"
+
+#~ msgid "Focused Row, Unselected"
+#~ msgstr "Fokussierte, nicht-ausgewÃ¤hlte Reihe"
+
+#~ msgid "Focused Row, Selected"
+#~ msgstr "Fokussierte, ausgewÃ¤hlte Reihe"
+
+#~ msgid "Beta Software"
+#~ msgstr "Beta Software"
+
+#~ msgid "Next Version?"
+#~ msgstr "NÃ¤chste Version?"
+
+#~ msgid ""
+#~ "This splitting mode has not been\n"
+#~ "implemented yet... Sorry."
+#~ msgstr ""
+#~ "Dieser aufteilungs-Modus wurde noch\n"
+#~ "nicht implementiert... Sorry."
+
+#, fuzzy
+#~ msgid ""
+#~ "Case-sensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr ""
+#~ "Sortieren nach GroÃ-/Kleinschreibung wird mit nicht-ASCII-Symbolen nicht "
+#~ "richtig funktionieren"
+
+#, fuzzy
+#~ msgid ""
+#~ "Case-insensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr ""
+#~ "Sortieren ohne GroÃ-/Kleinschreibung wird mit nicht-ASCII-Symbolen nicht "
+#~ "richtig funktionieren"
+
+#, fuzzy
+#~ msgid "%%%s bytes"
+#~ msgstr "%Lu Bytes"
+
+#~ msgid "Numerical Mode?"
+#~ msgstr "Numerischer Modus?"
+
+#~ msgid "Never"
+#~ msgstr "Nie"
+
+#~ msgid "On Every Access"
+#~ msgstr "Bei jedem Zugriff"
+
+#~ msgid "Mounting"
+#~ msgstr "Mounten"
+
+#~ msgid "Mount When?"
+#~ msgstr "Wann mounten?"
+
+#~ msgid "Mount Options"
+#~ msgstr "Mount-Optionen"
+
+#~ msgid "Mount Command"
+#~ msgstr "Mount-Befehl"
+
+#~ msgid "Unmount Command"
+#~ msgstr "Unmount-Befehl"
+
+#~ msgid "Only Mount on Toplevel Directories?"
+#~ msgstr "Nur bei Verzeichnissen hÃ¶chster Ebene mounten?"
+
+#~ msgid "Use Command Error Dialog?"
+#~ msgstr "Kommando-Fehler-Dialog benutzen?"
+
+#~ msgid "Unmount When gentoo Quits?"
+#~ msgstr "Beim Beenden unmounten?"
+
+#~ msgid "FAM: Supported and active."
+#~ msgstr "FAM: UnterstÃ¼zt und aktiviert."
+
+#~ msgid "FAM: Supported, but not active."
+#~ msgstr "FAM: UnterstÃ¼tzt, aber nicht aktiviert."
+
+#~ msgid "FAM: Not supported."
+#~ msgstr "FAM: Nicht unterstÃ¼tzt."
+
+#~ msgid ""
+#~ "Can't copy directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "Konnte Verzeichnis \"%s\"\n"
+#~ "nicht nach \"%s\" kopieren:\n"
+#~ "die Quelle enthÃ¤lt das Ziel."
+
+#~ msgid "Wrap Around At Top And Bottom?"
+#~ msgstr "Von oben nach unten springen und umgekehrt?"
+
+#~ msgid ""
+#~ "%s (%s bytes,\n"
+#~ "%s blocks)"
+#~ msgstr ""
+#~ "%s (%s Bytes,\n"
+#~ "%s BlÃ¶cke)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "Konnte Verzeichnis \"%s\"\n"
+#~ "nicht nach \"%s\" verschieben:\n"
+#~ "die Quelle enthÃ¤lt das Ziel."
+
+#, fuzzy
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the destination contains the source."
+#~ msgstr ""
+#~ "Konnte Verzeichnis \"%s\"\n"
+#~ "nicht nach \"%s\" verschieben:\n"
+#~ "die Quelle enthÃ¤lt das Ziel."
+
+#~ msgid "Regular expression error:\n"
+#~ msgstr "Fehler im RegulÃ¤ren Ausdruck:\n"
+
+#~ msgid "Use mmap() to Speed Loading?"
+#~ msgstr "mmap() fÃ¼r schnelles Laden benutzen?"
+
+#, fuzzy
+#~ msgid " (%%s/%%s, %%%s/%%%s blocks)"
+#~ msgstr " (%s/%s, %Lu/%Lu BlÃ¶cke)"
+
+#~ msgid ""
+#~ "Do not use FAM to automatically detect changes in viewed directories."
+#~ msgstr ""
+#~ "Kein FAM benutzen um automatisch Ãnderungen in angezeigten Verzeichnissen "
+#~ "anzuzeigen."
+
+#~ msgid "Couldn't initialize mount data - automounting won't work"
+#~ msgstr ""
+#~ "Konnte Mount-Daten nicht initialisieren - automounting wird nicht "
+#~ "funktionieren"
+
+#~ msgid "FAM open failed, error %d--FAM will not be used"
+#~ msgstr "FAM Ã¶ffnen fehlgeschlagen, Fehler %d--FAM wird nicht benutzt"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, "
+#~ "perhaps)"
+#~ msgstr ""
+#~ "Konnte FAM-Monitor nicht auf \"%s\" hinzufÃ¼gen, Fehler %s (mit --no-fam "
+#~ "um zu umgehen)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go "
+#~ "around, perhaps)"
+#~ msgstr ""
+#~ "Konnte FAM-Monitor nicht auf \"%s\" hinzufÃ¼gen, Fehler %s (mit --no-fam "
+#~ "um zu umgehen)"
+
+#~ msgid "Execution of \"%s %s\" failed:\n"
+#~ msgstr "AusfÃ¼hren von \"%s %s\" fehlgeschlagen:\n"
+
+#~ msgid "Mounting \"%s\" on \"%s\"..."
+#~ msgstr "Mounte \"%s\" nach \"%s\"..."
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Old: %%%s bytes, changed on %%s,\n"
+#~ "New: %%%s bytes, changed on %%s."
+#~ msgstr ""
+#~ "\n"
+#~ "Alt: %Lu Bytes, geÃ¤ndert %s.\n"
+#~ "Neu: %Lu Bytes, geÃ¤ndert %s."
+
+#~ msgid "File reading"
+#~ msgstr "Datei lesen"
+
 #, fuzzy
 #~ msgid "Pick Command ..."
-#~ msgstr "Code auswählen"
+#~ msgstr "Code auswÃ¤hlen"
 
 #~ msgid "Clr"
-#~ msgstr "Löschen"
+#~ msgstr "LÃ¶schen"
 
 #, fuzzy
 #~ msgid "Buffer Size for mmap()"
-#~ msgstr "Puffer-Größe"
+#~ msgstr "Puffer-GrÃ¶Ãe"
 
 #~ msgid "%s: Couldn't set text domain to \"%s\"\n"
-#~ msgstr "%s: Konnte die Text-Domäne nicht auf \"%s\" setzen\n"
+#~ msgstr "%s: Konnte die Text-DomÃ¤ne nicht auf \"%s\" setzen\n"
 
 #~ msgid "Top"
 #~ msgstr "Spitze"
@@ -2718,7 +2927,7 @@
 
 #, fuzzy
 #~ msgid "SelectShell"
-#~ msgstr "Auswählen"
+#~ msgstr "AuswÃ¤hlen"
 
 #~ msgid "Close"
-#~ msgstr "Schließen"
+#~ msgstr "SchlieÃen"

gentoo-0.19.9.tar.gz/po/es.gmo Added

gentoo-0.19.9.tar.gz/po/es.po Added

@@ -0,0 +1,2863 @@
+# translation of de.po to Spanish
+# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Emil Brink.
+# Innocent De Marchi <tangram.peces@gmail.com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gentoo\n"
+"Report-Msgid-Bugs-To: Emil Brink\n"
+"POT-Creation-Date: 2011-01-26 21:54+0100\n"
+"PO-Revision-Date: 2011-01-26 19:14+0100\n"
+"Last-Translator: Innocent De Marchi <tangram.peces@gmail.com>\n"
+"Language-Team: Innocent De Marchi <tangram.peces@gmail.com>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Spanish\n"
+"X-Poedit-Country: SPAIN\n"
+
+#: src/cfg_buttonlayout.c:65
+msgid "Left of Command Buttons"
+msgstr "A la izquierda de los botones de comandos"
+
+#: src/cfg_buttonlayout.c:65
+msgid "Right of Command Buttons"
+msgstr "A la derecha de los botones de comandos"
+
+#: src/cfg_buttonlayout.c:66
+msgid "No Padding"
+msgstr "Estático (sin separación)"
+
+#: src/cfg_buttonlayout.c:66
+msgid "Paned"
+msgstr "Panel"
+
+#: src/cfg_buttonlayout.c:66
+msgid "Static"
+msgstr "Estatico"
+
+#: src/cfg_buttonlayout.c:75
+msgid ""
+"This page lets you control how the Shortcuts button sheet is positioned "
+"relative to\n"
+"the one holding the main Command Buttons. It is more or less a place-holder; "
+"the plan\n"
+"is to provide a lot more flexibility in the button management, and also to "
+"support the\n"
+"creation of more than these two built-in sheets of buttons. But that has yet "
+"to happen.\n"
+"\n"
+"In the meantime, this provides the functionality that was present when the "
+"Shortcuts\n"
+"were a special feature with their own configuration page (up to and "
+"including version\n"
+"0.11.24 of gentoo), for your convenience.\n"
+"\n"
+"To find the Shortcut sheet, switch to the Definitions page, and use the "
+"option menu widget\n"
+"in the top left corner of the page."
+msgstr ""
+"Esta página te permite controlar la forma de ubicarse del panel de Funciones "
+"Rápidas en relación al\n"
+"panel que contiene los Botones de Comandos. Es una clase de anclaje; el "
+"plan\n"
+"es proveer de mucha mayor flexibilidad en la administración de botones y "
+"soportar la\n"
+"creación de más paneles de botones integrados en el programa. Pero eso aún "
+"esta por venir.\n"
+"\n"
+"Por lo pronto, provee la funcionalidad que estaba presente cuando las "
+"funciones rápidas\n"
+"eran una función especial con su propia página de configuración (hasta la "
+"versión 0.11.24 de gentoo, incluida), para tu conveniencia.\n"
+"\n"
+"Para encontrar el panel de funciones rápidas, cambia a la página de "
+"Definiciones y usa la opción entrada del menu\n"
+"en la esquina superior izquierda de la página."
+
+#: src/cfg_buttonlayout.c:88
+msgid "Shortcut Sheet Position"
+msgstr "Posición del panel de Funciones Rápidas"
+
+#: src/cfg_buttonlayout.c:102
+msgid "Separation Style"
+msgstr "Estilo de espacio intermedio"
+
+#: src/cfg_buttonlayout.c:116
+msgid "Layout"
+msgstr "Posición"
+
+#: src/cfg_buttons.c:308
+msgid "Set Row Width"
+msgstr "Establecer Ancho de Fila"
+
+#: src/cfg_buttons.c:326 src/cfg_buttons.c:748
+msgid "Default"
+msgstr "Predeterminado"
+
+#: src/cfg_buttons.c:439 src/overwrite.c:49
+msgid "Please Confirm"
+msgstr "Por favor, confirme"
+
+#: src/cfg_buttons.c:439
+msgid "Really delete current button row?"
+msgstr "¿Está seguro que desea borrar la fila de botones seleccionada?"
+
+#: src/cfg_buttons.c:439 src/cfg_styles.c:680
+msgid "_Delete|_Cancel"
+msgstr "_Borrar|_Cancelar"
+
+#: src/cfg_buttons.c:463
+msgid "Select Width for New Row"
+msgstr "Seleccionar el ancho de la nueva fila"
+
+#: src/cfg_buttons.c:466
+msgid "Change Width of Row"
+msgstr "Cambiar el ancho de la fila"
+
+#: src/cfg_buttons.c:609
+msgid "Edit Background Color"
+msgstr "Cambiar el color del fondo"
+
+#: src/cfg_buttons.c:653
+msgid "Edit Foreground Color"
+msgstr "Cambiar el color del primer plano"
+
+#: src/cfg_buttons.c:678
+msgid "Label"
+msgstr "Etiqueta"
+
+#: src/cfg_buttons.c:686 src/cfg_controls.c:612 src/cfg_controls.c:663
+#: src/cfg_controls.c:685
+msgid "Command"
+msgstr "Orden"
+
+#: src/cfg_buttons.c:697 src/cfg_controls.c:606
+msgid "Key"
+msgstr "Tecla"
+
+#: src/cfg_buttons.c:712
+msgid "Colors"
+msgstr "Colores"
+
+#: src/cfg_buttons.c:716
+msgid "Background..."
+msgstr "Fondo..."
+
+#: src/cfg_buttons.c:717 src/cfg_buttons.c:723
+msgid "Reset to Default"
+msgstr "Restablecer el predeterminado"
+
+#: src/cfg_buttons.c:722
+msgid "Foreground..."
+msgstr "Frente..."
+
+#: src/cfg_buttons.c:748
+msgid "Shortcuts"
+msgstr "Funciones rápidas"
+
+#: src/cfg_buttons.c:749
+msgid "Clear"
+msgstr "Limpiar"
+
+#: src/cfg_buttons.c:749
+msgid "Copy Colors To"
+msgstr "Copiar colores a"
+
+#: src/cfg_buttons.c:749
+msgid "Copy To"
+msgstr "Copiar a"
+
+#: src/cfg_buttons.c:749
+msgid "Swap With"
+msgstr "Cambiar con"
+
+#: src/cfg_buttons.c:750
+msgid "Add Row..."
+msgstr "Añadir fila..."
+
+#: src/cfg_buttons.c:750 src/cfg_cmdseq.c:966
+msgid "Delete Row"
+msgstr "Borrar fila"
+
+#: src/cfg_buttons.c:750
+msgid "Down"
+msgstr "Abajo"
+
+#: src/cfg_buttons.c:750
+msgid "Row Width..."
+msgstr "Ancho de fila"
+
+#: src/cfg_buttons.c:750
+msgid "Up"
+msgstr "Arriba"
+
+#: src/cfg_buttons.c:761
+msgid "Sheet"
+msgstr "Panel"
+
+#: src/cfg_buttons.c:775
+msgid "Primary"
+msgstr "Principal"
+
+#: src/cfg_buttons.c:777
+msgid "Secondary"
+msgstr "Secundario"
+
+#: src/cfg_buttons.c:782
+msgid "Tooltip"
+msgstr "Consejo"
+
+#: src/cfg_buttons.c:790 src/cfg_dirpane.c:1107
+msgid "Flags"
+msgstr "Banderas"
+
+#: src/cfg_buttons.c:792
+msgid "Narrow?"
+msgstr "¿Refinar?"
+
+#: src/cfg_buttons.c:796
+msgid "Show Tooltip?"
+msgstr "¿Mostrar consejo?"
+
+#: src/cfg_buttons.c:831
+msgid "Buttons"
+msgstr "Botones"
+
+#: src/cfg_buttons.c:832 src/cfg_cmdseq.c:1081
+msgid "Definitions"
+msgstr "Definiciones"
+
+#: src/cfg_cmdcfg.c:66
+msgid "Options"
+msgstr "Opciones"
+
+#: src/cfg_cmdseq.c:611
+msgid "Select Builtin"
+msgstr "Seleccionar predeterminado"
+
+#: src/cfg_cmdseq.c:627
+msgid "Opening brace"
+msgstr "Abriendo corchetes"
+
+#: src/cfg_cmdseq.c:628
+msgid "Closing brace"
+msgstr "Cerrando corchetes"
+
+#: src/cfg_cmdseq.c:629
+msgid "First selected"
+msgstr "El primero seleccionado"
+
+#: src/cfg_cmdseq.c:630
+msgid "First selected, unselect"
+msgstr "Seleccionado por primera vez, des-seleccionar"
+
+#: src/cfg_cmdseq.c:631
+msgid "First selected, with path"
+msgstr "El primero seleccionado, con ruta"
+
+#: src/cfg_cmdseq.c:632
+msgid "First selected, with path, unselect"
+msgstr "El primero seleccionado, con ruta, des-seleccionar"
+
+#: src/cfg_cmdseq.c:633
+msgid "First selected (destination pane)"
+msgstr "El primero seleccionado (panel de destino)"
+
+#: src/cfg_cmdseq.c:634
+msgid "First selected, no quotes"
+msgstr "El primero seleccionado sin comillas"
+
+#: src/cfg_cmdseq.c:635
+msgid "All selected"
+msgstr "Todos los seleccionados"
+
+#: src/cfg_cmdseq.c:636
+msgid "All selected, unselect"
+msgstr "Todos los seleccionados, des-seleccionar"
+
+#: src/cfg_cmdseq.c:637
+msgid "All selected, with paths"
+msgstr "Todos los seleccionados, con rutas"
+
+#: src/cfg_cmdseq.c:638
+msgid "All selected, with paths, unselect"
+msgstr "Todos los seleccionados, con rutas, des-seleccionar"
+
+#: src/cfg_cmdseq.c:639
+msgid "All selected (destination pane)"
+msgstr "Todos los seleccionados (panel de destino)"
+
+#: src/cfg_cmdseq.c:640
+msgid "All selected, no quotes"
+msgstr "Todos los seleccionados, no comillas"
+
+#: src/cfg_cmdseq.c:641
+msgid "Path to source pane's directory"
+msgstr "Ruta al directorio del panel de origen"
+
+#: src/cfg_cmdseq.c:642
+msgid "Path to destination pane's directory"
+msgstr "Ruta al directorio del panel de destino"
+
+#: src/cfg_cmdseq.c:643
+msgid "Path to home directory"
+msgstr "Ruta al directorio home"
+
+#: src/cfg_cmdseq.c:644
+msgid "Path of left pane"
+msgstr "Ruta del panel izquierdo"
+
+#: src/cfg_cmdseq.c:645
+msgid "Path of right pane"
+msgstr "Ruta del panel derecho"
+
+#: src/cfg_cmdseq.c:646
+msgid "URI of first selected"
+msgstr "URI del primero seleccionado"
+
+#: src/cfg_cmdseq.c:647
+msgid "URI of first selected, unselect"
+msgstr "URI del seleccionado por primera vez, des-seleccionado"
+
+#: src/cfg_cmdseq.c:648
+msgid "URI of first selected, no quotes"
+msgstr "URI del primero seleccionado sin comillas"
+
+#: src/cfg_cmdseq.c:649
+msgid "URIs of all selected"
+msgstr "URI de todos los seleccionados"
+
+#: src/cfg_cmdseq.c:650
+msgid "URIs of all selected, unselect"
+msgstr "URI de todos los seleccionados, des-seleccionados"
+
+#: src/cfg_cmdseq.c:651
+msgid "URIs of all selected, no quotes"
+msgstr "URI de todos los seleccionados, sin comillas"
+
+#: src/cfg_cmdseq.c:652
+msgid "URIs of all selected, unselect, no quotes"
+msgstr "URI de todos los seleccionados, sin comillas"
+
+#: src/cfg_cmdseq.c:653
+msgid "URI of first selected (destination pane)"
+msgstr "URI del primero seleccionado (panel de destino)"
+
+#: src/cfg_cmdseq.c:654
+msgid "Input combo box"
+msgstr "Caja de entrada"
+
+#: src/cfg_cmdseq.c:655
+msgid "Input using menu"
+msgstr "Entrada usando menú"
+
+#: src/cfg_cmdseq.c:656
+msgid "Input string"
+msgstr "Texto de entrada"
+
+#: src/cfg_cmdseq.c:657
+msgid "Input check button (gives TRUE or FALSE)"
+msgstr "Botón de opcion de entrada (da VERDADERO o FALSO)"
+
+#: src/cfg_cmdseq.c:658
+msgid "Add label to input window"
+msgstr "Agregar etiqueta a la ventana de entrada"
+
+#: src/cfg_cmdseq.c:659
+msgid "Add a separator bar to input window"
+msgstr "Agregar una barra de separación a la ventana de entrada"
+
+#: src/cfg_cmdseq.c:660
+msgid "$NAME"
+msgstr "$NAME"
+
+#: src/cfg_cmdseq.c:660
+msgid "Value of $NAME (environment)"
+msgstr "Valor de $NAME (entorno)"
+
+#: src/cfg_cmdseq.c:661
+msgid "gentoo's PID"
+msgstr "PID de gentoo"
+
+#: src/cfg_cmdseq.c:662
+msgid "Home directory for user NAME"
+msgstr "Directorio raiz del usuario <NOMBRE>"
+
+#: src/cfg_cmdseq.c:662
+msgid "~NAME"
+msgstr "~NOMBRE"
+
+#: src/cfg_cmdseq.c:686 src/cmd_split.c:536
+msgid "Pick Code"
+msgstr "Seleccionar código"
+
+#: src/cfg_cmdseq.c:778
+msgid "(No Options Available)"
+msgstr "(No hay opciones disponibles)"
+
+#: src/cfg_cmdseq.c:814
+msgid "Run in Background?"
+msgstr "¿Ejecutar en segundo plano?"
+
+#: src/cfg_cmdseq.c:818
+msgid "Kill Previous Instance?"
+msgstr "¿Matar la instancia anterior?"
+
+#: src/cfg_cmdseq.c:822
+msgid "Survive Quit?"
+msgstr "¿Sobrevivir a abandonar?"
+
+#: src/cfg_cmdseq.c:828
+msgid "Capture Output?"
+msgstr "¿Capturar Salida?"
+
+#: src/cfg_cmdseq.c:913
+msgid "Before Execution"
+msgstr "Previo a la ejecución"
+
+#: src/cfg_cmdseq.c:916
+msgid "Require Source Selection?"
+msgstr "¿Requerir selección del origen?"
+
+#: src/cfg_cmdseq.c:920
+msgid "Require Destination Selection?"
+msgstr "¿Requerir selección del destino?"
+
+#: src/cfg_cmdseq.c:926
+msgid "CD Source?"
+msgstr "¿CD Fuente?"
+
+#: src/cfg_cmdseq.c:929
+msgid "CD Destination?"
+msgstr "¿CD Destino?"
+
+#: src/cfg_cmdseq.c:937
+msgid "After Execution"
+msgstr "Posterior a la Ejecución"
+
+#: src/cfg_cmdseq.c:939
+msgid "Rescan Source?"
+msgstr "¿Actualizar el origen?"
+
+#: src/cfg_cmdseq.c:943
+msgid "Rescan Destination?"
+msgstr "¿Actualizar el destino?"
+
+#: src/cfg_cmdseq.c:957
+msgid "General"
+msgstr "General"
+
+#: src/cfg_cmdseq.c:960
+msgid "Before&After"
+msgstr "Antes&Después"
+
+#: src/cfg_cmdseq.c:965
+msgid "Built-In"
+msgstr "Predefinidos"
+
+#: src/cfg_cmdseq.c:965
+msgid "External"
+msgstr "Externas"
+
+#: src/cfg_cmdseq.c:966
+msgid "Add Row"
+msgstr "Agregar fila"
+
+#: src/cfg_cmdseq.c:966
+msgid "Duplicate"
+msgstr "Duplicar"
+
+#: src/cfg_cmdseq.c:993 src/cfg_styles.c:596 src/cfg_styles.c:823
+#: src/cfg_types.c:678 src/cmd_info.c:151 src/cmd_split.c:648
+#: src/cmd_symlink.c:213 src/dpformat.c:36
+msgid "Name"
+msgstr "Nombre"
+
+#: src/cfg_cmdseq.c:1004
+msgid "Definition"
+msgstr "Definición"
+
+#: src/cfg_cmdseq.c:1058
+msgid "Repeat Sequence Until No Source Selection?"
+msgstr "¿Repetir la secuencia hasta terminar con la seleccion de origen?"
+
+#: src/cfg_cmdseq.c:1070 src/cfg_controls.c:622 src/cfg_controls.c:673
+#: src/cfg_styles.c:853 src/cfg_types.c:776
+msgid "Add"
+msgstr "Agregar"
+
+#: src/cfg_cmdseq.c:1073 src/cfg_controls.c:625 src/cfg_controls.c:676
+#: src/cfg_styles.c:856 src/cfg_types.c:789
+msgid "Delete"
+msgstr "Borrar"
+
+#: src/cfg_cmdseq.c:1080
+msgid "Commands"
+msgstr "Órdenes"
+
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1288 src/cfg_dirpane.c:1293
+msgid "Left"
+msgstr "Izquierda"
+
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
+msgid "Middle"
+msgstr "Centro"
+
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1287 src/cfg_dirpane.c:1294
+msgid "Right"
+msgstr "Derecha"
+
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
+msgid "Wheel Down"
+msgstr "Bajar"
+
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
+msgid "Wheel Up"
+msgstr "Subir"
+
+#: src/cfg_controls.c:378
+msgid ""
+"The following modifier key(s) must\n"
+"be held down when the mouse button\n"
+"is clicked to trigger the command"
+msgstr ""
+"Las siguientes teclas de modificación deben\n"
+"mantenerse apretadas al hacer clic con el ratón\n"
+"para ejecutar la orden"
+
+#: src/cfg_controls.c:391
+msgid "Edit Modifiers"
+msgstr "Editar modificadores"
+
+#: src/cfg_controls.c:580
+msgid "Controls"
+msgstr "Controles"
+
+#: src/cfg_controls.c:587
+msgid "Global Keyboard Shortcuts"
+msgstr "Funciones rápidas del teclado globales"
+
+#: src/cfg_controls.c:632
+msgid "Dirpane Mouse Buttons"
+msgstr "Panel de control de los iconos del ratón"
+
+#: src/cfg_controls.c:657
+msgid "Button"
+msgstr "Botón"
+
+#: src/cfg_controls.c:660
+msgid "Edit Modifiers..."
+msgstr "Editar modificadores..."
+
+#: src/cfg_controls.c:683
+msgid "Click-M-Click Gesture"
+msgstr "Maniobra Clic-M-Clic"
+
+#: src/cfg_controls.c:693
+msgid "Time Limit"
+msgstr "Límite de tiempo"
+
+#: src/cfg_controls.c:704
+msgid "Ignore Num Lock For All Bindings?"
+msgstr "¿Ignorar el bloqueo numérico (tecla Bloq Num) para todos los enlaces?"
+
+#: src/cfg_controls.c:734
+msgid ""
+"Note: The mouse button control settings\n"
+"are ambiguous: the same button+modifier\n"
+"is used for more than one function. This\n"
+"might make their behaviour pretty weird..."
+msgstr ""
+"Nota: Las opciones para la configuración del botón del mouse\n"
+"son ambiguas: el mismo botón+modificador\n"
+"es usado para más de una función. Esto\n"
+"puede hacer que se comporten un poco extraño..."
+
+#: src/cfg_controls.c:738
+msgid "Warning"
+msgstr "Advertencia"
+
+#: src/cfg_controls.c:738 src/children.c:89 src/cmd_info.c:320
+msgid "_OK"
+msgstr "_De acuerdo"
+
+#: src/cfg_dirpane.c:333
+msgid "Append Type Character?"
+msgstr "¿Agregar caracter de tipo?"
+
+#: src/cfg_dirpane.c:336
+msgid "Append \"→ destination\" on Links?"
+msgstr "¿Agregar\"→ destino\" en enlaces?"
+
+#: src/cfg_dirpane.c:358
+msgid "Place Tick Every 3 Digits?"
+msgstr "¿Marca cada 3 dígitos?"
+
+#: src/cfg_dirpane.c:369
+msgid "Digits of Precision"
+msgstr "Digitos de precisión"
+
+#: src/cfg_dirpane.c:382
+msgid "Show Dir's File System Size?"
+msgstr "¿Mostrar el tamaño de los directorios del sistema de archivos?"
+
+#: src/cfg_dirpane.c:388 src/cfg_dirpane.c:392 src/cfg_dirpane.c:396
+#: src/cfg_dirpane.c:400 src/cfg_dirpane.c:404 src/cfg_dirpane.c:408
+#: src/cfg_dirpane.c:412 src/cfg_dirpane.c:416 src/cfg_dirpane.c:420
+#: src/cfg_dirpane.c:428
+msgid "Format"
+msgstr "Formato"
+
+#: src/cfg_dirpane.c:454
+#, c-format
+msgid "%s Settings"
+msgstr "%s Opciones"
+
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:970 src/cfg_dirpane.c:971
+#: src/cmd_select.c:381
+msgid "Content"
+msgstr "Contenido"
+
+#: src/cfg_dirpane.c:571
+msgid "Justification"
+msgstr "Justificación"
+
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:971
+msgid "Title"
+msgstr "Título"
+
+#: src/cfg_dirpane.c:571 src/window.c:200
+msgid "Width"
+msgstr "Ancho"
+
+#: src/cfg_dirpane.c:572
+msgid "Center"
+msgstr "Centro"
+
+#: src/cfg_dirpane.c:581
+msgid "Basic Settings"
+msgstr "Opciones básicas"
+
+#: src/cfg_dirpane.c:628
+msgid "Edit Column Content"
+msgstr "Editar el contenido de la columna"
+
+#: src/cfg_dirpane.c:970
+msgid "Default Title"
+msgstr "Título predeterminado"
+
+#: src/cfg_dirpane.c:996
+msgid "Directories First"
+msgstr "Directorios primero"
+
+#: src/cfg_dirpane.c:996
+msgid "Directories Last"
+msgstr "Directorios al final"
+
+#: src/cfg_dirpane.c:996
+msgid "Directories Mixed"
+msgstr "Mezclar directorios"
+
+#: src/cfg_dirpane.c:997
+msgid "Left of List"
+msgstr "A la izquierda de la lista"
+
+#: src/cfg_dirpane.c:997
+msgid "Right of List"
+msgstr "A la derecha de la lista"
+
+#: src/cfg_dirpane.c:997
+msgid "System Default"
+msgstr "Predeterminado del sistema"
+
+#: src/cfg_dirpane.c:998
+#, c-format
+msgid "Copy From %s"
+msgstr "Copiar desde %s"
+
+#: src/cfg_dirpane.c:998
+#, c-format
+msgid "Copy To %s"
+msgstr "Copiar a %s"
+
+#: src/cfg_dirpane.c:998
+#, c-format
+msgid "Swap With %s"
+msgstr "Intercambiar con %s"
+
+#: src/cfg_dirpane.c:1015
+msgid "Columns"
+msgstr "Columnas"
+
+#: src/cfg_dirpane.c:1020
+msgid "Available Content Types"
+msgstr "Tipos de contenido disponibles"
+
+#: src/cfg_dirpane.c:1037
+msgid "Selected Content Types"
+msgstr "Tipos de contenido seleccionados"
+
+#: src/cfg_dirpane.c:1049 src/cfg_styles.c:741
+msgid "Edit..."
+msgstr "Editar..."
+
+#: src/cfg_dirpane.c:1050 src/cmd_renamere.c:481
+msgid "Remove"
+msgstr "Eliminar"
+
+#: src/cfg_dirpane.c:1064
+msgid "Sorting"
+msgstr "Ordenar"
+
+#: src/cfg_dirpane.c:1067
+msgid "Sort On"
+msgstr "Orden por"
+
+#: src/cfg_dirpane.c:1071 src/cmd_split.c:590 src/dpformat.c:40
+#: src/dpformat.c:41
+msgid "Mode"
+msgstr "Modo"
+
+#: src/cfg_dirpane.c:1077
+msgid "Inverse Sorting?"
+msgstr "¿Orden inverso?"
+
+#: src/cfg_dirpane.c:1080 src/cfg_paths.c:228 src/cfg_types.c:744
+#: src/cmd_renamere.c:432 src/cmd_renamere.c:459 src/cmd_select.c:478
+#: src/textview.c:604
+msgid "Ignore Case?"
+msgstr "¿Ignorar mayúsculas/minúsculas?"
+
+#: src/cfg_dirpane.c:1088
+msgid "Default Directory"
+msgstr "Directorio predeterminado"
+
+#: src/cfg_dirpane.c:1094
+msgid "Grab Current"
+msgstr "Obtener el actual"
+
+#: src/cfg_dirpane.c:1097
+msgid "From History"
+msgstr "Desde historial"
+
+#: src/cfg_dirpane.c:1110
+msgid "Path Above?"
+msgstr "¿La ruta arriba?"
+
+#: src/cfg_dirpane.c:1114
+msgid "Hide Allowed?"
+msgstr "¿Permitir ocultar?"
+
+#: src/cfg_dirpane.c:1118
+msgid "Scrollbar Always?"
+msgstr "¿Siempre barra de desplazamiento?"
+
+#: src/cfg_dirpane.c:1122
+msgid "Huge Parent Button?"
+msgstr "¿Botón padre gigante?"
+
+#: src/cfg_dirpane.c:1127
+msgid "Set Custom Font?"
+msgstr "¿Quiere establecer la fuente personalizada?"
+
+#: src/cfg_dirpane.c:1140
+msgid "Scrollbar Position"
+msgstr "Barra de desplazamiento"
+
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
+msgid "Vertical"
+msgstr "Vertical"
+
+#: src/cfg_dirpane.c:1194
+msgid "Don't Track"
+msgstr "No Rastrear"
+
+#: src/cfg_dirpane.c:1194
+msgid "Ratio"
+msgstr "Proporción"
+
+#: src/cfg_dirpane.c:1194
+msgid "Size, Left Pane"
+msgstr "Tamaño, panel izquierdo"
+
+#: src/cfg_dirpane.c:1194
+msgid "Size, Right Pane"
+msgstr "Tamaño, panel derecho"
+
+#: src/cfg_dirpane.c:1198
+msgid "Pane Orientation"
+msgstr "Orientación del panel"
+
+#: src/cfg_dirpane.c:1212
+msgid "Split Tracking"
+msgstr "Rastrear división"
+
+#: src/cfg_dirpane.c:1235
+msgid "pixels"
+msgstr "pixeles"
+
+#: src/cfg_dirpane.c:1263
+msgid "Remember Selected Rows?"
+msgstr "¿Recordar las filas seleccionadas?"
+
+#: src/cfg_dirpane.c:1266
+msgid "Save History Lists?"
+msgstr "¿Guardar las listas de historial?"
+
+#: src/cfg_dirpane.c:1283 src/cfg_dirpane.c:1292
+msgid "Dir Panes"
+msgstr "Paneles de directorios"
+
+#: src/cfg_dirpane.c:1295
+msgid "Pane Split"
+msgstr "Separación de paneles"
+
+#: src/cfg_dirpane.c:1296
+msgid "History"
+msgstr "Historial"
+
+#: src/cfg_dirpane.c:1725
+msgid "'Blocks' Content Deprecated"
+msgstr "Contenido 'Bloques' obsoletas"
+
+#: src/cfg_dirpane.c:1726
+msgid ""
+"The 'Blocks' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
+"La columna de \"Blocks\" ya no se admite, \n"
+"pero la configuración sigue haciendo uso de ella. Se \n"
+"eliminará automáticamente."
+
+#: src/cfg_dirpane.c:1732
+msgid "'Block Size' Content Deprecated"
+msgstr "Contenido 'Block Size' obsoleto."
+
+#: src/cfg_dirpane.c:1733
+msgid ""
+"The 'Block Size' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
+"La columna 'Block Size'  ya no se utiliza, \n"
+"pero su configuración personalizada hace uso de esta opción.\n"
+"Se eliminará automáticamente."
+
+#: src/cfg_errors.c:48
+msgid "Errors"
+msgstr "Errores"
+
+#: src/cfg_errors.c:55
+msgid "Error and Status Message Display"
+msgstr "Presentación de mensages de error y de estado."
+
+#: src/cfg_errors.c:57
+msgid "Status Bar, Above Panes"
+msgstr "Barra de estado por encima de los paneles"
+
+#: src/cfg_errors.c:60
+msgid "Main Window's Title Bar"
+msgstr "Bara de título de la ventana principal."
+
+#: src/cfg_errors.c:63
+msgid "Separate Dialog"
+msgstr "Ventana de diálogo separada"
+
+#: src/cfg_errors.c:69
+msgid "Cause Console Beep on Error?"
+msgstr "¿Alarma en caso de error?"
+
+#: src/cfg_menus.c:44
+msgid "Menus"
+msgstr "Menús"
+
+#: src/cfg_nag.c:78
+#, c-format
+msgid ""
+"Click the button below to reset the %zu stored 'Don't show this dialog "
+"again' responses."
+msgstr ""
+"Haga clic en el botón para restablecer el %zu almacenado \"No volver a "
+"mostrar este cuadro de diálogo de nuevo\" respuestas."
+
+#: src/cfg_nag.c:100
+msgid "Nagging"
+msgstr "Persistente"
+
+#: src/cfg_nag.c:110
+msgid "Reset All"
+msgstr "Restablecer todo"
+
+#: src/cfg_paths.c:78
+msgid "Edit path"
+msgstr "Editar la ruta de directorio"
+
+#: src/cfg_paths.c:152
+msgid "Icons"
+msgstr "Íconos"
+
+#: src/cfg_paths.c:153
+msgid "GTK+ RC"
+msgstr "GTK+ RC"
+
+#: src/cfg_paths.c:154
+msgid "fstab"
+msgstr "fstab"
+
+#: src/cfg_paths.c:155
+msgid "mtab"
+msgstr "mtab"
+
+#: src/cfg_paths.c:157
+msgid "Beginning With Dot (.)"
+msgstr "Iniciando con punto (.)"
+
+#: src/cfg_paths.c:157
+msgid "Matching RE"
+msgstr "Coincidencias en ER"
+
+#: src/cfg_paths.c:157 src/cmd_chmod.c:252 src/menus.c:519
+msgid "None"
+msgstr "Ninguno"
+
+#: src/cfg_paths.c:163
+msgid "Paths & Hide"
+msgstr "Rutas y Esconder"
+
+#: src/cfg_paths.c:170
+msgid "Paths"
+msgstr "Rutas"
+
+#: src/cfg_paths.c:209
+msgid "Hide Entries"
+msgstr "Esconder entradas"
+
+#: src/cfg_styles.c:178 src/cfg_types.c:233 src/iconutil.c:31 src/menus.c:19
+msgid "(None)"
+msgstr "(Ninguno)"
+
+#: src/cfg_styles.c:199 src/cfg_styles.c:436 src/cfg_styles.c:785
+msgid "Delete Action"
+msgstr "Acción Borrar"
+
+#: src/cfg_styles.c:419 src/color_dialog.c:47
+msgid "Edit Color"
+msgstr "Editar Color"
+
+#: src/cfg_styles.c:436
+msgid "Revert to Inherited Command"
+msgstr "Restablecer orden heredada"
+
+#: src/cfg_styles.c:537
+msgid "Select Command ..."
+msgstr "Seleccionar orden ..."
+
+#: src/cfg_styles.c:601
+msgid "New Action Property"
+msgstr "Nueva propiedad de la ccción"
+
+#: src/cfg_styles.c:609
+msgid "something"
+msgstr "algo"
+
+#: src/cfg_styles.c:679
+msgid ""
+"Deleting this style will also delete\n"
+"all its children. Are you sure?"
+msgstr ""
+"Borrar este estilo borrará también\n"
+"todos sus hijos. ¿Está seguro?"
+
+#: src/cfg_styles.c:680
+msgid "Confirm Delete"
+msgstr "Confirmar eliminar"
+
+#: src/cfg_styles.c:703
+msgid "Background Color"
+msgstr "Color de fondo"
+
+#: src/cfg_styles.c:703
+msgid "Foreground Color"
+msgstr "Color de primer plano"
+
+#: src/cfg_styles.c:703 src/dpformat.c:55
+msgid "Icon"
+msgstr "Ícono"
+
+#: src/cfg_styles.c:705
+msgid "(Row Style Preview Text)"
+msgstr "(Texto para previsualizar el estilo de la fila)"
+
+#: src/cfg_styles.c:713 src/cmd_renameseq.c:358 src/cmd_split.c:656
+msgid "Preview"
+msgstr "Previsualizar"
+
+#: src/cfg_styles.c:737
+msgid "Override Parent's?"
+msgstr "¿Sobreescribir los padres?"
+
+#: src/cfg_styles.c:741
+msgid "Pick..."
+msgstr "Escoger..."
+
+#: src/cfg_styles.c:782
+msgid "Add Action..."
+msgstr "Agregar acción..."
+
+#: src/cfg_styles.c:829 src/menus.c:532
+msgid "Parent"
+msgstr "Padre"
+
+#: src/cfg_styles.c:840
+msgid "Inherited Properties"
+msgstr "Propiedades heredadas"
+
+#: src/cfg_styles.c:844
+msgid "Visual"
+msgstr "Visual"
+
+#: src/cfg_styles.c:846
+msgid "Actions"
+msgstr "Acciones"
+
+#: src/cfg_styles.c:863
+msgid "File Recognition"
+msgstr "Tipos de archivos"
+
+#: src/cfg_styles.c:864
+msgid "Styles"
+msgstr "Estilos"
+
+#: src/cfg_types.c:192
+#, c-format
+msgid "%s - Click to Change..."
+msgstr "%s - Clic para cambiar..."
+
+#: src/cfg_types.c:507
+msgid "(New Type)"
+msgstr "(Nuevo tipo)"
+
+#: src/cfg_types.c:646
+msgid "B-Dev"
+msgstr "B-Dev"
+
+#: src/cfg_types.c:646
+msgid "C-Dev"
+msgstr "C-Dev"
+
+#: src/cfg_types.c:646
+msgid "Dir"
+msgstr "Directorios"
+
+#: src/cfg_types.c:646
+msgid "FIFO"
+msgstr "FIFO"
+
+#: src/cfg_types.c:646
+msgid "File"
+msgstr "Archivo"
+
+#: src/cfg_types.c:646
+msgid "Link"
+msgstr "Enlace"
+
+#: src/cfg_types.c:646
+msgid "Socket"
+msgstr "Zócalo"
+
+#: src/cfg_types.c:647
+msgid "Readable"
+msgstr "Lectura"
+
+#: src/cfg_types.c:647
+msgid "SetGID"
+msgstr "Establecer GID"
+
+#: src/cfg_types.c:647
+msgid "SetUID"
+msgstr "Establecer UID"
+
+#: src/cfg_types.c:647 src/cmd_chmod.c:200
+msgid "Sticky"
+msgstr "Estatico (Sticky)"
+
+#: src/cfg_types.c:648
+msgid "Executable"
+msgstr "Ejecución"
+
+#: src/cfg_types.c:648
+msgid "Writable"
+msgstr "Escritura"
+
+#: src/cfg_types.c:649
+msgid "Match 'file' (RE)"
+msgstr "Identificar 'archivo' (ER)"
+
+#: src/cfg_types.c:649
+msgid "Match Name (RE)"
+msgstr "Identificar nombre (ER)"
+
+#: src/cfg_types.c:649
+msgid "Require Suffix"
+msgstr "Requerir extensión"
+
+#: src/cfg_types.c:687
+msgid "Identification"
+msgstr "Identificación"
+
+#: src/cfg_types.c:689
+msgid "Require Type"
+msgstr "Requerir iipo"
+
+#: src/cfg_types.c:703
+msgid "Require Protection"
+msgstr "Requerir protección"
+
+#: src/cfg_types.c:739
+msgid "Glob?"
+msgstr "¿Glob?"
+
+#: src/cfg_types.c:755
+msgid "Type's Style"
+msgstr "Estilo de tipos"
+
+#: src/cfg_types.c:757
+msgid "Style"
+msgstr "Estilo"
+
+#: src/cfg_types.c:797
+msgid "Types"
+msgstr "Tipos"
+
+#: src/cfg_windows.c:86
+msgid "Dialog Windows Center On Screen"
+msgstr "Ventanas de diálogo entradas en la pantalla"
+
+#: src/cfg_windows.c:86
+msgid "Dialog Windows Follow Mouse"
+msgstr "Las ventanas de diálogo siguen al puntero (ratón)"
+
+#: src/cfg_windows.c:86
+msgid "Dialog Windows Positioned by Window Manager"
+msgstr "Ventanas de diálogo colocadas por el gestor de ventanas"
+
+#: src/cfg_windows.c:94
+msgid "Windows"
+msgstr "Ventanas"
+
+#: src/cfg_windows.c:102
+msgid "Window Borders"
+msgstr "Limites de ventana"
+
+#: src/cfg_windows.c:118
+msgid "Dialog Positioning"
+msgstr "Posición de diálogos "
+
+#: src/children.c:88
+#, c-format
+msgid "Execution of \"%s\" Failed"
+msgstr "Falló la ejecución de \"%s\""
+
+#: src/children.c:89 src/dialog.c:290
+msgid "Error"
+msgstr "Error"
+
+#: src/children.c:227
+#, c-format
+msgid "Couldn't terminate child \"%s\" (pid=%d)--zombie alert"
+msgstr "No se pudo finalizar el proceso hijo \"%s\" (pid=%d)--alerta de zombie"
+
+#: src/cmd_about.c:54
+#, c-format
+msgid "Native CHARSET: \"%s\"."
+msgstr "CHARSET nativo: \"%s\"."
+
+#: src/cmd_about.c:68
+#, c-format
+msgid "Filename encoding: \"%s\"."
+msgstr "Nombre del archivo de codificación: \"%s\"."
+
+#: src/cmd_about.c:85
+#, c-format
+msgid "Version %s (GTK+ version %d.%d.%d)."
+msgstr "Versión %s (GTK+ versión %d.%d.%d)."
+
+#: src/cmd_about.c:97
+msgid "(c) 1998-2011 by Emil Brink, Obsession Development.\n"
+msgstr "(c) 1998-2011 por Emil Brink, Obsession Development.\n"
+
+#: src/cmd_about.c:99
+msgid ""
+"This is free software, and there is ABSOLUTELY NO\n"
+"WARRANTY. Read the file COPYING for more details.\n"
+msgstr ""
+"Este es software libre y no hay ABSOLUTAMENTE NINGUNA\n"
+"GARANTÍA. Lea el archivo COPYING para más detalles.\n"
+
+#: src/cmd_about.c:105
+msgid "NLS: Supported, using built-in English strings."
+msgstr "NLS: Soportado, usando cadenas de texto integrados en Inglés"
+
+#: src/cmd_about.c:118
+#, c-format
+msgid ""
+"The author of gentoo can be reached via Internet\n"
+"e-mail at <a href=\"mailto:%s\">%s</a>; feel free to let\n"
+"me know what you think of this software, give\n"
+"suggestions/bug reports, and so on.\n"
+"\n"
+"The latest release of gentoo can always be down-\n"
+"loaded from the official gentoo project homepage at\n"
+"<a href=\"%s\">%s</a>. New releases are\n"
+"typically announced on the Freshmeat service at\n"
+"<a href=\"http://freshmeat.net/\">freshmeat.net</a>."
+msgstr ""
+"El autor de gentoo puede ser contactado via Internet\n"
+"Correo electrónico: <a href=\"mailto:%s\">%s</a>; se agradecen \n"
+"opiniones, sugerencias/informes de errores y demás.\n"
+"\n"
+"Puede encontrar la última versión de gentoo\n"
+"en el sitio oficial del proyecto gentoo en\n"
+"<a href=\"%s\">%s</a>. Las actualizaciones\n"
+"son anunciadas en el servicio de Freshmeat en\n"
+"<a href=\"http://freshmeat.net/\">freshmeat.net</a>.."
+
+#: src/cmd_about.c:135
+msgid "About gentoo"
+msgstr "Acerca de gentoo"
+
+#: src/cmd_about.c:135
+msgid "_OK (Wait for More)"
+msgstr "_de acuerdo (Espera por más)"
+
+#: src/cmd_chmod.c:98
+#, c-format
+msgid "Set protection bits for \"%s\":"
+msgstr "Establecer bits de protección para \"%s\":"
+
+#: src/cmd_chmod.c:199 src/cmd_chown.c:176 src/cmd_info.c:274
+msgid "Group"
+msgstr "Grupo"
+
+#: src/cmd_chmod.c:199
+msgid "Others"
+msgstr "Otros"
+
+#: src/cmd_chmod.c:199 src/cmd_info.c:267
+msgid "Owner"
+msgstr "Propietario"
+
+#: src/cmd_chmod.c:199
+msgid "Special"
+msgstr "Especial"
+
+#: src/cmd_chmod.c:200
+msgid "Execute"
+msgstr "Ejecución"
+
+#: src/cmd_chmod.c:200
+msgid "Read"
+msgstr "Lectura"
+
+#: src/cmd_chmod.c:200
+msgid "Set GID"
+msgstr "Establecer GID"
+
+#: src/cmd_chmod.c:200
+msgid "Set UID"
+msgstr "Establecer UID"
+
+#: src/cmd_chmod.c:200
+msgid "Write"
+msgstr "Escritura"
+
+#: src/cmd_chmod.c:222
+msgid "Protection Bits"
+msgstr "Bits de Protección"
+
+#: src/cmd_chmod.c:233
+msgid "Textual"
+msgstr "Literales"
+
+#: src/cmd_chmod.c:246
+msgid "Octal"
+msgstr "Octal"
+
+#: src/cmd_chmod.c:251 src/menus.c:518
+msgid "All"
+msgstr "Todo"
+
+#: src/cmd_chmod.c:253 src/menus.c:520
+msgid "Toggle"
+msgstr "Activar"
+
+#: src/cmd_chmod.c:254
+msgid "Revert"
+msgstr "Restablecer"
+
+#: src/cmd_chmod.c:266 src/cmd_chown.c:201 src/cmd_info.c:372
+msgid "Recurse Directories?"
+msgstr "¿Recursivo en Directorios?"
+
+#: src/cmd_chmod.c:269
+msgid "Don't Touch Directories?"
+msgstr "¿No tocar directorios?"
+
+#: src/cmd_chmod.c:274
+msgid "Change Mode"
+msgstr "Cambiar modo"
+
+#: src/cmd_chown.c:57
+#, c-format
+msgid "Set Ownership for '%s':"
+msgstr "Establecer el propietario para '%s'"
+
+#: src/cmd_chown.c:176
+msgid "User"
+msgstr "Usuario"
+
+#: src/cmd_chown.c:206
+msgid "Change Ownership"
+msgstr "Cambiar el propietario"
+
+#: src/cmd_configure.c:50
+msgid "Automatically Save Changed Configuration on Exit?"
+msgstr "¿Guardar los cambios en la configuración al salir?"
+
+#: src/cmd_copy.c:175 src/cmd_copyas.c:62
+#, c-format
+msgid "\"%s\" Already Exists - Proceed With Copy?"
+msgstr "\"%s\" ya existe - ¿Seguir con la copia?"
+
+#: src/cmd_copy.c:176
+msgid "Copying..."
+msgstr "Copiando..."
+
+#: src/cmd_copy.c:217
+msgid "Preserve Dates During Copy?"
+msgstr "¿Mantener las fechas al copiar?"
+
+#: src/cmd_copy.c:218
+msgid "Ignore Failure to Copy Attributes (Date, Owner, Mode)?"
+msgstr ""
+"¿Ignorar los fallos de al copiar los atributos (Fecha, Propietario, Modo)?"
+
+#: src/cmd_copy.c:219
+msgid "Leave Failed Destination if Full Size?"
+msgstr "¿Ignorar el fallo en el destino en el caso de tamaño completo?"
+
+#: src/cmd_copy.c:220 src/cmd_viewtext.c:204
+msgid "Buffer Size"
+msgstr "Tamaño del buffer"
+
+#: src/cmd_copyas.c:49
+#, c-format
+msgid "Enter Name for Copy of \"%s\""
+msgstr "Teclee el nombre para la copia de \"%s\""
+
+#: src/cmd_copyas.c:51
+#, c-format
+msgid "Enter Name for Clone of \"%s\""
+msgstr "Teclee el nombre para el clón de \"%s\""
+
+#: src/cmd_copyas.c:64
+#, c-format
+msgid "\"%s\" Already Exists - Continue With Clone?"
+msgstr "\"%s\" Ya Existe - ¿Continuar con la clonación?"
+
+#: src/cmd_copyas.c:65
+msgid "Cloning..."
+msgstr "Clonando..."
+
+#: src/cmd_copyas.c:65
+msgid "Copying As..."
+msgstr "Copiando como..."
+
+#: src/cmd_copyas.c:79
+#, c-format
+msgid "Enter Name to Link \"%s\" As"
+msgstr "Teclee el nombre para el enlace \"%s\" como"
+
+#: src/cmd_copyas.c:81
+#, c-format
+msgid "Enter Name for Link Clone of \"%s\""
+msgstr "Teclee el nombre para el clon del enlace de \"%s\""
+
+#: src/cmd_copyas.c:91
+#, c-format
+msgid "\"%s\" Already Exists - Proceed With Symlink?"
+msgstr "\"%s\" Ya Existe - ¿Proceder con el enlace simbólico?"
+
+#: src/cmd_copyas.c:200 src/cmd_copyas.c:207
+msgid "Copy As"
+msgstr "Copiar como"
+
+#: src/cmd_copyas.c:209
+msgid "Clone"
+msgstr "Clonar"
+
+#: src/cmd_copyas.c:211
+msgid "Symbolic Link As"
+msgstr "Enlace simbólico como"
+
+#: src/cmd_copyas.c:213
+msgid "Symbolic Link Clone"
+msgstr "Clonar el enlace simbólico"
+
+#: src/cmd_delete.c:56
+#, c-format
+msgid ""
+"%s\n"
+"could not be deleted due to access restrictions.\n"
+"Attempt to change protection and retry?"
+msgstr ""
+"%s\n"
+"no pudo ser borrado debido a restricciones de acceso.\n"
+"¿Intentar cambiar la protección y reintentar?"
+
+#: src/cmd_delete.c:59
+msgid "Remember the answer (alters config)"
+msgstr "Recordar respuesta (altera la configuración)"
+
+#: src/cmd_delete.c:61
+msgid "Access Problem"
+msgstr "Problema de acceso"
+
+#: src/cmd_delete.c:61
+msgid "Change|Leave Alone"
+msgstr "Cambiar|Abandonar"
+
+#: src/cmd_delete.c:215
+#, c-format
+msgid "Really Delete \"%s\"?"
+msgstr "¿Seguro que quiere borrar \"%s\"?"
+
+#: src/cmd_delete.c:216
+msgid "Deleting..."
+msgstr "Borrando..."
+
+#: src/cmd_delete.c:279
+msgid "On Access Failure"
+msgstr "Error de acceso"
+
+#: src/cmd_delete.c:280
+msgid "Ask User|Automatically Try Changing, and Retry|Fail"
+msgstr "Preguntar al usuario|Intentar cambiar los permisos y reintentar|Fallo"
+
+#: src/cmd_dpfocus.c:33
+msgid "DpFocus Command is Deprecated"
+msgstr "La orden DpFocus es obsoleta"
+
+#: src/cmd_dpfocus.c:34
+msgid ""
+"The <tt>DpFocus</tt> command has been deprecated and is no longer supported. "
+"Please remove any keyboard or mouse bindings that use it and look into using "
+"the default GTK+ list view's cursor controls."
+msgstr ""
+"La orden <tt>DpFocus</tt> se ha elimnado y ya no se utiliza. Por favor, "
+"elimine los enlaces de teclado o del ratón que lo utilizan y hag uso de la "
+"lista GTK+ predeterminada para el control del cursor."
+
+#: src/cmd_dpfocus.c:64
+msgid "Treat Focused Row As Selection If No \"Real\" Selection Exists?"
+msgstr ""
+"¿Tratar la fila con foco como seleccionada si no hay una selección \"real\"?"
+
+#: src/cmd_dpfocus.c:66
+msgid "Move Focus to Last Selected/Deselected Row?"
+msgstr "¿Mover el foco a la última fila seleccionada/no seleccionada?"
+
+#: src/cmd_dpfocusisrch.c:163
+msgid "ISearch"
+msgstr "|Buscar"
+
+#: src/cmd_generic.c:143
+msgid "_OK|A_ll|_Skip|_Cancel"
+msgstr "_de Acuerdo|To_do|_Saltar|_Cancelar"
+
+#: src/cmd_generic.c:144
+msgid "_OK|_Skip|_Cancel"
+msgstr "_de Acuerdo|_Saltar|_Cancelar"
+
+#: src/cmd_getsize.c:51
+msgid "Getting sizes..."
+msgstr "Obteniendo tamaños..."
+
+#: src/cmd_getsize.c:134
+msgid "Unselect Rows When Done?"
+msgstr "¿Des-seleccionar filas al terminar?"
+
+#: src/cmd_info.c:68 src/errors.c:84
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: src/cmd_info.c:72
+#, c-format
+msgid ""
+"%u dirs, %u files,\n"
+"%u symlinks, %u special files"
+msgstr ""
+"%u directorios, %u archivos,\n"
+"%u enlaces simbólicos, %u archivos especiales"
+
+#: src/cmd_info.c:153
+msgid "Value"
+msgstr "Valor"
+
+#: src/cmd_info.c:198
+msgid "Link To"
+msgstr "Enlazar a"
+
+#: src/cmd_info.c:213 src/cmd_select.c:368 src/dpformat.c:54
+msgid "Type"
+msgstr "Tipo"
+
+#: src/cmd_info.c:216
+msgid "Location"
+msgstr "Localización"
+
+#: src/cmd_info.c:219 src/cmd_split.c:653 src/dpformat.c:37 src/window.c:199
+msgid "Size"
+msgstr "Tamaño"
+
+#: src/cmd_info.c:229
+#, c-format
+msgid "%s (%s bytes)"
+msgstr "%s (%s bytes)"
+
+#: src/cmd_info.c:240
+msgid "Contains"
+msgstr "Contiene"
+
+#: src/cmd_info.c:257
+msgid "'File' Info"
+msgstr "Información de 'Archivo'"
+
+#: src/cmd_info.c:285 src/dpformat.c:50
+msgid "Accessed"
+msgstr "Último acceso"
+
+#: src/cmd_info.c:286 src/dpformat.c:51
+msgid "Modified"
+msgstr "Modificado"
+
+#: src/cmd_info.c:287 src/dpformat.c:53
+msgid "Changed"
+msgstr "Cambiado"
+
+#: src/cmd_info.c:288 src/dpformat.c:52
+msgid "Created"
+msgstr "Generado"
+
+#: src/cmd_info.c:290
+msgid "Basic"
+msgstr "Básico"
+
+#: src/cmd_info.c:294
+msgid "Attributes"
+msgstr "Atributos"
+
+#: src/cmd_info.c:338
+msgid "Getting Information..."
+msgstr "Obteniendo información..."
+
+#: src/cmd_info.c:370
+msgid "Show 'file' Output?"
+msgstr "¿Mostrar 'archivo' de salida?"
+
+#: src/cmd_info.c:373
+msgid "Access Date Format"
+msgstr "Formato de la fecha de acceso"
+
+#: src/cmd_info.c:374
+msgid "Modify Date Format"
+msgstr "Modificar el formato de fecha"
+
+#: src/cmd_info.c:375
+msgid "Change Date Format"
+msgstr "Cambiar el formato de fecha"
+
+#: src/cmd_info.c:376
+msgid "Size Tick Mark"
+msgstr "Tamaño de la marca de graduación"
+
+#: src/cmd_join.c:46
+#, c-format
+msgid "\"%s\" Already Exists - Continue With Join?"
+msgstr "\"%s\" Ya Existe - ¿Continuar con la unión?"
+
+#: src/cmd_join.c:73
+msgid "Joining..."
+msgstr "Uniendo..."
+
+#: src/cmd_join.c:167
+msgid "Click and Drag Files to Reorder, Then Click Join."
+msgstr ""
+"Hacer Clic y arrastrar archivos para reordenar, después hacer clic en unir"
+
+#: src/cmd_join.c:175
+#, c-format
+msgid "The total size is %s (%lu bytes)."
+msgstr "El tamaño total es %s (%lu bytes)."
+
+#: src/cmd_join.c:178
+#, c-format
+msgid "The total size is %lu bytes."
+msgstr "El tamaño total es %lu bytes."
+
+#: src/cmd_join.c:220
+msgid "Enter Destination File Name"
+msgstr "Teclear el nombre del archivo destino"
+
+#: src/cmd_join.c:235
+msgid "Join"
+msgstr "Unir"
+
+#: src/cmd_join.c:235
+msgid "_Join|_Cancel"
+msgstr "_Unir|_Cancelar"
+
+#: src/cmd_mkdir.c:65
+#, c-format
+msgid "\"%s\" Already Exists - Proceed With MkDir?"
+msgstr "\"%s\" Ya Existe - ¿Seguir con MkDir (generar directorio)?"
+
+#: src/cmd_mkdir.c:119
+msgid "Enter Name of Directory to Create"
+msgstr "Teclee el nombre del directorio a generar"
+
+#: src/cmd_mkdir.c:128
+msgid "Make Directory"
+msgstr "Generar directorio"
+
+#: src/cmd_mkdir.c:151
+msgid "CD Into New Directory?"
+msgstr "¿Entrar en el nuevo directorio?"
+
+#: src/cmd_mkdir.c:152
+msgid "Focus New Directory?"
+msgstr "¿Enfocar el nuevo directorio?"
+
+#: src/cmd_move.c:128 src/cmd_moveas.c:51
+#, c-format
+msgid "\"%s\" Already Exists - Continue With Move?"
+msgstr "\"%s\" Ya Existe - ¿Continuar con mover?"
+
+#: src/cmd_move.c:129
+msgid "Moving..."
+msgstr "Moviendo..."
+
+#: src/cmd_moveas.c:41
+#, c-format
+msgid "Enter Name to Move \"%s\" As"
+msgstr "Teclee el nombre para mover \"%s\" como"
+
+#: src/cmd_moveas.c:66
+msgid "Invalid destination name for MoveAs"
+msgstr "Nombre de destino no válido para \"Mover como\""
+
+#: src/cmd_moveas.c:74
+msgid "Moving As..."
+msgstr "Moviendo como..."
+
+#: src/cmd_moveas.c:105 src/cmd_moveas.c:113
+msgid "Move As"
+msgstr "Mover como"
+
+#: src/cmd_quit.c:40
+msgid ""
+"You may have some unsaved configuration changes.\n"
+"Quitting without saving will lose them. Really quit?"
+msgstr ""
+"Es posible que tenga cambios sin guardar en la configuración.\n"
+"Al salir sin guardar se perderán estos cambios. ¿Aún desea salir?"
+
+#: src/cmd_quit.c:42 src/cmd_quit.c:54
+msgid "Confirm Quitting"
+msgstr "Confirmar Salir"
+
+#: src/cmd_quit.c:42
+msgid "_Quit|_Save, then Quit|_Cancel"
+msgstr "_Salir|_Guardar, y después Salir|_Cancelar"
+
+#: src/cmd_quit.c:54
+msgid "Are you sure you want to quit?"
+msgstr "¿Seguro que desea salir?"
+
+#: src/cmd_rename.c:57
+#, c-format
+msgid "Enter New Name For \"%s\""
+msgstr "Teclee el nuevo nombre para \"%s\""
+
+#: src/cmd_rename.c:67 src/cmd_renamere.c:142 src/cmd_renamere.c:225
+#: src/cmd_renamere.c:268 src/cmd_renamere.c:367 src/cmd_renameseq.c:152
+#, c-format
+msgid "\"%s\" Already Exists - Proceed With Rename?"
+msgstr "\"%s\" Ya Existe - ¿Seguir con renombrar?"
+
+#: src/cmd_rename.c:245
+msgid "Rename"
+msgstr "Renombrar"
+
+#: src/cmd_rename.c:261
+msgid "Rename Single File In-Place (Without Dialog)?"
+msgstr "¿Cambiar el nombre de archivo único en contexto (sin diálogos)?"
+
+#: src/cmd_renamere.c:419
+msgid ""
+"Look for substring in all filenames, and replace\n"
+"it with another string."
+msgstr ""
+"Buscar una cadena de texto en todos los archivos y reemplazarla\n"
+"con otra cadena de texto."
+
+#: src/cmd_renamere.c:422
+msgid "Replace"
+msgstr "Reemplazar"
+
+#: src/cmd_renamere.c:426
+msgid "With"
+msgstr "Con"
+
+#: src/cmd_renamere.c:434
+msgid "Replace All?"
+msgstr "¿Reemplazar todo?"
+
+#: src/cmd_renamere.c:438
+msgid "Simple"
+msgstr "Simple"
+
+#: src/cmd_renamere.c:442
+msgid ""
+"Execute the 'From' RE on each filename, storing\n"
+"parenthesised subexpression matches. Then replace\n"
+"any occurance of $n in 'To', where n is the index\n"
+"(counting from 1) of a subexpression, with the text\n"
+"that matched, and use the result as a new filename."
+msgstr ""
+"Ejecutar 'Desde' ER en cada archivo, almacenando\n"
+"las coincidencias de expresiones entre paréntesis. Después reemplazar\n"
+"cualquier ocurrencia de $n en 'A', donde n es el índice \n"
+"(contando desde 1) de una sub-expresión, con el texto\n"
+"que coincide y usar el resultado como un nuevo nombre de archivo."
+
+#: src/cmd_renamere.c:450 src/cmd_renamere.c:473
+msgid "From"
+msgstr "De"
+
+#: src/cmd_renamere.c:454 src/cmd_renamere.c:477
+msgid "To"
+msgstr "A"
+
+#: src/cmd_renamere.c:462
+msgid "Reg Exp"
+msgstr "Expresion regular"
+
+#: src/cmd_renamere.c:467
+msgid ""
+"Look for each character in the 'From' string, and replace\n"
+"any hits with the corresponding character in the 'To' string.\n"
+"Then, any characters in the 'Remove' string are removed from\n"
+"the filename, and the result used as the new name for each file."
+msgstr ""
+"Busca cada caracter en el texto 'De', y sustituye\n"
+"cualquier ocurrencia por el caracter correspondiente en el texto 'A'\n"
+"Después, cualquier caracter en el texto 'Cambiar' es cambiado del\n"
+"nombre del archivo, y el resultado usado como el nuevo nombre de cada "
+"archivo."
+
+#: src/cmd_renamere.c:486
+msgid "Map"
+msgstr "Mapa"
+
+#: src/cmd_renamere.c:490
+msgid ""
+"Changes the case (upper/lower) of the characters\n"
+"in the selected filename(s)."
+msgstr ""
+"Cambiar el tipo de letra (mayúscula/minúscula)\n"
+"del nombre de archivo(s) seleccionado(s)."
+
+#: src/cmd_renamere.c:492
+msgid "Lower Case?"
+msgstr "¿Minúsculas?"
+
+#: src/cmd_renamere.c:494
+msgid "Upper Case?"
+msgstr "¿Mayúsculas?"
+
+#: src/cmd_renamere.c:496
+msgid "Upper Case Initial?"
+msgstr "¿Mayúsculas iniciales?"
+
+#: src/cmd_renamere.c:499
+msgid "Case"
+msgstr "Tipo de letra"
+
+#: src/cmd_renamere.c:501
+msgid "RenameRE"
+msgstr "RenombrarER"
+
+#: src/cmd_renameseq.c:281
+msgid "10, Decimal"
+msgstr "10, decimal"
+
+#: src/cmd_renameseq.c:281
+msgid "16, Hex (A-F)"
+msgstr "16, Hex (A-F)"
+
+#: src/cmd_renameseq.c:281
+msgid "16, Hex (a-f)"
+msgstr "16, Hex (a-f)"
+
+#: src/cmd_renameseq.c:281
+msgid "8, Octal"
+msgstr "8, Octal"
+
+#: src/cmd_renameseq.c:306
+msgid ""
+"This command renames all selected files\n"
+"into a numbered sequence. The controls\n"
+"below let you define how the names are\n"
+"formed."
+msgstr ""
+"Esta orden renombra todos los archivos seleccionados\n"
+"a una secuencia numérica. Los controles inferiores permiten\n"
+"definir cómo se generan los nombres."
+
+#: src/cmd_renameseq.c:313
+msgid "Start At"
+msgstr "Empezar en"
+
+#: src/cmd_renameseq.c:323 src/cmd_split.c:609
+msgid "Base"
+msgstr "Base"
+
+#: src/cmd_renameseq.c:333
+msgid "Precision"
+msgstr "Precisión"
+
+#: src/cmd_renameseq.c:340
+msgid "Head"
+msgstr "Inicio"
+
+#: src/cmd_renameseq.c:347
+msgid "Tail"
+msgstr "Cola"
+
+#: src/cmd_renameseq.c:354
+msgid "Guess"
+msgstr "Invitado"
+
+#: src/cmd_renameseq.c:369
+msgid "Sequential Rename"
+msgstr "Renombrar secuencial"
+
+#: src/cmd_select.c:365
+msgid "All rows|Selected|Unselected|"
+msgstr "Todo|Seleccionados|No seleccionados"
+
+#: src/cmd_select.c:366
+msgid "All types|Directories only|Non-directories only|"
+msgstr "Cualquier tipo|Sólo directorios|Sólo no directorios|"
+
+#: src/cmd_select.c:367
+msgid "Select|Unselect|Toggle|"
+msgstr "Seleccionar|Des-seleccionar|Fijar|"
+
+#: src/cmd_select.c:368 src/menus.c:537
+msgid "Action"
+msgstr "Acción"
+
+#: src/cmd_select.c:368
+msgid "Set"
+msgstr "Grupo"
+
+#: src/cmd_select.c:469
+msgid "Treat RE as Glob Pattern?"
+msgstr "¿Tratar ER como patrón global?"
+
+#: src/cmd_select.c:472
+msgid "Invert RE Matching?"
+msgstr "¿Invertir coincidencia de ER?"
+
+#: src/cmd_select.c:475
+msgid "Require Match on Full Name?"
+msgstr "¿Exigir coincidencia en el nombre completo?"
+
+#: src/cmd_select.c:489
+msgid "Select Using RE"
+msgstr "Seleccionar usando ER"
+
+#: src/cmd_select.c:727
+msgid ""
+"Enter shell command to run. The command\n"
+"will have the selected content appended.\n"
+"Action is performed on successful exit."
+msgstr ""
+"Teclee el comando shell a ejecutar. El contenido\n"
+"seleccionado será añadido al final de la orden.\n"
+"La acción se ejecutará al finalizar exitosamente."
+
+#: src/cmd_select.c:734
+msgid "OK|Cancel"
+msgstr "de Acuerdo|Cancelar"
+
+#: src/cmd_select.c:734
+msgid "Select using shell command"
+msgstr "Seleccionar usando una orden shell"
+
+#: src/cmd_split.c:269
+#, c-format
+msgid ""
+"Split \"%s\".\n"
+"File is %s (%s)."
+msgstr ""
+"Dividir \"%s\".\n"
+"Archivo es %s (%s)."
+
+#: src/cmd_split.c:271
+#, c-format
+msgid ""
+"Split \"%s\".\n"
+"File is %s."
+msgstr ""
+"Dividir \"%s\".\n"
+"Archivo es %s"
+
+#: src/cmd_split.c:348
+#, c-format
+msgid "\"%s\" Already Exists - Continue With Split?"
+msgstr "\"%s\" Ya existe - ¿Continuar con dividir?"
+
+#: src/cmd_split.c:422
+msgid "Fixed Size Split"
+msgstr "Dividir a tamaño fijo"
+
+#: src/cmd_split.c:424
+msgid "Segment Size"
+msgstr "Tamaño del segmento"
+
+#: src/cmd_split.c:427
+msgid "1457000 bytes (3.5\" floppy)"
+msgstr "1457000 bytes (3.5\" disquetera)"
+
+#: src/cmd_split.c:428
+msgid "10485760 bytes (10 MB)"
+msgstr "10485760 bytes (10 Mb)"
+
+#: src/cmd_split.c:429
+msgid "26214400 bytes (25 MB)"
+msgstr "26214400 bytes (25 Mb)"
+
+#: src/cmd_split.c:430
+msgid "52428800 bytes (50 MB)"
+msgstr "52428800 bytes (50 Mb)"
+
+#: src/cmd_split.c:431
+msgid "78643200 bytes (75 MB)"
+msgstr "78643200 bytes (75 Mb)"
+
+#: src/cmd_split.c:432
+msgid "100431360 bytes (95 MB, Zip disk)"
+msgstr "100431360 bytes (95 Mb, unidad de disco Zip)"
+
+#: src/cmd_split.c:454
+msgid "Fixed Count Split"
+msgstr "Dividir a tamaño fijo"
+
+#: src/cmd_split.c:457
+msgid "Segment Count"
+msgstr "Tamaño del segmento"
+
+#: src/cmd_split.c:503
+msgid "Current part number, unique for every created file"
+msgstr "Número actual, único para cada archivo generado"
+
+#: src/cmd_split.c:504
+msgid "The value from the Base box"
+msgstr "El valor del cajetin base"
+
+#: src/cmd_split.c:505
+msgid "The amount that index will change for each file"
+msgstr "La cantidad que el índice va a cambiar para cada archivo"
+
+#: src/cmd_split.c:506
+msgid "The total number of files that will be created"
+msgstr "El número total de archivos que van a generarse"
+
+#: src/cmd_split.c:507
+msgid "The value of index for the last file to be created"
+msgstr "El valor del índice para el último archivo que se generará"
+
+#: src/cmd_split.c:570
+msgid "Fixed size, variable number of parts"
+msgstr "Tamaño fijo, número de partes variable"
+
+#: src/cmd_split.c:571
+msgid "Fixed number of parts, variable sizes"
+msgstr "Numero de partes fijo, tamaños variabes"
+
+#: src/cmd_split.c:580 src/cmd_split.c:663
+msgid "Split"
+msgstr "Dividir"
+
+#: src/cmd_split.c:599
+msgid "Name Format"
+msgstr "Formato del nombre"
+
+#: src/cmd_split.c:615
+msgid "Step"
+msgstr "Paso"
+
+#: src/cmd_split.c:624
+msgid "Zero-Fill Numbers?"
+msgstr "¿Números rellenados con ceros (\"Zero-Fil Numbers\")?"
+
+#: src/cmd_split.c:645
+msgid "Offset"
+msgstr "Desplazamiento"
+
+#: src/cmd_symlink.c:68 src/cmd_symlink.c:252
+#, c-format
+msgid "\"%s\" Already Exists - Continue With Link?"
+msgstr "\"%s\" Ya Existe - ¿Continuar con el enlace?"
+
+#: src/cmd_symlink.c:161 src/configure.c:239 src/icon_dialog.c:59
+#: src/progress.c:220
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/cmd_symlink.c:161 src/configure.c:233 src/dialog.c:290
+#: src/nag_dialog.c:36
+msgid "OK"
+msgstr "de Acuerdo"
+
+#: src/cmd_symlink.c:161
+msgid "Select Link Target"
+msgstr "Seleccione el destino del enlace"
+
+#: src/cmd_symlink.c:218
+msgid "Contents"
+msgstr "Contenido"
+
+#: src/cmd_symlink.c:231
+msgid "Edit Symbolic Link"
+msgstr "Editar enlace simbólico"
+
+#: src/cmd_symlink.c:236
+msgid "Create Symbolic Link"
+msgstr "Generar enlace simbólico"
+
+#: src/cmd_viewtext.c:205
+msgid "Hex-Check First"
+msgstr "Primero Hex-Check"
+
+#: src/cmd_viewtext.c:206
+msgid "Exit on Left Arrow Key?"
+msgstr "¿Cerrar con la tecla de la flecha izquierda?"
+
+#: src/cmdarg.c:201
+msgid "on"
+msgstr "en"
+
+#: src/cmdarg.c:201
+msgid "true"
+msgstr "verdadero"
+
+#: src/cmdarg.c:201
+msgid "yes"
+msgstr "si"
+
+#: src/cmdgrab.c:177
+#, c-format
+msgid "Output of %s (pid %d)"
+msgstr "Salida de %s (pid %d)"
+
+#: src/cmdseq.c:354 src/cmdseq.c:369
+#, c-format
+msgid ""
+"Unable to execute unknown\n"
+"command \"%s\"."
+msgstr ""
+"Imposible ejecutar la orden \"%s\"\n"
+"(no se reconoce)."
+
+#: src/cmdseq_dialog.c:134
+#, c-format
+msgid "Built-Ins (%u)"
+msgstr "Predefinidos (%u)"
+
+#: src/cmdseq_dialog.c:139
+#, c-format
+msgid "User Defined (%u)"
+msgstr "Definidos por el usuario (%u)"
+
+#: src/cmdseq_dialog.c:313
+msgid ""
+"Select a command, or type start\n"
+"of name and press TAB."
+msgstr ""
+"Seleccione una orden o teclee el inicio\n"
+"del nombre y presione TAB."
+
+#: src/cmdseq_dialog.c:330
+msgid "Select Command"
+msgstr "Seleccionar orden"
+
+#: src/configure.c:197
+msgid "Couldn't open configuration file for output"
+msgstr "No se puedo abrir el archivo de configuración para escritura"
+
+#: src/configure.c:236
+msgid "Save"
+msgstr "Guardar"
+
+#: src/configure.c:463
+#, c-format
+msgid "Config file version (%s) doesn't match program version (%s)"
+msgstr ""
+"La versión del archivo de configuración (%s) no coincide\n"
+"con la versión del programa(%s)"
+
+#: src/configure.c:475
+#, c-format
+msgid ""
+"Couldn't find any configuration file; checked\n"
+"both \"%s\" and \"%s\".\n"
+"Using built-in minimal configuration."
+msgstr ""
+"No se ha podido encontrar ningún archivo de configuración; se buscó\n"
+"en \"%s\" y \"%s\".\n"
+"Usando configuración mínima predefinida."
+
+#: src/dialog.c:124 src/dialog.c:260
+msgid "_OK|_Cancel"
+msgstr "_de Acuerdo|Cancelar"
+
+#: src/dirpane.c:541
+#, c-format
+msgid "%u/%u dirs, %u/%u files"
+msgstr "i%u/%u dirs, %u/%u archivos"
+
+#: src/dirpane.c:546
+#, c-format
+msgid " (%s/%s)"
+msgstr " (%s/%s)"
+
+#: src/dirpane.c:557
+#, c-format
+msgid ", %s (%s) used"
+msgstr ", %s (%s) utilizado"
+
+#: src/dirpane.c:559
+#, c-format
+msgid ", %s free"
+msgstr ", %s libre"
+
+#: src/dirpane.c:2084 src/dirpane.c:2131
+msgid "Move up to the parent directory"
+msgstr "Subir al directorio padre"
+
+#: src/dirpane.c:2106
+msgid "Enter path, then press Return to go there"
+msgstr "Teclee la ruta, después presione Enter para cambiar a ese directorio"
+
+#: src/dirpane.c:2107
+msgid "H"
+msgstr "H"
+
+#: src/dirpane.c:2111
+msgid ""
+"Click to enable/disable Hide rule (When pressed in, the hide rule is active, "
+"and matching entries are hidden)"
+msgstr ""
+"Haga clic para habilitar/deshabilitar Esconder regla (Cuando está\n"
+"presionado, se activa la regla ocultar y las coincidencias.)"
+
+#: src/dpformat.c:38
+msgid "Blocks"
+msgstr "Bloques"
+
+#: src/dpformat.c:39
+msgid "BSize"
+msgstr "BTamaño"
+
+#: src/dpformat.c:39
+msgid "Block Size"
+msgstr "Tamaño del Bloque"
+
+#: src/dpformat.c:40
+msgid "Mode, numerical"
+msgstr "Modo, numérico"
+
+#: src/dpformat.c:41
+msgid "Mode, string"
+msgstr "Modo, texto"
+
+#: src/dpformat.c:42
+msgid "Nlink"
+msgstr "NEnlace"
+
+#: src/dpformat.c:42
+msgid "Number of links"
+msgstr "Número de enlaces"
+
+#: src/dpformat.c:43
+msgid "Owner ID"
+msgstr "ID del Propietario"
+
+#: src/dpformat.c:43
+msgid "Uid"
+msgstr "Uid"
+
+#: src/dpformat.c:44
+msgid "Owner Name"
+msgstr "Nombre del propietario"
+
+#: src/dpformat.c:44
+msgid "Uname"
+msgstr "UNombre"
+
+#: src/dpformat.c:45
+msgid "Gid"
+msgstr "Gid"
+
+#: src/dpformat.c:45
+msgid "Group ID"
+msgstr "ID de Grupo"
+
+#: src/dpformat.c:46
+msgid "Gname"
+msgstr "Gnombre"
+
+#: src/dpformat.c:46
+msgid "Group Name"
+msgstr "Nombre del Grupo"
+
+#: src/dpformat.c:47
+msgid "Device"
+msgstr "Dispositivo"
+
+#: src/dpformat.c:47
+msgid "Device Number"
+msgstr "Número del dispositivo"
+
+#: src/dpformat.c:48
+msgid "DevMaj"
+msgstr "DispMay"
+
+#: src/dpformat.c:48
+msgid "Device Number, major"
+msgstr "Número del dispositivo, mayor"
+
+#: src/dpformat.c:49
+msgid "DevMin"
+msgstr "DispMen"
+
+#: src/dpformat.c:49
+msgid "Device Number, minor"
+msgstr "Número del dispositivo, menor"
+
+#: src/dpformat.c:50
+msgid "Time of Last Access"
+msgstr "Fecha del último acceso"
+
+#: src/dpformat.c:51
+msgid "Time of Last Modification"
+msgstr "Fecha de la última modificación"
+
+#: src/dpformat.c:52
+msgid "Time of Creation"
+msgstr "Fecha de generación"
+
+#: src/dpformat.c:53
+msgid "Time of Last Change"
+msgstr "Hora del último cambio"
+
+#: src/dpformat.c:54
+msgid "Type Name"
+msgstr "Teclee el nombre"
+
+#: src/dpformat.c:55
+msgid "I"
+msgstr "I"
+
+#: src/dpformat.c:56
+msgid "URI"
+msgstr "URI"
+
+#: src/dpformat.c:56
+msgid "URI (without file prefix)"
+msgstr "URI (sin prefijo del archivo)"
+
+#: src/errors.c:59
+#, c-format
+msgid "Couldn't %s \"%s\": %s (code %d)"
+msgstr "No fue posible %s \"%s\": %s (código %d)"
+
+#: src/errors.c:61
+#, c-format
+msgid "Couldn't %s \"%s\" (code %d)"
+msgstr "No fue posible %s \"%s\" (código %d)"
+
+#: src/errors.c:66
+#, c-format
+msgid "Couldn't %s \"%s\""
+msgstr "No fue posible %s \"%s\""
+
+#: src/errors.c:68
+#, c-format
+msgid "Couldn't %s"
+msgstr "No fue posible %s"
+
+#: src/errors.c:88
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: src/gentoo.c:427
+msgid "Report the version to standard output, and exit."
+msgstr "Informar de la versión en la salida estándar y salir."
+
+#: src/gentoo.c:429
+msgid "Report internal locale details, and exit."
+msgstr "Informar de los detalles locales y salir"
+
+#: src/gentoo.c:431
+msgid "Allows gentoo to be run by the root user. Could be dangerous."
+msgstr "Permite ejecutar gentoo al usuario root. Podría ser peligroso."
+
+#: src/gentoo.c:432
+msgid ""
+"Do not load the ~/.gentoorc configuration file; instead, use default values."
+msgstr ""
+"No cargar el archivo de configuración ~/.gentoorc; en vez de eso, usar\n"
+"valores predeterminados."
+
+#: src/gentoo.c:433
+msgid ""
+"Do not load the ~/.gentoogtkrc GTK+ configuration file; instead, use system "
+"defaults."
+msgstr ""
+"No cargar el archivo de configuración ~/.gentoorc; en vez de eso, usar\n"
+"valores predeterminados del sistema."
+
+#: src/gentoo.c:434
+msgid ""
+"Run COMMAND, a gentoo command. Done before user interaction allowed, but "
+"after configuration file has been read in. Can be used many times to run "
+"several commands in sequence."
+msgstr ""
+"Ejecute COMMAND, una orden de gentoo. Hacerlo antes de la interacción con el "
+"usuario, pero después de leer el archivo de configuración. Puede utilizarse "
+"muchas veces para ejecutar muchos órdenes secuencialmente."
+
+#: src/gentoo.c:435
+msgid "COMMAND"
+msgstr "COMMAND"
+
+#: src/gentoo.c:436 src/gentoo.c:437
+msgid "DIR"
+msgstr "DIR"
+
+#: src/gentoo.c:436
+msgid ""
+"Use DIR as path for the left directory pane. Overrides default (and history)."
+msgstr ""
+"Usar DIR como ruta para el panel izquierdo. Sobreescribe el predeterminado "
+"(e historial)"
+
+#: src/gentoo.c:437
+msgid ""
+"Use DIR as path for the right directory pane. Overrides default (and "
+"history)."
+msgstr ""
+"Usar DIR como ruta para el panel derecho. Sobreescribe el predeterminado (e "
+"historial)"
+
+#: src/gentoo.c:461
+msgid "- a graphical file manager using GTK+"
+msgstr "- gestor de archivos gráfico con GTK+"
+
+#: src/gentoo.c:466
+#, c-format
+msgid "Failed to parse command line options: %s\n"
+msgstr "No se ha podido analizar las opciones de línea de órdenes: %s\n"
+
+#: src/gentoo.c:506
+#, c-format
+msgid "%s: To run as root, envoke with the '--root-ok' option\n"
+msgstr "%s: Para ejecutar como root, invocar con la opción '--root-ok'\n"
+
+#: src/gentoo.c:538
+msgid "Couldn't initialize userinfo module - username resolving won't work"
+msgstr ""
+"No fue posible iniciar el módulo userinfo - no será posible resolver "
+"nombres\n"
+"de usuario"
+
+#: src/gentoo.c:570
+#, c-format
+msgid "gentoo v%s by Emil Brink <emil@obsession.se>"
+msgstr "gentoo v %s por Emil Brink <emil@obsession.se>"
+
+#: src/gentoo.c:577
+msgid "Development Version Warning"
+msgstr "Advertencia de versión en desarrollo"
+
+#: src/gentoo.c:577
+msgid ""
+"This version of gentoo is considered somewhat new and untested. There have "
+"been major changes to almost all parts of the program since the previous "
+"version. Please be a bit careful, and make sure you report any problem to "
+"the author. Thanks."
+msgstr ""
+"Esta versión de gentoo es muy reciente y poco probada. Ha habido cambios "
+"importantes en casi todas las partes del programa desde la versión anterior. "
+"Por favor, sea prudente en el uso de esta versión y asegúrese de informar de "
+"los errores y problemas al autor. Gracias."
+
+#: src/guiutil.c:124
+msgid "Progress"
+msgstr "Progreso"
+
+#: src/icon_dialog.c:52
+msgid "Pick Icon"
+msgstr "Escoger icono"
+
+#: src/icon_dialog.c:59
+msgid "Loading Icon Graphics..."
+msgstr "Cargando Imágenes de Iconos"
+
+#: src/menus.c:284
+msgid "(No Selection)"
+msgstr "(No hay Selección)"
+
+#: src/menus.c:521
+msgid "RegExp..."
+msgstr "ExpReg..."
+
+#: src/menus.c:533
+msgid "Other"
+msgstr "Otro"
+
+#: src/menus.c:534
+msgid "Rescan"
+msgstr "Actualizar"
+
+#: src/menus.c:535
+msgid "Select"
+msgstr "Seleccionar"
+
+#: src/menus.c:539
+msgid "Run..."
+msgstr "Ejecutar..."
+
+#: src/menus.c:541
+msgid "Configure..."
+msgstr "Configuración..."
+
+#: src/menus.c:618
+msgid "Select Menu"
+msgstr "Seleccionar Menú"
+
+#: src/nag_dialog.c:37
+msgid "_Don't show this dialog again"
+msgstr ""
+
+#: src/overwrite.c:49
+msgid "_OK|A_ll|_Skip|Skip _All|_Cancel"
+msgstr "_de Acuerdo|To_do|_Saltar|Saltar _Todo|_Cancelar"
+
+#: src/progress.c:196
+#, c-format
+msgid "Total (%s)"
+msgstr "Total (%s)"
+
+#: src/progress.c:305
+#, c-format
+msgid "Elapsed %02d:%02d  Speed %s/s  ETA %02u:%02u"
+msgstr "Transcurrido %02d:%02d  Velocidad %s/s  ETA %02u:%02u"
+
+#: src/sizeutil.c:31
+msgid "Unformatted Size"
+msgstr "Tamaño sin formato"
+
+#: src/sizeutil.c:32
+msgid "Formatted Size, Without Unit"
+msgstr "Tamaño con formato, sin unidad."
+
+#: src/sizeutil.c:33
+msgid "Formatted Size, in Bytes"
+msgstr "Tamaño con formato, en bytes"
+
+#: src/sizeutil.c:33 src/sizeutil.c:159
+msgid "bytes"
+msgstr "bytes"
+
+#: src/sizeutil.c:34
+msgid "Formatted Size, in Kilobytes"
+msgstr "Tamaño con formato, en kilobytes"
+
+#: src/sizeutil.c:34 src/sizeutil.c:163
+msgid "KB"
+msgstr "Kb"
+
+#: src/sizeutil.c:35
+msgid "Formatted Size, in Megabytes"
+msgstr "Tamaño con formato, en megabytes"
+
+#: src/sizeutil.c:35 src/sizeutil.c:167
+msgid "MB"
+msgstr "Mb"
+
+#: src/sizeutil.c:36
+msgid "Formatted Size, in Gigabytes"
+msgstr "Tamaño con formato, en gigabytes"
+
+#: src/sizeutil.c:36 src/sizeutil.c:171
+msgid "GB"
+msgstr "Gb"
+
+#: src/sizeutil.c:37
+msgid "Formatted Size, in Terabytes"
+msgstr "Tamaño con formato, en megabytes"
+
+#: src/sizeutil.c:37 src/sizeutil.c:175
+msgid "TB"
+msgstr "Tb"
+
+#: src/sizeutil.c:38
+msgid "Formatted Size, Automatic Unit"
+msgstr "Tamaño con formato, unidades automáticas"
+
+#: src/style_dialog.c:40
+msgid "Select Style"
+msgstr "Seleccionar estilo"
+
+#: src/styles.c:114
+msgid "Root"
+msgstr "Raíz"
+
+#: src/styles.c:120 src/types.c:292 src/types.c:295
+msgid "Directory"
+msgstr "Directorio"
+
+#: src/styles.c:889
+msgid "New Style"
+msgstr "Nuevo estilo"
+
+#: src/styles.c:889
+#, c-format
+msgid "New Style %u"
+msgstr "Nuevo estilo %u"
+
+#: src/textview.c:190
+#, c-format
+msgid ""
+"\n"
+"** Text conversion from charset '%s' failed, aborting."
+msgstr ""
+"\n"
+"** La conversión del texto desde el juego de carácteres '%s' ha fallado: "
+"suspendida."
+
+#: src/textview.c:405
+#, c-format
+msgid "Line %d (%.0f%%)"
+msgstr "Línea %d (%.0f%%)"
+
+#: src/textview.c:455
+msgid "Enter Line Number or Percentage:"
+msgstr "Teclee el número de línea o porcentaje:"
+
+#: src/textview.c:461
+msgid "Goto"
+msgstr "Ir a"
+
+#: src/textview.c:596
+msgid "Enter Text to Search For (RE)"
+msgstr "Teclee el texto a buscar (ER)"
+
+#: src/textview.c:607
+msgid "Don't Span Newlines?"
+msgstr "¿No romper los saltos de línea?"
+
+#: src/textview.c:613
+msgid "Search"
+msgstr "Buscar"
+
+#: src/types.c:287
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: src/types.c:572
+#, c-format
+msgid ""
+"Got SIGPIPE when writing to 'file' process (%s), it seems to have terminated "
+"prematurely."
+msgstr ""
+"Tiene SIGPIPE al escribir en el proceso 'file' (%s), parece haber terminado "
+"antes de tiempo."
+
+#: src/types.c:578
+msgid "Unable to run spawn 'file' command: "
+msgstr "No se puede ejecutar la orden 'file' :"
+
+#: src/window.c:83
+msgid "Configure gentoo"
+msgstr "Confugurar gentoo"
+
+#: src/window.c:90
+msgid "Text Viewer"
+msgstr "Visualizador de texto"
+
+#: src/window.c:199
+msgid "Position"
+msgstr "Posición"
+
+#: src/window.c:200
+msgid "Height"
+msgstr "Altura"
+
+#: src/window.c:200
+msgid "X"
+msgstr "X"
+
+#: src/window.c:200
+msgid "Y"
+msgstr "Y"
+
+#: src/window.c:207
+msgid "Set on Open?"
+msgstr "¿Establecer al abrir?"
+
+#: src/window.c:213
+msgid "Update on Close?"
+msgstr "¿Actualizar al cerrar?"
+
+#: src/window.c:244
+msgid "Grab"
+msgstr "Obtener"
+
+#: src/xmlutil.c:225
+msgid "XML module emitted locale-dependant real number"
+msgstr ""
+"El módulo XML emitió un número real dependiente de la configuración local"
+
+#~ msgid "Use Dialog to Report Errors?"
+#~ msgstr "Usar Diálogo para Reportar Errores?"
+
+#~ msgid "Raw Size, in Bytes"
+#~ msgstr "Tamaño sin Formato en Bytes"
+
+#~ msgid "Always Set"
+#~ msgstr "Siempre Establecer"
+
+#~ msgid "Modify 'Control' Key State"
+#~ msgstr "Estado de la Tecla 'Control'"
+
+#~ msgid "Active Pane Titles"
+#~ msgstr "Títulos de Paneles Activos"
+
+#~ msgid "Focused Row, Unselected"
+#~ msgstr "Fila en Foco, No Seleccionada"
+
+#~ msgid "Focused Row, Selected"
+#~ msgstr "Fila en Foco, Seleccionada"
+
+#~ msgid "Beta Software"
+#~ msgstr "Software Beta"
+
+#~ msgid "Next Version?"
+#~ msgstr "Siguiente Versión?"
+
+#~ msgid ""
+#~ "This splitting mode has not been\n"
+#~ "implemented yet... Sorry."
+#~ msgstr ""
+#~ "Este modo dividir no ha sido\n"
+#~ "implementado aún... Lo sentimos."
+
+#~ msgid ""
+#~ "Case-sensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr ""
+#~ "Ordenamiento sensible a mayúsculas/minúsculas no funcionará\n"
+#~ "correctamente con caracteres no ASCII"
+
+#~ msgid ""
+#~ "Case-insensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr ""
+#~ "Ordenamiento no sensible a mayúsculas/minúsculas no funcionará\n"
+#~ "correctamente con caracteres no ASCII"
+
+#~ msgid "Numerical Mode?"
+#~ msgstr "Modo Numérico?"
+
+#~ msgid "Never"
+#~ msgstr "Nunca"
+
+#~ msgid "On Every Access"
+#~ msgstr "Cada vez que Accese"
+
+#~ msgid "Mounting"
+#~ msgstr "Montar"
+
+#~ msgid "Mount When?"
+#~ msgstr "Cuándo Montar?"
+
+#~ msgid "Mount Options"
+#~ msgstr "Opciones de Montaje"
+
+#~ msgid "Mount Command"
+#~ msgstr "Comando para Montar"
+
+#~ msgid "Unmount Command"
+#~ msgstr "Comando para Desmontar"
+
+#~ msgid "Only Mount on Toplevel Directories?"
+#~ msgstr "Solo Montar en los Directorios del Nivel más Alto?"
+
+#~ msgid "Use Command Error Dialog?"
+#~ msgstr "Usar Diálogo de Error de Comando?"
+
+#~ msgid "Unmount When gentoo Quits?"
+#~ msgstr "Desmontar al Salir de gentoo?"
+
+#~ msgid "FAM: Supported and active."
+#~ msgstr "FAM: Soportado y activo."
+
+#~ msgid "FAM: Supported, but not active."
+#~ msgstr "FAM: Soportado, pero no activado."
+
+#~ msgid "FAM: Not supported."
+#~ msgstr "FAM: No soportado."
+
+#~ msgid ""
+#~ "Can't copy directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "No se puede copiar el directorio \"%s\"\n"
+#~ "a \"%s\":\n"
+#~ "el directorio fuente contiene al de destino."
+
+#~ msgid "Wrap Around At Top And Bottom?"
+#~ msgstr "Envolver Arriba y Abajo?"
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "No es posible mover el directorio \"%s\"\n"
+#~ "a \"%s\":\n"
+#~ "el directorio fuente contiene al de destino."
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the destination contains the source."
+#~ msgstr ""
+#~ "No es posible mover el directorio \"%s\"\n"
+#~ "a \"%s\":\n"
+#~ "El directorio destino contiene al fuente."
+
+#~ msgid "Regular expression error:\n"
+#~ msgstr "Error en la expresión regular:\n"
+
+#~ msgid "Use mmap() to Speed Loading?"
+#~ msgstr "Usar mmap() para Acelerar Carga?"
+
+#, fuzzy
+#~ msgid " (%%s/%%s, %%%s/%%%s blocks)"
+#~ msgstr " (%s/%s, %Lu/%Lu bloques)"
+
+#~ msgid ""
+#~ "Do not use FAM to automatically detect changes in viewed directories."
+#~ msgstr "No usar FAM para detectar cambios en directorios vistos."
+
+#~ msgid "Couldn't initialize mount data - automounting won't work"
+#~ msgstr "No fue posible iniciar montaje de datos - automontaje no funcionará"
+
+#~ msgid "FAM open failed, error %d--FAM will not be used"
+#~ msgstr "Abrir FAM falló, error %d--FAM no será usado"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, "
+#~ "perhaps)"
+#~ msgstr ""
+#~ "No es posible agregar monitor FAM a \"%s\", error %s\n"
+#~ "(reiniciar con --no-fam\n"
+#~ " podría evitar este problema)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go "
+#~ "around, perhaps)"
+#~ msgstr ""
+#~ "No es posible agregar monitor FAM a \"%s\", error %s\n"
+#~ "(reiniciar con --no-fam\n"
+#~ " podría evitar este problema)"
+
+#~ msgid "Execution of \"%s %s\" failed:\n"
+#~ msgstr "La ejecución de \"%s %s\" falló:\n"
+
+#~ msgid "Mounting \"%s\" on \"%s\"..."
+#~ msgstr "Montando \"%s\" en \"%s\"..."
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Old: %%%s bytes, changed on %%s,\n"
+#~ "New: %%%s bytes, changed on %%s."
+#~ msgstr ""
+#~ "\n"
+#~ "Anterior: %llu bytes, modificado en %s.\n"
+#~ "Nuevo: %llu bytes, modificado en %s."
+
+#~ msgid "File reading"
+#~ msgstr "Lectura de Archivo"
+
+#, fuzzy
+#~ msgid "Pick Command ..."
+#~ msgstr "Seleccionar Código"
+
+#, fuzzy
+#~ msgid "Clr"
+#~ msgstr "Limpiar"
+
+#, fuzzy
+#~ msgid "Buffer Size for mmap()"
+#~ msgstr "Tamaño del Buffer"
+
+#~ msgid "%s: Couldn't set text domain to \"%s\"\n"
+#~ msgstr "%s: No fue posible establecer el dominio del texto a \"%s\"\n"
+
+#~ msgid "Top"
+#~ msgstr "Inicio"
+
+#~ msgid "Bottom"
+#~ msgstr "Fin"
+
+#~ msgid "_Goto..."
+#~ msgstr "_Ir a..."
+
+#~ msgid "_Search..."
+#~ msgstr "_Buscar"
+
+#~ msgid "_Quit"
+#~ msgstr "_Salir"

gentoo-0.15.6.tar.bz2/po/es_MX.gmo -> gentoo-0.19.9.tar.gz/po/es_MX.gmo Changed

gentoo-0.15.6.tar.bz2/po/es_MX.po -> gentoo-0.19.9.tar.gz/po/es_MX.po Changed

@@ -2,10 +2,11 @@
 msgstr ""
 "Project-Id-Version: gentoo\n"
 "Report-Msgid-Bugs-To: Emil Brink\n"
-"POT-Creation-Date: 2009-07-11 19:05+0200\n"
+"POT-Creation-Date: 2011-01-26 21:54+0100\n"
 "PO-Revision-Date: 2007-01-24 16:46+0000\n"
 "Last-Translator: Hugo F Ritter Vazquez <mahfrv@bristol.ac.uk>\n"
 "Language-Team: Language es-MX\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,7 @@
 msgid "Set Row Width"
 msgstr "Establecer Ancho de Fila"
 
-#: src/cfg_buttons.c:326 src/cfg_buttons.c:749
+#: src/cfg_buttons.c:326 src/cfg_buttons.c:748
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -98,7 +99,7 @@
 msgid "Really delete current button row?"
 msgstr "Estás seguro que deseas borrar la fila de botones seleccionada?"
 
-#: src/cfg_buttons.c:439 src/cfg_styles.c:671
+#: src/cfg_buttons.c:439 src/cfg_styles.c:680
 msgid "_Delete|_Cancel"
 msgstr "_Borrar|_Cancelar"
 
@@ -122,104 +123,104 @@
 msgid "Label"
 msgstr "Etiqueta"
 
-#: src/cfg_buttons.c:685 src/cfg_controls.c:645 src/cfg_controls.c:696
-#: src/cfg_controls.c:718 src/cfg_controls.c:739
+#: src/cfg_buttons.c:686 src/cfg_controls.c:612 src/cfg_controls.c:663
+#: src/cfg_controls.c:685
 msgid "Command"
 msgstr "Comando"
 
-#: src/cfg_buttons.c:696 src/cfg_controls.c:639
+#: src/cfg_buttons.c:697 src/cfg_controls.c:606
 msgid "Key"
 msgstr "Teclas"
 
-#: src/cfg_buttons.c:711 src/cfg_dirpane.c:1373
+#: src/cfg_buttons.c:712
 msgid "Colors"
 msgstr "Colores"
 
-#: src/cfg_buttons.c:715
+#: src/cfg_buttons.c:716
 msgid "Background..."
 msgstr "Fondo..."
 
-#: src/cfg_buttons.c:716 src/cfg_buttons.c:722
+#: src/cfg_buttons.c:717 src/cfg_buttons.c:723
 msgid "Reset to Default"
 msgstr "Restablecer Predeterminado"
 
-#: src/cfg_buttons.c:721
+#: src/cfg_buttons.c:722
 msgid "Foreground..."
 msgstr "Frente..."
 
-#: src/cfg_buttons.c:749
+#: src/cfg_buttons.c:748
 msgid "Shortcuts"
 msgstr "Funciones Rápidas"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy Colors To"
 msgstr "Copiar Colores a"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy To"
 msgstr "Copiar a"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Swap With"
 msgstr "Cambiar con"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Add Row..."
 msgstr "Añadir Fila..."
 
-#: src/cfg_buttons.c:751 src/cfg_cmdseq.c:951
+#: src/cfg_buttons.c:750 src/cfg_cmdseq.c:966
 msgid "Delete Row"
 msgstr "Borrar Fila"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Down"
 msgstr "Abajo"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Row Width..."
 msgstr "Ancho de Fila"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Up"
 msgstr "Arriba"
 
-#: src/cfg_buttons.c:762
+#: src/cfg_buttons.c:761
 msgid "Sheet"
 msgstr "Panel"
 
-#: src/cfg_buttons.c:778
+#: src/cfg_buttons.c:775
 msgid "Primary"
 msgstr "Principal"
 
-#: src/cfg_buttons.c:780
+#: src/cfg_buttons.c:777
 msgid "Secondary"
 msgstr "Secundario"
 
-#: src/cfg_buttons.c:785
+#: src/cfg_buttons.c:782
 msgid "Tooltip"
 msgstr "Consejo"
 
-#: src/cfg_buttons.c:792 src/cfg_dirpane.c:1145
+#: src/cfg_buttons.c:790 src/cfg_dirpane.c:1107
 msgid "Flags"
 msgstr "Banderas"
 
-#: src/cfg_buttons.c:794
+#: src/cfg_buttons.c:792
 msgid "Narrow?"
 msgstr "Refinar?"
 
-#: src/cfg_buttons.c:798
+#: src/cfg_buttons.c:796
 msgid "Show Tooltip?"
 msgstr "Mostrar Consejo?"
 
-#: src/cfg_buttons.c:833
+#: src/cfg_buttons.c:831
 msgid "Buttons"
 msgstr "Botones"
 
-#: src/cfg_buttons.c:834 src/cfg_cmdseq.c:1067
+#: src/cfg_buttons.c:832 src/cfg_cmdseq.c:1081
 msgid "Definitions"
 msgstr "Definiciones"
 
@@ -227,261 +228,302 @@
 msgid "Options"
 msgstr "Opciones"
 
-#: src/cfg_cmdseq.c:610
+#: src/cfg_cmdseq.c:611
 msgid "Select Builtin"
 msgstr "Seleccionar Predeterminado"
 
-#: src/cfg_cmdseq.c:626
+#: src/cfg_cmdseq.c:627
 msgid "Opening brace"
 msgstr "Llave abriendo"
 
-#: src/cfg_cmdseq.c:627
+#: src/cfg_cmdseq.c:628
 msgid "Closing brace"
 msgstr "Llave cerrando"
 
-#: src/cfg_cmdseq.c:628
+#: src/cfg_cmdseq.c:629
 msgid "First selected"
 msgstr "El primero seleccionado"
 
-#: src/cfg_cmdseq.c:629
+#: src/cfg_cmdseq.c:630
 msgid "First selected, unselect"
 msgstr "Seleccionado por primera vez, des-seleccionar"
 
-#: src/cfg_cmdseq.c:630
+#: src/cfg_cmdseq.c:631
 msgid "First selected, with path"
 msgstr "El primero seleccionado, con ruta"
 
-#: src/cfg_cmdseq.c:631
+#: src/cfg_cmdseq.c:632
 msgid "First selected, with path, unselect"
 msgstr "El primero seleccionado, con ruta, des-seleccionar"
 
-#: src/cfg_cmdseq.c:632
+#: src/cfg_cmdseq.c:633
 msgid "First selected (destination pane)"
 msgstr "El primero seleccionado (panel de destino)"
 
-#: src/cfg_cmdseq.c:633
+#: src/cfg_cmdseq.c:634
 msgid "First selected, no quotes"
 msgstr "El primero seleccionado sin comillas"
 
-#: src/cfg_cmdseq.c:634
+#: src/cfg_cmdseq.c:635
 msgid "All selected"
 msgstr "Todos los seleccionados"
 
-#: src/cfg_cmdseq.c:635
+#: src/cfg_cmdseq.c:636
 msgid "All selected, unselect"
 msgstr "Todos los seleccionados, des-seleccionar"
 
-#: src/cfg_cmdseq.c:636
+#: src/cfg_cmdseq.c:637
 msgid "All selected, with paths"
 msgstr "Todos los seleccionados, con rutas"
 
-#: src/cfg_cmdseq.c:637
+#: src/cfg_cmdseq.c:638
 msgid "All selected, with paths, unselect"
 msgstr "Todos los seleccionados, con rutas, des-seleccionar"
 
-#: src/cfg_cmdseq.c:638
+#: src/cfg_cmdseq.c:639
 msgid "All selected (destination pane)"
 msgstr "Todos los seleccionados (panel de destino)"
 
-#: src/cfg_cmdseq.c:639
+#: src/cfg_cmdseq.c:640
 msgid "All selected, no quotes"
 msgstr "Todos los seleccionados, no comillas"
 
-#: src/cfg_cmdseq.c:640
+#: src/cfg_cmdseq.c:641
 msgid "Path to source pane's directory"
 msgstr "Ruta al directorio del panel de origen"
 
-#: src/cfg_cmdseq.c:641
+#: src/cfg_cmdseq.c:642
 msgid "Path to destination pane's directory"
 msgstr "Ruta al directorio del panel de destino"
 
-#: src/cfg_cmdseq.c:642
+#: src/cfg_cmdseq.c:643
 msgid "Path to home directory"
 msgstr "Ruta al directorio home"
 
-#: src/cfg_cmdseq.c:643
+#: src/cfg_cmdseq.c:644
 msgid "Path of left pane"
 msgstr "Ruta del panel izquierdo"
 
-#: src/cfg_cmdseq.c:644
+#: src/cfg_cmdseq.c:645
 msgid "Path of right pane"
 msgstr "Ruta del panel derecho"
 
-#: src/cfg_cmdseq.c:645
+#: src/cfg_cmdseq.c:646
+#, fuzzy
+msgid "URI of first selected"
+msgstr "El primero seleccionado"
+
+#: src/cfg_cmdseq.c:647
+#, fuzzy
+msgid "URI of first selected, unselect"
+msgstr "Seleccionado por primera vez, des-seleccionar"
+
+#: src/cfg_cmdseq.c:648
+#, fuzzy
+msgid "URI of first selected, no quotes"
+msgstr "El primero seleccionado sin comillas"
+
+#: src/cfg_cmdseq.c:649
+#, fuzzy
+msgid "URIs of all selected"
+msgstr "Todos los seleccionados"
+
+#: src/cfg_cmdseq.c:650
+#, fuzzy
+msgid "URIs of all selected, unselect"
+msgstr "Todos los seleccionados, des-seleccionar"
+
+#: src/cfg_cmdseq.c:651
+#, fuzzy
+msgid "URIs of all selected, no quotes"
+msgstr "Todos los seleccionados, no comillas"
+
+#: src/cfg_cmdseq.c:652
+#, fuzzy
+msgid "URIs of all selected, unselect, no quotes"
+msgstr "Todos los seleccionados, no comillas"
+
+#: src/cfg_cmdseq.c:653
+#, fuzzy
+msgid "URI of first selected (destination pane)"
+msgstr "El primero seleccionado (panel de destino)"
+
+#: src/cfg_cmdseq.c:654
 msgid "Input combo box"
 msgstr "Caja de entrada"
 
-#: src/cfg_cmdseq.c:646
+#: src/cfg_cmdseq.c:655
 msgid "Input using menu"
 msgstr "Entrada usando menú"
 
-#: src/cfg_cmdseq.c:647
+#: src/cfg_cmdseq.c:656
 msgid "Input string"
 msgstr "Texto de entrada"
 
-#: src/cfg_cmdseq.c:648
+#: src/cfg_cmdseq.c:657
 msgid "Input check button (gives TRUE or FALSE)"
 msgstr "Botón de Opcion de entrada (da TRUE o FALSE)"
 
-#: src/cfg_cmdseq.c:649
+#: src/cfg_cmdseq.c:658
 msgid "Add label to input window"
 msgstr "Agregar etiqueta a la ventana de entrada"
 
-#: src/cfg_cmdseq.c:650
+#: src/cfg_cmdseq.c:659
 msgid "Add a separator bar to input window"
 msgstr "Agregar una barra de separación a la ventana de entrada"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "$NAME"
 msgstr "$NOMBRE"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "Value of $NAME (environment)"
 msgstr "Valor de $NOMBRE (entorno)"
 
-#: src/cfg_cmdseq.c:652
+#: src/cfg_cmdseq.c:661
 msgid "gentoo's PID"
 msgstr "PID de gentoo"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "Home directory for user NAME"
 msgstr "Directorio home del usuario NOMBRE"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "~NAME"
 msgstr "~NOMBRE"
 
-#: src/cfg_cmdseq.c:677
+#: src/cfg_cmdseq.c:686 src/cmd_split.c:536
 msgid "Pick Code"
 msgstr "Seleccionar Código"
 
-#: src/cfg_cmdseq.c:765
+#: src/cfg_cmdseq.c:778
 msgid "(No Options Available)"
 msgstr "(No hay opciones disponibles)"
 
-#: src/cfg_cmdseq.c:801
+#: src/cfg_cmdseq.c:814
 msgid "Run in Background?"
 msgstr "Ejecutar en segundo plano?"
 
-#: src/cfg_cmdseq.c:805
+#: src/cfg_cmdseq.c:818
 msgid "Kill Previous Instance?"
 msgstr "Matar Instancia Anterior"
 
-#: src/cfg_cmdseq.c:809
+#: src/cfg_cmdseq.c:822
 msgid "Survive Quit?"
 msgstr "Sobrevivir Abandonar?"
 
-#: src/cfg_cmdseq.c:815
+#: src/cfg_cmdseq.c:828
 msgid "Capture Output?"
 msgstr "Capturar Salida?"
 
-#: src/cfg_cmdseq.c:900
+#: src/cfg_cmdseq.c:913
 msgid "Before Execution"
 msgstr "Previo a la Ejecución"
 
-#: src/cfg_cmdseq.c:903
+#: src/cfg_cmdseq.c:916
 msgid "Require Source Selection?"
 msgstr "Requerir Selección del Fuente?"
 
-#: src/cfg_cmdseq.c:907
+#: src/cfg_cmdseq.c:920
 msgid "Require Destination Selection?"
 msgstr "Requerir Selección del Destino?"
 
-#: src/cfg_cmdseq.c:912
+#: src/cfg_cmdseq.c:926
 msgid "CD Source?"
 msgstr "CD Fuente?"
 
-#: src/cfg_cmdseq.c:915
+#: src/cfg_cmdseq.c:929
 msgid "CD Destination?"
 msgstr "CD Destino?"
 
-#: src/cfg_cmdseq.c:922
+#: src/cfg_cmdseq.c:937
 msgid "After Execution"
 msgstr "Posterior a la Ejecución"
 
-#: src/cfg_cmdseq.c:924
+#: src/cfg_cmdseq.c:939
 msgid "Rescan Source?"
 msgstr "Actualizar Fuente?"
 
-#: src/cfg_cmdseq.c:928
+#: src/cfg_cmdseq.c:943
 msgid "Rescan Destination?"
 msgstr "Actualizar Destino?"
 
-#: src/cfg_cmdseq.c:942
+#: src/cfg_cmdseq.c:957
 #, fuzzy
 msgid "General"
 msgstr "Centro"
 
-#: src/cfg_cmdseq.c:945
+#: src/cfg_cmdseq.c:960
 msgid "Before&After"
 msgstr ""
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "Built-In"
 msgstr "Predefinidos"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "External"
 msgstr "Externas"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Add Row"
 msgstr "Agregar Fila"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: src/cfg_cmdseq.c:978 src/cfg_styles.c:588 src/cfg_styles.c:805
-#: src/cfg_types.c:679 src/cmd_symlink.c:209 src/dpformat.c:35
+#: src/cfg_cmdseq.c:993 src/cfg_styles.c:596 src/cfg_styles.c:823
+#: src/cfg_types.c:678 src/cmd_info.c:151 src/cmd_split.c:648
+#: src/cmd_symlink.c:213 src/dpformat.c:36
 msgid "Name"
 msgstr "Nombre"
 
-#: src/cfg_cmdseq.c:988
+#: src/cfg_cmdseq.c:1004
 msgid "Definition"
 msgstr "Definición"
 
-#: src/cfg_cmdseq.c:1044
+#: src/cfg_cmdseq.c:1058
 msgid "Repeat Sequence Until No Source Selection?"
 msgstr "Repetir Secuencia Hasta Terminar con la Seleccion de Origen"
 
-#: src/cfg_cmdseq.c:1056 src/cfg_controls.c:655 src/cfg_controls.c:706
-#: src/cfg_styles.c:833 src/cfg_types.c:775
+#: src/cfg_cmdseq.c:1070 src/cfg_controls.c:622 src/cfg_controls.c:673
+#: src/cfg_styles.c:853 src/cfg_types.c:776
 msgid "Add"
 msgstr "Agregar"
 
-#: src/cfg_cmdseq.c:1059 src/cfg_controls.c:658 src/cfg_controls.c:709
-#: src/cfg_styles.c:836 src/cfg_types.c:788
+#: src/cfg_cmdseq.c:1073 src/cfg_controls.c:625 src/cfg_controls.c:676
+#: src/cfg_styles.c:856 src/cfg_types.c:789
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/cfg_cmdseq.c:1066
+#: src/cfg_cmdseq.c:1080
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1365 src/cfg_dirpane.c:1371
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1288 src/cfg_dirpane.c:1293
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Middle"
 msgstr "Centro"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1364 src/cfg_dirpane.c:1372
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1287 src/cfg_dirpane.c:1294
 msgid "Right"
 msgstr "Derecha"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Down"
 msgstr "Bajar"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Up"
 msgstr "Subir"
 
-#: src/cfg_controls.c:382
+#: src/cfg_controls.c:378
 msgid ""
 "The following modifier key(s) must\n"
 "be held down when the mouse button\n"
@@ -491,47 +533,43 @@
 "mantenerse apretadas al hacer click con el ratón\n"
 "para ejecutar el comando"
 
-#: src/cfg_controls.c:395
+#: src/cfg_controls.c:391
 msgid "Edit Modifiers"
 msgstr "Editar Modificadores"
 
-#: src/cfg_controls.c:613
+#: src/cfg_controls.c:580
 msgid "Controls"
 msgstr "Controles"
 
-#: src/cfg_controls.c:620
+#: src/cfg_controls.c:587
 msgid "Global Keyboard Shortcuts"
 msgstr "Funciones Rápidas del Teclado Globales"
 
-#: src/cfg_controls.c:665
+#: src/cfg_controls.c:632
 msgid "Dirpane Mouse Buttons"
 msgstr ""
 
-#: src/cfg_controls.c:690
+#: src/cfg_controls.c:657
 msgid "Button"
 msgstr "Botón"
 
-#: src/cfg_controls.c:693
+#: src/cfg_controls.c:660
 msgid "Edit Modifiers..."
 msgstr "Editar Modificadores..."
 
-#: src/cfg_controls.c:716
+#: src/cfg_controls.c:683
 msgid "Click-M-Click Gesture"
 msgstr ""
 
-#: src/cfg_controls.c:726
+#: src/cfg_controls.c:693
 msgid "Time Limit"
 msgstr "Límite de tiempo"
 
-#: src/cfg_controls.c:737
-msgid "Path Right Click"
-msgstr ""
-
-#: src/cfg_controls.c:750
+#: src/cfg_controls.c:704
 msgid "Ignore Num Lock For All Bindings?"
 msgstr ""
 
-#: src/cfg_controls.c:780
+#: src/cfg_controls.c:734
 msgid ""
 "Note: The mouse button control settings\n"
 "are ambiguous: the same button+modifier\n"
@@ -543,427 +581,394 @@
 "es usado para más de una función. Esto\n"
 "puede hacer que se comporten un poco extraño..."
 
-#: src/cfg_controls.c:784
+#: src/cfg_controls.c:738
 msgid "Warning"
 msgstr "Advertencia"
 
-#: src/cfg_controls.c:784 src/children.c:95 src/cmd_info.c:246
+#: src/cfg_controls.c:738 src/children.c:89 src/cmd_info.c:320
 msgid "_OK"
 msgstr "_OK"
 
-#: src/cfg_dirpane.c:365
-msgid "Formatted Size, in bytes"
-msgstr "Tamaño con Formato, en bytes"
-
-#: src/cfg_dirpane.c:365
-msgid "Raw Size, in Bytes"
-msgstr "Tamaño sin Formato en Bytes"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in kilobytes"
-msgstr "Tamaño con Formato, en kilobytes"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in megabytes"
-msgstr "Tamaño con formato, en megabytes"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, \"Smart\" Unit"
-msgstr "Tamaño con formato, unidades \"inteligentes\""
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, in gigabytes"
-msgstr "Tamaño con formato, en gigabytes"
-
-#: src/cfg_dirpane.c:383
+#: src/cfg_dirpane.c:333
 msgid "Append Type Character?"
 msgstr "Agregar Caracter de Tipo?"
 
-#: src/cfg_dirpane.c:386
-msgid "Append \"-> destination\" on Links?"
+#: src/cfg_dirpane.c:336
+#, fuzzy
+msgid "Append \"→ destination\" on Links?"
 msgstr "Agregar \"-> destino\" a Ligas?"
 
-#: src/cfg_dirpane.c:406
+#: src/cfg_dirpane.c:358
 msgid "Place Tick Every 3 Digits?"
 msgstr "Marca Cada 3 dígitos?"
 
-#: src/cfg_dirpane.c:416
+#: src/cfg_dirpane.c:369
 msgid "Digits of Precision"
 msgstr "Digitos de Precisión"
 
-#: src/cfg_dirpane.c:429
+#: src/cfg_dirpane.c:382
 msgid "Show Dir's File System Size?"
 msgstr "Mostrar tamaño del Directorio en Sistema de Archivos"
 
-#: src/cfg_dirpane.c:435 src/cfg_dirpane.c:439 src/cfg_dirpane.c:443
-#: src/cfg_dirpane.c:447 src/cfg_dirpane.c:451 src/cfg_dirpane.c:455
-#: src/cfg_dirpane.c:459 src/cfg_dirpane.c:463 src/cfg_dirpane.c:467
-#: src/cfg_dirpane.c:474
+#: src/cfg_dirpane.c:388 src/cfg_dirpane.c:392 src/cfg_dirpane.c:396
+#: src/cfg_dirpane.c:400 src/cfg_dirpane.c:404 src/cfg_dirpane.c:408
+#: src/cfg_dirpane.c:412 src/cfg_dirpane.c:416 src/cfg_dirpane.c:420
+#: src/cfg_dirpane.c:428
 msgid "Format"
 msgstr "Formato"
 
-#: src/cfg_dirpane.c:497
+#: src/cfg_dirpane.c:454
 #, c-format
 msgid "%s Settings"
 msgstr "%s Opciones"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1002 src/cfg_dirpane.c:1003
-#: src/cmd_select.c:414
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:970 src/cfg_dirpane.c:971
+#: src/cmd_select.c:381
 msgid "Content"
 msgstr "Contenido"
 
-#: src/cfg_dirpane.c:611
+#: src/cfg_dirpane.c:571
 msgid "Justification"
 msgstr "Justificación"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1003
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:971
 msgid "Title"
 msgstr "Título"
 
-#: src/cfg_dirpane.c:611 src/window.c:201
+#: src/cfg_dirpane.c:571 src/window.c:200
 msgid "Width"
 msgstr "Ancho"
 
-#: src/cfg_dirpane.c:612
+#: src/cfg_dirpane.c:572
 msgid "Center"
 msgstr "Centro"
 
-#: src/cfg_dirpane.c:621
+#: src/cfg_dirpane.c:581
 msgid "Basic Settings"
 msgstr "Opciones Básicas"
 
-#: src/cfg_dirpane.c:669
+#: src/cfg_dirpane.c:628
 msgid "Edit Column Content"
 msgstr "Editar Contenido de la Columna"
 
-#: src/cfg_dirpane.c:1002
+#: src/cfg_dirpane.c:970
 msgid "Default Title"
 msgstr "Título Predeterminado"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories First"
 msgstr "Directorios al Principio"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Last"
 msgstr "Directorios al Final"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Mixed"
 msgstr "Mezclar Directorios"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Left of List"
 msgstr "Izquierda de la Lista"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Right of List"
 msgstr "Derecha de la Lista"
 
-#: src/cfg_dirpane.c:1029 src/cfg_dirpane.c:1030
+#: src/cfg_dirpane.c:997
 msgid "System Default"
 msgstr "Predeterminado"
 
-#: src/cfg_dirpane.c:1030
-msgid "Always Set"
-msgstr "Siempre Establecer"
-
-#: src/cfg_dirpane.c:1030 src/cmd_chmod.c:260 src/menus.c:513
-msgid "Toggle"
-msgstr ""
-
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, fuzzy, c-format
 msgid "Copy From %s"
 msgstr "Copiar Desde"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, fuzzy, c-format
 msgid "Copy To %s"
 msgstr "Copiar a"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, fuzzy, c-format
 msgid "Swap With %s"
 msgstr "Intercambiar con"
 
-#: src/cfg_dirpane.c:1048
+#: src/cfg_dirpane.c:1015
 msgid "Columns"
 msgstr "Columnas"
 
-#: src/cfg_dirpane.c:1053
+#: src/cfg_dirpane.c:1020
 msgid "Available Content Types"
 msgstr "Tipos de Contenido Disponibles"
 
-#: src/cfg_dirpane.c:1070
+#: src/cfg_dirpane.c:1037
 msgid "Selected Content Types"
 msgstr "Tipos de Contenido Seleccionados"
 
-#: src/cfg_dirpane.c:1081 src/cfg_styles.c:723
+#: src/cfg_dirpane.c:1049 src/cfg_styles.c:741
 msgid "Edit..."
 msgstr "Editar..."
 
-#: src/cfg_dirpane.c:1082 src/cmd_renamere.c:508
+#: src/cfg_dirpane.c:1050 src/cmd_renamere.c:481
 msgid "Remove"
 msgstr "Remover"
 
-#: src/cfg_dirpane.c:1096
+#: src/cfg_dirpane.c:1064
 msgid "Sorting"
 msgstr "Ordenar"
 
-#: src/cfg_dirpane.c:1099
+#: src/cfg_dirpane.c:1067
 msgid "Sort On"
 msgstr "Orden por"
 
-#: src/cfg_dirpane.c:1106 src/cmd_split.c:233 src/dpformat.c:39
-#: src/dpformat.c:40
+#: src/cfg_dirpane.c:1071 src/cmd_split.c:590 src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode"
 msgstr "Modo"
 
-#: src/cfg_dirpane.c:1113
+#: src/cfg_dirpane.c:1077
 msgid "Inverse Sorting?"
 msgstr "Orden Inverso?"
 
-#: src/cfg_dirpane.c:1116 src/cfg_paths.c:187 src/cfg_types.c:743
-#: src/cmd_renamere.c:459 src/cmd_renamere.c:486 src/cmd_select.c:520
-#: src/textview.c:620
+#: src/cfg_dirpane.c:1080 src/cfg_paths.c:228 src/cfg_types.c:744
+#: src/cmd_renamere.c:432 src/cmd_renamere.c:459 src/cmd_select.c:478
+#: src/textview.c:604
 msgid "Ignore Case?"
 msgstr "Ignorar mayúsculas/minúsculas"
 
-#: src/cfg_dirpane.c:1119
-msgid "Numerical Mode?"
-msgstr "Modo Numérico?"
-
-#: src/cfg_dirpane.c:1127
+#: src/cfg_dirpane.c:1088
 msgid "Default Directory"
 msgstr "Directorio Predeterminado"
 
-#: src/cfg_dirpane.c:1132
+#: src/cfg_dirpane.c:1094
 msgid "Grab Current"
 msgstr "Obtener Actual"
 
-#: src/cfg_dirpane.c:1135
+#: src/cfg_dirpane.c:1097
 msgid "From History"
 msgstr "Desde Historial"
 
-#: src/cfg_dirpane.c:1148
+#: src/cfg_dirpane.c:1110
 msgid "Path Above?"
 msgstr "Ruta Arriba?"
 
-#: src/cfg_dirpane.c:1152
+#: src/cfg_dirpane.c:1114
 msgid "Hide Allowed?"
 msgstr "Esconder permitido?"
 
-#: src/cfg_dirpane.c:1156
+#: src/cfg_dirpane.c:1118
 msgid "Scrollbar Always?"
 msgstr "Siempre Barras de Desplazamiento?"
 
-#: src/cfg_dirpane.c:1160
+#: src/cfg_dirpane.c:1122
 msgid "Huge Parent Button?"
 msgstr "Botón Subir Gigante?"
 
-#: src/cfg_dirpane.c:1168
+#: src/cfg_dirpane.c:1127
+msgid "Set Custom Font?"
+msgstr ""
+
+#: src/cfg_dirpane.c:1140
 msgid "Scrollbar Position"
 msgstr "Barra de Desplazamiento"
 
-#: src/cfg_dirpane.c:1180
-msgid "Modify 'Control' Key State"
-msgstr "Estado de la Tecla 'Control'"
-
-#: src/cfg_dirpane.c:1225
-msgid "Active Pane Titles"
-msgstr "Títulos de Paneles Activos"
-
-#: src/cfg_dirpane.c:1225
-msgid "Focused Row, Unselected"
-msgstr "Fila en Foco, No Seleccionada"
-
-#: src/cfg_dirpane.c:1226
-msgid "Focused Row, Selected"
-msgstr "Fila en Foco, Seleccionada"
-
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Horizontal"
 msgstr ""
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Vertical"
 msgstr ""
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Don't Track"
 msgstr "No Rastrear"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Ratio"
 msgstr "Proporción"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Left Pane"
 msgstr "Tamaño, Panel Izquierdo"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Right Pane"
 msgstr "Tamaño, Panel Derecho"
 
-#: src/cfg_dirpane.c:1275
+#: src/cfg_dirpane.c:1198
 msgid "Pane Orientation"
 msgstr "Orientación del Panel"
 
-#: src/cfg_dirpane.c:1289
+#: src/cfg_dirpane.c:1212
 msgid "Split Tracking"
 msgstr "Rastrear División"
 
-#: src/cfg_dirpane.c:1312
+#: src/cfg_dirpane.c:1235
 msgid "pixels"
 msgstr "pixeles"
 
-#: src/cfg_dirpane.c:1340
+#: src/cfg_dirpane.c:1263
 msgid "Remember Selected Rows?"
 msgstr "Recordar Filas Seleccionadas?"
 
-#: src/cfg_dirpane.c:1343
+#: src/cfg_dirpane.c:1266
 msgid "Save History Lists?"
 msgstr "Guardar Listas de Historial?"
 
-#: src/cfg_dirpane.c:1360 src/cfg_dirpane.c:1370
+#: src/cfg_dirpane.c:1283 src/cfg_dirpane.c:1292
 msgid "Dir Panes"
 msgstr "Paneles de Directorios"
 
-#: src/cfg_dirpane.c:1374
+#: src/cfg_dirpane.c:1295
 msgid "Pane Split"
 msgstr "Separación de Paneles"
 
-#: src/cfg_dirpane.c:1375
+#: src/cfg_dirpane.c:1296
 msgid "History"
 msgstr "Historial"
 
-#: src/cfg_errors.c:45
-msgid "Errors"
-msgstr "Errores"
+#: src/cfg_dirpane.c:1725
+msgid "'Blocks' Content Deprecated"
+msgstr ""
 
-#: src/cfg_errors.c:52
-msgid "Use Dialog to Report Errors?"
-msgstr "Usar Diálogo para Reportar Errores?"
+#: src/cfg_dirpane.c:1726
+msgid ""
+"The 'Blocks' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
 
-#: src/cfg_errors.c:56
-msgid "Cause Console Beep on Error?"
-msgstr "Alarma en Caso de Error?"
+#: src/cfg_dirpane.c:1732
+msgid "'Block Size' Content Deprecated"
+msgstr ""
 
-#: src/cfg_menus.c:44
-msgid "Menus"
-msgstr "Menús"
+#: src/cfg_dirpane.c:1733
+msgid ""
+"The 'Block Size' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
 
-#: src/cfg_mount.c:168
-msgid "Never"
-msgstr "Nunca"
+#: src/cfg_errors.c:48
+msgid "Errors"
+msgstr "Errores"
 
-#: src/cfg_mount.c:168
-msgid "On Every Access"
-msgstr "Cada vez que Accese"
+#: src/cfg_errors.c:55
+msgid "Error and Status Message Display"
+msgstr ""
 
-#: src/cfg_mount.c:177
-msgid "Mounting"
-msgstr "Montar"
+#: src/cfg_errors.c:57
+msgid "Status Bar, Above Panes"
+msgstr ""
 
-#: src/cfg_mount.c:184
-msgid "Mount When?"
-msgstr "Cuándo Montar?"
+#: src/cfg_errors.c:60
+msgid "Main Window's Title Bar"
+msgstr ""
 
-#: src/cfg_mount.c:196
-msgid "Mount Options"
-msgstr "Opciones de Montaje"
+#: src/cfg_errors.c:63
+msgid "Separate Dialog"
+msgstr ""
 
-#: src/cfg_mount.c:199
-msgid "Mount Command"
-msgstr "Comando para Montar"
+#: src/cfg_errors.c:69
+msgid "Cause Console Beep on Error?"
+msgstr "Alarma en Caso de Error?"
 
-#: src/cfg_mount.c:204
-msgid "Unmount Command"
-msgstr "Comando para Desmontar"
+#: src/cfg_menus.c:44
+msgid "Menus"
+msgstr "Menús"
 
-#: src/cfg_mount.c:211
-msgid "Only Mount on Toplevel Directories?"
-msgstr "Solo Montar en los Directorios del Nivel más Alto?"
+#: src/cfg_nag.c:78
+#, c-format
+msgid ""
+"Click the button below to reset the %zu stored 'Don't show this dialog "
+"again' responses."
+msgstr ""
 
-#: src/cfg_mount.c:214
-msgid "Use Command Error Dialog?"
-msgstr "Usar Diálogo de Error de Comando?"
+#: src/cfg_nag.c:100
+msgid "Nagging"
+msgstr ""
 
-#: src/cfg_mount.c:217
-msgid "Unmount When gentoo Quits?"
-msgstr "Desmontar al Salir de gentoo?"
+#: src/cfg_nag.c:110
+#, fuzzy
+msgid "Reset All"
+msgstr "Restablecer Predeterminado"
 
-#: src/cfg_paths.c:128
-msgid "GTK+ RC"
+#: src/cfg_paths.c:78
+msgid "Edit path"
 msgstr ""
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:152
 msgid "Icons"
 msgstr "Íconos"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:153
+msgid "GTK+ RC"
+msgstr ""
+
+#: src/cfg_paths.c:154
 msgid "fstab"
 msgstr ""
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:155
 msgid "mtab"
 msgstr ""
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Beginning With Dot (.)"
 msgstr "Iniciando con Punto (.)"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Matching RE"
 msgstr "Coincidencias en ER"
 
-#: src/cfg_paths.c:129 src/cmd_chmod.c:259 src/menus.c:512
+#: src/cfg_paths.c:157 src/cmd_chmod.c:252 src/menus.c:519
 msgid "None"
 msgstr "Ninguno"
 
-#: src/cfg_paths.c:135
+#: src/cfg_paths.c:163
 msgid "Paths & Hide"
 msgstr "Rutas y Esconder"
 
-#: src/cfg_paths.c:142
+#: src/cfg_paths.c:170
 msgid "Paths"
 msgstr "Rutas"
 
-#: src/cfg_paths.c:169
+#: src/cfg_paths.c:209
 msgid "Hide Entries"
 msgstr "Esconder Etradas"
 
-#: src/cfg_styles.c:170 src/cfg_types.c:234 src/iconutil.c:29 src/menus.c:19
+#: src/cfg_styles.c:178 src/cfg_types.c:233 src/iconutil.c:31 src/menus.c:19
 msgid "(None)"
 msgstr "(Ninguno)"
 
-#: src/cfg_styles.c:191 src/cfg_styles.c:428 src/cfg_styles.c:767
+#: src/cfg_styles.c:199 src/cfg_styles.c:436 src/cfg_styles.c:785
 msgid "Delete Action"
 msgstr "Acción Borrar"
 
-#: src/cfg_styles.c:411 src/color_dialog.c:48
+#: src/cfg_styles.c:419 src/color_dialog.c:47
 msgid "Edit Color"
 msgstr "Editar Color"
 
-#: src/cfg_styles.c:428
+#: src/cfg_styles.c:436
 msgid "Revert to Inherited Command"
 msgstr "Restablecer Comando Heredado"
 
-#: src/cfg_styles.c:529
+#: src/cfg_styles.c:537
 #, fuzzy
 msgid "Select Command ..."
 msgstr "Seleccionar Comando"
 
-#: src/cfg_styles.c:592
+#: src/cfg_styles.c:601
 msgid "New Action Property"
 msgstr "Nueva Propiedad de la Acción"
 
-#: src/cfg_styles.c:600
+#: src/cfg_styles.c:609
 msgid "something"
 msgstr "algo"
 
-#: src/cfg_styles.c:670
+#: src/cfg_styles.c:679
 msgid ""
 "Deleting this style will also delete\n"
 "all its children. Are you sure?"
@@ -971,140 +976,140 @@
 "Borrar este estilo borrará también\n"
 "todos sus hijos. Estás seguro?"
 
-#: src/cfg_styles.c:671
+#: src/cfg_styles.c:680
 msgid "Confirm Delete"
 msgstr "Comfirmar Borrar"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Background Color"
 msgstr "Color de Fondo"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Foreground Color"
 msgstr "Color Principal"
 
-#: src/cfg_styles.c:694 src/dpformat.c:53
+#: src/cfg_styles.c:703 src/dpformat.c:55
 msgid "Icon"
 msgstr "Ícono"
 
-#: src/cfg_styles.c:696
+#: src/cfg_styles.c:705
 msgid "(Row Style Preview Text)"
 msgstr "(Texto para Previsualizar Estilo de Fila)"
 
-#: src/cfg_styles.c:702 src/cmd_renameseq.c:386
+#: src/cfg_styles.c:713 src/cmd_renameseq.c:358 src/cmd_split.c:656
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: src/cfg_styles.c:719
+#: src/cfg_styles.c:737
 msgid "Override Parent's?"
 msgstr "Sobreescribir el del Padre?"
 
-#: src/cfg_styles.c:723
+#: src/cfg_styles.c:741
 msgid "Pick..."
 msgstr "Escoger..."
 
-#: src/cfg_styles.c:764
+#: src/cfg_styles.c:782
 msgid "Add Action..."
 msgstr "Agregar Acción..."
 
-#: src/cfg_styles.c:810 src/menus.c:525
+#: src/cfg_styles.c:829 src/menus.c:532
 msgid "Parent"
 msgstr "Padre"
 
-#: src/cfg_styles.c:820
+#: src/cfg_styles.c:840
 msgid "Inherited Properties"
 msgstr "Propiedades Heredadas"
 
-#: src/cfg_styles.c:824
+#: src/cfg_styles.c:844
 msgid "Visual"
 msgstr ""
 
-#: src/cfg_styles.c:826
+#: src/cfg_styles.c:846
 msgid "Actions"
 msgstr "Acciones"
 
-#: src/cfg_styles.c:843
+#: src/cfg_styles.c:863
 msgid "File Recognition"
 msgstr "Tipos de Archivos"
 
-#: src/cfg_styles.c:844
+#: src/cfg_styles.c:864
 msgid "Styles"
 msgstr "Estilos"
 
-#: src/cfg_types.c:193
+#: src/cfg_types.c:192
 #, c-format
 msgid "%s - Click to Change..."
 msgstr "%s - Click para Cambiar..."
 
-#: src/cfg_types.c:508
+#: src/cfg_types.c:507
 msgid "(New Type)"
 msgstr "(Nuevo Tipo)"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "B-Dev"
 msgstr ""
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "C-Dev"
 msgstr ""
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Dir"
 msgstr ""
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "FIFO"
 msgstr ""
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "File"
 msgstr "Archivo"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Link"
 msgstr "Liga"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 #, fuzzy
 msgid "Socket"
 msgstr "Grupo"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "Readable"
 msgstr "Lectura"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 #, fuzzy
 msgid "SetGID"
 msgstr "Establecer GID"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 #, fuzzy
 msgid "SetUID"
 msgstr "Establecer UID"
 
-#: src/cfg_types.c:648 src/cmd_chmod.c:209
+#: src/cfg_types.c:647 src/cmd_chmod.c:200
 #, fuzzy
 msgid "Sticky"
 msgstr "Estatico"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Executable"
 msgstr "Ejecución"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Writable"
 msgstr "Escritura"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match 'file' (RE)"
 msgstr "Identificar 'archivo' (ER)"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match Name (RE)"
 msgstr "Identificar Nombre (ER)"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Require Suffix"
 msgstr "Requerir Extensión"
 
@@ -1120,19 +1125,19 @@
 msgid "Require Protection"
 msgstr "Requerir Protección"
 
-#: src/cfg_types.c:738
+#: src/cfg_types.c:739
 msgid "Glob?"
 msgstr ""
 
-#: src/cfg_types.c:754
+#: src/cfg_types.c:755
 msgid "Type's Style"
 msgstr "Estilo del Tipo"
 
-#: src/cfg_types.c:756
+#: src/cfg_types.c:757
 msgid "Style"
 msgstr "Estilo"
 
-#: src/cfg_types.c:796
+#: src/cfg_types.c:797
 msgid "Types"
 msgstr "Tipos"
 
@@ -1161,17 +1166,17 @@
 msgid "Dialog Positioning"
 msgstr "Posición de Diálogos "
 
-#: src/children.c:94
+#: src/children.c:88
 #, c-format
 msgid "Execution of \"%s\" Failed"
 msgstr "Falló la ejecución de \"%s\""
 
-#: src/children.c:95 src/dialog.c:285
+#: src/children.c:89 src/dialog.c:290
 #, fuzzy
 msgid "Error"
 msgstr "Errores"
 
-#: src/children.c:274
+#: src/children.c:227
 #, c-format
 msgid "Couldn't terminate child \"%s\" (pid=%d)--zombie alert"
 msgstr "No se pudo finalizar el proceso hijo \"%s\" (pid=%d)--alerta de zombie"
@@ -1193,7 +1198,7 @@
 
 #: src/cmd_about.c:97
 #, fuzzy
-msgid "(c) 1998-2009 by Emil Brink, Obsession Development.\n"
+msgid "(c) 1998-2011 by Emil Brink, Obsession Development.\n"
 msgstr "(c) 1998-2005 por Emil Brink, Obsession Development.\n"
 
 #: src/cmd_about.c:99
@@ -1204,35 +1209,23 @@
 "Este es software libre y no hay ABSOLUTAMENTE NINGUNA\n"
 "GARANTÍA. Lee el archivo COPYING para más detalles.\n"
 
-#: src/cmd_about.c:106
-msgid "FAM: Supported and active."
-msgstr "FAM: Soportado y activo."
-
-#: src/cmd_about.c:108
-msgid "FAM: Supported, but not active."
-msgstr "FAM: Soportado, pero no activado."
-
-#: src/cmd_about.c:110
-msgid "FAM: Not supported."
-msgstr "FAM: No soportado."
-
-#: src/cmd_about.c:116
+#: src/cmd_about.c:105
 msgid "NLS: Supported, using built-in English strings."
 msgstr "NLS: Soportado, usando strings integrados en Inglés"
 
-#: src/cmd_about.c:129
-#, fuzzy
+#: src/cmd_about.c:118
+#, fuzzy, c-format
 msgid ""
 "The author of gentoo can be reached via Internet\n"
-"e-mail at <emil@obsession.se>; feel free to let\n"
+"e-mail at <a href=\"mailto:%s\">%s</a>; feel free to let\n"
 "me know what you think of this software, give\n"
 "suggestions/bug reports, and so on.\n"
 "\n"
 "The latest release of gentoo can always be down-\n"
 "loaded from the official gentoo project homepage at\n"
-"<http://www.obsession.se/gentoo/>. New releases are\n"
+"<a href=\"%s\">%s</a>. New releases are\n"
 "typically announced on the Freshmeat service at\n"
-"<http://freshmeat.net/>."
+"<a href=\"http://freshmeat.net/\">freshmeat.net</a>."
 msgstr ""
 "El autor de gentoo puede ser contactado vía Internet\n"
 "Correo electrónico: <emil@obsession.se>; son bienvenidas \n"
@@ -1244,11 +1237,11 @@
 "son anunciadas típicamente en el servicio de Freshmeat en\n"
 "<http://freshmeat.net/>."
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "About gentoo"
 msgstr "Acerca de gentoo"
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "_OK (Wait for More)"
 msgstr "_OK (Espera por Más)"
 
@@ -1257,84 +1250,88 @@
 msgid "Set protection bits for \"%s\":"
 msgstr "Establecer bits de protección para \"%s\":"
 
-#: src/cmd_chmod.c:208 src/cmd_chown.c:184 src/cmd_info.c:202
+#: src/cmd_chmod.c:199 src/cmd_chown.c:176 src/cmd_info.c:274
 msgid "Group"
 msgstr "Grupo"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Others"
 msgstr "Otros"
 
-#: src/cmd_chmod.c:208 src/cmd_info.c:195
+#: src/cmd_chmod.c:199 src/cmd_info.c:267
 msgid "Owner"
 msgstr "Propietario"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Special"
 msgstr "Especial"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Execute"
 msgstr "Ejecución"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Read"
 msgstr "Lectura"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set GID"
 msgstr "Establecer GID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set UID"
 msgstr "Establecer UID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Write"
 msgstr "Escritura"
 
-#: src/cmd_chmod.c:231
+#: src/cmd_chmod.c:222
 msgid "Protection Bits"
 msgstr "Bits de Protección"
 
-#: src/cmd_chmod.c:242
+#: src/cmd_chmod.c:233
 msgid "Textual"
 msgstr ""
 
-#: src/cmd_chmod.c:253
+#: src/cmd_chmod.c:246
 msgid "Octal"
 msgstr ""
 
-#: src/cmd_chmod.c:258 src/menus.c:511
+#: src/cmd_chmod.c:251 src/menus.c:518
 msgid "All"
 msgstr "Todo"
 
-#: src/cmd_chmod.c:261
+#: src/cmd_chmod.c:253 src/menus.c:520
+msgid "Toggle"
+msgstr ""
+
+#: src/cmd_chmod.c:254
 msgid "Revert"
 msgstr "Restablecer"
 
-#: src/cmd_chmod.c:273 src/cmd_chown.c:208 src/cmd_info.c:304
+#: src/cmd_chmod.c:266 src/cmd_chown.c:201 src/cmd_info.c:372
 msgid "Recurse Directories?"
 msgstr "Recursivo en Directorios?"
 
-#: src/cmd_chmod.c:276
+#: src/cmd_chmod.c:269
 msgid "Don't Touch Directories?"
 msgstr "No tocar Directorios?"
 
-#: src/cmd_chmod.c:281
+#: src/cmd_chmod.c:274
 msgid "Change Mode"
 msgstr "Cambiar Modo"
 
-#: src/cmd_chown.c:56
+#: src/cmd_chown.c:57
 #, c-format
 msgid "Set Ownership for '%s':"
 msgstr "Establecer Propietario para '%s'"
 
-#: src/cmd_chown.c:184
+#: src/cmd_chown.c:176
 msgid "User"
 msgstr "Usuario"
 
-#: src/cmd_chown.c:213
+#: src/cmd_chown.c:206
 msgid "Change Ownership"
 msgstr "Cambiar Pertenencia"
 
@@ -1342,48 +1339,37 @@
 msgid "Automatically Save Changed Configuration on Exit?"
 msgstr "Guardar Cambios en la Configuración al Salir?"
 
-#: src/cmd_copy.c:302
-#, c-format
-msgid ""
-"Can't copy directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"No se puede copiar el directorio \"%s\"\n"
-"a \"%s\":\n"
-"el directorio fuente contiene al de destino."
-
-#: src/cmd_copy.c:392 src/cmd_copyas.c:62
+#: src/cmd_copy.c:175 src/cmd_copyas.c:62
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Copy?"
 msgstr "\"%s\" Existe - Seguir con la Copia?"
 
-#: src/cmd_copy.c:393
+#: src/cmd_copy.c:176
 msgid "Copying..."
 msgstr "Copiando..."
 
-#: src/cmd_copy.c:440
+#: src/cmd_copy.c:217
 msgid "Preserve Dates During Copy?"
 msgstr "Preservar Fechas al Copiar?"
 
-#: src/cmd_copy.c:441
+#: src/cmd_copy.c:218
 msgid "Ignore Failure to Copy Attributes (Date, Owner, Mode)?"
 msgstr "Ignorar Fallas de Copia de Atributos (Fecha, Propietario, Modo)?"
 
-#: src/cmd_copy.c:442
+#: src/cmd_copy.c:219
 msgid "Leave Failed Destination if Full Size?"
 msgstr "Abandonar Destino si Espacio Lleno?"
 
-#: src/cmd_copy.c:443 src/cmd_viewtext.c:207
+#: src/cmd_copy.c:220 src/cmd_viewtext.c:204
 msgid "Buffer Size"
 msgstr "Tamaño del Buffer"
 
-#: src/cmd_copyas.c:51
+#: src/cmd_copyas.c:49
 #, c-format
 msgid "Enter Name for Copy of \"%s\""
 msgstr "Teclee Nombre para la Copia de \"%s\""
 
-#: src/cmd_copyas.c:53
+#: src/cmd_copyas.c:51
 #, c-format
 msgid "Enter Name for Clone of \"%s\""
 msgstr "Teclee Nombre para el Clón de \"%s\""
@@ -1411,28 +1397,28 @@
 msgid "Enter Name for Link Clone of \"%s\""
 msgstr "Teclee el Nombre para el Clon de la Liga de \"%s\""
 
-#: src/cmd_copyas.c:89
+#: src/cmd_copyas.c:91
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Symlink?"
 msgstr "\"%s\" Ya Existe - Proceder con Liga Simbólica?"
 
-#: src/cmd_copyas.c:204 src/cmd_copyas.c:210
+#: src/cmd_copyas.c:200 src/cmd_copyas.c:207
 msgid "Copy As"
 msgstr "Copiar Como"
 
-#: src/cmd_copyas.c:212
+#: src/cmd_copyas.c:209
 msgid "Clone"
 msgstr "Clonar"
 
-#: src/cmd_copyas.c:214
+#: src/cmd_copyas.c:211
 msgid "Symbolic Link As"
 msgstr "Liga Simbólica Como"
 
-#: src/cmd_copyas.c:216
+#: src/cmd_copyas.c:213
 msgid "Symbolic Link Clone"
 msgstr "Clonar Liga Simbólica"
 
-#: src/cmd_delete.c:55
+#: src/cmd_delete.c:56
 #, c-format
 msgid ""
 "%s\n"
@@ -1443,242 +1429,252 @@
 "no pudo ser borrado debido a restricciones de acceso.\n"
 "Intentar abrir permisos y reintentar?"
 
-#: src/cmd_delete.c:58
+#: src/cmd_delete.c:59
 msgid "Remember the answer (alters config)"
 msgstr "Recordar respuesta (altera la configuración)"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Access Problem"
 msgstr "Problema de Acceso"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Change|Leave Alone"
 msgstr "Cambiar|Abandonar"
 
-#: src/cmd_delete.c:236
+#: src/cmd_delete.c:215
 #, c-format
 msgid "Really Delete \"%s\"?"
 msgstr "Seguro que Quieres Borrar \"%s\"?"
 
-#: src/cmd_delete.c:237
+#: src/cmd_delete.c:216
 msgid "Deleting..."
 msgstr "Borrando..."
 
-#: src/cmd_delete.c:292
+#: src/cmd_delete.c:279
 msgid "On Access Failure"
 msgstr "En Falla de Acceso"
 
-#: src/cmd_delete.c:293
+#: src/cmd_delete.c:280
 msgid "Ask User|Automatically Try Changing, and Retry|Fail"
 msgstr "Preguntar al Usuario|Intentar Cambiar Permisos y Reintentar|Fallo"
 
-#: src/cmd_dpfocus.c:183
-msgid "Wrap Around At Top And Bottom?"
-msgstr "Envolver Arriba y Abajo?"
+#: src/cmd_dpfocus.c:33
+msgid "DpFocus Command is Deprecated"
+msgstr ""
+
+#: src/cmd_dpfocus.c:34
+msgid ""
+"The <tt>DpFocus</tt> command has been deprecated and is no longer supported. "
+"Please remove any keyboard or mouse bindings that use it and look into using "
+"the default GTK+ list view's cursor controls."
+msgstr ""
 
-#: src/cmd_dpfocus.c:184
+#: src/cmd_dpfocus.c:64
 msgid "Treat Focused Row As Selection If No \"Real\" Selection Exists?"
 msgstr ""
 "Tomar la Fila con Foco como Seleccionada si no Existe una Selección \"Real\"?"
 
-#: src/cmd_dpfocus.c:186
+#: src/cmd_dpfocus.c:66
 msgid "Move Focus to Last Selected/Deselected Row?"
 msgstr "Mover Foco a la Última Fila Seleccionada/No Seleccionada"
 
-#: src/cmd_dpfocusisrch.c:220
+#: src/cmd_dpfocusisrch.c:163
 #, fuzzy
 msgid "ISearch"
 msgstr "Buscar"
 
-#: src/cmd_generic.c:136
+#: src/cmd_generic.c:143
 msgid "_OK|A_ll|_Skip|_Cancel"
 msgstr "_OK|A_ll|_Saltar|_Cancelar"
 
-#: src/cmd_generic.c:137
+#: src/cmd_generic.c:144
 msgid "_OK|_Skip|_Cancel"
 msgstr "_OK|_Saltar|_Cancelar"
 
-#: src/cmd_getsize.c:49
+#: src/cmd_getsize.c:51
 msgid "Getting sizes..."
 msgstr "Obteniendo tamaños..."
 
-#: src/cmd_getsize.c:141
+#: src/cmd_getsize.c:134
 msgid "Unselect Rows When Done?"
 msgstr "Borrar Selección al Terminar?"
 
-#: src/cmd_info.c:71 src/cmd_info.c:163
-#, c-format
-msgid ""
-"%s (%s bytes,\n"
-"%s blocks)"
-msgstr ""
-"%s (%s bytes,\n"
-"%s bloques)"
+#: src/cmd_info.c:68 src/errors.c:84
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr ", %s usado"
 
-#: src/cmd_info.c:75
-#, c-format
-msgid "%u dirs, %u files, %u symlinks"
+#: src/cmd_info.c:72
+#, fuzzy, c-format
+msgid ""
+"%u dirs, %u files,\n"
+"%u symlinks, %u special files"
 msgstr "%u dirs, %u archivos, %u ligas simbólicas"
 
-#: src/cmd_info.c:134
+#: src/cmd_info.c:153
+msgid "Value"
+msgstr ""
+
+#: src/cmd_info.c:198
 msgid "Link To"
 msgstr "Ligar a"
 
-#: src/cmd_info.c:145 src/cmd_select.c:399 src/dpformat.c:52
+#: src/cmd_info.c:213 src/cmd_select.c:368 src/dpformat.c:54
 msgid "Type"
 msgstr "Tipo"
 
-#: src/cmd_info.c:148
+#: src/cmd_info.c:216
 msgid "Location"
 msgstr "Localización"
 
-#: src/cmd_info.c:151 src/dpformat.c:36 src/window.c:200
+#: src/cmd_info.c:219 src/cmd_split.c:653 src/dpformat.c:37 src/window.c:199
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/cmd_info.c:172
+#: src/cmd_info.c:229
+#, fuzzy, c-format
+msgid "%s (%s bytes)"
+msgstr ""
+"%s (%s bytes,\n"
+"%s bloques)"
+
+#: src/cmd_info.c:240
 msgid "Contains"
 msgstr "Contiene"
 
-#: src/cmd_info.c:186
+#: src/cmd_info.c:257
 msgid "'File' Info"
 msgstr "Información de 'Archivo'"
 
-#: src/cmd_info.c:213 src/dpformat.c:49
+#: src/cmd_info.c:285 src/dpformat.c:50
 msgid "Accessed"
 msgstr "Accesado"
 
-#: src/cmd_info.c:214 src/dpformat.c:50
+#: src/cmd_info.c:286 src/dpformat.c:51
 msgid "Modified"
 msgstr "Modificado"
 
-#: src/cmd_info.c:215
+#: src/cmd_info.c:287 src/dpformat.c:53
 msgid "Changed"
 msgstr "Cambiado"
 
-#: src/cmd_info.c:263
+#: src/cmd_info.c:288 src/dpformat.c:52
+msgid "Created"
+msgstr "Creado"
+
+#: src/cmd_info.c:290
+msgid "Basic"
+msgstr ""
+
+#: src/cmd_info.c:294
+msgid "Attributes"
+msgstr ""
+
+#: src/cmd_info.c:338
 msgid "Getting Information..."
 msgstr "Obteniendo Información..."
 
-#: src/cmd_info.c:302
+#: src/cmd_info.c:370
 msgid "Show 'file' Output?"
 msgstr "Mostrar Salida de 'archivo'?"
 
-#: src/cmd_info.c:305
+#: src/cmd_info.c:373
 msgid "Access Date Format"
 msgstr "Formato de la Fecha de Acceso"
 
-#: src/cmd_info.c:306
+#: src/cmd_info.c:374
 msgid "Modify Date Format"
 msgstr "Modificar Formato de Fecha"
 
-#: src/cmd_info.c:307
+#: src/cmd_info.c:375
 msgid "Change Date Format"
 msgstr "Cambiar Formato de Fecha"
 
-#: src/cmd_info.c:308
+#: src/cmd_info.c:376
 msgid "Size Tick Mark"
 msgstr "Marca de Separación en Tamaño"
 
-#: src/cmd_join.c:47
+#: src/cmd_join.c:46
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Join?"
 msgstr "\"%s\" Ya Existe - Continuar con Juntar?"
 
-#: src/cmd_join.c:76
+#: src/cmd_join.c:73
 msgid "Joining..."
 msgstr "Juntando..."
 
-#: src/cmd_join.c:162
+#: src/cmd_join.c:167
 msgid "Click and Drag Files to Reorder, Then Click Join."
 msgstr ""
 "Hacer Click y Arrastrar Archivos para Reordenar, Después Hacer Click en "
 "Juntar"
 
-#: src/cmd_join.c:170
+#: src/cmd_join.c:175
 #, c-format
 msgid "The total size is %s (%lu bytes)."
 msgstr "El tamaño total es %s (%lu bytes)."
 
-#: src/cmd_join.c:173
+#: src/cmd_join.c:178
 #, c-format
 msgid "The total size is %lu bytes."
 msgstr "El tamaño total es %lu bytes."
 
-#: src/cmd_join.c:215
+#: src/cmd_join.c:220
 msgid "Enter Destination File Name"
 msgstr "Teclear Nombre del Archivo Destino"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "Join"
 msgstr "Juntar"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "_Join|_Cancel"
 msgstr "_Juntar|_Cancelar"
 
-#: src/cmd_mkdir.c:75
+#: src/cmd_mkdir.c:65
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With MkDir?"
 msgstr "\"%s\" Ya Existe - Seguir con MkDir"
 
-#: src/cmd_mkdir.c:125
+#: src/cmd_mkdir.c:119
 msgid "Enter Name of Directory to Create"
 msgstr "Teclea el Nombre del Directorio a Crear"
 
-#: src/cmd_mkdir.c:133
+#: src/cmd_mkdir.c:128
 msgid "Make Directory"
 msgstr "Crear Directorio"
 
-#: src/cmd_mkdir.c:156
+#: src/cmd_mkdir.c:151
 msgid "CD Into New Directory?"
 msgstr "Entrar al Nuevo Directorio?"
 
-#: src/cmd_mkdir.c:157
+#: src/cmd_mkdir.c:152
 msgid "Focus New Directory?"
 msgstr "Enfocar Nuevo Directorio?"
 
-#: src/cmd_move.c:81
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"No es posible mover el directorio \"%s\"\n"
-"a \"%s\":\n"
-"el directorio fuente contiene al de destino."
-
-#: src/cmd_move.c:92
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the destination contains the source."
-msgstr ""
-"No es posible mover el directorio \"%s\"\n"
-"a \"%s\":\n"
-"El directorio destino contiene al fuente."
-
-#: src/cmd_move.c:188 src/cmd_moveas.c:48
+#: src/cmd_move.c:128 src/cmd_moveas.c:51
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Move?"
 msgstr "\"%s\" Ya Existe - Continuar con Mover?"
 
-#: src/cmd_move.c:189
+#: src/cmd_move.c:129
 msgid "Moving..."
 msgstr "Moviendo..."
 
-#: src/cmd_moveas.c:40
+#: src/cmd_moveas.c:41
 #, c-format
 msgid "Enter Name to Move \"%s\" As"
 msgstr "Teclee el Nombre Mover \"%s\" Como"
 
+#: src/cmd_moveas.c:66
+msgid "Invalid destination name for MoveAs"
+msgstr ""
+
 #: src/cmd_moveas.c:74
 msgid "Moving As..."
 msgstr "Moviendo Como..."
 
-#: src/cmd_moveas.c:105 src/cmd_moveas.c:110
+#: src/cmd_moveas.c:105 src/cmd_moveas.c:113
 msgid "Move As"
 msgstr "Mover Como"
 
@@ -1702,26 +1698,26 @@
 msgid "Are you sure you want to quit?"
 msgstr "Seguro que deseas salir?"
 
-#: src/cmd_rename.c:44
+#: src/cmd_rename.c:57
 #, c-format
 msgid "Enter New Name For \"%s\""
 msgstr "Teclee el Nuevo Nombre para \"%s\""
 
-#: src/cmd_rename.c:52 src/cmd_renamere.c:147 src/cmd_renamere.c:243
-#: src/cmd_renamere.c:293 src/cmd_renamere.c:388 src/cmd_renameseq.c:161
+#: src/cmd_rename.c:67 src/cmd_renamere.c:142 src/cmd_renamere.c:225
+#: src/cmd_renamere.c:268 src/cmd_renamere.c:367 src/cmd_renameseq.c:152
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Rename?"
 msgstr "\"%s\" Ya Existe - Seguir con Renombrar?"
 
-#: src/cmd_rename.c:132
+#: src/cmd_rename.c:245
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/cmd_renamere.c:260
-msgid "Regular expression error:\n"
-msgstr "Error en la expresión regular:\n"
+#: src/cmd_rename.c:261
+msgid "Rename Single File In-Place (Without Dialog)?"
+msgstr ""
 
-#: src/cmd_renamere.c:446
+#: src/cmd_renamere.c:419
 msgid ""
 "Look for substring in all filenames, and replace\n"
 "it with another string."
@@ -1729,24 +1725,24 @@
 "Buscar una cadena de texto en todos los archivos y reemplazarla\n"
 "con otra cena de texto."
 
-#: src/cmd_renamere.c:449
+#: src/cmd_renamere.c:422
 msgid "Replace"
 msgstr "Reemplazar"
 
-#: src/cmd_renamere.c:453
+#: src/cmd_renamere.c:426
 msgid "With"
 msgstr "Con"
 
-#: src/cmd_renamere.c:461
+#: src/cmd_renamere.c:434
 msgid "Replace All?"
 msgstr "Reemplazar Todo?"
 
-#: src/cmd_renamere.c:465
+#: src/cmd_renamere.c:438
 #, fuzzy
 msgid "Simple"
 msgstr "Archivo"
 
-#: src/cmd_renamere.c:469
+#: src/cmd_renamere.c:442
 msgid ""
 "Execute the 'From' RE on each filename, storing\n"
 "parenthesised subexpression matches. Then replace\n"
@@ -1760,19 +1756,19 @@
 "(empezando de 1) de una sub-expresión, con el texto\n"
 "que coincide y usar el resultado como un nuevo nombre de archivo."
 
-#: src/cmd_renamere.c:477 src/cmd_renamere.c:500
+#: src/cmd_renamere.c:450 src/cmd_renamere.c:473
 msgid "From"
 msgstr "De"
 
-#: src/cmd_renamere.c:481 src/cmd_renamere.c:504
+#: src/cmd_renamere.c:454 src/cmd_renamere.c:477
 msgid "To"
 msgstr "A"
 
-#: src/cmd_renamere.c:489
+#: src/cmd_renamere.c:462
 msgid "Reg Exp"
 msgstr "Expresion Regular"
 
-#: src/cmd_renamere.c:494
+#: src/cmd_renamere.c:467
 msgid ""
 "Look for each character in the 'From' string, and replace\n"
 "any hits with the corresponding character in the 'To' string.\n"
@@ -1785,57 +1781,57 @@
 "nombre del archivo, y el resultado usado como el nuevo nombre de cada "
 "archivo."
 
-#: src/cmd_renamere.c:513
+#: src/cmd_renamere.c:486
 msgid "Map"
 msgstr "Mapa"
 
-#: src/cmd_renamere.c:517
+#: src/cmd_renamere.c:490
 msgid ""
 "Changes the case (upper/lower) of the characters\n"
 "in the selected filename(s)."
 msgstr ""
 
-#: src/cmd_renamere.c:519
+#: src/cmd_renamere.c:492
 #, fuzzy
 msgid "Lower Case?"
 msgstr "Ignorar mayúsculas/minúsculas"
 
-#: src/cmd_renamere.c:521
+#: src/cmd_renamere.c:494
 #, fuzzy
 msgid "Upper Case?"
 msgstr "Ignorar mayúsculas/minúsculas"
 
-#: src/cmd_renamere.c:523
+#: src/cmd_renamere.c:496
 #, fuzzy
 msgid "Upper Case Initial?"
 msgstr "Ignorar mayúsculas/minúsculas"
 
-#: src/cmd_renamere.c:526
+#: src/cmd_renamere.c:499
 #, fuzzy
 msgid "Case"
 msgstr "Cancelar"
 
-#: src/cmd_renamere.c:528
+#: src/cmd_renamere.c:501
 msgid "RenameRE"
 msgstr "RenombrarER"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "10, Decimal"
 msgstr ""
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (A-F)"
 msgstr ""
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (a-f)"
 msgstr ""
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "8, Octal"
 msgstr ""
 
-#: src/cmd_renameseq.c:328
+#: src/cmd_renameseq.c:306
 msgid ""
 "This command renames all selected files\n"
 "into a numbered sequence. The controls\n"
@@ -1846,71 +1842,71 @@
 "a una secuencia numérica. Los controles abajo permiten\n"
 "definir cómo son formados los nombres."
 
-#: src/cmd_renameseq.c:335
+#: src/cmd_renameseq.c:313
 msgid "Start At"
 msgstr "Comenzar Wn"
 
-#: src/cmd_renameseq.c:343 src/cmd_split.c:247
+#: src/cmd_renameseq.c:323 src/cmd_split.c:609
 msgid "Base"
 msgstr ""
 
-#: src/cmd_renameseq.c:359
+#: src/cmd_renameseq.c:333
 msgid "Precision"
 msgstr "Precisión"
 
-#: src/cmd_renameseq.c:367
+#: src/cmd_renameseq.c:340
 msgid "Head"
 msgstr "Cabeza"
 
-#: src/cmd_renameseq.c:374
+#: src/cmd_renameseq.c:347
 msgid "Tail"
 msgstr "Cola"
 
-#: src/cmd_renameseq.c:382
+#: src/cmd_renameseq.c:354
 msgid "Guess"
 msgstr "Invitado"
 
-#: src/cmd_renameseq.c:396
+#: src/cmd_renameseq.c:369
 msgid "Sequential Rename"
 msgstr "Renombrar Secuencial"
 
-#: src/cmd_select.c:396
+#: src/cmd_select.c:365
 msgid "All rows|Selected|Unselected|"
 msgstr "Todo|Seleccionados|No seleccionados"
 
-#: src/cmd_select.c:397
+#: src/cmd_select.c:366
 msgid "All types|Directories only|Non-directories only|"
 msgstr "Cualquier tipo|Sólo directorios|Sólo no directorios|"
 
-#: src/cmd_select.c:398
+#: src/cmd_select.c:367
 msgid "Select|Unselect|Toggle|"
 msgstr "Seleccionar|Des-seleccionar|Fijar|"
 
-#: src/cmd_select.c:399 src/menus.c:530
+#: src/cmd_select.c:368 src/menus.c:537
 msgid "Action"
 msgstr "Acción"
 
-#: src/cmd_select.c:399
+#: src/cmd_select.c:368
 msgid "Set"
 msgstr "Grupo"
 
-#: src/cmd_select.c:511
+#: src/cmd_select.c:469
 msgid "Treat RE as Glob Pattern?"
 msgstr "Tratar ER como patrón global"
 
-#: src/cmd_select.c:514
+#: src/cmd_select.c:472
 msgid "Invert RE Matching?"
 msgstr "Invertir coincidencia de ER"
 
-#: src/cmd_select.c:517
+#: src/cmd_select.c:475
 msgid "Require Match on Full Name?"
 msgstr "Requerir coincidencia en el nombre completo?"
 
-#: src/cmd_select.c:531
+#: src/cmd_select.c:489
 msgid "Select Using RE"
 msgstr "Seleccionar usando ER"
 
-#: src/cmd_select.c:815
+#: src/cmd_select.c:727
 msgid ""
 "Enter shell command to run. The command\n"
 "will have the selected content appended.\n"
@@ -1920,15 +1916,15 @@
 "seleccionado será añadido al final del comando.\n"
 "Acción será realizada al finalizar exitosamente."
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "OK|Cancel"
 msgstr "OK|Cancelar"
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "Select using shell command"
 msgstr "Seleccionar usando un comando shell"
 
-#: src/cmd_split.c:68
+#: src/cmd_split.c:269
 #, c-format
 msgid ""
 "Split \"%s\".\n"
@@ -1937,7 +1933,7 @@
 "Dividir \"%s\".\n"
 "Archivo es %s (%s)."
 
-#: src/cmd_split.c:70
+#: src/cmd_split.c:271
 #, fuzzy, c-format
 msgid ""
 "Split \"%s\".\n"
@@ -1946,93 +1942,144 @@
 "Dividir \"%s\".\n"
 "Archivo es %s (%s)."
 
-#: src/cmd_split.c:106
+#: src/cmd_split.c:348
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Split?"
 msgstr "\"%s\" Ya existe - Continuar con dividir?"
 
-#: src/cmd_split.c:171
-msgid "Beta Software"
-msgstr "Software Beta"
-
-#: src/cmd_split.c:171
-msgid "Next Version?"
-msgstr "Siguiente Versión?"
-
-#: src/cmd_split.c:171
-msgid ""
-"This splitting mode has not been\n"
-"implemented yet... Sorry."
-msgstr ""
-"Este modo dividir no ha sido\n"
-"implementado aún... Lo sentimos."
-
-#: src/cmd_split.c:187
-msgid "  1457000 bytes (3.5\" floppy)"
-msgstr "  1457000 bytes (3.5\" floppy)"
-
-#: src/cmd_split.c:188
-msgid "100431360 bytes (Zip disk)"
-msgstr "100431360 bytes (disco Zip)"
-
-#: src/cmd_split.c:190
+#: src/cmd_split.c:422
 msgid "Fixed Size Split"
 msgstr "Dividir a tamaño fijo"
 
-#: src/cmd_split.c:193
+#: src/cmd_split.c:424
 msgid "Segment Size"
 msgstr "Tamño del segmento"
 
-#: src/cmd_split.c:221
-msgid "Fixed size, variable number of parts"
-msgstr "Tamaño fijo, número de partes variable"
+#: src/cmd_split.c:427
+#, fuzzy
+msgid "1457000 bytes (3.5\" floppy)"
+msgstr "  1457000 bytes (3.5\" floppy)"
 
-#: src/cmd_split.c:222
-msgid "Fixed number of parts, variable sizes"
-msgstr "Numero de partes fijo, tamaños variabes"
+#: src/cmd_split.c:428
+#, fuzzy
+msgid "10485760 bytes (10 MB)"
+msgstr "  1457000 bytes (3.5\" floppy)"
 
-#: src/cmd_split.c:230 src/cmd_split.c:261
-msgid "Split"
-msgstr "Dividir"
+#: src/cmd_split.c:429
+#, fuzzy
+msgid "26214400 bytes (25 MB)"
+msgstr "  1457000 bytes (3.5\" floppy)"
+
+#: src/cmd_split.c:430
+#, fuzzy
+msgid "52428800 bytes (50 MB)"
+msgstr "  1457000 bytes (3.5\" floppy)"
+
+#: src/cmd_split.c:431
+#, fuzzy
+msgid "78643200 bytes (75 MB)"
+msgstr "  1457000 bytes (3.5\" floppy)"
+
+#: src/cmd_split.c:432
+#, fuzzy
+msgid "100431360 bytes (95 MB, Zip disk)"
+msgstr "100431360 bytes (disco Zip)"
+
+#: src/cmd_split.c:454
+#, fuzzy
+msgid "Fixed Count Split"
+msgstr "Dividir a tamaño fijo"
+
+#: src/cmd_split.c:457
+#, fuzzy
+msgid "Segment Count"
+msgstr "Tamño del segmento"
+
+#: src/cmd_split.c:503
+msgid "Current part number, unique for every created file"
+msgstr ""
+
+#: src/cmd_split.c:504
+msgid "The value from the Base box"
+msgstr ""
+
+#: src/cmd_split.c:505
+msgid "The amount that index will change for each file"
+msgstr ""
+
+#: src/cmd_split.c:506
+msgid "The total number of files that will be created"
+msgstr ""
+
+#: src/cmd_split.c:507
+msgid "The value of index for the last file to be created"
+msgstr ""
+
+#: src/cmd_split.c:570
+msgid "Fixed size, variable number of parts"
+msgstr "Tamaño fijo, número de partes variable"
+
+#: src/cmd_split.c:571
+msgid "Fixed number of parts, variable sizes"
+msgstr "Numero de partes fijo, tamaños variabes"
+
+#: src/cmd_split.c:580 src/cmd_split.c:663
+msgid "Split"
+msgstr "Dividir"
 
-#: src/cmd_split.c:243
+#: src/cmd_split.c:599
 msgid "Name Format"
 msgstr "Formato del Nombre"
 
-#: src/cmd_split.c:252
+#: src/cmd_split.c:615
 msgid "Step"
 msgstr "Paso"
 
-#: src/cmd_symlink.c:77 src/cmd_symlink.c:246
+#: src/cmd_split.c:624
+msgid "Zero-Fill Numbers?"
+msgstr ""
+
+#: src/cmd_split.c:645
+msgid "Offset"
+msgstr ""
+
+#: src/cmd_symlink.c:68 src/cmd_symlink.c:252
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Link?"
 msgstr "\"%s\" Ya Existe - Continuar con Crear Liga?"
 
-#: src/cmd_symlink.c:184
+#: src/cmd_symlink.c:161 src/configure.c:239 src/icon_dialog.c:59
+#: src/progress.c:220
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/cmd_symlink.c:161 src/configure.c:233 src/dialog.c:290
+#: src/nag_dialog.c:36
+#, fuzzy
+msgid "OK"
+msgstr "_OK"
+
+#: src/cmd_symlink.c:161
 msgid "Select Link Target"
 msgstr "Seleccione Destino de la Liga"
 
-#: src/cmd_symlink.c:213
+#: src/cmd_symlink.c:218
 msgid "Contents"
 msgstr "Contenido"
 
-#: src/cmd_symlink.c:225
+#: src/cmd_symlink.c:231
 msgid "Edit Symbolic Link"
 msgstr "Editar Liga Simbólica"
 
-#: src/cmd_symlink.c:231
+#: src/cmd_symlink.c:236
 msgid "Create Symbolic Link"
 msgstr "Crear Liga Simbólica"
 
-#: src/cmd_viewtext.c:206
-msgid "Use mmap() to Speed Loading?"
-msgstr "Usar mmap() para Acelerar Carga?"
-
-#: src/cmd_viewtext.c:208
+#: src/cmd_viewtext.c:205
 msgid "Hex-Check First"
 msgstr "Primero Hex-Check"
 
-#: src/cmd_viewtext.c:209
+#: src/cmd_viewtext.c:206
 msgid "Exit on Left Arrow Key?"
 msgstr ""
 
@@ -2048,7 +2095,7 @@
 msgid "yes"
 msgstr "si"
 
-#: src/cmdgrab.c:222
+#: src/cmdgrab.c:177
 #, c-format
 msgid "Output of %s (pid %d)"
 msgstr "Salida de %s (pid %d)"
@@ -2060,17 +2107,17 @@
 "command \"%s\"."
 msgstr "Comando desconocido \"%s\"."
 
-#: src/cmdseq_dialog.c:126
+#: src/cmdseq_dialog.c:134
 #, c-format
 msgid "Built-Ins (%u)"
 msgstr "Predefinidos (%u)"
 
-#: src/cmdseq_dialog.c:131
+#: src/cmdseq_dialog.c:139
 #, c-format
 msgid "User Defined (%u)"
 msgstr "Definidos por el Usuario (%u)"
 
-#: src/cmdseq_dialog.c:302
+#: src/cmdseq_dialog.c:313
 msgid ""
 "Select a command, or type start\n"
 "of name and press TAB."
@@ -2078,35 +2125,26 @@
 "Seleccione un comando o teclee el inicio\n"
 "del nombre y presione TAB."
 
-#: src/cmdseq_dialog.c:319
+#: src/cmdseq_dialog.c:330
 msgid "Select Command"
 msgstr "Seleccionar Comando"
 
-#: src/configure.c:198
+#: src/configure.c:197
 msgid "Couldn't open configuration file for output"
 msgstr "No se puedo abrir el archivo de configuración para escritura"
 
-#: src/configure.c:234 src/dialog.c:285
-#, fuzzy
-msgid "OK"
-msgstr "_OK"
-
-#: src/configure.c:240
+#: src/configure.c:236
 msgid "Save"
 msgstr "Guardar"
 
-#: src/configure.c:244 src/icon_dialog.c:59 src/progress.c:219
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/configure.c:455
+#: src/configure.c:463
 #, c-format
 msgid "Config file version (%s) doesn't match program version (%s)"
 msgstr ""
 "La versión del archivo de configuración (%s) no coincide\n"
 "con la versión del programa(%s)"
 
-#: src/configure.c:467
+#: src/configure.c:475
 #, c-format
 msgid ""
 "Couldn't find any configuration file; checked\n"
@@ -2117,61 +2155,43 @@
 "en \"%s\" y \"%s\".\n"
 "Usando configuración mínima predefinida."
 
-#: src/dialog.c:123 src/dialog.c:253
+#: src/dialog.c:124 src/dialog.c:260
 msgid "_OK|_Cancel"
 msgstr "_OK|Cancelar"
 
-#: src/dirpane.c:134
-msgid ""
-"Case-sensitive sorting will not work correctly with non-ASCII characters"
-msgstr ""
-"Ordenamiento sensible a mayúsculas/minúsculas no funcionará\n"
-"correctamente con caracteres no ASCII"
-
-#: src/dirpane.c:143
-msgid ""
-"Case-insensitive sorting will not work correctly with non-ASCII characters"
-msgstr ""
-"Ordenamiento no sensible a mayúsculas/minúsculas no funcionará\n"
-"correctamente con caracteres no ASCII"
-
-#: src/dirpane.c:1189
+#: src/dirpane.c:541
 #, c-format
 msgid "%u/%u dirs, %u/%u files"
 msgstr "i%u/%u dirs, %u/%u archivos"
 
-#: src/dirpane.c:1197
-#, fuzzy, c-format
-msgid " (%%s/%%s, %%%s/%%%s blocks)"
-msgstr " (%s/%s, %Lu/%Lu bloques)"
+#: src/dirpane.c:546
+#, c-format
+msgid " (%s/%s)"
+msgstr ""
 
-#: src/dirpane.c:1210
+#: src/dirpane.c:557
 #, fuzzy, c-format
 msgid ", %s (%s) used"
 msgstr ", %s usado"
 
-#: src/dirpane.c:1212
+#: src/dirpane.c:559
 #, c-format
 msgid ", %s free"
 msgstr ", %s libre"
 
-#: src/dirpane.c:1560
-msgid "!!Invalid filename!!"
-msgstr ""
-
-#: src/dirpane.c:2004 src/dirpane.c:2053
+#: src/dirpane.c:2084 src/dirpane.c:2131
 msgid "Move up to the parent directory"
 msgstr "Subir al directorio padre"
 
-#: src/dirpane.c:2026
+#: src/dirpane.c:2106
 msgid "Enter path, then press Return to go there"
 msgstr "Teclee la ruta, después presione Enter para cambiar a ese directorio"
 
-#: src/dirpane.c:2027
+#: src/dirpane.c:2107
 msgid "H"
 msgstr ""
 
-#: src/dirpane.c:2031
+#: src/dirpane.c:2111
 msgid ""
 "Click to enable/disable Hide rule (When pressed in, the hide rule is active, "
 "and matching entries are hidden)"
@@ -2179,171 +2199,171 @@
 "Haga click para habilitar/deshabilitar Esconder regla (Cuando está\n"
 "presionado, esconder regla es activado y las coincidencias son escondidas.)"
 
-#: src/dpformat.c:37
+#: src/dpformat.c:38
 msgid "Blocks"
 msgstr "Bloques"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 #, fuzzy
 msgid "BSize"
 msgstr "Tamaño"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "Block Size"
 msgstr "Tamaño del Bloque"
 
-#: src/dpformat.c:39
+#: src/dpformat.c:40
 msgid "Mode, numerical"
 msgstr "Modo, numérico"
 
-#: src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode, string"
 msgstr "Modo, texto"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Nlink"
 msgstr "Nliga"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Number of links"
 msgstr "Número de ligas"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Owner ID"
 msgstr "ID del Propietario"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Uid"
 msgstr ""
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Owner Name"
 msgstr "Nombre del propietario"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Uname"
 msgstr "Unombre"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Gid"
 msgstr ""
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Group ID"
 msgstr "ID de Grupo"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Gname"
 msgstr "Gnombre"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Group Name"
 msgstr "Nombre del Grupo"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device Number"
 msgstr "Número del dispositivo"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "DevMaj"
 msgstr "DispMay"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "Device Number, major"
 msgstr "Número del dispositivo, mayor"
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "DevMin"
 msgstr "DispMen"
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "Device Number, minor"
 msgstr "Número del dispositivo, menor"
 
-#: src/dpformat.c:49
-msgid "Date of last Access"
-msgstr "Fecha del último acceso"
-
 #: src/dpformat.c:50
-msgid "Date of last Modification"
-msgstr "Fecha de la última Modificación"
-
-#: src/dpformat.c:51
-msgid "Created"
-msgstr "Creado"
+#, fuzzy
+msgid "Time of Last Access"
+msgstr "Fecha del último acceso"
 
 #: src/dpformat.c:51
-msgid "Date of Creation"
-msgstr "Fecha de Creación"
+#, fuzzy
+msgid "Time of Last Modification"
+msgstr "Fecha de la última Modificación"
 
 #: src/dpformat.c:52
-msgid "Type Name"
-msgstr "Teclee Nombre"
+#, fuzzy
+msgid "Time of Creation"
+msgstr "Fecha de Creación"
 
 #: src/dpformat.c:53
-msgid "I"
+msgid "Time of Last Change"
 msgstr ""
 
-#: src/dpformat.c:334
-msgid "B"
-msgstr ""
+#: src/dpformat.c:54
+msgid "Type Name"
+msgstr "Teclee Nombre"
 
-#: src/dpformat.c:338 src/sizeutil.c:32
-msgid "KB"
+#: src/dpformat.c:55
+msgid "I"
 msgstr ""
 
-#: src/dpformat.c:343 src/sizeutil.c:33
-msgid "MB"
+#: src/dpformat.c:56
+msgid "URI"
 msgstr ""
 
-#: src/dpformat.c:348 src/sizeutil.c:31
-msgid "GB"
+#: src/dpformat.c:56
+msgid "URI (without file prefix)"
 msgstr ""
 
-#: src/errors.c:69
+#: src/errors.c:59
 #, c-format
 msgid "Couldn't %s \"%s\": %s (code %d)"
 msgstr "No fue posible %s \"%s\": %s (código %d)"
 
-#: src/errors.c:71
+#: src/errors.c:61
 #, c-format
 msgid "Couldn't %s \"%s\" (code %d)"
 msgstr "No fue posible %s \"%s\" (código %d)"
 
-#: src/errors.c:76
+#: src/errors.c:66
 #, c-format
 msgid "Couldn't %s \"%s\""
 msgstr "No fue posible %s \"%s\""
 
-#: src/errors.c:78
+#: src/errors.c:68
 #, c-format
 msgid "Couldn't %s"
 msgstr "No fue posible %s"
 
-#: src/gentoo.c:421
+#: src/errors.c:88
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: src/gentoo.c:427
 msgid "Report the version to standard output, and exit."
 msgstr "Imprimir la versión a salida estándar y salir."
 
-#: src/gentoo.c:423
+#: src/gentoo.c:429
 msgid "Report internal locale details, and exit."
 msgstr "Reportar detalles de locales internas y salir"
 
-#: src/gentoo.c:425
+#: src/gentoo.c:431
 msgid "Allows gentoo to be run by the root user. Could be dangerous."
 msgstr "Permite a gentoo correr por el usuario root. Podría ser peligroso."
 
-#: src/gentoo.c:426
+#: src/gentoo.c:432
 msgid ""
 "Do not load the ~/.gentoorc configuration file; instead, use default values."
 msgstr ""
 "No cargar el archivo de configuración ~/.gentoorc; en vez de eso, usar\n"
 "valores predeterminados."
 
-#: src/gentoo.c:427
+#: src/gentoo.c:433
 msgid ""
 "Do not load the ~/.gentoogtkrc GTK+ configuration file; instead, use system "
 "defaults."
@@ -2351,81 +2371,81 @@
 "No cargar el archivo de configuración ~/.gentoorc; en vez de eso, usar\n"
 "valores predeterminados del sistema."
 
-#: src/gentoo.c:429
-msgid "Do not use FAM to automatically detect changes in viewed directories."
-msgstr "No usar FAM para detectar cambios en directorios vistos."
+#: src/gentoo.c:434
+#, fuzzy
+msgid ""
+"Run COMMAND, a gentoo command. Done before user interaction allowed, but "
+"after configuration file has been read in. Can be used many times to run "
+"several commands in sequence."
+msgstr ""
+"Ejecuta ARG, un comando de gentoo. Hecho antes de la interacción con el\n"
+"usuario, pero después de leer el archivo de configuración. Puede ser usado\n"
+"muchas veces para ejecutar muchos comandos en secuencia."
 
-#: src/gentoo.c:431
+#: src/gentoo.c:435
+msgid "COMMAND"
+msgstr ""
+
+#: src/gentoo.c:436 src/gentoo.c:437
+msgid "DIR"
+msgstr ""
+
+#: src/gentoo.c:436
+#, fuzzy
 msgid ""
-"Use ARG as path for the left directory pane. Overrides default (and history)."
+"Use DIR as path for the left directory pane. Overrides default (and history)."
 msgstr ""
 "Usar ARG como ruta para el panel izquierdo. Sobreescribe el predeterminado "
 "(e historial)"
 
-#: src/gentoo.c:432
+#: src/gentoo.c:437
+#, fuzzy
 msgid ""
-"Use ARG as path for the right directory pane. Overrides default (and "
+"Use DIR as path for the right directory pane. Overrides default (and "
 "history)."
 msgstr ""
 "Usar ARG como ruta para el panel derecho. Sobreescribe el predeterminado (e "
 "historial)"
 
-#: src/gentoo.c:433
-msgid ""
-"Run ARG, a gentoo command. Done before user interaction allowed, but after "
-"configuration file has been read in. Can be used many times to run several "
-"commands in sequence."
+#: src/gentoo.c:461
+msgid "- a graphical file manager using GTK+"
 msgstr ""
-"Ejecuta ARG, un comando de gentoo. Hecho antes de la interacción con el\n"
-"usuario, pero después de leer el archivo de configuración. Puede ser usado\n"
-"muchas veces para ejecutar muchos comandos en secuencia."
 
-#: src/gentoo.c:492
+#: src/gentoo.c:466
+#, c-format
+msgid "Failed to parse command line options: %s\n"
+msgstr ""
+
+#: src/gentoo.c:506
 #, c-format
 msgid "%s: To run as root, envoke with the '--root-ok' option\n"
 msgstr "%s: Para ejecutar como root, invocar con la opción '--root-ok'\n"
 
-#: src/gentoo.c:524
+#: src/gentoo.c:538
 msgid "Couldn't initialize userinfo module - username resolving won't work"
 msgstr ""
 "No fue posible iniciar el módulo userinfo - no será posible resolver "
 "nombres\n"
 "de usuario"
 
-#: src/gentoo.c:529
-msgid "Couldn't initialize mount data - automounting won't work"
-msgstr "No fue posible iniciar montaje de datos - automontaje no funcionará"
-
-#: src/gentoo.c:560
+#: src/gentoo.c:570
 #, c-format
 msgid "gentoo v%s by Emil Brink <emil@obsession.se>"
 msgstr "gentoo v%s por Emil Brink <emil@obsession.se>"
 
-#: src/gfam.c:216
-#, c-format
-msgid "FAM open failed, error %d--FAM will not be used"
-msgstr "Abrir FAM falló, error %d--FAM no será usado"
-
-#: src/gfam.c:235
-#, fuzzy, c-format
-msgid ""
-"Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, perhaps)"
+#: src/gentoo.c:577
+msgid "Development Version Warning"
 msgstr ""
-"No es posible agregar monitor FAM a \"%s\", error %s\n"
-"(reiniciar con --no-fam\n"
-" podría evitar este problema)"
 
-#: src/gfam.c:241
-#, fuzzy, c-format
+#: src/gentoo.c:577
 msgid ""
-"Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go around, "
-"perhaps)"
+"This version of gentoo is considered somewhat new and untested. There have "
+"been major changes to almost all parts of the program since the previous "
+"version. Please be a bit careful, and make sure you report any problem to "
+"the author. Thanks."
 msgstr ""
-"No es posible agregar monitor FAM a \"%s\", error %s\n"
-"(reiniciar con --no-fam\n"
-" podría evitar este problema)"
 
-#: src/guiutil.c:118
+#: src/guiutil.c:124
 msgid "Progress"
 msgstr "Progreso"
 
@@ -2437,220 +2457,218 @@
 msgid "Loading Icon Graphics..."
 msgstr "Cargando Imágenes de Iconos"
 
-#: src/menus.c:278
+#: src/menus.c:284
 msgid "(No Selection)"
 msgstr "(No hay Selección)"
 
-#: src/menus.c:514
+#: src/menus.c:521
 msgid "RegExp..."
 msgstr "ExpReg..."
 
-#: src/menus.c:526
+#: src/menus.c:533
 msgid "Other"
 msgstr "Otro"
 
-#: src/menus.c:527
+#: src/menus.c:534
 msgid "Rescan"
 msgstr "Actualizar"
 
-#: src/menus.c:528
+#: src/menus.c:535
 msgid "Select"
 msgstr "Seleccionar"
 
-#: src/menus.c:532
+#: src/menus.c:539
 msgid "Run..."
 msgstr "Ejecutar..."
 
-#: src/menus.c:534
+#: src/menus.c:541
 msgid "Configure..."
 msgstr "Configuración..."
 
-#: src/menus.c:610
+#: src/menus.c:618
 msgid "Select Menu"
 msgstr "Seleccionar Menú"
 
-#: src/mount.c:222
-#, c-format
-msgid "Execution of \"%s %s\" failed:\n"
-msgstr "La ejecución de \"%s %s\" falló:\n"
-
-#: src/mount.c:318
-#, c-format
-msgid "Mounting \"%s\" on \"%s\"..."
-msgstr "Montando \"%s\" en \"%s\"..."
+#: src/nag_dialog.c:37
+msgid "_Don't show this dialog again"
+msgstr ""
 
 #: src/overwrite.c:49
 msgid "_OK|A_ll|_Skip|Skip _All|_Cancel"
 msgstr "_OK|Todo _l|_Saltar|Saltar Todo _A|_Cancelar"
 
-#: src/overwrite.c:73
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Old: %%%s bytes, changed on %%s,\n"
-"New: %%%s bytes, changed on %%s."
-msgstr ""
-"\n"
-"Anterior: %llu bytes, modificado en %s.\n"
-"Nuevo: %llu bytes, modificado en %s."
-
-#: src/progress.c:195
+#: src/progress.c:196
 #, c-format
 msgid "Total (%s)"
 msgstr ""
 
-#: src/progress.c:315
+#: src/progress.c:305
 #, c-format
 msgid "Elapsed %02d:%02d  Speed %s/s  ETA %02u:%02u"
 msgstr "Transcurrido %02d:%02d  Velocidad %s/s  ETA %02u:%02u"
 
-#: src/sizeutil.c:30
-msgid "BYTES"
-msgstr ""
+#: src/sizeutil.c:31
+#, fuzzy
+msgid "Unformatted Size"
+msgstr "Tamaño con Formato, en bytes"
 
-#: src/sizeutil.c:69
-#, c-format
-msgid "%%%s"
-msgstr ""
+#: src/sizeutil.c:32
+#, fuzzy
+msgid "Formatted Size, Without Unit"
+msgstr "Tamaño con formato, unidades \"inteligentes\""
 
-#: src/sizeutil.c:70
-#, c-format
-msgid "%%%s bytes"
-msgstr ""
+#: src/sizeutil.c:33
+#, fuzzy
+msgid "Formatted Size, in Bytes"
+msgstr "Tamaño con Formato, en bytes"
 
-#: src/sizeutil.c:71
-#, c-format
-msgid "%%%s KB"
-msgstr ""
+#: src/sizeutil.c:33 src/sizeutil.c:159
+#, fuzzy
+msgid "bytes"
+msgstr "si"
 
-#: src/sizeutil.c:72
-#, c-format
-msgid "%%%s MB"
-msgstr ""
+#: src/sizeutil.c:34
+#, fuzzy
+msgid "Formatted Size, in Kilobytes"
+msgstr "Tamaño con Formato, en kilobytes"
 
-#: src/sizeutil.c:73
-#, c-format
-msgid "%%%s GB"
+#: src/sizeutil.c:34 src/sizeutil.c:163
+msgid "KB"
 msgstr ""
 
-#: src/sizeutil.c:164 src/sizeutil.c:211
-#, c-format
-msgid "%.2f KB"
+#: src/sizeutil.c:35
+#, fuzzy
+msgid "Formatted Size, in Megabytes"
+msgstr "Tamaño con formato, en megabytes"
+
+#: src/sizeutil.c:35 src/sizeutil.c:167
+msgid "MB"
 msgstr ""
 
-#: src/sizeutil.c:170 src/sizeutil.c:217
-#, c-format
-msgid "%.2f MB"
+#: src/sizeutil.c:36
+#, fuzzy
+msgid "Formatted Size, in Gigabytes"
+msgstr "Tamaño con formato, en gigabytes"
+
+#: src/sizeutil.c:36 src/sizeutil.c:171
+msgid "GB"
 msgstr ""
 
-#: src/sizeutil.c:176 src/sizeutil.c:223
-#, c-format
-msgid "%.2f GB"
+#: src/sizeutil.c:37
+#, fuzzy
+msgid "Formatted Size, in Terabytes"
+msgstr "Tamaño con formato, en megabytes"
+
+#: src/sizeutil.c:37 src/sizeutil.c:175
+msgid "TB"
 msgstr ""
 
+#: src/sizeutil.c:38
+#, fuzzy
+msgid "Formatted Size, Automatic Unit"
+msgstr "Tamaño con formato, unidades \"inteligentes\""
+
 #: src/style_dialog.c:40
 msgid "Select Style"
 msgstr "Seleccionar Estilo"
 
-#: src/styles.c:112
+#: src/styles.c:114
 msgid "Root"
 msgstr "Raíz"
 
-#: src/styles.c:118 src/types.c:485 src/types.c:488
+#: src/styles.c:120 src/types.c:292 src/types.c:295
 msgid "Directory"
 msgstr "Directorio"
 
-#: src/styles.c:961
+#: src/styles.c:889
 msgid "New Style"
 msgstr "Nuevo Estilo"
 
-#: src/styles.c:961
+#: src/styles.c:889
 #, c-format
 msgid "New Style %u"
 msgstr "Nuevo Estilo %u"
 
-#: src/textview.c:152
+#: src/textview.c:190
 #, c-format
-msgid "Unable to convert text from native character set (%s) to UTF-8: %s"
+msgid ""
+"\n"
+"** Text conversion from charset '%s' failed, aborting."
 msgstr ""
 
-#: src/textview.c:252 src/textview.c:353
-msgid "File reading"
-msgstr "Lectura de Archivo"
-
-#: src/textview.c:419
+#: src/textview.c:405
 #, c-format
 msgid "Line %d (%.0f%%)"
 msgstr "Línea %d (%.0f%%)"
 
-#: src/textview.c:472
+#: src/textview.c:455
 msgid "Enter Line Number or Percentage:"
 msgstr "Teclee el Número de Línea o Porcentaje:"
 
-#: src/textview.c:478
+#: src/textview.c:461
 msgid "Goto"
 msgstr "Ir a"
 
-#: src/textview.c:613
+#: src/textview.c:596
 msgid "Enter Text to Search For (RE)"
 msgstr "Teclee el texto a buscar (ER)"
 
-#: src/textview.c:623
+#: src/textview.c:607
 msgid "Don't Span Newlines?"
 msgstr "No romper líneas nuevas?"
 
-#: src/textview.c:629
+#: src/textview.c:613
 msgid "Search"
 msgstr "Buscar"
 
-#: src/types.c:454
+#: src/types.c:287
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: src/types.c:572
 #, c-format
 msgid ""
 "Got SIGPIPE when writing to 'file' process (%s), it seems to have terminated "
 "prematurely."
 msgstr ""
 
-#: src/types.c:461
+#: src/types.c:578
 msgid "Unable to run spawn 'file' command: "
 msgstr ""
 
-#: src/types.c:480
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: src/window.c:82
+#: src/window.c:83
 msgid "Configure gentoo"
 msgstr "Confugurar gentoo"
 
-#: src/window.c:89
+#: src/window.c:90
 msgid "Text Viewer"
 msgstr "Visualizador de Texto"
 
-#: src/window.c:200
+#: src/window.c:199
 msgid "Position"
 msgstr "Posición"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Height"
 msgstr "Altura"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "X"
 msgstr ""
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Y"
 msgstr ""
 
-#: src/window.c:208
+#: src/window.c:207
 msgid "Set on Open?"
 msgstr "Establecer al Abrir?"
 
-#: src/window.c:214
+#: src/window.c:213
 msgid "Update on Close?"
 msgstr "Actualizar al Cerrar?"
 
-#: src/window.c:245
+#: src/window.c:244
 msgid "Grab"
 msgstr "Obtener"
 
@@ -2658,6 +2676,181 @@
 msgid "XML module emitted locale-dependant real number"
 msgstr "Módulo XML emitió número real dependiente de local"
 
+#~ msgid "Use Dialog to Report Errors?"
+#~ msgstr "Usar Diálogo para Reportar Errores?"
+
+#~ msgid "Raw Size, in Bytes"
+#~ msgstr "Tamaño sin Formato en Bytes"
+
+#~ msgid "Always Set"
+#~ msgstr "Siempre Establecer"
+
+#~ msgid "Modify 'Control' Key State"
+#~ msgstr "Estado de la Tecla 'Control'"
+
+#~ msgid "Active Pane Titles"
+#~ msgstr "Títulos de Paneles Activos"
+
+#~ msgid "Focused Row, Unselected"
+#~ msgstr "Fila en Foco, No Seleccionada"
+
+#~ msgid "Focused Row, Selected"
+#~ msgstr "Fila en Foco, Seleccionada"
+
+#~ msgid "Beta Software"
+#~ msgstr "Software Beta"
+
+#~ msgid "Next Version?"
+#~ msgstr "Siguiente Versión?"
+
+#~ msgid ""
+#~ "This splitting mode has not been\n"
+#~ "implemented yet... Sorry."
+#~ msgstr ""
+#~ "Este modo dividir no ha sido\n"
+#~ "implementado aún... Lo sentimos."
+
+#~ msgid ""
+#~ "Case-sensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr ""
+#~ "Ordenamiento sensible a mayúsculas/minúsculas no funcionará\n"
+#~ "correctamente con caracteres no ASCII"
+
+#~ msgid ""
+#~ "Case-insensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr ""
+#~ "Ordenamiento no sensible a mayúsculas/minúsculas no funcionará\n"
+#~ "correctamente con caracteres no ASCII"
+
+#~ msgid "Numerical Mode?"
+#~ msgstr "Modo Numérico?"
+
+#~ msgid "Never"
+#~ msgstr "Nunca"
+
+#~ msgid "On Every Access"
+#~ msgstr "Cada vez que Accese"
+
+#~ msgid "Mounting"
+#~ msgstr "Montar"
+
+#~ msgid "Mount When?"
+#~ msgstr "Cuándo Montar?"
+
+#~ msgid "Mount Options"
+#~ msgstr "Opciones de Montaje"
+
+#~ msgid "Mount Command"
+#~ msgstr "Comando para Montar"
+
+#~ msgid "Unmount Command"
+#~ msgstr "Comando para Desmontar"
+
+#~ msgid "Only Mount on Toplevel Directories?"
+#~ msgstr "Solo Montar en los Directorios del Nivel más Alto?"
+
+#~ msgid "Use Command Error Dialog?"
+#~ msgstr "Usar Diálogo de Error de Comando?"
+
+#~ msgid "Unmount When gentoo Quits?"
+#~ msgstr "Desmontar al Salir de gentoo?"
+
+#~ msgid "FAM: Supported and active."
+#~ msgstr "FAM: Soportado y activo."
+
+#~ msgid "FAM: Supported, but not active."
+#~ msgstr "FAM: Soportado, pero no activado."
+
+#~ msgid "FAM: Not supported."
+#~ msgstr "FAM: No soportado."
+
+#~ msgid ""
+#~ "Can't copy directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "No se puede copiar el directorio \"%s\"\n"
+#~ "a \"%s\":\n"
+#~ "el directorio fuente contiene al de destino."
+
+#~ msgid "Wrap Around At Top And Bottom?"
+#~ msgstr "Envolver Arriba y Abajo?"
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "No es posible mover el directorio \"%s\"\n"
+#~ "a \"%s\":\n"
+#~ "el directorio fuente contiene al de destino."
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the destination contains the source."
+#~ msgstr ""
+#~ "No es posible mover el directorio \"%s\"\n"
+#~ "a \"%s\":\n"
+#~ "El directorio destino contiene al fuente."
+
+#~ msgid "Regular expression error:\n"
+#~ msgstr "Error en la expresión regular:\n"
+
+#~ msgid "Use mmap() to Speed Loading?"
+#~ msgstr "Usar mmap() para Acelerar Carga?"
+
+#, fuzzy
+#~ msgid " (%%s/%%s, %%%s/%%%s blocks)"
+#~ msgstr " (%s/%s, %Lu/%Lu bloques)"
+
+#~ msgid ""
+#~ "Do not use FAM to automatically detect changes in viewed directories."
+#~ msgstr "No usar FAM para detectar cambios en directorios vistos."
+
+#~ msgid "Couldn't initialize mount data - automounting won't work"
+#~ msgstr "No fue posible iniciar montaje de datos - automontaje no funcionará"
+
+#~ msgid "FAM open failed, error %d--FAM will not be used"
+#~ msgstr "Abrir FAM falló, error %d--FAM no será usado"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, "
+#~ "perhaps)"
+#~ msgstr ""
+#~ "No es posible agregar monitor FAM a \"%s\", error %s\n"
+#~ "(reiniciar con --no-fam\n"
+#~ " podría evitar este problema)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go "
+#~ "around, perhaps)"
+#~ msgstr ""
+#~ "No es posible agregar monitor FAM a \"%s\", error %s\n"
+#~ "(reiniciar con --no-fam\n"
+#~ " podría evitar este problema)"
+
+#~ msgid "Execution of \"%s %s\" failed:\n"
+#~ msgstr "La ejecución de \"%s %s\" falló:\n"
+
+#~ msgid "Mounting \"%s\" on \"%s\"..."
+#~ msgstr "Montando \"%s\" en \"%s\"..."
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Old: %%%s bytes, changed on %%s,\n"
+#~ "New: %%%s bytes, changed on %%s."
+#~ msgstr ""
+#~ "\n"
+#~ "Anterior: %llu bytes, modificado en %s.\n"
+#~ "Nuevo: %llu bytes, modificado en %s."
+
+#~ msgid "File reading"
+#~ msgstr "Lectura de Archivo"
+
 #, fuzzy
 #~ msgid "Pick Command ..."
 #~ msgstr "Seleccionar Código"

gentoo-0.15.6.tar.bz2/po/fr.gmo -> gentoo-0.19.9.tar.gz/po/fr.gmo Changed

gentoo-0.15.6.tar.bz2/po/fr.po -> gentoo-0.19.9.tar.gz/po/fr.po Changed

@@ -7,12 +7,13 @@
 msgstr ""
 "Project-Id-Version: gentoo\n"
 "Report-Msgid-Bugs-To: Emil Brink\n"
-"POT-Creation-Date: 2009-07-11 19:05+0200\n"
+"POT-Creation-Date: 2011-01-26 21:54+0100\n"
 "PO-Revision-Date: 2002-08-29 20:17+0200\n"
 "Last-Translator: ROSSI Philippe <prossi@free.fr>\n"
-"Language-Team: Français <fr@li.org>\n"
+"Language-Team: FranÃ§ais <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 0.9.6\n"
@@ -27,15 +28,15 @@
 
 #: src/cfg_buttonlayout.c:66
 msgid "No Padding"
-msgstr "Statique (sans séparation)"
+msgstr "Statique (sans sÃ©paration)"
 
 #: src/cfg_buttonlayout.c:66
 msgid "Paned"
-msgstr "Avec réglette"
+msgstr "Avec rÃ©glette"
 
 #: src/cfg_buttonlayout.c:66
 msgid "Static"
-msgstr "Statique (avec séparation)"
+msgstr "Statique (avec sÃ©paration)"
 
 #: src/cfg_buttonlayout.c:75
 msgid ""
@@ -61,11 +62,11 @@
 
 #: src/cfg_buttonlayout.c:88
 msgid "Shortcut Sheet Position"
-msgstr "Emplacement du panneau des raccourcis répertoires"
+msgstr "Emplacement du panneau des raccourcis rÃ©pertoires"
 
 #: src/cfg_buttonlayout.c:102
 msgid "Separation Style"
-msgstr "Séparation des boutons Répertoires/Commandes"
+msgstr "SÃ©paration des boutons RÃ©pertoires/Commandes"
 
 #: src/cfg_buttonlayout.c:116
 msgid "Layout"
@@ -73,408 +74,449 @@
 
 #: src/cfg_buttons.c:308
 msgid "Set Row Width"
-msgstr "Requête de gentoo"
+msgstr "RequÃªte de gentoo"
 
-#: src/cfg_buttons.c:326 src/cfg_buttons.c:749
+#: src/cfg_buttons.c:326 src/cfg_buttons.c:748
 msgid "Default"
 msgstr "Commandes"
 
 #: src/cfg_buttons.c:439 src/overwrite.c:49
 msgid "Please Confirm"
-msgstr "Confirmez S'il vous plaît"
+msgstr "Confirmez S'il vous plaÃ®t"
 
 #: src/cfg_buttons.c:439
 msgid "Really delete current button row?"
-msgstr "Désirez-vous réellement supprimer cette rangée de boutons ?"
+msgstr "DÃ©sirez-vous rÃ©ellement supprimer cette rangÃ©e de boutons ?"
 
-#: src/cfg_buttons.c:439 src/cfg_styles.c:671
+#: src/cfg_buttons.c:439 src/cfg_styles.c:680
 msgid "_Delete|_Cancel"
 msgstr "_Supprimer|_Annuler"
 
 #: src/cfg_buttons.c:463
 msgid "Select Width for New Row"
-msgstr "Nombre de boutons pour cette nouvelle rangée"
+msgstr "Nombre de boutons pour cette nouvelle rangÃ©e"
 
 #: src/cfg_buttons.c:466
 msgid "Change Width of Row"
-msgstr "Remanier le nombre de boutons pour cette rangée."
+msgstr "Remanier le nombre de boutons pour cette rangÃ©e."
 
 #: src/cfg_buttons.c:609
 msgid "Edit Background Color"
-msgstr "Édition - Couleur du fond"
+msgstr "Ãdition - Couleur du fond"
 
 #: src/cfg_buttons.c:653
 msgid "Edit Foreground Color"
-msgstr "Édition - Couleur de la police"
+msgstr "Ãdition - Couleur de la police"
 
 #: src/cfg_buttons.c:678
 msgid "Label"
 msgstr "Nom"
 
-#: src/cfg_buttons.c:685 src/cfg_controls.c:645 src/cfg_controls.c:696
-#: src/cfg_controls.c:718 src/cfg_controls.c:739
+#: src/cfg_buttons.c:686 src/cfg_controls.c:612 src/cfg_controls.c:663
+#: src/cfg_controls.c:685
 msgid "Command"
 msgstr "Commande "
 
-#: src/cfg_buttons.c:696 src/cfg_controls.c:639
+#: src/cfg_buttons.c:697 src/cfg_controls.c:606
 msgid "Key"
 msgstr "Raccourci"
 
-#: src/cfg_buttons.c:711 src/cfg_dirpane.c:1373
+#: src/cfg_buttons.c:712
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/cfg_buttons.c:715
+#: src/cfg_buttons.c:716
 msgid "Background..."
 msgstr "Fond..."
 
-#: src/cfg_buttons.c:716 src/cfg_buttons.c:722
+#: src/cfg_buttons.c:717 src/cfg_buttons.c:723
 msgid "Reset to Default"
-msgstr "Par défaut"
+msgstr "Par dÃ©faut"
 
-#: src/cfg_buttons.c:721
+#: src/cfg_buttons.c:722
 msgid "Foreground..."
 msgstr "Police..."
 
-#: src/cfg_buttons.c:749
+#: src/cfg_buttons.c:748
 msgid "Shortcuts"
-msgstr "Répertoires"
+msgstr "RÃ©pertoires"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Clear"
 msgstr "Effacer"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy Colors To"
 msgstr "Copier les couleurs vers..."
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy To"
 msgstr "Copier vers..."
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Swap With"
-msgstr "Échanger avec..."
+msgstr "Ãchanger avec..."
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Add Row..."
-msgstr "Ajout d'une rangée..."
+msgstr "Ajout d'une rangÃ©e..."
 
-#: src/cfg_buttons.c:751 src/cfg_cmdseq.c:951
+#: src/cfg_buttons.c:750 src/cfg_cmdseq.c:966
 msgid "Delete Row"
 msgstr "Supprimer"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Down"
 msgstr "En bas"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Row Width..."
 msgstr "Nbr de boutons..."
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Up"
 msgstr "En haut"
 
-#: src/cfg_buttons.c:762
+#: src/cfg_buttons.c:761
 msgid "Sheet"
 msgstr "Boutons de   "
 
-#: src/cfg_buttons.c:778
+#: src/cfg_buttons.c:775
 msgid "Primary"
 msgstr "Avant plan"
 
-#: src/cfg_buttons.c:780
+#: src/cfg_buttons.c:777
 msgid "Secondary"
-msgstr "Arrière-plan"
+msgstr "ArriÃ¨re-plan"
 
-#: src/cfg_buttons.c:785
+#: src/cfg_buttons.c:782
 msgid "Tooltip"
 msgstr "Commentaire"
 
-#: src/cfg_buttons.c:792 src/cfg_dirpane.c:1145
+#: src/cfg_buttons.c:790 src/cfg_dirpane.c:1107
 msgid "Flags"
 msgstr "Affichage"
 
-#: src/cfg_buttons.c:794
+#: src/cfg_buttons.c:792
 msgid "Narrow?"
-msgstr "Étroit"
+msgstr "Ãtroit"
 
-#: src/cfg_buttons.c:798
+#: src/cfg_buttons.c:796
 msgid "Show Tooltip?"
 msgstr "Afficher le commentaire (bulle d'aide)"
 
-#: src/cfg_buttons.c:833
+#: src/cfg_buttons.c:831
 msgid "Buttons"
 msgstr "Boutons de commande"
 
-#: src/cfg_buttons.c:834 src/cfg_cmdseq.c:1067
+#: src/cfg_buttons.c:832 src/cfg_cmdseq.c:1081
 msgid "Definitions"
-msgstr "Définitions"
+msgstr "DÃ©finitions"
 
 #: src/cfg_cmdcfg.c:66
 msgid "Options"
 msgstr "Options"
 
-#: src/cfg_cmdseq.c:610
+#: src/cfg_cmdseq.c:611
 msgid "Select Builtin"
 msgstr "Choix commande interne"
 
-#: src/cfg_cmdseq.c:626
+#: src/cfg_cmdseq.c:627
 msgid "Opening brace"
 msgstr "Accolade ouvrante"
 
-#: src/cfg_cmdseq.c:627
+#: src/cfg_cmdseq.c:628
 msgid "Closing brace"
 msgstr "Accolade fermante"
 
-#: src/cfg_cmdseq.c:628
+#: src/cfg_cmdseq.c:629
 msgid "First selected"
-msgstr "1ère entrée sélectionnée"
+msgstr "1Ã¨re entrÃ©e sÃ©lectionnÃ©e"
 
-#: src/cfg_cmdseq.c:629
+#: src/cfg_cmdseq.c:630
 msgid "First selected, unselect"
-msgstr "1ère entrée sélectionnée, désélectionnée"
+msgstr "1Ã¨re entrÃ©e sÃ©lectionnÃ©e, dÃ©sÃ©lectionnÃ©e"
 
-#: src/cfg_cmdseq.c:630
+#: src/cfg_cmdseq.c:631
 msgid "First selected, with path"
-msgstr "1ère entrée sélectionnée, avec chemin"
+msgstr "1Ã¨re entrÃ©e sÃ©lectionnÃ©e, avec chemin"
 
-#: src/cfg_cmdseq.c:631
+#: src/cfg_cmdseq.c:632
 msgid "First selected, with path, unselect"
-msgstr "1ère entrée sélectionnée, avec chemin, désélectionnée"
+msgstr "1Ã¨re entrÃ©e sÃ©lectionnÃ©e, avec chemin, dÃ©sÃ©lectionnÃ©e"
 
-#: src/cfg_cmdseq.c:632
+#: src/cfg_cmdseq.c:633
 msgid "First selected (destination pane)"
-msgstr "1ère entrée sélectionnée (panneau de destination)"
+msgstr "1Ã¨re entrÃ©e sÃ©lectionnÃ©e (panneau de destination)"
 
-#: src/cfg_cmdseq.c:633
+#: src/cfg_cmdseq.c:634
 #, fuzzy
 msgid "First selected, no quotes"
-msgstr "1ère entrée sélectionnée, désélectionnée"
+msgstr "1Ã¨re entrÃ©e sÃ©lectionnÃ©e, dÃ©sÃ©lectionnÃ©e"
 
-#: src/cfg_cmdseq.c:634
+#: src/cfg_cmdseq.c:635
 msgid "All selected"
-msgstr "Toutes entrées sélectionnées"
+msgstr "Toutes entrÃ©es sÃ©lectionnÃ©es"
 
-#: src/cfg_cmdseq.c:635
+#: src/cfg_cmdseq.c:636
 msgid "All selected, unselect"
-msgstr "Toutes entrées sélectionnées, désélectionnées"
+msgstr "Toutes entrÃ©es sÃ©lectionnÃ©es, dÃ©sÃ©lectionnÃ©es"
 
-#: src/cfg_cmdseq.c:636
+#: src/cfg_cmdseq.c:637
 msgid "All selected, with paths"
-msgstr "Toutes entrées sélectionnées, avec chemins"
+msgstr "Toutes entrÃ©es sÃ©lectionnÃ©es, avec chemins"
 
-#: src/cfg_cmdseq.c:637
+#: src/cfg_cmdseq.c:638
 msgid "All selected, with paths, unselect"
-msgstr "Toutes entrées sélectionnées, avec chemins, désélectionnées"
+msgstr "Toutes entrÃ©es sÃ©lectionnÃ©es, avec chemins, dÃ©sÃ©lectionnÃ©es"
 
-#: src/cfg_cmdseq.c:638
+#: src/cfg_cmdseq.c:639
 msgid "All selected (destination pane)"
-msgstr "Toutes entrées sélectionnées (panneau de destination)"
+msgstr "Toutes entrÃ©es sÃ©lectionnÃ©es (panneau de destination)"
 
-#: src/cfg_cmdseq.c:639
+#: src/cfg_cmdseq.c:640
 #, fuzzy
 msgid "All selected, no quotes"
-msgstr "Toutes entrées sélectionnées, avec chemins"
+msgstr "Toutes entrÃ©es sÃ©lectionnÃ©es, avec chemins"
 
-#: src/cfg_cmdseq.c:640
+#: src/cfg_cmdseq.c:641
 msgid "Path to source pane's directory"
-msgstr "Chemin du répertoire source"
+msgstr "Chemin du rÃ©pertoire source"
 
-#: src/cfg_cmdseq.c:641
+#: src/cfg_cmdseq.c:642
 msgid "Path to destination pane's directory"
-msgstr "Chemin du répertoire destination"
+msgstr "Chemin du rÃ©pertoire destination"
 
-#: src/cfg_cmdseq.c:642
+#: src/cfg_cmdseq.c:643
 msgid "Path to home directory"
-msgstr "Chemin du répertoire personnel"
+msgstr "Chemin du rÃ©pertoire personnel"
 
-#: src/cfg_cmdseq.c:643
+#: src/cfg_cmdseq.c:644
 msgid "Path of left pane"
 msgstr "Chemin du panneau gauche"
 
-#: src/cfg_cmdseq.c:644
+#: src/cfg_cmdseq.c:645
 msgid "Path of right pane"
 msgstr "Chemin du panneau droite"
 
-#: src/cfg_cmdseq.c:645
+#: src/cfg_cmdseq.c:646
+#, fuzzy
+msgid "URI of first selected"
+msgstr "1Ã¨re entrÃ©e sÃ©lectionnÃ©e"
+
+#: src/cfg_cmdseq.c:647
+#, fuzzy
+msgid "URI of first selected, unselect"
+msgstr "1Ã¨re entrÃ©e sÃ©lectionnÃ©e, dÃ©sÃ©lectionnÃ©e"
+
+#: src/cfg_cmdseq.c:648
+#, fuzzy
+msgid "URI of first selected, no quotes"
+msgstr "1Ã¨re entrÃ©e sÃ©lectionnÃ©e, dÃ©sÃ©lectionnÃ©e"
+
+#: src/cfg_cmdseq.c:649
+#, fuzzy
+msgid "URIs of all selected"
+msgstr "Toutes entrÃ©es sÃ©lectionnÃ©es"
+
+#: src/cfg_cmdseq.c:650
+#, fuzzy
+msgid "URIs of all selected, unselect"
+msgstr "Toutes entrÃ©es sÃ©lectionnÃ©es, dÃ©sÃ©lectionnÃ©es"
+
+#: src/cfg_cmdseq.c:651
+#, fuzzy
+msgid "URIs of all selected, no quotes"
+msgstr "Toutes entrÃ©es sÃ©lectionnÃ©es, avec chemins"
+
+#: src/cfg_cmdseq.c:652
+#, fuzzy
+msgid "URIs of all selected, unselect, no quotes"
+msgstr "Toutes entrÃ©es sÃ©lectionnÃ©es, avec chemins"
+
+#: src/cfg_cmdseq.c:653
+#, fuzzy
+msgid "URI of first selected (destination pane)"
+msgstr "1Ã¨re entrÃ©e sÃ©lectionnÃ©e (panneau de destination)"
+
+#: src/cfg_cmdseq.c:654
 msgid "Input combo box"
-msgstr "Boîte de sélection "
+msgstr "BoÃ®te de sÃ©lection "
 
-#: src/cfg_cmdseq.c:646
+#: src/cfg_cmdseq.c:655
 msgid "Input using menu"
-msgstr "Boîte de menu"
+msgstr "BoÃ®te de menu"
 
-#: src/cfg_cmdseq.c:647
+#: src/cfg_cmdseq.c:656
 msgid "Input string"
-msgstr "Saisie de chaînes"
+msgstr "Saisie de chaÃ®nes"
 
-#: src/cfg_cmdseq.c:648
+#: src/cfg_cmdseq.c:657
 msgid "Input check button (gives TRUE or FALSE)"
-msgstr "Contrôle du bouton (donne VRAI ou FAUX)"
+msgstr "ContrÃ´le du bouton (donne VRAI ou FAUX)"
 
-#: src/cfg_cmdseq.c:649
+#: src/cfg_cmdseq.c:658
 #, fuzzy
 msgid "Add label to input window"
-msgstr "Titre de la fenêtre"
+msgstr "Titre de la fenÃªtre"
 
-#: src/cfg_cmdseq.c:650
+#: src/cfg_cmdseq.c:659
 msgid "Add a separator bar to input window"
 msgstr ""
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "$NAME"
 msgstr "$NAME"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "Value of $NAME (environment)"
 msgstr "Valeur de $NAME (variable d'environnement)"
 
-#: src/cfg_cmdseq.c:652
+#: src/cfg_cmdseq.c:661
 msgid "gentoo's PID"
 msgstr "PID de gentoo's"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "Home directory for user NAME"
-msgstr "Chemin du répertoire pour l'utilisateur NAME"
+msgstr "Chemin du rÃ©pertoire pour l'utilisateur NAME"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "~NAME"
 msgstr "~NAME"
 
-#: src/cfg_cmdseq.c:677
+#: src/cfg_cmdseq.c:686 src/cmd_split.c:536
 msgid "Pick Code"
-msgstr "Sélection d'une fonction"
+msgstr "SÃ©lection d'une fonction"
 
-#: src/cfg_cmdseq.c:765
+#: src/cfg_cmdseq.c:778
 msgid "(No Options Available)"
 msgstr "(Aucune option de disponible)"
 
-#: src/cfg_cmdseq.c:801
+#: src/cfg_cmdseq.c:814
 msgid "Run in Background?"
-msgstr "Démarrer en tâche de fond"
+msgstr "DÃ©marrer en tÃ¢che de fond"
 
-#: src/cfg_cmdseq.c:805
+#: src/cfg_cmdseq.c:818
 msgid "Kill Previous Instance?"
 msgstr "Fermer si ouvert"
 
-#: src/cfg_cmdseq.c:809
+#: src/cfg_cmdseq.c:822
 msgid "Survive Quit?"
 msgstr "Survivre en quittant"
 
-#: src/cfg_cmdseq.c:815
+#: src/cfg_cmdseq.c:828
 msgid "Capture Output?"
 msgstr "Capture"
 
-#: src/cfg_cmdseq.c:900
+#: src/cfg_cmdseq.c:913
 msgid "Before Execution"
-msgstr "Avant exécution"
+msgstr "Avant exÃ©cution"
 
-#: src/cfg_cmdseq.c:903
+#: src/cfg_cmdseq.c:916
 #, fuzzy
 msgid "Require Source Selection?"
-msgstr "Droits d'accès"
+msgstr "Droits d'accÃ¨s"
 
-#: src/cfg_cmdseq.c:907
+#: src/cfg_cmdseq.c:920
 #, fuzzy
 msgid "Require Destination Selection?"
-msgstr "Droits d'accès"
+msgstr "Droits d'accÃ¨s"
 
-#: src/cfg_cmdseq.c:912
+#: src/cfg_cmdseq.c:926
 msgid "CD Source?"
 msgstr "CD Source"
 
-#: src/cfg_cmdseq.c:915
+#: src/cfg_cmdseq.c:929
 msgid "CD Destination?"
 msgstr "CD Destination"
 
-#: src/cfg_cmdseq.c:922
+#: src/cfg_cmdseq.c:937
 msgid "After Execution"
-msgstr "Après exécution"
+msgstr "AprÃ¨s exÃ©cution"
 
-#: src/cfg_cmdseq.c:924
+#: src/cfg_cmdseq.c:939
 msgid "Rescan Source?"
 msgstr "Re-analyser la source"
 
-#: src/cfg_cmdseq.c:928
+#: src/cfg_cmdseq.c:943
 msgid "Rescan Destination?"
 msgstr "Re-analyser la destination"
 
-#: src/cfg_cmdseq.c:942
+#: src/cfg_cmdseq.c:957
 msgid "General"
-msgstr "Général"
+msgstr "GÃ©nÃ©ral"
 
-#: src/cfg_cmdseq.c:945
+#: src/cfg_cmdseq.c:960
 msgid "Before&After"
-msgstr "Avant & Après"
+msgstr "Avant & AprÃ¨s"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "Built-In"
 msgstr "Interne"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "External"
 msgstr "Externe"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Add Row"
-msgstr "Nouvelle entrée "
+msgstr "Nouvelle entrÃ©e "
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Duplicate"
 msgstr "Duplicata"
 
-#: src/cfg_cmdseq.c:978 src/cfg_styles.c:588 src/cfg_styles.c:805
-#: src/cfg_types.c:679 src/cmd_symlink.c:209 src/dpformat.c:35
+#: src/cfg_cmdseq.c:993 src/cfg_styles.c:596 src/cfg_styles.c:823
+#: src/cfg_types.c:678 src/cmd_info.c:151 src/cmd_split.c:648
+#: src/cmd_symlink.c:213 src/dpformat.c:36
 msgid "Name"
 msgstr "Nom "
 
-#: src/cfg_cmdseq.c:988
+#: src/cfg_cmdseq.c:1004
 msgid "Definition"
-msgstr "Définition"
+msgstr "DÃ©finition"
 
-#: src/cfg_cmdseq.c:1044
+#: src/cfg_cmdseq.c:1058
 msgid "Repeat Sequence Until No Source Selection?"
 msgstr "Repeat Sequence Until No Source Selection?"
 
-#: src/cfg_cmdseq.c:1056 src/cfg_controls.c:655 src/cfg_controls.c:706
-#: src/cfg_styles.c:833 src/cfg_types.c:775
+#: src/cfg_cmdseq.c:1070 src/cfg_controls.c:622 src/cfg_controls.c:673
+#: src/cfg_styles.c:853 src/cfg_types.c:776
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/cfg_cmdseq.c:1059 src/cfg_controls.c:658 src/cfg_controls.c:709
-#: src/cfg_styles.c:836 src/cfg_types.c:788
+#: src/cfg_cmdseq.c:1073 src/cfg_controls.c:625 src/cfg_controls.c:676
+#: src/cfg_styles.c:856 src/cfg_types.c:789
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/cfg_cmdseq.c:1066
+#: src/cfg_cmdseq.c:1080
 msgid "Commands"
 msgstr "Commandes"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1365 src/cfg_dirpane.c:1371
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1288 src/cfg_dirpane.c:1293
 msgid "Left"
 msgstr "Gauche"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Middle"
 msgstr "Milieu"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1364 src/cfg_dirpane.c:1372
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1287 src/cfg_dirpane.c:1294
 msgid "Right"
 msgstr "Droite"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Down"
 msgstr "Molette vers le bas"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Up"
 msgstr "Molette vers le haut"
 
-#: src/cfg_controls.c:382
+#: src/cfg_controls.c:378
 msgid ""
 "The following modifier key(s) must\n"
 "be held down when the mouse button\n"
@@ -484,50 +526,46 @@
 "\n"
 "Vous pouvez assigner une touche(s) modificatrice(s)\n"
 "avec vos boutons de souris.\n"
-"Pour déclencher la commande, vous devrez \n"
-"maintenir celle(s)-ci enfoncée(s) et cliquez."
+"Pour dÃ©clencher la commande, vous devrez \n"
+"maintenir celle(s)-ci enfoncÃ©e(s) et cliquez."
 
-#: src/cfg_controls.c:395
+#: src/cfg_controls.c:391
 msgid "Edit Modifiers"
-msgstr "Requête de gentoo"
+msgstr "RequÃªte de gentoo"
 
-#: src/cfg_controls.c:613
+#: src/cfg_controls.c:580
 msgid "Controls"
 msgstr "Raccourcis clavier/souris"
 
-#: src/cfg_controls.c:620
+#: src/cfg_controls.c:587
 msgid "Global Keyboard Shortcuts"
-msgstr "Panneau de contrôle des raccourcis clavier"
+msgstr "Panneau de contrÃ´le des raccourcis clavier"
 
-#: src/cfg_controls.c:665
+#: src/cfg_controls.c:632
 msgid "Dirpane Mouse Buttons"
-msgstr "Panneau de contrôle des boutons de souris"
+msgstr "Panneau de contrÃ´le des boutons de souris"
 
-#: src/cfg_controls.c:690
+#: src/cfg_controls.c:657
 msgid "Button"
 msgstr "Bouton"
 
-#: src/cfg_controls.c:693
+#: src/cfg_controls.c:660
 msgid "Edit Modifiers..."
-msgstr "Éditer touche modificatrice..."
+msgstr "Ãditer touche modificatrice..."
 
-#: src/cfg_controls.c:716
+#: src/cfg_controls.c:683
 msgid "Click-M-Click Gesture"
 msgstr ""
 
-#: src/cfg_controls.c:726
+#: src/cfg_controls.c:693
 msgid "Time Limit"
 msgstr ""
 
-#: src/cfg_controls.c:737
-msgid "Path Right Click"
-msgstr ""
-
-#: src/cfg_controls.c:750
+#: src/cfg_controls.c:704
 msgid "Ignore Num Lock For All Bindings?"
 msgstr "Ignorer la touche clavier 'Verr num' pour tous les raccourcis"
 
-#: src/cfg_controls.c:780
+#: src/cfg_controls.c:734
 msgid ""
 "Note: The mouse button control settings\n"
 "are ambiguous: the same button+modifier\n"
@@ -535,316 +573,303 @@
 "might make their behaviour pretty weird..."
 msgstr ""
 "Note : Les configurations du bouton de souris\n"
-"sont ambigu : si la même combinaison\n"
-"(bouton+touche modificatrice) est employée\n"
+"sont ambigu : si la mÃªme combinaison\n"
+"(bouton+touche modificatrice) est employÃ©e\n"
 "pour plus d'une fonction. Cela pourraient avoir\n"
-"un comportement assez mystérieux..."
+"un comportement assez mystÃ©rieux..."
 
-#: src/cfg_controls.c:784
+#: src/cfg_controls.c:738
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/cfg_controls.c:784 src/children.c:95 src/cmd_info.c:246
+#: src/cfg_controls.c:738 src/children.c:89 src/cmd_info.c:320
 msgid "_OK"
 msgstr "_OK"
 
-#: src/cfg_dirpane.c:365
-msgid "Formatted Size, in bytes"
-msgstr "Taille formatée, en octets"
-
-#: src/cfg_dirpane.c:365
-msgid "Raw Size, in Bytes"
-msgstr "Taille RAW, en octets"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in kilobytes"
-msgstr "Taille formatée, en kilo-octets"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in megabytes"
-msgstr "Taille formatée, en méga-octets"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, \"Smart\" Unit"
-msgstr "Taille formatée,  \"Smart\" Unité"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, in gigabytes"
-msgstr "Taille Formatée, en gigaoctets"
-
-#: src/cfg_dirpane.c:383
+#: src/cfg_dirpane.c:333
 msgid "Append Type Character?"
-msgstr "Ajouter un type de caractère"
+msgstr "Ajouter un type de caractÃ¨re"
 
-#: src/cfg_dirpane.c:386
-msgid "Append \"-> destination\" on Links?"
+#: src/cfg_dirpane.c:336
+#, fuzzy
+msgid "Append \"â destination\" on Links?"
 msgstr "Ajouter \"-> destination\" sur les liens"
 
-#: src/cfg_dirpane.c:406
+#: src/cfg_dirpane.c:358
 msgid "Place Tick Every 3 Digits?"
 msgstr ""
 
-#: src/cfg_dirpane.c:416
+#: src/cfg_dirpane.c:369
 msgid "Digits of Precision"
 msgstr ""
 
-#: src/cfg_dirpane.c:429
+#: src/cfg_dirpane.c:382
 msgid "Show Dir's File System Size?"
 msgstr ""
 
-#: src/cfg_dirpane.c:435 src/cfg_dirpane.c:439 src/cfg_dirpane.c:443
-#: src/cfg_dirpane.c:447 src/cfg_dirpane.c:451 src/cfg_dirpane.c:455
-#: src/cfg_dirpane.c:459 src/cfg_dirpane.c:463 src/cfg_dirpane.c:467
-#: src/cfg_dirpane.c:474
+#: src/cfg_dirpane.c:388 src/cfg_dirpane.c:392 src/cfg_dirpane.c:396
+#: src/cfg_dirpane.c:400 src/cfg_dirpane.c:404 src/cfg_dirpane.c:408
+#: src/cfg_dirpane.c:412 src/cfg_dirpane.c:416 src/cfg_dirpane.c:420
+#: src/cfg_dirpane.c:428
 msgid "Format"
 msgstr ""
 
-#: src/cfg_dirpane.c:497
+#: src/cfg_dirpane.c:454
 #, c-format
 msgid "%s Settings"
 msgstr ""
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1002 src/cfg_dirpane.c:1003
-#: src/cmd_select.c:414
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:970 src/cfg_dirpane.c:971
+#: src/cmd_select.c:381
 msgid "Content"
 msgstr "Contenu"
 
-#: src/cfg_dirpane.c:611
+#: src/cfg_dirpane.c:571
 msgid "Justification"
 msgstr "Justification"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1003
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:971
 msgid "Title"
 msgstr "Titre"
 
-#: src/cfg_dirpane.c:611 src/window.c:201
+#: src/cfg_dirpane.c:571 src/window.c:200
 msgid "Width"
 msgstr "Largeur "
 
-#: src/cfg_dirpane.c:612
+#: src/cfg_dirpane.c:572
 msgid "Center"
 msgstr "Centrer"
 
-#: src/cfg_dirpane.c:621
+#: src/cfg_dirpane.c:581
 msgid "Basic Settings"
 msgstr "Configurations de base"
 
-#: src/cfg_dirpane.c:669
+#: src/cfg_dirpane.c:628
 msgid "Edit Column Content"
-msgstr "Édition - Contenu colonne"
+msgstr "Ãdition - Contenu colonne"
 
-#: src/cfg_dirpane.c:1002
+#: src/cfg_dirpane.c:970
 msgid "Default Title"
 msgstr "Titre"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories First"
-msgstr "Répertoires en premier "
+msgstr "RÃ©pertoires en premier "
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Last"
 msgstr "Fichiers en premier"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Mixed"
 msgstr "Mixte"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Left of List"
 msgstr "A gauche"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Right of List"
 msgstr "A droite"
 
-#: src/cfg_dirpane.c:1029 src/cfg_dirpane.c:1030
+#: src/cfg_dirpane.c:997
 msgid "System Default"
-msgstr "Défaut"
-
-#: src/cfg_dirpane.c:1030
-msgid "Always Set"
-msgstr ""
+msgstr "DÃ©faut"
 
-#: src/cfg_dirpane.c:1030 src/cmd_chmod.c:260 src/menus.c:513
-msgid "Toggle"
-msgstr "Basculer"
-
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy From %s"
 msgstr "Copier depuis le panneau de %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy To %s"
 msgstr "Copier vers le panneau de %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Swap With %s"
-msgstr "Échanger avec le panneau de %s"
+msgstr "Ãchanger avec le panneau de %s"
 
-#: src/cfg_dirpane.c:1048
+#: src/cfg_dirpane.c:1015
 msgid "Columns"
 msgstr "Format de liste"
 
-#: src/cfg_dirpane.c:1053
+#: src/cfg_dirpane.c:1020
 msgid "Available Content Types"
 msgstr "Types disponibles"
 
-#: src/cfg_dirpane.c:1070
+#: src/cfg_dirpane.c:1037
 msgid "Selected Content Types"
-msgstr "Types sélectionnés"
+msgstr "Types sÃ©lectionnÃ©s"
 
-#: src/cfg_dirpane.c:1081 src/cfg_styles.c:723
+#: src/cfg_dirpane.c:1049 src/cfg_styles.c:741
 msgid "Edit..."
-msgstr "Éditer"
+msgstr "Ãditer"
 
-#: src/cfg_dirpane.c:1082 src/cmd_renamere.c:508
+#: src/cfg_dirpane.c:1050 src/cmd_renamere.c:481
 msgid "Remove"
 msgstr "Retirer"
 
-#: src/cfg_dirpane.c:1096
+#: src/cfg_dirpane.c:1064
 msgid "Sorting"
 msgstr "Format d'affichage"
 
-#: src/cfg_dirpane.c:1099
+#: src/cfg_dirpane.c:1067
 msgid "Sort On"
 msgstr "Trier par  "
 
-#: src/cfg_dirpane.c:1106 src/cmd_split.c:233 src/dpformat.c:39
-#: src/dpformat.c:40
+#: src/cfg_dirpane.c:1071 src/cmd_split.c:590 src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode"
 msgstr "Mode "
 
-#: src/cfg_dirpane.c:1113
+#: src/cfg_dirpane.c:1077
 msgid "Inverse Sorting?"
 msgstr "Inverser l'ordre"
 
-#: src/cfg_dirpane.c:1116 src/cfg_paths.c:187 src/cfg_types.c:743
-#: src/cmd_renamere.c:459 src/cmd_renamere.c:486 src/cmd_select.c:520
-#: src/textview.c:620
+#: src/cfg_dirpane.c:1080 src/cfg_paths.c:228 src/cfg_types.c:744
+#: src/cmd_renamere.c:432 src/cmd_renamere.c:459 src/cmd_select.c:478
+#: src/textview.c:604
 msgid "Ignore Case?"
 msgstr "Ignorer la casse"
 
-#: src/cfg_dirpane.c:1119
-msgid "Numerical Mode?"
-msgstr "Mode numérique"
-
-#: src/cfg_dirpane.c:1127
+#: src/cfg_dirpane.c:1088
 msgid "Default Directory"
-msgstr "Répertoire par défaut au démarrage"
+msgstr "RÃ©pertoire par dÃ©faut au dÃ©marrage"
 
-#: src/cfg_dirpane.c:1132
+#: src/cfg_dirpane.c:1094
 msgid "Grab Current"
 msgstr "Capturer (courant)"
 
-#: src/cfg_dirpane.c:1135
+#: src/cfg_dirpane.c:1097
 #, fuzzy
 msgid "From History"
 msgstr "Historique"
 
-#: src/cfg_dirpane.c:1148
+#: src/cfg_dirpane.c:1110
 msgid "Path Above?"
 msgstr "Afficher le chemin au dessus"
 
-#: src/cfg_dirpane.c:1152
+#: src/cfg_dirpane.c:1114
 msgid "Hide Allowed?"
-msgstr "Afficher les fichiers cachés"
+msgstr "Afficher les fichiers cachÃ©s"
 
-#: src/cfg_dirpane.c:1156
+#: src/cfg_dirpane.c:1118
 msgid "Scrollbar Always?"
 msgstr "Afficher l'ascenseur"
 
-#: src/cfg_dirpane.c:1160
+#: src/cfg_dirpane.c:1122
 msgid "Huge Parent Button?"
-msgstr "Bouton 'Parent' énorme"
+msgstr "Bouton 'Parent' Ã©norme"
 
-#: src/cfg_dirpane.c:1168
+#: src/cfg_dirpane.c:1127
+msgid "Set Custom Font?"
+msgstr ""
+
+#: src/cfg_dirpane.c:1140
 msgid "Scrollbar Position"
 msgstr "Position ascenseurs"
 
-#: src/cfg_dirpane.c:1180
-msgid "Modify 'Control' Key State"
-msgstr "Modifier l'état touche 'Ctrl'"
-
-#: src/cfg_dirpane.c:1225
-msgid "Active Pane Titles"
-msgstr "Titre"
-
-#: src/cfg_dirpane.c:1225
-msgid "Focused Row, Unselected"
-msgstr "Désélectionner  "
-
-#: src/cfg_dirpane.c:1226
-msgid "Focused Row, Selected"
-msgstr "Sélectionner "
-
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Horizontal"
 msgstr "Gauche/Droite"
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Vertical"
 msgstr "Haut/Bas"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Don't Track"
 msgstr "Ne pas tracer"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Ratio"
 msgstr "Largeur proportionnelle"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Left Pane"
 msgstr "Largeur du panneau gauche"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Right Pane"
 msgstr "Largeur du panneau droit"
 
-#: src/cfg_dirpane.c:1275
+#: src/cfg_dirpane.c:1198
 msgid "Pane Orientation"
 msgstr "Orientation des panneaux"
 
-#: src/cfg_dirpane.c:1289
+#: src/cfg_dirpane.c:1212
 msgid "Split Tracking"
 msgstr "Dimensions des panneaux"
 
-#: src/cfg_dirpane.c:1312
+#: src/cfg_dirpane.c:1235
 msgid "pixels"
 msgstr "en pixels"
 
-#: src/cfg_dirpane.c:1340
+#: src/cfg_dirpane.c:1263
 msgid "Remember Selected Rows?"
 msgstr ""
 
-#: src/cfg_dirpane.c:1343
+#: src/cfg_dirpane.c:1266
 msgid "Save History Lists?"
 msgstr "Sauvegarder les fichiers d'historique"
 
-#: src/cfg_dirpane.c:1360 src/cfg_dirpane.c:1370
+#: src/cfg_dirpane.c:1283 src/cfg_dirpane.c:1292
 msgid "Dir Panes"
 msgstr "Panneaux"
 
-#: src/cfg_dirpane.c:1374
+#: src/cfg_dirpane.c:1295
 msgid "Pane Split"
 msgstr "Dimensions"
 
-#: src/cfg_dirpane.c:1375
+#: src/cfg_dirpane.c:1296
 msgid "History"
 msgstr "Historique"
 
-#: src/cfg_errors.c:45
+#: src/cfg_dirpane.c:1725
+msgid "'Blocks' Content Deprecated"
+msgstr ""
+
+#: src/cfg_dirpane.c:1726
+msgid ""
+"The 'Blocks' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
+
+#: src/cfg_dirpane.c:1732
+msgid "'Block Size' Content Deprecated"
+msgstr ""
+
+#: src/cfg_dirpane.c:1733
+msgid ""
+"The 'Block Size' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
+
+#: src/cfg_errors.c:48
 msgid "Errors"
 msgstr "Gestion des Erreurs"
 
-#: src/cfg_errors.c:52
-msgid "Use Dialog to Report Errors?"
-msgstr "Activer la boîte de dialogue pour les rapports d'erreurs"
+#: src/cfg_errors.c:55
+msgid "Error and Status Message Display"
+msgstr ""
+
+#: src/cfg_errors.c:57
+msgid "Status Bar, Above Panes"
+msgstr ""
 
-#: src/cfg_errors.c:56
+#: src/cfg_errors.c:60
+msgid "Main Window's Title Bar"
+msgstr ""
+
+#: src/cfg_errors.c:63
+msgid "Separate Dialog"
+msgstr ""
+
+#: src/cfg_errors.c:69
 msgid "Cause Console Beep on Error?"
 msgstr "Activer le signal sonore pour les erreurs"
 
@@ -852,116 +877,96 @@
 msgid "Menus"
 msgstr "Menus"
 
-#: src/cfg_mount.c:168
-msgid "Never"
-msgstr "Jamais"
-
-#: src/cfg_mount.c:168
-msgid "On Every Access"
-msgstr "A chaque accès"
-
-#: src/cfg_mount.c:177
-msgid "Mounting"
-msgstr "Points de montage"
-
-#: src/cfg_mount.c:184
-msgid "Mount When?"
-msgstr "Quand les monter ?"
-
-#: src/cfg_mount.c:196
-msgid "Mount Options"
-msgstr "Options de montage"
-
-#: src/cfg_mount.c:199
-msgid "Mount Command"
-msgstr "Commande de montage "
+#: src/cfg_nag.c:78
+#, c-format
+msgid ""
+"Click the button below to reset the %zu stored 'Don't show this dialog "
+"again' responses."
+msgstr ""
 
-#: src/cfg_mount.c:204
-msgid "Unmount Command"
-msgstr "Commande de démontage "
+#: src/cfg_nag.c:100
+msgid "Nagging"
+msgstr ""
 
-#: src/cfg_mount.c:211
-msgid "Only Mount on Toplevel Directories?"
-msgstr "Seulement les monter sur les répertoires de haut niveau"
+#: src/cfg_nag.c:110
+#, fuzzy
+msgid "Reset All"
+msgstr "Par dÃ©faut"
 
-#: src/cfg_mount.c:214
-msgid "Use Command Error Dialog?"
-msgstr "Activer la boîte de dialogue pour les rapports d'erreurs"
+#: src/cfg_paths.c:78
+msgid "Edit path"
+msgstr ""
 
-#: src/cfg_mount.c:217
-msgid "Unmount When gentoo Quits?"
-msgstr "Démonter en quittant gentoo"
+#: src/cfg_paths.c:152
+msgid "Icons"
+msgstr "IcÃ´nes "
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:153
 msgid "GTK+ RC"
 msgstr "GTK+ RC "
 
-#: src/cfg_paths.c:128
-msgid "Icons"
-msgstr "Icônes "
-
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:154
 msgid "fstab"
 msgstr "fstab"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:155
 msgid "mtab"
 msgstr "mtab"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Beginning With Dot (.)"
-msgstr "Cacher ceux commençant par un point (.)"
+msgstr "Cacher ceux commenÃ§ant par un point (.)"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Matching RE"
 msgstr "Suivant la correspondance RE"
 
-#: src/cfg_paths.c:129 src/cmd_chmod.c:259 src/menus.c:512
+#: src/cfg_paths.c:157 src/cmd_chmod.c:252 src/menus.c:519
 msgid "None"
 msgstr "Tout voir"
 
-#: src/cfg_paths.c:135
+#: src/cfg_paths.c:163
 msgid "Paths & Hide"
 msgstr "Chemins & Caches"
 
-#: src/cfg_paths.c:142
+#: src/cfg_paths.c:170
 msgid "Paths"
-msgstr "Chemins d'accès"
+msgstr "Chemins d'accÃ¨s"
 
-#: src/cfg_paths.c:169
+#: src/cfg_paths.c:209
 msgid "Hide Entries"
 msgstr "Afficher/Cacher les fichiers"
 
-#: src/cfg_styles.c:170 src/cfg_types.c:234 src/iconutil.c:29 src/menus.c:19
+#: src/cfg_styles.c:178 src/cfg_types.c:233 src/iconutil.c:31 src/menus.c:19
 msgid "(None)"
 msgstr "(Aucun)"
 
-#: src/cfg_styles.c:191 src/cfg_styles.c:428 src/cfg_styles.c:767
+#: src/cfg_styles.c:199 src/cfg_styles.c:436 src/cfg_styles.c:785
 msgid "Delete Action"
 msgstr "Supprimer l'action"
 
-#: src/cfg_styles.c:411 src/color_dialog.c:48
+#: src/cfg_styles.c:419 src/color_dialog.c:47
 msgid "Edit Color"
-msgstr "Édition couleur"
+msgstr "Ãdition couleur"
 
-#: src/cfg_styles.c:428
+#: src/cfg_styles.c:436
 msgid "Revert to Inherited Command"
-msgstr "Rétablir la commande"
+msgstr "RÃ©tablir la commande"
 
-#: src/cfg_styles.c:529
+#: src/cfg_styles.c:537
 #, fuzzy
 msgid "Select Command ..."
-msgstr "Requête de gentoo"
+msgstr "RequÃªte de gentoo"
 
-#: src/cfg_styles.c:592
+#: src/cfg_styles.c:601
 msgid "New Action Property"
-msgstr "Requête de gentoo"
+msgstr "RequÃªte de gentoo"
 
-#: src/cfg_styles.c:600
+#: src/cfg_styles.c:609
 msgid "something"
-msgstr "(commande à définir)"
+msgstr "(commande Ã  dÃ©finir)"
 
-#: src/cfg_styles.c:670
+#: src/cfg_styles.c:679
 msgid ""
 "Deleting this style will also delete\n"
 "all its children. Are you sure?"
@@ -970,136 +975,136 @@
 "vous allez supprimer tous les Styles (enfants).\n"
 "Confirmez-vous la suppression ?"
 
-#: src/cfg_styles.c:671
+#: src/cfg_styles.c:680
 msgid "Confirm Delete"
-msgstr "Requête de gentoo"
+msgstr "RequÃªte de gentoo"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Background Color"
 msgstr "Couleur fond"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Foreground Color"
 msgstr "Couleur police"
 
-#: src/cfg_styles.c:694 src/dpformat.c:53
+#: src/cfg_styles.c:703 src/dpformat.c:55
 msgid "Icon"
-msgstr "Icône"
+msgstr "IcÃ´ne"
 
-#: src/cfg_styles.c:696
+#: src/cfg_styles.c:705
 msgid "(Row Style Preview Text)"
 msgstr "(Style de rendu visuel)"
 
-#: src/cfg_styles.c:702 src/cmd_renameseq.c:386
+#: src/cfg_styles.c:713 src/cmd_renameseq.c:358 src/cmd_split.c:656
 msgid "Preview"
-msgstr "Aperçu "
+msgstr "AperÃ§u "
 
-#: src/cfg_styles.c:719
+#: src/cfg_styles.c:737
 msgid "Override Parent's?"
 msgstr "Personnaliser"
 
-#: src/cfg_styles.c:723
+#: src/cfg_styles.c:741
 msgid "Pick..."
-msgstr "Sélectionner..."
+msgstr "SÃ©lectionner..."
 
-#: src/cfg_styles.c:764
+#: src/cfg_styles.c:782
 msgid "Add Action..."
 msgstr "Ajouter une Action..."
 
-#: src/cfg_styles.c:810 src/menus.c:525
+#: src/cfg_styles.c:829 src/menus.c:532
 msgid "Parent"
 msgstr "Parent "
 
-#: src/cfg_styles.c:820
+#: src/cfg_styles.c:840
 msgid "Inherited Properties"
-msgstr "Propriétés"
+msgstr "PropriÃ©tÃ©s"
 
-#: src/cfg_styles.c:824
+#: src/cfg_styles.c:844
 msgid "Visual"
 msgstr "Visuel"
 
-#: src/cfg_styles.c:826
+#: src/cfg_styles.c:846
 msgid "Actions"
 msgstr "Actions"
 
-#: src/cfg_styles.c:843
+#: src/cfg_styles.c:863
 msgid "File Recognition"
 msgstr "Associations de fichiers "
 
-#: src/cfg_styles.c:844
+#: src/cfg_styles.c:864
 msgid "Styles"
 msgstr "Styles"
 
-#: src/cfg_types.c:193
+#: src/cfg_types.c:192
 #, c-format
 msgid "%s - Click to Change..."
 msgstr "%s - Cliquez pour changer..."
 
-#: src/cfg_types.c:508
+#: src/cfg_types.c:507
 msgid "(New Type)"
 msgstr "(Nouveau type)"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "B-Dev"
 msgstr "B-Dev"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "C-Dev"
 msgstr "C-Dev"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Dir"
-msgstr "Répertoire"
+msgstr "RÃ©pertoire"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "FIFO"
 msgstr "FIFO"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "File"
 msgstr "Fichier"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Link"
 msgstr "Lien"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Socket"
 msgstr "Socket"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "Readable"
 msgstr "Lecture"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetGID"
 msgstr "SGID"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetUID"
 msgstr "SUID"
 
-#: src/cfg_types.c:648 src/cmd_chmod.c:209
+#: src/cfg_types.c:647 src/cmd_chmod.c:200
 msgid "Sticky"
 msgstr "Sticky"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Executable"
-msgstr "Exécution"
+msgstr "ExÃ©cution"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Writable"
-msgstr "Écriture"
+msgstr "Ãcriture"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match 'file' (RE)"
 msgstr "Correspondance 'fichier'"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match Name (RE)"
 msgstr "Correspondance de nom"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Require Suffix"
 msgstr "Motifs de fichiers"
 
@@ -1113,21 +1118,21 @@
 
 #: src/cfg_types.c:703
 msgid "Require Protection"
-msgstr "Droits d'accès"
+msgstr "Droits d'accÃ¨s"
 
-#: src/cfg_types.c:738
+#: src/cfg_types.c:739
 msgid "Glob?"
 msgstr "Glob ?"
 
-#: src/cfg_types.c:754
+#: src/cfg_types.c:755
 msgid "Type's Style"
 msgstr "Type de style"
 
-#: src/cfg_types.c:756
+#: src/cfg_types.c:757
 msgid "Style"
 msgstr "Style"
 
-#: src/cfg_types.c:796
+#: src/cfg_types.c:797
 msgid "Types"
 msgstr "Types"
 
@@ -1145,28 +1150,28 @@
 
 #: src/cfg_windows.c:94
 msgid "Windows"
-msgstr "Fenêtres principales"
+msgstr "FenÃªtres principales"
 
 #: src/cfg_windows.c:102
 #, fuzzy
 msgid "Window Borders"
-msgstr "Fenêtres principales"
+msgstr "FenÃªtres principales"
 
 #: src/cfg_windows.c:118
 #, fuzzy
 msgid "Dialog Positioning"
 msgstr "Position"
 
-#: src/children.c:94
+#: src/children.c:88
 #, c-format
 msgid "Execution of \"%s\" Failed"
-msgstr "L'exécution de \"%s\" a échoué"
+msgstr "L'exÃ©cution de \"%s\" a Ã©chouÃ©"
 
-#: src/children.c:95 src/dialog.c:285
+#: src/children.c:89 src/dialog.c:290
 msgid "Error"
 msgstr "Erreur"
 
-#: src/children.c:274
+#: src/children.c:227
 #, c-format
 msgid "Couldn't terminate child \"%s\" (pid=%d)--zombie alert"
 msgstr ""
@@ -1188,7 +1193,7 @@
 
 #: src/cmd_about.c:97
 #, fuzzy
-msgid "(c) 1998-2009 by Emil Brink, Obsession Development.\n"
+msgid "(c) 1998-2011 by Emil Brink, Obsession Development.\n"
 msgstr "(c) 1998-2002 par Emil Brink, Obsession Development.\n"
 
 #: src/cmd_about.c:99
@@ -1197,57 +1202,45 @@
 "WARRANTY. Read the file COPYING for more details.\n"
 msgstr ""
 "C'est un logiciel libre, SANS AUCUNE GARANTIE. \n"
-"Lisez le fichier 'COPYING' pour plus de détails.\n"
-
-#: src/cmd_about.c:106
-msgid "FAM: Supported and active."
-msgstr "FAM : Supporté et actif"
-
-#: src/cmd_about.c:108
-msgid "FAM: Supported, but not active."
-msgstr "FAM : Supporté, mais non actif"
+"Lisez le fichier 'COPYING' pour plus de dÃ©tails.\n"
 
-#: src/cmd_about.c:110
-msgid "FAM: Not supported."
-msgstr "FAM : Non supporté"
-
-#: src/cmd_about.c:116
+#: src/cmd_about.c:105
 msgid "NLS: Supported, using built-in English strings."
-msgstr "NLS : Supporté, utilise les chaînes internes Anglaise"
+msgstr "NLS : SupportÃ©, utilise les chaÃ®nes internes Anglaise"
 
-#: src/cmd_about.c:129
-#, fuzzy
+#: src/cmd_about.c:118
+#, fuzzy, c-format
 msgid ""
 "The author of gentoo can be reached via Internet\n"
-"e-mail at <emil@obsession.se>; feel free to let\n"
+"e-mail at <a href=\"mailto:%s\">%s</a>; feel free to let\n"
 "me know what you think of this software, give\n"
 "suggestions/bug reports, and so on.\n"
 "\n"
 "The latest release of gentoo can always be down-\n"
 "loaded from the official gentoo project homepage at\n"
-"<http://www.obsession.se/gentoo/>. New releases are\n"
+"<a href=\"%s\">%s</a>. New releases are\n"
 "typically announced on the Freshmeat service at\n"
-"<http://freshmeat.net/>."
+"<a href=\"http://freshmeat.net/\">freshmeat.net</a>."
 msgstr ""
-"L'auteur de gentoo peut être joint via Internet\n"
-"par e-mail <emil@obsession.se>; n'hésitez pas à me\n"
+"L'auteur de gentoo peut Ãªtre joint via Internet\n"
+"par e-mail <emil@obsession.se>; n'hÃ©sitez pas Ã  me\n"
 "communiquer vos impressions, suggestions, rapports\n"
 "de bug sur ce logiciel ainsi que sur les\n"
 "\n"
 "widgets de J. Hanson <johan@tiq.com>.\n"
 "\n"
-"La dernière version de gentoo est toujours disponible\n"
-"en téléchargement sur le site officiel :\n"
+"La derniÃ¨re version de gentoo est toujours disponible\n"
+"en tÃ©lÃ©chargement sur le site officiel :\n"
 " <http://www.obsession.se/gentoo/>\n"
-"Les sorties des nouvelles versions sont annoncées sur le\n"
+"Les sorties des nouvelles versions sont annoncÃ©es sur le\n"
 "service Freshmeat :\n"
 "<Http: // freshmeat.net />"
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "About gentoo"
 msgstr "A propos de gentoo..."
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "_OK (Wait for More)"
 msgstr "_OK (Patientez...)"
 
@@ -1256,132 +1249,128 @@
 msgid "Set protection bits for \"%s\":"
 msgstr "Bits de protection pour \"%s\" :"
 
-#: src/cmd_chmod.c:208 src/cmd_chown.c:184 src/cmd_info.c:202
+#: src/cmd_chmod.c:199 src/cmd_chown.c:176 src/cmd_info.c:274
 msgid "Group"
 msgstr "Groupe"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 #, fuzzy
 msgid "Others"
 msgstr "Autres"
 
-#: src/cmd_chmod.c:208 src/cmd_info.c:195
+#: src/cmd_chmod.c:199 src/cmd_info.c:267
 msgid "Owner"
 msgstr "Utilisateur"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Special"
-msgstr "Spécial"
+msgstr "SpÃ©cial"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Execute"
-msgstr "Exécution"
+msgstr "ExÃ©cution"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Read"
 msgstr "Lecture"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set GID"
 msgstr "Set GID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set UID"
 msgstr "Set UID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Write"
-msgstr "Écriture"
+msgstr "Ãcriture"
 
-#: src/cmd_chmod.c:231
+#: src/cmd_chmod.c:222
 msgid "Protection Bits"
 msgstr "Bits de protection"
 
-#: src/cmd_chmod.c:242
+#: src/cmd_chmod.c:233
 msgid "Textual"
 msgstr ""
 
-#: src/cmd_chmod.c:253
+#: src/cmd_chmod.c:246
 msgid "Octal"
 msgstr ""
 
-#: src/cmd_chmod.c:258 src/menus.c:511
+#: src/cmd_chmod.c:251 src/menus.c:518
 msgid "All"
 msgstr "Tout"
 
-#: src/cmd_chmod.c:261
+#: src/cmd_chmod.c:253 src/menus.c:520
+msgid "Toggle"
+msgstr "Basculer"
+
+#: src/cmd_chmod.c:254
 msgid "Revert"
-msgstr "Rétablir"
+msgstr "RÃ©tablir"
 
-#: src/cmd_chmod.c:273 src/cmd_chown.c:208 src/cmd_info.c:304
+#: src/cmd_chmod.c:266 src/cmd_chown.c:201 src/cmd_info.c:372
 msgid "Recurse Directories?"
-msgstr "Appliquer aux sous-répertoires & fichiers"
+msgstr "Appliquer aux sous-rÃ©pertoires & fichiers"
 
-#: src/cmd_chmod.c:276
+#: src/cmd_chmod.c:269
 msgid "Don't Touch Directories?"
-msgstr "Ne pas appliquer aux sous-répertoires"
+msgstr "Ne pas appliquer aux sous-rÃ©pertoires"
 
-#: src/cmd_chmod.c:281
+#: src/cmd_chmod.c:274
 msgid "Change Mode"
-msgstr "Droits d'accès"
+msgstr "Droits d'accÃ¨s"
 
-#: src/cmd_chown.c:56
+#: src/cmd_chown.c:57
 #, c-format
 msgid "Set Ownership for '%s':"
-msgstr "Propriété pour  '%s' :"
+msgstr "PropriÃ©tÃ© pour  '%s' :"
 
-#: src/cmd_chown.c:184
+#: src/cmd_chown.c:176
 msgid "User"
 msgstr "Utilisateur"
 
-#: src/cmd_chown.c:213
+#: src/cmd_chown.c:206
 #, fuzzy
 msgid "Change Ownership"
-msgstr "Propriété"
+msgstr "PropriÃ©tÃ©"
 
 #: src/cmd_configure.c:50
 msgid "Automatically Save Changed Configuration on Exit?"
 msgstr ""
 
-#: src/cmd_copy.c:302
-#, c-format
-msgid ""
-"Can't copy directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-
-#: src/cmd_copy.c:392 src/cmd_copyas.c:62
+#: src/cmd_copy.c:175 src/cmd_copyas.c:62
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Copy?"
 msgstr ""
 "ATTENTION\n"
 "\n"
-"Le fichier \"%s\" existe déjà!\n"
-"Que désirez-vous faire ?\n"
+"Le fichier \"%s\" existe dÃ©jÃ !\n"
+"Que dÃ©sirez-vous faire ?\n"
 " "
 
-#: src/cmd_copy.c:393
+#: src/cmd_copy.c:176
 msgid "Copying..."
 msgstr "Copie en cours..."
 
-#: src/cmd_copy.c:440
+#: src/cmd_copy.c:217
 msgid "Preserve Dates During Copy?"
-msgstr "Préserver les dates pendant la copie"
+msgstr "PrÃ©server les dates pendant la copie"
 
-#: src/cmd_copy.c:441
+#: src/cmd_copy.c:218
 msgid "Ignore Failure to Copy Attributes (Date, Owner, Mode)?"
 msgstr ""
 
-#: src/cmd_copy.c:442
+#: src/cmd_copy.c:219
 msgid "Leave Failed Destination if Full Size?"
 msgstr "Abandonner, si l'espace libre de la destination est insuffisant"
 
-#: src/cmd_copy.c:443 src/cmd_viewtext.c:207
+#: src/cmd_copy.c:220 src/cmd_viewtext.c:204
 msgid "Buffer Size"
 msgstr "Taille du tampon"
 
-#: src/cmd_copyas.c:51
+#: src/cmd_copyas.c:49
 #, c-format
 msgid "Enter Name for Copy of \"%s\""
 msgstr ""
@@ -1389,7 +1378,7 @@
 "\n"
 "Entrer le nouveau nom pour \"%s\""
 
-#: src/cmd_copyas.c:53
+#: src/cmd_copyas.c:51
 #, c-format
 msgid "Enter Name for Clone of \"%s\""
 msgstr ""
@@ -1403,8 +1392,8 @@
 msgstr ""
 "ATTENTION\n"
 "\n"
-"Le fichier \"%s\" existe déjà!\n"
-"Que désirez-vous faire ?\n"
+"Le fichier \"%s\" existe dÃ©jÃ !\n"
+"Que dÃ©sirez-vous faire ?\n"
 " "
 
 #: src/cmd_copyas.c:65
@@ -1431,36 +1420,36 @@
 "\n"
 "Entrer le nouveau nom pour \"%s\""
 
-#: src/cmd_copyas.c:89
+#: src/cmd_copyas.c:91
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Symlink?"
 msgstr ""
 "ATTENTION\n"
 "\n"
-"Le fichier \"%s\" existe déjà!\n"
-"Que désirez-vous faire ?\n"
+"Le fichier \"%s\" existe dÃ©jÃ !\n"
+"Que dÃ©sirez-vous faire ?\n"
 " "
 
-#: src/cmd_copyas.c:204 src/cmd_copyas.c:210
+#: src/cmd_copyas.c:200 src/cmd_copyas.c:207
 msgid "Copy As"
 msgstr "Copie sous..."
 
-#: src/cmd_copyas.c:212
+#: src/cmd_copyas.c:209
 #, fuzzy
 msgid "Clone"
 msgstr "Fermer"
 
-#: src/cmd_copyas.c:214
+#: src/cmd_copyas.c:211
 #, fuzzy
 msgid "Symbolic Link As"
-msgstr "Édition lien symbolique"
+msgstr "Ãdition lien symbolique"
 
-#: src/cmd_copyas.c:216
+#: src/cmd_copyas.c:213
 #, fuzzy
 msgid "Symbolic Link Clone"
-msgstr "Édition lien symbolique"
+msgstr "Ãdition lien symbolique"
 
-#: src/cmd_delete.c:55
+#: src/cmd_delete.c:56
 #, c-format
 msgid ""
 "%s\n"
@@ -1468,269 +1457,286 @@
 "Attempt to change protection and retry?"
 msgstr ""
 
-#: src/cmd_delete.c:58
+#: src/cmd_delete.c:59
 msgid "Remember the answer (alters config)"
 msgstr ""
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 #, fuzzy
 msgid "Access Problem"
-msgstr "Accédé  "
+msgstr "AccÃ©dÃ©  "
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 #, fuzzy
 msgid "Change|Leave Alone"
-msgstr "Droits d'accès"
+msgstr "Droits d'accÃ¨s"
 
-#: src/cmd_delete.c:236
+#: src/cmd_delete.c:215
 #, c-format
 msgid "Really Delete \"%s\"?"
 msgstr ""
 "-  Suppression  -\n"
 "\n"
-"Désirez-vous réellement supprimer \"%s\" ?"
+"DÃ©sirez-vous rÃ©ellement supprimer \"%s\" ?"
 
-#: src/cmd_delete.c:237
+#: src/cmd_delete.c:216
 msgid "Deleting..."
 msgstr "Suppression..."
 
-#: src/cmd_delete.c:292
+#: src/cmd_delete.c:279
 msgid "On Access Failure"
 msgstr ""
 
-#: src/cmd_delete.c:293
+#: src/cmd_delete.c:280
 msgid "Ask User|Automatically Try Changing, and Retry|Fail"
 msgstr ""
 
-#: src/cmd_dpfocus.c:183
-msgid "Wrap Around At Top And Bottom?"
+#: src/cmd_dpfocus.c:33
+msgid "DpFocus Command is Deprecated"
+msgstr ""
+
+#: src/cmd_dpfocus.c:34
+msgid ""
+"The <tt>DpFocus</tt> command has been deprecated and is no longer supported. "
+"Please remove any keyboard or mouse bindings that use it and look into using "
+"the default GTK+ list view's cursor controls."
 msgstr ""
 
-#: src/cmd_dpfocus.c:184
+#: src/cmd_dpfocus.c:64
 msgid "Treat Focused Row As Selection If No \"Real\" Selection Exists?"
 msgstr ""
 
-#: src/cmd_dpfocus.c:186
+#: src/cmd_dpfocus.c:66
 msgid "Move Focus to Last Selected/Deselected Row?"
 msgstr ""
 
-#: src/cmd_dpfocusisrch.c:220
+#: src/cmd_dpfocusisrch.c:163
 #, fuzzy
 msgid "ISearch"
 msgstr "Rechercher"
 
-#: src/cmd_generic.c:136
+#: src/cmd_generic.c:143
 #, fuzzy
 msgid "_OK|A_ll|_Skip|_Cancel"
-msgstr "_Écraser| Écraser T_out   |_Sauter|Sauter _Tout|_Annuler"
+msgstr "_Ãcraser| Ãcraser T_out   |_Sauter|Sauter _Tout|_Annuler"
 
-#: src/cmd_generic.c:137
+#: src/cmd_generic.c:144
 #, fuzzy
 msgid "_OK|_Skip|_Cancel"
 msgstr "_OK|Annuler"
 
-#: src/cmd_getsize.c:49
+#: src/cmd_getsize.c:51
 msgid "Getting sizes..."
 msgstr "Calcul de(s) taille(s) en cours..."
 
-#: src/cmd_getsize.c:141
+#: src/cmd_getsize.c:134
 msgid "Unselect Rows When Done?"
-msgstr "Désélectionner automatiquement une fois terminer"
+msgstr "DÃ©sÃ©lectionner automatiquement une fois terminer"
 
-#: src/cmd_info.c:71 src/cmd_info.c:163
+#: src/cmd_info.c:68 src/errors.c:84
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr ", %s libre"
+
+#: src/cmd_info.c:72
 #, fuzzy, c-format
 msgid ""
-"%s (%s bytes,\n"
-"%s blocks)"
-msgstr "%s (%s octets)"
+"%u dirs, %u files,\n"
+"%u symlinks, %u special files"
+msgstr "%u rÃ©pertoire(s), %u fichier(s), %u Lien(s)"
 
-#: src/cmd_info.c:75
-#, c-format
-msgid "%u dirs, %u files, %u symlinks"
-msgstr "%u répertoire(s), %u fichier(s), %u Lien(s)"
+#: src/cmd_info.c:153
+msgid "Value"
+msgstr ""
 
-#: src/cmd_info.c:134
+#: src/cmd_info.c:198
 msgid "Link To"
-msgstr "Lier à"
+msgstr "Lier Ã "
 
-#: src/cmd_info.c:145 src/cmd_select.c:399 src/dpformat.c:52
+#: src/cmd_info.c:213 src/cmd_select.c:368 src/dpformat.c:54
 msgid "Type"
 msgstr "Type"
 
-#: src/cmd_info.c:148
+#: src/cmd_info.c:216
 msgid "Location"
 msgstr "Emplacement "
 
-#: src/cmd_info.c:151 src/dpformat.c:36 src/window.c:200
+#: src/cmd_info.c:219 src/cmd_split.c:653 src/dpformat.c:37 src/window.c:199
 msgid "Size"
 msgstr "Taille"
 
-#: src/cmd_info.c:172
+#: src/cmd_info.c:229
+#, fuzzy, c-format
+msgid "%s (%s bytes)"
+msgstr "%u octets"
+
+#: src/cmd_info.c:240
 msgid "Contains"
 msgstr "Contient"
 
-#: src/cmd_info.c:186
+#: src/cmd_info.c:257
 msgid "'File' Info"
-msgstr "Méta-Info "
+msgstr "MÃ©ta-Info "
 
-#: src/cmd_info.c:213 src/dpformat.c:49
+#: src/cmd_info.c:285 src/dpformat.c:50
 msgid "Accessed"
-msgstr "Accédé  "
+msgstr "AccÃ©dÃ©  "
 
-#: src/cmd_info.c:214 src/dpformat.c:50
+#: src/cmd_info.c:286 src/dpformat.c:51
 msgid "Modified"
-msgstr "Modifié "
+msgstr "ModifiÃ© "
 
-#: src/cmd_info.c:215
+#: src/cmd_info.c:287 src/dpformat.c:53
 msgid "Changed"
-msgstr "Changé "
+msgstr "ChangÃ© "
+
+#: src/cmd_info.c:288 src/dpformat.c:52
+msgid "Created"
+msgstr "CrÃ©Ã©"
+
+#: src/cmd_info.c:290
+#, fuzzy
+msgid "Basic"
+msgstr "Base"
+
+#: src/cmd_info.c:294
+msgid "Attributes"
+msgstr ""
 
-#: src/cmd_info.c:263
+#: src/cmd_info.c:338
 msgid "Getting Information..."
 msgstr "Collecte des informations"
 
-#: src/cmd_info.c:302
+#: src/cmd_info.c:370
 msgid "Show 'file' Output?"
-msgstr "Afficher les méta-informations du fichier"
+msgstr "Afficher les mÃ©ta-informations du fichier"
 
-#: src/cmd_info.c:305
+#: src/cmd_info.c:373
 msgid "Access Date Format"
-msgstr "Format date d'accès"
+msgstr "Format date d'accÃ¨s"
 
-#: src/cmd_info.c:306
+#: src/cmd_info.c:374
 msgid "Modify Date Format"
 msgstr "Format date de modification"
 
-#: src/cmd_info.c:307
+#: src/cmd_info.c:375
 msgid "Change Date Format"
 msgstr "Format date de changement"
 
-#: src/cmd_info.c:308
+#: src/cmd_info.c:376
 msgid "Size Tick Mark"
-msgstr "Séparateur "
+msgstr "SÃ©parateur "
 
-#: src/cmd_join.c:47
+#: src/cmd_join.c:46
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Join?"
 msgstr ""
 "ATTENTION\n"
 "\n"
-"Le fichier \"%s\" existe déjà!\n"
-"Que désirez-vous faire ?\n"
+"Le fichier \"%s\" existe dÃ©jÃ !\n"
+"Que dÃ©sirez-vous faire ?\n"
 " "
 
-#: src/cmd_join.c:76
+#: src/cmd_join.c:73
 msgid "Joining..."
 msgstr "Fusion en cours..."
 
-#: src/cmd_join.c:162
+#: src/cmd_join.c:167
 msgid "Click and Drag Files to Reorder, Then Click Join."
 msgstr ""
 "-  Fusionner  -\n"
 "\n"
-"a) Réorganisez l'ordre des fichiers à votre guise.\n"
-" Note:  Pour déplacer un fichier, utilisez la\n"
-" souris (sélectionner, glisser, relâcher).\n"
-" b) Tapez le nom du fichier à créer.\n"
+"a) RÃ©organisez l'ordre des fichiers Ã  votre guise.\n"
+" Note:  Pour dÃ©placer un fichier, utilisez la\n"
+" souris (sÃ©lectionner, glisser, relÃ¢cher).\n"
+" b) Tapez le nom du fichier Ã  crÃ©er.\n"
 " c) Cliquez sur Fusionner.\n"
 " "
 
-#: src/cmd_join.c:170
+#: src/cmd_join.c:175
 #, c-format
 msgid "The total size is %s (%lu bytes)."
 msgstr "La taille totale est de %s (%lu octets)."
 
-#: src/cmd_join.c:173
+#: src/cmd_join.c:178
 #, c-format
 msgid "The total size is %lu bytes."
 msgstr "La taille totale est de %lu octets"
 
-#: src/cmd_join.c:215
+#: src/cmd_join.c:220
 msgid "Enter Destination File Name"
-msgstr "Nom du fichier à créer"
+msgstr "Nom du fichier Ã  crÃ©er"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "Join"
-msgstr "Requête de gentoo"
+msgstr "RequÃªte de gentoo"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "_Join|_Cancel"
 msgstr "_Fusionner|Annuler"
 
-#: src/cmd_mkdir.c:75
+#: src/cmd_mkdir.c:65
 #, fuzzy, c-format
 msgid "\"%s\" Already Exists - Proceed With MkDir?"
 msgstr ""
 "ATTENTION\n"
 "\n"
-"Le fichier \"%s\" existe déjà!\n"
-"Que désirez-vous faire ?\n"
+"Le fichier \"%s\" existe dÃ©jÃ !\n"
+"Que dÃ©sirez-vous faire ?\n"
 " "
 
-#: src/cmd_mkdir.c:125
+#: src/cmd_mkdir.c:119
 msgid "Enter Name of Directory to Create"
 msgstr ""
-"-   Créer un répertoire  -\n"
+"-   CrÃ©er un rÃ©pertoire  -\n"
 "\n"
-"Entrer le nom du répertoire à créer"
+"Entrer le nom du rÃ©pertoire Ã  crÃ©er"
 
-#: src/cmd_mkdir.c:133
+#: src/cmd_mkdir.c:128
 msgid "Make Directory"
-msgstr "Requête de gentoo"
+msgstr "RequÃªte de gentoo"
 
-#: src/cmd_mkdir.c:156
+#: src/cmd_mkdir.c:151
 msgid "CD Into New Directory?"
-msgstr "Ouvrir automatiquement le nouveau répertoire"
+msgstr "Ouvrir automatiquement le nouveau rÃ©pertoire"
 
-#: src/cmd_mkdir.c:157
+#: src/cmd_mkdir.c:152
 msgid "Focus New Directory?"
-msgstr "Focus sur le nouveau répertoire"
-
-#: src/cmd_move.c:81
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
+msgstr "Focus sur le nouveau rÃ©pertoire"
 
-#: src/cmd_move.c:92
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the destination contains the source."
-msgstr ""
-
-#: src/cmd_move.c:188 src/cmd_moveas.c:48
+#: src/cmd_move.c:128 src/cmd_moveas.c:51
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Move?"
 msgstr ""
 "ATTENTION\n"
 "\n"
-"Le fichier \"%s\" existe déjà!\n"
-"Que désirez-vous faire ?\n"
+"Le fichier \"%s\" existe dÃ©jÃ !\n"
+"Que dÃ©sirez-vous faire ?\n"
 " "
 
-#: src/cmd_move.c:189
+#: src/cmd_move.c:129
 msgid "Moving..."
-msgstr "Déplacement en cours..."
+msgstr "DÃ©placement en cours..."
 
-#: src/cmd_moveas.c:40
+#: src/cmd_moveas.c:41
 #, c-format
 msgid "Enter Name to Move \"%s\" As"
 msgstr ""
-"-  Déplacer sous...  -\n"
+"-  DÃ©placer sous...  -\n"
 "\n"
 "Entrer le nouveau nom pour \"%s\""
 
+#: src/cmd_moveas.c:66
+msgid "Invalid destination name for MoveAs"
+msgstr ""
+
 #: src/cmd_moveas.c:74
 msgid "Moving As..."
-msgstr "Déplacement sous en cours..."
+msgstr "DÃ©placement sous en cours..."
 
-#: src/cmd_moveas.c:105 src/cmd_moveas.c:110
+#: src/cmd_moveas.c:105 src/cmd_moveas.c:113
 msgid "Move As"
-msgstr "Requête de gentoo"
+msgstr "RequÃªte de gentoo"
 
 #: src/cmd_quit.c:40
 msgid ""
@@ -1738,11 +1744,11 @@
 "Quitting without saving will lose them. Really quit?"
 msgstr ""
 "Vous avez modifier votre configuration.\n"
-"Désirez-vous vraiment quitter ?"
+"DÃ©sirez-vous vraiment quitter ?"
 
 #: src/cmd_quit.c:42 src/cmd_quit.c:54
 msgid "Confirm Quitting"
-msgstr "Requête de gentoo"
+msgstr "RequÃªte de gentoo"
 
 #: src/cmd_quit.c:42
 msgid "_Quit|_Save, then Quit|_Cancel"
@@ -1750,9 +1756,9 @@
 
 #: src/cmd_quit.c:54
 msgid "Are you sure you want to quit?"
-msgstr "Êtes-vous sûrs que vous voulez quitter ?"
+msgstr "Ãtes-vous sÃ»rs que vous voulez quitter ?"
 
-#: src/cmd_rename.c:44
+#: src/cmd_rename.c:57
 #, c-format
 msgid "Enter New Name For \"%s\""
 msgstr ""
@@ -1760,50 +1766,50 @@
 "\n"
 "Entrer le nouveau nom pour \"%s\""
 
-#: src/cmd_rename.c:52 src/cmd_renamere.c:147 src/cmd_renamere.c:243
-#: src/cmd_renamere.c:293 src/cmd_renamere.c:388 src/cmd_renameseq.c:161
+#: src/cmd_rename.c:67 src/cmd_renamere.c:142 src/cmd_renamere.c:225
+#: src/cmd_renamere.c:268 src/cmd_renamere.c:367 src/cmd_renameseq.c:152
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Rename?"
 msgstr ""
 "ATTENTION\n"
 "\n"
-"Le fichier \"%s\" existe déjà!\n"
-"Que désirez-vous faire ?\n"
+"Le fichier \"%s\" existe dÃ©jÃ !\n"
+"Que dÃ©sirez-vous faire ?\n"
 " "
 
-#: src/cmd_rename.c:132
+#: src/cmd_rename.c:245
 msgid "Rename"
-msgstr "Requête de gentoo"
+msgstr "RequÃªte de gentoo"
 
-#: src/cmd_renamere.c:260
-msgid "Regular expression error:\n"
-msgstr "Erreur d'expression régulière :\n"
+#: src/cmd_rename.c:261
+msgid "Rename Single File In-Place (Without Dialog)?"
+msgstr ""
 
-#: src/cmd_renamere.c:446
+#: src/cmd_renamere.c:419
 msgid ""
 "Look for substring in all filenames, and replace\n"
 "it with another string."
 msgstr ""
-"Recherche une sous-chaîne des éléments sélectionnés   \n"
+"Recherche une sous-chaÃ®ne des Ã©lÃ©ments sÃ©lectionnÃ©s   \n"
 " et la remplace par une nouvelle. "
 
-#: src/cmd_renamere.c:449
+#: src/cmd_renamere.c:422
 msgid "Replace"
 msgstr "Chercher "
 
-#: src/cmd_renamere.c:453
+#: src/cmd_renamere.c:426
 msgid "With"
 msgstr "Remplacer par "
 
-#: src/cmd_renamere.c:461
+#: src/cmd_renamere.c:434
 msgid "Replace All?"
 msgstr "Tout remplacer"
 
-#: src/cmd_renamere.c:465
+#: src/cmd_renamere.c:438
 msgid "Simple"
 msgstr "Simple"
 
-#: src/cmd_renamere.c:469
+#: src/cmd_renamere.c:442
 msgid ""
 "Execute the 'From' RE on each filename, storing\n"
 "parenthesised subexpression matches. Then replace\n"
@@ -1812,19 +1818,19 @@
 "that matched, and use the result as a new filename."
 msgstr ""
 
-#: src/cmd_renamere.c:477 src/cmd_renamere.c:500
+#: src/cmd_renamere.c:450 src/cmd_renamere.c:473
 msgid "From"
 msgstr ""
 
-#: src/cmd_renamere.c:481 src/cmd_renamere.c:504
+#: src/cmd_renamere.c:454 src/cmd_renamere.c:477
 msgid "To"
 msgstr ""
 
-#: src/cmd_renamere.c:489
+#: src/cmd_renamere.c:462
 msgid "Reg Exp"
 msgstr "Exp Reg"
 
-#: src/cmd_renamere.c:494
+#: src/cmd_renamere.c:467
 msgid ""
 "Look for each character in the 'From' string, and replace\n"
 "any hits with the corresponding character in the 'To' string.\n"
@@ -1832,58 +1838,58 @@
 "the filename, and the result used as the new name for each file."
 msgstr ""
 
-#: src/cmd_renamere.c:513
+#: src/cmd_renamere.c:486
 msgid "Map"
 msgstr ""
 
-#: src/cmd_renamere.c:517
+#: src/cmd_renamere.c:490
 msgid ""
 "Changes the case (upper/lower) of the characters\n"
 "in the selected filename(s)."
 msgstr ""
 
-#: src/cmd_renamere.c:519
+#: src/cmd_renamere.c:492
 #, fuzzy
 msgid "Lower Case?"
 msgstr "Ignorer la casse"
 
-#: src/cmd_renamere.c:521
+#: src/cmd_renamere.c:494
 #, fuzzy
 msgid "Upper Case?"
 msgstr "Ignorer la casse"
 
-#: src/cmd_renamere.c:523
+#: src/cmd_renamere.c:496
 #, fuzzy
 msgid "Upper Case Initial?"
 msgstr "Ignorer la casse"
 
-#: src/cmd_renamere.c:526
+#: src/cmd_renamere.c:499
 #, fuzzy
 msgid "Case"
 msgstr "Base"
 
-#: src/cmd_renamere.c:528
+#: src/cmd_renamere.c:501
 #, fuzzy
 msgid "RenameRE"
-msgstr "Requête de gentoo"
+msgstr "RequÃªte de gentoo"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "10, Decimal"
 msgstr ""
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (A-F)"
 msgstr ""
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (a-f)"
 msgstr ""
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "8, Octal"
 msgstr ""
 
-#: src/cmd_renameseq.c:328
+#: src/cmd_renameseq.c:306
 msgid ""
 "This command renames all selected files\n"
 "into a numbered sequence. The controls\n"
@@ -1891,204 +1897,254 @@
 "formed."
 msgstr ""
 
-#: src/cmd_renameseq.c:335
+#: src/cmd_renameseq.c:313
 msgid "Start At"
 msgstr ""
 
-#: src/cmd_renameseq.c:343 src/cmd_split.c:247
+#: src/cmd_renameseq.c:323 src/cmd_split.c:609
 msgid "Base"
 msgstr "Base"
 
-#: src/cmd_renameseq.c:359
+#: src/cmd_renameseq.c:333
 msgid "Precision"
-msgstr "Précision"
+msgstr "PrÃ©cision"
 
-#: src/cmd_renameseq.c:367
+#: src/cmd_renameseq.c:340
 msgid "Head"
 msgstr ""
 
-#: src/cmd_renameseq.c:374
+#: src/cmd_renameseq.c:347
 msgid "Tail"
 msgstr ""
 
-#: src/cmd_renameseq.c:382
+#: src/cmd_renameseq.c:354
 msgid "Guess"
 msgstr ""
 
-#: src/cmd_renameseq.c:396
+#: src/cmd_renameseq.c:369
 msgid "Sequential Rename"
 msgstr ""
 
-#: src/cmd_select.c:396
+#: src/cmd_select.c:365
 msgid "All rows|Selected|Unselected|"
-msgstr "Tout les éléments   |Sélectionner|Désélectionner |"
+msgstr "Tout les Ã©lÃ©ments   |SÃ©lectionner|DÃ©sÃ©lectionner |"
 
-#: src/cmd_select.c:397
+#: src/cmd_select.c:366
 msgid "All types|Directories only|Non-directories only|"
-msgstr "Tous les types|Répertoires seulement|Exclure les répertoires |"
+msgstr "Tous les types|RÃ©pertoires seulement|Exclure les rÃ©pertoires |"
 
-#: src/cmd_select.c:398
+#: src/cmd_select.c:367
 msgid "Select|Unselect|Toggle|"
-msgstr "Sélectionner|Désélectionner   |Basculer|"
+msgstr "SÃ©lectionner|DÃ©sÃ©lectionner   |Basculer|"
 
-#: src/cmd_select.c:399 src/menus.c:530
+#: src/cmd_select.c:368 src/menus.c:537
 msgid "Action"
 msgstr "Action "
 
-#: src/cmd_select.c:399
+#: src/cmd_select.c:368
 msgid "Set"
 msgstr "A faire sur "
 
-#: src/cmd_select.c:511
+#: src/cmd_select.c:469
 msgid "Treat RE as Glob Pattern?"
-msgstr "Traiter RE avec Glob comme modèle"
+msgstr "Traiter RE avec Glob comme modÃ¨le"
 
-#: src/cmd_select.c:514
+#: src/cmd_select.c:472
 msgid "Invert RE Matching?"
 msgstr "Inverser la correspondance RE"
 
-#: src/cmd_select.c:517
+#: src/cmd_select.c:475
 msgid "Require Match on Full Name?"
 msgstr "Exige une correspondance sur le nom entier"
 
-#: src/cmd_select.c:531
+#: src/cmd_select.c:489
 msgid "Select Using RE"
-msgstr "Requête de gentoo - RegExp"
+msgstr "RequÃªte de gentoo - RegExp"
 
-#: src/cmd_select.c:815
+#: src/cmd_select.c:727
 msgid ""
 "Enter shell command to run. The command\n"
 "will have the selected content appended.\n"
 "Action is performed on successful exit."
 msgstr ""
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 #, fuzzy
 msgid "OK|Cancel"
 msgstr "_OK|Annuler"
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 #, fuzzy
 msgid "Select using shell command"
-msgstr "Requête de gentoo"
+msgstr "RequÃªte de gentoo"
 
-#: src/cmd_split.c:68
+#: src/cmd_split.c:269
 #, c-format
 msgid ""
 "Split \"%s\".\n"
 "File is %s (%s)."
 msgstr ""
-"-  Découper  -\n"
+"-  DÃ©couper  -\n"
 "\n"
-"Découper le fichier \"%s\".\n"
+"DÃ©couper le fichier \"%s\".\n"
 "Sa taille est de %s (%s)."
 
-#: src/cmd_split.c:70
+#: src/cmd_split.c:271
 #, c-format
 msgid ""
 "Split \"%s\".\n"
 "File is %s."
 msgstr ""
-"Découper le fichier \"%s\".\n"
+"DÃ©couper le fichier \"%s\".\n"
 "Sa taille est de %s."
 
-#: src/cmd_split.c:106
+#: src/cmd_split.c:348
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Split?"
 msgstr ""
 "ATTENTION\n"
 "\n"
-"Le fichier \"%s\" existe déjà!\n"
-"Que désirez-vous faire ?\n"
+"Le fichier \"%s\" existe dÃ©jÃ !\n"
+"Que dÃ©sirez-vous faire ?\n"
 " "
 
-#: src/cmd_split.c:171
-msgid "Beta Software"
-msgstr "Logiciel en version beta"
+#: src/cmd_split.c:422
+msgid "Fixed Size Split"
+msgstr "Taille de dÃ©coupe fixÃ©e sur"
 
-#: src/cmd_split.c:171
-msgid "Next Version?"
-msgstr "Version suivante ?"
+#: src/cmd_split.c:424
+msgid "Segment Size"
+msgstr "Taille de segment "
 
-#: src/cmd_split.c:171
-msgid ""
-"This splitting mode has not been\n"
-"implemented yet... Sorry."
-msgstr ""
-"Désolé, ce mode de découpe n'a pas\n"
-"encore été implanté."
+#: src/cmd_split.c:427
+#, fuzzy
+msgid "1457000 bytes (3.5\" floppy)"
+msgstr " 1457000 octets (3.5\" disquette)"
 
-#: src/cmd_split.c:187
-msgid "  1457000 bytes (3.5\" floppy)"
+#: src/cmd_split.c:428
+#, fuzzy
+msgid "10485760 bytes (10 MB)"
 msgstr " 1457000 octets (3.5\" disquette)"
 
-#: src/cmd_split.c:188
-msgid "100431360 bytes (Zip disk)"
+#: src/cmd_split.c:429
+#, fuzzy
+msgid "26214400 bytes (25 MB)"
+msgstr " 1457000 octets (3.5\" disquette)"
+
+#: src/cmd_split.c:430
+#, fuzzy
+msgid "52428800 bytes (50 MB)"
+msgstr " 1457000 octets (3.5\" disquette)"
+
+#: src/cmd_split.c:431
+#, fuzzy
+msgid "78643200 bytes (75 MB)"
+msgstr " 1457000 octets (3.5\" disquette)"
+
+#: src/cmd_split.c:432
+#, fuzzy
+msgid "100431360 bytes (95 MB, Zip disk)"
 msgstr " 100431360 octets (disquette Zip)"
 
-#: src/cmd_split.c:190
-msgid "Fixed Size Split"
-msgstr "Taille de découpe fixée sur"
+#: src/cmd_split.c:454
+#, fuzzy
+msgid "Fixed Count Split"
+msgstr "Taille de dÃ©coupe fixÃ©e sur"
 
-#: src/cmd_split.c:193
-msgid "Segment Size"
+#: src/cmd_split.c:457
+#, fuzzy
+msgid "Segment Count"
 msgstr "Taille de segment "
 
-#: src/cmd_split.c:221
+#: src/cmd_split.c:503
+msgid "Current part number, unique for every created file"
+msgstr ""
+
+#: src/cmd_split.c:504
+msgid "The value from the Base box"
+msgstr ""
+
+#: src/cmd_split.c:505
+msgid "The amount that index will change for each file"
+msgstr ""
+
+#: src/cmd_split.c:506
+msgid "The total number of files that will be created"
+msgstr ""
+
+#: src/cmd_split.c:507
+msgid "The value of index for the last file to be created"
+msgstr ""
+
+#: src/cmd_split.c:570
 msgid "Fixed size, variable number of parts"
-msgstr "Taille fixée, nombre variable de parties"
+msgstr "Taille fixÃ©e, nombre variable de parties"
 
-#: src/cmd_split.c:222
+#: src/cmd_split.c:571
 msgid "Fixed number of parts, variable sizes"
-msgstr "Nombre de parties fixé,  tailles variables"
+msgstr "Nombre de parties fixÃ©,  tailles variables"
 
-#: src/cmd_split.c:230 src/cmd_split.c:261
+#: src/cmd_split.c:580 src/cmd_split.c:663
 msgid "Split"
-msgstr "Requête de gentoo"
+msgstr "RequÃªte de gentoo"
 
-#: src/cmd_split.c:243
+#: src/cmd_split.c:599
 msgid "Name Format"
 msgstr "Format de nom"
 
-#: src/cmd_split.c:252
+#: src/cmd_split.c:615
 msgid "Step"
 msgstr "Pas"
 
-#: src/cmd_symlink.c:77 src/cmd_symlink.c:246
+#: src/cmd_split.c:624
+msgid "Zero-Fill Numbers?"
+msgstr ""
+
+#: src/cmd_split.c:645
+msgid "Offset"
+msgstr ""
+
+#: src/cmd_symlink.c:68 src/cmd_symlink.c:252
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Link?"
 msgstr ""
 "ATTENTION\n"
 "\n"
-"Le fichier \"%s\" existe déjà!\n"
-"Que désirez-vous faire ?\n"
+"Le fichier \"%s\" existe dÃ©jÃ !\n"
+"Que dÃ©sirez-vous faire ?\n"
 " "
 
-#: src/cmd_symlink.c:184
+#: src/cmd_symlink.c:161 src/configure.c:239 src/icon_dialog.c:59
+#: src/progress.c:220
+msgid "Cancel"
+msgstr "Annuler"
+
+#: src/cmd_symlink.c:161 src/configure.c:233 src/dialog.c:290
+#: src/nag_dialog.c:36
+msgid "OK"
+msgstr "OK"
+
+#: src/cmd_symlink.c:161
 msgid "Select Link Target"
-msgstr "Sélection de la cible pour ce lien"
+msgstr "SÃ©lection de la cible pour ce lien"
 
-#: src/cmd_symlink.c:213
+#: src/cmd_symlink.c:218
 msgid "Contents"
 msgstr "Contenu "
 
-#: src/cmd_symlink.c:225
+#: src/cmd_symlink.c:231
 msgid "Edit Symbolic Link"
-msgstr "Édition lien symbolique"
+msgstr "Ãdition lien symbolique"
 
-#: src/cmd_symlink.c:231
+#: src/cmd_symlink.c:236
 msgid "Create Symbolic Link"
-msgstr "Créer un lien symbolique"
-
-#: src/cmd_viewtext.c:206
-msgid "Use mmap() to Speed Loading?"
-msgstr "Utiliser mmap() pour un chargement rapide"
+msgstr "CrÃ©er un lien symbolique"
 
-#: src/cmd_viewtext.c:208
+#: src/cmd_viewtext.c:205
 msgid "Hex-Check First"
-msgstr "Hex-Vérifié en premier  "
+msgstr "Hex-VÃ©rifiÃ© en premier  "
 
-#: src/cmd_viewtext.c:209
+#: src/cmd_viewtext.c:206
 msgid "Exit on Left Arrow Key?"
 msgstr ""
 
@@ -2104,7 +2160,7 @@
 msgid "yes"
 msgstr "Oui"
 
-#: src/cmdgrab.c:222
+#: src/cmdgrab.c:177
 #, c-format
 msgid "Output of %s (pid %d)"
 msgstr "Sortie de %s (pid %d)"
@@ -2115,57 +2171,49 @@
 "Unable to execute unknown\n"
 "command \"%s\"."
 msgstr ""
-"Incapable d'exécuter cette commande\n"
+"Incapable d'exÃ©cuter cette commande\n"
 "elle est inconnue ? \"%s\"."
 
-#: src/cmdseq_dialog.c:126
+#: src/cmdseq_dialog.c:134
 #, c-format
 msgid "Built-Ins (%u)"
-msgstr "Interne à gentoo (%u)"
+msgstr "Interne Ã  gentoo (%u)"
 
-#: src/cmdseq_dialog.c:131
+#: src/cmdseq_dialog.c:139
 #, c-format
 msgid "User Defined (%u)"
-msgstr "Définies par utilisateur (%u)"
+msgstr "DÃ©finies par utilisateur (%u)"
 
-#: src/cmdseq_dialog.c:302
+#: src/cmdseq_dialog.c:313
 msgid ""
 "Select a command, or type start\n"
 "of name and press TAB."
 msgstr ""
-"- Sélection d'une commande -\n"
+"- SÃ©lection d'une commande -\n"
 "\n"
 "Select a command, or type start\n"
 "of name and press TAB."
 
-#: src/cmdseq_dialog.c:319
+#: src/cmdseq_dialog.c:330
 msgid "Select Command"
-msgstr "Requête de gentoo"
+msgstr "RequÃªte de gentoo"
 
-#: src/configure.c:198
+#: src/configure.c:197
 msgid "Couldn't open configuration file for output"
 msgstr "Impossible d'ouvrir le fichier de configuration..."
 
-#: src/configure.c:234 src/dialog.c:285
-msgid "OK"
-msgstr "OK"
-
-#: src/configure.c:240
+#: src/configure.c:236
 msgid "Save"
 msgstr "Sauver"
 
-#: src/configure.c:244 src/icon_dialog.c:59 src/progress.c:219
-msgid "Cancel"
-msgstr "Annuler"
-
-#: src/configure.c:455
+#: src/configure.c:463
 #, c-format
 msgid "Config file version (%s) doesn't match program version (%s)"
 msgstr ""
-"La version du fichier de configuration (%s) ne correspond pas à la version (%"
-"s) du programme."
+"La version du fichier de configuration (%s) ne correspond pas Ã  la version "
+"(%s) du programme."
 
-#: src/configure.c:467
+#: src/configure.c:475
 #, c-format
 msgid ""
 "Couldn't find any configuration file; checked\n"
@@ -2176,522 +2224,506 @@
 " \"%s\" et \"%s\".\n"
 "Utilise la configuration interne minimale."
 
-#: src/dialog.c:123 src/dialog.c:253
+#: src/dialog.c:124 src/dialog.c:260
 msgid "_OK|_Cancel"
 msgstr "_OK|Annuler"
 
-#: src/dirpane.c:134
-msgid ""
-"Case-sensitive sorting will not work correctly with non-ASCII characters"
-msgstr ""
-"Le tri sensible à la casse ne travaillera pas correctement avec les "
-"caractères non-ASCII"
-
-#: src/dirpane.c:143
-msgid ""
-"Case-insensitive sorting will not work correctly with non-ASCII characters"
-msgstr ""
-"Le tri insensible à la casse ne travaillera pas correctement avec les "
-"caractères non-ASCII"
-
-#: src/dirpane.c:1189
+#: src/dirpane.c:541
 #, c-format
 msgid "%u/%u dirs, %u/%u files"
-msgstr "%u/%u répertoire(s) %u/%u fichier(s)"
+msgstr "%u/%u rÃ©pertoire(s) %u/%u fichier(s)"
 
-#: src/dirpane.c:1197
-#, fuzzy, c-format
-msgid " (%%s/%%s, %%%s/%%%s blocks)"
-msgstr " (%s/%s, %Lu/%Lu blocs)"
+#: src/dirpane.c:546
+#, c-format
+msgid " (%s/%s)"
+msgstr ""
 
-#: src/dirpane.c:1210
+#: src/dirpane.c:557
 #, fuzzy, c-format
 msgid ", %s (%s) used"
 msgstr ", %s libre"
 
-#: src/dirpane.c:1212
+#: src/dirpane.c:559
 #, c-format
 msgid ", %s free"
 msgstr ", %s libre"
 
-#: src/dirpane.c:1560
-msgid "!!Invalid filename!!"
-msgstr ""
-
-#: src/dirpane.c:2004 src/dirpane.c:2053
+#: src/dirpane.c:2084 src/dirpane.c:2131
 msgid "Move up to the parent directory"
-msgstr "Revenir en arrière."
+msgstr "Revenir en arriÃ¨re."
 
-#: src/dirpane.c:2026
+#: src/dirpane.c:2106
 msgid "Enter path, then press Return to go there"
 msgstr "Entrez un chemin et appuyez sur la touche RETURN."
 
-#: src/dirpane.c:2027
+#: src/dirpane.c:2107
 msgid "H"
 msgstr "H"
 
-#: src/dirpane.c:2031
+#: src/dirpane.c:2111
 msgid ""
 "Click to enable/disable Hide rule (When pressed in, the hide rule is active, "
 "and matching entries are hidden)"
-msgstr "Afficher ou ne pas afficher les fichiers cachés."
+msgstr "Afficher ou ne pas afficher les fichiers cachÃ©s."
 
-#: src/dpformat.c:37
+#: src/dpformat.c:38
 msgid "Blocks"
 msgstr "Bloc"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "BSize"
 msgstr "BTaille"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "Block Size"
 msgstr "Taille de bloc"
 
-#: src/dpformat.c:39
+#: src/dpformat.c:40
 msgid "Mode, numerical"
-msgstr "Droits d'accès (numérique)"
+msgstr "Droits d'accÃ¨s (numÃ©rique)"
 
-#: src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode, string"
-msgstr "Droits d'accès (chaîne)"
+msgstr "Droits d'accÃ¨s (chaÃ®ne)"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Nlink"
 msgstr "Lien"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Number of links"
 msgstr "Nombre de lien"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Owner ID"
-msgstr "Numéro d'identité du propriétaire"
+msgstr "NumÃ©ro d'identitÃ© du propriÃ©taire"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Uid"
 msgstr "Uid"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Owner Name"
-msgstr "Nom du propriétaire"
+msgstr "Nom du propriÃ©taire"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Uname"
-msgstr "Propriétaire"
+msgstr "PropriÃ©taire"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Gid"
 msgstr "Gid"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Group ID"
-msgstr "Numéro d'identité du groupe d'appartenance'"
+msgstr "NumÃ©ro d'identitÃ© du groupe d'appartenance'"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Gname"
 msgstr "Groupe"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Group Name"
 msgstr "Nom du groupe d'appartenance"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device"
-msgstr "Périphérique"
+msgstr "PÃ©riphÃ©rique"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device Number"
-msgstr "Numéro de périphérique"
+msgstr "NumÃ©ro de pÃ©riphÃ©rique"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "DevMaj"
 msgstr "DevMaj"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "Device Number, major"
-msgstr "Nombre majeur du périphérique"
+msgstr "Nombre majeur du pÃ©riphÃ©rique"
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "DevMin"
 msgstr "DevMin"
 
-#: src/dpformat.c:48
-msgid "Device Number, minor"
-msgstr "Nombre mineur du périphérique"
-
 #: src/dpformat.c:49
-msgid "Date of last Access"
-msgstr "Date de dernier accès"
+msgid "Device Number, minor"
+msgstr "Nombre mineur du pÃ©riphÃ©rique"
 
 #: src/dpformat.c:50
-msgid "Date of last Modification"
-msgstr "Date de dernière modification"
-
-#: src/dpformat.c:51
-msgid "Created"
-msgstr "Créé"
+#, fuzzy
+msgid "Time of Last Access"
+msgstr "Date de dernier accÃ¨s"
 
 #: src/dpformat.c:51
-msgid "Date of Creation"
-msgstr "Date de Création"
+#, fuzzy
+msgid "Time of Last Modification"
+msgstr "Date de derniÃ¨re modification"
 
 #: src/dpformat.c:52
+#, fuzzy
+msgid "Time of Creation"
+msgstr "Date de CrÃ©ation"
+
+#: src/dpformat.c:53
+msgid "Time of Last Change"
+msgstr ""
+
+#: src/dpformat.c:54
 msgid "Type Name"
 msgstr "Nom du Type"
 
-#: src/dpformat.c:53
+#: src/dpformat.c:55
 msgid "I"
 msgstr "|"
 
-#: src/dpformat.c:334
-msgid "B"
-msgstr "B"
-
-#: src/dpformat.c:338 src/sizeutil.c:32
-msgid "KB"
-msgstr "Ko"
-
-#: src/dpformat.c:343 src/sizeutil.c:33
-msgid "MB"
-msgstr "Mo"
+#: src/dpformat.c:56
+msgid "URI"
+msgstr ""
 
-#: src/dpformat.c:348 src/sizeutil.c:31
-msgid "GB"
-msgstr "Go"
+#: src/dpformat.c:56
+msgid "URI (without file prefix)"
+msgstr ""
 
-#: src/errors.c:69
+#: src/errors.c:59
 #, c-format
 msgid "Couldn't %s \"%s\": %s (code %d)"
 msgstr "Impossible %s \"%s\": %s (code %d)"
 
-#: src/errors.c:71
+#: src/errors.c:61
 #, c-format
 msgid "Couldn't %s \"%s\" (code %d)"
 msgstr "Impossible %s \"%s\" (code %d)"
 
-#: src/errors.c:76
+#: src/errors.c:66
 #, c-format
 msgid "Couldn't %s \"%s\""
 msgstr "Impossible %s \"%s\""
 
-#: src/errors.c:78
+#: src/errors.c:68
 #, c-format
 msgid "Couldn't %s"
 msgstr "Impossible %s"
 
-#: src/gentoo.c:421
+#: src/errors.c:88
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: src/gentoo.c:427
 msgid "Report the version to standard output, and exit."
 msgstr ""
 
-#: src/gentoo.c:423
+#: src/gentoo.c:429
 msgid "Report internal locale details, and exit."
 msgstr ""
 
-#: src/gentoo.c:425
+#: src/gentoo.c:431
 msgid "Allows gentoo to be run by the root user. Could be dangerous."
 msgstr ""
 
-#: src/gentoo.c:426
+#: src/gentoo.c:432
 msgid ""
 "Do not load the ~/.gentoorc configuration file; instead, use default values."
 msgstr ""
 
-#: src/gentoo.c:427
+#: src/gentoo.c:433
 msgid ""
 "Do not load the ~/.gentoogtkrc GTK+ configuration file; instead, use system "
 "defaults."
 msgstr ""
 
-#: src/gentoo.c:429
-msgid "Do not use FAM to automatically detect changes in viewed directories."
+#: src/gentoo.c:434
+msgid ""
+"Run COMMAND, a gentoo command. Done before user interaction allowed, but "
+"after configuration file has been read in. Can be used many times to run "
+"several commands in sequence."
 msgstr ""
 
-#: src/gentoo.c:431
+#: src/gentoo.c:435
+msgid "COMMAND"
+msgstr ""
+
+#: src/gentoo.c:436 src/gentoo.c:437
+msgid "DIR"
+msgstr ""
+
+#: src/gentoo.c:436
 msgid ""
-"Use ARG as path for the left directory pane. Overrides default (and history)."
+"Use DIR as path for the left directory pane. Overrides default (and history)."
 msgstr ""
 
-#: src/gentoo.c:432
+#: src/gentoo.c:437
 msgid ""
-"Use ARG as path for the right directory pane. Overrides default (and "
+"Use DIR as path for the right directory pane. Overrides default (and "
 "history)."
 msgstr ""
 
-#: src/gentoo.c:433
-msgid ""
-"Run ARG, a gentoo command. Done before user interaction allowed, but after "
-"configuration file has been read in. Can be used many times to run several "
-"commands in sequence."
+#: src/gentoo.c:461
+msgid "- a graphical file manager using GTK+"
 msgstr ""
 
-#: src/gentoo.c:492
+#: src/gentoo.c:466
 #, c-format
-msgid "%s: To run as root, envoke with the '--root-ok' option\n"
+msgid "Failed to parse command line options: %s\n"
 msgstr ""
 
-#: src/gentoo.c:524
-msgid "Couldn't initialize userinfo module - username resolving won't work"
+#: src/gentoo.c:506
+#, c-format
+msgid "%s: To run as root, envoke with the '--root-ok' option\n"
 msgstr ""
 
-#: src/gentoo.c:529
-msgid "Couldn't initialize mount data - automounting won't work"
+#: src/gentoo.c:538
+msgid "Couldn't initialize userinfo module - username resolving won't work"
 msgstr ""
 
-#: src/gentoo.c:560
+#: src/gentoo.c:570
 #, c-format
 msgid "gentoo v%s by Emil Brink <emil@obsession.se>"
 msgstr "gentoo v%s par Emil Brink <emil@obsession.se>"
 
-#: src/gfam.c:216
-#, c-format
-msgid "FAM open failed, error %d--FAM will not be used"
+#: src/gentoo.c:577
+msgid "Development Version Warning"
 msgstr ""
 
-#: src/gfam.c:235
-#, c-format
+#: src/gentoo.c:577
 msgid ""
-"Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, perhaps)"
+"This version of gentoo is considered somewhat new and untested. There have "
+"been major changes to almost all parts of the program since the previous "
+"version. Please be a bit careful, and make sure you report any problem to "
+"the author. Thanks."
 msgstr ""
 
-#: src/gfam.c:241
-#, c-format
-msgid ""
-"Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go around, "
-"perhaps)"
-msgstr ""
-
-#: src/guiutil.c:118
+#: src/guiutil.c:124
 msgid "Progress"
 msgstr "Progression"
 
 #: src/icon_dialog.c:52
 msgid "Pick Icon"
-msgstr "Choix d'une icône"
+msgstr "Choix d'une icÃ´ne"
 
 #: src/icon_dialog.c:59
 msgid "Loading Icon Graphics..."
-msgstr "Chargement d'une icône graphique..."
+msgstr "Chargement d'une icÃ´ne graphique..."
 
-#: src/menus.c:278
+#: src/menus.c:284
 #, fuzzy
 msgid "(No Selection)"
 msgstr "Boutons de   "
 
-#: src/menus.c:514
+#: src/menus.c:521
 #, fuzzy
 msgid "RegExp..."
 msgstr "Exp Reg"
 
-#: src/menus.c:526
+#: src/menus.c:533
 msgid "Other"
 msgstr "Autres"
 
-#: src/menus.c:527
+#: src/menus.c:534
 #, fuzzy
 msgid "Rescan"
 msgstr "Lecture"
 
-#: src/menus.c:528
+#: src/menus.c:535
 #, fuzzy
 msgid "Select"
 msgstr "Boutons de   "
 
-#: src/menus.c:532
+#: src/menus.c:539
 msgid "Run..."
 msgstr ""
 
-#: src/menus.c:534
+#: src/menus.c:541
 #, fuzzy
 msgid "Configure..."
 msgstr "Duplicata en cours..."
 
-#: src/menus.c:610
+#: src/menus.c:618
 msgid "Select Menu"
 msgstr ""
 
-#: src/mount.c:222
-#, c-format
-msgid "Execution of \"%s %s\" failed:\n"
-msgstr "L'exécution de \"%s %s\" à échouée :\n"
-
-#: src/mount.c:318
-#, c-format
-msgid "Mounting \"%s\" on \"%s\"..."
-msgstr "Montage \"%s\" sur \"%s\"..."
+#: src/nag_dialog.c:37
+msgid "_Don't show this dialog again"
+msgstr ""
 
 #: src/overwrite.c:49
 msgid "_OK|A_ll|_Skip|Skip _All|_Cancel"
-msgstr "_Écraser| Écraser T_out   |_Sauter|Sauter _Tout|_Annuler"
+msgstr "_Ãcraser| Ãcraser T_out   |_Sauter|Sauter _Tout|_Annuler"
 
-#: src/overwrite.c:73
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Old: %%%s bytes, changed on %%s,\n"
-"New: %%%s bytes, changed on %%s."
-msgstr ""
-"\n"
-"ancien   : %u octets, modifié le %s.\n"
-"Nouveau : %u octets, modifié le %s."
-
-#: src/progress.c:195
+#: src/progress.c:196
 #, c-format
 msgid "Total (%s)"
 msgstr "Total (%s)"
 
-#: src/progress.c:315
+#: src/progress.c:305
 #, c-format
 msgid "Elapsed %02d:%02d  Speed %s/s  ETA %02u:%02u"
-msgstr "Écoulé %02d:%02d  Vitesse %s/s  ETA %02u:%02u"
+msgstr "ÃcoulÃ© %02d:%02d  Vitesse %s/s  ETA %02u:%02u"
 
-#: src/sizeutil.c:30
-msgid "BYTES"
-msgstr "OCTETS"
+#: src/sizeutil.c:31
+#, fuzzy
+msgid "Unformatted Size"
+msgstr "Taille formatÃ©e, en octets"
 
-#: src/sizeutil.c:69
-#, c-format
-msgid "%%%s"
-msgstr ""
+#: src/sizeutil.c:32
+#, fuzzy
+msgid "Formatted Size, Without Unit"
+msgstr "Taille formatÃ©e,  \"Smart\" UnitÃ©"
 
-#: src/sizeutil.c:70
-#, fuzzy, c-format
-msgid "%%%s bytes"
-msgstr "%u octets"
+#: src/sizeutil.c:33
+#, fuzzy
+msgid "Formatted Size, in Bytes"
+msgstr "Taille formatÃ©e, en octets"
 
-#: src/sizeutil.c:71
-#, fuzzy, c-format
-msgid "%%%s KB"
-msgstr "%u Ko"
+#: src/sizeutil.c:33 src/sizeutil.c:159
+#, fuzzy
+msgid "bytes"
+msgstr "Oui"
 
-#: src/sizeutil.c:72
-#, fuzzy, c-format
-msgid "%%%s MB"
-msgstr "%u Mo"
+#: src/sizeutil.c:34
+#, fuzzy
+msgid "Formatted Size, in Kilobytes"
+msgstr "Taille formatÃ©e, en kilo-octets"
 
-#: src/sizeutil.c:73
-#, fuzzy, c-format
-msgid "%%%s GB"
-msgstr "%u Go"
+#: src/sizeutil.c:34 src/sizeutil.c:163
+msgid "KB"
+msgstr "Ko"
 
-#: src/sizeutil.c:164 src/sizeutil.c:211
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f Ko"
+#: src/sizeutil.c:35
+#, fuzzy
+msgid "Formatted Size, in Megabytes"
+msgstr "Taille formatÃ©e, en mÃ©ga-octets"
 
-#: src/sizeutil.c:170 src/sizeutil.c:217
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f Mo"
+#: src/sizeutil.c:35 src/sizeutil.c:167
+msgid "MB"
+msgstr "Mo"
 
-#: src/sizeutil.c:176 src/sizeutil.c:223
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f Go"
+#: src/sizeutil.c:36
+#, fuzzy
+msgid "Formatted Size, in Gigabytes"
+msgstr "Taille FormatÃ©e, en gigaoctets"
+
+#: src/sizeutil.c:36 src/sizeutil.c:171
+msgid "GB"
+msgstr "Go"
+
+#: src/sizeutil.c:37
+#, fuzzy
+msgid "Formatted Size, in Terabytes"
+msgstr "Taille formatÃ©e, en mÃ©ga-octets"
+
+#: src/sizeutil.c:37 src/sizeutil.c:175
+#, fuzzy
+msgid "TB"
+msgstr "B"
+
+#: src/sizeutil.c:38
+#, fuzzy
+msgid "Formatted Size, Automatic Unit"
+msgstr "Taille formatÃ©e,  \"Smart\" UnitÃ©"
 
 #: src/style_dialog.c:40
 msgid "Select Style"
-msgstr "Sélection d'un Style"
+msgstr "SÃ©lection d'un Style"
 
-#: src/styles.c:112
+#: src/styles.c:114
 msgid "Root"
 msgstr "Root"
 
-#: src/styles.c:118 src/types.c:485 src/types.c:488
+#: src/styles.c:120 src/types.c:292 src/types.c:295
 msgid "Directory"
-msgstr "Répertoire"
+msgstr "RÃ©pertoire"
 
-#: src/styles.c:961
+#: src/styles.c:889
 msgid "New Style"
 msgstr "Nouveau Style"
 
-#: src/styles.c:961
+#: src/styles.c:889
 #, c-format
 msgid "New Style %u"
 msgstr "Nouveau Style %u"
 
-#: src/textview.c:152
+#: src/textview.c:190
 #, c-format
-msgid "Unable to convert text from native character set (%s) to UTF-8: %s"
+msgid ""
+"\n"
+"** Text conversion from charset '%s' failed, aborting."
 msgstr ""
 
-#: src/textview.c:252 src/textview.c:353
-msgid "File reading"
-msgstr "Lecture du fichier"
-
-#: src/textview.c:419
+#: src/textview.c:405
 #, c-format
 msgid "Line %d (%.0f%%)"
 msgstr "Ligne %d (%.0f%%)"
 
-#: src/textview.c:472
+#: src/textview.c:455
 msgid "Enter Line Number or Percentage:"
-msgstr "Entrer un numéro de ligne ou un pourcentage :"
+msgstr "Entrer un numÃ©ro de ligne ou un pourcentage :"
 
-#: src/textview.c:478
+#: src/textview.c:461
 msgid "Goto"
 msgstr "Aller"
 
-#: src/textview.c:613
+#: src/textview.c:596
 msgid "Enter Text to Search For (RE)"
 msgstr "Entrer le texte de recherche pour (RE)"
 
-#: src/textview.c:623
+#: src/textview.c:607
 msgid "Don't Span Newlines?"
 msgstr ""
 
-#: src/textview.c:629
+#: src/textview.c:613
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/types.c:454
+#: src/types.c:287
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: src/types.c:572
 #, c-format
 msgid ""
 "Got SIGPIPE when writing to 'file' process (%s), it seems to have terminated "
 "prematurely."
 msgstr ""
 
-#: src/types.c:461
+#: src/types.c:578
 msgid "Unable to run spawn 'file' command: "
 msgstr ""
 
-#: src/types.c:480
-msgid "Unknown"
-msgstr "Inconnu"
-
-#: src/window.c:82
+#: src/window.c:83
 msgid "Configure gentoo"
 msgstr "Configuration de gentoo"
 
-#: src/window.c:89
+#: src/window.c:90
 msgid "Text Viewer"
 msgstr "Visualiseur de texte"
 
-#: src/window.c:200
+#: src/window.c:199
 msgid "Position"
 msgstr "Position"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Height"
 msgstr "Hauteur "
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "X"
 msgstr "X "
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Y"
 msgstr "Y "
 
-#: src/window.c:208
+#: src/window.c:207
 msgid "Set on Open?"
-msgstr "Identique aux réglages ci-dessous"
+msgstr "Identique aux rÃ©glages ci-dessous"
 
-#: src/window.c:214
+#: src/window.c:213
 msgid "Update on Close?"
-msgstr "Sauver ces réglages en quittant"
+msgstr "Sauver ces rÃ©glages en quittant"
 
-#: src/window.c:245
+#: src/window.c:244
 msgid "Grab"
 msgstr "Capturer"
 
@@ -2699,9 +2731,157 @@
 msgid "XML module emitted locale-dependant real number"
 msgstr ""
 
+#~ msgid "Use Dialog to Report Errors?"
+#~ msgstr "Activer la boÃ®te de dialogue pour les rapports d'erreurs"
+
+#~ msgid "Raw Size, in Bytes"
+#~ msgstr "Taille RAW, en octets"
+
+#~ msgid "Modify 'Control' Key State"
+#~ msgstr "Modifier l'Ã©tat touche 'Ctrl'"
+
+#~ msgid "Active Pane Titles"
+#~ msgstr "Titre"
+
+#~ msgid "Focused Row, Unselected"
+#~ msgstr "DÃ©sÃ©lectionner  "
+
+#~ msgid "Focused Row, Selected"
+#~ msgstr "SÃ©lectionner "
+
+#~ msgid "Beta Software"
+#~ msgstr "Logiciel en version beta"
+
+#~ msgid "Next Version?"
+#~ msgstr "Version suivante ?"
+
+#~ msgid ""
+#~ "This splitting mode has not been\n"
+#~ "implemented yet... Sorry."
+#~ msgstr ""
+#~ "DÃ©solÃ©, ce mode de dÃ©coupe n'a pas\n"
+#~ "encore Ã©tÃ© implantÃ©."
+
+#~ msgid ""
+#~ "Case-sensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr ""
+#~ "Le tri sensible Ã  la casse ne travaillera pas correctement avec les "
+#~ "caractÃ¨res non-ASCII"
+
+#~ msgid ""
+#~ "Case-insensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr ""
+#~ "Le tri insensible Ã  la casse ne travaillera pas correctement avec les "
+#~ "caractÃ¨res non-ASCII"
+
+#~ msgid "BYTES"
+#~ msgstr "OCTETS"
+
+#, fuzzy
+#~ msgid "%%%s bytes"
+#~ msgstr "%u octets"
+
+#, fuzzy
+#~ msgid "%%%s KB"
+#~ msgstr "%u Ko"
+
+#, fuzzy
+#~ msgid "%%%s MB"
+#~ msgstr "%u Mo"
+
+#, fuzzy
+#~ msgid "%%%s GB"
+#~ msgstr "%u Go"
+
+#~ msgid "%.2f KB"
+#~ msgstr "%.2f Ko"
+
+#~ msgid "%.2f MB"
+#~ msgstr "%.2f Mo"
+
+#~ msgid "%.2f GB"
+#~ msgstr "%.2f Go"
+
+#~ msgid "Numerical Mode?"
+#~ msgstr "Mode numÃ©rique"
+
+#~ msgid "Never"
+#~ msgstr "Jamais"
+
+#~ msgid "On Every Access"
+#~ msgstr "A chaque accÃ¨s"
+
+#~ msgid "Mounting"
+#~ msgstr "Points de montage"
+
+#~ msgid "Mount When?"
+#~ msgstr "Quand les monter ?"
+
+#~ msgid "Mount Options"
+#~ msgstr "Options de montage"
+
+#~ msgid "Mount Command"
+#~ msgstr "Commande de montage "
+
+#~ msgid "Unmount Command"
+#~ msgstr "Commande de dÃ©montage "
+
+#~ msgid "Only Mount on Toplevel Directories?"
+#~ msgstr "Seulement les monter sur les rÃ©pertoires de haut niveau"
+
+#~ msgid "Use Command Error Dialog?"
+#~ msgstr "Activer la boÃ®te de dialogue pour les rapports d'erreurs"
+
+#~ msgid "Unmount When gentoo Quits?"
+#~ msgstr "DÃ©monter en quittant gentoo"
+
+#~ msgid "FAM: Supported and active."
+#~ msgstr "FAM : SupportÃ© et actif"
+
+#~ msgid "FAM: Supported, but not active."
+#~ msgstr "FAM : SupportÃ©, mais non actif"
+
+#~ msgid "FAM: Not supported."
+#~ msgstr "FAM : Non supportÃ©"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s (%s bytes,\n"
+#~ "%s blocks)"
+#~ msgstr "%s (%s octets)"
+
+#~ msgid "Regular expression error:\n"
+#~ msgstr "Erreur d'expression rÃ©guliÃ¨re :\n"
+
+#~ msgid "Use mmap() to Speed Loading?"
+#~ msgstr "Utiliser mmap() pour un chargement rapide"
+
+#, fuzzy
+#~ msgid " (%%s/%%s, %%%s/%%%s blocks)"
+#~ msgstr " (%s/%s, %Lu/%Lu blocs)"
+
+#~ msgid "Execution of \"%s %s\" failed:\n"
+#~ msgstr "L'exÃ©cution de \"%s %s\" Ã  Ã©chouÃ©e :\n"
+
+#~ msgid "Mounting \"%s\" on \"%s\"..."
+#~ msgstr "Montage \"%s\" sur \"%s\"..."
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Old: %%%s bytes, changed on %%s,\n"
+#~ "New: %%%s bytes, changed on %%s."
+#~ msgstr ""
+#~ "\n"
+#~ "ancien   : %u octets, modifiÃ© le %s.\n"
+#~ "Nouveau : %u octets, modifiÃ© le %s."
+
+#~ msgid "File reading"
+#~ msgstr "Lecture du fichier"
+
 #, fuzzy
 #~ msgid "Pick Command ..."
-#~ msgstr "Sélection d'une fonction"
+#~ msgstr "SÃ©lection d'une fonction"
 
 #~ msgid "Clr"
 #~ msgstr "Clr"
@@ -2730,7 +2910,7 @@
 
 #, fuzzy
 #~ msgid "_Goto..."
-#~ msgstr "Aller à..."
+#~ msgstr "Aller Ã ..."
 
 #, fuzzy
 #~ msgid "_Search..."

gentoo-0.15.6.tar.bz2/po/gentoo.pot -> gentoo-0.19.9.tar.gz/po/gentoo.pot Changed

@@ -6,14 +6,15 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gentoo 0.15.6\n"
+"Project-Id-Version: gentoo 0.19.9\n"
 "Report-Msgid-Bugs-To: Emil Brink\n"
-"POT-Creation-Date: 2009-07-11 19:05+0200\n"
+"POT-Creation-Date: 2011-01-26 21:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/cfg_buttonlayout.c:65
@@ -67,7 +68,7 @@
 msgid "Set Row Width"
 msgstr ""
 
-#: src/cfg_buttons.c:326 src/cfg_buttons.c:749
+#: src/cfg_buttons.c:326 src/cfg_buttons.c:748
 msgid "Default"
 msgstr ""
 
@@ -79,7 +80,7 @@
 msgid "Really delete current button row?"
 msgstr ""
 
-#: src/cfg_buttons.c:439 src/cfg_styles.c:671
+#: src/cfg_buttons.c:439 src/cfg_styles.c:680
 msgid "_Delete|_Cancel"
 msgstr ""
 
@@ -103,103 +104,103 @@
 msgid "Label"
 msgstr ""
 
-#: src/cfg_buttons.c:685 src/cfg_controls.c:645 src/cfg_controls.c:696 src/cfg_controls.c:718 src/cfg_controls.c:739
+#: src/cfg_buttons.c:686 src/cfg_controls.c:612 src/cfg_controls.c:663 src/cfg_controls.c:685
 msgid "Command"
 msgstr ""
 
-#: src/cfg_buttons.c:696 src/cfg_controls.c:639
+#: src/cfg_buttons.c:697 src/cfg_controls.c:606
 msgid "Key"
 msgstr ""
 
-#: src/cfg_buttons.c:711 src/cfg_dirpane.c:1373
+#: src/cfg_buttons.c:712
 msgid "Colors"
 msgstr ""
 
-#: src/cfg_buttons.c:715
+#: src/cfg_buttons.c:716
 msgid "Background..."
 msgstr ""
 
-#: src/cfg_buttons.c:716 src/cfg_buttons.c:722
+#: src/cfg_buttons.c:717 src/cfg_buttons.c:723
 msgid "Reset to Default"
 msgstr ""
 
-#: src/cfg_buttons.c:721
+#: src/cfg_buttons.c:722
 msgid "Foreground..."
 msgstr ""
 
-#: src/cfg_buttons.c:749
+#: src/cfg_buttons.c:748
 msgid "Shortcuts"
 msgstr ""
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Clear"
 msgstr ""
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy Colors To"
 msgstr ""
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy To"
 msgstr ""
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Swap With"
 msgstr ""
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Add Row..."
 msgstr ""
 
-#: src/cfg_buttons.c:751 src/cfg_cmdseq.c:951
+#: src/cfg_buttons.c:750 src/cfg_cmdseq.c:966
 msgid "Delete Row"
 msgstr ""
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Down"
 msgstr ""
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Row Width..."
 msgstr ""
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Up"
 msgstr ""
 
-#: src/cfg_buttons.c:762
+#: src/cfg_buttons.c:761
 msgid "Sheet"
 msgstr ""
 
-#: src/cfg_buttons.c:778
+#: src/cfg_buttons.c:775
 msgid "Primary"
 msgstr ""
 
-#: src/cfg_buttons.c:780
+#: src/cfg_buttons.c:777
 msgid "Secondary"
 msgstr ""
 
-#: src/cfg_buttons.c:785
+#: src/cfg_buttons.c:782
 msgid "Tooltip"
 msgstr ""
 
-#: src/cfg_buttons.c:792 src/cfg_dirpane.c:1145
+#: src/cfg_buttons.c:790 src/cfg_dirpane.c:1107
 msgid "Flags"
 msgstr ""
 
-#: src/cfg_buttons.c:794
+#: src/cfg_buttons.c:792
 msgid "Narrow?"
 msgstr ""
 
-#: src/cfg_buttons.c:798
+#: src/cfg_buttons.c:796
 msgid "Show Tooltip?"
 msgstr ""
 
-#: src/cfg_buttons.c:833
+#: src/cfg_buttons.c:831
 msgid "Buttons"
 msgstr ""
 
-#: src/cfg_buttons.c:834 src/cfg_cmdseq.c:1067
+#: src/cfg_buttons.c:832 src/cfg_cmdseq.c:1081
 msgid "Definitions"
 msgstr ""
 
@@ -207,302 +208,330 @@
 msgid "Options"
 msgstr ""
 
-#: src/cfg_cmdseq.c:610
+#: src/cfg_cmdseq.c:611
 msgid "Select Builtin"
 msgstr ""
 
-#: src/cfg_cmdseq.c:626
+#: src/cfg_cmdseq.c:627
 msgid "Opening brace"
 msgstr ""
 
-#: src/cfg_cmdseq.c:627
+#: src/cfg_cmdseq.c:628
 msgid "Closing brace"
 msgstr ""
 
-#: src/cfg_cmdseq.c:628
+#: src/cfg_cmdseq.c:629
 msgid "First selected"
 msgstr ""
 
-#: src/cfg_cmdseq.c:629
+#: src/cfg_cmdseq.c:630
 msgid "First selected, unselect"
 msgstr ""
 
-#: src/cfg_cmdseq.c:630
+#: src/cfg_cmdseq.c:631
 msgid "First selected, with path"
 msgstr ""
 
-#: src/cfg_cmdseq.c:631
+#: src/cfg_cmdseq.c:632
 msgid "First selected, with path, unselect"
 msgstr ""
 
-#: src/cfg_cmdseq.c:632
+#: src/cfg_cmdseq.c:633
 msgid "First selected (destination pane)"
 msgstr ""
 
-#: src/cfg_cmdseq.c:633
+#: src/cfg_cmdseq.c:634
 msgid "First selected, no quotes"
 msgstr ""
 
-#: src/cfg_cmdseq.c:634
+#: src/cfg_cmdseq.c:635
 msgid "All selected"
 msgstr ""
 
-#: src/cfg_cmdseq.c:635
+#: src/cfg_cmdseq.c:636
 msgid "All selected, unselect"
 msgstr ""
 
-#: src/cfg_cmdseq.c:636
+#: src/cfg_cmdseq.c:637
 msgid "All selected, with paths"
 msgstr ""
 
-#: src/cfg_cmdseq.c:637
+#: src/cfg_cmdseq.c:638
 msgid "All selected, with paths, unselect"
 msgstr ""
 
-#: src/cfg_cmdseq.c:638
+#: src/cfg_cmdseq.c:639
 msgid "All selected (destination pane)"
 msgstr ""
 
-#: src/cfg_cmdseq.c:639
+#: src/cfg_cmdseq.c:640
 msgid "All selected, no quotes"
 msgstr ""
 
-#: src/cfg_cmdseq.c:640
+#: src/cfg_cmdseq.c:641
 msgid "Path to source pane's directory"
 msgstr ""
 
-#: src/cfg_cmdseq.c:641
+#: src/cfg_cmdseq.c:642
 msgid "Path to destination pane's directory"
 msgstr ""
 
-#: src/cfg_cmdseq.c:642
+#: src/cfg_cmdseq.c:643
 msgid "Path to home directory"
 msgstr ""
 
-#: src/cfg_cmdseq.c:643
+#: src/cfg_cmdseq.c:644
 msgid "Path of left pane"
 msgstr ""
 
-#: src/cfg_cmdseq.c:644
+#: src/cfg_cmdseq.c:645
 msgid "Path of right pane"
 msgstr ""
 
-#: src/cfg_cmdseq.c:645
+#: src/cfg_cmdseq.c:646
+msgid "URI of first selected"
+msgstr ""
+
+#: src/cfg_cmdseq.c:647
+msgid "URI of first selected, unselect"
+msgstr ""
+
+#: src/cfg_cmdseq.c:648
+msgid "URI of first selected, no quotes"
+msgstr ""
+
+#: src/cfg_cmdseq.c:649
+msgid "URIs of all selected"
+msgstr ""
+
+#: src/cfg_cmdseq.c:650
+msgid "URIs of all selected, unselect"
+msgstr ""
+
+#: src/cfg_cmdseq.c:651
+msgid "URIs of all selected, no quotes"
+msgstr ""
+
+#: src/cfg_cmdseq.c:652
+msgid "URIs of all selected, unselect, no quotes"
+msgstr ""
+
+#: src/cfg_cmdseq.c:653
+msgid "URI of first selected (destination pane)"
+msgstr ""
+
+#: src/cfg_cmdseq.c:654
 msgid "Input combo box"
 msgstr ""
 
-#: src/cfg_cmdseq.c:646
+#: src/cfg_cmdseq.c:655
 msgid "Input using menu"
 msgstr ""
 
-#: src/cfg_cmdseq.c:647
+#: src/cfg_cmdseq.c:656
 msgid "Input string"
 msgstr ""
 
-#: src/cfg_cmdseq.c:648
+#: src/cfg_cmdseq.c:657
 msgid "Input check button (gives TRUE or FALSE)"
 msgstr ""
 
-#: src/cfg_cmdseq.c:649
+#: src/cfg_cmdseq.c:658
 msgid "Add label to input window"
 msgstr ""
 
-#: src/cfg_cmdseq.c:650
+#: src/cfg_cmdseq.c:659
 msgid "Add a separator bar to input window"
 msgstr ""
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "$NAME"
 msgstr ""
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "Value of $NAME (environment)"
 msgstr ""
 
-#: src/cfg_cmdseq.c:652
+#: src/cfg_cmdseq.c:661
 msgid "gentoo's PID"
 msgstr ""
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "Home directory for user NAME"
 msgstr ""
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "~NAME"
 msgstr ""
 
-#: src/cfg_cmdseq.c:677
+#: src/cfg_cmdseq.c:686 src/cmd_split.c:536
 msgid "Pick Code"
 msgstr ""
 
-#: src/cfg_cmdseq.c:765
+#: src/cfg_cmdseq.c:778
 msgid "(No Options Available)"
 msgstr ""
 
-#: src/cfg_cmdseq.c:801
+#: src/cfg_cmdseq.c:814
 msgid "Run in Background?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:805
+#: src/cfg_cmdseq.c:818
 msgid "Kill Previous Instance?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:809
+#: src/cfg_cmdseq.c:822
 msgid "Survive Quit?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:815
+#: src/cfg_cmdseq.c:828
 msgid "Capture Output?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:900
+#: src/cfg_cmdseq.c:913
 msgid "Before Execution"
 msgstr ""
 
-#: src/cfg_cmdseq.c:903
+#: src/cfg_cmdseq.c:916
 msgid "Require Source Selection?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:907
+#: src/cfg_cmdseq.c:920
 msgid "Require Destination Selection?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:912
+#: src/cfg_cmdseq.c:926
 msgid "CD Source?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:915
+#: src/cfg_cmdseq.c:929
 msgid "CD Destination?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:922
+#: src/cfg_cmdseq.c:937
 msgid "After Execution"
 msgstr ""
 
-#: src/cfg_cmdseq.c:924
+#: src/cfg_cmdseq.c:939
 msgid "Rescan Source?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:928
+#: src/cfg_cmdseq.c:943
 msgid "Rescan Destination?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:942
+#: src/cfg_cmdseq.c:957
 msgid "General"
 msgstr ""
 
-#: src/cfg_cmdseq.c:945
+#: src/cfg_cmdseq.c:960
 msgid "Before&After"
 msgstr ""
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "Built-In"
 msgstr ""
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "External"
 msgstr ""
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Add Row"
 msgstr ""
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Duplicate"
 msgstr ""
 
-#: src/cfg_cmdseq.c:978 src/cfg_styles.c:588 src/cfg_styles.c:805 src/cfg_types.c:679 src/cmd_symlink.c:209 src/dpformat.c:35
+#: src/cfg_cmdseq.c:993 src/cfg_styles.c:596 src/cfg_styles.c:823 src/cfg_types.c:678 src/cmd_info.c:151 src/cmd_split.c:648 src/cmd_symlink.c:213 src/dpformat.c:36
 msgid "Name"
 msgstr ""
 
-#: src/cfg_cmdseq.c:988
+#: src/cfg_cmdseq.c:1004
 msgid "Definition"
 msgstr ""
 
-#: src/cfg_cmdseq.c:1044
+#: src/cfg_cmdseq.c:1058
 msgid "Repeat Sequence Until No Source Selection?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:1056 src/cfg_controls.c:655 src/cfg_controls.c:706 src/cfg_styles.c:833 src/cfg_types.c:775
+#: src/cfg_cmdseq.c:1070 src/cfg_controls.c:622 src/cfg_controls.c:673 src/cfg_styles.c:853 src/cfg_types.c:776
 msgid "Add"
 msgstr ""
 
-#: src/cfg_cmdseq.c:1059 src/cfg_controls.c:658 src/cfg_controls.c:709 src/cfg_styles.c:836 src/cfg_types.c:788
+#: src/cfg_cmdseq.c:1073 src/cfg_controls.c:625 src/cfg_controls.c:676 src/cfg_styles.c:856 src/cfg_types.c:789
 msgid "Delete"
 msgstr ""
 
-#: src/cfg_cmdseq.c:1066
+#: src/cfg_cmdseq.c:1080
 msgid "Commands"
 msgstr ""
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612 src/cfg_dirpane.c:1365 src/cfg_dirpane.c:1371
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572 src/cfg_dirpane.c:1288 src/cfg_dirpane.c:1293
 msgid "Left"
 msgstr ""
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Middle"
 msgstr ""
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612 src/cfg_dirpane.c:1364 src/cfg_dirpane.c:1372
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572 src/cfg_dirpane.c:1287 src/cfg_dirpane.c:1294
 msgid "Right"
 msgstr ""
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Down"
 msgstr ""
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Up"
 msgstr ""
 
-#: src/cfg_controls.c:382
+#: src/cfg_controls.c:378
 msgid ""
 "The following modifier key(s) must\n"
 "be held down when the mouse button\n"
 "is clicked to trigger the command"
 msgstr ""
 
-#: src/cfg_controls.c:395
+#: src/cfg_controls.c:391
 msgid "Edit Modifiers"
 msgstr ""
 
-#: src/cfg_controls.c:613
+#: src/cfg_controls.c:580
 msgid "Controls"
 msgstr ""
 
-#: src/cfg_controls.c:620
+#: src/cfg_controls.c:587
 msgid "Global Keyboard Shortcuts"
 msgstr ""
 
-#: src/cfg_controls.c:665
+#: src/cfg_controls.c:632
 msgid "Dirpane Mouse Buttons"
 msgstr ""
 
-#: src/cfg_controls.c:690
+#: src/cfg_controls.c:657
 msgid "Button"
 msgstr ""
 
-#: src/cfg_controls.c:693
+#: src/cfg_controls.c:660
 msgid "Edit Modifiers..."
 msgstr ""
 
-#: src/cfg_controls.c:716
+#: src/cfg_controls.c:683
 msgid "Click-M-Click Gesture"
 msgstr ""
 
-#: src/cfg_controls.c:726
+#: src/cfg_controls.c:693
 msgid "Time Limit"
 msgstr ""
 
-#: src/cfg_controls.c:737
-msgid "Path Right Click"
-msgstr ""
-
-#: src/cfg_controls.c:750
+#: src/cfg_controls.c:704
 msgid "Ignore Num Lock For All Bindings?"
 msgstr ""
 
-#: src/cfg_controls.c:780
+#: src/cfg_controls.c:734
 msgid ""
 "Note: The mouse button control settings\n"
 "are ambiguous: the same button+modifier\n"
@@ -510,554 +539,517 @@
 "might make their behaviour pretty weird..."
 msgstr ""
 
-#: src/cfg_controls.c:784
+#: src/cfg_controls.c:738
 msgid "Warning"
 msgstr ""
 
-#: src/cfg_controls.c:784 src/children.c:95 src/cmd_info.c:246
+#: src/cfg_controls.c:738 src/children.c:89 src/cmd_info.c:320
 msgid "_OK"
 msgstr ""
 
-#: src/cfg_dirpane.c:365
-msgid "Formatted Size, in bytes"
-msgstr ""
-
-#: src/cfg_dirpane.c:365
-msgid "Raw Size, in Bytes"
-msgstr ""
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in kilobytes"
-msgstr ""
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in megabytes"
-msgstr ""
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, \"Smart\" Unit"
-msgstr ""
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, in gigabytes"
-msgstr ""
-
-#: src/cfg_dirpane.c:383
+#: src/cfg_dirpane.c:333
 msgid "Append Type Character?"
 msgstr ""
 
-#: src/cfg_dirpane.c:386
-msgid "Append \"-> destination\" on Links?"
+#: src/cfg_dirpane.c:336
+msgid "Append \"→ destination\" on Links?"
 msgstr ""
 
-#: src/cfg_dirpane.c:406
+#: src/cfg_dirpane.c:358
 msgid "Place Tick Every 3 Digits?"
 msgstr ""
 
-#: src/cfg_dirpane.c:416
+#: src/cfg_dirpane.c:369
 msgid "Digits of Precision"
 msgstr ""
 
-#: src/cfg_dirpane.c:429
+#: src/cfg_dirpane.c:382
 msgid "Show Dir's File System Size?"
 msgstr ""
 
-#: src/cfg_dirpane.c:435 src/cfg_dirpane.c:439 src/cfg_dirpane.c:443 src/cfg_dirpane.c:447 src/cfg_dirpane.c:451 src/cfg_dirpane.c:455 src/cfg_dirpane.c:459 src/cfg_dirpane.c:463 src/cfg_dirpane.c:467 src/cfg_dirpane.c:474
+#: src/cfg_dirpane.c:388 src/cfg_dirpane.c:392 src/cfg_dirpane.c:396 src/cfg_dirpane.c:400 src/cfg_dirpane.c:404 src/cfg_dirpane.c:408 src/cfg_dirpane.c:412 src/cfg_dirpane.c:416 src/cfg_dirpane.c:420 src/cfg_dirpane.c:428
 msgid "Format"
 msgstr ""
 
-#: src/cfg_dirpane.c:497
+#: src/cfg_dirpane.c:454
 #, c-format
 msgid "%s Settings"
 msgstr ""
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1002 src/cfg_dirpane.c:1003 src/cmd_select.c:414
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:970 src/cfg_dirpane.c:971 src/cmd_select.c:381
 msgid "Content"
 msgstr ""
 
-#: src/cfg_dirpane.c:611
+#: src/cfg_dirpane.c:571
 msgid "Justification"
 msgstr ""
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1003
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:971
 msgid "Title"
 msgstr ""
 
-#: src/cfg_dirpane.c:611 src/window.c:201
+#: src/cfg_dirpane.c:571 src/window.c:200
 msgid "Width"
 msgstr ""
 
-#: src/cfg_dirpane.c:612
+#: src/cfg_dirpane.c:572
 msgid "Center"
 msgstr ""
 
-#: src/cfg_dirpane.c:621
+#: src/cfg_dirpane.c:581
 msgid "Basic Settings"
 msgstr ""
 
-#: src/cfg_dirpane.c:669
+#: src/cfg_dirpane.c:628
 msgid "Edit Column Content"
 msgstr ""
 
-#: src/cfg_dirpane.c:1002
+#: src/cfg_dirpane.c:970
 msgid "Default Title"
 msgstr ""
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories First"
 msgstr ""
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Last"
 msgstr ""
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Mixed"
 msgstr ""
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Left of List"
 msgstr ""
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Right of List"
 msgstr ""
 
-#: src/cfg_dirpane.c:1029 src/cfg_dirpane.c:1030
+#: src/cfg_dirpane.c:997
 msgid "System Default"
 msgstr ""
 
-#: src/cfg_dirpane.c:1030
-msgid "Always Set"
-msgstr ""
-
-#: src/cfg_dirpane.c:1030 src/cmd_chmod.c:260 src/menus.c:513
-msgid "Toggle"
-msgstr ""
-
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy From %s"
 msgstr ""
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy To %s"
 msgstr ""
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Swap With %s"
 msgstr ""
 
-#: src/cfg_dirpane.c:1048
+#: src/cfg_dirpane.c:1015
 msgid "Columns"
 msgstr ""
 
-#: src/cfg_dirpane.c:1053
+#: src/cfg_dirpane.c:1020
 msgid "Available Content Types"
 msgstr ""
 
-#: src/cfg_dirpane.c:1070
+#: src/cfg_dirpane.c:1037
 msgid "Selected Content Types"
 msgstr ""
 
-#: src/cfg_dirpane.c:1081 src/cfg_styles.c:723
+#: src/cfg_dirpane.c:1049 src/cfg_styles.c:741
 msgid "Edit..."
 msgstr ""
 
-#: src/cfg_dirpane.c:1082 src/cmd_renamere.c:508
+#: src/cfg_dirpane.c:1050 src/cmd_renamere.c:481
 msgid "Remove"
 msgstr ""
 
-#: src/cfg_dirpane.c:1096
+#: src/cfg_dirpane.c:1064
 msgid "Sorting"
 msgstr ""
 
-#: src/cfg_dirpane.c:1099
+#: src/cfg_dirpane.c:1067
 msgid "Sort On"
 msgstr ""
 
-#: src/cfg_dirpane.c:1106 src/cmd_split.c:233 src/dpformat.c:39 src/dpformat.c:40
+#: src/cfg_dirpane.c:1071 src/cmd_split.c:590 src/dpformat.c:40 src/dpformat.c:41
 msgid "Mode"
 msgstr ""
 
-#: src/cfg_dirpane.c:1113
+#: src/cfg_dirpane.c:1077
 msgid "Inverse Sorting?"
 msgstr ""
 
-#: src/cfg_dirpane.c:1116 src/cfg_paths.c:187 src/cfg_types.c:743 src/cmd_renamere.c:459 src/cmd_renamere.c:486 src/cmd_select.c:520 src/textview.c:620
+#: src/cfg_dirpane.c:1080 src/cfg_paths.c:228 src/cfg_types.c:744 src/cmd_renamere.c:432 src/cmd_renamere.c:459 src/cmd_select.c:478 src/textview.c:604
 msgid "Ignore Case?"
 msgstr ""
 
-#: src/cfg_dirpane.c:1119
-msgid "Numerical Mode?"
-msgstr ""
-
-#: src/cfg_dirpane.c:1127
+#: src/cfg_dirpane.c:1088
 msgid "Default Directory"
 msgstr ""
 
-#: src/cfg_dirpane.c:1132
+#: src/cfg_dirpane.c:1094
 msgid "Grab Current"
 msgstr ""
 
-#: src/cfg_dirpane.c:1135
+#: src/cfg_dirpane.c:1097
 msgid "From History"
 msgstr ""
 
-#: src/cfg_dirpane.c:1148
+#: src/cfg_dirpane.c:1110
 msgid "Path Above?"
 msgstr ""
 
-#: src/cfg_dirpane.c:1152
+#: src/cfg_dirpane.c:1114
 msgid "Hide Allowed?"
 msgstr ""
 
-#: src/cfg_dirpane.c:1156
+#: src/cfg_dirpane.c:1118
 msgid "Scrollbar Always?"
 msgstr ""
 
-#: src/cfg_dirpane.c:1160
+#: src/cfg_dirpane.c:1122
 msgid "Huge Parent Button?"
 msgstr ""
 
-#: src/cfg_dirpane.c:1168
-msgid "Scrollbar Position"
-msgstr ""
-
-#: src/cfg_dirpane.c:1180
-msgid "Modify 'Control' Key State"
-msgstr ""
-
-#: src/cfg_dirpane.c:1225
-msgid "Active Pane Titles"
-msgstr ""
-
-#: src/cfg_dirpane.c:1225
-msgid "Focused Row, Unselected"
+#: src/cfg_dirpane.c:1127
+msgid "Set Custom Font?"
 msgstr ""
 
-#: src/cfg_dirpane.c:1226
-msgid "Focused Row, Selected"
+#: src/cfg_dirpane.c:1140
+msgid "Scrollbar Position"
 msgstr ""
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Horizontal"
 msgstr ""
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Vertical"
 msgstr ""
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Don't Track"
 msgstr ""
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Ratio"
 msgstr ""
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Left Pane"
 msgstr ""
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Right Pane"
 msgstr ""
 
-#: src/cfg_dirpane.c:1275
+#: src/cfg_dirpane.c:1198
 msgid "Pane Orientation"
 msgstr ""
 
-#: src/cfg_dirpane.c:1289
+#: src/cfg_dirpane.c:1212
 msgid "Split Tracking"
 msgstr ""
 
-#: src/cfg_dirpane.c:1312
+#: src/cfg_dirpane.c:1235
 msgid "pixels"
 msgstr ""
 
-#: src/cfg_dirpane.c:1340
+#: src/cfg_dirpane.c:1263
 msgid "Remember Selected Rows?"
 msgstr ""
 
-#: src/cfg_dirpane.c:1343
+#: src/cfg_dirpane.c:1266
 msgid "Save History Lists?"
 msgstr ""
 
-#: src/cfg_dirpane.c:1360 src/cfg_dirpane.c:1370
+#: src/cfg_dirpane.c:1283 src/cfg_dirpane.c:1292
 msgid "Dir Panes"
 msgstr ""
 
-#: src/cfg_dirpane.c:1374
+#: src/cfg_dirpane.c:1295
 msgid "Pane Split"
 msgstr ""
 
-#: src/cfg_dirpane.c:1375
+#: src/cfg_dirpane.c:1296
 msgid "History"
 msgstr ""
 
-#: src/cfg_errors.c:45
-msgid "Errors"
+#: src/cfg_dirpane.c:1725
+msgid "'Blocks' Content Deprecated"
 msgstr ""
 
-#: src/cfg_errors.c:52
-msgid "Use Dialog to Report Errors?"
+#: src/cfg_dirpane.c:1726
+msgid ""
+"The 'Blocks' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
 msgstr ""
 
-#: src/cfg_errors.c:56
-msgid "Cause Console Beep on Error?"
+#: src/cfg_dirpane.c:1732
+msgid "'Block Size' Content Deprecated"
 msgstr ""
 
-#: src/cfg_menus.c:44
-msgid "Menus"
+#: src/cfg_dirpane.c:1733
+msgid ""
+"The 'Block Size' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
 msgstr ""
 
-#: src/cfg_mount.c:168
-msgid "Never"
+#: src/cfg_errors.c:48
+msgid "Errors"
 msgstr ""
 
-#: src/cfg_mount.c:168
-msgid "On Every Access"
+#: src/cfg_errors.c:55
+msgid "Error and Status Message Display"
 msgstr ""
 
-#: src/cfg_mount.c:177
-msgid "Mounting"
+#: src/cfg_errors.c:57
+msgid "Status Bar, Above Panes"
 msgstr ""
 
-#: src/cfg_mount.c:184
-msgid "Mount When?"
+#: src/cfg_errors.c:60
+msgid "Main Window's Title Bar"
 msgstr ""
 
-#: src/cfg_mount.c:196
-msgid "Mount Options"
+#: src/cfg_errors.c:63
+msgid "Separate Dialog"
 msgstr ""
 
-#: src/cfg_mount.c:199
-msgid "Mount Command"
+#: src/cfg_errors.c:69
+msgid "Cause Console Beep on Error?"
 msgstr ""
 
-#: src/cfg_mount.c:204
-msgid "Unmount Command"
+#: src/cfg_menus.c:44
+msgid "Menus"
 msgstr ""
 
-#: src/cfg_mount.c:211
-msgid "Only Mount on Toplevel Directories?"
+#: src/cfg_nag.c:78
+#, c-format
+msgid "Click the button below to reset the %zu stored 'Don't show this dialog again' responses."
 msgstr ""
 
-#: src/cfg_mount.c:214
-msgid "Use Command Error Dialog?"
+#: src/cfg_nag.c:100
+msgid "Nagging"
 msgstr ""
 
-#: src/cfg_mount.c:217
-msgid "Unmount When gentoo Quits?"
+#: src/cfg_nag.c:110
+msgid "Reset All"
 msgstr ""
 
-#: src/cfg_paths.c:128
-msgid "GTK+ RC"
+#: src/cfg_paths.c:78
+msgid "Edit path"
 msgstr ""
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:152
 msgid "Icons"
 msgstr ""
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:153
+msgid "GTK+ RC"
+msgstr ""
+
+#: src/cfg_paths.c:154
 msgid "fstab"
 msgstr ""
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:155
 msgid "mtab"
 msgstr ""
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Beginning With Dot (.)"
 msgstr ""
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Matching RE"
 msgstr ""
 
-#: src/cfg_paths.c:129 src/cmd_chmod.c:259 src/menus.c:512
+#: src/cfg_paths.c:157 src/cmd_chmod.c:252 src/menus.c:519
 msgid "None"
 msgstr ""
 
-#: src/cfg_paths.c:135
+#: src/cfg_paths.c:163
 msgid "Paths & Hide"
 msgstr ""
 
-#: src/cfg_paths.c:142
+#: src/cfg_paths.c:170
 msgid "Paths"
 msgstr ""
 
-#: src/cfg_paths.c:169
+#: src/cfg_paths.c:209
 msgid "Hide Entries"
 msgstr ""
 
-#: src/cfg_styles.c:170 src/cfg_types.c:234 src/iconutil.c:29 src/menus.c:19
+#: src/cfg_styles.c:178 src/cfg_types.c:233 src/iconutil.c:31 src/menus.c:19
 msgid "(None)"
 msgstr ""
 
-#: src/cfg_styles.c:191 src/cfg_styles.c:428 src/cfg_styles.c:767
+#: src/cfg_styles.c:199 src/cfg_styles.c:436 src/cfg_styles.c:785
 msgid "Delete Action"
 msgstr ""
 
-#: src/cfg_styles.c:411 src/color_dialog.c:48
+#: src/cfg_styles.c:419 src/color_dialog.c:47
 msgid "Edit Color"
 msgstr ""
 
-#: src/cfg_styles.c:428
+#: src/cfg_styles.c:436
 msgid "Revert to Inherited Command"
 msgstr ""
 
-#: src/cfg_styles.c:529
+#: src/cfg_styles.c:537
 msgid "Select Command ..."
 msgstr ""
 
-#: src/cfg_styles.c:592
+#: src/cfg_styles.c:601
 msgid "New Action Property"
 msgstr ""
 
-#: src/cfg_styles.c:600
+#: src/cfg_styles.c:609
 msgid "something"
 msgstr ""
 
-#: src/cfg_styles.c:670
+#: src/cfg_styles.c:679
 msgid ""
 "Deleting this style will also delete\n"
 "all its children. Are you sure?"
 msgstr ""
 
-#: src/cfg_styles.c:671
+#: src/cfg_styles.c:680
 msgid "Confirm Delete"
 msgstr ""
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Background Color"
 msgstr ""
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Foreground Color"
 msgstr ""
 
-#: src/cfg_styles.c:694 src/dpformat.c:53
+#: src/cfg_styles.c:703 src/dpformat.c:55
 msgid "Icon"
 msgstr ""
 
-#: src/cfg_styles.c:696
+#: src/cfg_styles.c:705
 msgid "(Row Style Preview Text)"
 msgstr ""
 
-#: src/cfg_styles.c:702 src/cmd_renameseq.c:386
+#: src/cfg_styles.c:713 src/cmd_renameseq.c:358 src/cmd_split.c:656
 msgid "Preview"
 msgstr ""
 
-#: src/cfg_styles.c:719
+#: src/cfg_styles.c:737
 msgid "Override Parent's?"
 msgstr ""
 
-#: src/cfg_styles.c:723
+#: src/cfg_styles.c:741
 msgid "Pick..."
 msgstr ""
 
-#: src/cfg_styles.c:764
+#: src/cfg_styles.c:782
 msgid "Add Action..."
 msgstr ""
 
-#: src/cfg_styles.c:810 src/menus.c:525
+#: src/cfg_styles.c:829 src/menus.c:532
 msgid "Parent"
 msgstr ""
 
-#: src/cfg_styles.c:820
+#: src/cfg_styles.c:840
 msgid "Inherited Properties"
 msgstr ""
 
-#: src/cfg_styles.c:824
+#: src/cfg_styles.c:844
 msgid "Visual"
 msgstr ""
 
-#: src/cfg_styles.c:826
+#: src/cfg_styles.c:846
 msgid "Actions"
 msgstr ""
 
-#: src/cfg_styles.c:843
+#: src/cfg_styles.c:863
 msgid "File Recognition"
 msgstr ""
 
-#: src/cfg_styles.c:844
+#: src/cfg_styles.c:864
 msgid "Styles"
 msgstr ""
 
-#: src/cfg_types.c:193
+#: src/cfg_types.c:192
 #, c-format
 msgid "%s - Click to Change..."
 msgstr ""
 
-#: src/cfg_types.c:508
+#: src/cfg_types.c:507
 msgid "(New Type)"
 msgstr ""
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "B-Dev"
 msgstr ""
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "C-Dev"
 msgstr ""
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Dir"
 msgstr ""
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "FIFO"
 msgstr ""
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "File"
 msgstr ""
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Link"
 msgstr ""
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Socket"
 msgstr ""
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "Readable"
 msgstr ""
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetGID"
 msgstr ""
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetUID"
 msgstr ""
 
-#: src/cfg_types.c:648 src/cmd_chmod.c:209
+#: src/cfg_types.c:647 src/cmd_chmod.c:200
 msgid "Sticky"
 msgstr ""
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Executable"
 msgstr ""
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Writable"
 msgstr ""
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match 'file' (RE)"
 msgstr ""
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match Name (RE)"
 msgstr ""
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Require Suffix"
 msgstr ""
 
@@ -1073,19 +1065,19 @@
 msgid "Require Protection"
 msgstr ""
 
-#: src/cfg_types.c:738
+#: src/cfg_types.c:739
 msgid "Glob?"
 msgstr ""
 
-#: src/cfg_types.c:754
+#: src/cfg_types.c:755
 msgid "Type's Style"
 msgstr ""
 
-#: src/cfg_types.c:756
+#: src/cfg_types.c:757
 msgid "Style"
 msgstr ""
 
-#: src/cfg_types.c:796
+#: src/cfg_types.c:797
 msgid "Types"
 msgstr ""
 
@@ -1113,16 +1105,16 @@
 msgid "Dialog Positioning"
 msgstr ""
 
-#: src/children.c:94
+#: src/children.c:88
 #, c-format
 msgid "Execution of \"%s\" Failed"
 msgstr ""
 
-#: src/children.c:95 src/dialog.c:285
+#: src/children.c:89 src/dialog.c:290
 msgid "Error"
 msgstr ""
 
-#: src/children.c:274
+#: src/children.c:227
 #, c-format
 msgid "Couldn't terminate child \"%s\" (pid=%d)--zombie alert"
 msgstr ""
@@ -1143,7 +1135,7 @@
 msgstr ""
 
 #: src/cmd_about.c:97
-msgid "(c) 1998-2009 by Emil Brink, Obsession Development.\n"
+msgid "(c) 1998-2011 by Emil Brink, Obsession Development.\n"
 msgstr ""
 
 #: src/cmd_about.c:99
@@ -1152,41 +1144,30 @@
 "WARRANTY. Read the file COPYING for more details.\n"
 msgstr ""
 
-#: src/cmd_about.c:106
-msgid "FAM: Supported and active."
-msgstr ""
-
-#: src/cmd_about.c:108
-msgid "FAM: Supported, but not active."
-msgstr ""
-
-#: src/cmd_about.c:110
-msgid "FAM: Not supported."
-msgstr ""
-
-#: src/cmd_about.c:116
+#: src/cmd_about.c:105
 msgid "NLS: Supported, using built-in English strings."
 msgstr ""
 
-#: src/cmd_about.c:129
+#: src/cmd_about.c:118
+#, c-format
 msgid ""
 "The author of gentoo can be reached via Internet\n"
-"e-mail at <emil@obsession.se>; feel free to let\n"
+"e-mail at <a href=\"mailto:%s\">%s</a>; feel free to let\n"
 "me know what you think of this software, give\n"
 "suggestions/bug reports, and so on.\n"
 "\n"
 "The latest release of gentoo can always be down-\n"
 "loaded from the official gentoo project homepage at\n"
-"<http://www.obsession.se/gentoo/>. New releases are\n"
+"<a href=\"%s\">%s</a>. New releases are\n"
 "typically announced on the Freshmeat service at\n"
-"<http://freshmeat.net/>."
+"<a href=\"http://freshmeat.net/\">freshmeat.net</a>."
 msgstr ""
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "About gentoo"
 msgstr ""
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "_OK (Wait for More)"
 msgstr ""
 
@@ -1195,84 +1176,88 @@
 msgid "Set protection bits for \"%s\":"
 msgstr ""
 
-#: src/cmd_chmod.c:208 src/cmd_chown.c:184 src/cmd_info.c:202
+#: src/cmd_chmod.c:199 src/cmd_chown.c:176 src/cmd_info.c:274
 msgid "Group"
 msgstr ""
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Others"
 msgstr ""
 
-#: src/cmd_chmod.c:208 src/cmd_info.c:195
+#: src/cmd_chmod.c:199 src/cmd_info.c:267
 msgid "Owner"
 msgstr ""
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Special"
 msgstr ""
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Execute"
 msgstr ""
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Read"
 msgstr ""
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set GID"
 msgstr ""
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set UID"
 msgstr ""
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Write"
 msgstr ""
 
-#: src/cmd_chmod.c:231
+#: src/cmd_chmod.c:222
 msgid "Protection Bits"
 msgstr ""
 
-#: src/cmd_chmod.c:242
+#: src/cmd_chmod.c:233
 msgid "Textual"
 msgstr ""
 
-#: src/cmd_chmod.c:253
+#: src/cmd_chmod.c:246
 msgid "Octal"
 msgstr ""
 
-#: src/cmd_chmod.c:258 src/menus.c:511
+#: src/cmd_chmod.c:251 src/menus.c:518
 msgid "All"
 msgstr ""
 
-#: src/cmd_chmod.c:261
+#: src/cmd_chmod.c:253 src/menus.c:520
+msgid "Toggle"
+msgstr ""
+
+#: src/cmd_chmod.c:254
 msgid "Revert"
 msgstr ""
 
-#: src/cmd_chmod.c:273 src/cmd_chown.c:208 src/cmd_info.c:304
+#: src/cmd_chmod.c:266 src/cmd_chown.c:201 src/cmd_info.c:372
 msgid "Recurse Directories?"
 msgstr ""
 
-#: src/cmd_chmod.c:276
+#: src/cmd_chmod.c:269
 msgid "Don't Touch Directories?"
 msgstr ""
 
-#: src/cmd_chmod.c:281
+#: src/cmd_chmod.c:274
 msgid "Change Mode"
 msgstr ""
 
-#: src/cmd_chown.c:56
+#: src/cmd_chown.c:57
 #, c-format
 msgid "Set Ownership for '%s':"
 msgstr ""
 
-#: src/cmd_chown.c:184
+#: src/cmd_chown.c:176
 msgid "User"
 msgstr ""
 
-#: src/cmd_chown.c:213
+#: src/cmd_chown.c:206
 msgid "Change Ownership"
 msgstr ""
 
@@ -1280,45 +1265,37 @@
 msgid "Automatically Save Changed Configuration on Exit?"
 msgstr ""
 
-#: src/cmd_copy.c:302
-#, c-format
-msgid ""
-"Can't copy directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-
-#: src/cmd_copy.c:392 src/cmd_copyas.c:62
+#: src/cmd_copy.c:175 src/cmd_copyas.c:62
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Copy?"
 msgstr ""
 
-#: src/cmd_copy.c:393
+#: src/cmd_copy.c:176
 msgid "Copying..."
 msgstr ""
 
-#: src/cmd_copy.c:440
+#: src/cmd_copy.c:217
 msgid "Preserve Dates During Copy?"
 msgstr ""
 
-#: src/cmd_copy.c:441
+#: src/cmd_copy.c:218
 msgid "Ignore Failure to Copy Attributes (Date, Owner, Mode)?"
 msgstr ""
 
-#: src/cmd_copy.c:442
+#: src/cmd_copy.c:219
 msgid "Leave Failed Destination if Full Size?"
 msgstr ""
 
-#: src/cmd_copy.c:443 src/cmd_viewtext.c:207
+#: src/cmd_copy.c:220 src/cmd_viewtext.c:204
 msgid "Buffer Size"
 msgstr ""
 
-#: src/cmd_copyas.c:51
+#: src/cmd_copyas.c:49
 #, c-format
 msgid "Enter Name for Copy of \"%s\""
 msgstr ""
 
-#: src/cmd_copyas.c:53
+#: src/cmd_copyas.c:51
 #, c-format
 msgid "Enter Name for Clone of \"%s\""
 msgstr ""
@@ -1346,28 +1323,28 @@
 msgid "Enter Name for Link Clone of \"%s\""
 msgstr ""
 
-#: src/cmd_copyas.c:89
+#: src/cmd_copyas.c:91
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Symlink?"
 msgstr ""
 
-#: src/cmd_copyas.c:204 src/cmd_copyas.c:210
+#: src/cmd_copyas.c:200 src/cmd_copyas.c:207
 msgid "Copy As"
 msgstr ""
 
-#: src/cmd_copyas.c:212
+#: src/cmd_copyas.c:209
 msgid "Clone"
 msgstr ""
 
-#: src/cmd_copyas.c:214
+#: src/cmd_copyas.c:211
 msgid "Symbolic Link As"
 msgstr ""
 
-#: src/cmd_copyas.c:216
+#: src/cmd_copyas.c:213
 msgid "Symbolic Link Clone"
 msgstr ""
 
-#: src/cmd_delete.c:55
+#: src/cmd_delete.c:56
 #, c-format
 msgid ""
 "%s\n"
@@ -1375,230 +1352,243 @@
 "Attempt to change protection and retry?"
 msgstr ""
 
-#: src/cmd_delete.c:58
+#: src/cmd_delete.c:59
 msgid "Remember the answer (alters config)"
 msgstr ""
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Access Problem"
 msgstr ""
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Change|Leave Alone"
 msgstr ""
 
-#: src/cmd_delete.c:236
+#: src/cmd_delete.c:215
 #, c-format
 msgid "Really Delete \"%s\"?"
 msgstr ""
 
-#: src/cmd_delete.c:237
+#: src/cmd_delete.c:216
 msgid "Deleting..."
 msgstr ""
 
-#: src/cmd_delete.c:292
+#: src/cmd_delete.c:279
 msgid "On Access Failure"
 msgstr ""
 
-#: src/cmd_delete.c:293
+#: src/cmd_delete.c:280
 msgid "Ask User|Automatically Try Changing, and Retry|Fail"
 msgstr ""
 
-#: src/cmd_dpfocus.c:183
-msgid "Wrap Around At Top And Bottom?"
+#: src/cmd_dpfocus.c:33
+msgid "DpFocus Command is Deprecated"
+msgstr ""
+
+#: src/cmd_dpfocus.c:34
+msgid "The <tt>DpFocus</tt> command has been deprecated and is no longer supported. Please remove any keyboard or mouse bindings that use it and look into using the default GTK+ list view's cursor controls."
 msgstr ""
 
-#: src/cmd_dpfocus.c:184
+#: src/cmd_dpfocus.c:64
 msgid "Treat Focused Row As Selection If No \"Real\" Selection Exists?"
 msgstr ""
 
-#: src/cmd_dpfocus.c:186
+#: src/cmd_dpfocus.c:66
 msgid "Move Focus to Last Selected/Deselected Row?"
 msgstr ""
 
-#: src/cmd_dpfocusisrch.c:220
+#: src/cmd_dpfocusisrch.c:163
 msgid "ISearch"
 msgstr ""
 
-#: src/cmd_generic.c:136
+#: src/cmd_generic.c:143
 msgid "_OK|A_ll|_Skip|_Cancel"
 msgstr ""
 
-#: src/cmd_generic.c:137
+#: src/cmd_generic.c:144
 msgid "_OK|_Skip|_Cancel"
 msgstr ""
 
-#: src/cmd_getsize.c:49
+#: src/cmd_getsize.c:51
 msgid "Getting sizes..."
 msgstr ""
 
-#: src/cmd_getsize.c:141
+#: src/cmd_getsize.c:134
 msgid "Unselect Rows When Done?"
 msgstr ""
 
-#: src/cmd_info.c:71 src/cmd_info.c:163
+#: src/cmd_info.c:68 src/errors.c:84
 #, c-format
-msgid ""
-"%s (%s bytes,\n"
-"%s blocks)"
+msgid "%s (%s)"
 msgstr ""
 
-#: src/cmd_info.c:75
+#: src/cmd_info.c:72
 #, c-format
-msgid "%u dirs, %u files, %u symlinks"
+msgid ""
+"%u dirs, %u files,\n"
+"%u symlinks, %u special files"
 msgstr ""
 
-#: src/cmd_info.c:134
+#: src/cmd_info.c:153
+msgid "Value"
+msgstr ""
+
+#: src/cmd_info.c:198
 msgid "Link To"
 msgstr ""
 
-#: src/cmd_info.c:145 src/cmd_select.c:399 src/dpformat.c:52
+#: src/cmd_info.c:213 src/cmd_select.c:368 src/dpformat.c:54
 msgid "Type"
 msgstr ""
 
-#: src/cmd_info.c:148
+#: src/cmd_info.c:216
 msgid "Location"
 msgstr ""
 
-#: src/cmd_info.c:151 src/dpformat.c:36 src/window.c:200
+#: src/cmd_info.c:219 src/cmd_split.c:653 src/dpformat.c:37 src/window.c:199
 msgid "Size"
 msgstr ""
 
-#: src/cmd_info.c:172
+#: src/cmd_info.c:229
+#, c-format
+msgid "%s (%s bytes)"
+msgstr ""
+
+#: src/cmd_info.c:240
 msgid "Contains"
 msgstr ""
 
-#: src/cmd_info.c:186
+#: src/cmd_info.c:257
 msgid "'File' Info"
 msgstr ""
 
-#: src/cmd_info.c:213 src/dpformat.c:49
+#: src/cmd_info.c:285 src/dpformat.c:50
 msgid "Accessed"
 msgstr ""
 
-#: src/cmd_info.c:214 src/dpformat.c:50
+#: src/cmd_info.c:286 src/dpformat.c:51
 msgid "Modified"
 msgstr ""
 
-#: src/cmd_info.c:215
+#: src/cmd_info.c:287 src/dpformat.c:53
 msgid "Changed"
 msgstr ""
 
-#: src/cmd_info.c:263
+#: src/cmd_info.c:288 src/dpformat.c:52
+msgid "Created"
+msgstr ""
+
+#: src/cmd_info.c:290
+msgid "Basic"
+msgstr ""
+
+#: src/cmd_info.c:294
+msgid "Attributes"
+msgstr ""
+
+#: src/cmd_info.c:338
 msgid "Getting Information..."
 msgstr ""
 
-#: src/cmd_info.c:302
+#: src/cmd_info.c:370
 msgid "Show 'file' Output?"
 msgstr ""
 
-#: src/cmd_info.c:305
+#: src/cmd_info.c:373
 msgid "Access Date Format"
 msgstr ""
 
-#: src/cmd_info.c:306
+#: src/cmd_info.c:374
 msgid "Modify Date Format"
 msgstr ""
 
-#: src/cmd_info.c:307
+#: src/cmd_info.c:375
 msgid "Change Date Format"
 msgstr ""
 
-#: src/cmd_info.c:308
+#: src/cmd_info.c:376
 msgid "Size Tick Mark"
 msgstr ""
 
-#: src/cmd_join.c:47
+#: src/cmd_join.c:46
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Join?"
 msgstr ""
 
-#: src/cmd_join.c:76
+#: src/cmd_join.c:73
 msgid "Joining..."
 msgstr ""
 
-#: src/cmd_join.c:162
+#: src/cmd_join.c:167
 msgid "Click and Drag Files to Reorder, Then Click Join."
 msgstr ""
 
-#: src/cmd_join.c:170
+#: src/cmd_join.c:175
 #, c-format
 msgid "The total size is %s (%lu bytes)."
 msgstr ""
 
-#: src/cmd_join.c:173
+#: src/cmd_join.c:178
 #, c-format
 msgid "The total size is %lu bytes."
 msgstr ""
 
-#: src/cmd_join.c:215
+#: src/cmd_join.c:220
 msgid "Enter Destination File Name"
 msgstr ""
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "Join"
 msgstr ""
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "_Join|_Cancel"
 msgstr ""
 
-#: src/cmd_mkdir.c:75
+#: src/cmd_mkdir.c:65
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With MkDir?"
 msgstr ""
 
-#: src/cmd_mkdir.c:125
+#: src/cmd_mkdir.c:119
 msgid "Enter Name of Directory to Create"
 msgstr ""
 
-#: src/cmd_mkdir.c:133
+#: src/cmd_mkdir.c:128
 msgid "Make Directory"
 msgstr ""
 
-#: src/cmd_mkdir.c:156
+#: src/cmd_mkdir.c:151
 msgid "CD Into New Directory?"
 msgstr ""
 
-#: src/cmd_mkdir.c:157
+#: src/cmd_mkdir.c:152
 msgid "Focus New Directory?"
 msgstr ""
 
-#: src/cmd_move.c:81
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-
-#: src/cmd_move.c:92
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the destination contains the source."
-msgstr ""
-
-#: src/cmd_move.c:188 src/cmd_moveas.c:48
+#: src/cmd_move.c:128 src/cmd_moveas.c:51
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Move?"
 msgstr ""
 
-#: src/cmd_move.c:189
+#: src/cmd_move.c:129
 msgid "Moving..."
 msgstr ""
 
-#: src/cmd_moveas.c:40
+#: src/cmd_moveas.c:41
 #, c-format
 msgid "Enter Name to Move \"%s\" As"
 msgstr ""
 
+#: src/cmd_moveas.c:66
+msgid "Invalid destination name for MoveAs"
+msgstr ""
+
 #: src/cmd_moveas.c:74
 msgid "Moving As..."
 msgstr ""
 
-#: src/cmd_moveas.c:105 src/cmd_moveas.c:110
+#: src/cmd_moveas.c:105 src/cmd_moveas.c:113
 msgid "Move As"
 msgstr ""
 
@@ -1620,47 +1610,47 @@
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/cmd_rename.c:44
+#: src/cmd_rename.c:57
 #, c-format
 msgid "Enter New Name For \"%s\""
 msgstr ""
 
-#: src/cmd_rename.c:52 src/cmd_renamere.c:147 src/cmd_renamere.c:243 src/cmd_renamere.c:293 src/cmd_renamere.c:388 src/cmd_renameseq.c:161
+#: src/cmd_rename.c:67 src/cmd_renamere.c:142 src/cmd_renamere.c:225 src/cmd_renamere.c:268 src/cmd_renamere.c:367 src/cmd_renameseq.c:152
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Rename?"
 msgstr ""
 
-#: src/cmd_rename.c:132
+#: src/cmd_rename.c:245
 msgid "Rename"
 msgstr ""
 
-#: src/cmd_renamere.c:260
-msgid "Regular expression error:\n"
+#: src/cmd_rename.c:261
+msgid "Rename Single File In-Place (Without Dialog)?"
 msgstr ""
 
-#: src/cmd_renamere.c:446
+#: src/cmd_renamere.c:419
 msgid ""
 "Look for substring in all filenames, and replace\n"
 "it with another string."
 msgstr ""
 
-#: src/cmd_renamere.c:449
+#: src/cmd_renamere.c:422
 msgid "Replace"
 msgstr ""
 
-#: src/cmd_renamere.c:453
+#: src/cmd_renamere.c:426
 msgid "With"
 msgstr ""
 
-#: src/cmd_renamere.c:461
+#: src/cmd_renamere.c:434
 msgid "Replace All?"
 msgstr ""
 
-#: src/cmd_renamere.c:465
+#: src/cmd_renamere.c:438
 msgid "Simple"
 msgstr ""
 
-#: src/cmd_renamere.c:469
+#: src/cmd_renamere.c:442
 msgid ""
 "Execute the 'From' RE on each filename, storing\n"
 "parenthesised subexpression matches. Then replace\n"
@@ -1669,19 +1659,19 @@
 "that matched, and use the result as a new filename."
 msgstr ""
 
-#: src/cmd_renamere.c:477 src/cmd_renamere.c:500
+#: src/cmd_renamere.c:450 src/cmd_renamere.c:473
 msgid "From"
 msgstr ""
 
-#: src/cmd_renamere.c:481 src/cmd_renamere.c:504
+#: src/cmd_renamere.c:454 src/cmd_renamere.c:477
 msgid "To"
 msgstr ""
 
-#: src/cmd_renamere.c:489
+#: src/cmd_renamere.c:462
 msgid "Reg Exp"
 msgstr ""
 
-#: src/cmd_renamere.c:494
+#: src/cmd_renamere.c:467
 msgid ""
 "Look for each character in the 'From' string, and replace\n"
 "any hits with the corresponding character in the 'To' string.\n"
@@ -1689,53 +1679,53 @@
 "the filename, and the result used as the new name for each file."
 msgstr ""
 
-#: src/cmd_renamere.c:513
+#: src/cmd_renamere.c:486
 msgid "Map"
 msgstr ""
 
-#: src/cmd_renamere.c:517
+#: src/cmd_renamere.c:490
 msgid ""
 "Changes the case (upper/lower) of the characters\n"
 "in the selected filename(s)."
 msgstr ""
 
-#: src/cmd_renamere.c:519
+#: src/cmd_renamere.c:492
 msgid "Lower Case?"
 msgstr ""
 
-#: src/cmd_renamere.c:521
+#: src/cmd_renamere.c:494
 msgid "Upper Case?"
 msgstr ""
 
-#: src/cmd_renamere.c:523
+#: src/cmd_renamere.c:496
 msgid "Upper Case Initial?"
 msgstr ""
 
-#: src/cmd_renamere.c:526
+#: src/cmd_renamere.c:499
 msgid "Case"
 msgstr ""
 
-#: src/cmd_renamere.c:528
+#: src/cmd_renamere.c:501
 msgid "RenameRE"
 msgstr ""
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "10, Decimal"
 msgstr ""
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (A-F)"
 msgstr ""
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (a-f)"
 msgstr ""
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "8, Octal"
 msgstr ""
 
-#: src/cmd_renameseq.c:328
+#: src/cmd_renameseq.c:306
 msgid ""
 "This command renames all selected files\n"
 "into a numbered sequence. The controls\n"
@@ -1743,184 +1733,226 @@
 "formed."
 msgstr ""
 
-#: src/cmd_renameseq.c:335
+#: src/cmd_renameseq.c:313
 msgid "Start At"
 msgstr ""
 
-#: src/cmd_renameseq.c:343 src/cmd_split.c:247
+#: src/cmd_renameseq.c:323 src/cmd_split.c:609
 msgid "Base"
 msgstr ""
 
-#: src/cmd_renameseq.c:359
+#: src/cmd_renameseq.c:333
 msgid "Precision"
 msgstr ""
 
-#: src/cmd_renameseq.c:367
+#: src/cmd_renameseq.c:340
 msgid "Head"
 msgstr ""
 
-#: src/cmd_renameseq.c:374
+#: src/cmd_renameseq.c:347
 msgid "Tail"
 msgstr ""
 
-#: src/cmd_renameseq.c:382
+#: src/cmd_renameseq.c:354
 msgid "Guess"
 msgstr ""
 
-#: src/cmd_renameseq.c:396
+#: src/cmd_renameseq.c:369
 msgid "Sequential Rename"
 msgstr ""
 
-#: src/cmd_select.c:396
+#: src/cmd_select.c:365
 msgid "All rows|Selected|Unselected|"
 msgstr ""
 
-#: src/cmd_select.c:397
+#: src/cmd_select.c:366
 msgid "All types|Directories only|Non-directories only|"
 msgstr ""
 
-#: src/cmd_select.c:398
+#: src/cmd_select.c:367
 msgid "Select|Unselect|Toggle|"
 msgstr ""
 
-#: src/cmd_select.c:399 src/menus.c:530
+#: src/cmd_select.c:368 src/menus.c:537
 msgid "Action"
 msgstr ""
 
-#: src/cmd_select.c:399
+#: src/cmd_select.c:368
 msgid "Set"
 msgstr ""
 
-#: src/cmd_select.c:511
+#: src/cmd_select.c:469
 msgid "Treat RE as Glob Pattern?"
 msgstr ""
 
-#: src/cmd_select.c:514
+#: src/cmd_select.c:472
 msgid "Invert RE Matching?"
 msgstr ""
 
-#: src/cmd_select.c:517
+#: src/cmd_select.c:475
 msgid "Require Match on Full Name?"
 msgstr ""
 
-#: src/cmd_select.c:531
+#: src/cmd_select.c:489
 msgid "Select Using RE"
 msgstr ""
 
-#: src/cmd_select.c:815
+#: src/cmd_select.c:727
 msgid ""
 "Enter shell command to run. The command\n"
 "will have the selected content appended.\n"
 "Action is performed on successful exit."
 msgstr ""
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "OK|Cancel"
 msgstr ""
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "Select using shell command"
 msgstr ""
 
-#: src/cmd_split.c:68
+#: src/cmd_split.c:269
 #, c-format
 msgid ""
 "Split \"%s\".\n"
 "File is %s (%s)."
 msgstr ""
 
-#: src/cmd_split.c:70
+#: src/cmd_split.c:271
 #, c-format
 msgid ""
 "Split \"%s\".\n"
 "File is %s."
 msgstr ""
 
-#: src/cmd_split.c:106
+#: src/cmd_split.c:348
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Split?"
 msgstr ""
 
-#: src/cmd_split.c:171
-msgid "Beta Software"
+#: src/cmd_split.c:422
+msgid "Fixed Size Split"
 msgstr ""
 
-#: src/cmd_split.c:171
-msgid "Next Version?"
+#: src/cmd_split.c:424
+msgid "Segment Size"
 msgstr ""
 
-#: src/cmd_split.c:171
-msgid ""
-"This splitting mode has not been\n"
-"implemented yet... Sorry."
+#: src/cmd_split.c:427
+msgid "1457000 bytes (3.5\" floppy)"
 msgstr ""
 
-#: src/cmd_split.c:187
-msgid "  1457000 bytes (3.5\" floppy)"
+#: src/cmd_split.c:428
+msgid "10485760 bytes (10 MB)"
 msgstr ""
 
-#: src/cmd_split.c:188
-msgid "100431360 bytes (Zip disk)"
+#: src/cmd_split.c:429
+msgid "26214400 bytes (25 MB)"
 msgstr ""
 
-#: src/cmd_split.c:190
-msgid "Fixed Size Split"
+#: src/cmd_split.c:430
+msgid "52428800 bytes (50 MB)"
 msgstr ""
 
-#: src/cmd_split.c:193
-msgid "Segment Size"
+#: src/cmd_split.c:431
+msgid "78643200 bytes (75 MB)"
+msgstr ""
+
+#: src/cmd_split.c:432
+msgid "100431360 bytes (95 MB, Zip disk)"
+msgstr ""
+
+#: src/cmd_split.c:454
+msgid "Fixed Count Split"
 msgstr ""
 
-#: src/cmd_split.c:221
+#: src/cmd_split.c:457
+msgid "Segment Count"
+msgstr ""
+
+#: src/cmd_split.c:503
+msgid "Current part number, unique for every created file"
+msgstr ""
+
+#: src/cmd_split.c:504
+msgid "The value from the Base box"
+msgstr ""
+
+#: src/cmd_split.c:505
+msgid "The amount that index will change for each file"
+msgstr ""
+
+#: src/cmd_split.c:506
+msgid "The total number of files that will be created"
+msgstr ""
+
+#: src/cmd_split.c:507
+msgid "The value of index for the last file to be created"
+msgstr ""
+
+#: src/cmd_split.c:570
 msgid "Fixed size, variable number of parts"
 msgstr ""
 
-#: src/cmd_split.c:222
+#: src/cmd_split.c:571
 msgid "Fixed number of parts, variable sizes"
 msgstr ""
 
-#: src/cmd_split.c:230 src/cmd_split.c:261
+#: src/cmd_split.c:580 src/cmd_split.c:663
 msgid "Split"
 msgstr ""
 
-#: src/cmd_split.c:243
+#: src/cmd_split.c:599
 msgid "Name Format"
 msgstr ""
 
-#: src/cmd_split.c:252
+#: src/cmd_split.c:615
 msgid "Step"
 msgstr ""
 
-#: src/cmd_symlink.c:77 src/cmd_symlink.c:246
+#: src/cmd_split.c:624
+msgid "Zero-Fill Numbers?"
+msgstr ""
+
+#: src/cmd_split.c:645
+msgid "Offset"
+msgstr ""
+
+#: src/cmd_symlink.c:68 src/cmd_symlink.c:252
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Link?"
 msgstr ""
 
-#: src/cmd_symlink.c:184
+#: src/cmd_symlink.c:161 src/configure.c:239 src/icon_dialog.c:59 src/progress.c:220
+msgid "Cancel"
+msgstr ""
+
+#: src/cmd_symlink.c:161 src/configure.c:233 src/dialog.c:290 src/nag_dialog.c:36
+msgid "OK"
+msgstr ""
+
+#: src/cmd_symlink.c:161
 msgid "Select Link Target"
 msgstr ""
 
-#: src/cmd_symlink.c:213
+#: src/cmd_symlink.c:218
 msgid "Contents"
 msgstr ""
 
-#: src/cmd_symlink.c:225
+#: src/cmd_symlink.c:231
 msgid "Edit Symbolic Link"
 msgstr ""
 
-#: src/cmd_symlink.c:231
+#: src/cmd_symlink.c:236
 msgid "Create Symbolic Link"
 msgstr ""
 
-#: src/cmd_viewtext.c:206
-msgid "Use mmap() to Speed Loading?"
-msgstr ""
-
-#: src/cmd_viewtext.c:208
+#: src/cmd_viewtext.c:205
 msgid "Hex-Check First"
 msgstr ""
 
-#: src/cmd_viewtext.c:209
+#: src/cmd_viewtext.c:206
 msgid "Exit on Left Arrow Key?"
 msgstr ""
 
@@ -1936,7 +1968,7 @@
 msgid "yes"
 msgstr ""
 
-#: src/cmdgrab.c:222
+#: src/cmdgrab.c:177
 #, c-format
 msgid "Output of %s (pid %d)"
 msgstr ""
@@ -1948,48 +1980,40 @@
 "command \"%s\"."
 msgstr ""
 
-#: src/cmdseq_dialog.c:126
+#: src/cmdseq_dialog.c:134
 #, c-format
 msgid "Built-Ins (%u)"
 msgstr ""
 
-#: src/cmdseq_dialog.c:131
+#: src/cmdseq_dialog.c:139
 #, c-format
 msgid "User Defined (%u)"
 msgstr ""
 
-#: src/cmdseq_dialog.c:302
+#: src/cmdseq_dialog.c:313
 msgid ""
 "Select a command, or type start\n"
 "of name and press TAB."
 msgstr ""
 
-#: src/cmdseq_dialog.c:319
+#: src/cmdseq_dialog.c:330
 msgid "Select Command"
 msgstr ""
 
-#: src/configure.c:198
+#: src/configure.c:197
 msgid "Couldn't open configuration file for output"
 msgstr ""
 
-#: src/configure.c:234 src/dialog.c:285
-msgid "OK"
-msgstr ""
-
-#: src/configure.c:240
+#: src/configure.c:236
 msgid "Save"
 msgstr ""
 
-#: src/configure.c:244 src/icon_dialog.c:59 src/progress.c:219
-msgid "Cancel"
-msgstr ""
-
-#: src/configure.c:455
+#: src/configure.c:463
 #, c-format
 msgid "Config file version (%s) doesn't match program version (%s)"
 msgstr ""
 
-#: src/configure.c:467
+#: src/configure.c:475
 #, c-format
 msgid ""
 "Couldn't find any configuration file; checked\n"
@@ -1997,272 +2021,259 @@
 "Using built-in minimal configuration."
 msgstr ""
 
-#: src/dialog.c:123 src/dialog.c:253
+#: src/dialog.c:124 src/dialog.c:260
 msgid "_OK|_Cancel"
 msgstr ""
 
-#: src/dirpane.c:134
-msgid "Case-sensitive sorting will not work correctly with non-ASCII characters"
-msgstr ""
-
-#: src/dirpane.c:143
-msgid "Case-insensitive sorting will not work correctly with non-ASCII characters"
-msgstr ""
-
-#: src/dirpane.c:1189
+#: src/dirpane.c:541
 #, c-format
 msgid "%u/%u dirs, %u/%u files"
 msgstr ""
 
-#: src/dirpane.c:1197
+#: src/dirpane.c:546
 #, c-format
-msgid " (%%s/%%s, %%%s/%%%s blocks)"
+msgid " (%s/%s)"
 msgstr ""
 
-#: src/dirpane.c:1210
+#: src/dirpane.c:557
 #, c-format
 msgid ", %s (%s) used"
 msgstr ""
 
-#: src/dirpane.c:1212
+#: src/dirpane.c:559
 #, c-format
 msgid ", %s free"
 msgstr ""
 
-#: src/dirpane.c:1560
-msgid "!!Invalid filename!!"
-msgstr ""
-
-#: src/dirpane.c:2004 src/dirpane.c:2053
+#: src/dirpane.c:2084 src/dirpane.c:2131
 msgid "Move up to the parent directory"
 msgstr ""
 
-#: src/dirpane.c:2026
+#: src/dirpane.c:2106
 msgid "Enter path, then press Return to go there"
 msgstr ""
 
-#: src/dirpane.c:2027
+#: src/dirpane.c:2107
 msgid "H"
 msgstr ""
 
-#: src/dirpane.c:2031
+#: src/dirpane.c:2111
 msgid "Click to enable/disable Hide rule (When pressed in, the hide rule is active, and matching entries are hidden)"
 msgstr ""
 
-#: src/dpformat.c:37
+#: src/dpformat.c:38
 msgid "Blocks"
 msgstr ""
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "BSize"
 msgstr ""
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "Block Size"
 msgstr ""
 
-#: src/dpformat.c:39
+#: src/dpformat.c:40
 msgid "Mode, numerical"
 msgstr ""
 
-#: src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode, string"
 msgstr ""
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Nlink"
 msgstr ""
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Number of links"
 msgstr ""
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Owner ID"
 msgstr ""
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Uid"
 msgstr ""
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Owner Name"
 msgstr ""
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Uname"
 msgstr ""
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Gid"
 msgstr ""
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Group ID"
 msgstr ""
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Gname"
 msgstr ""
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Group Name"
 msgstr ""
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device"
 msgstr ""
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device Number"
 msgstr ""
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "DevMaj"
 msgstr ""
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "Device Number, major"
 msgstr ""
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "DevMin"
 msgstr ""
 
-#: src/dpformat.c:48
-msgid "Device Number, minor"
-msgstr ""
-
 #: src/dpformat.c:49
-msgid "Date of last Access"
+msgid "Device Number, minor"
 msgstr ""
 
 #: src/dpformat.c:50
-msgid "Date of last Modification"
-msgstr ""
-
-#: src/dpformat.c:51
-msgid "Created"
+msgid "Time of Last Access"
 msgstr ""
 
 #: src/dpformat.c:51
-msgid "Date of Creation"
+msgid "Time of Last Modification"
 msgstr ""
 
 #: src/dpformat.c:52
-msgid "Type Name"
+msgid "Time of Creation"
 msgstr ""
 
 #: src/dpformat.c:53
-msgid "I"
+msgid "Time of Last Change"
 msgstr ""
 
-#: src/dpformat.c:334
-msgid "B"
+#: src/dpformat.c:54
+msgid "Type Name"
 msgstr ""
 
-#: src/dpformat.c:338 src/sizeutil.c:32
-msgid "KB"
+#: src/dpformat.c:55
+msgid "I"
 msgstr ""
 
-#: src/dpformat.c:343 src/sizeutil.c:33
-msgid "MB"
+#: src/dpformat.c:56
+msgid "URI"
 msgstr ""
 
-#: src/dpformat.c:348 src/sizeutil.c:31
-msgid "GB"
+#: src/dpformat.c:56
+msgid "URI (without file prefix)"
 msgstr ""
 
-#: src/errors.c:69
+#: src/errors.c:59
 #, c-format
 msgid "Couldn't %s \"%s\": %s (code %d)"
 msgstr ""
 
-#: src/errors.c:71
+#: src/errors.c:61
 #, c-format
 msgid "Couldn't %s \"%s\" (code %d)"
 msgstr ""
 
-#: src/errors.c:76
+#: src/errors.c:66
 #, c-format
 msgid "Couldn't %s \"%s\""
 msgstr ""
 
-#: src/errors.c:78
+#: src/errors.c:68
 #, c-format
 msgid "Couldn't %s"
 msgstr ""
 
-#: src/gentoo.c:421
+#: src/errors.c:88
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: src/gentoo.c:427
 msgid "Report the version to standard output, and exit."
 msgstr ""
 
-#: src/gentoo.c:423
+#: src/gentoo.c:429
 msgid "Report internal locale details, and exit."
 msgstr ""
 
-#: src/gentoo.c:425
+#: src/gentoo.c:431
 msgid "Allows gentoo to be run by the root user. Could be dangerous."
 msgstr ""
 
-#: src/gentoo.c:426
+#: src/gentoo.c:432
 msgid "Do not load the ~/.gentoorc configuration file; instead, use default values."
 msgstr ""
 
-#: src/gentoo.c:427
+#: src/gentoo.c:433
 msgid "Do not load the ~/.gentoogtkrc GTK+ configuration file; instead, use system defaults."
 msgstr ""
 
-#: src/gentoo.c:429
-msgid "Do not use FAM to automatically detect changes in viewed directories."
+#: src/gentoo.c:434
+msgid "Run COMMAND, a gentoo command. Done before user interaction allowed, but after configuration file has been read in. Can be used many times to run several commands in sequence."
 msgstr ""
 
-#: src/gentoo.c:431
-msgid "Use ARG as path for the left directory pane. Overrides default (and history)."
+#: src/gentoo.c:435
+msgid "COMMAND"
 msgstr ""
 
-#: src/gentoo.c:432
-msgid "Use ARG as path for the right directory pane. Overrides default (and history)."
+#: src/gentoo.c:436 src/gentoo.c:437
+msgid "DIR"
 msgstr ""
 
-#: src/gentoo.c:433
-msgid "Run ARG, a gentoo command. Done before user interaction allowed, but after configuration file has been read in. Can be used many times to run several commands in sequence."
+#: src/gentoo.c:436
+msgid "Use DIR as path for the left directory pane. Overrides default (and history)."
 msgstr ""
 
-#: src/gentoo.c:492
-#, c-format
-msgid "%s: To run as root, envoke with the '--root-ok' option\n"
+#: src/gentoo.c:437
+msgid "Use DIR as path for the right directory pane. Overrides default (and history)."
 msgstr ""
 
-#: src/gentoo.c:524
-msgid "Couldn't initialize userinfo module - username resolving won't work"
+#: src/gentoo.c:461
+msgid "- a graphical file manager using GTK+"
 msgstr ""
 
-#: src/gentoo.c:529
-msgid "Couldn't initialize mount data - automounting won't work"
+#: src/gentoo.c:466
+#, c-format
+msgid "Failed to parse command line options: %s\n"
 msgstr ""
 
-#: src/gentoo.c:560
+#: src/gentoo.c:506
 #, c-format
-msgid "gentoo v%s by Emil Brink <emil@obsession.se>"
+msgid "%s: To run as root, envoke with the '--root-ok' option\n"
 msgstr ""
 
-#: src/gfam.c:216
-#, c-format
-msgid "FAM open failed, error %d--FAM will not be used"
+#: src/gentoo.c:538
+msgid "Couldn't initialize userinfo module - username resolving won't work"
 msgstr ""
 
-#: src/gfam.c:235
+#: src/gentoo.c:570
 #, c-format
-msgid "Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, perhaps)"
+msgid "gentoo v%s by Emil Brink <emil@obsession.se>"
 msgstr ""
 
-#: src/gfam.c:241
-#, c-format
-msgid "Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go around, perhaps)"
+#: src/gentoo.c:577
+msgid "Development Version Warning"
+msgstr ""
+
+#: src/gentoo.c:577
+msgid "This version of gentoo is considered somewhat new and untested. There have been major changes to almost all parts of the program since the previous version. Please be a bit careful, and make sure you report any problem to the author. Thanks."
 msgstr ""
 
-#: src/guiutil.c:118
+#: src/guiutil.c:124
 msgid "Progress"
 msgstr ""
 
@@ -2274,215 +2285,207 @@
 msgid "Loading Icon Graphics..."
 msgstr ""
 
-#: src/menus.c:278
+#: src/menus.c:284
 msgid "(No Selection)"
 msgstr ""
 
-#: src/menus.c:514
+#: src/menus.c:521
 msgid "RegExp..."
 msgstr ""
 
-#: src/menus.c:526
+#: src/menus.c:533
 msgid "Other"
 msgstr ""
 
-#: src/menus.c:527
+#: src/menus.c:534
 msgid "Rescan"
 msgstr ""
 
-#: src/menus.c:528
+#: src/menus.c:535
 msgid "Select"
 msgstr ""
 
-#: src/menus.c:532
+#: src/menus.c:539
 msgid "Run..."
 msgstr ""
 
-#: src/menus.c:534
+#: src/menus.c:541
 msgid "Configure..."
 msgstr ""
 
-#: src/menus.c:610
+#: src/menus.c:618
 msgid "Select Menu"
 msgstr ""
 
-#: src/mount.c:222
-#, c-format
-msgid "Execution of \"%s %s\" failed:\n"
-msgstr ""
-
-#: src/mount.c:318
-#, c-format
-msgid "Mounting \"%s\" on \"%s\"..."
+#: src/nag_dialog.c:37
+msgid "_Don't show this dialog again"
 msgstr ""
 
 #: src/overwrite.c:49
 msgid "_OK|A_ll|_Skip|Skip _All|_Cancel"
 msgstr ""
 
-#: src/overwrite.c:73
-#, c-format
-msgid ""
-"\n"
-"Old: %%%s bytes, changed on %%s,\n"
-"New: %%%s bytes, changed on %%s."
-msgstr ""
-
-#: src/progress.c:195
+#: src/progress.c:196
 #, c-format
 msgid "Total (%s)"
 msgstr ""
 
-#: src/progress.c:315
+#: src/progress.c:305
 #, c-format
 msgid "Elapsed %02d:%02d  Speed %s/s  ETA %02u:%02u"
 msgstr ""
 
-#: src/sizeutil.c:30
-msgid "BYTES"
+#: src/sizeutil.c:31
+msgid "Unformatted Size"
 msgstr ""
 
-#: src/sizeutil.c:69
-#, c-format
-msgid "%%%s"
+#: src/sizeutil.c:32
+msgid "Formatted Size, Without Unit"
 msgstr ""
 
-#: src/sizeutil.c:70
-#, c-format
-msgid "%%%s bytes"
+#: src/sizeutil.c:33
+msgid "Formatted Size, in Bytes"
 msgstr ""
 
-#: src/sizeutil.c:71
-#, c-format
-msgid "%%%s KB"
+#: src/sizeutil.c:33 src/sizeutil.c:159
+msgid "bytes"
 msgstr ""
 
-#: src/sizeutil.c:72
-#, c-format
-msgid "%%%s MB"
+#: src/sizeutil.c:34
+msgid "Formatted Size, in Kilobytes"
 msgstr ""
 
-#: src/sizeutil.c:73
-#, c-format
-msgid "%%%s GB"
+#: src/sizeutil.c:34 src/sizeutil.c:163
+msgid "KB"
 msgstr ""
 
-#: src/sizeutil.c:164 src/sizeutil.c:211
-#, c-format
-msgid "%.2f KB"
+#: src/sizeutil.c:35
+msgid "Formatted Size, in Megabytes"
 msgstr ""
 
-#: src/sizeutil.c:170 src/sizeutil.c:217
-#, c-format
-msgid "%.2f MB"
+#: src/sizeutil.c:35 src/sizeutil.c:167
+msgid "MB"
 msgstr ""
 
-#: src/sizeutil.c:176 src/sizeutil.c:223
-#, c-format
-msgid "%.2f GB"
+#: src/sizeutil.c:36
+msgid "Formatted Size, in Gigabytes"
+msgstr ""
+
+#: src/sizeutil.c:36 src/sizeutil.c:171
+msgid "GB"
+msgstr ""
+
+#: src/sizeutil.c:37
+msgid "Formatted Size, in Terabytes"
+msgstr ""
+
+#: src/sizeutil.c:37 src/sizeutil.c:175
+msgid "TB"
+msgstr ""
+
+#: src/sizeutil.c:38
+msgid "Formatted Size, Automatic Unit"
 msgstr ""
 
 #: src/style_dialog.c:40
 msgid "Select Style"
 msgstr ""
 
-#: src/styles.c:112
+#: src/styles.c:114
 msgid "Root"
 msgstr ""
 
-#: src/styles.c:118 src/types.c:485 src/types.c:488
+#: src/styles.c:120 src/types.c:292 src/types.c:295
 msgid "Directory"
 msgstr ""
 
-#: src/styles.c:961
+#: src/styles.c:889
 msgid "New Style"
 msgstr ""
 
-#: src/styles.c:961
+#: src/styles.c:889
 #, c-format
 msgid "New Style %u"
 msgstr ""
 
-#: src/textview.c:152
+#: src/textview.c:190
 #, c-format
-msgid "Unable to convert text from native character set (%s) to UTF-8: %s"
-msgstr ""
-
-#: src/textview.c:252 src/textview.c:353
-msgid "File reading"
+msgid ""
+"\n"
+"** Text conversion from charset '%s' failed, aborting."
 msgstr ""
 
-#: src/textview.c:419
+#: src/textview.c:405
 #, c-format
 msgid "Line %d (%.0f%%)"
 msgstr ""
 
-#: src/textview.c:472
+#: src/textview.c:455
 msgid "Enter Line Number or Percentage:"
 msgstr ""
 
-#: src/textview.c:478
+#: src/textview.c:461
 msgid "Goto"
 msgstr ""
 
-#: src/textview.c:613
+#: src/textview.c:596
 msgid "Enter Text to Search For (RE)"
 msgstr ""
 
-#: src/textview.c:623
+#: src/textview.c:607
 msgid "Don't Span Newlines?"
 msgstr ""
 
-#: src/textview.c:629
+#: src/textview.c:613
 msgid "Search"
 msgstr ""
 
-#: src/types.c:454
+#: src/types.c:287
+msgid "Unknown"
+msgstr ""
+
+#: src/types.c:572
 #, c-format
 msgid "Got SIGPIPE when writing to 'file' process (%s), it seems to have terminated prematurely."
 msgstr ""
 
-#: src/types.c:461
+#: src/types.c:578
 msgid "Unable to run spawn 'file' command: "
 msgstr ""
 
-#: src/types.c:480
-msgid "Unknown"
-msgstr ""
-
-#: src/window.c:82
+#: src/window.c:83
 msgid "Configure gentoo"
 msgstr ""
 
-#: src/window.c:89
+#: src/window.c:90
 msgid "Text Viewer"
 msgstr ""
 
-#: src/window.c:200
+#: src/window.c:199
 msgid "Position"
 msgstr ""
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Height"
 msgstr ""
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "X"
 msgstr ""
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Y"
 msgstr ""
 
-#: src/window.c:208
+#: src/window.c:207
 msgid "Set on Open?"
 msgstr ""
 
-#: src/window.c:214
+#: src/window.c:213
 msgid "Update on Close?"
 msgstr ""
 
-#: src/window.c:245
+#: src/window.c:244
 msgid "Grab"
 msgstr ""

gentoo-0.15.6.tar.bz2/po/it.gmo -> gentoo-0.19.9.tar.gz/po/it.gmo Changed

gentoo-0.15.6.tar.bz2/po/it.po -> gentoo-0.19.9.tar.gz/po/it.po Changed

@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: gentoo 0.11.51\n"
 "Report-Msgid-Bugs-To: Emil Brink\n"
-"POT-Creation-Date: 2009-07-11 19:05+0200\n"
+"POT-Creation-Date: 2011-01-26 21:54+0100\n"
 "PO-Revision-Date: 2004-06-18 12:00+0100\n"
 "Last-Translator: Francesco Cosoleto <cosoleto@free.fr>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -93,7 +94,7 @@
 msgid "Set Row Width"
 msgstr "Imposta ampiezza"
 
-#: src/cfg_buttons.c:326 src/cfg_buttons.c:749
+#: src/cfg_buttons.c:326 src/cfg_buttons.c:748
 msgid "Default"
 msgstr "Predefinito"
 
@@ -105,7 +106,7 @@
 msgid "Really delete current button row?"
 msgstr "Cancellare veramente questa fila di pulsanti?"
 
-#: src/cfg_buttons.c:439 src/cfg_styles.c:671
+#: src/cfg_buttons.c:439 src/cfg_styles.c:680
 msgid "_Delete|_Cancel"
 msgstr "_Cancella|_Annulla"
 
@@ -129,104 +130,104 @@
 msgid "Label"
 msgstr "Etichetta"
 
-#: src/cfg_buttons.c:685 src/cfg_controls.c:645 src/cfg_controls.c:696
-#: src/cfg_controls.c:718 src/cfg_controls.c:739
+#: src/cfg_buttons.c:686 src/cfg_controls.c:612 src/cfg_controls.c:663
+#: src/cfg_controls.c:685
 msgid "Command"
 msgstr "Comando"
 
-#: src/cfg_buttons.c:696 src/cfg_controls.c:639
+#: src/cfg_buttons.c:697 src/cfg_controls.c:606
 msgid "Key"
 msgstr "Tasto"
 
-#: src/cfg_buttons.c:711 src/cfg_dirpane.c:1373
+#: src/cfg_buttons.c:712
 msgid "Colors"
 msgstr "Colori"
 
-#: src/cfg_buttons.c:715
+#: src/cfg_buttons.c:716
 msgid "Background..."
 msgstr "Sfondo..."
 
-#: src/cfg_buttons.c:716 src/cfg_buttons.c:722
+#: src/cfg_buttons.c:717 src/cfg_buttons.c:723
 msgid "Reset to Default"
 msgstr "Reimposta a predefinito"
 
-#: src/cfg_buttons.c:721
+#: src/cfg_buttons.c:722
 msgid "Foreground..."
 msgstr "Primo piano..."
 
-#: src/cfg_buttons.c:749
+#: src/cfg_buttons.c:748
 msgid "Shortcuts"
 msgstr "Scorciatoie"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Clear"
 msgstr "Libera"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy Colors To"
 msgstr "Copia colori a..."
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy To"
 msgstr "Copia a..."
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Swap With"
 msgstr "Scambia con..."
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Add Row..."
 msgstr "Aggiungi riga..."
 
-#: src/cfg_buttons.c:751 src/cfg_cmdseq.c:951
+#: src/cfg_buttons.c:750 src/cfg_cmdseq.c:966
 msgid "Delete Row"
 msgstr "Cancella riga"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Down"
 msgstr "Sotto"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Row Width..."
 msgstr "Ampiezza..."
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Up"
 msgstr "Su"
 
-#: src/cfg_buttons.c:762
+#: src/cfg_buttons.c:761
 msgid "Sheet"
 msgstr "Foglio"
 
-#: src/cfg_buttons.c:778
+#: src/cfg_buttons.c:775
 msgid "Primary"
 msgstr "Primario"
 
-#: src/cfg_buttons.c:780
+#: src/cfg_buttons.c:777
 msgid "Secondary"
 msgstr "Secondario"
 
-#: src/cfg_buttons.c:785
+#: src/cfg_buttons.c:782
 msgid "Tooltip"
 msgstr "Suggerimento"
 
-#: src/cfg_buttons.c:792 src/cfg_dirpane.c:1145
+#: src/cfg_buttons.c:790 src/cfg_dirpane.c:1107
 msgid "Flags"
 msgstr "Parametri"
 
-#: src/cfg_buttons.c:794
+#: src/cfg_buttons.c:792
 msgid "Narrow?"
 msgstr "Stringere?"
 
-#: src/cfg_buttons.c:798
+#: src/cfg_buttons.c:796
 msgid "Show Tooltip?"
 msgstr "Con suggerimento?"
 
-#: src/cfg_buttons.c:833
+#: src/cfg_buttons.c:831
 msgid "Buttons"
 msgstr "Pulsanti"
 
-#: src/cfg_buttons.c:834 src/cfg_cmdseq.c:1067
+#: src/cfg_buttons.c:832 src/cfg_cmdseq.c:1081
 msgid "Definitions"
 msgstr "Definizioni"
 
@@ -234,262 +235,303 @@
 msgid "Options"
 msgstr "Opzioni"
 
-#: src/cfg_cmdseq.c:610
+#: src/cfg_cmdseq.c:611
 msgid "Select Builtin"
 msgstr "Selezione comandi interni"
 
-#: src/cfg_cmdseq.c:626
+#: src/cfg_cmdseq.c:627
 msgid "Opening brace"
 msgstr "Graffa di apertura"
 
-#: src/cfg_cmdseq.c:627
+#: src/cfg_cmdseq.c:628
 msgid "Closing brace"
 msgstr "Graffa di chiusura"
 
-#: src/cfg_cmdseq.c:628
+#: src/cfg_cmdseq.c:629
 msgid "First selected"
 msgstr "Primo selezionato"
 
-#: src/cfg_cmdseq.c:629
+#: src/cfg_cmdseq.c:630
 msgid "First selected, unselect"
 msgstr "Primo selezionato, deseleziona"
 
-#: src/cfg_cmdseq.c:630
+#: src/cfg_cmdseq.c:631
 msgid "First selected, with path"
 msgstr "Primo selezionato, con percorso"
 
-#: src/cfg_cmdseq.c:631
+#: src/cfg_cmdseq.c:632
 msgid "First selected, with path, unselect"
 msgstr "Primo selezionato, con percorso, deseleziona"
 
-#: src/cfg_cmdseq.c:632
+#: src/cfg_cmdseq.c:633
 msgid "First selected (destination pane)"
 msgstr "Primo selezionato (pannello di destinazione)"
 
-#: src/cfg_cmdseq.c:633
+#: src/cfg_cmdseq.c:634
 msgid "First selected, no quotes"
 msgstr "Primo selezionato, senza virgolette"
 
-#: src/cfg_cmdseq.c:634
+#: src/cfg_cmdseq.c:635
 msgid "All selected"
 msgstr "Tutta la selezione"
 
-#: src/cfg_cmdseq.c:635
+#: src/cfg_cmdseq.c:636
 msgid "All selected, unselect"
 msgstr "Tutta la selezione, deseleziona"
 
-#: src/cfg_cmdseq.c:636
+#: src/cfg_cmdseq.c:637
 msgid "All selected, with paths"
 msgstr "Tutta la selezione, con percorsi"
 
-#: src/cfg_cmdseq.c:637
+#: src/cfg_cmdseq.c:638
 msgid "All selected, with paths, unselect"
 msgstr "Tutta la selezione, con percorsi, deseleziona"
 
-#: src/cfg_cmdseq.c:638
+#: src/cfg_cmdseq.c:639
 msgid "All selected (destination pane)"
 msgstr "Tutta la selezione (pannello di destinazione)"
 
-#: src/cfg_cmdseq.c:639
+#: src/cfg_cmdseq.c:640
 msgid "All selected, no quotes"
 msgstr "Tutta la selezione, senza virgolette"
 
-#: src/cfg_cmdseq.c:640
+#: src/cfg_cmdseq.c:641
 msgid "Path to source pane's directory"
 msgstr "Percorso della directory del pannello sorgente"
 
-#: src/cfg_cmdseq.c:641
+#: src/cfg_cmdseq.c:642
 msgid "Path to destination pane's directory"
 msgstr "Percorso della directory del pannello di destinazione"
 
-#: src/cfg_cmdseq.c:642
+#: src/cfg_cmdseq.c:643
 msgid "Path to home directory"
 msgstr "Percorso della directory home"
 
-#: src/cfg_cmdseq.c:643
+#: src/cfg_cmdseq.c:644
 msgid "Path of left pane"
 msgstr "Percorso del pannello sinistro"
 
-#: src/cfg_cmdseq.c:644
+#: src/cfg_cmdseq.c:645
 msgid "Path of right pane"
 msgstr "Percorso del pannello destro"
 
-#: src/cfg_cmdseq.c:645
+#: src/cfg_cmdseq.c:646
+#, fuzzy
+msgid "URI of first selected"
+msgstr "Primo selezionato"
+
+#: src/cfg_cmdseq.c:647
+#, fuzzy
+msgid "URI of first selected, unselect"
+msgstr "Primo selezionato, deseleziona"
+
+#: src/cfg_cmdseq.c:648
+#, fuzzy
+msgid "URI of first selected, no quotes"
+msgstr "Primo selezionato, senza virgolette"
+
+#: src/cfg_cmdseq.c:649
+#, fuzzy
+msgid "URIs of all selected"
+msgstr "Tutta la selezione"
+
+#: src/cfg_cmdseq.c:650
+#, fuzzy
+msgid "URIs of all selected, unselect"
+msgstr "Tutta la selezione, deseleziona"
+
+#: src/cfg_cmdseq.c:651
+#, fuzzy
+msgid "URIs of all selected, no quotes"
+msgstr "Tutta la selezione, senza virgolette"
+
+#: src/cfg_cmdseq.c:652
+#, fuzzy
+msgid "URIs of all selected, unselect, no quotes"
+msgstr "Tutta la selezione, senza virgolette"
+
+#: src/cfg_cmdseq.c:653
+#, fuzzy
+msgid "URI of first selected (destination pane)"
+msgstr "Primo selezionato (pannello di destinazione)"
+
+#: src/cfg_cmdseq.c:654
 msgid "Input combo box"
 msgstr "Inserisce un combo box"
 
-#: src/cfg_cmdseq.c:646
+#: src/cfg_cmdseq.c:655
 msgid "Input using menu"
 msgstr "Per l'immissione tramite menù"
 
-#: src/cfg_cmdseq.c:647
+#: src/cfg_cmdseq.c:656
 msgid "Input string"
 msgstr "Per l'immissione di una stringa"
 
-#: src/cfg_cmdseq.c:648
+#: src/cfg_cmdseq.c:657
 msgid "Input check button (gives TRUE or FALSE)"
 msgstr "Inserisce un pulsante di verifica (che emette TRUE o FALSE)"
 
-#: src/cfg_cmdseq.c:649
+#: src/cfg_cmdseq.c:658
 msgid "Add label to input window"
 msgstr "Aggiunge il titolo alla finestra d'immissione"
 
-#: src/cfg_cmdseq.c:650
+#: src/cfg_cmdseq.c:659
 msgid "Add a separator bar to input window"
 msgstr "Aggiunge una barra di separazione alla finestra d'immissione"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "$NAME"
 msgstr "$NOME"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "Value of $NAME (environment)"
 msgstr "Valore di $NOME (variabile d'ambiente)"
 
-#: src/cfg_cmdseq.c:652
+#: src/cfg_cmdseq.c:661
 msgid "gentoo's PID"
 msgstr "PID di gentoo"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "Home directory for user NAME"
 msgstr "Directory home dell'utente NOME"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "~NAME"
 msgstr "~NOME"
 
-#: src/cfg_cmdseq.c:677
+#: src/cfg_cmdseq.c:686 src/cmd_split.c:536
 msgid "Pick Code"
 msgstr "Selezione codice"
 
-#: src/cfg_cmdseq.c:765
+#: src/cfg_cmdseq.c:778
 msgid "(No Options Available)"
 msgstr "(Nessuna opzione disponibile)"
 
-#: src/cfg_cmdseq.c:801
+#: src/cfg_cmdseq.c:814
 msgid "Run in Background?"
 msgstr "Esegui in background?"
 
-#: src/cfg_cmdseq.c:805
+#: src/cfg_cmdseq.c:818
 msgid "Kill Previous Instance?"
 msgstr "Sopprimi l'istanza precedente?"
 
-#: src/cfg_cmdseq.c:809
+#: src/cfg_cmdseq.c:822
 msgid "Survive Quit?"
 msgstr "Si deve tenere in vita all'uscita?"
 
-#: src/cfg_cmdseq.c:815
+#: src/cfg_cmdseq.c:828
 msgid "Capture Output?"
 msgstr "Cattura i dati uscenti?"
 
-#: src/cfg_cmdseq.c:900
+#: src/cfg_cmdseq.c:913
 msgid "Before Execution"
 msgstr "Prima dell'esecuzione"
 
-#: src/cfg_cmdseq.c:903
+#: src/cfg_cmdseq.c:916
 #, fuzzy
 msgid "Require Source Selection?"
 msgstr "Richiede protezione"
 
-#: src/cfg_cmdseq.c:907
+#: src/cfg_cmdseq.c:920
 #, fuzzy
 msgid "Require Destination Selection?"
 msgstr "Richiede protezione"
 
-#: src/cfg_cmdseq.c:912
+#: src/cfg_cmdseq.c:926
 msgid "CD Source?"
 msgstr "CD sorgente?"
 
-#: src/cfg_cmdseq.c:915
+#: src/cfg_cmdseq.c:929
 msgid "CD Destination?"
 msgstr "CD destinazione?"
 
-#: src/cfg_cmdseq.c:922
+#: src/cfg_cmdseq.c:937
 msgid "After Execution"
 msgstr "Dopo l'esecuzione"
 
-#: src/cfg_cmdseq.c:924
+#: src/cfg_cmdseq.c:939
 msgid "Rescan Source?"
 msgstr "Riesamina sorgente?"
 
-#: src/cfg_cmdseq.c:928
+#: src/cfg_cmdseq.c:943
 msgid "Rescan Destination?"
 msgstr "Riesamina destinazione?"
 
-#: src/cfg_cmdseq.c:942
+#: src/cfg_cmdseq.c:957
 msgid "General"
 msgstr "Generale"
 
-#: src/cfg_cmdseq.c:945
+#: src/cfg_cmdseq.c:960
 msgid "Before&After"
 msgstr "Prima & Dopo"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "Built-In"
 msgstr "Interno"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "External"
 msgstr "Esterno"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Add Row"
 msgstr "Aggiungi riga"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Duplicate"
 msgstr "Duplica"
 
-#: src/cfg_cmdseq.c:978 src/cfg_styles.c:588 src/cfg_styles.c:805
-#: src/cfg_types.c:679 src/cmd_symlink.c:209 src/dpformat.c:35
+#: src/cfg_cmdseq.c:993 src/cfg_styles.c:596 src/cfg_styles.c:823
+#: src/cfg_types.c:678 src/cmd_info.c:151 src/cmd_split.c:648
+#: src/cmd_symlink.c:213 src/dpformat.c:36
 msgid "Name"
 msgstr "Nome"
 
-#: src/cfg_cmdseq.c:988
+#: src/cfg_cmdseq.c:1004
 msgid "Definition"
 msgstr "Definizione"
 
-#: src/cfg_cmdseq.c:1044
+#: src/cfg_cmdseq.c:1058
 msgid "Repeat Sequence Until No Source Selection?"
 msgstr "Ripetere la sequenza finché vi sono selezioni?"
 
-#: src/cfg_cmdseq.c:1056 src/cfg_controls.c:655 src/cfg_controls.c:706
-#: src/cfg_styles.c:833 src/cfg_types.c:775
+#: src/cfg_cmdseq.c:1070 src/cfg_controls.c:622 src/cfg_controls.c:673
+#: src/cfg_styles.c:853 src/cfg_types.c:776
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/cfg_cmdseq.c:1059 src/cfg_controls.c:658 src/cfg_controls.c:709
-#: src/cfg_styles.c:836 src/cfg_types.c:788
+#: src/cfg_cmdseq.c:1073 src/cfg_controls.c:625 src/cfg_controls.c:676
+#: src/cfg_styles.c:856 src/cfg_types.c:789
 msgid "Delete"
 msgstr "Cancella"
 
-#: src/cfg_cmdseq.c:1066
+#: src/cfg_cmdseq.c:1080
 msgid "Commands"
 msgstr "Comandi"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1365 src/cfg_dirpane.c:1371
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1288 src/cfg_dirpane.c:1293
 msgid "Left"
 msgstr "Sinistra"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Middle"
 msgstr "Medio"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1364 src/cfg_dirpane.c:1372
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1287 src/cfg_dirpane.c:1294
 msgid "Right"
 msgstr "Destra"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Down"
 msgstr "Ruota verso il basso"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Up"
 msgstr "Ruota verso l'alto"
 
-#: src/cfg_controls.c:382
+#: src/cfg_controls.c:378
 msgid ""
 "The following modifier key(s) must\n"
 "be held down when the mouse button\n"
@@ -500,47 +542,43 @@
 "quando il pulsante del mouse è\n"
 "cliccato per l'avvio del comando"
 
-#: src/cfg_controls.c:395
+#: src/cfg_controls.c:391
 msgid "Edit Modifiers"
 msgstr "Cambia modificatori"
 
-#: src/cfg_controls.c:613
+#: src/cfg_controls.c:580
 msgid "Controls"
 msgstr "Controlli"
 
-#: src/cfg_controls.c:620
+#: src/cfg_controls.c:587
 msgid "Global Keyboard Shortcuts"
 msgstr "Scorciatoie di tastiera generali"
 
-#: src/cfg_controls.c:665
+#: src/cfg_controls.c:632
 msgid "Dirpane Mouse Buttons"
 msgstr "I pulsanti del mouse sui pannelli delle directory"
 
-#: src/cfg_controls.c:690
+#: src/cfg_controls.c:657
 msgid "Button"
 msgstr "Pulsante"
 
-#: src/cfg_controls.c:693
+#: src/cfg_controls.c:660
 msgid "Edit Modifiers..."
 msgstr "Cambia modificatori..."
 
-#: src/cfg_controls.c:716
+#: src/cfg_controls.c:683
 msgid "Click-M-Click Gesture"
 msgstr "Manovra Click-M-Click"
 
-#: src/cfg_controls.c:726
+#: src/cfg_controls.c:693
 msgid "Time Limit"
 msgstr "Limite temporale"
 
-#: src/cfg_controls.c:737
-msgid "Path Right Click"
-msgstr "Clic con il pulsante destro sul percorso"
-
-#: src/cfg_controls.c:750
+#: src/cfg_controls.c:704
 msgid "Ignore Num Lock For All Bindings?"
 msgstr "Ignorare «Bloc Num» per le associazioni di tastiera?"
 
-#: src/cfg_controls.c:780
+#: src/cfg_controls.c:734
 msgid ""
 "Note: The mouse button control settings\n"
 "are ambiguous: the same button+modifier\n"
@@ -554,310 +592,297 @@
 "potrebbe rendere il loro comportamento\n"
 "particolarmente bizzarro..."
 
-#: src/cfg_controls.c:784
+#: src/cfg_controls.c:738
 msgid "Warning"
 msgstr "Attenzione"
 
-#: src/cfg_controls.c:784 src/children.c:95 src/cmd_info.c:246
+#: src/cfg_controls.c:738 src/children.c:89 src/cmd_info.c:320
 msgid "_OK"
 msgstr "_OK"
 
-#: src/cfg_dirpane.c:365
-msgid "Formatted Size, in bytes"
-msgstr "Dimensione impaginata, in byte"
-
-#: src/cfg_dirpane.c:365
-msgid "Raw Size, in Bytes"
-msgstr "Dimensione non impaginata, in byte"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in kilobytes"
-msgstr "Dimensione impaginata, in kilobyte"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in megabytes"
-msgstr "Dimensione impaginata, in megabyte"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, \"Smart\" Unit"
-msgstr "Dimensione impaginata, in unità variabili"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, in gigabytes"
-msgstr "Dimensione impaginata, in gigabyte"
-
-#: src/cfg_dirpane.c:383
+#: src/cfg_dirpane.c:333
 msgid "Append Type Character?"
 msgstr "Apporre carattere tipo?"
 
-#: src/cfg_dirpane.c:386
-msgid "Append \"-> destination\" on Links?"
+#: src/cfg_dirpane.c:336
+#, fuzzy
+msgid "Append \"→ destination\" on Links?"
 msgstr "Apporre \"-> destinazione\" sui collegamenti?"
 
-#: src/cfg_dirpane.c:406
+#: src/cfg_dirpane.c:358
 msgid "Place Tick Every 3 Digits?"
 msgstr "Porre un separatore ogni tre cifre?"
 
-#: src/cfg_dirpane.c:416
+#: src/cfg_dirpane.c:369
 msgid "Digits of Precision"
 msgstr "Cifre di precisione"
 
-#: src/cfg_dirpane.c:429
+#: src/cfg_dirpane.c:382
 msgid "Show Dir's File System Size?"
 msgstr "Mostra la dimensione relativa al file system delle directory?"
 
-#: src/cfg_dirpane.c:435 src/cfg_dirpane.c:439 src/cfg_dirpane.c:443
-#: src/cfg_dirpane.c:447 src/cfg_dirpane.c:451 src/cfg_dirpane.c:455
-#: src/cfg_dirpane.c:459 src/cfg_dirpane.c:463 src/cfg_dirpane.c:467
-#: src/cfg_dirpane.c:474
+#: src/cfg_dirpane.c:388 src/cfg_dirpane.c:392 src/cfg_dirpane.c:396
+#: src/cfg_dirpane.c:400 src/cfg_dirpane.c:404 src/cfg_dirpane.c:408
+#: src/cfg_dirpane.c:412 src/cfg_dirpane.c:416 src/cfg_dirpane.c:420
+#: src/cfg_dirpane.c:428
 msgid "Format"
 msgstr "Formato"
 
-#: src/cfg_dirpane.c:497
+#: src/cfg_dirpane.c:454
 #, c-format
 msgid "%s Settings"
 msgstr "Impostazione '%s'"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1002 src/cfg_dirpane.c:1003
-#: src/cmd_select.c:414
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:970 src/cfg_dirpane.c:971
+#: src/cmd_select.c:381
 msgid "Content"
 msgstr "Contenuto"
 
-#: src/cfg_dirpane.c:611
+#: src/cfg_dirpane.c:571
 msgid "Justification"
 msgstr "Giustificazione"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1003
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:971
 msgid "Title"
 msgstr "Titolo"
 
-#: src/cfg_dirpane.c:611 src/window.c:201
+#: src/cfg_dirpane.c:571 src/window.c:200
 msgid "Width"
 msgstr "Ampiezza"
 
-#: src/cfg_dirpane.c:612
+#: src/cfg_dirpane.c:572
 msgid "Center"
 msgstr "Centro"
 
-#: src/cfg_dirpane.c:621
+#: src/cfg_dirpane.c:581
 msgid "Basic Settings"
 msgstr "Impostazioni base"
 
-#: src/cfg_dirpane.c:669
+#: src/cfg_dirpane.c:628
 msgid "Edit Column Content"
 msgstr "Modifica contenuto colonna"
 
-#: src/cfg_dirpane.c:1002
+#: src/cfg_dirpane.c:970
 msgid "Default Title"
 msgstr "Titolo predefinito"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories First"
 msgstr "Le directory prima"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Last"
 msgstr "Le directory per ultime"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Mixed"
 msgstr "Le directory mischiate"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Left of List"
 msgstr "A sinistra dell'elenco"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Right of List"
 msgstr "A destra dell'elenco"
 
-#: src/cfg_dirpane.c:1029 src/cfg_dirpane.c:1030
+#: src/cfg_dirpane.c:997
 msgid "System Default"
 msgstr "Predefinito del sistema"
 
-#: src/cfg_dirpane.c:1030
-msgid "Always Set"
-msgstr "Sempre impostato"
-
-#: src/cfg_dirpane.c:1030 src/cmd_chmod.c:260 src/menus.c:513
-msgid "Toggle"
-msgstr "Inversione"
-
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy From %s"
 msgstr "Copia da %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy To %s"
 msgstr "Copia a %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Swap With %s"
 msgstr "Scambia con %s"
 
-#: src/cfg_dirpane.c:1048
+#: src/cfg_dirpane.c:1015
 msgid "Columns"
 msgstr "Colonne"
 
-#: src/cfg_dirpane.c:1053
+#: src/cfg_dirpane.c:1020
 msgid "Available Content Types"
 msgstr "Tipi di contenuto disponibili"
 
-#: src/cfg_dirpane.c:1070
+#: src/cfg_dirpane.c:1037
 msgid "Selected Content Types"
 msgstr "Tipi di contenuto selezionati"
 
-#: src/cfg_dirpane.c:1081 src/cfg_styles.c:723
+#: src/cfg_dirpane.c:1049 src/cfg_styles.c:741
 msgid "Edit..."
 msgstr "Modifica..."
 
-#: src/cfg_dirpane.c:1082 src/cmd_renamere.c:508
+#: src/cfg_dirpane.c:1050 src/cmd_renamere.c:481
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: src/cfg_dirpane.c:1096
+#: src/cfg_dirpane.c:1064
 msgid "Sorting"
 msgstr "Ordinamento"
 
-#: src/cfg_dirpane.c:1099
+#: src/cfg_dirpane.c:1067
 msgid "Sort On"
 msgstr "Ordine per"
 
-#: src/cfg_dirpane.c:1106 src/cmd_split.c:233 src/dpformat.c:39
-#: src/dpformat.c:40
+#: src/cfg_dirpane.c:1071 src/cmd_split.c:590 src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode"
 msgstr "Modo"
 
-#: src/cfg_dirpane.c:1113
+#: src/cfg_dirpane.c:1077
 msgid "Inverse Sorting?"
 msgstr "Ordinamento invertito?"
 
-#: src/cfg_dirpane.c:1116 src/cfg_paths.c:187 src/cfg_types.c:743
-#: src/cmd_renamere.c:459 src/cmd_renamere.c:486 src/cmd_select.c:520
-#: src/textview.c:620
+#: src/cfg_dirpane.c:1080 src/cfg_paths.c:228 src/cfg_types.c:744
+#: src/cmd_renamere.c:432 src/cmd_renamere.c:459 src/cmd_select.c:478
+#: src/textview.c:604
 msgid "Ignore Case?"
 msgstr "Maiuscole come minuscole?"
 
-#: src/cfg_dirpane.c:1119
-msgid "Numerical Mode?"
-msgstr "Stile numerico?"
-
-#: src/cfg_dirpane.c:1127
+#: src/cfg_dirpane.c:1088
 msgid "Default Directory"
 msgstr "Directory predefinita"
 
-#: src/cfg_dirpane.c:1132
+#: src/cfg_dirpane.c:1094
 msgid "Grab Current"
 msgstr "Quella di adesso"
 
-#: src/cfg_dirpane.c:1135
+#: src/cfg_dirpane.c:1097
 msgid "From History"
 msgstr "Dalla cronologia"
 
-#: src/cfg_dirpane.c:1148
+#: src/cfg_dirpane.c:1110
 msgid "Path Above?"
 msgstr "Il percorso posto in alto?"
 
-#: src/cfg_dirpane.c:1152
+#: src/cfg_dirpane.c:1114
 msgid "Hide Allowed?"
 msgstr "Abilita nascondimento?"
 
-#: src/cfg_dirpane.c:1156
+#: src/cfg_dirpane.c:1118
 msgid "Scrollbar Always?"
 msgstr "Barra di scorrimento fissa?"
 
-#: src/cfg_dirpane.c:1160
+#: src/cfg_dirpane.c:1122
 msgid "Huge Parent Button?"
 msgstr ""
 
-#: src/cfg_dirpane.c:1168
+#: src/cfg_dirpane.c:1127
+msgid "Set Custom Font?"
+msgstr ""
+
+#: src/cfg_dirpane.c:1140
 msgid "Scrollbar Position"
 msgstr "Posizione barra di scorrimento"
 
-#: src/cfg_dirpane.c:1180
-msgid "Modify 'Control' Key State"
-msgstr "Altera lo stato del tasto «Control»"
-
-#: src/cfg_dirpane.c:1225
-msgid "Active Pane Titles"
-msgstr "Titolo del pannello quando attivo"
-
-#: src/cfg_dirpane.c:1225
-msgid "Focused Row, Unselected"
-msgstr "Riga con focus, non selezionata"
-
-#: src/cfg_dirpane.c:1226
-msgid "Focused Row, Selected"
-msgstr "Riga con focus, selezionata"
-
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Horizontal"
 msgstr "Orizzontale"
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Vertical"
 msgstr "Verticale"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Don't Track"
 msgstr "Non tracciare"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Ratio"
 msgstr "Proporzione"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Left Pane"
 msgstr "Dimensione, pannello sinistro"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Right Pane"
 msgstr "Dimensione, pannello destro"
 
-#: src/cfg_dirpane.c:1275
+#: src/cfg_dirpane.c:1198
 msgid "Pane Orientation"
 msgstr "Orientamento pannelli"
 
-#: src/cfg_dirpane.c:1289
+#: src/cfg_dirpane.c:1212
 msgid "Split Tracking"
 msgstr "Tracciamento della divisione"
 
-#: src/cfg_dirpane.c:1312
+#: src/cfg_dirpane.c:1235
 msgid "pixels"
 msgstr "pixel"
 
-#: src/cfg_dirpane.c:1340
+#: src/cfg_dirpane.c:1263
 msgid "Remember Selected Rows?"
 msgstr "Ricorda le righe selezionate?"
 
-#: src/cfg_dirpane.c:1343
+#: src/cfg_dirpane.c:1266
 msgid "Save History Lists?"
 msgstr "Salva gli elenchi della cronologia?"
 
-#: src/cfg_dirpane.c:1360 src/cfg_dirpane.c:1370
+#: src/cfg_dirpane.c:1283 src/cfg_dirpane.c:1292
 msgid "Dir Panes"
 msgstr "Pannelli"
 
-#: src/cfg_dirpane.c:1374
+#: src/cfg_dirpane.c:1295
 msgid "Pane Split"
 msgstr "Divisione"
 
-#: src/cfg_dirpane.c:1375
+#: src/cfg_dirpane.c:1296
 msgid "History"
 msgstr "Cronologia"
 
-#: src/cfg_errors.c:45
+#: src/cfg_dirpane.c:1725
+msgid "'Blocks' Content Deprecated"
+msgstr ""
+
+#: src/cfg_dirpane.c:1726
+msgid ""
+"The 'Blocks' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
+
+#: src/cfg_dirpane.c:1732
+msgid "'Block Size' Content Deprecated"
+msgstr ""
+
+#: src/cfg_dirpane.c:1733
+msgid ""
+"The 'Block Size' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
+
+#: src/cfg_errors.c:48
 msgid "Errors"
 msgstr "Errori"
 
-#: src/cfg_errors.c:52
-msgid "Use Dialog to Report Errors?"
-msgstr "Finestre di dialogo per la segnalazione di errori?"
+#: src/cfg_errors.c:55
+msgid "Error and Status Message Display"
+msgstr ""
+
+#: src/cfg_errors.c:57
+msgid "Status Bar, Above Panes"
+msgstr ""
+
+#: src/cfg_errors.c:60
+msgid "Main Window's Title Bar"
+msgstr ""
+
+#: src/cfg_errors.c:63
+msgid "Separate Dialog"
+msgstr ""
 
-#: src/cfg_errors.c:56
+#: src/cfg_errors.c:69
 msgid "Cause Console Beep on Error?"
 msgstr "Emettere un beep in caso di errore?"
 
@@ -865,116 +890,96 @@
 msgid "Menus"
 msgstr "Menù"
 
-#: src/cfg_mount.c:168
-msgid "Never"
-msgstr "Mai"
-
-#: src/cfg_mount.c:168
-msgid "On Every Access"
-msgstr "Su ogni accesso"
-
-#: src/cfg_mount.c:177
-msgid "Mounting"
-msgstr "Montaggio"
-
-#: src/cfg_mount.c:184
-msgid "Mount When?"
-msgstr "Quando montare?"
-
-#: src/cfg_mount.c:196
-msgid "Mount Options"
-msgstr "Opzioni per montare"
-
-#: src/cfg_mount.c:199
-msgid "Mount Command"
-msgstr "Per montare, comando "
+#: src/cfg_nag.c:78
+#, c-format
+msgid ""
+"Click the button below to reset the %zu stored 'Don't show this dialog "
+"again' responses."
+msgstr ""
 
-#: src/cfg_mount.c:204
-msgid "Unmount Command"
-msgstr "Per smontare, comando "
+#: src/cfg_nag.c:100
+msgid "Nagging"
+msgstr ""
 
-#: src/cfg_mount.c:211
-msgid "Only Mount on Toplevel Directories?"
-msgstr "Monta soltanto in directory vuote?"
+#: src/cfg_nag.c:110
+#, fuzzy
+msgid "Reset All"
+msgstr "Reimposta a predefinito"
 
-#: src/cfg_mount.c:214
-msgid "Use Command Error Dialog?"
-msgstr "Finestra di dialogo per gli errori?"
+#: src/cfg_paths.c:78
+msgid "Edit path"
+msgstr ""
 
-#: src/cfg_mount.c:217
-msgid "Unmount When gentoo Quits?"
-msgstr "Smonta quando gentoo termina?"
+#: src/cfg_paths.c:152
+msgid "Icons"
+msgstr "Icone"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:153
 msgid "GTK+ RC"
 msgstr "GTK+ RC"
 
-#: src/cfg_paths.c:128
-msgid "Icons"
-msgstr "Icone"
-
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:154
 msgid "fstab"
 msgstr "fstab"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:155
 msgid "mtab"
 msgstr "mtab"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Beginning With Dot (.)"
 msgstr "Inizianti con un punto"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Matching RE"
 msgstr "Corrispondenti all'espressione regolare"
 
-#: src/cfg_paths.c:129 src/cmd_chmod.c:259 src/menus.c:512
+#: src/cfg_paths.c:157 src/cmd_chmod.c:252 src/menus.c:519
 msgid "None"
 msgstr "Nulla"
 
-#: src/cfg_paths.c:135
+#: src/cfg_paths.c:163
 msgid "Paths & Hide"
 msgstr "Percorsi e nascondimenti"
 
-#: src/cfg_paths.c:142
+#: src/cfg_paths.c:170
 msgid "Paths"
 msgstr "Percorsi"
 
-#: src/cfg_paths.c:169
+#: src/cfg_paths.c:209
 msgid "Hide Entries"
 msgstr "Quali voci nascondere"
 
-#: src/cfg_styles.c:170 src/cfg_types.c:234 src/iconutil.c:29 src/menus.c:19
+#: src/cfg_styles.c:178 src/cfg_types.c:233 src/iconutil.c:31 src/menus.c:19
 msgid "(None)"
 msgstr "(Niente)"
 
-#: src/cfg_styles.c:191 src/cfg_styles.c:428 src/cfg_styles.c:767
+#: src/cfg_styles.c:199 src/cfg_styles.c:436 src/cfg_styles.c:785
 msgid "Delete Action"
 msgstr "Cancella azione"
 
-#: src/cfg_styles.c:411 src/color_dialog.c:48
+#: src/cfg_styles.c:419 src/color_dialog.c:47
 msgid "Edit Color"
 msgstr "Modifica colore"
 
-#: src/cfg_styles.c:428
+#: src/cfg_styles.c:436
 msgid "Revert to Inherited Command"
 msgstr "Ritorna al comando ereditato"
 
-#: src/cfg_styles.c:529
+#: src/cfg_styles.c:537
 #, fuzzy
 msgid "Select Command ..."
 msgstr "Selezionare comando"
 
-#: src/cfg_styles.c:592
+#: src/cfg_styles.c:601
 msgid "New Action Property"
 msgstr "Nuova proprietà d'azione"
 
-#: src/cfg_styles.c:600
+#: src/cfg_styles.c:609
 msgid "something"
 msgstr "qualcosa"
 
-#: src/cfg_styles.c:670
+#: src/cfg_styles.c:679
 msgid ""
 "Deleting this style will also delete\n"
 "all its children. Are you sure?"
@@ -982,139 +987,139 @@
 "Cancellando questo stile si elimineranno anche\n"
 "tutti i suoi discendenti. Si è sicuri?"
 
-#: src/cfg_styles.c:671
+#: src/cfg_styles.c:680
 msgid "Confirm Delete"
 msgstr "Conferma cancellazione"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Background Color"
 msgstr "Colore sfondo"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Foreground Color"
 msgstr "Colore primo piano"
 
-#: src/cfg_styles.c:694 src/dpformat.c:53
+#: src/cfg_styles.c:703 src/dpformat.c:55
 msgid "Icon"
 msgstr "Icona"
 
-#: src/cfg_styles.c:696
+#: src/cfg_styles.c:705
 msgid "(Row Style Preview Text)"
 msgstr "Stile del testo della riga"
 
-#: src/cfg_styles.c:702 src/cmd_renameseq.c:386
+#: src/cfg_styles.c:713 src/cmd_renameseq.c:358 src/cmd_split.c:656
 msgid "Preview"
 msgstr "Anteprima"
 
-#: src/cfg_styles.c:719
+#: src/cfg_styles.c:737
 msgid "Override Parent's?"
 msgstr "Sostituisci l'ascendente?"
 
-#: src/cfg_styles.c:723
+#: src/cfg_styles.c:741
 msgid "Pick..."
 msgstr "Scelta..."
 
-#: src/cfg_styles.c:764
+#: src/cfg_styles.c:782
 msgid "Add Action..."
 msgstr "Aggiungi azione..."
 
 # n.d.T: "Parent" -> "Directory precedente", "Precedente",
 # ossia tradotto nello stile Amiga.
 #
-#: src/cfg_styles.c:810 src/menus.c:525
+#: src/cfg_styles.c:829 src/menus.c:532
 msgid "Parent"
 msgstr "Precedente"
 
-#: src/cfg_styles.c:820
+#: src/cfg_styles.c:840
 msgid "Inherited Properties"
 msgstr "Ereditamento proprietà"
 
-#: src/cfg_styles.c:824
+#: src/cfg_styles.c:844
 msgid "Visual"
 msgstr "Visive"
 
-#: src/cfg_styles.c:826
+#: src/cfg_styles.c:846
 msgid "Actions"
 msgstr "D'azione"
 
-#: src/cfg_styles.c:843
+#: src/cfg_styles.c:863
 msgid "File Recognition"
 msgstr "Riconoscimento file"
 
-#: src/cfg_styles.c:844
+#: src/cfg_styles.c:864
 msgid "Styles"
 msgstr "Stili"
 
-#: src/cfg_types.c:193
+#: src/cfg_types.c:192
 #, c-format
 msgid "%s - Click to Change..."
 msgstr "%s - Un clic per cambiare..."
 
-#: src/cfg_types.c:508
+#: src/cfg_types.c:507
 msgid "(New Type)"
 msgstr "(Nuovo tipo)"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "B-Dev"
 msgstr "Device a blocchi"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "C-Dev"
 msgstr "Device a caratteri"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Dir"
 msgstr "Dir"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "FIFO"
 msgstr "FIFO"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "File"
 msgstr "File"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Link"
 msgstr "Collegamento"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Socket"
 msgstr "Socket"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "Readable"
 msgstr "Leggibile"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetGID"
 msgstr "SetGID"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetUID"
 msgstr "SetUID"
 
-#: src/cfg_types.c:648 src/cmd_chmod.c:209
+#: src/cfg_types.c:647 src/cmd_chmod.c:200
 msgid "Sticky"
 msgstr "Sticky"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Executable"
 msgstr "Eseguibile"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Writable"
 msgstr "Scrivibile"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match 'file' (RE)"
 msgstr "Corrispondenti con \"file\" (RE)"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match Name (RE)"
 msgstr "Corrispondenti con il nome (RE)"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Require Suffix"
 msgstr "Richiede suffisso"
 
@@ -1130,19 +1135,19 @@
 msgid "Require Protection"
 msgstr "Richiede protezione"
 
-#: src/cfg_types.c:738
+#: src/cfg_types.c:739
 msgid "Glob?"
 msgstr ""
 
-#: src/cfg_types.c:754
+#: src/cfg_types.c:755
 msgid "Type's Style"
 msgstr "Stile del tipo"
 
-#: src/cfg_types.c:756
+#: src/cfg_types.c:757
 msgid "Style"
 msgstr "Stile"
 
-#: src/cfg_types.c:796
+#: src/cfg_types.c:797
 msgid "Types"
 msgstr "Tipi"
 
@@ -1172,16 +1177,16 @@
 msgid "Dialog Positioning"
 msgstr "Posizionamento dialogo"
 
-#: src/children.c:94
+#: src/children.c:88
 #, c-format
 msgid "Execution of \"%s\" Failed"
 msgstr "Esecuzione di \"%s\" fallita"
 
-#: src/children.c:95 src/dialog.c:285
+#: src/children.c:89 src/dialog.c:290
 msgid "Error"
 msgstr "Errore"
 
-#: src/children.c:274
+#: src/children.c:227
 #, c-format
 msgid "Couldn't terminate child \"%s\" (pid=%d)--zombie alert"
 msgstr ""
@@ -1204,7 +1209,7 @@
 
 #: src/cmd_about.c:97
 #, fuzzy
-msgid "(c) 1998-2009 by Emil Brink, Obsession Development.\n"
+msgid "(c) 1998-2011 by Emil Brink, Obsession Development.\n"
 msgstr "(c) 1998-2004 di Emil Brink, Obsession Development.\n"
 
 #: src/cmd_about.c:99
@@ -1215,35 +1220,23 @@
 "Questo è software libero e privo ASSOLUTAMENTE DI\n"
 "OGNI GARANZIA. Leggere il file COPYING per dettagli.\n"
 
-#: src/cmd_about.c:106
-msgid "FAM: Supported and active."
-msgstr "FAM: Disponibile e attivo."
-
-#: src/cmd_about.c:108
-msgid "FAM: Supported, but not active."
-msgstr "FAM: Disponibile, ma non attivo."
-
-#: src/cmd_about.c:110
-msgid "FAM: Not supported."
-msgstr "FAM: Non disponibile"
-
-#: src/cmd_about.c:116
+#: src/cmd_about.c:105
 msgid "NLS: Supported, using built-in English strings."
 msgstr "NLS: Attivo, versione italiana di Francesco Cosoleto."
 
-#: src/cmd_about.c:129
-#, fuzzy
+#: src/cmd_about.c:118
+#, fuzzy, c-format
 msgid ""
 "The author of gentoo can be reached via Internet\n"
-"e-mail at <emil@obsession.se>; feel free to let\n"
+"e-mail at <a href=\"mailto:%s\">%s</a>; feel free to let\n"
 "me know what you think of this software, give\n"
 "suggestions/bug reports, and so on.\n"
 "\n"
 "The latest release of gentoo can always be down-\n"
 "loaded from the official gentoo project homepage at\n"
-"<http://www.obsession.se/gentoo/>. New releases are\n"
+"<a href=\"%s\">%s</a>. New releases are\n"
 "typically announced on the Freshmeat service at\n"
-"<http://freshmeat.net/>."
+"<a href=\"http://freshmeat.net/\">freshmeat.net</a>."
 msgstr ""
 "L'autore di gentoo può essere contattato via Internet\n"
 "all'e-mail <emil@obsession.se>, in questo modo potete\n"
@@ -1258,11 +1251,11 @@
 "solitamente annunciate su Freshmeat, il cui indirizzo è\n"
 "<http://freshmeat.net/>."
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "About gentoo"
 msgstr "Informazioni su gentoo"
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "_OK (Wait for More)"
 msgstr "_OK (Di più fra poco)"
 
@@ -1271,85 +1264,89 @@
 msgid "Set protection bits for \"%s\":"
 msgstr "Imposta bit di protezione per \"%s\":"
 
-#: src/cmd_chmod.c:208 src/cmd_chown.c:184 src/cmd_info.c:202
+#: src/cmd_chmod.c:199 src/cmd_chown.c:176 src/cmd_info.c:274
 msgid "Group"
 msgstr "Gruppo"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Others"
 msgstr "Altri"
 
-#: src/cmd_chmod.c:208 src/cmd_info.c:195
+#: src/cmd_chmod.c:199 src/cmd_info.c:267
 msgid "Owner"
 msgstr "Proprietario"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Special"
 msgstr "Speciale"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Execute"
 msgstr "Esecuzione"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Read"
 msgstr "Lettura"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set GID"
 msgstr "Set GID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set UID"
 msgstr "Set UID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Write"
 msgstr "Scrittura"
 
-#: src/cmd_chmod.c:231
+#: src/cmd_chmod.c:222
 msgid "Protection Bits"
 msgstr "Bit di protezione"
 
-#: src/cmd_chmod.c:242
+#: src/cmd_chmod.c:233
 msgid "Textual"
 msgstr ""
 
-#: src/cmd_chmod.c:253
+#: src/cmd_chmod.c:246
 #, fuzzy
 msgid "Octal"
 msgstr "8, Ottale"
 
-#: src/cmd_chmod.c:258 src/menus.c:511
+#: src/cmd_chmod.c:251 src/menus.c:518
 msgid "All"
 msgstr "Tutti"
 
-#: src/cmd_chmod.c:261
+#: src/cmd_chmod.c:253 src/menus.c:520
+msgid "Toggle"
+msgstr "Inversione"
+
+#: src/cmd_chmod.c:254
 msgid "Revert"
 msgstr "Precedente"
 
-#: src/cmd_chmod.c:273 src/cmd_chown.c:208 src/cmd_info.c:304
+#: src/cmd_chmod.c:266 src/cmd_chown.c:201 src/cmd_info.c:372
 msgid "Recurse Directories?"
 msgstr "Addentrarsi nelle directory?"
 
-#: src/cmd_chmod.c:276
+#: src/cmd_chmod.c:269
 msgid "Don't Touch Directories?"
 msgstr "Non toccare le directory?"
 
-#: src/cmd_chmod.c:281
+#: src/cmd_chmod.c:274
 msgid "Change Mode"
 msgstr "Cambia permessi"
 
-#: src/cmd_chown.c:56
+#: src/cmd_chown.c:57
 #, c-format
 msgid "Set Ownership for '%s':"
 msgstr "Imposta la proprietà per \"%s\":"
 
-#: src/cmd_chown.c:184
+#: src/cmd_chown.c:176
 msgid "User"
 msgstr "Utente"
 
-#: src/cmd_chown.c:213
+#: src/cmd_chown.c:206
 msgid "Change Ownership"
 msgstr "Cambia proprietà"
 
@@ -1357,48 +1354,37 @@
 msgid "Automatically Save Changed Configuration on Exit?"
 msgstr "Salvataggio automatico in uscita delle modifiche alla configurazione?"
 
-#: src/cmd_copy.c:302
-#, c-format
-msgid ""
-"Can't copy directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"Non si può copiare la directory \"%s\"\n"
-"in \"%s\":\n"
-"la sorgente contiene la destinazione."
-
-#: src/cmd_copy.c:392 src/cmd_copyas.c:62
+#: src/cmd_copy.c:175 src/cmd_copyas.c:62
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Copy?"
 msgstr "\"%s\" esiste già. Proseguire con la copia?"
 
-#: src/cmd_copy.c:393
+#: src/cmd_copy.c:176
 msgid "Copying..."
 msgstr "Copia in corso..."
 
-#: src/cmd_copy.c:440
+#: src/cmd_copy.c:217
 msgid "Preserve Dates During Copy?"
 msgstr "Mantieni le date originali nella copia?"
 
-#: src/cmd_copy.c:441
+#: src/cmd_copy.c:218
 msgid "Ignore Failure to Copy Attributes (Date, Owner, Mode)?"
 msgstr "Ignora la mancata copia degli attributi (data, proprietario, modo)?"
 
-#: src/cmd_copy.c:442
+#: src/cmd_copy.c:219
 msgid "Leave Failed Destination if Full Size?"
 msgstr "Non riuscendo, lasciar stare la destinazione se è completa?"
 
-#: src/cmd_copy.c:443 src/cmd_viewtext.c:207
+#: src/cmd_copy.c:220 src/cmd_viewtext.c:204
 msgid "Buffer Size"
 msgstr "Grandezza buffer"
 
-#: src/cmd_copyas.c:51
+#: src/cmd_copyas.c:49
 #, c-format
 msgid "Enter Name for Copy of \"%s\""
 msgstr "Inserire nome per la copia di \"%s\""
 
-#: src/cmd_copyas.c:53
+#: src/cmd_copyas.c:51
 #, c-format
 msgid "Enter Name for Clone of \"%s\""
 msgstr "Inserire nome per il clone di \"%s\""
@@ -1426,28 +1412,28 @@
 msgid "Enter Name for Link Clone of \"%s\""
 msgstr "Inserire il nome per il collegamento clone di \"%s\""
 
-#: src/cmd_copyas.c:89
+#: src/cmd_copyas.c:91
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Symlink?"
 msgstr "\"%s\" esiste già. Proseguire con il collegamento simbolico?"
 
-#: src/cmd_copyas.c:204 src/cmd_copyas.c:210
+#: src/cmd_copyas.c:200 src/cmd_copyas.c:207
 msgid "Copy As"
 msgstr "Copia con nome"
 
-#: src/cmd_copyas.c:212
+#: src/cmd_copyas.c:209
 msgid "Clone"
 msgstr "Clona"
 
-#: src/cmd_copyas.c:214
+#: src/cmd_copyas.c:211
 msgid "Symbolic Link As"
 msgstr "Collega simbolicamente con nome"
 
-#: src/cmd_copyas.c:216
+#: src/cmd_copyas.c:213
 msgid "Symbolic Link Clone"
 msgstr "Clone di collegamento simbolico"
 
-#: src/cmd_delete.c:55
+#: src/cmd_delete.c:56
 #, c-format
 msgid ""
 "%s\n"
@@ -1458,240 +1444,248 @@
 "non si è potuto eliminare per via di restrizioni nell'accesso.\n"
 "Si riprova cambiando la protezione?"
 
-#: src/cmd_delete.c:58
+#: src/cmd_delete.c:59
 msgid "Remember the answer (alters config)"
 msgstr "Ricorda la risposta (altera la configurazione)"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Access Problem"
 msgstr "Problema di accesso"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Change|Leave Alone"
 msgstr "Cambia|Lascia stare"
 
-#: src/cmd_delete.c:236
+#: src/cmd_delete.c:215
 #, c-format
 msgid "Really Delete \"%s\"?"
 msgstr "Veramente cancellare \"%s\"?"
 
-#: src/cmd_delete.c:237
+#: src/cmd_delete.c:216
 msgid "Deleting..."
 msgstr "Cancellazione..."
 
-#: src/cmd_delete.c:292
+#: src/cmd_delete.c:279
 msgid "On Access Failure"
 msgstr "In caso di problemi d'accesso"
 
-#: src/cmd_delete.c:293
+#: src/cmd_delete.c:280
 msgid "Ask User|Automatically Try Changing, and Retry|Fail"
 msgstr "Chiedi all'utente|Autonomamente prova a cambiare, e ritenta|Annulla"
 
-#: src/cmd_dpfocus.c:183
-msgid "Wrap Around At Top And Bottom?"
+#: src/cmd_dpfocus.c:33
+msgid "DpFocus Command is Deprecated"
+msgstr ""
+
+#: src/cmd_dpfocus.c:34
+msgid ""
+"The <tt>DpFocus</tt> command has been deprecated and is no longer supported. "
+"Please remove any keyboard or mouse bindings that use it and look into using "
+"the default GTK+ list view's cursor controls."
 msgstr ""
-"In cima e in fondo all'elenco, consentire il movimento all'altra estremità?"
 
-#: src/cmd_dpfocus.c:184
+#: src/cmd_dpfocus.c:64
 msgid "Treat Focused Row As Selection If No \"Real\" Selection Exists?"
 msgstr ""
 "Considera la riga con il focus come selezione se non ve n'è una effettiva?"
 
-#: src/cmd_dpfocus.c:186
+#: src/cmd_dpfocus.c:66
 msgid "Move Focus to Last Selected/Deselected Row?"
 msgstr "Sposta il focus all'ultima riga selezionata/deselezionata?"
 
-#: src/cmd_dpfocusisrch.c:220
+#: src/cmd_dpfocusisrch.c:163
 msgid "ISearch"
 msgstr "Ricerca I."
 
-#: src/cmd_generic.c:136
+#: src/cmd_generic.c:143
 msgid "_OK|A_ll|_Skip|_Cancel"
 msgstr "_OK|_Tutti|_Salta|_Annulla"
 
-#: src/cmd_generic.c:137
+#: src/cmd_generic.c:144
 msgid "_OK|_Skip|_Cancel"
 msgstr "_OK|_Salta|_Annulla"
 
-#: src/cmd_getsize.c:49
+#: src/cmd_getsize.c:51
 msgid "Getting sizes..."
 msgstr "Ottenimento delle dimensioni..."
 
-#: src/cmd_getsize.c:141
+#: src/cmd_getsize.c:134
 msgid "Unselect Rows When Done?"
 msgstr "Deselezione delle righe dopo l'esecuzione?"
 
-#: src/cmd_info.c:71 src/cmd_info.c:163
-#, c-format
-msgid ""
-"%s (%s bytes,\n"
-"%s blocks)"
-msgstr ""
-"%s (%s byte,\n"
-"%s blocchi)"
+#: src/cmd_info.c:68 src/errors.c:84
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr ", %s usati"
 
-#: src/cmd_info.c:75
-#, c-format
-msgid "%u dirs, %u files, %u symlinks"
+#: src/cmd_info.c:72
+#, fuzzy, c-format
+msgid ""
+"%u dirs, %u files,\n"
+"%u symlinks, %u special files"
 msgstr "%u dir, %u file, %u symlink"
 
-#: src/cmd_info.c:134
+#: src/cmd_info.c:153
+msgid "Value"
+msgstr ""
+
+#: src/cmd_info.c:198
 msgid "Link To"
 msgstr "Collegamento a"
 
-#: src/cmd_info.c:145 src/cmd_select.c:399 src/dpformat.c:52
+#: src/cmd_info.c:213 src/cmd_select.c:368 src/dpformat.c:54
 msgid "Type"
 msgstr "Tipo"
 
-#: src/cmd_info.c:148
+#: src/cmd_info.c:216
 msgid "Location"
 msgstr "Posizione"
 
-#: src/cmd_info.c:151 src/dpformat.c:36 src/window.c:200
+#: src/cmd_info.c:219 src/cmd_split.c:653 src/dpformat.c:37 src/window.c:199
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/cmd_info.c:172
+#: src/cmd_info.c:229
+#, fuzzy, c-format
+msgid "%s (%s bytes)"
+msgstr "%Lu byte"
+
+#: src/cmd_info.c:240
 msgid "Contains"
 msgstr "Contiene"
 
-#: src/cmd_info.c:186
+#: src/cmd_info.c:257
 msgid "'File' Info"
 msgstr "Informazioni di \"file\""
 
-#: src/cmd_info.c:213 src/dpformat.c:49
+#: src/cmd_info.c:285 src/dpformat.c:50
 msgid "Accessed"
 msgstr "Ultimo accesso"
 
-#: src/cmd_info.c:214 src/dpformat.c:50
+#: src/cmd_info.c:286 src/dpformat.c:51
 msgid "Modified"
 msgstr "Modificato"
 
-#: src/cmd_info.c:215
+#: src/cmd_info.c:287 src/dpformat.c:53
 msgid "Changed"
 msgstr "Cambiato"
 
-#: src/cmd_info.c:263
+#: src/cmd_info.c:288 src/dpformat.c:52
+msgid "Created"
+msgstr "Creato"
+
+#: src/cmd_info.c:290
+#, fuzzy
+msgid "Basic"
+msgstr "Base"
+
+#: src/cmd_info.c:294
+msgid "Attributes"
+msgstr ""
+
+#: src/cmd_info.c:338
 msgid "Getting Information..."
 msgstr "Raccolta delle informazioni..."
 
-#: src/cmd_info.c:302
+#: src/cmd_info.c:370
 msgid "Show 'file' Output?"
 msgstr "Mostra i dati di uscita di \"file\"?"
 
-#: src/cmd_info.c:305
+#: src/cmd_info.c:373
 msgid "Access Date Format"
 msgstr "Formato della data di accesso"
 
-#: src/cmd_info.c:306
+#: src/cmd_info.c:374
 msgid "Modify Date Format"
 msgstr "Formato della data di modifica"
 
-#: src/cmd_info.c:307
+#: src/cmd_info.c:375
 msgid "Change Date Format"
 msgstr "Formato della data di cambiamento"
 
-#: src/cmd_info.c:308
+#: src/cmd_info.c:376
 msgid "Size Tick Mark"
 msgstr "Segno marcatore della dimensione"
 
-#: src/cmd_join.c:47
+#: src/cmd_join.c:46
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Join?"
 msgstr "\"%s\" esiste già. Proseguire con l'unione?"
 
-#: src/cmd_join.c:76
+#: src/cmd_join.c:73
 msgid "Joining..."
 msgstr "Unione..."
 
-#: src/cmd_join.c:162
+#: src/cmd_join.c:167
 msgid "Click and Drag Files to Reorder, Then Click Join."
 msgstr "Cliccare e trascinare i file da riordinare, quindi cliccare «Unisci»"
 
-#: src/cmd_join.c:170
+#: src/cmd_join.c:175
 #, c-format
 msgid "The total size is %s (%lu bytes)."
 msgstr "La dimensione totale è %s (%lu byte)."
 
-#: src/cmd_join.c:173
+#: src/cmd_join.c:178
 #, c-format
 msgid "The total size is %lu bytes."
 msgstr "La dimensione totale è %lu byte."
 
-#: src/cmd_join.c:215
+#: src/cmd_join.c:220
 msgid "Enter Destination File Name"
 msgstr "Inserire nome del file di destinazione"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "Join"
 msgstr "Unione"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "_Join|_Cancel"
 msgstr "_Unisci|_Annulla"
 
-#: src/cmd_mkdir.c:75
+#: src/cmd_mkdir.c:65
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With MkDir?"
 msgstr "\"%s\" esiste già. Proseguire con mkdir?"
 
-#: src/cmd_mkdir.c:125
+#: src/cmd_mkdir.c:119
 msgid "Enter Name of Directory to Create"
 msgstr "Inserire il nome della directory da creare"
 
-#: src/cmd_mkdir.c:133
+#: src/cmd_mkdir.c:128
 msgid "Make Directory"
 msgstr "Crea directory"
 
-#: src/cmd_mkdir.c:156
+#: src/cmd_mkdir.c:151
 msgid "CD Into New Directory?"
 msgstr "Portarsi nella nuova directory?"
 
-#: src/cmd_mkdir.c:157
+#: src/cmd_mkdir.c:152
 msgid "Focus New Directory?"
 msgstr "Il focus sulla nuova directory?"
 
-#: src/cmd_move.c:81
-#, fuzzy, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"Non si può copiare la directory \"%s\"\n"
-"in \"%s\":\n"
-"la sorgente contiene la destinazione."
-
-#: src/cmd_move.c:92
-#, fuzzy, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the destination contains the source."
-msgstr ""
-"Non si può copiare la directory \"%s\"\n"
-"in \"%s\":\n"
-"la sorgente contiene la destinazione."
-
-#: src/cmd_move.c:188 src/cmd_moveas.c:48
+#: src/cmd_move.c:128 src/cmd_moveas.c:51
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Move?"
 msgstr "\"%s\" esiste già. Continuare con lo spostamento?"
 
-#: src/cmd_move.c:189
+#: src/cmd_move.c:129
 msgid "Moving..."
 msgstr "Spostamento..."
 
-#: src/cmd_moveas.c:40
+#: src/cmd_moveas.c:41
 #, c-format
 msgid "Enter Name to Move \"%s\" As"
 msgstr "Inserire il nome con il quale spostare \"%s\""
 
+#: src/cmd_moveas.c:66
+msgid "Invalid destination name for MoveAs"
+msgstr ""
+
 #: src/cmd_moveas.c:74
 msgid "Moving As..."
 msgstr "Spostamento con nome..."
 
-#: src/cmd_moveas.c:105 src/cmd_moveas.c:110
+#: src/cmd_moveas.c:105 src/cmd_moveas.c:113
 msgid "Move As"
 msgstr "Sposta con nome"
 
@@ -1715,26 +1709,26 @@
 msgid "Are you sure you want to quit?"
 msgstr "Si è sicuri di voler uscire?"
 
-#: src/cmd_rename.c:44
+#: src/cmd_rename.c:57
 #, c-format
 msgid "Enter New Name For \"%s\""
 msgstr "Inserisci nuovo nome per \"%s\""
 
-#: src/cmd_rename.c:52 src/cmd_renamere.c:147 src/cmd_renamere.c:243
-#: src/cmd_renamere.c:293 src/cmd_renamere.c:388 src/cmd_renameseq.c:161
+#: src/cmd_rename.c:67 src/cmd_renamere.c:142 src/cmd_renamere.c:225
+#: src/cmd_renamere.c:268 src/cmd_renamere.c:367 src/cmd_renameseq.c:152
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Rename?"
 msgstr "\"%s\" esiste già. Proseguire nel rinominare?"
 
-#: src/cmd_rename.c:132
+#: src/cmd_rename.c:245
 msgid "Rename"
 msgstr "Rinomina"
 
-#: src/cmd_renamere.c:260
-msgid "Regular expression error:\n"
-msgstr "Errore nell'espressione regolare:\n"
+#: src/cmd_rename.c:261
+msgid "Rename Single File In-Place (Without Dialog)?"
+msgstr ""
 
-#: src/cmd_renamere.c:446
+#: src/cmd_renamere.c:419
 msgid ""
 "Look for substring in all filenames, and replace\n"
 "it with another string."
@@ -1742,23 +1736,23 @@
 "Cerca una sottostringa in tutti i nomi di file\n"
 "e la sostituisce con un'altra."
 
-#: src/cmd_renamere.c:449
+#: src/cmd_renamere.c:422
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: src/cmd_renamere.c:453
+#: src/cmd_renamere.c:426
 msgid "With"
 msgstr "Con"
 
-#: src/cmd_renamere.c:461
+#: src/cmd_renamere.c:434
 msgid "Replace All?"
 msgstr "Sostituisci tutti?"
 
-#: src/cmd_renamere.c:465
+#: src/cmd_renamere.c:438
 msgid "Simple"
 msgstr "Semplice"
 
-#: src/cmd_renamere.c:469
+#: src/cmd_renamere.c:442
 msgid ""
 "Execute the 'From' RE on each filename, storing\n"
 "parenthesised subexpression matches. Then replace\n"
@@ -1774,19 +1768,19 @@
 "il testo che occorre. Quindi impiega il risultato come\n"
 "un nuovo nome di file."
 
-#: src/cmd_renamere.c:477 src/cmd_renamere.c:500
+#: src/cmd_renamere.c:450 src/cmd_renamere.c:473
 msgid "From"
 msgstr "Da"
 
-#: src/cmd_renamere.c:481 src/cmd_renamere.c:504
+#: src/cmd_renamere.c:454 src/cmd_renamere.c:477
 msgid "To"
 msgstr "A"
 
-#: src/cmd_renamere.c:489
+#: src/cmd_renamere.c:462
 msgid "Reg Exp"
 msgstr "Reg Exp"
 
-#: src/cmd_renamere.c:494
+#: src/cmd_renamere.c:467
 msgid ""
 "Look for each character in the 'From' string, and replace\n"
 "any hits with the corresponding character in the 'To' string.\n"
@@ -1794,58 +1788,58 @@
 "the filename, and the result used as the new name for each file."
 msgstr ""
 
-#: src/cmd_renamere.c:513
+#: src/cmd_renamere.c:486
 msgid "Map"
 msgstr ""
 
-#: src/cmd_renamere.c:517
+#: src/cmd_renamere.c:490
 msgid ""
 "Changes the case (upper/lower) of the characters\n"
 "in the selected filename(s)."
 msgstr ""
 
-#: src/cmd_renamere.c:519
+#: src/cmd_renamere.c:492
 #, fuzzy
 msgid "Lower Case?"
 msgstr "Maiuscole come minuscole?"
 
-#: src/cmd_renamere.c:521
+#: src/cmd_renamere.c:494
 #, fuzzy
 msgid "Upper Case?"
 msgstr "Maiuscole come minuscole?"
 
-#: src/cmd_renamere.c:523
+#: src/cmd_renamere.c:496
 #, fuzzy
 msgid "Upper Case Initial?"
 msgstr "Maiuscole come minuscole?"
 
-#: src/cmd_renamere.c:526
+#: src/cmd_renamere.c:499
 #, fuzzy
 msgid "Case"
 msgstr "Base"
 
-#: src/cmd_renamere.c:528
+#: src/cmd_renamere.c:501
 #, fuzzy
 msgid "RenameRE"
 msgstr "Rinomina"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "10, Decimal"
 msgstr "10, Decimale"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (A-F)"
 msgstr "16, Esadec. (A-F)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (a-f)"
 msgstr "16, Esadec. (a-f)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "8, Octal"
 msgstr "8, Ottale"
 
-#: src/cmd_renameseq.c:328
+#: src/cmd_renameseq.c:306
 msgid ""
 "This command renames all selected files\n"
 "into a numbered sequence. The controls\n"
@@ -1857,89 +1851,89 @@
 "presenti permettono di definire come i nomi\n"
 "sono composti."
 
-#: src/cmd_renameseq.c:335
+#: src/cmd_renameseq.c:313
 msgid "Start At"
 msgstr "Inizio da"
 
-#: src/cmd_renameseq.c:343 src/cmd_split.c:247
+#: src/cmd_renameseq.c:323 src/cmd_split.c:609
 msgid "Base"
 msgstr "Base"
 
-#: src/cmd_renameseq.c:359
+#: src/cmd_renameseq.c:333
 msgid "Precision"
 msgstr "Precisione"
 
-#: src/cmd_renameseq.c:367
+#: src/cmd_renameseq.c:340
 msgid "Head"
 msgstr "Testa"
 
-#: src/cmd_renameseq.c:374
+#: src/cmd_renameseq.c:347
 msgid "Tail"
 msgstr "Coda"
 
-#: src/cmd_renameseq.c:382
+#: src/cmd_renameseq.c:354
 msgid "Guess"
 msgstr "Ipotesi"
 
-#: src/cmd_renameseq.c:396
+#: src/cmd_renameseq.c:369
 msgid "Sequential Rename"
 msgstr "Rinomina sequenziale"
 
-#: src/cmd_select.c:396
+#: src/cmd_select.c:365
 msgid "All rows|Selected|Unselected|"
 msgstr "Tutte le righe|Parte selezionata|Parte deselezionata|"
 
-#: src/cmd_select.c:397
+#: src/cmd_select.c:366
 msgid "All types|Directories only|Non-directories only|"
 msgstr "Tutti i tipi|Solo le directory|Solo non-directory|"
 
-#: src/cmd_select.c:398
+#: src/cmd_select.c:367
 msgid "Select|Unselect|Toggle|"
 msgstr "Seleziona|Deseleziona|Inverti"
 
-#: src/cmd_select.c:399 src/menus.c:530
+#: src/cmd_select.c:368 src/menus.c:537
 msgid "Action"
 msgstr "Azione"
 
-#: src/cmd_select.c:399
+#: src/cmd_select.c:368
 msgid "Set"
 msgstr "Serie"
 
-#: src/cmd_select.c:511
+#: src/cmd_select.c:469
 #, fuzzy
 msgid "Treat RE as Glob Pattern?"
 msgstr "Considera RE come un modello di glob?"
 
-#: src/cmd_select.c:514
+#: src/cmd_select.c:472
 msgid "Invert RE Matching?"
 msgstr "Inversione della corrispondenza?"
 
-#: src/cmd_select.c:517
+#: src/cmd_select.c:475
 msgid "Require Match on Full Name?"
 msgstr "Richiesta la corrispondenza sull'intero nome?"
 
-#: src/cmd_select.c:531
+#: src/cmd_select.c:489
 msgid "Select Using RE"
 msgstr "Selezione con RE"
 
-#: src/cmd_select.c:815
+#: src/cmd_select.c:727
 msgid ""
 "Enter shell command to run. The command\n"
 "will have the selected content appended.\n"
 "Action is performed on successful exit."
 msgstr ""
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 #, fuzzy
 msgid "OK|Cancel"
 msgstr "_OK|_Annulla"
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 #, fuzzy
 msgid "Select using shell command"
 msgstr "Selezionare comando"
 
-#: src/cmd_split.c:68
+#: src/cmd_split.c:269
 #, c-format
 msgid ""
 "Split \"%s\".\n"
@@ -1948,7 +1942,7 @@
 "Suddivisione di \"%s\".\n"
 "Il file è di %s (%s)."
 
-#: src/cmd_split.c:70
+#: src/cmd_split.c:271
 #, c-format
 msgid ""
 "Split \"%s\".\n"
@@ -1957,93 +1951,143 @@
 "Suddivisione di \"%s\".\n"
 "Il file è di %s."
 
-#: src/cmd_split.c:106
+#: src/cmd_split.c:348
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Split?"
 msgstr "\"%s\" esiste già. Continuare con la suddivisione?"
 
-#: src/cmd_split.c:171
-msgid "Beta Software"
-msgstr "Software in sviluppo"
+#: src/cmd_split.c:422
+msgid "Fixed Size Split"
+msgstr "Dimensione della suddivisione fissa"
+
+#: src/cmd_split.c:424
+msgid "Segment Size"
+msgstr "Dimensione segmento"
 
-#: src/cmd_split.c:171
-msgid "Next Version?"
-msgstr "Prossima versione?"
+#: src/cmd_split.c:427
+#, fuzzy
+msgid "1457000 bytes (3.5\" floppy)"
+msgstr "  1457000 byte (3.5\" floppy)"
 
-#: src/cmd_split.c:171
-msgid ""
-"This splitting mode has not been\n"
-"implemented yet... Sorry."
-msgstr ""
-"Questa modalità di suddivisione non\n"
-"è ancora stata implementata... Spiacenti."
+#: src/cmd_split.c:428
+#, fuzzy
+msgid "10485760 bytes (10 MB)"
+msgstr "  1457000 byte (3.5\" floppy)"
+
+#: src/cmd_split.c:429
+#, fuzzy
+msgid "26214400 bytes (25 MB)"
+msgstr "  1457000 byte (3.5\" floppy)"
+
+#: src/cmd_split.c:430
+#, fuzzy
+msgid "52428800 bytes (50 MB)"
+msgstr "  1457000 byte (3.5\" floppy)"
 
-#: src/cmd_split.c:187
-msgid "  1457000 bytes (3.5\" floppy)"
+#: src/cmd_split.c:431
+#, fuzzy
+msgid "78643200 bytes (75 MB)"
 msgstr "  1457000 byte (3.5\" floppy)"
 
-#: src/cmd_split.c:188
-msgid "100431360 bytes (Zip disk)"
+#: src/cmd_split.c:432
+#, fuzzy
+msgid "100431360 bytes (95 MB, Zip disk)"
 msgstr "100431360 byte (Disco Zip)"
 
-#: src/cmd_split.c:190
-msgid "Fixed Size Split"
+#: src/cmd_split.c:454
+#, fuzzy
+msgid "Fixed Count Split"
 msgstr "Dimensione della suddivisione fissa"
 
-#: src/cmd_split.c:193
-msgid "Segment Size"
+#: src/cmd_split.c:457
+#, fuzzy
+msgid "Segment Count"
 msgstr "Dimensione segmento"
 
-#: src/cmd_split.c:221
-msgid "Fixed size, variable number of parts"
-msgstr "Dimensione fissa, numero di parti variabile"
+#: src/cmd_split.c:503
+msgid "Current part number, unique for every created file"
+msgstr ""
+
+#: src/cmd_split.c:504
+msgid "The value from the Base box"
+msgstr ""
+
+#: src/cmd_split.c:505
+msgid "The amount that index will change for each file"
+msgstr ""
+
+#: src/cmd_split.c:506
+msgid "The total number of files that will be created"
+msgstr ""
+
+#: src/cmd_split.c:507
+msgid "The value of index for the last file to be created"
+msgstr ""
 
-#: src/cmd_split.c:222
+#: src/cmd_split.c:570
+msgid "Fixed size, variable number of parts"
+msgstr "Dimensione fissa, numero di parti variabile"
+
+#: src/cmd_split.c:571
 msgid "Fixed number of parts, variable sizes"
 msgstr "Numero di parti fisso, dimensioni variabili"
 
-#: src/cmd_split.c:230 src/cmd_split.c:261
+#: src/cmd_split.c:580 src/cmd_split.c:663
 msgid "Split"
 msgstr "Suddivisione"
 
-#: src/cmd_split.c:243
+#: src/cmd_split.c:599
 msgid "Name Format"
 msgstr "Formato del nome"
 
-#: src/cmd_split.c:252
+#: src/cmd_split.c:615
 msgid "Step"
 msgstr "Passo"
 
-#: src/cmd_symlink.c:77 src/cmd_symlink.c:246
+#: src/cmd_split.c:624
+msgid "Zero-Fill Numbers?"
+msgstr ""
+
+#: src/cmd_split.c:645
+msgid "Offset"
+msgstr ""
+
+#: src/cmd_symlink.c:68 src/cmd_symlink.c:252
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Link?"
 msgstr "\"%s\" esiste già. Continuare con il collegamento?"
 
-#: src/cmd_symlink.c:184
+#: src/cmd_symlink.c:161 src/configure.c:239 src/icon_dialog.c:59
+#: src/progress.c:220
+msgid "Cancel"
+msgstr "Annulla"
+
+#: src/cmd_symlink.c:161 src/configure.c:233 src/dialog.c:290
+#: src/nag_dialog.c:36
+msgid "OK"
+msgstr "OK"
+
+#: src/cmd_symlink.c:161
 msgid "Select Link Target"
 msgstr "Seleziona la destinazione del collegamento"
 
-#: src/cmd_symlink.c:213
+#: src/cmd_symlink.c:218
 msgid "Contents"
 msgstr "Contenuto"
 
-#: src/cmd_symlink.c:225
+#: src/cmd_symlink.c:231
 msgid "Edit Symbolic Link"
 msgstr "Modifica collegamento simbolico"
 
-#: src/cmd_symlink.c:231
+#: src/cmd_symlink.c:236
 msgid "Create Symbolic Link"
 msgstr "Crea collegamento simbolico"
 
-#: src/cmd_viewtext.c:206
-msgid "Use mmap() to Speed Loading?"
-msgstr "Uso di mmap() per velocizzare il caricamento?"
-
-#: src/cmd_viewtext.c:208
+#: src/cmd_viewtext.c:205
 msgid "Hex-Check First"
 msgstr "Controllo esadecimale per i primi"
 
-#: src/cmd_viewtext.c:209
+#: src/cmd_viewtext.c:206
 msgid "Exit on Left Arrow Key?"
 msgstr ""
 
@@ -2059,7 +2103,7 @@
 msgid "yes"
 msgstr "sì"
 
-#: src/cmdgrab.c:222
+#: src/cmdgrab.c:177
 #, c-format
 msgid "Output of %s (pid %d)"
 msgstr "Uscita di %s (pid %d)"
@@ -2073,17 +2117,17 @@
 "Impossibile eseguire il comando\n"
 "non riconosciuto \"%s\"."
 
-#: src/cmdseq_dialog.c:126
+#: src/cmdseq_dialog.c:134
 #, c-format
 msgid "Built-Ins (%u)"
 msgstr "Interni (%u)"
 
-#: src/cmdseq_dialog.c:131
+#: src/cmdseq_dialog.c:139
 #, c-format
 msgid "User Defined (%u)"
 msgstr "Utente (%u)"
 
-#: src/cmdseq_dialog.c:302
+#: src/cmdseq_dialog.c:313
 msgid ""
 "Select a command, or type start\n"
 "of name and press TAB."
@@ -2091,34 +2135,26 @@
 "Selezionare un comando, o digitare\n"
 "l'inizio del suo nome e premere TAB."
 
-#: src/cmdseq_dialog.c:319
+#: src/cmdseq_dialog.c:330
 msgid "Select Command"
 msgstr "Selezionare comando"
 
-#: src/configure.c:198
+#: src/configure.c:197
 msgid "Couldn't open configuration file for output"
 msgstr "Non si è potuto aprire il file di configurazione per scriverlo"
 
-#: src/configure.c:234 src/dialog.c:285
-msgid "OK"
-msgstr "OK"
-
-#: src/configure.c:240
+#: src/configure.c:236
 msgid "Save"
 msgstr "Salva"
 
-#: src/configure.c:244 src/icon_dialog.c:59 src/progress.c:219
-msgid "Cancel"
-msgstr "Annulla"
-
-#: src/configure.c:455
+#: src/configure.c:463
 #, c-format
 msgid "Config file version (%s) doesn't match program version (%s)"
 msgstr ""
 "La versione del file di configurazione (%s) non corrisponde con la versione "
 "del programma (%s)"
 
-#: src/configure.c:467
+#: src/configure.c:475
 #, c-format
 msgid ""
 "Couldn't find any configuration file; checked\n"
@@ -2129,57 +2165,43 @@
 "stato controllato in \"%s\" e in \"%s\".\n"
 "In uso la configurazione minima interna."
 
-#: src/dialog.c:123 src/dialog.c:253
+#: src/dialog.c:124 src/dialog.c:260
 msgid "_OK|_Cancel"
 msgstr "_OK|_Annulla"
 
-#: src/dirpane.c:134
-msgid ""
-"Case-sensitive sorting will not work correctly with non-ASCII characters"
-msgstr "L'ordinamento non funzionerà pienamente con caratteri non-ASCII"
-
-#: src/dirpane.c:143
-msgid ""
-"Case-insensitive sorting will not work correctly with non-ASCII characters"
-msgstr "L'ordinamento non funzionerà pienamente con caratteri non-ASCII"
-
-#: src/dirpane.c:1189
+#: src/dirpane.c:541
 #, c-format
 msgid "%u/%u dirs, %u/%u files"
 msgstr "%u/%u dir, %u/%u file"
 
-#: src/dirpane.c:1197
-#, fuzzy, c-format
-msgid " (%%s/%%s, %%%s/%%%s blocks)"
-msgstr " (%s/%s, %Lu/%Lu blocchi)"
+#: src/dirpane.c:546
+#, c-format
+msgid " (%s/%s)"
+msgstr ""
 
-#: src/dirpane.c:1210
+#: src/dirpane.c:557
 #, fuzzy, c-format
 msgid ", %s (%s) used"
 msgstr ", %s usati"
 
-#: src/dirpane.c:1212
+#: src/dirpane.c:559
 #, c-format
 msgid ", %s free"
 msgstr ", %s liberi"
 
-#: src/dirpane.c:1560
-msgid "!!Invalid filename!!"
-msgstr ""
-
-#: src/dirpane.c:2004 src/dirpane.c:2053
+#: src/dirpane.c:2084 src/dirpane.c:2131
 msgid "Move up to the parent directory"
 msgstr "Sale alla directory precedente"
 
-#: src/dirpane.c:2026
+#: src/dirpane.c:2106
 msgid "Enter path, then press Return to go there"
 msgstr "Inserire il percorso, quindi premere «Invio»"
 
-#: src/dirpane.c:2027
+#: src/dirpane.c:2107
 msgid "H"
 msgstr "N"
 
-#: src/dirpane.c:2031
+#: src/dirpane.c:2111
 msgid ""
 "Click to enable/disable Hide rule (When pressed in, the hide rule is active, "
 "and matching entries are hidden)"
@@ -2187,172 +2209,172 @@
 "Un clic abilita/disabilita le regole per il nascondimento dei file. Premuto, "
 "renderà effettive le regole e le voci che le seguono non saranno visibili."
 
-#: src/dpformat.c:37
+#: src/dpformat.c:38
 msgid "Blocks"
 msgstr "Blocchi"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "BSize"
 msgstr "Dim. Blocco"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "Block Size"
 msgstr "Grandezza blocco"
 
-#: src/dpformat.c:39
+#: src/dpformat.c:40
 msgid "Mode, numerical"
 msgstr "Permessi, formato numerico"
 
-#: src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode, string"
 msgstr "Permessi, formato testo"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Nlink"
 msgstr "N° colleg."
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Number of links"
 msgstr "Numero di collegamenti"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Owner ID"
 msgstr "ID proprietario"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Uid"
 msgstr "ID utente"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Owner Name"
 msgstr "Nome proprietario"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Uname"
 msgstr "Utente"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Gid"
 msgstr "ID gruppo"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Group ID"
 msgstr "ID gruppo"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Gname"
 msgstr "Gruppo"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Group Name"
 msgstr "Nome gruppo"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device Number"
 msgstr "Numero dispositivo"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "DevMaj"
 msgstr "DevMag"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "Device Number, major"
 msgstr "Numero dispositivo, maggiore"
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "DevMin"
 msgstr "DevMin"
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "Device Number, minor"
 msgstr "Numero dispositivo, minore"
 
-#: src/dpformat.c:49
-msgid "Date of last Access"
-msgstr "Data dell'ultimo accesso"
-
 #: src/dpformat.c:50
-msgid "Date of last Modification"
-msgstr "Data dell'ultima modifica"
+#, fuzzy
+msgid "Time of Last Access"
+msgstr "Data dell'ultimo accesso"
 
 #: src/dpformat.c:51
-msgid "Created"
-msgstr "Creato"
+#, fuzzy
+msgid "Time of Last Modification"
+msgstr "Data dell'ultima modifica"
 
-#: src/dpformat.c:51
-msgid "Date of Creation"
+#: src/dpformat.c:52
+#, fuzzy
+msgid "Time of Creation"
 msgstr "Data di creazione"
 
-#: src/dpformat.c:52
+#: src/dpformat.c:53
+msgid "Time of Last Change"
+msgstr ""
+
+#: src/dpformat.c:54
 msgid "Type Name"
 msgstr "Nome tipo"
 
-#: src/dpformat.c:53
+#: src/dpformat.c:55
 msgid "I"
 msgstr "I"
 
-#: src/dpformat.c:334
-msgid "B"
-msgstr "b"
-
-#: src/dpformat.c:338 src/sizeutil.c:32
-msgid "KB"
-msgstr "Kb"
-
-#: src/dpformat.c:343 src/sizeutil.c:33
-msgid "MB"
-msgstr "Mb"
+#: src/dpformat.c:56
+msgid "URI"
+msgstr ""
 
-#: src/dpformat.c:348 src/sizeutil.c:31
-msgid "GB"
-msgstr "Gb"
+#: src/dpformat.c:56
+msgid "URI (without file prefix)"
+msgstr ""
 
-#: src/errors.c:69
+#: src/errors.c:59
 #, c-format
 msgid "Couldn't %s \"%s\": %s (code %d)"
 msgstr "Non riuscito %s \"%s\": %s (codice %d)"
 
-#: src/errors.c:71
+#: src/errors.c:61
 #, c-format
 msgid "Couldn't %s \"%s\" (code %d)"
 msgstr "Non riuscito %s \"%s\" (codice %d)"
 
-#: src/errors.c:76
+#: src/errors.c:66
 #, c-format
 msgid "Couldn't %s \"%s\""
 msgstr "Non riuscito %s \"%s\""
 
-#: src/errors.c:78
+#: src/errors.c:68
 #, c-format
 msgid "Couldn't %s"
 msgstr "Non riuscito %s"
 
-#: src/gentoo.c:421
+#: src/errors.c:88
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: src/gentoo.c:427
 msgid "Report the version to standard output, and exit."
 msgstr "Indica la versione allo standard output, poi esce."
 
-#: src/gentoo.c:423
+#: src/gentoo.c:429
 #, fuzzy
 msgid "Report internal locale details, and exit."
 msgstr "Indica la versione allo standard output, poi esce."
 
-#: src/gentoo.c:425
+#: src/gentoo.c:431
 msgid "Allows gentoo to be run by the root user. Could be dangerous."
 msgstr ""
 "Consente a gentoo di essere eseguito dall'utente root. Può essere pericoloso."
 
-#: src/gentoo.c:426
+#: src/gentoo.c:432
 msgid ""
 "Do not load the ~/.gentoorc configuration file; instead, use default values."
 msgstr ""
 "Non carica ~/.gentoorc, il file di configurazione, per usare i valori "
 "predefiniti."
 
-#: src/gentoo.c:427
+#: src/gentoo.c:433
 msgid ""
 "Do not load the ~/.gentoogtkrc GTK+ configuration file; instead, use system "
 "defaults."
@@ -2360,82 +2382,80 @@
 "Non carica ~/.gentoogtkrc, file di configurazione GTK+, usa le impostazioni "
 "di sistema"
 
-#: src/gentoo.c:429
-msgid "Do not use FAM to automatically detect changes in viewed directories."
+#: src/gentoo.c:434
+#, fuzzy
+msgid ""
+"Run COMMAND, a gentoo command. Done before user interaction allowed, but "
+"after configuration file has been read in. Can be used many times to run "
+"several commands in sequence."
+msgstr ""
+"Esegue ARG come un comando di gentoo. Viene eseguito prima di lasciare "
+"l'interazione all'utente, ma dopo aver letto il file di configurazione. Può "
+"essere usato più volte per eseguire più comandi in sequenza."
+
+#: src/gentoo.c:435
+msgid "COMMAND"
 msgstr ""
-"Non impiega FAM per il rilevamento automatico dei cambiamenti nelle "
-"directory visualizzate."
 
-#: src/gentoo.c:431
+#: src/gentoo.c:436 src/gentoo.c:437
+msgid "DIR"
+msgstr ""
+
+#: src/gentoo.c:436
+#, fuzzy
 msgid ""
-"Use ARG as path for the left directory pane. Overrides default (and history)."
+"Use DIR as path for the left directory pane. Overrides default (and history)."
 msgstr ""
 "Usa ARG come percorso per il pannello sinistro. Non considererà altre "
 "impostazioni."
 
-#: src/gentoo.c:432
+#: src/gentoo.c:437
+#, fuzzy
 msgid ""
-"Use ARG as path for the right directory pane. Overrides default (and "
+"Use DIR as path for the right directory pane. Overrides default (and "
 "history)."
 msgstr ""
 "Usa ARG come percorso per il pannello destro. Non considererà altre "
 "impostazioni."
 
-#: src/gentoo.c:433
-msgid ""
-"Run ARG, a gentoo command. Done before user interaction allowed, but after "
-"configuration file has been read in. Can be used many times to run several "
-"commands in sequence."
+#: src/gentoo.c:461
+msgid "- a graphical file manager using GTK+"
 msgstr ""
-"Esegue ARG come un comando di gentoo. Viene eseguito prima di lasciare "
-"l'interazione all'utente, ma dopo aver letto il file di configurazione. Può "
-"essere usato più volte per eseguire più comandi in sequenza."
 
-#: src/gentoo.c:492
+#: src/gentoo.c:466
+#, c-format
+msgid "Failed to parse command line options: %s\n"
+msgstr ""
+
+#: src/gentoo.c:506
 #, c-format
 msgid "%s: To run as root, envoke with the '--root-ok' option\n"
 msgstr "%s: Per eseguire come root, richiamare con l'opzione '--root-ok'\n"
 
-#: src/gentoo.c:524
+#: src/gentoo.c:538
 msgid "Couldn't initialize userinfo module - username resolving won't work"
 msgstr ""
 "Non si è potuto inizializzare il modulo userinfo - la risoluzione del nome "
 "utente non funzionerà"
 
-#: src/gentoo.c:529
-msgid "Couldn't initialize mount data - automounting won't work"
-msgstr ""
-"Non si è potuto inizializzare i dati per mount - il montaggio automatico non "
-"funzionerà"
-
-#: src/gentoo.c:560
+#: src/gentoo.c:570
 #, c-format
 msgid "gentoo v%s by Emil Brink <emil@obsession.se>"
 msgstr "gentoo v%s di Emil Brink <emil@obsession.se>"
 
-#: src/gfam.c:216
-#, c-format
-msgid "FAM open failed, error %d--FAM will not be used"
-msgstr "Apertura di FAM fallita, errore %d--FAM non sarà usato"
-
-#: src/gfam.c:235
-#, fuzzy, c-format
-msgid ""
-"Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, perhaps)"
+#: src/gentoo.c:577
+msgid "Development Version Warning"
 msgstr ""
-"Non si è potuto aggiungere il monitor FAM su \"%s\", errore %s (riesegui con "
-"--no-fam per ovviare, forse"
 
-#: src/gfam.c:241
-#, fuzzy, c-format
+#: src/gentoo.c:577
 msgid ""
-"Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go around, "
-"perhaps)"
+"This version of gentoo is considered somewhat new and untested. There have "
+"been major changes to almost all parts of the program since the previous "
+"version. Please be a bit careful, and make sure you report any problem to "
+"the author. Thanks."
 msgstr ""
-"Non si è potuto aggiungere il monitor FAM su \"%s\", errore %s (riesegui con "
-"--no-fam per ovviare, forse"
 
-#: src/guiutil.c:118
+#: src/guiutil.c:124
 msgid "Progress"
 msgstr "Progressione"
 
@@ -2447,220 +2467,219 @@
 msgid "Loading Icon Graphics..."
 msgstr "Caricamento icone..."
 
-#: src/menus.c:278
+#: src/menus.c:284
 msgid "(No Selection)"
 msgstr "(Nessuna selezione)"
 
-#: src/menus.c:514
+#: src/menus.c:521
 msgid "RegExp..."
 msgstr "RegExp..."
 
-#: src/menus.c:526
+#: src/menus.c:533
 msgid "Other"
 msgstr "Opposto"
 
-#: src/menus.c:527
+#: src/menus.c:534
 msgid "Rescan"
 msgstr "Riesamina"
 
-#: src/menus.c:528
+#: src/menus.c:535
 msgid "Select"
 msgstr "Seleziona"
 
-#: src/menus.c:532
+#: src/menus.c:539
 msgid "Run..."
 msgstr "Esegui..."
 
-#: src/menus.c:534
+#: src/menus.c:541
 msgid "Configure..."
 msgstr "Configura..."
 
-#: src/menus.c:610
+#: src/menus.c:618
 msgid "Select Menu"
 msgstr "Selezione menù"
 
-#: src/mount.c:222
-#, c-format
-msgid "Execution of \"%s %s\" failed:\n"
-msgstr "Esecuzione di \"%s %s\" fallita:\n"
-
-#: src/mount.c:318
-#, c-format
-msgid "Mounting \"%s\" on \"%s\"..."
-msgstr "Montaggio di \"%s\" su \"%s\"..."
+#: src/nag_dialog.c:37
+msgid "_Don't show this dialog again"
+msgstr ""
 
 #: src/overwrite.c:49
 msgid "_OK|A_ll|_Skip|Skip _All|_Cancel"
 msgstr "_OK|_Tutti|_Salta|Salta t_utti|_Annulla"
 
-#: src/overwrite.c:73
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Old: %%%s bytes, changed on %%s,\n"
-"New: %%%s bytes, changed on %%s."
-msgstr ""
-"\n"
-"Vecchio: %Lu byte, cambiato il %s.\n"
-"Nuovo: %Lu byte, cambiato il %s."
-
-#: src/progress.c:195
+#: src/progress.c:196
 #, c-format
 msgid "Total (%s)"
 msgstr "Totale (%s)"
 
-#: src/progress.c:315
+#: src/progress.c:305
 #, c-format
 msgid "Elapsed %02d:%02d  Speed %s/s  ETA %02u:%02u"
 msgstr "Trascorso %02d:%02d  Velocità %s/s  ETA %02u:%02u"
 
-#: src/sizeutil.c:30
-msgid "BYTES"
-msgstr "BYTE"
+#: src/sizeutil.c:31
+#, fuzzy
+msgid "Unformatted Size"
+msgstr "Dimensione impaginata, in byte"
 
-#: src/sizeutil.c:69
-#, c-format
-msgid "%%%s"
-msgstr ""
+#: src/sizeutil.c:32
+#, fuzzy
+msgid "Formatted Size, Without Unit"
+msgstr "Dimensione impaginata, in unità variabili"
 
-#: src/sizeutil.c:70
-#, fuzzy, c-format
-msgid "%%%s bytes"
-msgstr "%Lu byte"
+#: src/sizeutil.c:33
+#, fuzzy
+msgid "Formatted Size, in Bytes"
+msgstr "Dimensione impaginata, in byte"
 
-#: src/sizeutil.c:71
-#, fuzzy, c-format
-msgid "%%%s KB"
-msgstr "%Lu Kb"
+#: src/sizeutil.c:33 src/sizeutil.c:159
+#, fuzzy
+msgid "bytes"
+msgstr "sì"
 
-#: src/sizeutil.c:72
-#, fuzzy, c-format
-msgid "%%%s MB"
-msgstr "%Lu Mb"
+#: src/sizeutil.c:34
+#, fuzzy
+msgid "Formatted Size, in Kilobytes"
+msgstr "Dimensione impaginata, in kilobyte"
 
-#: src/sizeutil.c:73
-#, fuzzy, c-format
-msgid "%%%s GB"
-msgstr "%Lu Gb"
+#: src/sizeutil.c:34 src/sizeutil.c:163
+msgid "KB"
+msgstr "Kb"
 
-#: src/sizeutil.c:164 src/sizeutil.c:211
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f Kb"
+#: src/sizeutil.c:35
+#, fuzzy
+msgid "Formatted Size, in Megabytes"
+msgstr "Dimensione impaginata, in megabyte"
 
-#: src/sizeutil.c:170 src/sizeutil.c:217
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f Mb"
+#: src/sizeutil.c:35 src/sizeutil.c:167
+msgid "MB"
+msgstr "Mb"
 
-#: src/sizeutil.c:176 src/sizeutil.c:223
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f Gb"
+#: src/sizeutil.c:36
+#, fuzzy
+msgid "Formatted Size, in Gigabytes"
+msgstr "Dimensione impaginata, in gigabyte"
+
+#: src/sizeutil.c:36 src/sizeutil.c:171
+msgid "GB"
+msgstr "Gb"
+
+#: src/sizeutil.c:37
+#, fuzzy
+msgid "Formatted Size, in Terabytes"
+msgstr "Dimensione impaginata, in megabyte"
+
+#: src/sizeutil.c:37 src/sizeutil.c:175
+#, fuzzy
+msgid "TB"
+msgstr "b"
+
+#: src/sizeutil.c:38
+#, fuzzy
+msgid "Formatted Size, Automatic Unit"
+msgstr "Dimensione impaginata, in unità variabili"
 
 #: src/style_dialog.c:40
 msgid "Select Style"
 msgstr "Selezione stile"
 
-#: src/styles.c:112
+#: src/styles.c:114
 msgid "Root"
 msgstr "Radice"
 
-#: src/styles.c:118 src/types.c:485 src/types.c:488
+#: src/styles.c:120 src/types.c:292 src/types.c:295
 msgid "Directory"
 msgstr "Directory"
 
-#: src/styles.c:961
+#: src/styles.c:889
 msgid "New Style"
 msgstr "Nuovo stile"
 
-#: src/styles.c:961
+#: src/styles.c:889
 #, c-format
 msgid "New Style %u"
 msgstr "Nuovo stile %u"
 
-#: src/textview.c:152
+#: src/textview.c:190
 #, c-format
-msgid "Unable to convert text from native character set (%s) to UTF-8: %s"
+msgid ""
+"\n"
+"** Text conversion from charset '%s' failed, aborting."
 msgstr ""
 
-#: src/textview.c:252 src/textview.c:353
-msgid "File reading"
-msgstr "Lettura file"
-
-#: src/textview.c:419
+#: src/textview.c:405
 #, c-format
 msgid "Line %d (%.0f%%)"
 msgstr "Linea %d (%.0f%%)"
 
-#: src/textview.c:472
+#: src/textview.c:455
 msgid "Enter Line Number or Percentage:"
 msgstr "Inserire numero di linea o percentuale:"
 
-#: src/textview.c:478
+#: src/textview.c:461
 msgid "Goto"
 msgstr "Vai a"
 
-#: src/textview.c:613
+#: src/textview.c:596
 msgid "Enter Text to Search For (RE)"
 msgstr "Inserire il testo da cercare (RE)"
 
-#: src/textview.c:623
+#: src/textview.c:607
 msgid "Don't Span Newlines?"
 msgstr "Non estendersi sulle linee?"
 
-#: src/textview.c:629
+#: src/textview.c:613
 msgid "Search"
 msgstr "Cerca"
 
-#: src/types.c:454
+#: src/types.c:287
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#: src/types.c:572
 #, c-format
 msgid ""
 "Got SIGPIPE when writing to 'file' process (%s), it seems to have terminated "
 "prematurely."
 msgstr ""
 
-#: src/types.c:461
+#: src/types.c:578
 msgid "Unable to run spawn 'file' command: "
 msgstr ""
 
-#: src/types.c:480
-msgid "Unknown"
-msgstr "Sconosciuto"
-
-#: src/window.c:82
+#: src/window.c:83
 msgid "Configure gentoo"
 msgstr "Configurazione gentoo"
 
-#: src/window.c:89
+#: src/window.c:90
 msgid "Text Viewer"
 msgstr "Visualizzatore testo"
 
-#: src/window.c:200
+#: src/window.c:199
 msgid "Position"
 msgstr "Posizione"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Height"
 msgstr "Altezza"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "X"
 msgstr "X"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Y"
 msgstr "Y"
 
-#: src/window.c:208
+#: src/window.c:207
 msgid "Set on Open?"
 msgstr "Impostare all'apertura?"
 
-#: src/window.c:214
+#: src/window.c:213
 msgid "Update on Close?"
 msgstr "Aggiornare alla chiusura?"
 
-#: src/window.c:245
+#: src/window.c:244
 msgid "Grab"
 msgstr "Preleva"
 
@@ -2669,6 +2688,221 @@
 msgstr ""
 "Il modulo XML ha emesso un numero reale dipendente dalla localizzazione"
 
+#~ msgid "Use Dialog to Report Errors?"
+#~ msgstr "Finestre di dialogo per la segnalazione di errori?"
+
+#~ msgid "Path Right Click"
+#~ msgstr "Clic con il pulsante destro sul percorso"
+
+#~ msgid "Raw Size, in Bytes"
+#~ msgstr "Dimensione non impaginata, in byte"
+
+#~ msgid "Always Set"
+#~ msgstr "Sempre impostato"
+
+#~ msgid "Modify 'Control' Key State"
+#~ msgstr "Altera lo stato del tasto «Control»"
+
+#~ msgid "Active Pane Titles"
+#~ msgstr "Titolo del pannello quando attivo"
+
+#~ msgid "Focused Row, Unselected"
+#~ msgstr "Riga con focus, non selezionata"
+
+#~ msgid "Focused Row, Selected"
+#~ msgstr "Riga con focus, selezionata"
+
+#~ msgid "Beta Software"
+#~ msgstr "Software in sviluppo"
+
+#~ msgid "Next Version?"
+#~ msgstr "Prossima versione?"
+
+#~ msgid ""
+#~ "This splitting mode has not been\n"
+#~ "implemented yet... Sorry."
+#~ msgstr ""
+#~ "Questa modalità di suddivisione non\n"
+#~ "è ancora stata implementata... Spiacenti."
+
+#~ msgid ""
+#~ "Case-sensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr "L'ordinamento non funzionerà pienamente con caratteri non-ASCII"
+
+#~ msgid ""
+#~ "Case-insensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr "L'ordinamento non funzionerà pienamente con caratteri non-ASCII"
+
+#~ msgid "BYTES"
+#~ msgstr "BYTE"
+
+#, fuzzy
+#~ msgid "%%%s bytes"
+#~ msgstr "%Lu byte"
+
+#, fuzzy
+#~ msgid "%%%s KB"
+#~ msgstr "%Lu Kb"
+
+#, fuzzy
+#~ msgid "%%%s MB"
+#~ msgstr "%Lu Mb"
+
+#, fuzzy
+#~ msgid "%%%s GB"
+#~ msgstr "%Lu Gb"
+
+#~ msgid "%.2f KB"
+#~ msgstr "%.2f Kb"
+
+#~ msgid "%.2f MB"
+#~ msgstr "%.2f Mb"
+
+#~ msgid "%.2f GB"
+#~ msgstr "%.2f Gb"
+
+#~ msgid "Numerical Mode?"
+#~ msgstr "Stile numerico?"
+
+#~ msgid "Never"
+#~ msgstr "Mai"
+
+#~ msgid "On Every Access"
+#~ msgstr "Su ogni accesso"
+
+#~ msgid "Mounting"
+#~ msgstr "Montaggio"
+
+#~ msgid "Mount When?"
+#~ msgstr "Quando montare?"
+
+#~ msgid "Mount Options"
+#~ msgstr "Opzioni per montare"
+
+#~ msgid "Mount Command"
+#~ msgstr "Per montare, comando "
+
+#~ msgid "Unmount Command"
+#~ msgstr "Per smontare, comando "
+
+#~ msgid "Only Mount on Toplevel Directories?"
+#~ msgstr "Monta soltanto in directory vuote?"
+
+#~ msgid "Use Command Error Dialog?"
+#~ msgstr "Finestra di dialogo per gli errori?"
+
+#~ msgid "Unmount When gentoo Quits?"
+#~ msgstr "Smonta quando gentoo termina?"
+
+#~ msgid "FAM: Supported and active."
+#~ msgstr "FAM: Disponibile e attivo."
+
+#~ msgid "FAM: Supported, but not active."
+#~ msgstr "FAM: Disponibile, ma non attivo."
+
+#~ msgid "FAM: Not supported."
+#~ msgstr "FAM: Non disponibile"
+
+#~ msgid ""
+#~ "Can't copy directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "Non si può copiare la directory \"%s\"\n"
+#~ "in \"%s\":\n"
+#~ "la sorgente contiene la destinazione."
+
+#~ msgid "Wrap Around At Top And Bottom?"
+#~ msgstr ""
+#~ "In cima e in fondo all'elenco, consentire il movimento all'altra "
+#~ "estremità?"
+
+#~ msgid ""
+#~ "%s (%s bytes,\n"
+#~ "%s blocks)"
+#~ msgstr ""
+#~ "%s (%s byte,\n"
+#~ "%s blocchi)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "Non si può copiare la directory \"%s\"\n"
+#~ "in \"%s\":\n"
+#~ "la sorgente contiene la destinazione."
+
+#, fuzzy
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the destination contains the source."
+#~ msgstr ""
+#~ "Non si può copiare la directory \"%s\"\n"
+#~ "in \"%s\":\n"
+#~ "la sorgente contiene la destinazione."
+
+#~ msgid "Regular expression error:\n"
+#~ msgstr "Errore nell'espressione regolare:\n"
+
+#~ msgid "Use mmap() to Speed Loading?"
+#~ msgstr "Uso di mmap() per velocizzare il caricamento?"
+
+#, fuzzy
+#~ msgid " (%%s/%%s, %%%s/%%%s blocks)"
+#~ msgstr " (%s/%s, %Lu/%Lu blocchi)"
+
+#~ msgid ""
+#~ "Do not use FAM to automatically detect changes in viewed directories."
+#~ msgstr ""
+#~ "Non impiega FAM per il rilevamento automatico dei cambiamenti nelle "
+#~ "directory visualizzate."
+
+#~ msgid "Couldn't initialize mount data - automounting won't work"
+#~ msgstr ""
+#~ "Non si è potuto inizializzare i dati per mount - il montaggio automatico "
+#~ "non funzionerà"
+
+#~ msgid "FAM open failed, error %d--FAM will not be used"
+#~ msgstr "Apertura di FAM fallita, errore %d--FAM non sarà usato"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, "
+#~ "perhaps)"
+#~ msgstr ""
+#~ "Non si è potuto aggiungere il monitor FAM su \"%s\", errore %s (riesegui "
+#~ "con --no-fam per ovviare, forse"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go "
+#~ "around, perhaps)"
+#~ msgstr ""
+#~ "Non si è potuto aggiungere il monitor FAM su \"%s\", errore %s (riesegui "
+#~ "con --no-fam per ovviare, forse"
+
+#~ msgid "Execution of \"%s %s\" failed:\n"
+#~ msgstr "Esecuzione di \"%s %s\" fallita:\n"
+
+#~ msgid "Mounting \"%s\" on \"%s\"..."
+#~ msgstr "Montaggio di \"%s\" su \"%s\"..."
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Old: %%%s bytes, changed on %%s,\n"
+#~ "New: %%%s bytes, changed on %%s."
+#~ msgstr ""
+#~ "\n"
+#~ "Vecchio: %Lu byte, cambiato il %s.\n"
+#~ "Nuovo: %Lu byte, cambiato il %s."
+
+#~ msgid "File reading"
+#~ msgstr "Lettura file"
+
 #, fuzzy
 #~ msgid "Pick Command ..."
 #~ msgstr "Selezione codice"

gentoo-0.15.6.tar.bz2/po/ja_JP.UTF-8.gmo -> gentoo-0.19.9.tar.gz/po/ja_JP.UTF-8.gmo Changed

gentoo-0.15.6.tar.bz2/po/ja_JP.UTF-8.po -> gentoo-0.19.9.tar.gz/po/ja_JP.UTF-8.po Changed

@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: gentoo 0.11.50\n"
 "Report-Msgid-Bugs-To: Emil Brink\n"
-"POT-Creation-Date: 2009-07-11 19:05+0200\n"
+"POT-Creation-Date: 2011-01-26 21:54+0100\n"
 "PO-Revision-Date: 2004-12-23 20:09+0900\n"
 "Last-Translator: Tadashi Jokagi <elf@elf.no-ip.org>\n"
 "Language-Team: Japanese <LL@li.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -73,7 +74,7 @@
 msgid "Set Row Width"
 msgstr ""
 
-#: src/cfg_buttons.c:326 src/cfg_buttons.c:749
+#: src/cfg_buttons.c:326 src/cfg_buttons.c:748
 msgid "Default"
 msgstr "デフォルト"
 
@@ -85,7 +86,7 @@
 msgid "Really delete current button row?"
 msgstr ""
 
-#: src/cfg_buttons.c:439 src/cfg_styles.c:671
+#: src/cfg_buttons.c:439 src/cfg_styles.c:680
 msgid "_Delete|_Cancel"
 msgstr "削除(_D)|取り消し(_D)"
 
@@ -109,104 +110,104 @@
 msgid "Label"
 msgstr "ラベル"
 
-#: src/cfg_buttons.c:685 src/cfg_controls.c:645 src/cfg_controls.c:696
-#: src/cfg_controls.c:718 src/cfg_controls.c:739
+#: src/cfg_buttons.c:686 src/cfg_controls.c:612 src/cfg_controls.c:663
+#: src/cfg_controls.c:685
 msgid "Command"
 msgstr "コマンド"
 
-#: src/cfg_buttons.c:696 src/cfg_controls.c:639
+#: src/cfg_buttons.c:697 src/cfg_controls.c:606
 msgid "Key"
 msgstr "キー"
 
-#: src/cfg_buttons.c:711 src/cfg_dirpane.c:1373
+#: src/cfg_buttons.c:712
 msgid "Colors"
 msgstr "色"
 
-#: src/cfg_buttons.c:715
+#: src/cfg_buttons.c:716
 msgid "Background..."
 msgstr "背景色..."
 
-#: src/cfg_buttons.c:716 src/cfg_buttons.c:722
+#: src/cfg_buttons.c:717 src/cfg_buttons.c:723
 msgid "Reset to Default"
 msgstr "デフォルトにリセット"
 
-#: src/cfg_buttons.c:721
+#: src/cfg_buttons.c:722
 msgid "Foreground..."
 msgstr "前面色..."
 
-#: src/cfg_buttons.c:749
+#: src/cfg_buttons.c:748
 msgid "Shortcuts"
 msgstr "ショートカット"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Clear"
 msgstr "消去"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy Colors To"
 msgstr ""
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy To"
 msgstr ""
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Swap With"
 msgstr ""
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Add Row..."
 msgstr ""
 
-#: src/cfg_buttons.c:751 src/cfg_cmdseq.c:951
+#: src/cfg_buttons.c:750 src/cfg_cmdseq.c:966
 msgid "Delete Row"
 msgstr ""
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Down"
 msgstr ""
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Row Width..."
 msgstr ""
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Up"
 msgstr ""
 
-#: src/cfg_buttons.c:762
+#: src/cfg_buttons.c:761
 msgid "Sheet"
 msgstr "シート"
 
-#: src/cfg_buttons.c:778
+#: src/cfg_buttons.c:775
 msgid "Primary"
 msgstr ""
 
-#: src/cfg_buttons.c:780
+#: src/cfg_buttons.c:777
 msgid "Secondary"
 msgstr ""
 
-#: src/cfg_buttons.c:785
+#: src/cfg_buttons.c:782
 msgid "Tooltip"
 msgstr "ツールチップ"
 
-#: src/cfg_buttons.c:792 src/cfg_dirpane.c:1145
+#: src/cfg_buttons.c:790 src/cfg_dirpane.c:1107
 msgid "Flags"
 msgstr "フラグ"
 
-#: src/cfg_buttons.c:794
+#: src/cfg_buttons.c:792
 msgid "Narrow?"
 msgstr ""
 
-#: src/cfg_buttons.c:798
+#: src/cfg_buttons.c:796
 msgid "Show Tooltip?"
 msgstr ""
 
-#: src/cfg_buttons.c:833
+#: src/cfg_buttons.c:831
 msgid "Buttons"
 msgstr "ボタン"
 
-#: src/cfg_buttons.c:834 src/cfg_cmdseq.c:1067
+#: src/cfg_buttons.c:832 src/cfg_cmdseq.c:1081
 msgid "Definitions"
 msgstr ""
 
@@ -214,307 +215,337 @@
 msgid "Options"
 msgstr "オプション"
 
-#: src/cfg_cmdseq.c:610
+#: src/cfg_cmdseq.c:611
 msgid "Select Builtin"
 msgstr ""
 
-#: src/cfg_cmdseq.c:626
+#: src/cfg_cmdseq.c:627
 msgid "Opening brace"
 msgstr ""
 
-#: src/cfg_cmdseq.c:627
+#: src/cfg_cmdseq.c:628
 msgid "Closing brace"
 msgstr ""
 
-#: src/cfg_cmdseq.c:628
+#: src/cfg_cmdseq.c:629
 msgid "First selected"
 msgstr ""
 
-#: src/cfg_cmdseq.c:629
+#: src/cfg_cmdseq.c:630
 msgid "First selected, unselect"
 msgstr ""
 
-#: src/cfg_cmdseq.c:630
+#: src/cfg_cmdseq.c:631
 msgid "First selected, with path"
 msgstr ""
 
-#: src/cfg_cmdseq.c:631
+#: src/cfg_cmdseq.c:632
 msgid "First selected, with path, unselect"
 msgstr ""
 
-#: src/cfg_cmdseq.c:632
+#: src/cfg_cmdseq.c:633
 msgid "First selected (destination pane)"
 msgstr ""
 
-#: src/cfg_cmdseq.c:633
+#: src/cfg_cmdseq.c:634
 msgid "First selected, no quotes"
 msgstr ""
 
-#: src/cfg_cmdseq.c:634
+#: src/cfg_cmdseq.c:635
 msgid "All selected"
 msgstr ""
 
-#: src/cfg_cmdseq.c:635
+#: src/cfg_cmdseq.c:636
 msgid "All selected, unselect"
 msgstr ""
 
-#: src/cfg_cmdseq.c:636
+#: src/cfg_cmdseq.c:637
 msgid "All selected, with paths"
 msgstr ""
 
-#: src/cfg_cmdseq.c:637
+#: src/cfg_cmdseq.c:638
 msgid "All selected, with paths, unselect"
 msgstr ""
 
-#: src/cfg_cmdseq.c:638
+#: src/cfg_cmdseq.c:639
 msgid "All selected (destination pane)"
 msgstr ""
 
-#: src/cfg_cmdseq.c:639
+#: src/cfg_cmdseq.c:640
 msgid "All selected, no quotes"
 msgstr ""
 
-#: src/cfg_cmdseq.c:640
+#: src/cfg_cmdseq.c:641
 msgid "Path to source pane's directory"
 msgstr ""
 
-#: src/cfg_cmdseq.c:641
+#: src/cfg_cmdseq.c:642
 msgid "Path to destination pane's directory"
 msgstr ""
 
-#: src/cfg_cmdseq.c:642
+#: src/cfg_cmdseq.c:643
 msgid "Path to home directory"
 msgstr ""
 
-#: src/cfg_cmdseq.c:643
+#: src/cfg_cmdseq.c:644
 msgid "Path of left pane"
 msgstr "左パネルのパス"
 
-#: src/cfg_cmdseq.c:644
+#: src/cfg_cmdseq.c:645
 msgid "Path of right pane"
 msgstr "右パネルのパス"
 
-#: src/cfg_cmdseq.c:645
+#: src/cfg_cmdseq.c:646
+msgid "URI of first selected"
+msgstr ""
+
+#: src/cfg_cmdseq.c:647
+msgid "URI of first selected, unselect"
+msgstr ""
+
+#: src/cfg_cmdseq.c:648
+msgid "URI of first selected, no quotes"
+msgstr ""
+
+#: src/cfg_cmdseq.c:649
+msgid "URIs of all selected"
+msgstr ""
+
+#: src/cfg_cmdseq.c:650
+#, fuzzy
+msgid "URIs of all selected, unselect"
+msgstr "すべての行|選択済み|未選択|"
+
+#: src/cfg_cmdseq.c:651
+msgid "URIs of all selected, no quotes"
+msgstr ""
+
+#: src/cfg_cmdseq.c:652
+msgid "URIs of all selected, unselect, no quotes"
+msgstr ""
+
+#: src/cfg_cmdseq.c:653
+msgid "URI of first selected (destination pane)"
+msgstr ""
+
+#: src/cfg_cmdseq.c:654
 msgid "Input combo box"
 msgstr "入力コンボボックス"
 
-#: src/cfg_cmdseq.c:646
+#: src/cfg_cmdseq.c:655
 msgid "Input using menu"
 msgstr ""
 
-#: src/cfg_cmdseq.c:647
+#: src/cfg_cmdseq.c:656
 msgid "Input string"
 msgstr "文字列入力"
 
-#: src/cfg_cmdseq.c:648
+#: src/cfg_cmdseq.c:657
 msgid "Input check button (gives TRUE or FALSE)"
 msgstr ""
 
-#: src/cfg_cmdseq.c:649
+#: src/cfg_cmdseq.c:658
 msgid "Add label to input window"
 msgstr ""
 
-#: src/cfg_cmdseq.c:650
+#: src/cfg_cmdseq.c:659
 msgid "Add a separator bar to input window"
 msgstr ""
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "$NAME"
 msgstr ""
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "Value of $NAME (environment)"
 msgstr ""
 
-#: src/cfg_cmdseq.c:652
+#: src/cfg_cmdseq.c:661
 msgid "gentoo's PID"
 msgstr ""
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "Home directory for user NAME"
 msgstr ""
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "~NAME"
 msgstr ""
 
-#: src/cfg_cmdseq.c:677
+#: src/cfg_cmdseq.c:686 src/cmd_split.c:536
 msgid "Pick Code"
 msgstr ""
 
-#: src/cfg_cmdseq.c:765
+#: src/cfg_cmdseq.c:778
 msgid "(No Options Available)"
 msgstr ""
 
-#: src/cfg_cmdseq.c:801
+#: src/cfg_cmdseq.c:814
 msgid "Run in Background?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:805
+#: src/cfg_cmdseq.c:818
 msgid "Kill Previous Instance?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:809
+#: src/cfg_cmdseq.c:822
 msgid "Survive Quit?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:815
+#: src/cfg_cmdseq.c:828
 msgid "Capture Output?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:900
+#: src/cfg_cmdseq.c:913
 msgid "Before Execution"
 msgstr ""
 
-#: src/cfg_cmdseq.c:903
+#: src/cfg_cmdseq.c:916
 msgid "Require Source Selection?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:907
+#: src/cfg_cmdseq.c:920
 msgid "Require Destination Selection?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:912
+#: src/cfg_cmdseq.c:926
 msgid "CD Source?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:915
+#: src/cfg_cmdseq.c:929
 msgid "CD Destination?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:922
+#: src/cfg_cmdseq.c:937
 msgid "After Execution"
 msgstr ""
 
-#: src/cfg_cmdseq.c:924
+#: src/cfg_cmdseq.c:939
 msgid "Rescan Source?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:928
+#: src/cfg_cmdseq.c:943
 msgid "Rescan Destination?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:942
+#: src/cfg_cmdseq.c:957
 msgid "General"
 msgstr "一般"
 
-#: src/cfg_cmdseq.c:945
+#: src/cfg_cmdseq.c:960
 msgid "Before&After"
 msgstr ""
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "Built-In"
 msgstr "組み込み"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "External"
 msgstr ""
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Add Row"
 msgstr ""
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Duplicate"
 msgstr "複製"
 
-#: src/cfg_cmdseq.c:978 src/cfg_styles.c:588 src/cfg_styles.c:805
-#: src/cfg_types.c:679 src/cmd_symlink.c:209 src/dpformat.c:35
+#: src/cfg_cmdseq.c:993 src/cfg_styles.c:596 src/cfg_styles.c:823
+#: src/cfg_types.c:678 src/cmd_info.c:151 src/cmd_split.c:648
+#: src/cmd_symlink.c:213 src/dpformat.c:36
 msgid "Name"
 msgstr "名前"
 
-#: src/cfg_cmdseq.c:988
+#: src/cfg_cmdseq.c:1004
 msgid "Definition"
 msgstr ""
 
-#: src/cfg_cmdseq.c:1044
+#: src/cfg_cmdseq.c:1058
 msgid "Repeat Sequence Until No Source Selection?"
 msgstr ""
 
-#: src/cfg_cmdseq.c:1056 src/cfg_controls.c:655 src/cfg_controls.c:706
-#: src/cfg_styles.c:833 src/cfg_types.c:775
+#: src/cfg_cmdseq.c:1070 src/cfg_controls.c:622 src/cfg_controls.c:673
+#: src/cfg_styles.c:853 src/cfg_types.c:776
 msgid "Add"
 msgstr "追加"
 
-#: src/cfg_cmdseq.c:1059 src/cfg_controls.c:658 src/cfg_controls.c:709
-#: src/cfg_styles.c:836 src/cfg_types.c:788
+#: src/cfg_cmdseq.c:1073 src/cfg_controls.c:625 src/cfg_controls.c:676
+#: src/cfg_styles.c:856 src/cfg_types.c:789
 msgid "Delete"
 msgstr "削除"
 
-#: src/cfg_cmdseq.c:1066
+#: src/cfg_cmdseq.c:1080
 msgid "Commands"
 msgstr "コマンド"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1365 src/cfg_dirpane.c:1371
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1288 src/cfg_dirpane.c:1293
 msgid "Left"
 msgstr "左"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Middle"
 msgstr "中央"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1364 src/cfg_dirpane.c:1372
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1287 src/cfg_dirpane.c:1294
 msgid "Right"
 msgstr "右"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Down"
 msgstr "ホイールダウン"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Up"
 msgstr "ホイールアップ"
 
-#: src/cfg_controls.c:382
+#: src/cfg_controls.c:378
 msgid ""
 "The following modifier key(s) must\n"
 "be held down when the mouse button\n"
 "is clicked to trigger the command"
 msgstr ""
 
-#: src/cfg_controls.c:395
+#: src/cfg_controls.c:391
 msgid "Edit Modifiers"
 msgstr ""
 
-#: src/cfg_controls.c:613
+#: src/cfg_controls.c:580
 msgid "Controls"
 msgstr ""
 
-#: src/cfg_controls.c:620
+#: src/cfg_controls.c:587
 msgid "Global Keyboard Shortcuts"
 msgstr "一般キーボードショートカット"
 
-#: src/cfg_controls.c:665
+#: src/cfg_controls.c:632
 msgid "Dirpane Mouse Buttons"
 msgstr ""
 
-#: src/cfg_controls.c:690
+#: src/cfg_controls.c:657
 msgid "Button"
 msgstr "ボタン"
 
-#: src/cfg_controls.c:693
+#: src/cfg_controls.c:660
 msgid "Edit Modifiers..."
 msgstr ""
 
-#: src/cfg_controls.c:716
+#: src/cfg_controls.c:683
 msgid "Click-M-Click Gesture"
 msgstr ""
 
-#: src/cfg_controls.c:726
+#: src/cfg_controls.c:693
 msgid "Time Limit"
 msgstr "時間制限"
 
-#: src/cfg_controls.c:737
-msgid "Path Right Click"
-msgstr ""
-
-#: src/cfg_controls.c:750
+#: src/cfg_controls.c:704
 msgid "Ignore Num Lock For All Bindings?"
 msgstr ""
 
-#: src/cfg_controls.c:780
+#: src/cfg_controls.c:734
 msgid ""
 "Note: The mouse button control settings\n"
 "are ambiguous: the same button+modifier\n"
@@ -522,562 +553,528 @@
 "might make their behaviour pretty weird..."
 msgstr ""
 
-#: src/cfg_controls.c:784
+#: src/cfg_controls.c:738
 msgid "Warning"
 msgstr "警告"
 
-#: src/cfg_controls.c:784 src/children.c:95 src/cmd_info.c:246
+#: src/cfg_controls.c:738 src/children.c:89 src/cmd_info.c:320
 msgid "_OK"
 msgstr "_OK"
 
-#: src/cfg_dirpane.c:365
-msgid "Formatted Size, in bytes"
-msgstr ""
-
-#: src/cfg_dirpane.c:365
-msgid "Raw Size, in Bytes"
-msgstr ""
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in kilobytes"
-msgstr ""
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in megabytes"
-msgstr ""
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, \"Smart\" Unit"
-msgstr ""
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, in gigabytes"
-msgstr ""
-
-#: src/cfg_dirpane.c:383
+#: src/cfg_dirpane.c:333
 msgid "Append Type Character?"
 msgstr ""
 
-#: src/cfg_dirpane.c:386
-msgid "Append \"-> destination\" on Links?"
+#: src/cfg_dirpane.c:336
+msgid "Append \"→ destination\" on Links?"
 msgstr ""
 
-#: src/cfg_dirpane.c:406
+#: src/cfg_dirpane.c:358
 msgid "Place Tick Every 3 Digits?"
 msgstr ""
 
-#: src/cfg_dirpane.c:416
+#: src/cfg_dirpane.c:369
 msgid "Digits of Precision"
 msgstr ""
 
-#: src/cfg_dirpane.c:429
+#: src/cfg_dirpane.c:382
 msgid "Show Dir's File System Size?"
 msgstr ""
 
-#: src/cfg_dirpane.c:435 src/cfg_dirpane.c:439 src/cfg_dirpane.c:443
-#: src/cfg_dirpane.c:447 src/cfg_dirpane.c:451 src/cfg_dirpane.c:455
-#: src/cfg_dirpane.c:459 src/cfg_dirpane.c:463 src/cfg_dirpane.c:467
-#: src/cfg_dirpane.c:474
+#: src/cfg_dirpane.c:388 src/cfg_dirpane.c:392 src/cfg_dirpane.c:396
+#: src/cfg_dirpane.c:400 src/cfg_dirpane.c:404 src/cfg_dirpane.c:408
+#: src/cfg_dirpane.c:412 src/cfg_dirpane.c:416 src/cfg_dirpane.c:420
+#: src/cfg_dirpane.c:428
 msgid "Format"
 msgstr ""
 
-#: src/cfg_dirpane.c:497
+#: src/cfg_dirpane.c:454
 #, c-format
 msgid "%s Settings"
 msgstr "%s 設定"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1002 src/cfg_dirpane.c:1003
-#: src/cmd_select.c:414
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:970 src/cfg_dirpane.c:971
+#: src/cmd_select.c:381
 msgid "Content"
 msgstr ""
 
-#: src/cfg_dirpane.c:611
+#: src/cfg_dirpane.c:571
 msgid "Justification"
 msgstr ""
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1003
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:971
 msgid "Title"
 msgstr "タイトル"
 
-#: src/cfg_dirpane.c:611 src/window.c:201
+#: src/cfg_dirpane.c:571 src/window.c:200
 msgid "Width"
 msgstr "幅"
 
-#: src/cfg_dirpane.c:612
+#: src/cfg_dirpane.c:572
 msgid "Center"
 msgstr "中央"
 
-#: src/cfg_dirpane.c:621
+#: src/cfg_dirpane.c:581
 msgid "Basic Settings"
 msgstr "基本設定"
 
-#: src/cfg_dirpane.c:669
+#: src/cfg_dirpane.c:628
 msgid "Edit Column Content"
 msgstr ""
 
-#: src/cfg_dirpane.c:1002
+#: src/cfg_dirpane.c:970
 msgid "Default Title"
 msgstr "デフォルトタイトル"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories First"
 msgstr ""
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Last"
 msgstr ""
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Mixed"
 msgstr ""
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Left of List"
 msgstr "一覧の左"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Right of List"
 msgstr "位置らのの右"
 
-#: src/cfg_dirpane.c:1029 src/cfg_dirpane.c:1030
+#: src/cfg_dirpane.c:997
 msgid "System Default"
 msgstr "システムデフォルト"
 
-#: src/cfg_dirpane.c:1030
-msgid "Always Set"
-msgstr "常に設定"
-
-#: src/cfg_dirpane.c:1030 src/cmd_chmod.c:260 src/menus.c:513
-msgid "Toggle"
-msgstr "トグル"
-
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy From %s"
 msgstr "%s からコピー"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy To %s"
 msgstr "%s へコピー"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Swap With %s"
 msgstr "%s と入れ替え"
 
-#: src/cfg_dirpane.c:1048
+#: src/cfg_dirpane.c:1015
 msgid "Columns"
 msgstr ""
 
-#: src/cfg_dirpane.c:1053
+#: src/cfg_dirpane.c:1020
 msgid "Available Content Types"
 msgstr "利用可能なコンテントタイプ"
 
-#: src/cfg_dirpane.c:1070
+#: src/cfg_dirpane.c:1037
 msgid "Selected Content Types"
 msgstr ""
 
-#: src/cfg_dirpane.c:1081 src/cfg_styles.c:723
+#: src/cfg_dirpane.c:1049 src/cfg_styles.c:741
 msgid "Edit..."
 msgstr "編集..."
 
-#: src/cfg_dirpane.c:1082 src/cmd_renamere.c:508
+#: src/cfg_dirpane.c:1050 src/cmd_renamere.c:481
 msgid "Remove"
 msgstr "削除"
 
-#: src/cfg_dirpane.c:1096
+#: src/cfg_dirpane.c:1064
 msgid "Sorting"
 msgstr ""
 
-#: src/cfg_dirpane.c:1099
+#: src/cfg_dirpane.c:1067
 msgid "Sort On"
 msgstr ""
 
-#: src/cfg_dirpane.c:1106 src/cmd_split.c:233 src/dpformat.c:39
-#: src/dpformat.c:40
+#: src/cfg_dirpane.c:1071 src/cmd_split.c:590 src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode"
 msgstr "モード"
 
-#: src/cfg_dirpane.c:1113
+#: src/cfg_dirpane.c:1077
 msgid "Inverse Sorting?"
 msgstr "逆ソートしますか?"
 
-#: src/cfg_dirpane.c:1116 src/cfg_paths.c:187 src/cfg_types.c:743
-#: src/cmd_renamere.c:459 src/cmd_renamere.c:486 src/cmd_select.c:520
-#: src/textview.c:620
+#: src/cfg_dirpane.c:1080 src/cfg_paths.c:228 src/cfg_types.c:744
+#: src/cmd_renamere.c:432 src/cmd_renamere.c:459 src/cmd_select.c:478
+#: src/textview.c:604
 msgid "Ignore Case?"
 msgstr "英大小文字を同一視?"
 
-#: src/cfg_dirpane.c:1119
-msgid "Numerical Mode?"
-msgstr ""
-
-#: src/cfg_dirpane.c:1127
+#: src/cfg_dirpane.c:1088
 msgid "Default Directory"
 msgstr "デフォルトディレクトリ"
 
-#: src/cfg_dirpane.c:1132
+#: src/cfg_dirpane.c:1094
 msgid "Grab Current"
 msgstr ""
 
-#: src/cfg_dirpane.c:1135
+#: src/cfg_dirpane.c:1097
 msgid "From History"
 msgstr "履歴から"
 
-#: src/cfg_dirpane.c:1148
+#: src/cfg_dirpane.c:1110
 msgid "Path Above?"
 msgstr ""
 
-#: src/cfg_dirpane.c:1152
+#: src/cfg_dirpane.c:1114
 msgid "Hide Allowed?"
 msgstr ""
 
-#: src/cfg_dirpane.c:1156
+#: src/cfg_dirpane.c:1118
 msgid "Scrollbar Always?"
 msgstr ""
 
-#: src/cfg_dirpane.c:1160
+#: src/cfg_dirpane.c:1122
 msgid "Huge Parent Button?"
 msgstr ""
 
-#: src/cfg_dirpane.c:1168
-msgid "Scrollbar Position"
-msgstr "スクロールバー位置"
-
-#: src/cfg_dirpane.c:1180
-msgid "Modify 'Control' Key State"
-msgstr ""
-
-#: src/cfg_dirpane.c:1225
-msgid "Active Pane Titles"
-msgstr ""
-
-#: src/cfg_dirpane.c:1225
-msgid "Focused Row, Unselected"
+#: src/cfg_dirpane.c:1127
+msgid "Set Custom Font?"
 msgstr ""
 
-#: src/cfg_dirpane.c:1226
-msgid "Focused Row, Selected"
-msgstr ""
+#: src/cfg_dirpane.c:1140
+msgid "Scrollbar Position"
+msgstr "スクロールバー位置"
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Horizontal"
 msgstr "水平"
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Vertical"
 msgstr "垂直"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Don't Track"
 msgstr ""
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Ratio"
 msgstr ""
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Left Pane"
 msgstr "左ペインサイズ"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Right Pane"
 msgstr "右ペインサイズ"
 
-#: src/cfg_dirpane.c:1275
+#: src/cfg_dirpane.c:1198
 msgid "Pane Orientation"
 msgstr ""
 
-#: src/cfg_dirpane.c:1289
+#: src/cfg_dirpane.c:1212
 msgid "Split Tracking"
 msgstr ""
 
-#: src/cfg_dirpane.c:1312
+#: src/cfg_dirpane.c:1235
 msgid "pixels"
 msgstr "ピクセル"
 
-#: src/cfg_dirpane.c:1340
+#: src/cfg_dirpane.c:1263
 msgid "Remember Selected Rows?"
 msgstr ""
 
-#: src/cfg_dirpane.c:1343
+#: src/cfg_dirpane.c:1266
 msgid "Save History Lists?"
 msgstr "履歴一覧を保存しますか?"
 
-#: src/cfg_dirpane.c:1360 src/cfg_dirpane.c:1370
+#: src/cfg_dirpane.c:1283 src/cfg_dirpane.c:1292
 msgid "Dir Panes"
 msgstr ""
 
-#: src/cfg_dirpane.c:1374
+#: src/cfg_dirpane.c:1295
 msgid "Pane Split"
 msgstr "ペイン分割"
 
-#: src/cfg_dirpane.c:1375
+#: src/cfg_dirpane.c:1296
 msgid "History"
 msgstr "履歴"
 
-#: src/cfg_errors.c:45
-msgid "Errors"
-msgstr "エラー"
-
-#: src/cfg_errors.c:52
-msgid "Use Dialog to Report Errors?"
+#: src/cfg_dirpane.c:1725
+msgid "'Blocks' Content Deprecated"
 msgstr ""
 
-#: src/cfg_errors.c:56
-msgid "Cause Console Beep on Error?"
+#: src/cfg_dirpane.c:1726
+msgid ""
+"The 'Blocks' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
 msgstr ""
 
-#: src/cfg_menus.c:44
-msgid "Menus"
-msgstr "メニュー"
+#: src/cfg_dirpane.c:1732
+msgid "'Block Size' Content Deprecated"
+msgstr ""
 
-#: src/cfg_mount.c:168
-msgid "Never"
+#: src/cfg_dirpane.c:1733
+msgid ""
+"The 'Block Size' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
 msgstr ""
 
-#: src/cfg_mount.c:168
-msgid "On Every Access"
+#: src/cfg_errors.c:48
+msgid "Errors"
+msgstr "エラー"
+
+#: src/cfg_errors.c:55
+msgid "Error and Status Message Display"
 msgstr ""
 
-#: src/cfg_mount.c:177
-msgid "Mounting"
+#: src/cfg_errors.c:57
+msgid "Status Bar, Above Panes"
 msgstr ""
 
-#: src/cfg_mount.c:184
-msgid "Mount When?"
+#: src/cfg_errors.c:60
+msgid "Main Window's Title Bar"
 msgstr ""
 
-#: src/cfg_mount.c:196
-msgid "Mount Options"
-msgstr "マウントオプション"
+#: src/cfg_errors.c:63
+msgid "Separate Dialog"
+msgstr ""
 
-#: src/cfg_mount.c:199
-msgid "Mount Command"
-msgstr "マウントコマンド"
+#: src/cfg_errors.c:69
+msgid "Cause Console Beep on Error?"
+msgstr ""
 
-#: src/cfg_mount.c:204
-msgid "Unmount Command"
-msgstr "アンマウントコマンド"
+#: src/cfg_menus.c:44
+msgid "Menus"
+msgstr "メニュー"
 
-#: src/cfg_mount.c:211
-msgid "Only Mount on Toplevel Directories?"
+#: src/cfg_nag.c:78
+#, c-format
+msgid ""
+"Click the button below to reset the %zu stored 'Don't show this dialog "
+"again' responses."
 msgstr ""
 
-#: src/cfg_mount.c:214
-msgid "Use Command Error Dialog?"
-msgstr "コマンドエラーダイアログを使いますか?"
+#: src/cfg_nag.c:100
+msgid "Nagging"
+msgstr ""
 
-#: src/cfg_mount.c:217
-msgid "Unmount When gentoo Quits?"
-msgstr "gentoo を終了したらマウント解除しますか?"
+#: src/cfg_nag.c:110
+#, fuzzy
+msgid "Reset All"
+msgstr "デフォルトにリセット"
 
-#: src/cfg_paths.c:128
-msgid "GTK+ RC"
+#: src/cfg_paths.c:78
+msgid "Edit path"
 msgstr ""
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:152
 msgid "Icons"
 msgstr "アイコン"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:153
+msgid "GTK+ RC"
+msgstr ""
+
+#: src/cfg_paths.c:154
 msgid "fstab"
 msgstr "fstab"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:155
 msgid "mtab"
 msgstr "mtab"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Beginning With Dot (.)"
 msgstr "ドット(.)で始まる"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Matching RE"
 msgstr ""
 
-#: src/cfg_paths.c:129 src/cmd_chmod.c:259 src/menus.c:512
+#: src/cfg_paths.c:157 src/cmd_chmod.c:252 src/menus.c:519
 msgid "None"
 msgstr "なし"
 
-#: src/cfg_paths.c:135
+#: src/cfg_paths.c:163
 msgid "Paths & Hide"
 msgstr ""
 
-#: src/cfg_paths.c:142
+#: src/cfg_paths.c:170
 msgid "Paths"
 msgstr "パス"
 
-#: src/cfg_paths.c:169
+#: src/cfg_paths.c:209
 msgid "Hide Entries"
 msgstr ""
 
-#: src/cfg_styles.c:170 src/cfg_types.c:234 src/iconutil.c:29 src/menus.c:19
+#: src/cfg_styles.c:178 src/cfg_types.c:233 src/iconutil.c:31 src/menus.c:19
 msgid "(None)"
 msgstr "エントリを隠す"
 
-#: src/cfg_styles.c:191 src/cfg_styles.c:428 src/cfg_styles.c:767
+#: src/cfg_styles.c:199 src/cfg_styles.c:436 src/cfg_styles.c:785
 msgid "Delete Action"
 msgstr "削除操作"
 
-#: src/cfg_styles.c:411 src/color_dialog.c:48
+#: src/cfg_styles.c:419 src/color_dialog.c:47
 msgid "Edit Color"
 msgstr "カラー編集"
 
-#: src/cfg_styles.c:428
+#: src/cfg_styles.c:436
 msgid "Revert to Inherited Command"
 msgstr ""
 
-#: src/cfg_styles.c:529
+#: src/cfg_styles.c:537
 #, fuzzy
 msgid "Select Command ..."
 msgstr "コマンド選択"
 
-#: src/cfg_styles.c:592
+#: src/cfg_styles.c:601
 msgid "New Action Property"
 msgstr "新規操作プロパティ"
 
-#: src/cfg_styles.c:600
+#: src/cfg_styles.c:609
 msgid "something"
 msgstr ""
 
-#: src/cfg_styles.c:670
+#: src/cfg_styles.c:679
 msgid ""
 "Deleting this style will also delete\n"
 "all its children. Are you sure?"
 msgstr ""
 
-#: src/cfg_styles.c:671
+#: src/cfg_styles.c:680
 msgid "Confirm Delete"
 msgstr "削除確認"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Background Color"
 msgstr "背景色"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Foreground Color"
 msgstr "前面色"
 
-#: src/cfg_styles.c:694 src/dpformat.c:53
+#: src/cfg_styles.c:703 src/dpformat.c:55
 msgid "Icon"
 msgstr "アイコン"
 
-#: src/cfg_styles.c:696
+#: src/cfg_styles.c:705
 msgid "(Row Style Preview Text)"
 msgstr ""
 
-#: src/cfg_styles.c:702 src/cmd_renameseq.c:386
+#: src/cfg_styles.c:713 src/cmd_renameseq.c:358 src/cmd_split.c:656
 msgid "Preview"
 msgstr "プレビュー"
 
-#: src/cfg_styles.c:719
+#: src/cfg_styles.c:737
 msgid "Override Parent's?"
 msgstr ""
 
-#: src/cfg_styles.c:723
+#: src/cfg_styles.c:741
 msgid "Pick..."
 msgstr ""
 
-#: src/cfg_styles.c:764
+#: src/cfg_styles.c:782
 msgid "Add Action..."
 msgstr "操作追加..."
 
-#: src/cfg_styles.c:810 src/menus.c:525
+#: src/cfg_styles.c:829 src/menus.c:532
 msgid "Parent"
 msgstr "親"
 
-#: src/cfg_styles.c:820
+#: src/cfg_styles.c:840
 msgid "Inherited Properties"
 msgstr ""
 
-#: src/cfg_styles.c:824
+#: src/cfg_styles.c:844
 msgid "Visual"
 msgstr "ビジュアル"
 
-#: src/cfg_styles.c:826
+#: src/cfg_styles.c:846
 msgid "Actions"
 msgstr "操作"
 
-#: src/cfg_styles.c:843
+#: src/cfg_styles.c:863
 msgid "File Recognition"
 msgstr ""
 
-#: src/cfg_styles.c:844
+#: src/cfg_styles.c:864
 msgid "Styles"
 msgstr "スタイル"
 
-#: src/cfg_types.c:193
+#: src/cfg_types.c:192
 #, c-format
 msgid "%s - Click to Change..."
 msgstr ""
 
-#: src/cfg_types.c:508
+#: src/cfg_types.c:507
 msgid "(New Type)"
 msgstr "(新規タイプ)"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "B-Dev"
 msgstr "ブロックデバイス"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "C-Dev"
 msgstr "キャラクタデバイス"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Dir"
 msgstr "ディレクトリ"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "FIFO"
 msgstr "FIFO"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "File"
 msgstr "ファイル"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Link"
 msgstr "リンク"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Socket"
 msgstr "ソケット"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "Readable"
 msgstr "読み込み可能"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetGID"
 msgstr "GID 設定"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetUID"
 msgstr "UID 設定"
 
-#: src/cfg_types.c:648 src/cmd_chmod.c:209
+#: src/cfg_types.c:647 src/cmd_chmod.c:200
 msgid "Sticky"
 msgstr "スティッキー"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Executable"
 msgstr "実行可能"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Writable"
 msgstr "書き込み可能"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match 'file' (RE)"
 msgstr ""
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match Name (RE)"
 msgstr ""
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Require Suffix"
 msgstr ""
 
@@ -1093,19 +1090,19 @@
 msgid "Require Protection"
 msgstr ""
 
-#: src/cfg_types.c:738
+#: src/cfg_types.c:739
 msgid "Glob?"
 msgstr ""
 
-#: src/cfg_types.c:754
+#: src/cfg_types.c:755
 msgid "Type's Style"
 msgstr ""
 
-#: src/cfg_types.c:756
+#: src/cfg_types.c:757
 msgid "Style"
 msgstr "スタイル"
 
-#: src/cfg_types.c:796
+#: src/cfg_types.c:797
 msgid "Types"
 msgstr "種類"
 
@@ -1133,16 +1130,16 @@
 msgid "Dialog Positioning"
 msgstr "ダイアログ位置"
 
-#: src/children.c:94
+#: src/children.c:88
 #, c-format
 msgid "Execution of \"%s\" Failed"
 msgstr "\"%s\" の実行に失敗しました"
 
-#: src/children.c:95 src/dialog.c:285
+#: src/children.c:89 src/dialog.c:290
 msgid "Error"
 msgstr "エラー"
 
-#: src/children.c:274
+#: src/children.c:227
 #, c-format
 msgid "Couldn't terminate child \"%s\" (pid=%d)--zombie alert"
 msgstr ""
@@ -1163,7 +1160,7 @@
 msgstr "バージョン %s (GTK+ バージョン %d.%d.%d)"
 
 #: src/cmd_about.c:97
-msgid "(c) 1998-2009 by Emil Brink, Obsession Development.\n"
+msgid "(c) 1998-2011 by Emil Brink, Obsession Development.\n"
 msgstr ""
 
 #: src/cmd_about.c:99
@@ -1172,41 +1169,30 @@
 "WARRANTY. Read the file COPYING for more details.\n"
 msgstr ""
 
-#: src/cmd_about.c:106
-msgid "FAM: Supported and active."
-msgstr "FAM: サポート済みで、有効です。"
-
-#: src/cmd_about.c:108
-msgid "FAM: Supported, but not active."
-msgstr "FAM: サポート済みです。しかし有効ではありません。"
-
-#: src/cmd_about.c:110
-msgid "FAM: Not supported."
-msgstr "FAM: サポートされません。"
-
-#: src/cmd_about.c:116
+#: src/cmd_about.c:105
 msgid "NLS: Supported, using built-in English strings."
 msgstr ""
 
-#: src/cmd_about.c:129
+#: src/cmd_about.c:118
+#, c-format
 msgid ""
 "The author of gentoo can be reached via Internet\n"
-"e-mail at <emil@obsession.se>; feel free to let\n"
+"e-mail at <a href=\"mailto:%s\">%s</a>; feel free to let\n"
 "me know what you think of this software, give\n"
 "suggestions/bug reports, and so on.\n"
 "\n"
 "The latest release of gentoo can always be down-\n"
 "loaded from the official gentoo project homepage at\n"
-"<http://www.obsession.se/gentoo/>. New releases are\n"
+"<a href=\"%s\">%s</a>. New releases are\n"
 "typically announced on the Freshmeat service at\n"
-"<http://freshmeat.net/>."
+"<a href=\"http://freshmeat.net/\">freshmeat.net</a>."
 msgstr ""
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "About gentoo"
 msgstr "gentoo について"
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "_OK (Wait for More)"
 msgstr ""
 
@@ -1215,85 +1201,89 @@
 msgid "Set protection bits for \"%s\":"
 msgstr ""
 
-#: src/cmd_chmod.c:208 src/cmd_chown.c:184 src/cmd_info.c:202
+#: src/cmd_chmod.c:199 src/cmd_chown.c:176 src/cmd_info.c:274
 msgid "Group"
 msgstr "グループ"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Others"
 msgstr ""
 
-#: src/cmd_chmod.c:208 src/cmd_info.c:195
+#: src/cmd_chmod.c:199 src/cmd_info.c:267
 msgid "Owner"
 msgstr "所有者"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Special"
 msgstr "スペシャル"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Execute"
 msgstr "実行"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Read"
 msgstr "読み込み"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set GID"
 msgstr "GID 設定"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set UID"
 msgstr "UID 設定"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Write"
 msgstr "書き込み"
 
-#: src/cmd_chmod.c:231
+#: src/cmd_chmod.c:222
 msgid "Protection Bits"
 msgstr ""
 
-#: src/cmd_chmod.c:242
+#: src/cmd_chmod.c:233
 msgid "Textual"
 msgstr ""
 
-#: src/cmd_chmod.c:253
+#: src/cmd_chmod.c:246
 #, fuzzy
 msgid "Octal"
 msgstr "8 進数"
 
-#: src/cmd_chmod.c:258 src/menus.c:511
+#: src/cmd_chmod.c:251 src/menus.c:518
 msgid "All"
 msgstr "すべて"
 
-#: src/cmd_chmod.c:261
+#: src/cmd_chmod.c:253 src/menus.c:520
+msgid "Toggle"
+msgstr "トグル"
+
+#: src/cmd_chmod.c:254
 msgid "Revert"
 msgstr ""
 
-#: src/cmd_chmod.c:273 src/cmd_chown.c:208 src/cmd_info.c:304
+#: src/cmd_chmod.c:266 src/cmd_chown.c:201 src/cmd_info.c:372
 msgid "Recurse Directories?"
 msgstr ""
 
-#: src/cmd_chmod.c:276
+#: src/cmd_chmod.c:269
 msgid "Don't Touch Directories?"
 msgstr ""
 
-#: src/cmd_chmod.c:281
+#: src/cmd_chmod.c:274
 msgid "Change Mode"
 msgstr "モード変更"
 
-#: src/cmd_chown.c:56
+#: src/cmd_chown.c:57
 #, c-format
 msgid "Set Ownership for '%s':"
 msgstr ""
 
-#: src/cmd_chown.c:184
+#: src/cmd_chown.c:176
 msgid "User"
 msgstr "ユーザー"
 
-#: src/cmd_chown.c:213
+#: src/cmd_chown.c:206
 msgid "Change Ownership"
 msgstr "所有者変更"
 
@@ -1301,45 +1291,37 @@
 msgid "Automatically Save Changed Configuration on Exit?"
 msgstr ""
 
-#: src/cmd_copy.c:302
-#, c-format
-msgid ""
-"Can't copy directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-
-#: src/cmd_copy.c:392 src/cmd_copyas.c:62
+#: src/cmd_copy.c:175 src/cmd_copyas.c:62
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Copy?"
 msgstr "\"%s\" は既に存在します - コピーを続けますか?"
 
-#: src/cmd_copy.c:393
+#: src/cmd_copy.c:176
 msgid "Copying..."
 msgstr "コピー中..."
 
-#: src/cmd_copy.c:440
+#: src/cmd_copy.c:217
 msgid "Preserve Dates During Copy?"
 msgstr ""
 
-#: src/cmd_copy.c:441
+#: src/cmd_copy.c:218
 msgid "Ignore Failure to Copy Attributes (Date, Owner, Mode)?"
 msgstr ""
 
-#: src/cmd_copy.c:442
+#: src/cmd_copy.c:219
 msgid "Leave Failed Destination if Full Size?"
 msgstr ""
 
-#: src/cmd_copy.c:443 src/cmd_viewtext.c:207
+#: src/cmd_copy.c:220 src/cmd_viewtext.c:204
 msgid "Buffer Size"
 msgstr "バッファサイズ"
 
-#: src/cmd_copyas.c:51
+#: src/cmd_copyas.c:49
 #, c-format
 msgid "Enter Name for Copy of \"%s\""
 msgstr "\"%s\" のコピー名を入力"
 
-#: src/cmd_copyas.c:53
+#: src/cmd_copyas.c:51
 #, c-format
 msgid "Enter Name for Clone of \"%s\""
 msgstr "%s の複製名を入力"
@@ -1367,28 +1349,28 @@
 msgid "Enter Name for Link Clone of \"%s\""
 msgstr ""
 
-#: src/cmd_copyas.c:89
+#: src/cmd_copyas.c:91
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Symlink?"
 msgstr "\"%s\" は既に存在します - シンボリックリンクを続けますか?"
 
-#: src/cmd_copyas.c:204 src/cmd_copyas.c:210
+#: src/cmd_copyas.c:200 src/cmd_copyas.c:207
 msgid "Copy As"
 msgstr ""
 
-#: src/cmd_copyas.c:212
+#: src/cmd_copyas.c:209
 msgid "Clone"
 msgstr "複製"
 
-#: src/cmd_copyas.c:214
+#: src/cmd_copyas.c:211
 msgid "Symbolic Link As"
 msgstr ""
 
-#: src/cmd_copyas.c:216
+#: src/cmd_copyas.c:213
 msgid "Symbolic Link Clone"
 msgstr "シンボリックリンク複製"
 
-#: src/cmd_delete.c:55
+#: src/cmd_delete.c:56
 #, c-format
 msgid ""
 "%s\n"
@@ -1396,232 +1378,246 @@
 "Attempt to change protection and retry?"
 msgstr ""
 
-#: src/cmd_delete.c:58
+#: src/cmd_delete.c:59
 msgid "Remember the answer (alters config)"
 msgstr ""
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Access Problem"
 msgstr "アクセス問題"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Change|Leave Alone"
 msgstr ""
 
-#: src/cmd_delete.c:236
+#: src/cmd_delete.c:215
 #, c-format
 msgid "Really Delete \"%s\"?"
 msgstr ""
 
-#: src/cmd_delete.c:237
+#: src/cmd_delete.c:216
 msgid "Deleting..."
 msgstr "削除中..."
 
-#: src/cmd_delete.c:292
+#: src/cmd_delete.c:279
 msgid "On Access Failure"
 msgstr ""
 
-#: src/cmd_delete.c:293
+#: src/cmd_delete.c:280
 msgid "Ask User|Automatically Try Changing, and Retry|Fail"
 msgstr ""
 
-#: src/cmd_dpfocus.c:183
-msgid "Wrap Around At Top And Bottom?"
+#: src/cmd_dpfocus.c:33
+msgid "DpFocus Command is Deprecated"
+msgstr ""
+
+#: src/cmd_dpfocus.c:34
+msgid ""
+"The <tt>DpFocus</tt> command has been deprecated and is no longer supported. "
+"Please remove any keyboard or mouse bindings that use it and look into using "
+"the default GTK+ list view's cursor controls."
 msgstr ""
 
-#: src/cmd_dpfocus.c:184
+#: src/cmd_dpfocus.c:64
 msgid "Treat Focused Row As Selection If No \"Real\" Selection Exists?"
 msgstr ""
 
-#: src/cmd_dpfocus.c:186
+#: src/cmd_dpfocus.c:66
 msgid "Move Focus to Last Selected/Deselected Row?"
 msgstr ""
 
-#: src/cmd_dpfocusisrch.c:220
+#: src/cmd_dpfocusisrch.c:163
 msgid "ISearch"
 msgstr ""
 
-#: src/cmd_generic.c:136
+#: src/cmd_generic.c:143
 msgid "_OK|A_ll|_Skip|_Cancel"
 msgstr "_OK<|すべて(_A)|飛ばす(_S)|取り消し(_C)"
 
-#: src/cmd_generic.c:137
+#: src/cmd_generic.c:144
 msgid "_OK|_Skip|_Cancel"
 msgstr "_OK|飛ばす(_S)|取り消し(_C)"
 
-#: src/cmd_getsize.c:49
+#: src/cmd_getsize.c:51
 msgid "Getting sizes..."
 msgstr ""
 
-#: src/cmd_getsize.c:141
+#: src/cmd_getsize.c:134
 msgid "Unselect Rows When Done?"
 msgstr ""
 
-#: src/cmd_info.c:71 src/cmd_info.c:163
-#, c-format
-msgid ""
-"%s (%s bytes,\n"
-"%s blocks)"
-msgstr ""
-"%s (%s バイト、\n"
-"%s ブロック)"
+#: src/cmd_info.c:68 src/errors.c:84
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "、%s 使用済み"
 
-#: src/cmd_info.c:75
-#, c-format
-msgid "%u dirs, %u files, %u symlinks"
+#: src/cmd_info.c:72
+#, fuzzy, c-format
+msgid ""
+"%u dirs, %u files,\n"
+"%u symlinks, %u special files"
 msgstr "%u このディレクトリ、%u 個のファイル、%u 個のシンボリックリンク"
 
-#: src/cmd_info.c:134
+#: src/cmd_info.c:153
+msgid "Value"
+msgstr ""
+
+#: src/cmd_info.c:198
 msgid "Link To"
 msgstr "リンク先"
 
-#: src/cmd_info.c:145 src/cmd_select.c:399 src/dpformat.c:52
+#: src/cmd_info.c:213 src/cmd_select.c:368 src/dpformat.c:54
 msgid "Type"
 msgstr "種類"
 
-#: src/cmd_info.c:148
+#: src/cmd_info.c:216
 msgid "Location"
 msgstr "場所"
 
-#: src/cmd_info.c:151 src/dpformat.c:36 src/window.c:200
+#: src/cmd_info.c:219 src/cmd_split.c:653 src/dpformat.c:37 src/window.c:199
 msgid "Size"
 msgstr "サイズ"
 
-#: src/cmd_info.c:172
+#: src/cmd_info.c:229
+#, fuzzy, c-format
+msgid "%s (%s bytes)"
+msgstr "%Lu バイト"
+
+#: src/cmd_info.c:240
 msgid "Contains"
 msgstr "内容"
 
-#: src/cmd_info.c:186
+#: src/cmd_info.c:257
 msgid "'File' Info"
 msgstr "ファイルの情報"
 
-#: src/cmd_info.c:213 src/dpformat.c:49
+#: src/cmd_info.c:285 src/dpformat.c:50
 msgid "Accessed"
 msgstr "最終アクセス"
 
-#: src/cmd_info.c:214 src/dpformat.c:50
+#: src/cmd_info.c:286 src/dpformat.c:51
 msgid "Modified"
 msgstr "最終修正"
 
-#: src/cmd_info.c:215
+#: src/cmd_info.c:287 src/dpformat.c:53
 msgid "Changed"
 msgstr "最終変更"
 
-#: src/cmd_info.c:263
+#: src/cmd_info.c:288 src/dpformat.c:52
+msgid "Created"
+msgstr ""
+
+#: src/cmd_info.c:290
+msgid "Basic"
+msgstr ""
+
+#: src/cmd_info.c:294
+msgid "Attributes"
+msgstr ""
+
+#: src/cmd_info.c:338
 msgid "Getting Information..."
 msgstr "情報取得中..."
 
-#: src/cmd_info.c:302
+#: src/cmd_info.c:370
 msgid "Show 'file' Output?"
 msgstr ""
 
-#: src/cmd_info.c:305
+#: src/cmd_info.c:373
 msgid "Access Date Format"
 msgstr "アクセス日付書式"
 
-#: src/cmd_info.c:306
+#: src/cmd_info.c:374
 msgid "Modify Date Format"
 msgstr "修正日付書式"
 
-#: src/cmd_info.c:307
+#: src/cmd_info.c:375
 msgid "Change Date Format"
 msgstr "変更日付書式"
 
-#: src/cmd_info.c:308
+#: src/cmd_info.c:376
 msgid "Size Tick Mark"
 msgstr ""
 
-#: src/cmd_join.c:47
+#: src/cmd_join.c:46
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Join?"
 msgstr "\"%s\" は既に存在します - 結合を続けますか?"
 
-#: src/cmd_join.c:76
+#: src/cmd_join.c:73
 msgid "Joining..."
 msgstr "結合中..."
 
-#: src/cmd_join.c:162
+#: src/cmd_join.c:167
 msgid "Click and Drag Files to Reorder, Then Click Join."
 msgstr ""
 
-#: src/cmd_join.c:170
+#: src/cmd_join.c:175
 #, c-format
 msgid "The total size is %s (%lu bytes)."
 msgstr "総サイズは %s です (%lu バイト)"
 
-#: src/cmd_join.c:173
+#: src/cmd_join.c:178
 #, c-format
 msgid "The total size is %lu bytes."
 msgstr "総サイズは %lu バイトです。"
 
-#: src/cmd_join.c:215
+#: src/cmd_join.c:220
 msgid "Enter Destination File Name"
 msgstr ""
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "Join"
 msgstr "結合"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "_Join|_Cancel"
 msgstr "結合(_J)|取り消し(_C)"
 
-#: src/cmd_mkdir.c:75
+#: src/cmd_mkdir.c:65
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With MkDir?"
 msgstr "\"%s\" は既に存在します - ディレクトリ作成を続けますか?"
 
-#: src/cmd_mkdir.c:125
+#: src/cmd_mkdir.c:119
 msgid "Enter Name of Directory to Create"
 msgstr "作成するディレクトリの名前を入力"
 
-#: src/cmd_mkdir.c:133
+#: src/cmd_mkdir.c:128
 msgid "Make Directory"
 msgstr "ディレクトリ作成"
 
-#: src/cmd_mkdir.c:156
+#: src/cmd_mkdir.c:151
 msgid "CD Into New Directory?"
 msgstr ""
 
-#: src/cmd_mkdir.c:157
+#: src/cmd_mkdir.c:152
 msgid "Focus New Directory?"
 msgstr ""
 
-#: src/cmd_move.c:81
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-
-#: src/cmd_move.c:92
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the destination contains the source."
-msgstr ""
-
-#: src/cmd_move.c:188 src/cmd_moveas.c:48
+#: src/cmd_move.c:128 src/cmd_moveas.c:51
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Move?"
 msgstr ""
 
-#: src/cmd_move.c:189
+#: src/cmd_move.c:129
 msgid "Moving..."
 msgstr ""
 
-#: src/cmd_moveas.c:40
+#: src/cmd_moveas.c:41
 #, c-format
 msgid "Enter Name to Move \"%s\" As"
 msgstr ""
 
+#: src/cmd_moveas.c:66
+msgid "Invalid destination name for MoveAs"
+msgstr ""
+
 #: src/cmd_moveas.c:74
 msgid "Moving As..."
 msgstr ""
 
-#: src/cmd_moveas.c:105 src/cmd_moveas.c:110
+#: src/cmd_moveas.c:105 src/cmd_moveas.c:113
 msgid "Move As"
 msgstr ""
 
@@ -1643,48 +1639,48 @@
 msgid "Are you sure you want to quit?"
 msgstr "本当に終了しますか?"
 
-#: src/cmd_rename.c:44
+#: src/cmd_rename.c:57
 #, c-format
 msgid "Enter New Name For \"%s\""
 msgstr "\"%s\" の新しい名前を入力"
 
-#: src/cmd_rename.c:52 src/cmd_renamere.c:147 src/cmd_renamere.c:243
-#: src/cmd_renamere.c:293 src/cmd_renamere.c:388 src/cmd_renameseq.c:161
+#: src/cmd_rename.c:67 src/cmd_renamere.c:142 src/cmd_renamere.c:225
+#: src/cmd_renamere.c:268 src/cmd_renamere.c:367 src/cmd_renameseq.c:152
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Rename?"
 msgstr "\"%s\" は既に存在します - 名称変更を続けますか?"
 
-#: src/cmd_rename.c:132
+#: src/cmd_rename.c:245
 msgid "Rename"
 msgstr "名称変更"
 
-#: src/cmd_renamere.c:260
-msgid "Regular expression error:\n"
-msgstr "正規表現エラー:\n"
+#: src/cmd_rename.c:261
+msgid "Rename Single File In-Place (Without Dialog)?"
+msgstr ""
 
-#: src/cmd_renamere.c:446
+#: src/cmd_renamere.c:419
 msgid ""
 "Look for substring in all filenames, and replace\n"
 "it with another string."
 msgstr ""
 
-#: src/cmd_renamere.c:449
+#: src/cmd_renamere.c:422
 msgid "Replace"
 msgstr "置換"
 
-#: src/cmd_renamere.c:453
+#: src/cmd_renamere.c:426
 msgid "With"
 msgstr ""
 
-#: src/cmd_renamere.c:461
+#: src/cmd_renamere.c:434
 msgid "Replace All?"
 msgstr "すべて置換しますか?"
 
-#: src/cmd_renamere.c:465
+#: src/cmd_renamere.c:438
 msgid "Simple"
 msgstr ""
 
-#: src/cmd_renamere.c:469
+#: src/cmd_renamere.c:442
 msgid ""
 "Execute the 'From' RE on each filename, storing\n"
 "parenthesised subexpression matches. Then replace\n"
@@ -1693,19 +1689,19 @@
 "that matched, and use the result as a new filename."
 msgstr ""
 
-#: src/cmd_renamere.c:477 src/cmd_renamere.c:500
+#: src/cmd_renamere.c:450 src/cmd_renamere.c:473
 msgid "From"
 msgstr "差出人"
 
-#: src/cmd_renamere.c:481 src/cmd_renamere.c:504
+#: src/cmd_renamere.c:454 src/cmd_renamere.c:477
 msgid "To"
 msgstr "宛先"
 
-#: src/cmd_renamere.c:489
+#: src/cmd_renamere.c:462
 msgid "Reg Exp"
 msgstr "正規表現"
 
-#: src/cmd_renamere.c:494
+#: src/cmd_renamere.c:467
 msgid ""
 "Look for each character in the 'From' string, and replace\n"
 "any hits with the corresponding character in the 'To' string.\n"
@@ -1713,58 +1709,58 @@
 "the filename, and the result used as the new name for each file."
 msgstr ""
 
-#: src/cmd_renamere.c:513
+#: src/cmd_renamere.c:486
 msgid "Map"
 msgstr ""
 
-#: src/cmd_renamere.c:517
+#: src/cmd_renamere.c:490
 msgid ""
 "Changes the case (upper/lower) of the characters\n"
 "in the selected filename(s)."
 msgstr ""
 
-#: src/cmd_renamere.c:519
+#: src/cmd_renamere.c:492
 #, fuzzy
 msgid "Lower Case?"
 msgstr "英大小文字を同一視?"
 
-#: src/cmd_renamere.c:521
+#: src/cmd_renamere.c:494
 #, fuzzy
 msgid "Upper Case?"
 msgstr "英大小文字を同一視?"
 
-#: src/cmd_renamere.c:523
+#: src/cmd_renamere.c:496
 #, fuzzy
 msgid "Upper Case Initial?"
 msgstr "英大小文字を同一視?"
 
-#: src/cmd_renamere.c:526
+#: src/cmd_renamere.c:499
 #, fuzzy
 msgid "Case"
 msgstr "取り消し"
 
-#: src/cmd_renamere.c:528
+#: src/cmd_renamere.c:501
 #, fuzzy
 msgid "RenameRE"
 msgstr "名称変更"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "10, Decimal"
 msgstr "10 進数"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (A-F)"
 msgstr "16 進数 (A-F)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (a-f)"
 msgstr "16 進数 (a-f)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "8, Octal"
 msgstr "8 進数"
 
-#: src/cmd_renameseq.c:328
+#: src/cmd_renameseq.c:306
 msgid ""
 "This command renames all selected files\n"
 "into a numbered sequence. The controls\n"
@@ -1772,186 +1768,238 @@
 "formed."
 msgstr ""
 
-#: src/cmd_renameseq.c:335
+#: src/cmd_renameseq.c:313
 msgid "Start At"
 msgstr ""
 
-#: src/cmd_renameseq.c:343 src/cmd_split.c:247
+#: src/cmd_renameseq.c:323 src/cmd_split.c:609
 msgid "Base"
 msgstr ""
 
-#: src/cmd_renameseq.c:359
+#: src/cmd_renameseq.c:333
 msgid "Precision"
 msgstr ""
 
-#: src/cmd_renameseq.c:367
+#: src/cmd_renameseq.c:340
 msgid "Head"
 msgstr ""
 
-#: src/cmd_renameseq.c:374
+#: src/cmd_renameseq.c:347
 msgid "Tail"
 msgstr ""
 
-#: src/cmd_renameseq.c:382
+#: src/cmd_renameseq.c:354
 msgid "Guess"
 msgstr ""
 
-#: src/cmd_renameseq.c:396
+#: src/cmd_renameseq.c:369
 msgid "Sequential Rename"
 msgstr ""
 
-#: src/cmd_select.c:396
+#: src/cmd_select.c:365
 msgid "All rows|Selected|Unselected|"
 msgstr "すべての行|選択済み|未選択|"
 
-#: src/cmd_select.c:397
+#: src/cmd_select.c:366
 msgid "All types|Directories only|Non-directories only|"
 msgstr "すべての種類|ディレクトリのみ|非ディレクトリのみ|"
 
-#: src/cmd_select.c:398
+#: src/cmd_select.c:367
 msgid "Select|Unselect|Toggle|"
 msgstr "選択|選択解除|切り替え|"
 
-#: src/cmd_select.c:399 src/menus.c:530
+#: src/cmd_select.c:368 src/menus.c:537
 msgid "Action"
 msgstr "操作"
 
-#: src/cmd_select.c:399
+#: src/cmd_select.c:368
 msgid "Set"
 msgstr "設定"
 
-#: src/cmd_select.c:511
+#: src/cmd_select.c:469
 msgid "Treat RE as Glob Pattern?"
 msgstr ""
 
-#: src/cmd_select.c:514
+#: src/cmd_select.c:472
 msgid "Invert RE Matching?"
 msgstr ""
 
-#: src/cmd_select.c:517
+#: src/cmd_select.c:475
 msgid "Require Match on Full Name?"
 msgstr ""
 
-#: src/cmd_select.c:531
+#: src/cmd_select.c:489
 msgid "Select Using RE"
 msgstr ""
 
-#: src/cmd_select.c:815
+#: src/cmd_select.c:727
 msgid ""
 "Enter shell command to run. The command\n"
 "will have the selected content appended.\n"
 "Action is performed on successful exit."
 msgstr ""
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 #, fuzzy
 msgid "OK|Cancel"
 msgstr "_OK|取り消し(_C)"
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 #, fuzzy
 msgid "Select using shell command"
 msgstr "コマンド選択"
 
-#: src/cmd_split.c:68
+#: src/cmd_split.c:269
 #, c-format
 msgid ""
 "Split \"%s\".\n"
 "File is %s (%s)."
 msgstr ""
 
-#: src/cmd_split.c:70
+#: src/cmd_split.c:271
 #, c-format
 msgid ""
 "Split \"%s\".\n"
 "File is %s."
 msgstr ""
 
-#: src/cmd_split.c:106
+#: src/cmd_split.c:348
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Split?"
 msgstr "\"%s\" は既に存在します - 分割を続けますか?"
 
-#: src/cmd_split.c:171
-msgid "Beta Software"
-msgstr "ベータソフトウェア"
+#: src/cmd_split.c:422
+msgid "Fixed Size Split"
+msgstr "固定サイズで分割"
+
+#: src/cmd_split.c:424
+msgid "Segment Size"
+msgstr "分割容量"
 
-#: src/cmd_split.c:171
-msgid "Next Version?"
-msgstr "次のバージョン?"
+#: src/cmd_split.c:427
+#, fuzzy
+msgid "1457000 bytes (3.5\" floppy)"
+msgstr "  1457000 バイト (3.5 インチフロッピー)"
 
-#: src/cmd_split.c:171
-msgid ""
-"This splitting mode has not been\n"
-"implemented yet... Sorry."
-msgstr ""
+#: src/cmd_split.c:428
+#, fuzzy
+msgid "10485760 bytes (10 MB)"
+msgstr "  1457000 バイト (3.5 インチフロッピー)"
+
+#: src/cmd_split.c:429
+#, fuzzy
+msgid "26214400 bytes (25 MB)"
+msgstr "  1457000 バイト (3.5 インチフロッピー)"
 
-#: src/cmd_split.c:187
-msgid "  1457000 bytes (3.5\" floppy)"
+#: src/cmd_split.c:430
+#, fuzzy
+msgid "52428800 bytes (50 MB)"
 msgstr "  1457000 バイト (3.5 インチフロッピー)"
 
-#: src/cmd_split.c:188
-msgid "100431360 bytes (Zip disk)"
+#: src/cmd_split.c:431
+#, fuzzy
+msgid "78643200 bytes (75 MB)"
+msgstr "  1457000 バイト (3.5 インチフロッピー)"
+
+#: src/cmd_split.c:432
+#, fuzzy
+msgid "100431360 bytes (95 MB, Zip disk)"
 msgstr "100431360 バイト (Zip ディスク)"
 
-#: src/cmd_split.c:190
-msgid "Fixed Size Split"
+#: src/cmd_split.c:454
+#, fuzzy
+msgid "Fixed Count Split"
 msgstr "固定サイズで分割"
 
-#: src/cmd_split.c:193
-msgid "Segment Size"
+#: src/cmd_split.c:457
+#, fuzzy
+msgid "Segment Count"
 msgstr "分割容量"
 
-#: src/cmd_split.c:221
+#: src/cmd_split.c:503
+msgid "Current part number, unique for every created file"
+msgstr ""
+
+#: src/cmd_split.c:504
+msgid "The value from the Base box"
+msgstr ""
+
+#: src/cmd_split.c:505
+msgid "The amount that index will change for each file"
+msgstr ""
+
+#: src/cmd_split.c:506
+msgid "The total number of files that will be created"
+msgstr ""
+
+#: src/cmd_split.c:507
+msgid "The value of index for the last file to be created"
+msgstr ""
+
+#: src/cmd_split.c:570
 msgid "Fixed size, variable number of parts"
 msgstr ""
 
-#: src/cmd_split.c:222
+#: src/cmd_split.c:571
 msgid "Fixed number of parts, variable sizes"
 msgstr "可変サイズで分割数を固定"
 
-#: src/cmd_split.c:230 src/cmd_split.c:261
+#: src/cmd_split.c:580 src/cmd_split.c:663
 msgid "Split"
 msgstr "分割"
 
-#: src/cmd_split.c:243
+#: src/cmd_split.c:599
 msgid "Name Format"
 msgstr "名称書式"
 
-#: src/cmd_split.c:252
+#: src/cmd_split.c:615
 msgid "Step"
 msgstr "ステップ"
 
-#: src/cmd_symlink.c:77 src/cmd_symlink.c:246
+#: src/cmd_split.c:624
+msgid "Zero-Fill Numbers?"
+msgstr ""
+
+#: src/cmd_split.c:645
+msgid "Offset"
+msgstr ""
+
+#: src/cmd_symlink.c:68 src/cmd_symlink.c:252
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Link?"
 msgstr "\"%s\" は既に存在します - リンクを続けますか?"
 
-#: src/cmd_symlink.c:184
+#: src/cmd_symlink.c:161 src/configure.c:239 src/icon_dialog.c:59
+#: src/progress.c:220
+msgid "Cancel"
+msgstr "取り消し"
+
+#: src/cmd_symlink.c:161 src/configure.c:233 src/dialog.c:290
+#: src/nag_dialog.c:36
+msgid "OK"
+msgstr "OK"
+
+#: src/cmd_symlink.c:161
 msgid "Select Link Target"
 msgstr ""
 
-#: src/cmd_symlink.c:213
+#: src/cmd_symlink.c:218
 msgid "Contents"
 msgstr ""
 
-#: src/cmd_symlink.c:225
+#: src/cmd_symlink.c:231
 msgid "Edit Symbolic Link"
 msgstr "シンボリックリンク編集"
 
-#: src/cmd_symlink.c:231
+#: src/cmd_symlink.c:236
 msgid "Create Symbolic Link"
 msgstr ""
 
-#: src/cmd_viewtext.c:206
-msgid "Use mmap() to Speed Loading?"
-msgstr ""
-
-#: src/cmd_viewtext.c:208
+#: src/cmd_viewtext.c:205
 msgid "Hex-Check First"
 msgstr ""
 
-#: src/cmd_viewtext.c:209
+#: src/cmd_viewtext.c:206
 msgid "Exit on Left Arrow Key?"
 msgstr ""
 
@@ -1967,7 +2015,7 @@
 msgid "yes"
 msgstr "はい"
 
-#: src/cmdgrab.c:222
+#: src/cmdgrab.c:177
 #, c-format
 msgid "Output of %s (pid %d)"
 msgstr ""
@@ -1979,48 +2027,40 @@
 "command \"%s\"."
 msgstr ""
 
-#: src/cmdseq_dialog.c:126
+#: src/cmdseq_dialog.c:134
 #, c-format
 msgid "Built-Ins (%u)"
 msgstr ""
 
-#: src/cmdseq_dialog.c:131
+#: src/cmdseq_dialog.c:139
 #, c-format
 msgid "User Defined (%u)"
 msgstr ""
 
-#: src/cmdseq_dialog.c:302
+#: src/cmdseq_dialog.c:313
 msgid ""
 "Select a command, or type start\n"
 "of name and press TAB."
 msgstr ""
 
-#: src/cmdseq_dialog.c:319
+#: src/cmdseq_dialog.c:330
 msgid "Select Command"
 msgstr "コマンド選択"
 
-#: src/configure.c:198
+#: src/configure.c:197
 msgid "Couldn't open configuration file for output"
 msgstr ""
 
-#: src/configure.c:234 src/dialog.c:285
-msgid "OK"
-msgstr "OK"
-
-#: src/configure.c:240
+#: src/configure.c:236
 msgid "Save"
 msgstr "保存"
 
-#: src/configure.c:244 src/icon_dialog.c:59 src/progress.c:219
-msgid "Cancel"
-msgstr "取り消し"
-
-#: src/configure.c:455
+#: src/configure.c:463
 #, c-format
 msgid "Config file version (%s) doesn't match program version (%s)"
 msgstr "設定ファイルバージョン(%s)はプログラムバージョン(%s)と一致しません。"
 
-#: src/configure.c:467
+#: src/configure.c:475
 #, c-format
 msgid ""
 "Couldn't find any configuration file; checked\n"
@@ -2028,288 +2068,274 @@
 "Using built-in minimal configuration."
 msgstr ""
 
-#: src/dialog.c:123 src/dialog.c:253
+#: src/dialog.c:124 src/dialog.c:260
 msgid "_OK|_Cancel"
 msgstr "_OK|取り消し(_C)"
 
-#: src/dirpane.c:134
-msgid ""
-"Case-sensitive sorting will not work correctly with non-ASCII characters"
-msgstr ""
-
-#: src/dirpane.c:143
-msgid ""
-"Case-insensitive sorting will not work correctly with non-ASCII characters"
-msgstr ""
-
-#: src/dirpane.c:1189
+#: src/dirpane.c:541
 #, c-format
 msgid "%u/%u dirs, %u/%u files"
 msgstr "%u/%u ディレクトリ、%u/%u ファイル"
 
-#: src/dirpane.c:1197
-#, fuzzy, c-format
-msgid " (%%s/%%s, %%%s/%%%s blocks)"
-msgstr " (%s/%s、%Lu/%Lu ブロック)"
+#: src/dirpane.c:546
+#, c-format
+msgid " (%s/%s)"
+msgstr ""
 
-#: src/dirpane.c:1210
+#: src/dirpane.c:557
 #, fuzzy, c-format
 msgid ", %s (%s) used"
 msgstr "、%s 使用済み"
 
-#: src/dirpane.c:1212
+#: src/dirpane.c:559
 #, c-format
 msgid ", %s free"
 msgstr "、%s 空き"
 
-#: src/dirpane.c:1560
-msgid "!!Invalid filename!!"
-msgstr ""
-
-#: src/dirpane.c:2004 src/dirpane.c:2053
+#: src/dirpane.c:2084 src/dirpane.c:2131
 msgid "Move up to the parent directory"
 msgstr ""
 
-#: src/dirpane.c:2026
+#: src/dirpane.c:2106
 msgid "Enter path, then press Return to go there"
 msgstr ""
 
-#: src/dirpane.c:2027
+#: src/dirpane.c:2107
 msgid "H"
 msgstr "H"
 
-#: src/dirpane.c:2031
+#: src/dirpane.c:2111
 msgid ""
 "Click to enable/disable Hide rule (When pressed in, the hide rule is active, "
 "and matching entries are hidden)"
 msgstr ""
 
-#: src/dpformat.c:37
+#: src/dpformat.c:38
 msgid "Blocks"
 msgstr "ブロック"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "BSize"
 msgstr "B サイズ"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "Block Size"
 msgstr "ブロック容量"
 
-#: src/dpformat.c:39
+#: src/dpformat.c:40
 msgid "Mode, numerical"
 msgstr ""
 
-#: src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode, string"
 msgstr ""
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Nlink"
 msgstr ""
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Number of links"
 msgstr ""
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Owner ID"
 msgstr "所有者 ID"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Uid"
 msgstr "UID"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Owner Name"
 msgstr "所有者名"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Uname"
 msgstr "ユーザー名"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Gid"
 msgstr "GID"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Group ID"
 msgstr "グループ ID"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Gname"
 msgstr "グループ名"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Group Name"
 msgstr "グループ名"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device"
 msgstr "デバイス"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device Number"
 msgstr "デバイス番号"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "DevMaj"
 msgstr ""
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "Device Number, major"
 msgstr ""
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "DevMin"
 msgstr ""
 
-#: src/dpformat.c:48
-msgid "Device Number, minor"
-msgstr ""
-
 #: src/dpformat.c:49
-msgid "Date of last Access"
+msgid "Device Number, minor"
 msgstr ""
 
 #: src/dpformat.c:50
-msgid "Date of last Modification"
+msgid "Time of Last Access"
 msgstr ""
 
 #: src/dpformat.c:51
-msgid "Created"
-msgstr ""
-
-#: src/dpformat.c:51
-msgid "Date of Creation"
+msgid "Time of Last Modification"
 msgstr ""
 
 #: src/dpformat.c:52
-msgid "Type Name"
+msgid "Time of Creation"
 msgstr ""
 
 #: src/dpformat.c:53
-msgid "I"
+msgid "Time of Last Change"
 msgstr ""
 
-#: src/dpformat.c:334
-msgid "B"
-msgstr "バイト"
+#: src/dpformat.c:54
+msgid "Type Name"
+msgstr ""
 
-#: src/dpformat.c:338 src/sizeutil.c:32
-msgid "KB"
-msgstr "キロバイト"
+#: src/dpformat.c:55
+msgid "I"
+msgstr ""
 
-#: src/dpformat.c:343 src/sizeutil.c:33
-msgid "MB"
-msgstr "メガバイト"
+#: src/dpformat.c:56
+msgid "URI"
+msgstr ""
 
-#: src/dpformat.c:348 src/sizeutil.c:31
-msgid "GB"
-msgstr "ギガバイト"
+#: src/dpformat.c:56
+msgid "URI (without file prefix)"
+msgstr ""
 
-#: src/errors.c:69
+#: src/errors.c:59
 #, c-format
 msgid "Couldn't %s \"%s\": %s (code %d)"
 msgstr ""
 
-#: src/errors.c:71
+#: src/errors.c:61
 #, c-format
 msgid "Couldn't %s \"%s\" (code %d)"
 msgstr ""
 
-#: src/errors.c:76
+#: src/errors.c:66
 #, c-format
 msgid "Couldn't %s \"%s\""
 msgstr ""
 
-#: src/errors.c:78
+#: src/errors.c:68
 #, c-format
 msgid "Couldn't %s"
 msgstr ""
 
-#: src/gentoo.c:421
+#: src/errors.c:88
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: src/gentoo.c:427
 msgid "Report the version to standard output, and exit."
 msgstr ""
 
-#: src/gentoo.c:423
+#: src/gentoo.c:429
 msgid "Report internal locale details, and exit."
 msgstr ""
 
-#: src/gentoo.c:425
+#: src/gentoo.c:431
 msgid "Allows gentoo to be run by the root user. Could be dangerous."
 msgstr ""
 
-#: src/gentoo.c:426
+#: src/gentoo.c:432
 msgid ""
 "Do not load the ~/.gentoorc configuration file; instead, use default values."
 msgstr ""
 
-#: src/gentoo.c:427
+#: src/gentoo.c:433
 msgid ""
 "Do not load the ~/.gentoogtkrc GTK+ configuration file; instead, use system "
 "defaults."
 msgstr ""
 
-#: src/gentoo.c:429
-msgid "Do not use FAM to automatically detect changes in viewed directories."
+#: src/gentoo.c:434
+msgid ""
+"Run COMMAND, a gentoo command. Done before user interaction allowed, but "
+"after configuration file has been read in. Can be used many times to run "
+"several commands in sequence."
 msgstr ""
 
-#: src/gentoo.c:431
+#: src/gentoo.c:435
+msgid "COMMAND"
+msgstr ""
+
+#: src/gentoo.c:436 src/gentoo.c:437
+msgid "DIR"
+msgstr ""
+
+#: src/gentoo.c:436
 msgid ""
-"Use ARG as path for the left directory pane. Overrides default (and history)."
+"Use DIR as path for the left directory pane. Overrides default (and history)."
 msgstr ""
 
-#: src/gentoo.c:432
+#: src/gentoo.c:437
 msgid ""
-"Use ARG as path for the right directory pane. Overrides default (and "
+"Use DIR as path for the right directory pane. Overrides default (and "
 "history)."
 msgstr ""
 
-#: src/gentoo.c:433
-msgid ""
-"Run ARG, a gentoo command. Done before user interaction allowed, but after "
-"configuration file has been read in. Can be used many times to run several "
-"commands in sequence."
+#: src/gentoo.c:461
+msgid "- a graphical file manager using GTK+"
 msgstr ""
 
-#: src/gentoo.c:492
+#: src/gentoo.c:466
 #, c-format
-msgid "%s: To run as root, envoke with the '--root-ok' option\n"
+msgid "Failed to parse command line options: %s\n"
 msgstr ""
 
-#: src/gentoo.c:524
-msgid "Couldn't initialize userinfo module - username resolving won't work"
+#: src/gentoo.c:506
+#, c-format
+msgid "%s: To run as root, envoke with the '--root-ok' option\n"
 msgstr ""
 
-#: src/gentoo.c:529
-msgid "Couldn't initialize mount data - automounting won't work"
+#: src/gentoo.c:538
+msgid "Couldn't initialize userinfo module - username resolving won't work"
 msgstr ""
 
-#: src/gentoo.c:560
+#: src/gentoo.c:570
 #, c-format
 msgid "gentoo v%s by Emil Brink <emil@obsession.se>"
 msgstr ""
 
-#: src/gfam.c:216
-#, c-format
-msgid "FAM open failed, error %d--FAM will not be used"
-msgstr ""
-
-#: src/gfam.c:235
-#, c-format
-msgid ""
-"Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, perhaps)"
+#: src/gentoo.c:577
+msgid "Development Version Warning"
 msgstr ""
 
-#: src/gfam.c:241
-#, c-format
+#: src/gentoo.c:577
 msgid ""
-"Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go around, "
-"perhaps)"
+"This version of gentoo is considered somewhat new and untested. There have "
+"been major changes to almost all parts of the program since the previous "
+"version. Please be a bit careful, and make sure you report any problem to "
+"the author. Thanks."
 msgstr ""
 
-#: src/guiutil.c:118
+#: src/guiutil.c:124
 msgid "Progress"
 msgstr ""
 
@@ -2321,217 +2347,211 @@
 msgid "Loading Icon Graphics..."
 msgstr "アイコン画像読み込み中"
 
-#: src/menus.c:278
+#: src/menus.c:284
 msgid "(No Selection)"
 msgstr ""
 
-#: src/menus.c:514
+#: src/menus.c:521
 msgid "RegExp..."
 msgstr "正規表現..."
 
-#: src/menus.c:526
+#: src/menus.c:533
 msgid "Other"
 msgstr "その他"
 
-#: src/menus.c:527
+#: src/menus.c:534
 msgid "Rescan"
 msgstr "再走査"
 
-#: src/menus.c:528
+#: src/menus.c:535
 msgid "Select"
 msgstr "選択"
 
-#: src/menus.c:532
+#: src/menus.c:539
 msgid "Run..."
 msgstr "実行..."
 
-#: src/menus.c:534
+#: src/menus.c:541
 msgid "Configure..."
 msgstr "設定..."
 
-#: src/menus.c:610
+#: src/menus.c:618
 msgid "Select Menu"
 msgstr "メニュー選択"
 
-#: src/mount.c:222
-#, c-format
-msgid "Execution of \"%s %s\" failed:\n"
-msgstr ""
-
-#: src/mount.c:318
-#, c-format
-msgid "Mounting \"%s\" on \"%s\"..."
+#: src/nag_dialog.c:37
+msgid "_Don't show this dialog again"
 msgstr ""
 
 #: src/overwrite.c:49
 msgid "_OK|A_ll|_Skip|Skip _All|_Cancel"
 msgstr "|_OK|すべて(_L)|飛ばす(_S)|すべて飛ばす(_A)|取り消し(_C)|"
 
-#: src/overwrite.c:73
-#, c-format
-msgid ""
-"\n"
-"Old: %%%s bytes, changed on %%s,\n"
-"New: %%%s bytes, changed on %%s."
-msgstr ""
-
-#: src/progress.c:195
+#: src/progress.c:196
 #, c-format
 msgid "Total (%s)"
 msgstr "合計 (%s)"
 
-#: src/progress.c:315
+#: src/progress.c:305
 #, c-format
 msgid "Elapsed %02d:%02d  Speed %s/s  ETA %02u:%02u"
 msgstr ""
 
-#: src/sizeutil.c:30
-msgid "BYTES"
-msgstr "バイト"
+#: src/sizeutil.c:31
+msgid "Unformatted Size"
+msgstr ""
 
-#: src/sizeutil.c:69
-#, c-format
-msgid "%%%s"
+#: src/sizeutil.c:32
+msgid "Formatted Size, Without Unit"
 msgstr ""
 
-#: src/sizeutil.c:70
-#, fuzzy, c-format
-msgid "%%%s bytes"
-msgstr "%Lu バイト"
+#: src/sizeutil.c:33
+msgid "Formatted Size, in Bytes"
+msgstr ""
 
-#: src/sizeutil.c:71
-#, fuzzy, c-format
-msgid "%%%s KB"
-msgstr "%Lu キロバイト"
+#: src/sizeutil.c:33 src/sizeutil.c:159
+#, fuzzy
+msgid "bytes"
+msgstr "はい"
 
-#: src/sizeutil.c:72
-#, fuzzy, c-format
-msgid "%%%s MB"
-msgstr "%Lu ギガバイト"
+#: src/sizeutil.c:34
+msgid "Formatted Size, in Kilobytes"
+msgstr ""
 
-#: src/sizeutil.c:73
-#, c-format
-msgid "%%%s GB"
+#: src/sizeutil.c:34 src/sizeutil.c:163
+msgid "KB"
+msgstr "キロバイト"
+
+#: src/sizeutil.c:35
+msgid "Formatted Size, in Megabytes"
 msgstr ""
 
-#: src/sizeutil.c:164 src/sizeutil.c:211
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f キロバイト"
+#: src/sizeutil.c:35 src/sizeutil.c:167
+msgid "MB"
+msgstr "メガバイト"
 
-#: src/sizeutil.c:170 src/sizeutil.c:217
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f メガバイト"
+#: src/sizeutil.c:36
+msgid "Formatted Size, in Gigabytes"
+msgstr ""
 
-#: src/sizeutil.c:176 src/sizeutil.c:223
-#, c-format
-msgid "%.2f GB"
+#: src/sizeutil.c:36 src/sizeutil.c:171
+msgid "GB"
+msgstr "ギガバイト"
+
+#: src/sizeutil.c:37
+msgid "Formatted Size, in Terabytes"
+msgstr ""
+
+#: src/sizeutil.c:37 src/sizeutil.c:175
+#, fuzzy
+msgid "TB"
+msgstr "バイト"
+
+#: src/sizeutil.c:38
+msgid "Formatted Size, Automatic Unit"
 msgstr ""
 
 #: src/style_dialog.c:40
 msgid "Select Style"
 msgstr "スタイル選択"
 
-#: src/styles.c:112
+#: src/styles.c:114
 msgid "Root"
 msgstr ""
 
-#: src/styles.c:118 src/types.c:485 src/types.c:488
+#: src/styles.c:120 src/types.c:292 src/types.c:295
 msgid "Directory"
 msgstr "ディレクトリ"
 
-#: src/styles.c:961
+#: src/styles.c:889
 msgid "New Style"
 msgstr "新規スタイル"
 
-#: src/styles.c:961
+#: src/styles.c:889
 #, c-format
 msgid "New Style %u"
 msgstr ""
 
-#: src/textview.c:152
+#: src/textview.c:190
 #, c-format
-msgid "Unable to convert text from native character set (%s) to UTF-8: %s"
+msgid ""
+"\n"
+"** Text conversion from charset '%s' failed, aborting."
 msgstr ""
 
-#: src/textview.c:252 src/textview.c:353
-msgid "File reading"
-msgstr "ファイル読み込み中"
-
-#: src/textview.c:419
+#: src/textview.c:405
 #, c-format
 msgid "Line %d (%.0f%%)"
 msgstr ""
 
-#: src/textview.c:472
+#: src/textview.c:455
 msgid "Enter Line Number or Percentage:"
 msgstr "行番号かパーセントを入力:"
 
-#: src/textview.c:478
+#: src/textview.c:461
 msgid "Goto"
 msgstr ""
 
-#: src/textview.c:613
+#: src/textview.c:596
 msgid "Enter Text to Search For (RE)"
 msgstr ""
 
-#: src/textview.c:623
+#: src/textview.c:607
 msgid "Don't Span Newlines?"
 msgstr ""
 
-#: src/textview.c:629
+#: src/textview.c:613
 msgid "Search"
 msgstr "検索"
 
-#: src/types.c:454
+#: src/types.c:287
+msgid "Unknown"
+msgstr "未知"
+
+#: src/types.c:572
 #, c-format
 msgid ""
 "Got SIGPIPE when writing to 'file' process (%s), it seems to have terminated "
 "prematurely."
 msgstr ""
 
-#: src/types.c:461
+#: src/types.c:578
 msgid "Unable to run spawn 'file' command: "
 msgstr ""
 
-#: src/types.c:480
-msgid "Unknown"
-msgstr "未知"
-
-#: src/window.c:82
+#: src/window.c:83
 msgid "Configure gentoo"
 msgstr "gentoo 設定"
 
-#: src/window.c:89
+#: src/window.c:90
 msgid "Text Viewer"
 msgstr "テキスト閲覧"
 
-#: src/window.c:200
+#: src/window.c:199
 msgid "Position"
 msgstr "位置"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Height"
 msgstr "高さ"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "X"
 msgstr "X"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Y"
 msgstr "Y"
 
-#: src/window.c:208
+#: src/window.c:207
 msgid "Set on Open?"
 msgstr ""
 
-#: src/window.c:214
+#: src/window.c:213
 msgid "Update on Close?"
 msgstr ""
 
-#: src/window.c:245
+#: src/window.c:244
 msgid "Grab"
 msgstr ""
 
@@ -2539,6 +2559,77 @@
 msgid "XML module emitted locale-dependant real number"
 msgstr ""
 
+#~ msgid "Always Set"
+#~ msgstr "常に設定"
+
+#~ msgid "Beta Software"
+#~ msgstr "ベータソフトウェア"
+
+#~ msgid "Next Version?"
+#~ msgstr "次のバージョン?"
+
+#~ msgid "BYTES"
+#~ msgstr "バイト"
+
+#, fuzzy
+#~ msgid "%%%s bytes"
+#~ msgstr "%Lu バイト"
+
+#, fuzzy
+#~ msgid "%%%s KB"
+#~ msgstr "%Lu キロバイト"
+
+#, fuzzy
+#~ msgid "%%%s MB"
+#~ msgstr "%Lu ギガバイト"
+
+#~ msgid "%.2f KB"
+#~ msgstr "%.2f キロバイト"
+
+#~ msgid "%.2f MB"
+#~ msgstr "%.2f メガバイト"
+
+#~ msgid "Mount Options"
+#~ msgstr "マウントオプション"
+
+#~ msgid "Mount Command"
+#~ msgstr "マウントコマンド"
+
+#~ msgid "Unmount Command"
+#~ msgstr "アンマウントコマンド"
+
+#~ msgid "Use Command Error Dialog?"
+#~ msgstr "コマンドエラーダイアログを使いますか?"
+
+#~ msgid "Unmount When gentoo Quits?"
+#~ msgstr "gentoo を終了したらマウント解除しますか?"
+
+#~ msgid "FAM: Supported and active."
+#~ msgstr "FAM: サポート済みで、有効です。"
+
+#~ msgid "FAM: Supported, but not active."
+#~ msgstr "FAM: サポート済みです。しかし有効ではありません。"
+
+#~ msgid "FAM: Not supported."
+#~ msgstr "FAM: サポートされません。"
+
+#~ msgid ""
+#~ "%s (%s bytes,\n"
+#~ "%s blocks)"
+#~ msgstr ""
+#~ "%s (%s バイト、\n"
+#~ "%s ブロック)"
+
+#~ msgid "Regular expression error:\n"
+#~ msgstr "正規表現エラー:\n"
+
+#, fuzzy
+#~ msgid " (%%s/%%s, %%%s/%%%s blocks)"
+#~ msgstr " (%s/%s、%Lu/%Lu ブロック)"
+
+#~ msgid "File reading"
+#~ msgstr "ファイル読み込み中"
+
 #, fuzzy
 #~ msgid "Pick Command ..."
 #~ msgstr "コマンド"

gentoo-0.15.6.tar.bz2/po/pl.gmo -> gentoo-0.19.9.tar.gz/po/pl.gmo Changed

gentoo-0.15.6.tar.bz2/po/pl.po -> gentoo-0.19.9.tar.gz/po/pl.po Changed

@@ -8,21 +8,22 @@
 msgstr ""
 "Project-Id-Version: gentoo 0.11.52\n"
 "Report-Msgid-Bugs-To: Emil Brink\n"
-"POT-Creation-Date: 2009-07-11 19:05+0200\n"
+"POT-Creation-Date: 2011-01-26 21:54+0100\n"
 "PO-Revision-Date: 2008-07-14 20:59+0200\n"
-"Last-Translator: Miku³a S³awomir <zorba@silesianet.pl>\n"
+"Last-Translator: MikuÅa SÅawomir <zorba@silesianet.pl>\n"
 "Language-Team: Polish <translators@gnome.pl>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/cfg_buttonlayout.c:65
 msgid "Left of Command Buttons"
-msgstr "Z lewej strony Listwy Przycisków"
+msgstr "Z lewej strony Listwy PrzyciskÃ³w"
 
 #: src/cfg_buttonlayout.c:65
 msgid "Right of Command Buttons"
-msgstr "Z prawej strony Listwy Przycisków"
+msgstr "Z prawej strony Listwy PrzyciskÃ³w"
 
 #: src/cfg_buttonlayout.c:66
 msgid "No Padding"
@@ -57,22 +58,22 @@
 "option menu widget\n"
 "in the top left corner of the page."
 msgstr ""
-"Ta strona pozwala ci kontrolowaæ w jaki sposób listwa skrótów jest \n"
-"umieszczana wzglêdem g³ównej listwy zawieraj±cej komendy. Jest to mniej\n"
-" wiêcej pojemnik; zamiarem jest utworzenie wiêkszej elastyczno¶ci w \n"
-"zarz±dzaniu przyciskami, oraz umo¿liwiæ powstanie wiêkszej ilo¶ci \n"
-"wbudowanych listw z przyciskami. Ale jest to dopiero w fazie planów.\n"
+"Ta strona pozwala ci kontrolowaÄ w jaki sposÃ³b listwa skrÃ³tÃ³w jest \n"
+"umieszczana wzglÄdem gÅÃ³wnej listwy zawierajÄcej komendy. Jest to mniej\n"
+" wiÄcej pojemnik; zamiarem jest utworzenie wiÄkszej elastycznoÅci w \n"
+"zarzÄdzaniu przyciskami, oraz umoÅ¼liwiÄ powstanie wiÄkszej iloÅci \n"
+"wbudowanych listw z przyciskami. Ale jest to dopiero w fazie planÃ³w.\n"
 "\n"
-"W miêdzyczasie, to rozwi±zanie stwarza funkcjonalno¶æ, która istnia³a \n"
-"wcze¶niej, gdzie Skróty mia³y osobn± stronê konfiguracyjn± (a¿ do 0.11.24).\n"
+"W miÄdzyczasie, to rozwiÄzanie stwarza funkcjonalnoÅÄ, ktÃ³ra istniaÅa \n"
+"wczeÅniej, gdzie SkrÃ³ty miaÅy osobnÄ stronÄ konfiguracyjnÄ (aÅ¼ do 0.11.24).\n"
 "\n"
-"Aby znale¼æ stronê konfiguracji Skrótów, prze³±cz siê na stronê\n"
-" Przyciski, i u¿yj kontrolki opcji po³o¿onej w lewym górnym rogu strony \n"
+"Aby znaleÅºÄ stronÄ konfiguracji SkrÃ³tÃ³w, przeÅÄcz siÄ na stronÄ\n"
+" Przyciski, i uÅ¼yj kontrolki opcji poÅoÅ¼onej w lewym gÃ³rnym rogu strony \n"
 "do wybrania odpowiedniego menu."
 
 #: src/cfg_buttonlayout.c:88
 msgid "Shortcut Sheet Position"
-msgstr "Pozycja paska skrótów."
+msgstr "Pozycja paska skrÃ³tÃ³w."
 
 #: src/cfg_buttonlayout.c:102
 msgid "Separation Style"
@@ -80,39 +81,39 @@
 
 #: src/cfg_buttonlayout.c:116
 msgid "Layout"
-msgstr "Wygl±d"
+msgstr "WyglÄd"
 
 #: src/cfg_buttons.c:308
 msgid "Set Row Width"
-msgstr "Ustal szeroko¶æ rzêdów"
+msgstr "Ustal szerokoÅÄ rzÄdÃ³w"
 
-#: src/cfg_buttons.c:326 src/cfg_buttons.c:749
+#: src/cfg_buttons.c:326 src/cfg_buttons.c:748
 msgid "Default"
-msgstr "Domy¶lne"
+msgstr "DomyÅlne"
 
 #: src/cfg_buttons.c:439 src/overwrite.c:49
 msgid "Please Confirm"
-msgstr "Proszê potwierd¼"
+msgstr "ProszÄ potwierdÅº"
 
 #: src/cfg_buttons.c:439
 msgid "Really delete current button row?"
-msgstr "Czy rzeczywi¶cie chcesz usun±æ bie¿±cy rz±d?"
+msgstr "Czy rzeczywiÅcie chcesz usunÄÄ bieÅ¼Äcy rzÄd?"
 
-#: src/cfg_buttons.c:439 src/cfg_styles.c:671
+#: src/cfg_buttons.c:439 src/cfg_styles.c:680
 msgid "_Delete|_Cancel"
 msgstr "_Skasuj|_Anuluj"
 
 #: src/cfg_buttons.c:463
 msgid "Select Width for New Row"
-msgstr "Wybierz szeroko¶æ dla nowego rzêdu"
+msgstr "Wybierz szerokoÅÄ dla nowego rzÄdu"
 
 #: src/cfg_buttons.c:466
 msgid "Change Width of Row"
-msgstr "Zmieñ d³ugo¶æ rzêdu"
+msgstr "ZmieÅ dÅugoÅÄ rzÄdu"
 
 #: src/cfg_buttons.c:609
 msgid "Edit Background Color"
-msgstr "Edytuj kolor t³a"
+msgstr "Edytuj kolor tÅa"
 
 #: src/cfg_buttons.c:653
 msgid "Edit Foreground Color"
@@ -122,104 +123,104 @@
 msgid "Label"
 msgstr "Etykieta"
 
-#: src/cfg_buttons.c:685 src/cfg_controls.c:645 src/cfg_controls.c:696
-#: src/cfg_controls.c:718 src/cfg_controls.c:739
+#: src/cfg_buttons.c:686 src/cfg_controls.c:612 src/cfg_controls.c:663
+#: src/cfg_controls.c:685
 msgid "Command"
 msgstr "Komenda"
 
-#: src/cfg_buttons.c:696 src/cfg_controls.c:639
+#: src/cfg_buttons.c:697 src/cfg_controls.c:606
 msgid "Key"
 msgstr "Przycisk"
 
-#: src/cfg_buttons.c:711 src/cfg_dirpane.c:1373
+#: src/cfg_buttons.c:712
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/cfg_buttons.c:715
+#: src/cfg_buttons.c:716
 msgid "Background..."
-msgstr "T³o..."
+msgstr "TÅo..."
 
-#: src/cfg_buttons.c:716 src/cfg_buttons.c:722
+#: src/cfg_buttons.c:717 src/cfg_buttons.c:723
 msgid "Reset to Default"
-msgstr "Domy¶lne ustawienia"
+msgstr "DomyÅlne ustawienia"
 
-#: src/cfg_buttons.c:721
+#: src/cfg_buttons.c:722
 msgid "Foreground..."
 msgstr "Kolor"
 
-#: src/cfg_buttons.c:749
+#: src/cfg_buttons.c:748
 msgid "Shortcuts"
-msgstr "Skróty"
+msgstr "SkrÃ³ty"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Clear"
-msgstr "Czy¶æ"
+msgstr "CzyÅÄ"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy Colors To"
 msgstr "Kopiuj kolor do"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy To"
 msgstr "Kopiuj do"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Swap With"
-msgstr "Zamieñ z"
+msgstr "ZamieÅ z"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Add Row..."
-msgstr "Dodaj rz±d..."
+msgstr "Dodaj rzÄd..."
 
-#: src/cfg_buttons.c:751 src/cfg_cmdseq.c:951
+#: src/cfg_buttons.c:750 src/cfg_cmdseq.c:966
 msgid "Delete Row"
-msgstr "Usuñ rz±d"
+msgstr "UsuÅ rzÄd"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Down"
-msgstr "W dó³"
+msgstr "W dÃ³Å"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Row Width..."
-msgstr "Szeroko¶æ rzêdu..."
+msgstr "SzerokoÅÄ rzÄdu..."
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Up"
-msgstr "W górê"
+msgstr "W gÃ³rÄ"
 
-#: src/cfg_buttons.c:762
+#: src/cfg_buttons.c:761
 msgid "Sheet"
 msgstr "Sheet"
 
-#: src/cfg_buttons.c:778
+#: src/cfg_buttons.c:775
 msgid "Primary"
 msgstr "Pierwszy"
 
-#: src/cfg_buttons.c:780
+#: src/cfg_buttons.c:777
 msgid "Secondary"
 msgstr "Drugi"
 
-#: src/cfg_buttons.c:785
+#: src/cfg_buttons.c:782
 msgid "Tooltip"
-msgstr "Podpowied¼"
+msgstr "PodpowiedÅº"
 
-#: src/cfg_buttons.c:792 src/cfg_dirpane.c:1145
+#: src/cfg_buttons.c:790 src/cfg_dirpane.c:1107
 msgid "Flags"
 msgstr "Flagi"
 
-#: src/cfg_buttons.c:794
+#: src/cfg_buttons.c:792
 msgid "Narrow?"
-msgstr "Zwê¿yæ?"
+msgstr "ZwÄÅ¼yÄ?"
 
-#: src/cfg_buttons.c:798
+#: src/cfg_buttons.c:796
 msgid "Show Tooltip?"
-msgstr "Pokazaæ podpowied¼?"
+msgstr "PokazaÄ podpowiedÅº?"
 
-#: src/cfg_buttons.c:833
+#: src/cfg_buttons.c:831
 msgid "Buttons"
 msgstr "Przyciski"
 
-#: src/cfg_buttons.c:834 src/cfg_cmdseq.c:1067
+#: src/cfg_buttons.c:832 src/cfg_cmdseq.c:1081
 msgid "Definitions"
 msgstr "Definicje"
 
@@ -227,309 +228,346 @@
 msgid "Options"
 msgstr "Opcje"
 
-#: src/cfg_cmdseq.c:610
+#: src/cfg_cmdseq.c:611
 msgid "Select Builtin"
 msgstr "Wybierz wbudowany"
 
-#: src/cfg_cmdseq.c:626
+#: src/cfg_cmdseq.c:627
 msgid "Opening brace"
-msgstr "Otwieraj±cy nawias klamrowy"
+msgstr "OtwierajÄcy nawias klamrowy"
 
-#: src/cfg_cmdseq.c:627
+#: src/cfg_cmdseq.c:628
 msgid "Closing brace"
-msgstr "Zamykaj±cy nawias klamrowy"
+msgstr "ZamykajÄcy nawias klamrowy"
 
-#: src/cfg_cmdseq.c:628
+#: src/cfg_cmdseq.c:629
 msgid "First selected"
 msgstr "Pierwszy wybrany"
 
-#: src/cfg_cmdseq.c:629
+#: src/cfg_cmdseq.c:630
 msgid "First selected, unselect"
 msgstr "Pierwszy wybrany, odznacz"
 
-#: src/cfg_cmdseq.c:630
+#: src/cfg_cmdseq.c:631
 msgid "First selected, with path"
-msgstr "Pierwszy wybrany, z scie¿k±"
+msgstr "Pierwszy wybrany, z scieÅ¼kÄ"
 
-#: src/cfg_cmdseq.c:631
+#: src/cfg_cmdseq.c:632
 msgid "First selected, with path, unselect"
-msgstr "Pierwszy wybrany, z scie¿k±, odznacz"
+msgstr "Pierwszy wybrany, z scieÅ¼kÄ, odznacz"
 
-#: src/cfg_cmdseq.c:632
+#: src/cfg_cmdseq.c:633
 msgid "First selected (destination pane)"
 msgstr "Pierwszy wybrany (docelowy panel)"
 
-#: src/cfg_cmdseq.c:633
+#: src/cfg_cmdseq.c:634
 msgid "First selected, no quotes"
-msgstr "Pierwszy wybrany, bez cudzys³owu"
+msgstr "Pierwszy wybrany, bez cudzysÅowu"
 
-#: src/cfg_cmdseq.c:634
+#: src/cfg_cmdseq.c:635
 msgid "All selected"
 msgstr "Wszystkie wybrane"
 
-#: src/cfg_cmdseq.c:635
+#: src/cfg_cmdseq.c:636
 msgid "All selected, unselect"
 msgstr "Wszystkie wybrane, odznacz"
 
-#: src/cfg_cmdseq.c:636
+#: src/cfg_cmdseq.c:637
 msgid "All selected, with paths"
-msgstr "Wszystkie wybrane, z scie¿kami"
+msgstr "Wszystkie wybrane, z scieÅ¼kami"
 
-#: src/cfg_cmdseq.c:637
+#: src/cfg_cmdseq.c:638
 msgid "All selected, with paths, unselect"
-msgstr "Wszystkie wybrane, z scie¿kami, odznacz"
+msgstr "Wszystkie wybrane, z scieÅ¼kami, odznacz"
 
-#: src/cfg_cmdseq.c:638
+#: src/cfg_cmdseq.c:639
 msgid "All selected (destination pane)"
 msgstr "Wszystkie wybrane (docelowy panel)"
 
-#: src/cfg_cmdseq.c:639
+#: src/cfg_cmdseq.c:640
 msgid "All selected, no quotes"
-msgstr "Wszystkie wybrane, bez cudzys³owów"
+msgstr "Wszystkie wybrane, bez cudzysÅowÃ³w"
 
-#: src/cfg_cmdseq.c:640
+#: src/cfg_cmdseq.c:641
 msgid "Path to source pane's directory"
-msgstr "Scie¿ka do katalogu panelu ¼ród³owego"
+msgstr "ScieÅ¼ka do katalogu panelu ÅºrÃ³dÅowego"
 
-#: src/cfg_cmdseq.c:641
+#: src/cfg_cmdseq.c:642
 msgid "Path to destination pane's directory"
-msgstr "Scie¿ka do katalogu panelu docelowego"
+msgstr "ScieÅ¼ka do katalogu panelu docelowego"
 
-#: src/cfg_cmdseq.c:642
+#: src/cfg_cmdseq.c:643
 msgid "Path to home directory"
-msgstr "Scie¿ka do katalogu domowego"
+msgstr "ScieÅ¼ka do katalogu domowego"
 
-#: src/cfg_cmdseq.c:643
+#: src/cfg_cmdseq.c:644
 msgid "Path of left pane"
-msgstr "Scie¿ka lewego panelu"
+msgstr "ScieÅ¼ka lewego panelu"
 
-#: src/cfg_cmdseq.c:644
+#: src/cfg_cmdseq.c:645
 msgid "Path of right pane"
-msgstr "Scie¿ka prawego panelu"
+msgstr "ScieÅ¼ka prawego panelu"
 
-#: src/cfg_cmdseq.c:645
+#: src/cfg_cmdseq.c:646
+#, fuzzy
+msgid "URI of first selected"
+msgstr "Pierwszy wybrany"
+
+#: src/cfg_cmdseq.c:647
+#, fuzzy
+msgid "URI of first selected, unselect"
+msgstr "Pierwszy wybrany, odznacz"
+
+#: src/cfg_cmdseq.c:648
+#, fuzzy
+msgid "URI of first selected, no quotes"
+msgstr "Pierwszy wybrany, bez cudzysÅowu"
+
+#: src/cfg_cmdseq.c:649
+#, fuzzy
+msgid "URIs of all selected"
+msgstr "Wszystkie wybrane"
+
+#: src/cfg_cmdseq.c:650
+#, fuzzy
+msgid "URIs of all selected, unselect"
+msgstr "Wszystkie wybrane, odznacz"
+
+#: src/cfg_cmdseq.c:651
+#, fuzzy
+msgid "URIs of all selected, no quotes"
+msgstr "Wszystkie wybrane, bez cudzysÅowÃ³w"
+
+#: src/cfg_cmdseq.c:652
+#, fuzzy
+msgid "URIs of all selected, unselect, no quotes"
+msgstr "Wszystkie wybrane, bez cudzysÅowÃ³w"
+
+#: src/cfg_cmdseq.c:653
+#, fuzzy
+msgid "URI of first selected (destination pane)"
+msgstr "Pierwszy wybrany (docelowy panel)"
+
+#: src/cfg_cmdseq.c:654
 msgid "Input combo box"
-msgstr "Wej¶ciowe okno wyboru"
+msgstr "WejÅciowe okno wyboru"
 
-#: src/cfg_cmdseq.c:646
+#: src/cfg_cmdseq.c:655
 msgid "Input using menu"
-msgstr "Wej¶cie u¿ywaj±c menu"
+msgstr "WejÅcie uÅ¼ywajÄc menu"
 
-#: src/cfg_cmdseq.c:647
+#: src/cfg_cmdseq.c:656
 msgid "Input string"
-msgstr "Wej¶ciowy ci±g"
+msgstr "WejÅciowy ciÄg"
 
-#: src/cfg_cmdseq.c:648
+#: src/cfg_cmdseq.c:657
 msgid "Input check button (gives TRUE or FALSE)"
-msgstr "Wej¶ciowa fiszka (w wyniku TRUE lub FALSE)"
+msgstr "WejÅciowa fiszka (w wyniku TRUE lub FALSE)"
 
-#: src/cfg_cmdseq.c:649
+#: src/cfg_cmdseq.c:658
 msgid "Add label to input window"
-msgstr "Dodaj etykietê dla okna wej¶ciowego"
+msgstr "Dodaj etykietÄ dla okna wejÅciowego"
 
-#: src/cfg_cmdseq.c:650
+#: src/cfg_cmdseq.c:659
 msgid "Add a separator bar to input window"
-msgstr "Dodaj pasek separatora do okna wej¶ciowego"
+msgstr "Dodaj pasek separatora do okna wejÅciowego"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "$NAME"
 msgstr "$NAME"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "Value of $NAME (environment)"
-msgstr "Warto¶æ $NAME (¶rodowisko)"
+msgstr "WartoÅÄ $NAME (Årodowisko)"
 
-#: src/cfg_cmdseq.c:652
+#: src/cfg_cmdseq.c:661
 msgid "gentoo's PID"
 msgstr "PID gentoo"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "Home directory for user NAME"
-msgstr "Katalog domowy dla u¿ytkownika NAME"
+msgstr "Katalog domowy dla uÅ¼ytkownika NAME"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "~NAME"
 msgstr "~NAME"
 
-#: src/cfg_cmdseq.c:677
+#: src/cfg_cmdseq.c:686 src/cmd_split.c:536
 msgid "Pick Code"
 msgstr "Wybierz kod"
 
-#: src/cfg_cmdseq.c:765
+#: src/cfg_cmdseq.c:778
 msgid "(No Options Available)"
 msgstr "(Brak opcji)"
 
-#: src/cfg_cmdseq.c:801
+#: src/cfg_cmdseq.c:814
 msgid "Run in Background?"
 msgstr "Uruchom w tle?"
 
-#: src/cfg_cmdseq.c:805
+#: src/cfg_cmdseq.c:818
 msgid "Kill Previous Instance?"
-msgstr "Zabij poprzedni± instancjê?"
+msgstr "Zabij poprzedniÄ instancjÄ?"
 
-#: src/cfg_cmdseq.c:809
+#: src/cfg_cmdseq.c:822
 msgid "Survive Quit?"
-msgstr "Przetrzymaj zakoñczenie?"
+msgstr "Przetrzymaj zakoÅczenie?"
 
-#: src/cfg_cmdseq.c:815
+#: src/cfg_cmdseq.c:828
 msgid "Capture Output?"
-msgstr "Przechwyæ wyj¶cie?"
+msgstr "PrzechwyÄ wyjÅcie?"
 
-#: src/cfg_cmdseq.c:900
+#: src/cfg_cmdseq.c:913
 msgid "Before Execution"
 msgstr "Przed wykonaniem"
 
-#: src/cfg_cmdseq.c:903
+#: src/cfg_cmdseq.c:916
 msgid "Require Source Selection?"
-msgstr "Wymaga zaznaczenia ¼ród³a?"
+msgstr "Wymaga zaznaczenia ÅºrÃ³dÅa?"
 
-#: src/cfg_cmdseq.c:907
+#: src/cfg_cmdseq.c:920
 msgid "Require Destination Selection?"
 msgstr "Wymaga zaznaczenia celu?"
 
-#: src/cfg_cmdseq.c:912
+#: src/cfg_cmdseq.c:926
 msgid "CD Source?"
-msgstr "CD ¼ród³owy?"
+msgstr "CD ÅºrÃ³dÅowy?"
 
-#: src/cfg_cmdseq.c:915
+#: src/cfg_cmdseq.c:929
 msgid "CD Destination?"
 msgstr "CD docelowy?"
 
-#: src/cfg_cmdseq.c:922
+#: src/cfg_cmdseq.c:937
 msgid "After Execution"
 msgstr "Po wykonaniu"
 
-#: src/cfg_cmdseq.c:924
+#: src/cfg_cmdseq.c:939
 msgid "Rescan Source?"
-msgstr "Oczytaj ponownie ¼ród³o?"
+msgstr "Oczytaj ponownie ÅºrÃ³dÅo?"
 
-#: src/cfg_cmdseq.c:928
+#: src/cfg_cmdseq.c:943
 msgid "Rescan Destination?"
 msgstr "Odczytaj ponownie przeznaczenie?"
 
-#: src/cfg_cmdseq.c:942
+#: src/cfg_cmdseq.c:957
 msgid "General"
-msgstr "Ogólne"
+msgstr "OgÃ³lne"
 
-#: src/cfg_cmdseq.c:945
+#: src/cfg_cmdseq.c:960
 msgid "Before&After"
 msgstr "Przed&Po"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "Built-In"
 msgstr "Wbudowane"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "External"
-msgstr "Zewnêtrzne"
+msgstr "ZewnÄtrzne"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Add Row"
-msgstr "Dodaj rz±d"
+msgstr "Dodaj rzÄd"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Duplicate"
 msgstr "Powiel"
 
-#: src/cfg_cmdseq.c:978 src/cfg_styles.c:588 src/cfg_styles.c:805
-#: src/cfg_types.c:679 src/cmd_symlink.c:209 src/dpformat.c:35
+#: src/cfg_cmdseq.c:993 src/cfg_styles.c:596 src/cfg_styles.c:823
+#: src/cfg_types.c:678 src/cmd_info.c:151 src/cmd_split.c:648
+#: src/cmd_symlink.c:213 src/dpformat.c:36
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/cfg_cmdseq.c:988
+#: src/cfg_cmdseq.c:1004
 msgid "Definition"
 msgstr "Definicja"
 
-#: src/cfg_cmdseq.c:1044
+#: src/cfg_cmdseq.c:1058
 msgid "Repeat Sequence Until No Source Selection?"
-msgstr "Powtarzaj sekwencjê dopóki brak zaznaczenia w ¼ród³owym?"
+msgstr "Powtarzaj sekwencjÄ dopÃ³ki brak zaznaczenia w ÅºrÃ³dÅowym?"
 
-#: src/cfg_cmdseq.c:1056 src/cfg_controls.c:655 src/cfg_controls.c:706
-#: src/cfg_styles.c:833 src/cfg_types.c:775
+#: src/cfg_cmdseq.c:1070 src/cfg_controls.c:622 src/cfg_controls.c:673
+#: src/cfg_styles.c:853 src/cfg_types.c:776
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/cfg_cmdseq.c:1059 src/cfg_controls.c:658 src/cfg_controls.c:709
-#: src/cfg_styles.c:836 src/cfg_types.c:788
+#: src/cfg_cmdseq.c:1073 src/cfg_controls.c:625 src/cfg_controls.c:676
+#: src/cfg_styles.c:856 src/cfg_types.c:789
 msgid "Delete"
-msgstr "Usuñ"
+msgstr "UsuÅ"
 
-#: src/cfg_cmdseq.c:1066
+#: src/cfg_cmdseq.c:1080
 msgid "Commands"
 msgstr "Komendy"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1365 src/cfg_dirpane.c:1371
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1288 src/cfg_dirpane.c:1293
 msgid "Left"
 msgstr "Lewy"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Middle"
-msgstr "¦rodkowy"
+msgstr "Årodkowy"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1364 src/cfg_dirpane.c:1372
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1287 src/cfg_dirpane.c:1294
 msgid "Right"
 msgstr "Prawy"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Down"
-msgstr "Kó³ko w dó³"
+msgstr "KÃ³Åko w dÃ³Å"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Up"
-msgstr "Kó³ko w górê"
+msgstr "KÃ³Åko w gÃ³rÄ"
 
-#: src/cfg_controls.c:382
+#: src/cfg_controls.c:378
 msgid ""
 "The following modifier key(s) must\n"
 "be held down when the mouse button\n"
 "is clicked to trigger the command"
 msgstr ""
-"Poni¿sze klawisze <modyfikatory> musz± byæ przytrzymane\n"
-"równocze¶nie z klawiszem myszy aby wykonaæ komendê"
+"PoniÅ¼sze klawisze <modyfikatory> muszÄ byÄ przytrzymane\n"
+"rÃ³wnoczeÅnie z klawiszem myszy aby wykonaÄ komendÄ"
 
-#: src/cfg_controls.c:395
+#: src/cfg_controls.c:391
 msgid "Edit Modifiers"
 msgstr "Edytuj modyfikatory"
 
-#: src/cfg_controls.c:613
+#: src/cfg_controls.c:580
 msgid "Controls"
-msgstr "Skróty klawiaturowe"
+msgstr "SkrÃ³ty klawiaturowe"
 
-#: src/cfg_controls.c:620
+#: src/cfg_controls.c:587
 msgid "Global Keyboard Shortcuts"
-msgstr "Globalne skróty klawiaturowe"
+msgstr "Globalne skrÃ³ty klawiaturowe"
 
-#: src/cfg_controls.c:665
+#: src/cfg_controls.c:632
 msgid "Dirpane Mouse Buttons"
 msgstr "Klawisze Myszy"
 
-#: src/cfg_controls.c:690
+#: src/cfg_controls.c:657
 msgid "Button"
 msgstr "Przycisk"
 
-#: src/cfg_controls.c:693
+#: src/cfg_controls.c:660
 msgid "Edit Modifiers..."
 msgstr "Edytuj modyfikatory..."
 
-#: src/cfg_controls.c:716
+#: src/cfg_controls.c:683
 msgid "Click-M-Click Gesture"
 msgstr "Klik-M-Klik Gest"
 
-#: src/cfg_controls.c:726
+#: src/cfg_controls.c:693
 msgid "Time Limit"
 msgstr "Limit czasu"
 
-#: src/cfg_controls.c:737
-msgid "Path Right Click"
-msgstr "Klikniêcie prawym klawiszem na ¶cie¿kê"
-
-#: src/cfg_controls.c:750
+#: src/cfg_controls.c:704
 msgid "Ignore Num Lock For All Bindings?"
-msgstr "Ignoruj Num Lock dla ka¿dego przypisania?"
+msgstr "Ignoruj Num Lock dla kaÅ¼dego przypisania?"
 
-#: src/cfg_controls.c:780
+#: src/cfg_controls.c:734
 msgid ""
 "Note: The mouse button control settings\n"
 "are ambiguous: the same button+modifier\n"
@@ -537,568 +575,535 @@
 "might make their behaviour pretty weird..."
 msgstr ""
 "Informacja: Ustawienia klawiszy myszki \n"
-"s± dwuznaczne: ten sam klawisz+ modyfikator\n"
-"s± u¿ywane w wiêcej ni¿ jednej funkcji. Mo¿e \n"
-"to powodowaæ dziwne zachowanie siê aplikacji..."
+"sÄ dwuznaczne: ten sam klawisz+ modyfikator\n"
+"sÄ uÅ¼ywane w wiÄcej niÅ¼ jednej funkcji. MoÅ¼e \n"
+"to powodowaÄ dziwne zachowanie siÄ aplikacji..."
 
-#: src/cfg_controls.c:784
+#: src/cfg_controls.c:738
 msgid "Warning"
-msgstr "Ostrze¿enie"
+msgstr "OstrzeÅ¼enie"
 
-#: src/cfg_controls.c:784 src/children.c:95 src/cmd_info.c:246
+#: src/cfg_controls.c:738 src/children.c:89 src/cmd_info.c:320
 msgid "_OK"
 msgstr "_OK"
 
-#: src/cfg_dirpane.c:365
-msgid "Formatted Size, in bytes"
-msgstr "Wielko¶æ formatowana, w bajtach"
-
-#: src/cfg_dirpane.c:365
-msgid "Raw Size, in Bytes"
-msgstr "Wielko¶æ surowa, w bajtach"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in kilobytes"
-msgstr "Wielko¶æ formatowana, w kilobajtach"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in megabytes"
-msgstr "Wielko¶æ formatowana, w megabajtach"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, \"Smart\" Unit"
-msgstr "Wielko¶æ formatowana, \"Sprytne\" jednostki"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, in gigabytes"
-msgstr "Wielko¶æ formatowana, w gigabajtach"
-
-#: src/cfg_dirpane.c:383
+#: src/cfg_dirpane.c:333
 msgid "Append Type Character?"
-msgstr "Do³±czany znak typu?"
+msgstr "DoÅÄczany znak typu?"
 
-#: src/cfg_dirpane.c:386
-msgid "Append \"-> destination\" on Links?"
-msgstr "Do³±czaj \"->przeznaczenie\" w dowi±zaniach?"
+#: src/cfg_dirpane.c:336
+#, fuzzy
+msgid "Append \"â destination\" on Links?"
+msgstr "DoÅÄczaj \"->przeznaczenie\" w dowiÄzaniach?"
 
-#: src/cfg_dirpane.c:406
+#: src/cfg_dirpane.c:358
 msgid "Place Tick Every 3 Digits?"
-msgstr "Umie¶æ znacznik co 3 cyfry?"
+msgstr "UmieÅÄ znacznik co 3 cyfry?"
 
-#: src/cfg_dirpane.c:416
+#: src/cfg_dirpane.c:369
 msgid "Digits of Precision"
 msgstr "Precyzja"
 
-#: src/cfg_dirpane.c:429
+#: src/cfg_dirpane.c:382
 msgid "Show Dir's File System Size?"
-msgstr "Pokazuj wielko¶æ"
+msgstr "Pokazuj wielkoÅÄ"
 
-#: src/cfg_dirpane.c:435 src/cfg_dirpane.c:439 src/cfg_dirpane.c:443
-#: src/cfg_dirpane.c:447 src/cfg_dirpane.c:451 src/cfg_dirpane.c:455
-#: src/cfg_dirpane.c:459 src/cfg_dirpane.c:463 src/cfg_dirpane.c:467
-#: src/cfg_dirpane.c:474
+#: src/cfg_dirpane.c:388 src/cfg_dirpane.c:392 src/cfg_dirpane.c:396
+#: src/cfg_dirpane.c:400 src/cfg_dirpane.c:404 src/cfg_dirpane.c:408
+#: src/cfg_dirpane.c:412 src/cfg_dirpane.c:416 src/cfg_dirpane.c:420
+#: src/cfg_dirpane.c:428
 msgid "Format"
 msgstr "Format"
 
-#: src/cfg_dirpane.c:497
+#: src/cfg_dirpane.c:454
 #, c-format
 msgid "%s Settings"
 msgstr "%s ustawienia"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1002 src/cfg_dirpane.c:1003
-#: src/cmd_select.c:414
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:970 src/cfg_dirpane.c:971
+#: src/cmd_select.c:381
 msgid "Content"
-msgstr "Zawarto¶æ"
+msgstr "ZawartoÅÄ"
 
-#: src/cfg_dirpane.c:611
+#: src/cfg_dirpane.c:571
 msgid "Justification"
-msgstr "Wyrównanie"
+msgstr "WyrÃ³wnanie"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1003
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:971
 msgid "Title"
-msgstr "Tytu³"
+msgstr "TytuÅ"
 
-#: src/cfg_dirpane.c:611 src/window.c:201
+#: src/cfg_dirpane.c:571 src/window.c:200
 msgid "Width"
-msgstr "Szeroko¶æ"
+msgstr "SzerokoÅÄ"
 
-#: src/cfg_dirpane.c:612
+#: src/cfg_dirpane.c:572
 msgid "Center"
-msgstr "¦rodek"
+msgstr "Årodek"
 
-#: src/cfg_dirpane.c:621
+#: src/cfg_dirpane.c:581
 msgid "Basic Settings"
 msgstr "Ustawienia podstawowe"
 
-#: src/cfg_dirpane.c:669
+#: src/cfg_dirpane.c:628
 msgid "Edit Column Content"
-msgstr "Edycja zawarto¶ci kolumny"
+msgstr "Edycja zawartoÅci kolumny"
 
-#: src/cfg_dirpane.c:1002
+#: src/cfg_dirpane.c:970
 msgid "Default Title"
-msgstr "Domy¶lny tytu³"
+msgstr "DomyÅlny tytuÅ"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories First"
-msgstr "Katalogi na pocz±tku"
+msgstr "Katalogi na poczÄtku"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Last"
-msgstr "Katalogi na koñcu"
+msgstr "Katalogi na koÅcu"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Mixed"
 msgstr "Katalogi mieszanie"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Left of List"
 msgstr "Z lewej strony listy"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Right of List"
 msgstr "Z prawej strony listy"
 
-#: src/cfg_dirpane.c:1029 src/cfg_dirpane.c:1030
+#: src/cfg_dirpane.c:997
 msgid "System Default"
-msgstr "Domy¶lne systemowe"
+msgstr "DomyÅlne systemowe"
 
-#: src/cfg_dirpane.c:1030
-msgid "Always Set"
-msgstr "Zawsze ustaw"
-
-#: src/cfg_dirpane.c:1030 src/cmd_chmod.c:260 src/menus.c:513
-msgid "Toggle"
-msgstr "Zmieñ"
-
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy From %s"
 msgstr "Kopiuj z %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy To %s"
 msgstr "Kopiuj do %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Swap With %s"
-msgstr "Zamieñ z %s"
+msgstr "ZamieÅ z %s"
 
-#: src/cfg_dirpane.c:1048
+#: src/cfg_dirpane.c:1015
 msgid "Columns"
 msgstr "Kolumny"
 
-#: src/cfg_dirpane.c:1053
+#: src/cfg_dirpane.c:1020
 msgid "Available Content Types"
-msgstr "Dostêpna zawarto¶æ typów"
+msgstr "DostÄpna zawartoÅÄ typÃ³w"
 
-#: src/cfg_dirpane.c:1070
+#: src/cfg_dirpane.c:1037
 msgid "Selected Content Types"
-msgstr "Wybrana zawarto¶æ typów"
+msgstr "Wybrana zawartoÅÄ typÃ³w"
 
-#: src/cfg_dirpane.c:1081 src/cfg_styles.c:723
+#: src/cfg_dirpane.c:1049 src/cfg_styles.c:741
 msgid "Edit..."
 msgstr "Edytuj..."
 
-#: src/cfg_dirpane.c:1082 src/cmd_renamere.c:508
+#: src/cfg_dirpane.c:1050 src/cmd_renamere.c:481
 msgid "Remove"
-msgstr "Usuñ"
+msgstr "UsuÅ"
 
-#: src/cfg_dirpane.c:1096
+#: src/cfg_dirpane.c:1064
 msgid "Sorting"
 msgstr "Sortowanie"
 
-#: src/cfg_dirpane.c:1099
+#: src/cfg_dirpane.c:1067
 msgid "Sort On"
 msgstr "Sortuj z"
 
-#: src/cfg_dirpane.c:1106 src/cmd_split.c:233 src/dpformat.c:39
-#: src/dpformat.c:40
+#: src/cfg_dirpane.c:1071 src/cmd_split.c:590 src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode"
 msgstr "Tryb"
 
-#: src/cfg_dirpane.c:1113
+#: src/cfg_dirpane.c:1077
 msgid "Inverse Sorting?"
 msgstr "Odwrotne sortowanie?"
 
-#: src/cfg_dirpane.c:1116 src/cfg_paths.c:187 src/cfg_types.c:743
-#: src/cmd_renamere.c:459 src/cmd_renamere.c:486 src/cmd_select.c:520
-#: src/textview.c:620
+#: src/cfg_dirpane.c:1080 src/cfg_paths.c:228 src/cfg_types.c:744
+#: src/cmd_renamere.c:432 src/cmd_renamere.c:459 src/cmd_select.c:478
+#: src/textview.c:604
 msgid "Ignore Case?"
-msgstr "Ignoruj czcionkê?"
-
-#: src/cfg_dirpane.c:1119
-msgid "Numerical Mode?"
-msgstr "Tryb numeryczny?"
+msgstr "Ignoruj czcionkÄ?"
 
-#: src/cfg_dirpane.c:1127
+#: src/cfg_dirpane.c:1088
 msgid "Default Directory"
-msgstr "Domy¶lny katalog"
+msgstr "DomyÅlny katalog"
 
-#: src/cfg_dirpane.c:1132
+#: src/cfg_dirpane.c:1094
 msgid "Grab Current"
 msgstr "Pobierz obecny"
 
-#: src/cfg_dirpane.c:1135
+#: src/cfg_dirpane.c:1097
 msgid "From History"
 msgstr "Z historii"
 
-#: src/cfg_dirpane.c:1148
+#: src/cfg_dirpane.c:1110
 msgid "Path Above?"
-msgstr "¦cie¿ka powy¿ej?"
+msgstr "ÅcieÅ¼ka powyÅ¼ej?"
 
-#: src/cfg_dirpane.c:1152
+#: src/cfg_dirpane.c:1114
 msgid "Hide Allowed?"
 msgstr "Dozwolone ukrywanie?"
 
-#: src/cfg_dirpane.c:1156
+#: src/cfg_dirpane.c:1118
 msgid "Scrollbar Always?"
 msgstr "Zawsze scrollbar?"
 
-#: src/cfg_dirpane.c:1160
+#: src/cfg_dirpane.c:1122
 msgid "Huge Parent Button?"
-msgstr "Du¿y przycisk \"do góry\"?"
+msgstr "DuÅ¼y przycisk \"do gÃ³ry\"?"
+
+#: src/cfg_dirpane.c:1127
+msgid "Set Custom Font?"
+msgstr ""
 
-#: src/cfg_dirpane.c:1168
+#: src/cfg_dirpane.c:1140
 msgid "Scrollbar Position"
 msgstr "Pozycja scrollbar'a"
 
-#: src/cfg_dirpane.c:1180
-msgid "Modify 'Control' Key State"
-msgstr "Modyfikuj stan przycisku Control"
-
-#: src/cfg_dirpane.c:1225
-msgid "Active Pane Titles"
-msgstr "Aktywne tytu³y paneli"
-
-#: src/cfg_dirpane.c:1225
-msgid "Focused Row, Unselected"
-msgstr "Pod¶wietlony rz±d, odznacz"
-
-#: src/cfg_dirpane.c:1226
-msgid "Focused Row, Selected"
-msgstr "Pod¶wietlony rz±d, zaznacz"
-
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Horizontal"
 msgstr "Poziomo"
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Vertical"
 msgstr "Pionowo"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Don't Track"
-msgstr "Nie ¶led¼"
+msgstr "Nie ÅledÅº"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Ratio"
-msgstr "Wspó³czynnik"
+msgstr "WspÃ³Åczynnik"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Left Pane"
 msgstr "Rozmiar, Lewy panel"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Right Pane"
 msgstr "Rozmiar, Prawy panel"
 
-#: src/cfg_dirpane.c:1275
+#: src/cfg_dirpane.c:1198
 msgid "Pane Orientation"
 msgstr "Orientacja paneli"
 
-#: src/cfg_dirpane.c:1289
+#: src/cfg_dirpane.c:1212
 msgid "Split Tracking"
-msgstr "¦ledzenie podzia³u"
+msgstr "Åledzenie podziaÅu"
 
-#: src/cfg_dirpane.c:1312
+#: src/cfg_dirpane.c:1235
 msgid "pixels"
 msgstr "pikseli"
 
-#: src/cfg_dirpane.c:1340
+#: src/cfg_dirpane.c:1263
 msgid "Remember Selected Rows?"
-msgstr "Zapamiêtaj wybrane rzêdy ?"
+msgstr "ZapamiÄtaj wybrane rzÄdy ?"
 
-#: src/cfg_dirpane.c:1343
+#: src/cfg_dirpane.c:1266
 msgid "Save History Lists?"
-msgstr "Zapisz historiê?"
+msgstr "Zapisz historiÄ?"
 
-#: src/cfg_dirpane.c:1360 src/cfg_dirpane.c:1370
+#: src/cfg_dirpane.c:1283 src/cfg_dirpane.c:1292
 msgid "Dir Panes"
 msgstr "Panele"
 
-#: src/cfg_dirpane.c:1374
+#: src/cfg_dirpane.c:1295
 msgid "Pane Split"
-msgstr "Podzia³ paneli"
+msgstr "PodziaÅ paneli"
 
-#: src/cfg_dirpane.c:1375
+#: src/cfg_dirpane.c:1296
 msgid "History"
 msgstr "Historia"
 
-#: src/cfg_errors.c:45
-msgid "Errors"
-msgstr "B³êdy"
+#: src/cfg_dirpane.c:1725
+msgid "'Blocks' Content Deprecated"
+msgstr ""
 
-#: src/cfg_errors.c:52
-msgid "Use Dialog to Report Errors?"
-msgstr "U¿ywaj okna dialogowego do raportu b³êdów?"
+#: src/cfg_dirpane.c:1726
+msgid ""
+"The 'Blocks' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
 
-#: src/cfg_errors.c:56
-msgid "Cause Console Beep on Error?"
-msgstr "Brzêczyk systemowy przy b³êdzie?"
+#: src/cfg_dirpane.c:1732
+msgid "'Block Size' Content Deprecated"
+msgstr ""
 
-#: src/cfg_menus.c:44
-msgid "Menus"
-msgstr "Menu"
+#: src/cfg_dirpane.c:1733
+msgid ""
+"The 'Block Size' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
 
-#: src/cfg_mount.c:168
-msgid "Never"
-msgstr "Nigdy"
+#: src/cfg_errors.c:48
+msgid "Errors"
+msgstr "BÅÄdy"
 
-#: src/cfg_mount.c:168
-msgid "On Every Access"
-msgstr "Przy ka¿dym dostêpie"
+#: src/cfg_errors.c:55
+msgid "Error and Status Message Display"
+msgstr ""
 
-#: src/cfg_mount.c:177
-msgid "Mounting"
-msgstr "Montowanie"
+#: src/cfg_errors.c:57
+msgid "Status Bar, Above Panes"
+msgstr ""
 
-#: src/cfg_mount.c:184
-msgid "Mount When?"
-msgstr "Kiedy montowaæ?"
+#: src/cfg_errors.c:60
+msgid "Main Window's Title Bar"
+msgstr ""
 
-#: src/cfg_mount.c:196
-msgid "Mount Options"
-msgstr "Opcje montowania"
+#: src/cfg_errors.c:63
+msgid "Separate Dialog"
+msgstr ""
 
-#: src/cfg_mount.c:199
-msgid "Mount Command"
-msgstr "Komenda montowania"
+#: src/cfg_errors.c:69
+msgid "Cause Console Beep on Error?"
+msgstr "BrzÄczyk systemowy przy bÅÄdzie?"
 
-#: src/cfg_mount.c:204
-msgid "Unmount Command"
-msgstr "Komenda odmontowania"
+#: src/cfg_menus.c:44
+msgid "Menus"
+msgstr "Menu"
 
-#: src/cfg_mount.c:211
-msgid "Only Mount on Toplevel Directories?"
-msgstr "Montuj tylko katalogi najwy¿szego rzêdu"
+#: src/cfg_nag.c:78
+#, c-format
+msgid ""
+"Click the button below to reset the %zu stored 'Don't show this dialog "
+"again' responses."
+msgstr ""
 
-#: src/cfg_mount.c:214
-msgid "Use Command Error Dialog?"
-msgstr "Uzywaj dialogu b³êdu"
+#: src/cfg_nag.c:100
+msgid "Nagging"
+msgstr ""
 
-#: src/cfg_mount.c:217
-msgid "Unmount When gentoo Quits?"
-msgstr "Odmontuj przy zamykaniu gentoo"
+#: src/cfg_nag.c:110
+#, fuzzy
+msgid "Reset All"
+msgstr "DomyÅlne ustawienia"
 
-#: src/cfg_paths.c:128
-msgid "GTK+ RC"
-msgstr "GTK+ RC"
+#: src/cfg_paths.c:78
+msgid "Edit path"
+msgstr ""
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:152
 msgid "Icons"
 msgstr "Ikony"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:153
+msgid "GTK+ RC"
+msgstr "GTK+ RC"
+
+#: src/cfg_paths.c:154
 msgid "fstab"
 msgstr "fstab"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:155
 msgid "mtab"
 msgstr "mtab"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Beginning With Dot (.)"
-msgstr "Zaczynaj±ce siê od kropki (.)"
+msgstr "ZaczynajÄce siÄ od kropki (.)"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Matching RE"
-msgstr "Odpowiadaj±ce wzorcowi"
+msgstr "OdpowiadajÄce wzorcowi"
 
-#: src/cfg_paths.c:129 src/cmd_chmod.c:259 src/menus.c:512
+#: src/cfg_paths.c:157 src/cmd_chmod.c:252 src/menus.c:519
 msgid "None"
-msgstr "¯adne"
+msgstr "Å»adne"
 
-#: src/cfg_paths.c:135
+#: src/cfg_paths.c:163
 msgid "Paths & Hide"
-msgstr "¦cie¿ki & Ukrywanie"
+msgstr "ÅcieÅ¼ki & Ukrywanie"
 
-#: src/cfg_paths.c:142
+#: src/cfg_paths.c:170
 msgid "Paths"
-msgstr "¦cie¿ki"
+msgstr "ÅcieÅ¼ki"
 
-#: src/cfg_paths.c:169
+#: src/cfg_paths.c:209
 msgid "Hide Entries"
 msgstr "Ukrywaj wpisy"
 
-#: src/cfg_styles.c:170 src/cfg_types.c:234 src/iconutil.c:29 src/menus.c:19
+#: src/cfg_styles.c:178 src/cfg_types.c:233 src/iconutil.c:31 src/menus.c:19
 msgid "(None)"
-msgstr "(¿adne)"
+msgstr "(Å¼adne)"
 
-#: src/cfg_styles.c:191 src/cfg_styles.c:428 src/cfg_styles.c:767
+#: src/cfg_styles.c:199 src/cfg_styles.c:436 src/cfg_styles.c:785
 msgid "Delete Action"
-msgstr "Usuñ zdarzenie"
+msgstr "UsuÅ zdarzenie"
 
-#: src/cfg_styles.c:411 src/color_dialog.c:48
+#: src/cfg_styles.c:419 src/color_dialog.c:47
 msgid "Edit Color"
 msgstr "Edytuj kolor"
 
-#: src/cfg_styles.c:428
+#: src/cfg_styles.c:436
 msgid "Revert to Inherited Command"
-msgstr "Powróæ do odziedziczonej komendy"
+msgstr "PowrÃ³Ä do odziedziczonej komendy"
 
-#: src/cfg_styles.c:529
+#: src/cfg_styles.c:537
 #, fuzzy
 msgid "Select Command ..."
-msgstr "Wybór komendy"
+msgstr "WybÃ³r komendy"
 
-#: src/cfg_styles.c:592
+#: src/cfg_styles.c:601
 msgid "New Action Property"
-msgstr "W³a¶ciwo¶ci nowego zdarzenia"
+msgstr "WÅaÅciwoÅci nowego zdarzenia"
 
-#: src/cfg_styles.c:600
+#: src/cfg_styles.c:609
 msgid "something"
-msgstr "co¶"
+msgstr "coÅ"
 
-#: src/cfg_styles.c:670
+#: src/cfg_styles.c:679
 msgid ""
 "Deleting this style will also delete\n"
 "all its children. Are you sure?"
 msgstr ""
-"Usuniêcie tego stylu spowoduje usuniêcie\n"
-"wszystkich styli potomnych. Jeste¶ pewien?"
+"UsuniÄcie tego stylu spowoduje usuniÄcie\n"
+"wszystkich styli potomnych. JesteÅ pewien?"
 
-#: src/cfg_styles.c:671
+#: src/cfg_styles.c:680
 msgid "Confirm Delete"
-msgstr "Potwierd¼ usuniêcie"
+msgstr "PotwierdÅº usuniÄcie"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Background Color"
-msgstr "Kolor t³a"
+msgstr "Kolor tÅa"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Foreground Color"
-msgstr "Kolor g³ówny"
+msgstr "Kolor gÅÃ³wny"
 
-#: src/cfg_styles.c:694 src/dpformat.c:53
+#: src/cfg_styles.c:703 src/dpformat.c:55
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/cfg_styles.c:696
+#: src/cfg_styles.c:705
 msgid "(Row Style Preview Text)"
-msgstr "(Styl rzêdu podgl±d tekstu)"
+msgstr "(Styl rzÄdu podglÄd tekstu)"
 
-#: src/cfg_styles.c:702 src/cmd_renameseq.c:386
+#: src/cfg_styles.c:713 src/cmd_renameseq.c:358 src/cmd_split.c:656
 msgid "Preview"
-msgstr "Podgl±d"
+msgstr "PodglÄd"
 
-#: src/cfg_styles.c:719
+#: src/cfg_styles.c:737
 msgid "Override Parent's?"
 msgstr "Nadpisz macierzyste?"
 
-#: src/cfg_styles.c:723
+#: src/cfg_styles.c:741
 msgid "Pick..."
 msgstr "Wybierz..."
 
-#: src/cfg_styles.c:764
+#: src/cfg_styles.c:782
 msgid "Add Action..."
 msgstr "Dodaj zdarzenie..."
 
-#: src/cfg_styles.c:810 src/menus.c:525
+#: src/cfg_styles.c:829 src/menus.c:532
 msgid "Parent"
 msgstr "Macierzyste"
 
-#: src/cfg_styles.c:820
+#: src/cfg_styles.c:840
 msgid "Inherited Properties"
-msgstr "Potomne w³a¶ciwo¶ci"
+msgstr "Potomne wÅaÅciwoÅci"
 
-#: src/cfg_styles.c:824
+#: src/cfg_styles.c:844
 msgid "Visual"
 msgstr "Wizualne"
 
-#: src/cfg_styles.c:826
+#: src/cfg_styles.c:846
 msgid "Actions"
 msgstr "Zdarzenia"
 
-#: src/cfg_styles.c:843
+#: src/cfg_styles.c:863
 msgid "File Recognition"
-msgstr "Rozpoznawanie plików"
+msgstr "Rozpoznawanie plikÃ³w"
 
-#: src/cfg_styles.c:844
+#: src/cfg_styles.c:864
 msgid "Styles"
 msgstr "Style"
 
-#: src/cfg_types.c:193
+#: src/cfg_types.c:192
 #, c-format
 msgid "%s - Click to Change..."
-msgstr "%s - Naci¶nij aby zmieniæ..."
+msgstr "%s - NaciÅnij aby zmieniÄ..."
 
-#: src/cfg_types.c:508
+#: src/cfg_types.c:507
 msgid "(New Type)"
 msgstr "(Nowy typ)"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "B-Dev"
 msgstr "B-Dev"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "C-Dev"
 msgstr "C-Dev"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Dir"
 msgstr "Katalog"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "FIFO"
 msgstr "FIFO"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "File"
 msgstr "Plik"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Link"
-msgstr "Dowi±zanie"
+msgstr "DowiÄzanie"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Socket"
 msgstr "Gniazdo"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "Readable"
 msgstr "Do odczytu"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetGID"
 msgstr "Z GID"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetUID"
 msgstr "Z UID"
 
-#: src/cfg_types.c:648 src/cmd_chmod.c:209
+#: src/cfg_types.c:647 src/cmd_chmod.c:200
 msgid "Sticky"
 msgstr "\"Sticky\""
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Executable"
 msgstr "Wykonywalny"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Writable"
 msgstr "Do zapisu"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match 'file' (RE)"
 msgstr "Odpowiada wzorcowi pliku"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match Name (RE)"
 msgstr "Odpowiada wzorcowi nazwy"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Require Suffix"
 msgstr "Wymaga rozszerzenia"
 
@@ -1114,25 +1119,25 @@
 msgid "Require Protection"
 msgstr "Wymaga zabezpieczenia"
 
-#: src/cfg_types.c:738
+#: src/cfg_types.c:739
 msgid "Glob?"
 msgstr "Globalnie?"
 
-#: src/cfg_types.c:754
+#: src/cfg_types.c:755
 msgid "Type's Style"
 msgstr "Styl typu"
 
-#: src/cfg_types.c:756
+#: src/cfg_types.c:757
 msgid "Style"
 msgstr "Styl"
 
-#: src/cfg_types.c:796
+#: src/cfg_types.c:797
 msgid "Types"
 msgstr "Typy"
 
 #: src/cfg_windows.c:86
 msgid "Dialog Windows Center On Screen"
-msgstr "Okna dialogowe na ¶rodku ekranu"
+msgstr "Okna dialogowe na Årodku ekranu"
 
 #: src/cfg_windows.c:86
 msgid "Dialog Windows Follow Mouse"
@@ -1140,7 +1145,7 @@
 
 #: src/cfg_windows.c:86
 msgid "Dialog Windows Positioned by Window Manager"
-msgstr "Okna dialogowe umieszczane zgodnie z polityk± zarz±dcy okien"
+msgstr "Okna dialogowe umieszczane zgodnie z politykÄ zarzÄdcy okien"
 
 #: src/cfg_windows.c:94
 msgid "Windows"
@@ -1155,19 +1160,19 @@
 msgid "Dialog Positioning"
 msgstr "Pozycjonowanie okien dialogowych"
 
-#: src/children.c:94
+#: src/children.c:88
 #, c-format
 msgid "Execution of \"%s\" Failed"
-msgstr "Wykonanie \"%s\" nie powiod³o siê"
+msgstr "Wykonanie \"%s\" nie powiodÅo siÄ"
 
-#: src/children.c:95 src/dialog.c:285
+#: src/children.c:89 src/dialog.c:290
 msgid "Error"
-msgstr "B³±d"
+msgstr "BÅÄd"
 
-#: src/children.c:274
+#: src/children.c:227
 #, c-format
 msgid "Couldn't terminate child \"%s\" (pid=%d)--zombie alert"
-msgstr "Nie mo¿na zakoñczyæ \"%s\" (pid=%d) -- alarm: proces zombie"
+msgstr "Nie moÅ¼na zakoÅczyÄ \"%s\" (pid=%d) -- alarm: proces zombie"
 
 #: src/cmd_about.c:54
 #, c-format
@@ -1186,7 +1191,7 @@
 
 #: src/cmd_about.c:97
 #, fuzzy
-msgid "(c) 1998-2009 by Emil Brink, Obsession Development.\n"
+msgid "(c) 1998-2011 by Emil Brink, Obsession Development.\n"
 msgstr "(c) 1998-2008 - Emil Brink, Obsession Development.\n"
 
 #: src/cmd_about.c:99
@@ -1195,201 +1200,182 @@
 "WARRANTY. Read the file COPYING for more details.\n"
 msgstr ""
 "To jest wolne oprogramowanie, i jako takie autor nie udziela\n"
-"JAKIEJKOLWIEK GWARANCJI dzia³ania. Przeczytaj plik COPYING\n"
-"dla uzyskania wiêcej szczegó³ów.\n"
-
-#: src/cmd_about.c:106
-msgid "FAM: Supported and active."
-msgstr "FAM: Wspierane i aktywne"
+"JAKIEJKOLWIEK GWARANCJI dziaÅania. Przeczytaj plik COPYING\n"
+"dla uzyskania wiÄcej szczegÃ³ÅÃ³w.\n"
 
-#: src/cmd_about.c:108
-msgid "FAM: Supported, but not active."
-msgstr "FAM: Wspierane, nieaktywne."
-
-#: src/cmd_about.c:110
-msgid "FAM: Not supported."
-msgstr "FAM: nie wspierane."
-
-#: src/cmd_about.c:116
+#: src/cmd_about.c:105
 msgid "NLS: Supported, using built-in English strings."
-msgstr "NLS: Wspierane, u¿wyane domy¶lne angielskie t³umaczenie."
+msgstr "NLS: Wspierane, uÅ¼wyane domyÅlne angielskie tÅumaczenie."
 
-#: src/cmd_about.c:129
-#, fuzzy
+#: src/cmd_about.c:118
+#, fuzzy, c-format
 msgid ""
 "The author of gentoo can be reached via Internet\n"
-"e-mail at <emil@obsession.se>; feel free to let\n"
+"e-mail at <a href=\"mailto:%s\">%s</a>; feel free to let\n"
 "me know what you think of this software, give\n"
 "suggestions/bug reports, and so on.\n"
 "\n"
 "The latest release of gentoo can always be down-\n"
 "loaded from the official gentoo project homepage at\n"
-"<http://www.obsession.se/gentoo/>. New releases are\n"
+"<a href=\"%s\">%s</a>. New releases are\n"
 "typically announced on the Freshmeat service at\n"
-"<http://freshmeat.net/>."
+"<a href=\"http://freshmeat.net/\">freshmeat.net</a>."
 msgstr ""
-"Kontakt z autorem gentoo jest mo¿liwy przez internet\n"
-"email : <emil@obsession.se>; czuj siê zachêcony do \n"
-"przekazania mi co my¶lisz o tym oprogramowaniu, \n"
-"przeka¿ sugestie/raporty b³êdów itp.\n"
+"Kontakt z autorem gentoo jest moÅ¼liwy przez internet\n"
+"email : <emil@obsession.se>; czuj siÄ zachÄcony do \n"
+"przekazania mi co myÅlisz o tym oprogramowaniu, \n"
+"przekaÅ¼ sugestie/raporty bÅÄdÃ³w itp.\n"
 "\n"
 "\n"
-"W³asne widgety - J. Hanson <johan@tiq.com>.\n"
+"WÅasne widgety - J. Hanson <johan@tiq.com>.\n"
 "\n"
-"Najnowsza wersja gentoo mo¿e byæ zawsze sci±gniêta\n"
+"Najnowsza wersja gentoo moÅ¼e byÄ zawsze sciÄgniÄta\n"
 "z oficjalnej strony projektu gentoo <http://www.obsession.se/gentoo/>.\n"
-"Nowe wersje s± najczêsciej og³aszane w serwisie Freshmeat \n"
+"Nowe wersje sÄ najczÄsciej ogÅaszane w serwisie Freshmeat \n"
 "<http://freshmeat.net/>."
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "About gentoo"
 msgstr "O gentoo"
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "_OK (Wait for More)"
-msgstr "_OK (Czekaj na wiêcej)"
+msgstr "_OK (Czekaj na wiÄcej)"
 
 #: src/cmd_chmod.c:98
 #, c-format
 msgid "Set protection bits for \"%s\":"
 msgstr "Ustaw bity zabezpieczenia dla \"%s\":"
 
-#: src/cmd_chmod.c:208 src/cmd_chown.c:184 src/cmd_info.c:202
+#: src/cmd_chmod.c:199 src/cmd_chown.c:176 src/cmd_info.c:274
 msgid "Group"
 msgstr "Grupa"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Others"
 msgstr "Inne/i"
 
-#: src/cmd_chmod.c:208 src/cmd_info.c:195
+#: src/cmd_chmod.c:199 src/cmd_info.c:267
 msgid "Owner"
-msgstr "W³a¶ciciel"
+msgstr "WÅaÅciciel"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Special"
 msgstr "Specjalne"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Read"
 msgstr "Czytaj"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set GID"
 msgstr "Ustaw GID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set UID"
 msgstr "Ustaw UID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Write"
 msgstr "Zapis"
 
-#: src/cmd_chmod.c:231
+#: src/cmd_chmod.c:222
 msgid "Protection Bits"
 msgstr "Bity zabezpieczenia"
 
-#: src/cmd_chmod.c:242
+#: src/cmd_chmod.c:233
 msgid "Textual"
 msgstr ""
 
-#: src/cmd_chmod.c:253
+#: src/cmd_chmod.c:246
 #, fuzzy
 msgid "Octal"
-msgstr "8, ósemkowo"
+msgstr "8, Ã³semkowo"
 
-#: src/cmd_chmod.c:258 src/menus.c:511
+#: src/cmd_chmod.c:251 src/menus.c:518
 msgid "All"
 msgstr "Wszystko"
 
-#: src/cmd_chmod.c:261
+#: src/cmd_chmod.c:253 src/menus.c:520
+msgid "Toggle"
+msgstr "ZmieÅ"
+
+#: src/cmd_chmod.c:254
 msgid "Revert"
-msgstr "Odwróæ"
+msgstr "OdwrÃ³Ä"
 
-#: src/cmd_chmod.c:273 src/cmd_chown.c:208 src/cmd_info.c:304
+#: src/cmd_chmod.c:266 src/cmd_chown.c:201 src/cmd_info.c:372
 msgid "Recurse Directories?"
-msgstr "W g³±b katalogów?"
+msgstr "W gÅÄb katalogÃ³w?"
 
-#: src/cmd_chmod.c:276
+#: src/cmd_chmod.c:269
 msgid "Don't Touch Directories?"
-msgstr "Bez uwzglêdnienia katalogów?"
+msgstr "Bez uwzglÄdnienia katalogÃ³w?"
 
-#: src/cmd_chmod.c:281
+#: src/cmd_chmod.c:274
 msgid "Change Mode"
 msgstr "Zmiana trybu"
 
-#: src/cmd_chown.c:56
+#: src/cmd_chown.c:57
 #, c-format
 msgid "Set Ownership for '%s':"
-msgstr "Ustaw w³a¶ciciela dla '%s':"
+msgstr "Ustaw wÅaÅciciela dla '%s':"
 
-#: src/cmd_chown.c:184
+#: src/cmd_chown.c:176
 msgid "User"
-msgstr "U¿ytkownik"
+msgstr "UÅ¼ytkownik"
 
-#: src/cmd_chown.c:213
+#: src/cmd_chown.c:206
 msgid "Change Ownership"
-msgstr "Zmieñ w³a¶ciciela"
+msgstr "ZmieÅ wÅaÅciciela"
 
 #: src/cmd_configure.c:50
 msgid "Automatically Save Changed Configuration on Exit?"
-msgstr "Automatycznie zapisuj zmiany konfiguracji podczas wyj¶cia z programu ?"
-
-#: src/cmd_copy.c:302
-#, c-format
-msgid ""
-"Can't copy directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"Nie mo¿na skopiowaæ katalogu \"%s\"\n"
-"do \"%s\":\n"
-"¼ród³o zawiera katalog docelowy."
+msgstr "Automatycznie zapisuj zmiany konfiguracji podczas wyjÅcia z programu ?"
 
-#: src/cmd_copy.c:392 src/cmd_copyas.c:62
+#: src/cmd_copy.c:175 src/cmd_copyas.c:62
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Copy?"
-msgstr "\"%s\" ju¿ istnieje - kontynuowaæ kopiowanie?"
+msgstr "\"%s\" juÅ¼ istnieje - kontynuowaÄ kopiowanie?"
 
-#: src/cmd_copy.c:393
+#: src/cmd_copy.c:176
 msgid "Copying..."
 msgstr "Kopiowanie..."
 
-#: src/cmd_copy.c:440
+#: src/cmd_copy.c:217
 msgid "Preserve Dates During Copy?"
-msgstr "Zachowaæ daty podczas kopiowania?"
+msgstr "ZachowaÄ daty podczas kopiowania?"
 
-#: src/cmd_copy.c:441
+#: src/cmd_copy.c:218
 msgid "Ignore Failure to Copy Attributes (Date, Owner, Mode)?"
-msgstr "Ignoruj b³±d kopiowania atrybutów (Data, W³a¶ciciel, Tryb) ?\""
+msgstr "Ignoruj bÅÄd kopiowania atrybutÃ³w (Data, WÅaÅciciel, Tryb) ?\""
 
-#: src/cmd_copy.c:442
+#: src/cmd_copy.c:219
 msgid "Leave Failed Destination if Full Size?"
-msgstr "Zostaw niedokoñczony cel je¶li pe³ny?"
+msgstr "Zostaw niedokoÅczony cel jeÅli peÅny?"
 
-#: src/cmd_copy.c:443 src/cmd_viewtext.c:207
+#: src/cmd_copy.c:220 src/cmd_viewtext.c:204
 msgid "Buffer Size"
-msgstr "Wielko¶æ bufora"
+msgstr "WielkoÅÄ bufora"
 
-#: src/cmd_copyas.c:51
+#: src/cmd_copyas.c:49
 #, c-format
 msgid "Enter Name for Copy of \"%s\""
-msgstr "Podaj nazwê dla kopiowanego \"%s\""
+msgstr "Podaj nazwÄ dla kopiowanego \"%s\""
 
-#: src/cmd_copyas.c:53
+#: src/cmd_copyas.c:51
 #, c-format
 msgid "Enter Name for Clone of \"%s\""
-msgstr "Podaj nazwê dla klonu \"%s\""
+msgstr "Podaj nazwÄ dla klonu \"%s\""
 
 #: src/cmd_copyas.c:64
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Clone?"
-msgstr "\"%s\" ju¿ istnieje - kontynuowaæ klonowanie?"
+msgstr "\"%s\" juÅ¼ istnieje - kontynuowaÄ klonowanie?"
 
 #: src/cmd_copyas.c:65
 msgid "Cloning..."
@@ -1402,35 +1388,35 @@
 #: src/cmd_copyas.c:79
 #, c-format
 msgid "Enter Name to Link \"%s\" As"
-msgstr "Wprowad¼ nazwê dla dowi±zania \"%s\" jako"
+msgstr "WprowadÅº nazwÄ dla dowiÄzania \"%s\" jako"
 
 #: src/cmd_copyas.c:81
 #, c-format
 msgid "Enter Name for Link Clone of \"%s\""
-msgstr "Wprowad¼ nazwê dla dowi±zania klonu \"%s\""
+msgstr "WprowadÅº nazwÄ dla dowiÄzania klonu \"%s\""
 
-#: src/cmd_copyas.c:89
+#: src/cmd_copyas.c:91
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Symlink?"
-msgstr "\"%s\" ju¿ istnieje - kontynuowaæ dowi±zanie symboliczne?"
+msgstr "\"%s\" juÅ¼ istnieje - kontynuowaÄ dowiÄzanie symboliczne?"
 
-#: src/cmd_copyas.c:204 src/cmd_copyas.c:210
+#: src/cmd_copyas.c:200 src/cmd_copyas.c:207
 msgid "Copy As"
 msgstr "Kopiuj jako"
 
-#: src/cmd_copyas.c:212
+#: src/cmd_copyas.c:209
 msgid "Clone"
 msgstr "Klonowanie"
 
-#: src/cmd_copyas.c:214
+#: src/cmd_copyas.c:211
 msgid "Symbolic Link As"
-msgstr "Dowi±zanie symboliczne jako"
+msgstr "DowiÄzanie symboliczne jako"
 
-#: src/cmd_copyas.c:216
+#: src/cmd_copyas.c:213
 msgid "Symbolic Link Clone"
-msgstr "Dowi±zanie symboliczne klon"
+msgstr "DowiÄzanie symboliczne klon"
 
-#: src/cmd_delete.c:55
+#: src/cmd_delete.c:56
 #, c-format
 msgid ""
 "%s\n"
@@ -1438,309 +1424,320 @@
 "Attempt to change protection and retry?"
 msgstr ""
 "%s\n"
-"Nie mo¿e zostaæ skasowany ze wzglêdu na ograniczenia dostêpu.\n"
-"Spróbowaæ zmieniæ zabezpieczenie i ponowiæ?"
+"Nie moÅ¼e zostaÄ skasowany ze wzglÄdu na ograniczenia dostÄpu.\n"
+"SprÃ³bowaÄ zmieniÄ zabezpieczenie i ponowiÄ?"
 
-#: src/cmd_delete.c:58
+#: src/cmd_delete.c:59
 msgid "Remember the answer (alters config)"
-msgstr "Zapamiêtaj odpowied¼ (zmienia konfiguracjê)"
+msgstr "ZapamiÄtaj odpowiedÅº (zmienia konfiguracjÄ)"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Access Problem"
-msgstr "Problem dostêpu"
+msgstr "Problem dostÄpu"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Change|Leave Alone"
-msgstr "Zmieñ| Pozostaw"
+msgstr "ZmieÅ| Pozostaw"
 
-#: src/cmd_delete.c:236
+#: src/cmd_delete.c:215
 #, c-format
 msgid "Really Delete \"%s\"?"
-msgstr "Naprawdê skasowaæ \"%s\" ?"
+msgstr "NaprawdÄ skasowaÄ \"%s\" ?"
 
-#: src/cmd_delete.c:237
+#: src/cmd_delete.c:216
 msgid "Deleting..."
 msgstr "Usuwanie..."
 
-#: src/cmd_delete.c:292
+#: src/cmd_delete.c:279
 msgid "On Access Failure"
-msgstr "B³±d podczas dostêpu"
+msgstr "BÅÄd podczas dostÄpu"
 
-#: src/cmd_delete.c:293
+#: src/cmd_delete.c:280
 msgid "Ask User|Automatically Try Changing, and Retry|Fail"
-msgstr "Zapytaj|Automatycznie spróbuj zmieniæ, wykonaj ponownie|Przerwij"
+msgstr "Zapytaj|Automatycznie sprÃ³buj zmieniÄ, wykonaj ponownie|Przerwij"
+
+#: src/cmd_dpfocus.c:33
+msgid "DpFocus Command is Deprecated"
+msgstr ""
 
-#: src/cmd_dpfocus.c:183
-msgid "Wrap Around At Top And Bottom?"
-msgstr "Zawiñ u góry i do³u?"
+#: src/cmd_dpfocus.c:34
+msgid ""
+"The <tt>DpFocus</tt> command has been deprecated and is no longer supported. "
+"Please remove any keyboard or mouse bindings that use it and look into using "
+"the default GTK+ list view's cursor controls."
+msgstr ""
 
-#: src/cmd_dpfocus.c:184
+#: src/cmd_dpfocus.c:64
 msgid "Treat Focused Row As Selection If No \"Real\" Selection Exists?"
 msgstr ""
-"Traktuj pod¶wietlone rzêdy jako zaznaczone je¶li nie istniej± \"prawdziwe\" "
+"Traktuj podÅwietlone rzÄdy jako zaznaczone jeÅli nie istniejÄ \"prawdziwe\" "
 "zaznaczenia?"
 
-#: src/cmd_dpfocus.c:186
+#: src/cmd_dpfocus.c:66
 msgid "Move Focus to Last Selected/Deselected Row?"
-msgstr "Przesuñ pod¶wietlenie do ostatnio zaznaczonego/odznaczonego rzêdu?"
+msgstr "PrzesuÅ podÅwietlenie do ostatnio zaznaczonego/odznaczonego rzÄdu?"
 
-#: src/cmd_dpfocusisrch.c:220
+#: src/cmd_dpfocusisrch.c:163
 msgid "ISearch"
 msgstr "lSzukaj"
 
-#: src/cmd_generic.c:136
+#: src/cmd_generic.c:143
 msgid "_OK|A_ll|_Skip|_Cancel"
-msgstr "_OK|_Wszystko|_Pomiñ|_Anuluj"
+msgstr "_OK|_Wszystko|_PomiÅ|_Anuluj"
 
-#: src/cmd_generic.c:137
+#: src/cmd_generic.c:144
 msgid "_OK|_Skip|_Cancel"
-msgstr "_OK|_Pomiñ|_Anuluj"
+msgstr "_OK|_PomiÅ|_Anuluj"
 
-#: src/cmd_getsize.c:49
+#: src/cmd_getsize.c:51
 msgid "Getting sizes..."
 msgstr "Pobieranie rozmiaru..."
 
-#: src/cmd_getsize.c:141
+#: src/cmd_getsize.c:134
 msgid "Unselect Rows When Done?"
-msgstr "Odznacz rzêdy po wykonaniu?"
+msgstr "Odznacz rzÄdy po wykonaniu?"
 
-#: src/cmd_info.c:71 src/cmd_info.c:163
-#, c-format
+#: src/cmd_info.c:68 src/errors.c:84
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr ", %s uÅ¼yte"
+
+#: src/cmd_info.c:72
+#, fuzzy, c-format
 msgid ""
-"%s (%s bytes,\n"
-"%s blocks)"
-msgstr ""
-"%s (%s bajtów,\n"
-"%s bloków)"
+"%u dirs, %u files,\n"
+"%u symlinks, %u special files"
+msgstr "%u katalogÃ³w, %u plikÃ³w, %u dowiÄzaÅ symbolicznych"
 
-#: src/cmd_info.c:75
-#, c-format
-msgid "%u dirs, %u files, %u symlinks"
-msgstr "%u katalogów, %u plików, %u dowi±zañ symbolicznych"
+#: src/cmd_info.c:153
+msgid "Value"
+msgstr ""
 
-#: src/cmd_info.c:134
+#: src/cmd_info.c:198
 msgid "Link To"
-msgstr "Dowi±¿ do"
+msgstr "DowiÄÅ¼ do"
 
-#: src/cmd_info.c:145 src/cmd_select.c:399 src/dpformat.c:52
+#: src/cmd_info.c:213 src/cmd_select.c:368 src/dpformat.c:54
 msgid "Type"
 msgstr "Typ"
 
-#: src/cmd_info.c:148
+#: src/cmd_info.c:216
 msgid "Location"
-msgstr "Po³o¿enie"
+msgstr "PoÅoÅ¼enie"
 
-#: src/cmd_info.c:151 src/dpformat.c:36 src/window.c:200
+#: src/cmd_info.c:219 src/cmd_split.c:653 src/dpformat.c:37 src/window.c:199
 msgid "Size"
-msgstr "Wielko¶æ"
+msgstr "WielkoÅÄ"
 
-#: src/cmd_info.c:172
+#: src/cmd_info.c:229
+#, fuzzy, c-format
+msgid "%s (%s bytes)"
+msgstr ""
+"%u "
+"bajtÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÃÅ¡ÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂw"
+
+#: src/cmd_info.c:240
 msgid "Contains"
 msgstr "Zawiera"
 
-#: src/cmd_info.c:186
+#: src/cmd_info.c:257
 msgid "'File' Info"
 msgstr "Informacja o pliku"
 
-#: src/cmd_info.c:213 src/dpformat.c:49
+#: src/cmd_info.c:285 src/dpformat.c:50
 msgid "Accessed"
-msgstr "Czas dostêpu"
+msgstr "Czas dostÄpu"
 
-#: src/cmd_info.c:214 src/dpformat.c:50
+#: src/cmd_info.c:286 src/dpformat.c:51
 msgid "Modified"
 msgstr "Czas modyfikacji"
 
-#: src/cmd_info.c:215
+#: src/cmd_info.c:287 src/dpformat.c:53
 msgid "Changed"
 msgstr "Czas zmiany"
 
-#: src/cmd_info.c:263
+#: src/cmd_info.c:288 src/dpformat.c:52
+msgid "Created"
+msgstr "Utworzony"
+
+#: src/cmd_info.c:290
+#, fuzzy
+msgid "Basic"
+msgstr "Baza"
+
+#: src/cmd_info.c:294
+msgid "Attributes"
+msgstr ""
+
+#: src/cmd_info.c:338
 msgid "Getting Information..."
 msgstr "Pobieranie informacji..."
 
-#: src/cmd_info.c:302
+#: src/cmd_info.c:370
 msgid "Show 'file' Output?"
-msgstr "Poka¿ wyj¶cie pliku?"
+msgstr "PokaÅ¼ wyjÅcie pliku?"
 
-#: src/cmd_info.c:305
+#: src/cmd_info.c:373
 msgid "Access Date Format"
-msgstr "Format daty dostêpu"
+msgstr "Format daty dostÄpu"
 
-#: src/cmd_info.c:306
+#: src/cmd_info.c:374
 msgid "Modify Date Format"
 msgstr "Format daty modyfikacji"
 
-#: src/cmd_info.c:307
+#: src/cmd_info.c:375
 msgid "Change Date Format"
 msgstr "Format daty zmiany"
 
-#: src/cmd_info.c:308
+#: src/cmd_info.c:376
 msgid "Size Tick Mark"
-msgstr "Wygl±d znacznika"
+msgstr "WyglÄd znacznika"
 
-#: src/cmd_join.c:47
+#: src/cmd_join.c:46
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Join?"
-msgstr "\"%s\" ju¿ istnieje - kontynuowaæ ³±czenie?"
+msgstr "\"%s\" juÅ¼ istnieje - kontynuowaÄ ÅÄczenie?"
 
-#: src/cmd_join.c:76
+#: src/cmd_join.c:73
 msgid "Joining..."
-msgstr "£±czenie..."
+msgstr "ÅÄczenie..."
 
-#: src/cmd_join.c:162
+#: src/cmd_join.c:167
 msgid "Click and Drag Files to Reorder, Then Click Join."
 msgstr ""
-"Kliknij i przeci±gnij pliki aby zmieniæ porz±dek, Kliknij aby po³±czyæ."
+"Kliknij i przeciÄgnij pliki aby zmieniÄ porzÄdek, Kliknij aby poÅÄczyÄ."
 
-#: src/cmd_join.c:170
+#: src/cmd_join.c:175
 #, c-format
 msgid "The total size is %s (%lu bytes)."
-msgstr "Ca³kowity rozmiar to %s (%lu bajtów)."
+msgstr "CaÅkowity rozmiar to %s (%lu bajtÃ³w)."
 
-#: src/cmd_join.c:173
+#: src/cmd_join.c:178
 #, c-format
 msgid "The total size is %lu bytes."
-msgstr "Ca³kowity rozmiar to %lu bajtów."
+msgstr "CaÅkowity rozmiar to %lu bajtÃ³w."
 
-#: src/cmd_join.c:215
+#: src/cmd_join.c:220
 msgid "Enter Destination File Name"
-msgstr "Wprowad¼ docelow± nazwê pliku"
+msgstr "WprowadÅº docelowÄ nazwÄ pliku"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "Join"
-msgstr "Po³±cz"
+msgstr "PoÅÄcz"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "_Join|_Cancel"
-msgstr "_Po³±cz|_Anuluj"
+msgstr "_PoÅÄcz|_Anuluj"
 
-#: src/cmd_mkdir.c:75
+#: src/cmd_mkdir.c:65
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With MkDir?"
-msgstr "\"%s\" ju¿ istnieje - kontynuowaæ tworzenie katalogu?"
+msgstr "\"%s\" juÅ¼ istnieje - kontynuowaÄ tworzenie katalogu?"
 
-#: src/cmd_mkdir.c:125
+#: src/cmd_mkdir.c:119
 msgid "Enter Name of Directory to Create"
-msgstr "Wprowad¼ nazwê katalogu do utworzenia"
+msgstr "WprowadÅº nazwÄ katalogu do utworzenia"
 
-#: src/cmd_mkdir.c:133
+#: src/cmd_mkdir.c:128
 msgid "Make Directory"
-msgstr "Utwórz katalog"
+msgstr "UtwÃ³rz katalog"
 
-#: src/cmd_mkdir.c:156
+#: src/cmd_mkdir.c:151
 msgid "CD Into New Directory?"
 msgstr "CD do nowego katalogu?"
 
-#: src/cmd_mkdir.c:157
+#: src/cmd_mkdir.c:152
 msgid "Focus New Directory?"
-msgstr "Pod¶wietlenie nowego katalogu?"
-
-#: src/cmd_move.c:81
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"Nie mo¿na przenie¶æ katalogu \"%s\"\n"
-"do \"%s\":\n"
-"¼ród³o zawiera katalog docelowy."
+msgstr "PodÅwietlenie nowego katalogu?"
 
-#: src/cmd_move.c:92
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the destination contains the source."
-msgstr ""
-"Nie mo¿na przenie¶æ katalogu \"%s\"\n"
-"do \"%s\":\n"
-"katalog docelowy zawiera ¼ród³o."
-
-#: src/cmd_move.c:188 src/cmd_moveas.c:48
+#: src/cmd_move.c:128 src/cmd_moveas.c:51
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Move?"
-msgstr "\"%s\" ju¿ istnieje - kontynuowaæ przeniesienie?"
+msgstr "\"%s\" juÅ¼ istnieje - kontynuowaÄ przeniesienie?"
 
-#: src/cmd_move.c:189
+#: src/cmd_move.c:129
 msgid "Moving..."
 msgstr "Przenoszenie..."
 
-#: src/cmd_moveas.c:40
+#: src/cmd_moveas.c:41
 #, c-format
 msgid "Enter Name to Move \"%s\" As"
-msgstr "Wprowad¼ nazwê do przeniesienia \"%s\" jako"
+msgstr "WprowadÅº nazwÄ do przeniesienia \"%s\" jako"
+
+#: src/cmd_moveas.c:66
+msgid "Invalid destination name for MoveAs"
+msgstr ""
 
 #: src/cmd_moveas.c:74
 msgid "Moving As..."
 msgstr "Przenoszenie jako..."
 
-#: src/cmd_moveas.c:105 src/cmd_moveas.c:110
+#: src/cmd_moveas.c:105 src/cmd_moveas.c:113
 msgid "Move As"
-msgstr "Przenie¶ jako"
+msgstr "PrzenieÅ jako"
 
 #: src/cmd_quit.c:40
 msgid ""
 "You may have some unsaved configuration changes.\n"
 "Quitting without saving will lose them. Really quit?"
 msgstr ""
-"Mo¿esz mieæ niezapisan± konfiguracjê.\n"
-"Przy wyj¶ciu mo¿esz je utraciæ. Naprawdê wyj¶æ?"
+"MoÅ¼esz mieÄ niezapisanÄ konfiguracjÄ.\n"
+"Przy wyjÅciu moÅ¼esz je utraciÄ. NaprawdÄ wyjÅÄ?"
 
 #: src/cmd_quit.c:42 src/cmd_quit.c:54
 msgid "Confirm Quitting"
-msgstr "Potwierd¼ wyj¶cie"
+msgstr "PotwierdÅº wyjÅcie"
 
 #: src/cmd_quit.c:42
 msgid "_Quit|_Save, then Quit|_Cancel"
-msgstr "_Wyj¶cie|_Zapisz, potem wyjd¼|_Anuluj"
+msgstr "_WyjÅcie|_Zapisz, potem wyjdÅº|_Anuluj"
 
 #: src/cmd_quit.c:54
 msgid "Are you sure you want to quit?"
-msgstr "Jeste¶ pewien, ¿e chcesz wyj¶æ?"
+msgstr "JesteÅ pewien, Å¼e chcesz wyjÅÄ?"
 
-#: src/cmd_rename.c:44
+#: src/cmd_rename.c:57
 #, c-format
 msgid "Enter New Name For \"%s\""
-msgstr "Wprowad¼ now± nazwê dla \"%s\""
+msgstr "WprowadÅº nowÄ nazwÄ dla \"%s\""
 
-#: src/cmd_rename.c:52 src/cmd_renamere.c:147 src/cmd_renamere.c:243
-#: src/cmd_renamere.c:293 src/cmd_renamere.c:388 src/cmd_renameseq.c:161
+#: src/cmd_rename.c:67 src/cmd_renamere.c:142 src/cmd_renamere.c:225
+#: src/cmd_renamere.c:268 src/cmd_renamere.c:367 src/cmd_renameseq.c:152
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Rename?"
-msgstr "\"%s\" ju¿ istnieje - kontynuowaæ zmianê nazwy?"
+msgstr "\"%s\" juÅ¼ istnieje - kontynuowaÄ zmianÄ nazwy?"
 
-#: src/cmd_rename.c:132
+#: src/cmd_rename.c:245
 msgid "Rename"
-msgstr "Zmieñ nazwê"
+msgstr "ZmieÅ nazwÄ"
 
-#: src/cmd_renamere.c:260
-msgid "Regular expression error:\n"
-msgstr "B³±d wyra¿enia regularnego:\n"
+#: src/cmd_rename.c:261
+msgid "Rename Single File In-Place (Without Dialog)?"
+msgstr ""
 
-#: src/cmd_renamere.c:446
+#: src/cmd_renamere.c:419
 msgid ""
 "Look for substring in all filenames, and replace\n"
 "it with another string."
-msgstr "Szukaj ci±gu w ka¿dej nazwie pliku, zamieñ je nowym ci±giem."
+msgstr "Szukaj ciÄgu w kaÅ¼dej nazwie pliku, zamieÅ je nowym ciÄgiem."
 
-#: src/cmd_renamere.c:449
+#: src/cmd_renamere.c:422
 msgid "Replace"
-msgstr "Zamieñ"
+msgstr "ZamieÅ"
 
-#: src/cmd_renamere.c:453
+#: src/cmd_renamere.c:426
 msgid "With"
 msgstr "Z"
 
-#: src/cmd_renamere.c:461
+#: src/cmd_renamere.c:434
 msgid "Replace All?"
-msgstr "Zamieñ wszystko?"
+msgstr "ZamieÅ wszystko?"
 
-#: src/cmd_renamere.c:465
+#: src/cmd_renamere.c:438
 msgid "Simple"
 msgstr "Proste"
 
-#: src/cmd_renamere.c:469
+#: src/cmd_renamere.c:442
 msgid ""
 "Execute the 'From' RE on each filename, storing\n"
 "parenthesised subexpression matches. Then replace\n"
@@ -1748,83 +1745,83 @@
 "(counting from 1) of a subexpression, with the text\n"
 "that matched, and use the result as a new filename."
 msgstr ""
-"Wykonaj \"Z wyr. reg.\" na ka¿dym pliku, zapisuj±c przetworzone\n"
-"podwyra¿enia, które pasuj±. Zamieñ wyst±pienie ka¿dego $n w \"Do\",\n"
-"gdzie n jest indeksem (licz±c od 1) podwyra¿enia, z tekstem który pasuje,\n"
-" u¿ywaj±c wyniku jako nowej nazwy pliku."
+"Wykonaj \"Z wyr. reg.\" na kaÅ¼dym pliku, zapisujÄc przetworzone\n"
+"podwyraÅ¼enia, ktÃ³re pasujÄ. ZamieÅ wystÄpienie kaÅ¼dego $n w \"Do\",\n"
+"gdzie n jest indeksem (liczÄc od 1) podwyraÅ¼enia, z tekstem ktÃ³ry pasuje,\n"
+" uÅ¼ywajÄc wyniku jako nowej nazwy pliku."
 
-#: src/cmd_renamere.c:477 src/cmd_renamere.c:500
+#: src/cmd_renamere.c:450 src/cmd_renamere.c:473
 msgid "From"
 msgstr "Z"
 
-#: src/cmd_renamere.c:481 src/cmd_renamere.c:504
+#: src/cmd_renamere.c:454 src/cmd_renamere.c:477
 msgid "To"
 msgstr "Do"
 
-#: src/cmd_renamere.c:489
+#: src/cmd_renamere.c:462
 msgid "Reg Exp"
 msgstr "Wyr. Reg."
 
-#: src/cmd_renamere.c:494
+#: src/cmd_renamere.c:467
 msgid ""
 "Look for each character in the 'From' string, and replace\n"
 "any hits with the corresponding character in the 'To' string.\n"
 "Then, any characters in the 'Remove' string are removed from\n"
 "the filename, and the result used as the new name for each file."
 msgstr ""
-"Szukaj ka¿dego znaku z pola 'Z' i zamieñ\n"
+"Szukaj kaÅ¼dego znaku z pola 'Z' i zamieÅ\n"
 "wszystkie znalezione elementy znakiem z pola 'Do'.\n"
-"Dodatkowo, wszystkie znaki z pola 'Usuñ' zostan± usuniête z\n"
-"nazwy pliku. Rezultat zostanie u¿yty jako nowa nazwa dla ka¿dego pliku."
+"Dodatkowo, wszystkie znaki z pola 'UsuÅ' zostanÄ usuniÄte z\n"
+"nazwy pliku. Rezultat zostanie uÅ¼yty jako nowa nazwa dla kaÅ¼dego pliku."
 
-#: src/cmd_renamere.c:513
+#: src/cmd_renamere.c:486
 msgid "Map"
 msgstr "Mapa zamiany"
 
-#: src/cmd_renamere.c:517
+#: src/cmd_renamere.c:490
 msgid ""
 "Changes the case (upper/lower) of the characters\n"
 "in the selected filename(s)."
 msgstr ""
 
-#: src/cmd_renamere.c:519
+#: src/cmd_renamere.c:492
 msgid "Lower Case?"
-msgstr "ma³ymi literami?"
+msgstr "maÅymi literami?"
 
-#: src/cmd_renamere.c:521
+#: src/cmd_renamere.c:494
 msgid "Upper Case?"
-msgstr "DU¯YMI LITERAMI?"
+msgstr "DUÅ»YMI LITERAMI?"
 
-#: src/cmd_renamere.c:523
+#: src/cmd_renamere.c:496
 #, fuzzy
 msgid "Upper Case Initial?"
-msgstr "DU¯YMI LITERAMI?"
+msgstr "DUÅ»YMI LITERAMI?"
 
-#: src/cmd_renamere.c:526
+#: src/cmd_renamere.c:499
 msgid "Case"
 msgstr "Czcionka"
 
-#: src/cmd_renamere.c:528
+#: src/cmd_renamere.c:501
 msgid "RenameRE"
-msgstr "Zmieñ u¿ywaj±c wyra¿eñ regularnych"
+msgstr "ZmieÅ uÅ¼ywajÄc wyraÅ¼eÅ regularnych"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "10, Decimal"
-msgstr "10, Dziesiêtnie"
+msgstr "10, DziesiÄtnie"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (A-F)"
 msgstr "16, szesnastkowo (A-F)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (a-f)"
 msgstr "16, szesnastkowo (a-f)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "8, Octal"
-msgstr "8, ósemkowo"
+msgstr "8, Ã³semkowo"
 
-#: src/cmd_renameseq.c:328
+#: src/cmd_renameseq.c:306
 msgid ""
 "This command renames all selected files\n"
 "into a numbered sequence. The controls\n"
@@ -1832,92 +1829,92 @@
 "formed."
 msgstr ""
 "Ta komenda zmienia wszystkie wybrane pliki w \n"
-"numerowan± sekwencjê. Kontrolki poni¿ej pozwalaj±\n"
-"zdefiniowaæ formê nowych nazw."
+"numerowanÄ sekwencjÄ. Kontrolki poniÅ¼ej pozwalajÄ\n"
+"zdefiniowaÄ formÄ nowych nazw."
 
-#: src/cmd_renameseq.c:335
+#: src/cmd_renameseq.c:313
 msgid "Start At"
 msgstr "Zacznj od"
 
-#: src/cmd_renameseq.c:343 src/cmd_split.c:247
+#: src/cmd_renameseq.c:323 src/cmd_split.c:609
 msgid "Base"
 msgstr "Baza"
 
-#: src/cmd_renameseq.c:359
+#: src/cmd_renameseq.c:333
 msgid "Precision"
 msgstr "Precyzja"
 
-#: src/cmd_renameseq.c:367
+#: src/cmd_renameseq.c:340
 msgid "Head"
-msgstr "Pocz±tkowy"
+msgstr "PoczÄtkowy"
 
-#: src/cmd_renameseq.c:374
+#: src/cmd_renameseq.c:347
 msgid "Tail"
-msgstr "Koñcowy"
+msgstr "KoÅcowy"
 
-#: src/cmd_renameseq.c:382
+#: src/cmd_renameseq.c:354
 msgid "Guess"
 msgstr "Zgaduj"
 
-#: src/cmd_renameseq.c:396
+#: src/cmd_renameseq.c:369
 msgid "Sequential Rename"
 msgstr "Zmiana sekwencyjna"
 
-#: src/cmd_select.c:396
+#: src/cmd_select.c:365
 msgid "All rows|Selected|Unselected|"
-msgstr "Wszystkie rzêdy|Zaznaczone|Odznaczone|"
+msgstr "Wszystkie rzÄdy|Zaznaczone|Odznaczone|"
 
-#: src/cmd_select.c:397
+#: src/cmd_select.c:366
 msgid "All types|Directories only|Non-directories only|"
-msgstr "Wszytkie typy|Tylko katalogi|Bez katalogów|"
+msgstr "Wszytkie typy|Tylko katalogi|Bez katalogÃ³w|"
 
-#: src/cmd_select.c:398
+#: src/cmd_select.c:367
 msgid "Select|Unselect|Toggle|"
-msgstr "Zaznacz|Odznacz|Odwróæ|"
+msgstr "Zaznacz|Odznacz|OdwrÃ³Ä|"
 
-#: src/cmd_select.c:399 src/menus.c:530
+#: src/cmd_select.c:368 src/menus.c:537
 msgid "Action"
 msgstr "Zdarzenie"
 
-#: src/cmd_select.c:399
+#: src/cmd_select.c:368
 msgid "Set"
 msgstr "Ustaw"
 
-#: src/cmd_select.c:511
+#: src/cmd_select.c:469
 msgid "Treat RE as Glob Pattern?"
-msgstr "Traktuj wyr. reg. jako globaln± maskê?"
+msgstr "Traktuj wyr. reg. jako globalnÄ maskÄ?"
 
-#: src/cmd_select.c:514
+#: src/cmd_select.c:472
 msgid "Invert RE Matching?"
-msgstr "Odwróæ zaznaczenie wyr. reg.?"
+msgstr "OdwrÃ³Ä zaznaczenie wyr. reg.?"
 
-#: src/cmd_select.c:517
+#: src/cmd_select.c:475
 msgid "Require Match on Full Name?"
-msgstr "Wymaga zaznaczenia przy Pe³nej nazwie?"
+msgstr "Wymaga zaznaczenia przy PeÅnej nazwie?"
 
-#: src/cmd_select.c:531
+#: src/cmd_select.c:489
 msgid "Select Using RE"
-msgstr "Zaznacz u¿ywaj±c wyr. reg."
+msgstr "Zaznacz uÅ¼ywajÄc wyr. reg."
 
-#: src/cmd_select.c:815
+#: src/cmd_select.c:727
 msgid ""
 "Enter shell command to run. The command\n"
 "will have the selected content appended.\n"
 "Action is performed on successful exit."
 msgstr ""
-"Wprowad¼ rozkaz pow³oki do uruchomienia. Rozkaz\n"
-"bêdzie uzupe³niony o zaznaczone elementy.\n"
-"Akcja zostanie wykonana w przypadku wyj¶cia z pow³oki z sukcesem."
+"WprowadÅº rozkaz powÅoki do uruchomienia. Rozkaz\n"
+"bÄdzie uzupeÅniony o zaznaczone elementy.\n"
+"Akcja zostanie wykonana w przypadku wyjÅcia z powÅoki z sukcesem."
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "OK|Cancel"
 msgstr "OK|Anuluj"
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "Select using shell command"
-msgstr "Wybierz u¿ywaj±c rozkazu pow³oki"
+msgstr "Wybierz uÅ¼ywajÄc rozkazu powÅoki"
 
-#: src/cmd_split.c:68
+#: src/cmd_split.c:269
 #, c-format
 msgid ""
 "Split \"%s\".\n"
@@ -1926,7 +1923,7 @@
 "Podziel \"%s\".\n"
 "Plik jest %s (%s)."
 
-#: src/cmd_split.c:70
+#: src/cmd_split.c:271
 #, c-format
 msgid ""
 "Split \"%s\".\n"
@@ -1935,93 +1932,143 @@
 "Podziel \"%s\".\n"
 "Plik jest %s."
 
-#: src/cmd_split.c:106
+#: src/cmd_split.c:348
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Split?"
-msgstr "\"%s\" ju¿ istnieje - kontynuowaæ podzia³?"
+msgstr "\"%s\" juÅ¼ istnieje - kontynuowaÄ podziaÅ?"
 
-#: src/cmd_split.c:171
-msgid "Beta Software"
-msgstr "Beta Software"
+#: src/cmd_split.c:422
+msgid "Fixed Size Split"
+msgstr "Ustalona wielkoÅÄ podziaÅu"
 
-#: src/cmd_split.c:171
-msgid "Next Version?"
-msgstr "Kolejna wersja?"
+#: src/cmd_split.c:424
+msgid "Segment Size"
+msgstr "WielkoÅÄ segmentowa"
 
-#: src/cmd_split.c:171
-msgid ""
-"This splitting mode has not been\n"
-"implemented yet... Sorry."
+#: src/cmd_split.c:427
+#, fuzzy
+msgid "1457000 bytes (3.5\" floppy)"
+msgstr " 1457000 bajtÃ³w (3.5\" dyskietka)"
+
+#: src/cmd_split.c:428
+#, fuzzy
+msgid "10485760 bytes (10 MB)"
+msgstr " 1457000 bajtÃ³w (3.5\" dyskietka)"
+
+#: src/cmd_split.c:429
+#, fuzzy
+msgid "26214400 bytes (25 MB)"
+msgstr " 1457000 bajtÃ³w (3.5\" dyskietka)"
+
+#: src/cmd_split.c:430
+#, fuzzy
+msgid "52428800 bytes (50 MB)"
+msgstr " 1457000 bajtÃ³w (3.5\" dyskietka)"
+
+#: src/cmd_split.c:431
+#, fuzzy
+msgid "78643200 bytes (75 MB)"
+msgstr " 1457000 bajtÃ³w (3.5\" dyskietka)"
+
+#: src/cmd_split.c:432
+#, fuzzy
+msgid "100431360 bytes (95 MB, Zip disk)"
+msgstr "100431360 bajtÃ³w (Dysk ZIP)"
+
+#: src/cmd_split.c:454
+#, fuzzy
+msgid "Fixed Count Split"
+msgstr "Ustalona wielkoÅÄ podziaÅu"
+
+#: src/cmd_split.c:457
+#, fuzzy
+msgid "Segment Count"
+msgstr "WielkoÅÄ segmentowa"
+
+#: src/cmd_split.c:503
+msgid "Current part number, unique for every created file"
 msgstr ""
-"Ten tryb podzia³u nie zosta³ jescze \n"
-"zaimplementowany... Przepraszam."
 
-#: src/cmd_split.c:187
-msgid "  1457000 bytes (3.5\" floppy)"
-msgstr " 1457000 bajtów (3.5\" dyskietka)"
+#: src/cmd_split.c:504
+msgid "The value from the Base box"
+msgstr ""
 
-#: src/cmd_split.c:188
-msgid "100431360 bytes (Zip disk)"
-msgstr "100431360 bajtów (Dysk ZIP)"
+#: src/cmd_split.c:505
+msgid "The amount that index will change for each file"
+msgstr ""
 
-#: src/cmd_split.c:190
-msgid "Fixed Size Split"
-msgstr "Ustalona wielko¶æ podzia³u"
+#: src/cmd_split.c:506
+msgid "The total number of files that will be created"
+msgstr ""
 
-#: src/cmd_split.c:193
-msgid "Segment Size"
-msgstr "Wielko¶æ segmentowa"
+#: src/cmd_split.c:507
+msgid "The value of index for the last file to be created"
+msgstr ""
 
-#: src/cmd_split.c:221
+#: src/cmd_split.c:570
 msgid "Fixed size, variable number of parts"
-msgstr "Ustalona wielko¶æ, zmienne numery czê¶ci"
+msgstr "Ustalona wielkoÅÄ, zmienne numery czÄÅci"
 
-#: src/cmd_split.c:222
+#: src/cmd_split.c:571
 msgid "Fixed number of parts, variable sizes"
-msgstr "Sta³e numery czê¶ci, zmienna wielko¶æ"
+msgstr "StaÅe numery czÄÅci, zmienna wielkoÅÄ"
 
-#: src/cmd_split.c:230 src/cmd_split.c:261
+#: src/cmd_split.c:580 src/cmd_split.c:663
 msgid "Split"
 msgstr "Podziel"
 
-#: src/cmd_split.c:243
+#: src/cmd_split.c:599
 msgid "Name Format"
 msgstr "Format nazwy"
 
-#: src/cmd_split.c:252
+#: src/cmd_split.c:615
 msgid "Step"
 msgstr "Krok"
 
-#: src/cmd_symlink.c:77 src/cmd_symlink.c:246
+#: src/cmd_split.c:624
+msgid "Zero-Fill Numbers?"
+msgstr ""
+
+#: src/cmd_split.c:645
+msgid "Offset"
+msgstr ""
+
+#: src/cmd_symlink.c:68 src/cmd_symlink.c:252
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Link?"
-msgstr "\"%s\" juz istnieje - kontynuowaæ dowi±zanie?"
+msgstr "\"%s\" juz istnieje - kontynuowaÄ dowiÄzanie?"
+
+#: src/cmd_symlink.c:161 src/configure.c:239 src/icon_dialog.c:59
+#: src/progress.c:220
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: src/cmd_symlink.c:161 src/configure.c:233 src/dialog.c:290
+#: src/nag_dialog.c:36
+msgid "OK"
+msgstr "OK"
 
-#: src/cmd_symlink.c:184
+#: src/cmd_symlink.c:161
 msgid "Select Link Target"
-msgstr "Wybierz cel dla dowi±zania"
+msgstr "Wybierz cel dla dowiÄzania"
 
-#: src/cmd_symlink.c:213
+#: src/cmd_symlink.c:218
 msgid "Contents"
-msgstr "Zawarto¶æ"
+msgstr "ZawartoÅÄ"
 
-#: src/cmd_symlink.c:225
+#: src/cmd_symlink.c:231
 msgid "Edit Symbolic Link"
-msgstr "Edytuj dowi±zanie symboliczne"
+msgstr "Edytuj dowiÄzanie symboliczne"
 
-#: src/cmd_symlink.c:231
+#: src/cmd_symlink.c:236
 msgid "Create Symbolic Link"
-msgstr "Utwórz dowi±zanie symboliczne"
-
-#: src/cmd_viewtext.c:206
-msgid "Use mmap() to Speed Loading?"
-msgstr "U¿ywaj mmap() dla przy¶pieszenia ³adowania?"
+msgstr "UtwÃ³rz dowiÄzanie symboliczne"
 
-#: src/cmd_viewtext.c:208
+#: src/cmd_viewtext.c:205
 msgid "Hex-Check First"
 msgstr "Najpierw Hex"
 
-#: src/cmd_viewtext.c:209
+#: src/cmd_viewtext.c:206
 msgid "Exit on Left Arrow Key?"
 msgstr ""
 
@@ -2037,619 +2084,806 @@
 msgid "yes"
 msgstr "tak"
 
-#: src/cmdgrab.c:222
+#: src/cmdgrab.c:177
 #, c-format
 msgid "Output of %s (pid %d)"
-msgstr "Wyj¶cie %s (pid %d)"
+msgstr "WyjÅcie %s (pid %d)"
 
 #: src/cmdseq.c:354 src/cmdseq.c:369
 #, c-format
 msgid ""
 "Unable to execute unknown\n"
 "command \"%s\"."
-msgstr "Nie mo¿na wykonaæ nieznanej komendy \"%s\"."
+msgstr "Nie moÅ¼na wykonaÄ nieznanej komendy \"%s\"."
 
-#: src/cmdseq_dialog.c:126
+#: src/cmdseq_dialog.c:134
 #, c-format
 msgid "Built-Ins (%u)"
 msgstr "Wbudowane (%u)"
 
-#: src/cmdseq_dialog.c:131
+#: src/cmdseq_dialog.c:139
 #, c-format
 msgid "User Defined (%u)"
 msgstr "Zdefiniowane (%u)"
 
-#: src/cmdseq_dialog.c:302
+#: src/cmdseq_dialog.c:313
 msgid ""
 "Select a command, or type start\n"
 "of name and press TAB."
 msgstr ""
-"Wybierz komendê, lub wpisz pocz±tek nazwy\n"
-"i wci¶nij TAB"
+"Wybierz komendÄ, lub wpisz poczÄtek nazwy\n"
+"i wciÅnij TAB"
 
-#: src/cmdseq_dialog.c:319
+#: src/cmdseq_dialog.c:330
 msgid "Select Command"
-msgstr "Wybór komendy"
+msgstr "WybÃ³r komendy"
 
-#: src/configure.c:198
+#: src/configure.c:197
 msgid "Couldn't open configuration file for output"
-msgstr "Nie mo¿na otworzyæ pliku konfiguracyjnego dla wyj¶cia"
+msgstr "Nie moÅ¼na otworzyÄ pliku konfiguracyjnego dla wyjÅcia"
 
-#: src/configure.c:234 src/dialog.c:285
-msgid "OK"
-msgstr "OK"
-
-#: src/configure.c:240
+#: src/configure.c:236
 msgid "Save"
 msgstr "Zapisz"
 
-#: src/configure.c:244 src/icon_dialog.c:59 src/progress.c:219
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: src/configure.c:455
+#: src/configure.c:463
 #, c-format
 msgid "Config file version (%s) doesn't match program version (%s)"
 msgstr ""
-"Wersja pliku konfiguracyjnego (%s) nie zgadza siê z wersj± programu (%s)"
+"Wersja pliku konfiguracyjnego (%s) nie zgadza siÄ z wersjÄ programu (%s)"
 
-#: src/configure.c:467
+#: src/configure.c:475
 #, c-format
 msgid ""
 "Couldn't find any configuration file; checked\n"
 "both \"%s\" and \"%s\".\n"
 "Using built-in minimal configuration."
 msgstr ""
-"Nie mo¿na znale¼æ pliku konfiguracyjnego; sprawdzono\n"
+"Nie moÅ¼na znaleÅºÄ pliku konfiguracyjnego; sprawdzono\n"
 "\"%s\" jak i \"%s\".\n"
-"U¿ywanie wbudowanej minimalnej konfiguracji."
+"UÅ¼ywanie wbudowanej minimalnej konfiguracji."
 
-#: src/dialog.c:123 src/dialog.c:253
+#: src/dialog.c:124 src/dialog.c:260
 msgid "_OK|_Cancel"
 msgstr "_OK|_Anuluj"
 
-#: src/dirpane.c:134
-msgid ""
-"Case-sensitive sorting will not work correctly with non-ASCII characters"
-msgstr ""
-"Sortowanie z uwzglêdnieniem wielko¶ci czcionki nie bêdzie dzia³a³o poprawnie "
-"z znakami nie-ASCII"
-
-#: src/dirpane.c:143
-msgid ""
-"Case-insensitive sorting will not work correctly with non-ASCII characters"
-msgstr ""
-"Sortowanie bez uwzglêdnienienia wielko¶ci czcionki nie bêdzie dzia³a³o "
-"poprawnie z znakami nie-ASCII"
-
-#: src/dirpane.c:1189
+#: src/dirpane.c:541
 #, c-format
 msgid "%u/%u dirs, %u/%u files"
-msgstr "%u/%u katalogów, %u/%u plików"
+msgstr "%u/%u katalogÃ³w, %u/%u plikÃ³w"
 
-#: src/dirpane.c:1197
-#, fuzzy, c-format
-msgid " (%%s/%%s, %%%s/%%%s blocks)"
-msgstr " (%s/%s, %Lu/%Lu bloków)"
+#: src/dirpane.c:546
+#, c-format
+msgid " (%s/%s)"
+msgstr ""
 
-#: src/dirpane.c:1210
+#: src/dirpane.c:557
 #, fuzzy, c-format
 msgid ", %s (%s) used"
-msgstr ", %s u¿yte"
+msgstr ", %s uÅ¼yte"
 
-#: src/dirpane.c:1212
+#: src/dirpane.c:559
 #, c-format
 msgid ", %s free"
 msgstr ", %s wolne"
 
-#: src/dirpane.c:1560
-msgid "!!Invalid filename!!"
-msgstr ""
-
-#: src/dirpane.c:2004 src/dirpane.c:2053
+#: src/dirpane.c:2084 src/dirpane.c:2131
 msgid "Move up to the parent directory"
-msgstr "Przejd¼ do katalogu powy¿ej"
+msgstr "PrzejdÅº do katalogu powyÅ¼ej"
 
-#: src/dirpane.c:2026
+#: src/dirpane.c:2106
 msgid "Enter path, then press Return to go there"
-msgstr "Wprowad¼ scie¼kê, nastêpnie naci¶nij Return aby tam przej¶æ"
+msgstr "WprowadÅº scieÅºkÄ, nastÄpnie naciÅnij Return aby tam przejÅÄ"
 
-#: src/dirpane.c:2027
+#: src/dirpane.c:2107
 msgid "H"
 msgstr "H"
 
-#: src/dirpane.c:2031
+#: src/dirpane.c:2111
 msgid ""
 "Click to enable/disable Hide rule (When pressed in, the hide rule is active, "
 "and matching entries are hidden)"
 msgstr ""
-"Wci¶nij, aby w³±czyæ/wy³±czyæ regu³ê ukrywania (kiedy wci¶niêty, regu³a "
-"ukrywania jest aktywna, a wpisy s± ukryte)"
+"WciÅnij, aby wÅÄczyÄ/wyÅÄczyÄ reguÅÄ ukrywania (kiedy wciÅniÄty, reguÅa "
+"ukrywania jest aktywna, a wpisy sÄ ukryte)"
 
-#: src/dpformat.c:37
+#: src/dpformat.c:38
 msgid "Blocks"
 msgstr "Bloki"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "BSize"
-msgstr "BWielko¶æ"
+msgstr "BWielkoÅÄ"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "Block Size"
-msgstr "Wielko¶æ bloków"
+msgstr "WielkoÅÄ blokÃ³w"
 
-#: src/dpformat.c:39
+#: src/dpformat.c:40
 msgid "Mode, numerical"
 msgstr "Tryb, numerycznie"
 
-#: src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode, string"
-msgstr "Tryb, ci±g"
+msgstr "Tryb, ciÄg"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Nlink"
-msgstr "N-linków"
+msgstr "N-linkÃ³w"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Number of links"
-msgstr "Liczba dowi±zañ"
+msgstr "Liczba dowiÄzaÅ"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Owner ID"
-msgstr "ID w³a¶ciciela"
+msgstr "ID wÅaÅciciela"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Uid"
 msgstr "Uid"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Owner Name"
-msgstr "Nazwa w³a¶ciciela"
+msgstr "Nazwa wÅaÅciciela"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Uname"
 msgstr "U-nazwa"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Gid"
 msgstr "Gid"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Group ID"
 msgstr "ID grupy"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Gname"
 msgstr "G-nazwa"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Group Name"
 msgstr "Nazwa grupy"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device"
-msgstr "Urz±dzenie"
+msgstr "UrzÄdzenie"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device Number"
-msgstr "Numer urz±dzenia"
+msgstr "Numer urzÄdzenia"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "DevMaj"
 msgstr "DevMaj"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "Device Number, major"
-msgstr "Numer urz±dzenia, g³ówny"
+msgstr "Numer urzÄdzenia, gÅÃ³wny"
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "DevMin"
 msgstr "DevMin"
 
-#: src/dpformat.c:48
-msgid "Device Number, minor"
-msgstr "Numer urz±dzenia, poboczny"
-
 #: src/dpformat.c:49
-msgid "Date of last Access"
-msgstr "Data ostatniego dostêpu"
+msgid "Device Number, minor"
+msgstr "Numer urzÄdzenia, poboczny"
 
 #: src/dpformat.c:50
-msgid "Date of last Modification"
-msgstr "Data ostatniej modyfikacji"
+#, fuzzy
+msgid "Time of Last Access"
+msgstr "Data ostatniego dostÄpu"
 
 #: src/dpformat.c:51
-msgid "Created"
-msgstr "Utworzony"
+#, fuzzy
+msgid "Time of Last Modification"
+msgstr "Data ostatniej modyfikacji"
 
-#: src/dpformat.c:51
-msgid "Date of Creation"
+#: src/dpformat.c:52
+#, fuzzy
+msgid "Time of Creation"
 msgstr "Data utworzenia"
 
-#: src/dpformat.c:52
+#: src/dpformat.c:53
+msgid "Time of Last Change"
+msgstr ""
+
+#: src/dpformat.c:54
 msgid "Type Name"
 msgstr "Nazwa typu"
 
-#: src/dpformat.c:53
+#: src/dpformat.c:55
 msgid "I"
 msgstr "I"
 
-#: src/dpformat.c:334
-msgid "B"
-msgstr "B"
-
-#: src/dpformat.c:338 src/sizeutil.c:32
-msgid "KB"
-msgstr "KB"
-
-#: src/dpformat.c:343 src/sizeutil.c:33
-msgid "MB"
-msgstr "MB"
+#: src/dpformat.c:56
+msgid "URI"
+msgstr ""
 
-#: src/dpformat.c:348 src/sizeutil.c:31
-msgid "GB"
-msgstr "GB"
+#: src/dpformat.c:56
+msgid "URI (without file prefix)"
+msgstr ""
 
-#: src/errors.c:69
+#: src/errors.c:59
 #, c-format
 msgid "Couldn't %s \"%s\": %s (code %d)"
-msgstr "Nie mo¿na %s \"%s\": %s (kod %d)"
+msgstr "Nie moÅ¼na %s \"%s\": %s (kod %d)"
 
-#: src/errors.c:71
+#: src/errors.c:61
 #, c-format
 msgid "Couldn't %s \"%s\" (code %d)"
-msgstr "Nie mo¿na %s \"%s\" (kod %d)"
+msgstr "Nie moÅ¼na %s \"%s\" (kod %d)"
 
-#: src/errors.c:76
+#: src/errors.c:66
 #, c-format
 msgid "Couldn't %s \"%s\""
-msgstr "Nie mo¿na %s \"%s\""
+msgstr "Nie moÅ¼na %s \"%s\""
 
-#: src/errors.c:78
+#: src/errors.c:68
 #, c-format
 msgid "Couldn't %s"
-msgstr "Nie mo¿na %s"
+msgstr "Nie moÅ¼na %s"
+
+#: src/errors.c:88
+#, c-format
+msgid "%s"
+msgstr ""
 
 # src/gentoo.c:440
#: src/gentoo.c:440
-#: src/gentoo.c:421
+#: src/gentoo.c:427
 msgid "Report the version to standard output, and exit."
-msgstr "Wy¶wietl wersjê na standardowe wyj¶cie, potem zakoñcz."
+msgstr "WyÅwietl wersjÄ na standardowe wyjÅcie, potem zakoÅcz."
 
 # src/gentoo.c:440
#: src/gentoo.c:440
-#: src/gentoo.c:423
+#: src/gentoo.c:429
 msgid "Report internal locale details, and exit."
-msgstr "Wy¶wietl wewnêtrzne szczegó³y lokalizacji, potem zakoñcz."
+msgstr "WyÅwietl wewnÄtrzne szczegÃ³Åy lokalizacji, potem zakoÅcz."
 
 # src/gentoo.c:441
#: src/gentoo.c:441
-#: src/gentoo.c:425
+#: src/gentoo.c:431
 msgid "Allows gentoo to be run by the root user. Could be dangerous."
-msgstr "Umo¿liwia uruchomienie programu jako root. Mo¿e byæ niebezpieczne."
+msgstr "UmoÅ¼liwia uruchomienie programu jako root. MoÅ¼e byÄ niebezpieczne."
 
 # src/gentoo.c:442
#: src/gentoo.c:442
-#: src/gentoo.c:426
+#: src/gentoo.c:432
 msgid ""
 "Do not load the ~/.gentoorc configuration file; instead, use default values."
 msgstr ""
-"Nie ³aduj pliku konfiguracyjnego ~/.gentoorc; zamiast tego u¿yj warto¶ci "
-"domy¶lnych"
+"Nie Åaduj pliku konfiguracyjnego ~/.gentoorc; zamiast tego uÅ¼yj wartoÅci "
+"domyÅlnych"
 
 # src/gentoo.c:443
#: src/gentoo.c:443
-#: src/gentoo.c:427
+#: src/gentoo.c:433
 msgid ""
 "Do not load the ~/.gentoogtkrc GTK+ configuration file; instead, use system "
 "defaults."
 msgstr ""
-"Nie ³adu³ pliku konfiguracyjnego GTK+ : ~/.gentoogtkrc ; zamiast tego u¿yj "
-"domy¶lnego pliku systemowego."
+"Nie ÅaduÅ pliku konfiguracyjnego GTK+ : ~/.gentoogtkrc ; zamiast tego uÅ¼yj "
+"domyÅlnego pliku systemowego."
 
-# src/gentoo.c:445
#: src/gentoo.c:445
-#: src/gentoo.c:429
-msgid "Do not use FAM to automatically detect changes in viewed directories."
-msgstr "Nie u¿ywaj FAM do automatycznej detekcji zmian w bie¿±cych katalogach."
+#: src/gentoo.c:434
+#, fuzzy
+msgid ""
+"Run COMMAND, a gentoo command. Done before user interaction allowed, but "
+"after configuration file has been read in. Can be used many times to run "
+"several commands in sequence."
+msgstr ""
+"Uruchom ARG, komenda gentoo. Polecenie zostanie wykonane przed umoÅ¼liwieniem "
+"uÅ¼ytkownikowi interakcji, ale po odczycie pliku konfiguracyjnego. MoÅ¼e "
+"zostaÄ uÅ¼yte wielokrotnie, pozwalajÄc na uruchomienie w sekwencji."
+
+#: src/gentoo.c:435
+msgid "COMMAND"
+msgstr ""
+
+#: src/gentoo.c:436 src/gentoo.c:437
+msgid "DIR"
+msgstr ""
 
 # src/gentoo.c:447
#: src/gentoo.c:447
-#: src/gentoo.c:431
+#: src/gentoo.c:436
+#, fuzzy
 msgid ""
-"Use ARG as path for the left directory pane. Overrides default (and history)."
+"Use DIR as path for the left directory pane. Overrides default (and history)."
 msgstr ""
-"U¿ywaj ARG jako ¶cie¿ki dla lewego panelu. Zamiast domy¶lnego (i historii)"
+"UÅ¼ywaj ARG jako ÅcieÅ¼ki dla lewego panelu. Zamiast domyÅlnego (i historii)"
 
 # src/gentoo.c:448
#: src/gentoo.c:448
-#: src/gentoo.c:432
+#: src/gentoo.c:437
+#, fuzzy
 msgid ""
-"Use ARG as path for the right directory pane. Overrides default (and "
+"Use DIR as path for the right directory pane. Overrides default (and "
 "history)."
 msgstr ""
-"U¿ywaj ARG jako ¶cie¿ki dla prawego panelu. Zamiast domy¶lnego (i historii)"
+"UÅ¼ywaj ARG jako ÅcieÅ¼ki dla prawego panelu. Zamiast domyÅlnego (i historii)"
 
-#: src/gentoo.c:433
-msgid ""
-"Run ARG, a gentoo command. Done before user interaction allowed, but after "
-"configuration file has been read in. Can be used many times to run several "
-"commands in sequence."
+#: src/gentoo.c:461
+msgid "- a graphical file manager using GTK+"
+msgstr ""
+
+#: src/gentoo.c:466
+#, c-format
+msgid "Failed to parse command line options: %s\n"
 msgstr ""
-"Uruchom ARG, komenda gentoo. Polecenie zostanie wykonane przed umo¿liwieniem "
-"u¿ytkownikowi interakcji, ale po odczycie pliku konfiguracyjnego. Mo¿e "
-"zostaæ u¿yte wielokrotnie, pozwalaj±c na uruchomienie w sekwencji."
 
-#: src/gentoo.c:492
+#: src/gentoo.c:506
 #, c-format
 msgid "%s: To run as root, envoke with the '--root-ok' option\n"
-msgstr "%s: Uruchomiony przez root'a, uruchom z opcj± --root-ok\n"
+msgstr "%s: Uruchomiony przez root'a, uruchom z opcjÄ --root-ok\n"
 
-#: src/gentoo.c:524
+#: src/gentoo.c:538
 msgid "Couldn't initialize userinfo module - username resolving won't work"
 msgstr ""
-"Nie mo¿na zainicjalizowaæ modu³u userinfo - rozwi±zywanie nazw u¿ytkowników "
-"nie bêdzie dzia³aæ."
+"Nie moÅ¼na zainicjalizowaÄ moduÅu userinfo - rozwiÄzywanie nazw uÅ¼ytkownikÃ³w "
+"nie bÄdzie dziaÅaÄ."
 
-#: src/gentoo.c:529
-msgid "Couldn't initialize mount data - automounting won't work"
-msgstr ""
-"Nie mo¿na zainicjalizowaæ danych montowania - automatyczne montowanie nie "
-"bêdzie dzia³aæ"
-
-#: src/gentoo.c:560
+#: src/gentoo.c:570
 #, c-format
 msgid "gentoo v%s by Emil Brink <emil@obsession.se>"
 msgstr "gentoo v%s - Emil Brink <emil@obsession.se>"
 
-#: src/gfam.c:216
-#, c-format
-msgid "FAM open failed, error %d--FAM will not be used"
-msgstr "Dostêp do FAM nieudany, b³±d %d--FAM nie zostanie u¿yte"
-
-#: src/gfam.c:235
-#, fuzzy, c-format
-msgid ""
-"Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, perhaps)"
+#: src/gentoo.c:577
+msgid "Development Version Warning"
 msgstr ""
-"Nie mo¿na dodaæ monitora FAM \"%s\", b³±d %s (uruchom z --no-fam aby omin±c "
-"ten b³±d, chyba)"
 
-#: src/gfam.c:241
-#, fuzzy, c-format
+#: src/gentoo.c:577
 msgid ""
-"Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go around, "
-"perhaps)"
+"This version of gentoo is considered somewhat new and untested. There have "
+"been major changes to almost all parts of the program since the previous "
+"version. Please be a bit careful, and make sure you report any problem to "
+"the author. Thanks."
 msgstr ""
-"Nie mo¿na dodaæ monitora FAM \"%s\", b³±d %s (uruchom z --no-fam aby omin±c "
-"ten b³±d, chyba)"
 
-#: src/guiutil.c:118
+#: src/guiutil.c:124
 msgid "Progress"
-msgstr "Postêp"
+msgstr "PostÄp"
 
 #: src/icon_dialog.c:52
 msgid "Pick Icon"
-msgstr "Wybierz ikonê"
+msgstr "Wybierz ikonÄ"
 
 #: src/icon_dialog.c:59
 msgid "Loading Icon Graphics..."
-msgstr "£adowanie grafik ikon..."
+msgstr "Åadowanie grafik ikon..."
 
-#: src/menus.c:278
+#: src/menus.c:284
 msgid "(No Selection)"
 msgstr "(brak zaznaczenia)"
 
-#: src/menus.c:514
+#: src/menus.c:521
 msgid "RegExp..."
 msgstr "Wyr. Reg."
 
-#: src/menus.c:526
+#: src/menus.c:533
 msgid "Other"
 msgstr "Inni"
 
-#: src/menus.c:527
+#: src/menus.c:534
 msgid "Rescan"
 msgstr "Odczytaj ponownie"
 
-#: src/menus.c:528
+#: src/menus.c:535
 msgid "Select"
 msgstr "Wybierz"
 
-#: src/menus.c:532
+#: src/menus.c:539
 msgid "Run..."
 msgstr "Uruchom..."
 
-#: src/menus.c:534
+#: src/menus.c:541
 msgid "Configure..."
 msgstr "Konfiguracja..."
 
-#: src/menus.c:610
+#: src/menus.c:618
 msgid "Select Menu"
 msgstr "Wybierz menu"
 
-#: src/mount.c:222
-#, c-format
-msgid "Execution of \"%s %s\" failed:\n"
-msgstr "Wykoananie \"%s %s\" nieudane:\n"
-
-#: src/mount.c:318
-#, c-format
-msgid "Mounting \"%s\" on \"%s\"..."
-msgstr "Montowanie \"%s\" w \"%s\"..."
+#: src/nag_dialog.c:37
+msgid "_Don't show this dialog again"
+msgstr ""
 
 #: src/overwrite.c:49
 msgid "_OK|A_ll|_Skip|Skip _All|_Cancel"
-msgstr "_OK|_Wszystko|_Pomiñ|Po_miñ Wszystko|_Anuluj"
-
-#: src/overwrite.c:73
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Old: %%%s bytes, changed on %%s,\n"
-"New: %%%s bytes, changed on %%s."
-msgstr ""
-"\n"
-"Stary: %llu bajtów, zmieniony %s.\n"
-"Nowy: %llu bajtów, zmieniony %s."
+msgstr "_OK|_Wszystko|_PomiÅ|Po_miÅ Wszystko|_Anuluj"
 
-#: src/progress.c:195
+#: src/progress.c:196
 #, c-format
 msgid "Total (%s)"
-msgstr "Ca³kowity (%s)"
+msgstr "CaÅkowity (%s)"
 
-#: src/progress.c:315
+#: src/progress.c:305
 #, c-format
 msgid "Elapsed %02d:%02d  Speed %s/s  ETA %02u:%02u"
-msgstr "Up³ynê³o %02d:%02d  Prêdko¶æ %s/s  ETA %02u:%02u"
+msgstr "UpÅynÄÅo %02d:%02d  PrÄdkoÅÄ %s/s  ETA %02u:%02u"
 
-#: src/sizeutil.c:30
-msgid "BYTES"
-msgstr "BYTES"
+#: src/sizeutil.c:31
+#, fuzzy
+msgid "Unformatted Size"
+msgstr "WielkoÅÄ formatowana, w bajtach"
 
-#: src/sizeutil.c:69
-#, c-format
-msgid "%%%s"
-msgstr ""
+#: src/sizeutil.c:32
+#, fuzzy
+msgid "Formatted Size, Without Unit"
+msgstr "WielkoÅÄ formatowana, \"Sprytne\" jednostki"
 
-#: src/sizeutil.c:70
-#, fuzzy, c-format
-msgid "%%%s bytes"
-msgstr ""
-"%u "
-"bajtÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÄÂÄ¹ÄÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂw"
+#: src/sizeutil.c:33
+#, fuzzy
+msgid "Formatted Size, in Bytes"
+msgstr "WielkoÅÄ formatowana, w bajtach"
 
-#: src/sizeutil.c:71
-#, fuzzy, c-format
-msgid "%%%s KB"
-msgstr "%u KB"
+#: src/sizeutil.c:33 src/sizeutil.c:159
+#, fuzzy
+msgid "bytes"
+msgstr "tak"
 
-#: src/sizeutil.c:72
-#, fuzzy, c-format
-msgid "%%%s MB"
-msgstr "%u MB"
+#: src/sizeutil.c:34
+#, fuzzy
+msgid "Formatted Size, in Kilobytes"
+msgstr "WielkoÅÄ formatowana, w kilobajtach"
 
-#: src/sizeutil.c:73
-#, fuzzy, c-format
-msgid "%%%s GB"
-msgstr "%u GB"
+#: src/sizeutil.c:34 src/sizeutil.c:163
+msgid "KB"
+msgstr "KB"
 
-#: src/sizeutil.c:164 src/sizeutil.c:211
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+#: src/sizeutil.c:35
+#, fuzzy
+msgid "Formatted Size, in Megabytes"
+msgstr "WielkoÅÄ formatowana, w megabajtach"
 
-#: src/sizeutil.c:170 src/sizeutil.c:217
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+#: src/sizeutil.c:35 src/sizeutil.c:167
+msgid "MB"
+msgstr "MB"
 
-#: src/sizeutil.c:176 src/sizeutil.c:223
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+#: src/sizeutil.c:36
+#, fuzzy
+msgid "Formatted Size, in Gigabytes"
+msgstr "WielkoÅÄ formatowana, w gigabajtach"
+
+#: src/sizeutil.c:36 src/sizeutil.c:171
+msgid "GB"
+msgstr "GB"
+
+#: src/sizeutil.c:37
+#, fuzzy
+msgid "Formatted Size, in Terabytes"
+msgstr "WielkoÅÄ formatowana, w megabajtach"
+
+#: src/sizeutil.c:37 src/sizeutil.c:175
+#, fuzzy
+msgid "TB"
+msgstr "B"
+
+#: src/sizeutil.c:38
+#, fuzzy
+msgid "Formatted Size, Automatic Unit"
+msgstr "WielkoÅÄ formatowana, \"Sprytne\" jednostki"
 
 #: src/style_dialog.c:40
 msgid "Select Style"
 msgstr "Wybierz styl"
 
-#: src/styles.c:112
+#: src/styles.c:114
 msgid "Root"
 msgstr "Root"
 
-#: src/styles.c:118 src/types.c:485 src/types.c:488
+#: src/styles.c:120 src/types.c:292 src/types.c:295
 msgid "Directory"
 msgstr "Katalog"
 
-#: src/styles.c:961
+#: src/styles.c:889
 msgid "New Style"
 msgstr "Nowy styl"
 
-#: src/styles.c:961
+#: src/styles.c:889
 #, c-format
 msgid "New Style %u"
 msgstr "Nowy styl %u"
 
-#: src/textview.c:152
+#: src/textview.c:190
 #, c-format
-msgid "Unable to convert text from native character set (%s) to UTF-8: %s"
+msgid ""
+"\n"
+"** Text conversion from charset '%s' failed, aborting."
 msgstr ""
 
-#: src/textview.c:252 src/textview.c:353
-msgid "File reading"
-msgstr "Odczyt pliku"
-
-#: src/textview.c:419
+#: src/textview.c:405
 #, c-format
 msgid "Line %d (%.0f%%)"
 msgstr "Linia %d (%.0f%%)"
 
-#: src/textview.c:472
+#: src/textview.c:455
 msgid "Enter Line Number or Percentage:"
-msgstr "Wprowad¼ nomer linii lub procentowo:"
+msgstr "WprowadÅº nomer linii lub procentowo:"
 
-#: src/textview.c:478
+#: src/textview.c:461
 msgid "Goto"
-msgstr "Przejd¼"
+msgstr "PrzejdÅº"
 
-#: src/textview.c:613
+#: src/textview.c:596
 msgid "Enter Text to Search For (RE)"
-msgstr "Wprowad¼ poszukiwany tekst dla (wyr. reg.)"
+msgstr "WprowadÅº poszukiwany tekst dla (wyr. reg.)"
 
-#: src/textview.c:623
+#: src/textview.c:607
 msgid "Don't Span Newlines?"
 msgstr "Nie rozszerzaj nowych linii?"
 
-#: src/textview.c:629
+#: src/textview.c:613
 msgid "Search"
 msgstr "Szukaj"
 
-#: src/types.c:454
+#: src/types.c:287
+msgid "Unknown"
+msgstr "Nieznany"
+
+#: src/types.c:572
 #, c-format
 msgid ""
 "Got SIGPIPE when writing to 'file' process (%s), it seems to have terminated "
 "prematurely."
 msgstr ""
 
-#: src/types.c:461
+#: src/types.c:578
 msgid "Unable to run spawn 'file' command: "
 msgstr ""
 
-#: src/types.c:480
-msgid "Unknown"
-msgstr "Nieznany"
-
-#: src/window.c:82
+#: src/window.c:83
 msgid "Configure gentoo"
 msgstr "Konfiguracja gentoo"
 
-#: src/window.c:89
+#: src/window.c:90
 msgid "Text Viewer"
-msgstr "Przegl±darka tekstu"
+msgstr "PrzeglÄdarka tekstu"
 
-#: src/window.c:200
+#: src/window.c:199
 msgid "Position"
 msgstr "Pozycja"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Height"
-msgstr "Wysoko¶æ"
+msgstr "WysokoÅÄ"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "X"
 msgstr "X"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Y"
 msgstr "Y"
 
-#: src/window.c:208
+#: src/window.c:207
 msgid "Set on Open?"
 msgstr "Ustaw przy otwarciu?"
 
-#: src/window.c:214
+#: src/window.c:213
 msgid "Update on Close?"
-msgstr "Uaktualnij przy wyj¶ciu?"
+msgstr "Uaktualnij przy wyjÅciu?"
 
-#: src/window.c:245
+#: src/window.c:244
 msgid "Grab"
 msgstr "Pobierz"
 
 #: src/xmlutil.c:225
 msgid "XML module emitted locale-dependant real number"
-msgstr "XML modu³ wys³a³ zale¿ny od locale numer"
+msgstr "XML moduÅ wysÅaÅ zaleÅ¼ny od locale numer"
+
+#~ msgid "Use Dialog to Report Errors?"
+#~ msgstr "UÅ¼ywaj okna dialogowego do raportu bÅÄdÃ³w?"
+
+#~ msgid "Path Right Click"
+#~ msgstr "KlikniÄcie prawym klawiszem na ÅcieÅ¼kÄ"
+
+#~ msgid "Raw Size, in Bytes"
+#~ msgstr "WielkoÅÄ surowa, w bajtach"
+
+#~ msgid "Always Set"
+#~ msgstr "Zawsze ustaw"
+
+#~ msgid "Modify 'Control' Key State"
+#~ msgstr "Modyfikuj stan przycisku Control"
+
+#~ msgid "Active Pane Titles"
+#~ msgstr "Aktywne tytuÅy paneli"
+
+#~ msgid "Focused Row, Unselected"
+#~ msgstr "PodÅwietlony rzÄd, odznacz"
+
+#~ msgid "Focused Row, Selected"
+#~ msgstr "PodÅwietlony rzÄd, zaznacz"
+
+#~ msgid "Beta Software"
+#~ msgstr "Beta Software"
+
+#~ msgid "Next Version?"
+#~ msgstr "Kolejna wersja?"
+
+#~ msgid ""
+#~ "This splitting mode has not been\n"
+#~ "implemented yet... Sorry."
+#~ msgstr ""
+#~ "Ten tryb podziaÅu nie zostaÅ jescze \n"
+#~ "zaimplementowany... Przepraszam."
+
+#~ msgid ""
+#~ "Case-sensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr ""
+#~ "Sortowanie z uwzglÄdnieniem wielkoÅci czcionki nie bÄdzie dziaÅaÅo "
+#~ "poprawnie z znakami nie-ASCII"
+
+#~ msgid ""
+#~ "Case-insensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr ""
+#~ "Sortowanie bez uwzglÄdnienienia wielkoÅci czcionki nie bÄdzie dziaÅaÅo "
+#~ "poprawnie z znakami nie-ASCII"
+
+#~ msgid "BYTES"
+#~ msgstr "BYTES"
+
+#, fuzzy
+#~ msgid "%%%s bytes"
+#~ msgstr ""
+#~ "%u "
+#~ "bajtÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÃÅ¡ÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂw"
+
+#, fuzzy
+#~ msgid "%%%s KB"
+#~ msgstr "%u KB"
+
+#, fuzzy
+#~ msgid "%%%s MB"
+#~ msgstr "%u MB"
+
+#, fuzzy
+#~ msgid "%%%s GB"
+#~ msgstr "%u GB"
+
+#~ msgid "%.2f KB"
+#~ msgstr "%.2f KB"
+
+#~ msgid "%.2f MB"
+#~ msgstr "%.2f MB"
+
+#~ msgid "%.2f GB"
+#~ msgstr "%.2f GB"
+
+#~ msgid "Numerical Mode?"
+#~ msgstr "Tryb numeryczny?"
+
+#~ msgid "Never"
+#~ msgstr "Nigdy"
+
+#~ msgid "On Every Access"
+#~ msgstr "Przy kaÅ¼dym dostÄpie"
+
+#~ msgid "Mounting"
+#~ msgstr "Montowanie"
+
+#~ msgid "Mount When?"
+#~ msgstr "Kiedy montowaÄ?"
+
+#~ msgid "Mount Options"
+#~ msgstr "Opcje montowania"
+
+#~ msgid "Mount Command"
+#~ msgstr "Komenda montowania"
+
+#~ msgid "Unmount Command"
+#~ msgstr "Komenda odmontowania"
+
+#~ msgid "Only Mount on Toplevel Directories?"
+#~ msgstr "Montuj tylko katalogi najwyÅ¼szego rzÄdu"
+
+#~ msgid "Use Command Error Dialog?"
+#~ msgstr "Uzywaj dialogu bÅÄdu"
+
+#~ msgid "Unmount When gentoo Quits?"
+#~ msgstr "Odmontuj przy zamykaniu gentoo"
+
+#~ msgid "FAM: Supported and active."
+#~ msgstr "FAM: Wspierane i aktywne"
+
+#~ msgid "FAM: Supported, but not active."
+#~ msgstr "FAM: Wspierane, nieaktywne."
+
+#~ msgid "FAM: Not supported."
+#~ msgstr "FAM: nie wspierane."
+
+#~ msgid ""
+#~ "Can't copy directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "Nie moÅ¼na skopiowaÄ katalogu \"%s\"\n"
+#~ "do \"%s\":\n"
+#~ "ÅºrÃ³dÅo zawiera katalog docelowy."
+
+#~ msgid "Wrap Around At Top And Bottom?"
+#~ msgstr "ZawiÅ u gÃ³ry i doÅu?"
+
+#~ msgid ""
+#~ "%s (%s bytes,\n"
+#~ "%s blocks)"
+#~ msgstr ""
+#~ "%s (%s bajtÃ³w,\n"
+#~ "%s blokÃ³w)"
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "Nie moÅ¼na przenieÅÄ katalogu \"%s\"\n"
+#~ "do \"%s\":\n"
+#~ "ÅºrÃ³dÅo zawiera katalog docelowy."
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the destination contains the source."
+#~ msgstr ""
+#~ "Nie moÅ¼na przenieÅÄ katalogu \"%s\"\n"
+#~ "do \"%s\":\n"
+#~ "katalog docelowy zawiera ÅºrÃ³dÅo."
+
+#~ msgid "Regular expression error:\n"
+#~ msgstr "BÅÄd wyraÅ¼enia regularnego:\n"
+
+#~ msgid "Use mmap() to Speed Loading?"
+#~ msgstr "UÅ¼ywaj mmap() dla przyÅpieszenia Åadowania?"
+
+#, fuzzy
+#~ msgid " (%%s/%%s, %%%s/%%%s blocks)"
+#~ msgstr " (%s/%s, %Lu/%Lu blokÃ³w)"
+
+# src/gentoo.c:445
#: src/gentoo.c:445
+#~ msgid ""
+#~ "Do not use FAM to automatically detect changes in viewed directories."
+#~ msgstr ""
+#~ "Nie uÅ¼ywaj FAM do automatycznej detekcji zmian w bieÅ¼Äcych katalogach."
+
+#~ msgid "Couldn't initialize mount data - automounting won't work"
+#~ msgstr ""
+#~ "Nie moÅ¼na zainicjalizowaÄ danych montowania - automatyczne montowanie nie "
+#~ "bÄdzie dziaÅaÄ"
+
+#~ msgid "FAM open failed, error %d--FAM will not be used"
+#~ msgstr "DostÄp do FAM nieudany, bÅÄd %d--FAM nie zostanie uÅ¼yte"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, "
+#~ "perhaps)"
+#~ msgstr ""
+#~ "Nie moÅ¼na dodaÄ monitora FAM \"%s\", bÅÄd %s (uruchom z --no-fam aby "
+#~ "ominÄc ten bÅÄd, chyba)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go "
+#~ "around, perhaps)"
+#~ msgstr ""
+#~ "Nie moÅ¼na dodaÄ monitora FAM \"%s\", bÅÄd %s (uruchom z --no-fam aby "
+#~ "ominÄc ten bÅÄd, chyba)"
+
+#~ msgid "Execution of \"%s %s\" failed:\n"
+#~ msgstr "Wykoananie \"%s %s\" nieudane:\n"
+
+#~ msgid "Mounting \"%s\" on \"%s\"..."
+#~ msgstr "Montowanie \"%s\" w \"%s\"..."
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Old: %%%s bytes, changed on %%s,\n"
+#~ "New: %%%s bytes, changed on %%s."
+#~ msgstr ""
+#~ "\n"
+#~ "Stary: %llu bajtÃ³w, zmieniony %s.\n"
+#~ "Nowy: %llu bajtÃ³w, zmieniony %s."
+
+#~ msgid "File reading"
+#~ msgstr "Odczyt pliku"
 
 #, fuzzy
 #~ msgid "Pick Command ..."
@@ -2662,17 +2896,17 @@
 #~ "Convert all characters in filename to either\n"
 #~ "all-lower or all-upper case."
 #~ msgstr ""
-#~ "Zmieñ wszystkie znaki w nazwie pliku na \n"
-#~ "wszystkie du¿e litery lub wszystkie ma³e litery."
+#~ "ZmieÅ wszystkie znaki w nazwie pliku na \n"
+#~ "wszystkie duÅ¼e litery lub wszystkie maÅe litery."
 
 #~ msgid "Buffer Size for mmap()"
-#~ msgstr "Wielko¶æ bufora dla operacji mmap()"
+#~ msgstr "WielkoÅÄ bufora dla operacji mmap()"
 
 #~ msgid "%s: Couldn't set text domain to \"%s\"\n"
-#~ msgstr "%s: Nie mo¿na zmieniæ domeny tekstu na \"%s\"\n"
+#~ msgstr "%s: Nie moÅ¼na zmieniÄ domeny tekstu na \"%s\"\n"
 
 #~ msgid "%Lu bytes"
-#~ msgstr "%Lu bajtów"
+#~ msgstr "%Lu bajtÃ³w"
 
 #~ msgid "%Lu KB"
 #~ msgstr "%Lu KB"
@@ -2684,19 +2918,19 @@
 #~ msgstr "%Lu GB"
 
 #~ msgid "Top"
-#~ msgstr "Góra"
+#~ msgstr "GÃ³ra"
 
 #~ msgid "Bottom"
-#~ msgstr "Dó³"
+#~ msgstr "DÃ³Å"
 
 #~ msgid "_Goto..."
-#~ msgstr "_Przejd¼ do..."
+#~ msgstr "_PrzejdÅº do..."
 
 #~ msgid "_Search..."
 #~ msgstr "_Szukaj..."
 
 #~ msgid "_Quit"
-#~ msgstr "_Wyj¶cie"
+#~ msgstr "_WyjÅcie"
 
 #, fuzzy
 #~ msgid "SelectShell"
@@ -2706,7 +2940,7 @@
 #~ msgstr "Zamknij"
 
 #~ msgid "Skip"
-#~ msgstr "PomiÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÃÅ¡ÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂ"
+#~ msgstr "PomiÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÄÂÄ¹ÄÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂÄÂÃÂÄÂÃÂÃÂÃÂÄÂÃÂ"
 
 #~ msgid "Menu"
 #~ msgstr "Menu"

gentoo-0.15.6.tar.bz2/po/ru_RU.CP1251.gmo -> gentoo-0.19.9.tar.gz/po/ru_RU.CP1251.gmo Changed

gentoo-0.15.6.tar.bz2/po/ru_RU.CP1251.po -> gentoo-0.19.9.tar.gz/po/ru_RU.CP1251.po Changed

@@ -7,33 +7,34 @@
 msgstr ""
 "Project-Id-Version: gentoo 0.11.51\n"
 "Report-Msgid-Bugs-To: Emil Brink\n"
-"POT-Creation-Date: 2009-07-11 19:05+0200\n"
+"POT-Creation-Date: 2011-01-26 21:54+0100\n"
 "PO-Revision-Date: 2008-07-13 20:20+0200\n"
 "Last-Translator: Michael Y. Zaripov <m3@mail.ru>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CP1251\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/cfg_buttonlayout.c:65
 msgid "Left of Command Buttons"
-msgstr "Ñ ëåâîé ñòîðîíû ïàíåëè êîìàíä"
+msgstr "Ð¡ Ð»ÐµÐ²Ð¾Ð¹ ÑÑÐ¾ÑÐ¾Ð½Ñ Ð¿Ð°Ð½ÐµÐ»Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´"
 
 #: src/cfg_buttonlayout.c:65
 msgid "Right of Command Buttons"
-msgstr "Ñ ïðàâîé ñòîðîíû ïàíåëè êîìàíä"
+msgstr "Ð¡ Ð¿ÑÐ°Ð²Ð¾Ð¹ ÑÑÐ¾ÑÐ¾Ð½Ñ Ð¿Ð°Ð½ÐµÐ»Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´"
 
 #: src/cfg_buttonlayout.c:66
 msgid "No Padding"
-msgstr "Áåç ðàçäåëåíèÿ"
+msgstr "ÐÐµÐ· ÑÐ°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ñ"
 
 #: src/cfg_buttonlayout.c:66
 msgid "Paned"
-msgstr "Ïàíåëü"
+msgstr "ÐÐ°Ð½ÐµÐ»Ñ"
 
 #: src/cfg_buttonlayout.c:66
 msgid "Static"
-msgstr "Ïîñòîÿííûé"
+msgstr "ÐÐ¾ÑÑÐ¾ÑÐ½Ð½ÑÐ¹"
 
 #: src/cfg_buttonlayout.c:75
 msgid ""
@@ -56,1115 +57,1119 @@
 "option menu widget\n"
 "in the top left corner of the page."
 msgstr ""
-"Ýòà ñòðàíèöà ïîçâîëÿåò âûáðàòü ðàñïîëîæåíèå ïàíåëè çàêëàäîê \n"
-"îòíîñèòåëüíî ïàíåëè êîìàíä. Çàêëàäêè ïîçâîëÿþò Âàì íàçíà÷èòü\n"
-"íà ÷àñòî èñïîëüçóåìûå êàòàëîãè ñïåöèàëüíóþ êíîïêó è ïåðåõîäèòü \n"
-"â ýòè ïàïêè íàæàòèåì ëåâîé èëè ñðåäíåé êíîïêè ìûøêè \n"
-"Âû ìîæåòå ðàçìåñòèòü ïàíåëü çàêëàäîê ñëåâà èëè ñïðàâà.\n"
-"Òàêæå âûáåðèòå òèï ðàçäåëèòåëÿ.\n"
+"ÐÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ° Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐµÑ Ð²ÑÐ±ÑÐ°ÑÑ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº \n"
+"Ð¾ÑÐ½Ð¾ÑÐ¸ÑÐµÐ»ÑÐ½Ð¾ Ð¿Ð°Ð½ÐµÐ»Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´. ÐÐ°ÐºÐ»Ð°Ð´ÐºÐ¸ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑÑ ÐÐ°Ð¼ Ð½Ð°Ð·Ð½Ð°ÑÐ¸ÑÑ\n"
+"Ð½Ð° ÑÐ°ÑÑÐ¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÐ¼ÑÐµ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¸ ÑÐ¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ Ð¸ Ð¿ÐµÑÐµÑÐ¾Ð´Ð¸ÑÑ \n"
+"Ð² ÑÑÐ¸ Ð¿Ð°Ð¿ÐºÐ¸ Ð½Ð°Ð¶Ð°ÑÐ¸ÐµÐ¼ Ð»ÐµÐ²Ð¾Ð¹ Ð¸Ð»Ð¸ ÑÑÐµÐ´Ð½ÐµÐ¹ ÐºÐ½Ð¾Ð¿ÐºÐ¸ Ð¼ÑÑÐºÐ¸ \n"
+"ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ°Ð·Ð¼ÐµÑÑÐ¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº ÑÐ»ÐµÐ²Ð° Ð¸Ð»Ð¸ ÑÐ¿ÑÐ°Ð²Ð°.\n"
+"Ð¢Ð°ÐºÐ¶Ðµ Ð²ÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ¸Ð¿ ÑÐ°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ.\n"
 "\n"
-"Íàñòðîèòü ñàìó ïàíåëü ìîæíî ïåðåêëþ÷èâøèñü â ðàçäåë \n"
-"Êíîïêè - Îïðåäåëåíèÿ è ñ ïîìîùüþ êíîïêè âñïëûâàþùåãî ìåíþ, \n"
-"ðàñïîëîæåííîé â âåðõíåì ëåâîì óãëó, âûáðàòü Çàêëàäêè"
+"ÐÐ°ÑÑÑÐ¾Ð¸ÑÑ ÑÐ°Ð¼Ñ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑÐµÐºÐ»ÑÑÐ¸Ð²ÑÐ¸ÑÑ Ð² ÑÐ°Ð·Ð´ÐµÐ» \n"
+"ÐÐ½Ð¾Ð¿ÐºÐ¸ - ÐÐ¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¸ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÐ¸ Ð²ÑÐ¿Ð»ÑÐ²Ð°ÑÑÐµÐ³Ð¾ Ð¼ÐµÐ½Ñ, \n"
+"ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ð¾Ð¹ Ð² Ð²ÐµÑÑÐ½ÐµÐ¼ Ð»ÐµÐ²Ð¾Ð¼ ÑÐ³Ð»Ñ, Ð²ÑÐ±ÑÐ°ÑÑ ÐÐ°ÐºÐ»Ð°Ð´ÐºÐ¸"
 
 #: src/cfg_buttonlayout.c:88
 msgid "Shortcut Sheet Position"
-msgstr "Ðàñïîëîæåíèå ïàíåëè çàêëàäîê"
+msgstr "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº"
 
 #: src/cfg_buttonlayout.c:102
 msgid "Separation Style"
-msgstr "Òèï ðàçäåëèòåëÿ"
+msgstr "Ð¢Ð¸Ð¿ ÑÐ°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ"
 
 #: src/cfg_buttonlayout.c:116
 msgid "Layout"
-msgstr "Âèä"
+msgstr "ÐÐ¸Ð´"
 
 #: src/cfg_buttons.c:308
 msgid "Set Row Width"
-msgstr "Óñòàíîâèòü øèðèíó"
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÑÐ¸ÑÐ¸Ð½Ñ"
 
-#: src/cfg_buttons.c:326 src/cfg_buttons.c:749
+#: src/cfg_buttons.c:326 src/cfg_buttons.c:748
 msgid "Default"
-msgstr "Ïî óìîë÷àíèþ"
+msgstr "ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
 
 #: src/cfg_buttons.c:439 src/overwrite.c:49
 msgid "Please Confirm"
-msgstr "Ïîäòâåðäèòå"
+msgstr "ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ"
 
 #: src/cfg_buttons.c:439
 msgid "Really delete current button row?"
-msgstr "Äåéñòâèòåëüíî óäàëèòü òåêóùóþ ñòðîêó êíîïîê?"
+msgstr "ÐÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÐµÐºÑÑÑÑ ÑÑÑÐ¾ÐºÑ ÐºÐ½Ð¾Ð¿Ð¾Ðº?"
 
-#: src/cfg_buttons.c:439 src/cfg_styles.c:671
+#: src/cfg_buttons.c:439 src/cfg_styles.c:680
 msgid "_Delete|_Cancel"
-msgstr "_Óäàëèòü|_Îòìåíà"
+msgstr "_Ð£Ð´Ð°Ð»Ð¸ÑÑ|_ÐÑÐ¼ÐµÐ½Ð°"
 
 #: src/cfg_buttons.c:463
 msgid "Select Width for New Row"
-msgstr "Âûáåðèòå øèðèíó íîâîé ñòðîêè"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ¸ÑÐ¸Ð½Ñ Ð½Ð¾Ð²Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸"
 
 #: src/cfg_buttons.c:466
 msgid "Change Width of Row"
-msgstr "Èçìåíèòü øèðèíó ñòðîêè"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ¸ÑÐ¸Ð½Ñ ÑÑÑÐ¾ÐºÐ¸"
 
 #: src/cfg_buttons.c:609
 msgid "Edit Background Color"
-msgstr "Èçìåíèòü öâåò ôîíà"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ²ÐµÑ ÑÐ¾Ð½Ð°"
 
 #: src/cfg_buttons.c:653
 msgid "Edit Foreground Color"
-msgstr "Èçìåíèòü öâåò"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ²ÐµÑ"
 
 #: src/cfg_buttons.c:678
 msgid "Label"
-msgstr "Çàãîëîâîê"
+msgstr "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº"
 
-#: src/cfg_buttons.c:685 src/cfg_controls.c:645 src/cfg_controls.c:696
-#: src/cfg_controls.c:718 src/cfg_controls.c:739
+#: src/cfg_buttons.c:686 src/cfg_controls.c:612 src/cfg_controls.c:663
+#: src/cfg_controls.c:685
 msgid "Command"
-msgstr "Êîìàíäà"
+msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð°"
 
-#: src/cfg_buttons.c:696 src/cfg_controls.c:639
+#: src/cfg_buttons.c:697 src/cfg_controls.c:606
 msgid "Key"
-msgstr "Êíîïêà"
+msgstr "ÐÐ½Ð¾Ð¿ÐºÐ°"
 
-#: src/cfg_buttons.c:711 src/cfg_dirpane.c:1373
+#: src/cfg_buttons.c:712
 msgid "Colors"
-msgstr "Öâåòà"
+msgstr "Ð¦Ð²ÐµÑÐ°"
 
-#: src/cfg_buttons.c:715
+#: src/cfg_buttons.c:716
 msgid "Background..."
-msgstr "Ôîí..."
+msgstr "Ð¤Ð¾Ð½..."
 
-#: src/cfg_buttons.c:716 src/cfg_buttons.c:722
+#: src/cfg_buttons.c:717 src/cfg_buttons.c:723
 msgid "Reset to Default"
-msgstr "Âåðíóòü íà÷àëüíûå"
+msgstr "ÐÐµÑÐ½ÑÑÑ Ð½Ð°ÑÐ°Ð»ÑÐ½ÑÐµ"
 
-#: src/cfg_buttons.c:721
+#: src/cfg_buttons.c:722
 msgid "Foreground..."
-msgstr "Öâåò"
+msgstr "Ð¦Ð²ÐµÑ"
 
-#: src/cfg_buttons.c:749
+#: src/cfg_buttons.c:748
 msgid "Shortcuts"
-msgstr "Çàêëàäêè"
+msgstr "ÐÐ°ÐºÐ»Ð°Ð´ÐºÐ¸"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Clear"
-msgstr "Óáðàòü"
+msgstr "Ð£Ð±ÑÐ°ÑÑ"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy Colors To"
-msgstr "Êîïèðîâàòü öâåòà"
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ ÑÐ²ÐµÑÐ°"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy To"
-msgstr "Êîïèðîâàòü"
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Swap With"
-msgstr "Îáìåíÿòü"
+msgstr "ÐÐ±Ð¼ÐµÐ½ÑÑÑ"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Add Row..."
-msgstr "Äîáàâèòü ñòðîêó..."
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÑÑÑÐ¾ÐºÑ..."
 
-#: src/cfg_buttons.c:751 src/cfg_cmdseq.c:951
+#: src/cfg_buttons.c:750 src/cfg_cmdseq.c:966
 msgid "Delete Row"
-msgstr "Óáðàòü ñòðîêó"
+msgstr "Ð£Ð±ÑÐ°ÑÑ ÑÑÑÐ¾ÐºÑ"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Down"
-msgstr "Âíèç"
+msgstr "ÐÐ½Ð¸Ð·"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Row Width..."
-msgstr "Øèðèíà ñòðîêè..."
+msgstr "Ð¨Ð¸ÑÐ¸Ð½Ð° ÑÑÑÐ¾ÐºÐ¸..."
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Up"
-msgstr "Ââåðõ"
+msgstr "ÐÐ²ÐµÑÑ"
 
-#: src/cfg_buttons.c:762
+#: src/cfg_buttons.c:761
 msgid "Sheet"
-msgstr "Ëèñò"
+msgstr "ÐÐ¸ÑÑ"
 
-#: src/cfg_buttons.c:778
+#: src/cfg_buttons.c:775
 msgid "Primary"
-msgstr "Îñíîâíàÿ"
+msgstr "ÐÑÐ½Ð¾Ð²Ð½Ð°Ñ"
 
-#: src/cfg_buttons.c:780
+#: src/cfg_buttons.c:777
 msgid "Secondary"
-msgstr "Âòîðè÷íàÿ"
+msgstr "ÐÑÐ¾ÑÐ¸ÑÐ½Ð°Ñ"
 
-#: src/cfg_buttons.c:785
+#: src/cfg_buttons.c:782
 msgid "Tooltip"
-msgstr "Ïîäñêàçêà"
+msgstr "ÐÐ¾Ð´ÑÐºÐ°Ð·ÐºÐ°"
 
-#: src/cfg_buttons.c:792 src/cfg_dirpane.c:1145
+#: src/cfg_buttons.c:790 src/cfg_dirpane.c:1107
 msgid "Flags"
-msgstr "Ôëàãè"
+msgstr "Ð¤Ð»Ð°Ð³Ð¸"
 
-#: src/cfg_buttons.c:794
+#: src/cfg_buttons.c:792
 msgid "Narrow?"
-msgstr "Ñóçèòü?"
+msgstr "Ð¡ÑÐ·Ð¸ÑÑ?"
 
-#: src/cfg_buttons.c:798
+#: src/cfg_buttons.c:796
 msgid "Show Tooltip?"
-msgstr "Ïîêàçûâàòü ïîäñêàçêè"
+msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð¿Ð¾Ð´ÑÐºÐ°Ð·ÐºÐ¸"
 
-#: src/cfg_buttons.c:833
+#: src/cfg_buttons.c:831
 msgid "Buttons"
-msgstr "Êíîïêè"
+msgstr "ÐÐ½Ð¾Ð¿ÐºÐ¸"
 
-#: src/cfg_buttons.c:834 src/cfg_cmdseq.c:1067
+#: src/cfg_buttons.c:832 src/cfg_cmdseq.c:1081
 msgid "Definitions"
-msgstr "Îïðåäåëåíèÿ"
+msgstr "ÐÐ¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ"
 
 #: src/cfg_cmdcfg.c:66
 msgid "Options"
-msgstr "Äåòàëè"
+msgstr "ÐÐµÑÐ°Ð»Ð¸"
 
-#: src/cfg_cmdseq.c:610
+#: src/cfg_cmdseq.c:611
 msgid "Select Builtin"
-msgstr "Âûáðàòü âñòðîåíûå"
+msgstr "ÐÑÐ±ÑÐ°ÑÑ Ð²ÑÑÑÐ¾ÐµÐ½ÑÐµ"
 
-#: src/cfg_cmdseq.c:626
+#: src/cfg_cmdseq.c:627
 msgid "Opening brace"
-msgstr "Îòêðûòü ñêîáó"
+msgstr "ÐÑÐºÑÑÑÑ ÑÐºÐ¾Ð±Ñ"
 
-#: src/cfg_cmdseq.c:627
+#: src/cfg_cmdseq.c:628
 msgid "Closing brace"
-msgstr "Çàêðûòü ñêîáó"
+msgstr "ÐÐ°ÐºÑÑÑÑ ÑÐºÐ¾Ð±Ñ"
 
-#: src/cfg_cmdseq.c:628
+#: src/cfg_cmdseq.c:629
 msgid "First selected"
-msgstr "Ïåðâûé âûáðàííûé"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹"
 
-#: src/cfg_cmdseq.c:629
+#: src/cfg_cmdseq.c:630
 msgid "First selected, unselect"
-msgstr "Ïåðâûé âûáðàííûé, ðàçîòìåòèòü"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
 
-#: src/cfg_cmdseq.c:630
+#: src/cfg_cmdseq.c:631
 msgid "First selected, with path"
-msgstr "Ïåðâûé âûáðàííûé, ñ ïóòåì"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, Ñ Ð¿ÑÑÐµÐ¼"
 
-#: src/cfg_cmdseq.c:631
+#: src/cfg_cmdseq.c:632
 msgid "First selected, with path, unselect"
-msgstr "Ïåðâûé âûáðàííûé, ñ ïóòåì, ðàçîòìåòèòü"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, Ñ Ð¿ÑÑÐµÐ¼, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
 
-#: src/cfg_cmdseq.c:632
+#: src/cfg_cmdseq.c:633
 msgid "First selected (destination pane)"
-msgstr "Ïåðâûé âûáðàííûé (ïàíåëü íàçíà÷åíèÿ)"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹ (Ð¿Ð°Ð½ÐµÐ»Ñ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ)"
 
-#: src/cfg_cmdseq.c:633
+#: src/cfg_cmdseq.c:634
 msgid "First selected, no quotes"
-msgstr "Ïåðâûé âûáðàííûé, áåç êàâû÷åê"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, Ð±ÐµÐ· ÐºÐ°Ð²ÑÑÐµÐº"
 
-#: src/cfg_cmdseq.c:634
+#: src/cfg_cmdseq.c:635
 msgid "All selected"
-msgstr "Âñå âûáðàííûå"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ"
 
-#: src/cfg_cmdseq.c:635
+#: src/cfg_cmdseq.c:636
 msgid "All selected, unselect"
-msgstr "Âñå âûáðàííûå, ðàçîòìåòèòü"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
 
-#: src/cfg_cmdseq.c:636
+#: src/cfg_cmdseq.c:637
 msgid "All selected, with paths"
-msgstr "Âñå âûáðàííûå, ñ ïóòÿìè"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, Ñ Ð¿ÑÑÑÐ¼Ð¸"
 
-#: src/cfg_cmdseq.c:637
+#: src/cfg_cmdseq.c:638
 msgid "All selected, with paths, unselect"
-msgstr "Âñå âûáðàííûå, ñ ïóòÿìè, ðàçîòìåòèòü"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, Ñ Ð¿ÑÑÑÐ¼Ð¸, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
 
-#: src/cfg_cmdseq.c:638
+#: src/cfg_cmdseq.c:639
 msgid "All selected (destination pane)"
-msgstr "Âñå âûáðàííûå(ïàíåëü íàçíà÷åíèÿ)"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ(Ð¿Ð°Ð½ÐµÐ»Ñ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ)"
 
-#: src/cfg_cmdseq.c:639
+#: src/cfg_cmdseq.c:640
 msgid "All selected, no quotes"
-msgstr "Âñå âûáðàííûå, áåç êàâû÷åê"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, Ð±ÐµÐ· ÐºÐ°Ð²ÑÑÐµÐº"
 
-#: src/cfg_cmdseq.c:640
+#: src/cfg_cmdseq.c:641
 msgid "Path to source pane's directory"
-msgstr "Ïóòü íà ïàíåëè èñòî÷íèêà"
+msgstr "ÐÑÑÑ Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ°"
 
-#: src/cfg_cmdseq.c:641
+#: src/cfg_cmdseq.c:642
 msgid "Path to destination pane's directory"
-msgstr "Ïóòü íà ïàíåëè íàçíà÷åíèÿ"
+msgstr "ÐÑÑÑ Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ"
 
-#: src/cfg_cmdseq.c:642
+#: src/cfg_cmdseq.c:643
 msgid "Path to home directory"
-msgstr "Äîìàøíèé êàòàëîã"
+msgstr "ÐÐ¾Ð¼Ð°ÑÐ½Ð¸Ð¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³"
 
-#: src/cfg_cmdseq.c:643
+#: src/cfg_cmdseq.c:644
 msgid "Path of left pane"
-msgstr "Ïóòü íà ëåâîé ïàíåëè"
+msgstr "ÐÑÑÑ Ð½Ð° Ð»ÐµÐ²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_cmdseq.c:644
+#: src/cfg_cmdseq.c:645
 msgid "Path of right pane"
-msgstr "Ïóòü íà ïðàâîé ïàíåëè"
+msgstr "ÐÑÑÑ Ð½Ð° Ð¿ÑÐ°Ð²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_cmdseq.c:645
+#: src/cfg_cmdseq.c:646
+#, fuzzy
+msgid "URI of first selected"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹"
+
+#: src/cfg_cmdseq.c:647
+#, fuzzy
+msgid "URI of first selected, unselect"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
+
+#: src/cfg_cmdseq.c:648
+#, fuzzy
+msgid "URI of first selected, no quotes"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, Ð±ÐµÐ· ÐºÐ°Ð²ÑÑÐµÐº"
+
+#: src/cfg_cmdseq.c:649
+#, fuzzy
+msgid "URIs of all selected"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ"
+
+#: src/cfg_cmdseq.c:650
+#, fuzzy
+msgid "URIs of all selected, unselect"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
+
+#: src/cfg_cmdseq.c:651
+#, fuzzy
+msgid "URIs of all selected, no quotes"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, Ð±ÐµÐ· ÐºÐ°Ð²ÑÑÐµÐº"
+
+#: src/cfg_cmdseq.c:652
+#, fuzzy
+msgid "URIs of all selected, unselect, no quotes"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, Ð±ÐµÐ· ÐºÐ°Ð²ÑÑÐµÐº"
+
+#: src/cfg_cmdseq.c:653
+#, fuzzy
+msgid "URI of first selected (destination pane)"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹ (Ð¿Ð°Ð½ÐµÐ»Ñ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ)"
+
+#: src/cfg_cmdseq.c:654
 msgid "Input combo box"
-msgstr "Êíîïêà âûáîðà"
+msgstr "ÐÐ½Ð¾Ð¿ÐºÐ° Ð²ÑÐ±Ð¾ÑÐ°"
 
-#: src/cfg_cmdseq.c:646
+#: src/cfg_cmdseq.c:655
 msgid "Input using menu"
-msgstr "Ìåíþ âûáîðà"
+msgstr "ÐÐµÐ½Ñ Ð²ÑÐ±Ð¾ÑÐ°"
 
-#: src/cfg_cmdseq.c:647
+#: src/cfg_cmdseq.c:656
 msgid "Input string"
-msgstr "Ââîä ñòðîêà"
+msgstr "ÐÐ²Ð¾Ð´ ÑÑÑÐ¾ÐºÐ°"
 
-#: src/cfg_cmdseq.c:648
+#: src/cfg_cmdseq.c:657
 msgid "Input check button (gives TRUE or FALSE)"
-msgstr "Êíîïêè - ôëàæêè (ÄÀ/ÍÅÒ)"
+msgstr "ÐÐ½Ð¾Ð¿ÐºÐ¸ - ÑÐ»Ð°Ð¶ÐºÐ¸ (ÐÐ/ÐÐÐ¢)"
 
-#: src/cfg_cmdseq.c:649
+#: src/cfg_cmdseq.c:658
 msgid "Add label to input window"
-msgstr "Çàãîëîâîê îêíà äèàëîãà"
+msgstr "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð¾ÐºÐ½Ð° Ð´Ð¸Ð°Ð»Ð¾Ð³Ð°"
 
-#: src/cfg_cmdseq.c:650
+#: src/cfg_cmdseq.c:659
 msgid "Add a separator bar to input window"
-msgstr "Ëèíèÿ-ðàçäåëèòåëü â îêíå ââîäà"
+msgstr "ÐÐ¸Ð½Ð¸Ñ-ÑÐ°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ Ð² Ð¾ÐºÐ½Ðµ Ð²Ð²Ð¾Ð´Ð°"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "$NAME"
 msgstr "$NAME"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "Value of $NAME (environment)"
-msgstr "Çíà÷åíèå $NAME (èç îêðóæåíèÿ)"
+msgstr "ÐÐ½Ð°ÑÐµÐ½Ð¸Ðµ $NAME (Ð¸Ð· Ð¾ÐºÑÑÐ¶ÐµÐ½Ð¸Ñ)"
 
-#: src/cfg_cmdseq.c:652
+#: src/cfg_cmdseq.c:661
 msgid "gentoo's PID"
 msgstr "PID gentoo"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "Home directory for user NAME"
-msgstr "Äîìàøíèé êàòàëîã ïîëüçîâàòåëÿ NAME"
+msgstr "ÐÐ¾Ð¼Ð°ÑÐ½Ð¸Ð¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ NAME"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "~NAME"
 msgstr "~NAME"
 
-#: src/cfg_cmdseq.c:677
+#: src/cfg_cmdseq.c:686 src/cmd_split.c:536
 msgid "Pick Code"
-msgstr "Âûáðàòü êîä"
+msgstr "ÐÑÐ±ÑÐ°ÑÑ ÐºÐ¾Ð´"
 
-#: src/cfg_cmdseq.c:765
+#: src/cfg_cmdseq.c:778
 msgid "(No Options Available)"
-msgstr "(Íåò íàñòðîåê)"
+msgstr "(ÐÐµÑ Ð½Ð°ÑÑÑÐ¾ÐµÐº)"
 
-#: src/cfg_cmdseq.c:801
+#: src/cfg_cmdseq.c:814
 msgid "Run in Background?"
-msgstr "Çàïóñòèòü ôîíîì?"
+msgstr "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÑÐ¾Ð½Ð¾Ð¼?"
 
-#: src/cfg_cmdseq.c:805
+#: src/cfg_cmdseq.c:818
 msgid "Kill Previous Instance?"
-msgstr "Ñíÿòü ïðåäûäóùóþ çàäà÷ó?"
+msgstr "Ð¡Ð½ÑÑÑ Ð¿ÑÐµÐ´ÑÐ´ÑÑÑÑ Ð·Ð°Ð´Ð°ÑÑ?"
 
-#: src/cfg_cmdseq.c:809
+#: src/cfg_cmdseq.c:822
 msgid "Survive Quit?"
-msgstr "Íå ñíèìàòü ïðè âûõîäå?"
+msgstr "ÐÐµ ÑÐ½Ð¸Ð¼Ð°ÑÑ Ð¿ÑÐ¸ Ð²ÑÑÐ¾Ð´Ðµ?"
 
-#: src/cfg_cmdseq.c:815
+#: src/cfg_cmdseq.c:828
 msgid "Capture Output?"
-msgstr "Ïîêàçûâàòü âûâîä?"
+msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð²ÑÐ²Ð¾Ð´?"
 
-#: src/cfg_cmdseq.c:900
+#: src/cfg_cmdseq.c:913
 msgid "Before Execution"
-msgstr "Ïåðåä çàïóñêîì"
+msgstr "ÐÐµÑÐµÐ´ Ð·Ð°Ð¿ÑÑÐºÐ¾Ð¼"
 
-#: src/cfg_cmdseq.c:903
+#: src/cfg_cmdseq.c:916
 msgid "Require Source Selection?"
-msgstr "Îáÿçàòåëåí âûáîð èñòî÷íèêà?"
+msgstr "ÐÐ±ÑÐ·Ð°ÑÐµÐ»ÐµÐ½ Ð²ÑÐ±Ð¾Ñ Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ°?"
 
-#: src/cfg_cmdseq.c:907
+#: src/cfg_cmdseq.c:920
 msgid "Require Destination Selection?"
-msgstr "Îáÿçàòåëåí âûáîð íàçíà÷åíèÿ?"
+msgstr "ÐÐ±ÑÐ·Ð°ÑÐµÐ»ÐµÐ½ Ð²ÑÐ±Ð¾Ñ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ?"
 
-#: src/cfg_cmdseq.c:912
+#: src/cfg_cmdseq.c:926
 msgid "CD Source?"
-msgstr "Ïåðåéòè â êàòàëîã èñòî÷íèêà?"
+msgstr "ÐÐµÑÐµÐ¹ÑÐ¸ Ð² ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ°?"
 
-#: src/cfg_cmdseq.c:915
+#: src/cfg_cmdseq.c:929
 msgid "CD Destination?"
-msgstr "Ïåðåéòè â êàòàëîã íàçíà÷åíèÿ?"
+msgstr "ÐÐµÑÐµÐ¹ÑÐ¸ Ð² ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ?"
 
-#: src/cfg_cmdseq.c:922
+#: src/cfg_cmdseq.c:937
 msgid "After Execution"
-msgstr "Ïîñëå çàïóñêà"
+msgstr "ÐÐ¾ÑÐ»Ðµ Ð·Ð°Ð¿ÑÑÐºÐ°"
 
-#: src/cfg_cmdseq.c:924
+#: src/cfg_cmdseq.c:939
 msgid "Rescan Source?"
-msgstr "Ïåðå÷èòàòü êàòàëîã èñòî÷íèêà?"
+msgstr "ÐÐµÑÐµÑÐ¸ÑÐ°ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ°?"
 
-#: src/cfg_cmdseq.c:928
+#: src/cfg_cmdseq.c:943
 msgid "Rescan Destination?"
-msgstr "Ïåðå÷èòàòü êàòàëîã íàçíà÷åíèÿ?"
+msgstr "ÐÐµÑÐµÑÐ¸ÑÐ°ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ?"
 
-#: src/cfg_cmdseq.c:942
+#: src/cfg_cmdseq.c:957
 msgid "General"
-msgstr "Îñíîâíûå"
+msgstr "ÐÑÐ½Ð¾Ð²Ð½ÑÐµ"
 
-#: src/cfg_cmdseq.c:945
+#: src/cfg_cmdseq.c:960
 msgid "Before&After"
-msgstr "Äî è ïîñëå"
+msgstr "ÐÐ¾ Ð¸ Ð¿Ð¾ÑÐ»Ðµ"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "Built-In"
-msgstr "Âñòðîåíûå"
+msgstr "ÐÑÑÑÐ¾ÐµÐ½ÑÐµ"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "External"
-msgstr "Âíåøíèå"
+msgstr "ÐÐ½ÐµÑÐ½Ð¸Ðµ"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Add Row"
-msgstr "Äîáàâèòü ñòðîêó"
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÑÑÑÐ¾ÐºÑ"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Duplicate"
-msgstr "Ñîçäàòü êîïèþ"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°ÑÑ ÐºÐ¾Ð¿Ð¸Ñ"
 
-#: src/cfg_cmdseq.c:978 src/cfg_styles.c:588 src/cfg_styles.c:805
-#: src/cfg_types.c:679 src/cmd_symlink.c:209 src/dpformat.c:35
+#: src/cfg_cmdseq.c:993 src/cfg_styles.c:596 src/cfg_styles.c:823
+#: src/cfg_types.c:678 src/cmd_info.c:151 src/cmd_split.c:648
+#: src/cmd_symlink.c:213 src/dpformat.c:36
 msgid "Name"
-msgstr "Èìÿ"
+msgstr "ÐÐ¼Ñ"
 
-#: src/cfg_cmdseq.c:988
+#: src/cfg_cmdseq.c:1004
 msgid "Definition"
-msgstr "Îïèñàíèå"
+msgstr "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
-#: src/cfg_cmdseq.c:1044
+#: src/cfg_cmdseq.c:1058
 msgid "Repeat Sequence Until No Source Selection?"
-msgstr "Ïîâòîðÿòü ïîñëåäîâàòåëüíîñòü ïîêà åñòü âûáðàíûå?"
+msgstr "ÐÐ¾Ð²ÑÐ¾ÑÑÑÑ Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»ÑÐ½Ð¾ÑÑÑ Ð¿Ð¾ÐºÐ° ÐµÑÑÑ Ð²ÑÐ±ÑÐ°Ð½ÑÐµ?"
 
-#: src/cfg_cmdseq.c:1056 src/cfg_controls.c:655 src/cfg_controls.c:706
-#: src/cfg_styles.c:833 src/cfg_types.c:775
+#: src/cfg_cmdseq.c:1070 src/cfg_controls.c:622 src/cfg_controls.c:673
+#: src/cfg_styles.c:853 src/cfg_types.c:776
 msgid "Add"
-msgstr "Äîáàâèòü"
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ"
 
-#: src/cfg_cmdseq.c:1059 src/cfg_controls.c:658 src/cfg_controls.c:709
-#: src/cfg_styles.c:836 src/cfg_types.c:788
+#: src/cfg_cmdseq.c:1073 src/cfg_controls.c:625 src/cfg_controls.c:676
+#: src/cfg_styles.c:856 src/cfg_types.c:789
 msgid "Delete"
-msgstr "Óáðàòü"
+msgstr "Ð£Ð±ÑÐ°ÑÑ"
 
-#: src/cfg_cmdseq.c:1066
+#: src/cfg_cmdseq.c:1080
 msgid "Commands"
-msgstr "Êîìàíäû"
+msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ñ"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1365 src/cfg_dirpane.c:1371
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1288 src/cfg_dirpane.c:1293
 msgid "Left"
-msgstr "Ëåâàÿ"
+msgstr "ÐÐµÐ²Ð°Ñ"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Middle"
-msgstr "Ñðåäíÿÿ"
+msgstr "Ð¡ÑÐµÐ´Ð½ÑÑ"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1364 src/cfg_dirpane.c:1372
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1287 src/cfg_dirpane.c:1294
 msgid "Right"
-msgstr "Ïðàâàÿ"
+msgstr "ÐÑÐ°Ð²Ð°Ñ"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Down"
-msgstr "Êîëåñîì âíèç"
+msgstr "ÐÐ¾Ð»ÐµÑÐ¾Ð¼ Ð²Ð½Ð¸Ð·"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Up"
-msgstr "Êîëåñîì ââåðõ"
+msgstr "ÐÐ¾Ð»ÐµÑÐ¾Ð¼ Ð²Ð²ÐµÑÑ"
 
-#: src/cfg_controls.c:382
+#: src/cfg_controls.c:378
 msgid ""
 "The following modifier key(s) must\n"
 "be held down when the mouse button\n"
 "is clicked to trigger the command"
 msgstr ""
-"Ñëåäóþùèå êíîïêè ìîäèôèêàòîðû äîëæíû\n"
-"áûòü íàæàòû âî âðåìÿ ùåë÷êà ìûøêè"
+"Ð¡Ð»ÐµÐ´ÑÑÑÐ¸Ðµ ÐºÐ½Ð¾Ð¿ÐºÐ¸ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÑ Ð´Ð¾Ð»Ð¶Ð½Ñ\n"
+"Ð±ÑÑÑ Ð½Ð°Ð¶Ð°ÑÑ Ð²Ð¾ Ð²ÑÐµÐ¼Ñ ÑÐµÐ»ÑÐºÐ° Ð¼ÑÑÐºÐ¸"
 
-#: src/cfg_controls.c:395
+#: src/cfg_controls.c:391
 msgid "Edit Modifiers"
-msgstr "Èçìåíèòü ìîäèôèêàòîðû"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÑ"
 
-#: src/cfg_controls.c:613
+#: src/cfg_controls.c:580
 msgid "Controls"
-msgstr "Óïðàâëåíèå"
+msgstr "Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_controls.c:620
+#: src/cfg_controls.c:587
 msgid "Global Keyboard Shortcuts"
-msgstr "Îñíîâíûå êîìáèíàöèè êíîïîê"
+msgstr "ÐÑÐ½Ð¾Ð²Ð½ÑÐµ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°ÑÐ¸Ð¸ ÐºÐ½Ð¾Ð¿Ð¾Ðº"
 
-#: src/cfg_controls.c:665
+#: src/cfg_controls.c:632
 msgid "Dirpane Mouse Buttons"
-msgstr "Êëàâèøè ìûøêè"
+msgstr "ÐÐ»Ð°Ð²Ð¸ÑÐ¸ Ð¼ÑÑÐºÐ¸"
 
-#: src/cfg_controls.c:690
+#: src/cfg_controls.c:657
 msgid "Button"
-msgstr "Êíîïêà"
+msgstr "ÐÐ½Ð¾Ð¿ÐºÐ°"
 
-#: src/cfg_controls.c:693
+#: src/cfg_controls.c:660
 msgid "Edit Modifiers..."
-msgstr "Èçìåíèòü ìîäèôèêàòîðû..."
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÑ..."
 
-#: src/cfg_controls.c:716
+#: src/cfg_controls.c:683
 msgid "Click-M-Click Gesture"
-msgstr "Ùåëê-Ì-Ùåëê âîçìîæíîñòü"
+msgstr "Ð©ÐµÐ»Ðº-Ð-Ð©ÐµÐ»Ðº Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ"
 
-#: src/cfg_controls.c:726
+#: src/cfg_controls.c:693
 msgid "Time Limit"
-msgstr "Çàäåðæêà"
+msgstr "ÐÐ°Ð´ÐµÑÐ¶ÐºÐ°"
 
-#: src/cfg_controls.c:737
-msgid "Path Right Click"
-msgstr "Ïðàâûé ùåë÷îê íà ïóòè"
-
-#: src/cfg_controls.c:750
+#: src/cfg_controls.c:704
 msgid "Ignore Num Lock For All Bindings?"
-msgstr "Íå ó÷èòûâàòü Num Lock äëÿ âñåõ êîìáèíàöèé?"
+msgstr "ÐÐµ ÑÑÐ¸ÑÑÐ²Ð°ÑÑ Num Lock Ð´Ð»Ñ Ð²ÑÐµÑ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°ÑÐ¸Ð¹?"
 
-#: src/cfg_controls.c:780
+#: src/cfg_controls.c:734
 msgid ""
 "Note: The mouse button control settings\n"
 "are ambiguous: the same button+modifier\n"
 "is used for more than one function. This\n"
 "might make their behaviour pretty weird..."
 msgstr ""
-"Âàæíî: Çíà÷åíèÿ êëàâèø ìûøêè íåîäíîçíà÷íû:\n"
-"îäíà êîìáèíàöèÿ êíîïêè è ìîäèôèêàòîðà\n"
-"èñïîëüçóåòñÿ äëÿ áîëåå ÷åì îäíîé öåëè. Ýòî\n"
-"ìîæåò ïðèâåñòè ê èõ íåîæèäàííîìó ïîâåäåíèþ..."
+"ÐÐ°Ð¶Ð½Ð¾: ÐÐ½Ð°ÑÐµÐ½Ð¸Ñ ÐºÐ»Ð°Ð²Ð¸Ñ Ð¼ÑÑÐºÐ¸ Ð½ÐµÐ¾Ð´Ð½Ð¾Ð·Ð½Ð°ÑÐ½Ñ:\n"
+"Ð¾Ð´Ð½Ð° ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°ÑÐ¸Ñ ÐºÐ½Ð¾Ð¿ÐºÐ¸ Ð¸ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÐ°\n"
+"Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð´Ð»Ñ Ð±Ð¾Ð»ÐµÐµ ÑÐµÐ¼ Ð¾Ð´Ð½Ð¾Ð¹ ÑÐµÐ»Ð¸. ÐÑÐ¾\n"
+"Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑÐ¸Ð²ÐµÑÑÐ¸ Ðº Ð¸Ñ Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð¾Ð¼Ñ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ñ..."
 
-#: src/cfg_controls.c:784
+#: src/cfg_controls.c:738
 msgid "Warning"
-msgstr "Ïðåäóïðåæäåíèå"
+msgstr "ÐÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_controls.c:784 src/children.c:95 src/cmd_info.c:246
+#: src/cfg_controls.c:738 src/children.c:89 src/cmd_info.c:320
 msgid "_OK"
-msgstr "_Äà"
-
-#: src/cfg_dirpane.c:365
-msgid "Formatted Size, in bytes"
-msgstr "Ðàçìåð, â áàéòàõ"
-
-#: src/cfg_dirpane.c:365
-msgid "Raw Size, in Bytes"
-msgstr "Ñûðîé ðàçìåð, â áàéòàõ"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in kilobytes"
-msgstr "Ðàçìåð, â êèëîáàéòàõ"
+msgstr "_ÐÐ°"
 
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in megabytes"
-msgstr "Ðàçìåð, â ìåãàáàéòàõ"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, \"Smart\" Unit"
-msgstr "Ðàçìåð,â \"óìíûõ\" åäèíèöàõ"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, in gigabytes"
-msgstr "Ðàçìåð, â ãèãàáàéòàõ"
-
-#: src/cfg_dirpane.c:383
+#: src/cfg_dirpane.c:333
 msgid "Append Type Character?"
-msgstr "Äîáàâèòü òèï ñèìâîëà?"
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÑÐ¸Ð¿ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°?"
 
-#: src/cfg_dirpane.c:386
-msgid "Append \"-> destination\" on Links?"
-msgstr "Äîáàâèòü \"->íàçíà÷åíèå\" â ññûëêè?"
+#: src/cfg_dirpane.c:336
+#, fuzzy
+msgid "Append \"â destination\" on Links?"
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ \"->Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ\" Ð² ÑÑÑÐ»ÐºÐ¸?"
 
-#: src/cfg_dirpane.c:406
+#: src/cfg_dirpane.c:358
 msgid "Place Tick Every 3 Digits?"
-msgstr "Ðàçäåëèòü ðàçðÿäû?"
+msgstr "Ð Ð°Ð·Ð´ÐµÐ»Ð¸ÑÑ ÑÐ°Ð·ÑÑÐ´Ñ?"
 
-#: src/cfg_dirpane.c:416
+#: src/cfg_dirpane.c:369
 msgid "Digits of Precision"
-msgstr "Òî÷íîñòü"
+msgstr "Ð¢Ð¾ÑÐ½Ð¾ÑÑÑ"
 
-#: src/cfg_dirpane.c:429
+#: src/cfg_dirpane.c:382
 msgid "Show Dir's File System Size?"
-msgstr "Ïîêàçàòü ðàçìåð ôàéëîâîé ñèñòåìû?"
+msgstr "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ ÑÐ°Ð·Ð¼ÐµÑ ÑÐ°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑÐµÐ¼Ñ?"
 
-#: src/cfg_dirpane.c:435 src/cfg_dirpane.c:439 src/cfg_dirpane.c:443
-#: src/cfg_dirpane.c:447 src/cfg_dirpane.c:451 src/cfg_dirpane.c:455
-#: src/cfg_dirpane.c:459 src/cfg_dirpane.c:463 src/cfg_dirpane.c:467
-#: src/cfg_dirpane.c:474
+#: src/cfg_dirpane.c:388 src/cfg_dirpane.c:392 src/cfg_dirpane.c:396
+#: src/cfg_dirpane.c:400 src/cfg_dirpane.c:404 src/cfg_dirpane.c:408
+#: src/cfg_dirpane.c:412 src/cfg_dirpane.c:416 src/cfg_dirpane.c:420
+#: src/cfg_dirpane.c:428
 msgid "Format"
-msgstr "Ôîðìàò"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°Ñ"
 
-#: src/cfg_dirpane.c:497
+#: src/cfg_dirpane.c:454
 #, c-format
 msgid "%s Settings"
-msgstr "%s íàñòðîéêè"
+msgstr "%s Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1002 src/cfg_dirpane.c:1003
-#: src/cmd_select.c:414
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:970 src/cfg_dirpane.c:971
+#: src/cmd_select.c:381
 msgid "Content"
-msgstr "Ñîäåðæàíèå"
+msgstr "Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ"
 
-#: src/cfg_dirpane.c:611
+#: src/cfg_dirpane.c:571
 msgid "Justification"
-msgstr "Âûðàâíèâàíèå"
+msgstr "ÐÑÑÐ°Ð²Ð½Ð¸Ð²Ð°Ð½Ð¸Ðµ"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1003
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:971
 msgid "Title"
-msgstr "Çàãîëîâîê"
+msgstr "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº"
 
-#: src/cfg_dirpane.c:611 src/window.c:201
+#: src/cfg_dirpane.c:571 src/window.c:200
 msgid "Width"
-msgstr "Øèðèíà"
+msgstr "Ð¨Ð¸ÑÐ¸Ð½Ð°"
 
-#: src/cfg_dirpane.c:612
+#: src/cfg_dirpane.c:572
 msgid "Center"
-msgstr "Ïî öåíòðó"
+msgstr "ÐÐ¾ ÑÐµÐ½ÑÑÑ"
 
-#: src/cfg_dirpane.c:621
+#: src/cfg_dirpane.c:581
 msgid "Basic Settings"
-msgstr "Îñíîâíûå íàñòðîéêè"
+msgstr "ÐÑÐ½Ð¾Ð²Ð½ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸"
 
-#: src/cfg_dirpane.c:669
+#: src/cfg_dirpane.c:628
 msgid "Edit Column Content"
-msgstr "Èçìåíèòü ñîäåðæèìîå êîëîíîê"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ ÐºÐ¾Ð»Ð¾Ð½Ð¾Ðº"
 
-#: src/cfg_dirpane.c:1002
+#: src/cfg_dirpane.c:970
 msgid "Default Title"
-msgstr "Çàãîëîâîê ïî óìîë÷àíèþ"
+msgstr "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories First"
-msgstr "Êàòàëîãè ââåðõó"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³Ð¸ Ð²Ð²ÐµÑÑÑ"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Last"
-msgstr "Êàòàëîãè âíèçó"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³Ð¸ Ð²Ð½Ð¸Ð·Ñ"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Mixed"
-msgstr "Êàòàëîãè êàê ôàéëû"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³Ð¸ ÐºÐ°Ðº ÑÐ°Ð¹Ð»Ñ"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Left of List"
-msgstr "Ñëåâà îò ñïèñêà"
+msgstr "Ð¡Ð»ÐµÐ²Ð° Ð¾Ñ ÑÐ¿Ð¸ÑÐºÐ°"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Right of List"
-msgstr "Ñïðàâà îò ñïèñêà"
+msgstr "Ð¡Ð¿ÑÐ°Ð²Ð° Ð¾Ñ ÑÐ¿Ð¸ÑÐºÐ°"
 
-#: src/cfg_dirpane.c:1029 src/cfg_dirpane.c:1030
+#: src/cfg_dirpane.c:997
 msgid "System Default"
-msgstr "Ïî óìîë÷àíèþ"
+msgstr "ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
 
-#: src/cfg_dirpane.c:1030
-msgid "Always Set"
-msgstr "Âñåãäà âêëþ÷åíî"
-
-#: src/cfg_dirpane.c:1030 src/cmd_chmod.c:260 src/menus.c:513
-msgid "Toggle"
-msgstr "Ïåðåêëþ÷èòü"
-
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy From %s"
-msgstr "Ñêîïèðîâàòü èç %s"
+msgstr "Ð¡ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð¸Ð· %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy To %s"
-msgstr "Êîïèðîâàòü â %s"
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð² %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Swap With %s"
-msgstr "Îáìåíÿòü ñ %s"
+msgstr "ÐÐ±Ð¼ÐµÐ½ÑÑÑ Ñ %s"
 
-#: src/cfg_dirpane.c:1048
+#: src/cfg_dirpane.c:1015
 msgid "Columns"
-msgstr "Êîëîíêè"
+msgstr "ÐÐ¾Ð»Ð¾Ð½ÐºÐ¸"
 
-#: src/cfg_dirpane.c:1053
+#: src/cfg_dirpane.c:1020
 msgid "Available Content Types"
-msgstr "Äîñòóïíûå òèïû ñîäåðæèìîãî"
+msgstr "ÐÐ¾ÑÑÑÐ¿Ð½ÑÐµ ÑÐ¸Ð¿Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾"
 
-#: src/cfg_dirpane.c:1070
+#: src/cfg_dirpane.c:1037
 msgid "Selected Content Types"
-msgstr "Âûáðàíûå òèïû ñîäåðæèìîãî"
+msgstr "ÐÑÐ±ÑÐ°Ð½ÑÐµ ÑÐ¸Ð¿Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾"
 
-#: src/cfg_dirpane.c:1081 src/cfg_styles.c:723
+#: src/cfg_dirpane.c:1049 src/cfg_styles.c:741
 msgid "Edit..."
-msgstr "Èçìåíèòü..."
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ..."
 
-#: src/cfg_dirpane.c:1082 src/cmd_renamere.c:508
+#: src/cfg_dirpane.c:1050 src/cmd_renamere.c:481
 msgid "Remove"
-msgstr "Óáðàòü"
+msgstr "Ð£Ð±ÑÐ°ÑÑ"
 
-#: src/cfg_dirpane.c:1096
+#: src/cfg_dirpane.c:1064
 msgid "Sorting"
-msgstr "Ñîðòèðîâêà"
+msgstr "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ°"
 
-#: src/cfg_dirpane.c:1099
+#: src/cfg_dirpane.c:1067
 msgid "Sort On"
-msgstr "Ñîðòèðîâàòü"
+msgstr "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ"
 
-#: src/cfg_dirpane.c:1106 src/cmd_split.c:233 src/dpformat.c:39
-#: src/dpformat.c:40
+#: src/cfg_dirpane.c:1071 src/cmd_split.c:590 src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode"
-msgstr "Ðåæèì"
+msgstr "Ð ÐµÐ¶Ð¸Ð¼"
 
-#: src/cfg_dirpane.c:1113
+#: src/cfg_dirpane.c:1077
 msgid "Inverse Sorting?"
-msgstr "Îáðàòíàÿ ñîðòèðîâêà?"
+msgstr "ÐÐ±ÑÐ°ÑÐ½Ð°Ñ ÑÐ¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ°?"
 
-#: src/cfg_dirpane.c:1116 src/cfg_paths.c:187 src/cfg_types.c:743
-#: src/cmd_renamere.c:459 src/cmd_renamere.c:486 src/cmd_select.c:520
-#: src/textview.c:620
+#: src/cfg_dirpane.c:1080 src/cfg_paths.c:228 src/cfg_types.c:744
+#: src/cmd_renamere.c:432 src/cmd_renamere.c:459 src/cmd_select.c:478
+#: src/textview.c:604
 msgid "Ignore Case?"
-msgstr "Íå ó÷èòûâàòü ðåãèñòð?"
-
-#: src/cfg_dirpane.c:1119
-msgid "Numerical Mode?"
-msgstr "Ó÷èòûâàòü äëèíó?"
+msgstr "ÐÐµ ÑÑÐ¸ÑÑÐ²Ð°ÑÑ ÑÐµÐ³Ð¸ÑÑÑ?"
 
-#: src/cfg_dirpane.c:1127
+#: src/cfg_dirpane.c:1088
 msgid "Default Directory"
-msgstr "Êàòàëîã ïî óìîë÷àíèþ"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
 
-#: src/cfg_dirpane.c:1132
+#: src/cfg_dirpane.c:1094
 msgid "Grab Current"
-msgstr "Âçÿòü òåêóùèå"
+msgstr "ÐÐ·ÑÑÑ ÑÐµÐºÑÑÐ¸Ðµ"
 
-#: src/cfg_dirpane.c:1135
+#: src/cfg_dirpane.c:1097
 msgid "From History"
-msgstr "Ïîñëåäíèé"
+msgstr "ÐÐ¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹"
 
-#: src/cfg_dirpane.c:1148
+#: src/cfg_dirpane.c:1110
 msgid "Path Above?"
-msgstr "Ïóòü ñâåðõó?"
+msgstr "ÐÑÑÑ ÑÐ²ÐµÑÑÑ?"
 
-#: src/cfg_dirpane.c:1152
+#: src/cfg_dirpane.c:1114
 msgid "Hide Allowed?"
-msgstr "Ðàçðåøèòü ñêðûòèå?"
+msgstr "Ð Ð°Ð·ÑÐµÑÐ¸ÑÑ ÑÐºÑÑÑÐ¸Ðµ?"
 
-#: src/cfg_dirpane.c:1156
+#: src/cfg_dirpane.c:1118
 msgid "Scrollbar Always?"
-msgstr "Áåãóíîê âñåãäà?"
+msgstr "ÐÐµÐ³ÑÐ½Ð¾Ðº Ð²ÑÐµÐ³Ð´Ð°?"
 
-#: src/cfg_dirpane.c:1160
+#: src/cfg_dirpane.c:1122
 msgid "Huge Parent Button?"
-msgstr "Áîëüøàÿ êíîïêà Ââåðõ?"
+msgstr "ÐÐ¾Ð»ÑÑÐ°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° ÐÐ²ÐµÑÑ?"
 
-#: src/cfg_dirpane.c:1168
-msgid "Scrollbar Position"
-msgstr "Ðàñïîëîæåíèå áåãóíêà"
-
-#: src/cfg_dirpane.c:1180
-msgid "Modify 'Control' Key State"
-msgstr "Èçìåíèòü ñîñòîÿíèå êíîïêè 'Control'"
-
-#: src/cfg_dirpane.c:1225
-msgid "Active Pane Titles"
-msgstr "Çàãîëîâîê àêòèâíîé ïàíåëè"
-
-#: src/cfg_dirpane.c:1225
-msgid "Focused Row, Unselected"
-msgstr "Âûáðàííàÿ ñòðîêà, íå îòìå÷åíàÿ"
+#: src/cfg_dirpane.c:1127
+msgid "Set Custom Font?"
+msgstr ""
 
-#: src/cfg_dirpane.c:1226
-msgid "Focused Row, Selected"
-msgstr "Âûáðàííàÿ ñòðîêà, îòìå÷åííàÿ"
+#: src/cfg_dirpane.c:1140
+msgid "Scrollbar Position"
+msgstr "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð±ÐµÐ³ÑÐ½ÐºÐ°"
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Horizontal"
-msgstr "Ãîðèçîíòàëüíî"
+msgstr "ÐÐ¾ÑÐ¸Ð·Ð¾Ð½ÑÐ°Ð»ÑÐ½Ð¾"
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Vertical"
-msgstr "Âåðòèêàëüíî"
+msgstr "ÐÐµÑÑÐ¸ÐºÐ°Ð»ÑÐ½Ð¾"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Don't Track"
-msgstr "Íå èçìåíÿòü"
+msgstr "ÐÐµ Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Ratio"
-msgstr "Ñîîòíîøåíèå"
+msgstr "Ð¡Ð¾Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Left Pane"
-msgstr "Ðàçìåð ëåâîé ïàíåëè"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ Ð»ÐµÐ²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Right Pane"
-msgstr "Ðàçìåð ïðàâîé ïàíåëè"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ Ð¿ÑÐ°Ð²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_dirpane.c:1275
+#: src/cfg_dirpane.c:1198
 msgid "Pane Orientation"
-msgstr "Îðèåíòàöèÿ ïàíåëè"
+msgstr "ÐÑÐ¸ÐµÐ½ÑÐ°ÑÐ¸Ñ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_dirpane.c:1289
+#: src/cfg_dirpane.c:1212
 msgid "Split Tracking"
-msgstr "Ðàçäåëèòåëü"
+msgstr "Ð Ð°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ"
 
-#: src/cfg_dirpane.c:1312
+#: src/cfg_dirpane.c:1235
 msgid "pixels"
-msgstr "òî÷êè"
+msgstr "ÑÐ¾ÑÐºÐ¸"
 
-#: src/cfg_dirpane.c:1340
+#: src/cfg_dirpane.c:1263
 msgid "Remember Selected Rows?"
-msgstr "Çàïîìèíàòü âûáðàíûå ýëåìåíòû?"
+msgstr "ÐÐ°Ð¿Ð¾Ð¼Ð¸Ð½Ð°ÑÑ Ð²ÑÐ±ÑÐ°Ð½ÑÐµ ÑÐ»ÐµÐ¼ÐµÐ½ÑÑ?"
 
-#: src/cfg_dirpane.c:1343
+#: src/cfg_dirpane.c:1266
 msgid "Save History Lists?"
-msgstr "Ñîõðàíÿòü èñòîðèþ?"
+msgstr "Ð¡Ð¾ÑÑÐ°Ð½ÑÑÑ Ð¸ÑÑÐ¾ÑÐ¸Ñ?"
 
-#: src/cfg_dirpane.c:1360 src/cfg_dirpane.c:1370
+#: src/cfg_dirpane.c:1283 src/cfg_dirpane.c:1292
 msgid "Dir Panes"
-msgstr "Ïàíåëè"
+msgstr "ÐÐ°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_dirpane.c:1374
+#: src/cfg_dirpane.c:1295
 msgid "Pane Split"
-msgstr "Ðàçäåëèòåëü"
+msgstr "Ð Ð°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ"
 
-#: src/cfg_dirpane.c:1375
+#: src/cfg_dirpane.c:1296
 msgid "History"
-msgstr "Èñòîðèÿ"
+msgstr "ÐÑÑÐ¾ÑÐ¸Ñ"
 
-#: src/cfg_errors.c:45
-msgid "Errors"
-msgstr "Îøèáêè"
+#: src/cfg_dirpane.c:1725
+msgid "'Blocks' Content Deprecated"
+msgstr ""
 
-#: src/cfg_errors.c:52
-msgid "Use Dialog to Report Errors?"
-msgstr "Èñïîëüçîâàòü äèàëîã äëÿ îøèáîê?"
+#: src/cfg_dirpane.c:1726
+msgid ""
+"The 'Blocks' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
 
-#: src/cfg_errors.c:56
-msgid "Cause Console Beep on Error?"
-msgstr "Èñïîëüçîâàòü ñèãíàë äèíàìèêà?"
+#: src/cfg_dirpane.c:1732
+msgid "'Block Size' Content Deprecated"
+msgstr ""
 
-#: src/cfg_menus.c:44
-msgid "Menus"
-msgstr "Ìåíþ"
+#: src/cfg_dirpane.c:1733
+msgid ""
+"The 'Block Size' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
 
-#: src/cfg_mount.c:168
-msgid "Never"
-msgstr "Íèêîãäà"
+#: src/cfg_errors.c:48
+msgid "Errors"
+msgstr "ÐÑÐ¸Ð±ÐºÐ¸"
 
-#: src/cfg_mount.c:168
-msgid "On Every Access"
-msgstr "Ïðè êàæäîì îáðàùåíèè"
+#: src/cfg_errors.c:55
+msgid "Error and Status Message Display"
+msgstr ""
 
-#: src/cfg_mount.c:177
-msgid "Mounting"
-msgstr "Ïîäêëþ÷åíèå"
+#: src/cfg_errors.c:57
+msgid "Status Bar, Above Panes"
+msgstr ""
 
-#: src/cfg_mount.c:184
-msgid "Mount When?"
-msgstr "Êîãäà ïîäêëþ÷àòü?"
+#: src/cfg_errors.c:60
+msgid "Main Window's Title Bar"
+msgstr ""
 
-#: src/cfg_mount.c:196
-msgid "Mount Options"
-msgstr "Íàñòðîéêà ïîäêëþ÷åíèÿ äèñêîâ"
+#: src/cfg_errors.c:63
+msgid "Separate Dialog"
+msgstr ""
 
-#: src/cfg_mount.c:199
-msgid "Mount Command"
-msgstr "Êîìàíäà ïîäêëþ÷åíèÿ"
+#: src/cfg_errors.c:69
+msgid "Cause Console Beep on Error?"
+msgstr "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐ¸Ð³Ð½Ð°Ð» Ð´Ð¸Ð½Ð°Ð¼Ð¸ÐºÐ°?"
 
-#: src/cfg_mount.c:204
-msgid "Unmount Command"
-msgstr "Êîìàíäà îòêëþ÷åíèÿ"
+#: src/cfg_menus.c:44
+msgid "Menus"
+msgstr "ÐÐµÐ½Ñ"
 
-#: src/cfg_mount.c:211
-msgid "Only Mount on Toplevel Directories?"
-msgstr "Ïîäêëþ÷àòü òîëüêî â êîðíåâîì êàòàëîãå?"
+#: src/cfg_nag.c:78
+#, c-format
+msgid ""
+"Click the button below to reset the %zu stored 'Don't show this dialog "
+"again' responses."
+msgstr ""
 
-#: src/cfg_mount.c:214
-msgid "Use Command Error Dialog?"
-msgstr "Èñïîëüçîâàòü äèàëîã äëÿ îøèáîê"
+#: src/cfg_nag.c:100
+msgid "Nagging"
+msgstr ""
 
-#: src/cfg_mount.c:217
-msgid "Unmount When gentoo Quits?"
-msgstr "Îòêëþ÷àòü ïðè âûõîäå?"
+#: src/cfg_nag.c:110
+#, fuzzy
+msgid "Reset All"
+msgstr "ÐÐµÑÐ½ÑÑÑ Ð½Ð°ÑÐ°Ð»ÑÐ½ÑÐµ"
 
-#: src/cfg_paths.c:128
-msgid "GTK+ RC"
-msgstr "GTK+ RC"
+#: src/cfg_paths.c:78
+msgid "Edit path"
+msgstr ""
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:152
 msgid "Icons"
-msgstr "Çíà÷êè"
+msgstr "ÐÐ½Ð°ÑÐºÐ¸"
+
+#: src/cfg_paths.c:153
+msgid "GTK+ RC"
+msgstr "GTK+ RC"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:154
 msgid "fstab"
 msgstr "fstab"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:155
 msgid "mtab"
 msgstr "mtab"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Beginning With Dot (.)"
-msgstr "Íà÷èíàþùèåñÿ ñ òî÷êè (.)"
+msgstr "ÐÐ°ÑÐ¸Ð½Ð°ÑÑÐ¸ÐµÑÑ Ñ ÑÐ¾ÑÐºÐ¸ (.)"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Matching RE"
-msgstr "Óäîâëåòâîðÿþùèå óñëîâèþ"
+msgstr "Ð£Ð´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÑÑÑÐ¸Ðµ ÑÑÐ»Ð¾Ð²Ð¸Ñ"
 
-#: src/cfg_paths.c:129 src/cmd_chmod.c:259 src/menus.c:512
+#: src/cfg_paths.c:157 src/cmd_chmod.c:252 src/menus.c:519
 msgid "None"
-msgstr "Íåò"
+msgstr "ÐÐµÑ"
 
-#: src/cfg_paths.c:135
+#: src/cfg_paths.c:163
 msgid "Paths & Hide"
-msgstr "Ïóòè & Ñêðûòèå"
+msgstr "ÐÑÑÐ¸ & Ð¡ÐºÑÑÑÐ¸Ðµ"
 
-#: src/cfg_paths.c:142
+#: src/cfg_paths.c:170
 msgid "Paths"
-msgstr "Ïóòè"
+msgstr "ÐÑÑÐ¸"
 
-#: src/cfg_paths.c:169
+#: src/cfg_paths.c:209
 msgid "Hide Entries"
-msgstr "Ñêðûòèå"
+msgstr "Ð¡ÐºÑÑÑÐ¸Ðµ"
 
-#: src/cfg_styles.c:170 src/cfg_types.c:234 src/iconutil.c:29 src/menus.c:19
+#: src/cfg_styles.c:178 src/cfg_types.c:233 src/iconutil.c:31 src/menus.c:19
 msgid "(None)"
-msgstr "(Íåò)"
+msgstr "(ÐÐµÑ)"
 
-#: src/cfg_styles.c:191 src/cfg_styles.c:428 src/cfg_styles.c:767
+#: src/cfg_styles.c:199 src/cfg_styles.c:436 src/cfg_styles.c:785
 msgid "Delete Action"
-msgstr "Óäàëåíèå"
+msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_styles.c:411 src/color_dialog.c:48
+#: src/cfg_styles.c:419 src/color_dialog.c:47
 msgid "Edit Color"
-msgstr "Èçìåíèòü öâåò"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ²ÐµÑ"
 
-#: src/cfg_styles.c:428
+#: src/cfg_styles.c:436
 msgid "Revert to Inherited Command"
-msgstr "Îñòàâèòü òîëüêî íàñëåäóåìûå"
+msgstr "ÐÑÑÐ°Ð²Ð¸ÑÑ ÑÐ¾Ð»ÑÐºÐ¾ Ð½Ð°ÑÐ»ÐµÐ´ÑÐµÐ¼ÑÐµ"
 
-#: src/cfg_styles.c:529
+#: src/cfg_styles.c:537
 #, fuzzy
 msgid "Select Command ..."
-msgstr "Âûáåðèòå êîìàíäó"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ"
 
-#: src/cfg_styles.c:592
+#: src/cfg_styles.c:601
 msgid "New Action Property"
-msgstr "Ñâîéñòâà íîâîãî ñîáûòèÿ"
+msgstr "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° Ð½Ð¾Ð²Ð¾Ð³Ð¾ ÑÐ¾Ð±ÑÑÐ¸Ñ"
 
-#: src/cfg_styles.c:600
+#: src/cfg_styles.c:609
 msgid "something"
-msgstr "íå÷òî"
+msgstr "Ð½ÐµÑÑÐ¾"
 
-#: src/cfg_styles.c:670
+#: src/cfg_styles.c:679
 msgid ""
 "Deleting this style will also delete\n"
 "all its children. Are you sure?"
 msgstr ""
-"Óäàëåíèå ýòîãî êëàññà ïîâëå÷åò òàêæå\n"
-"óäàëåíèå âñåõ ïîòîìêîâ. Óâåðåíû?"
+"Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ ÑÑÐ¾Ð³Ð¾ ÐºÐ»Ð°ÑÑÐ° Ð¿Ð¾Ð²Ð»ÐµÑÐµÑ ÑÐ°ÐºÐ¶Ðµ\n"
+"ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð²ÑÐµÑ Ð¿Ð¾ÑÐ¾Ð¼ÐºÐ¾Ð². Ð£Ð²ÐµÑÐµÐ½Ñ?"
 
-#: src/cfg_styles.c:671
+#: src/cfg_styles.c:680
 msgid "Confirm Delete"
-msgstr "Ïîäòâåðäèòå óäàëåíèå"
+msgstr "ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Background Color"
-msgstr "Öâåò ôîíà"
+msgstr "Ð¦Ð²ÐµÑ ÑÐ¾Ð½Ð°"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Foreground Color"
-msgstr "Öâåò"
+msgstr "Ð¦Ð²ÐµÑ"
 
-#: src/cfg_styles.c:694 src/dpformat.c:53
+#: src/cfg_styles.c:703 src/dpformat.c:55
 msgid "Icon"
-msgstr "Çíà÷îê"
+msgstr "ÐÐ½Ð°ÑÐ¾Ðº"
 
-#: src/cfg_styles.c:696
+#: src/cfg_styles.c:705
 msgid "(Row Style Preview Text)"
-msgstr "(Òàê áóäåò âûãëÿäåòü)"
+msgstr "(Ð¢Ð°Ðº Ð±ÑÐ´ÐµÑ Ð²ÑÐ³Ð»ÑÐ´ÐµÑÑ)"
 
-#: src/cfg_styles.c:702 src/cmd_renameseq.c:386
+#: src/cfg_styles.c:713 src/cmd_renameseq.c:358 src/cmd_split.c:656
 msgid "Preview"
-msgstr "Ïðåäïðîñìîòð"
+msgstr "ÐÑÐµÐ´Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑ"
 
-#: src/cfg_styles.c:719
+#: src/cfg_styles.c:737
 msgid "Override Parent's?"
-msgstr "Ïåðåîïðåäåëèòü?"
+msgstr "ÐÐµÑÐµÐ¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ?"
 
-#: src/cfg_styles.c:723
+#: src/cfg_styles.c:741
 msgid "Pick..."
-msgstr "Âûáåðèòå..."
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ..."
 
-#: src/cfg_styles.c:764
+#: src/cfg_styles.c:782
 msgid "Add Action..."
-msgstr "Äîáàâèòü äåéñòâèå..."
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ..."
 
-#: src/cfg_styles.c:810 src/menus.c:525
+#: src/cfg_styles.c:829 src/menus.c:532
 msgid "Parent"
-msgstr "Ðîäèòåëü"
+msgstr "Ð Ð¾Ð´Ð¸ÑÐµÐ»Ñ"
 
-#: src/cfg_styles.c:820
+#: src/cfg_styles.c:840
 msgid "Inherited Properties"
-msgstr "Íàñëåäóåìûå ñâîéñòâà"
+msgstr "ÐÐ°ÑÐ»ÐµÐ´ÑÐµÐ¼ÑÐµ ÑÐ²Ð¾Ð¹ÑÑÐ²Ð°"
 
-#: src/cfg_styles.c:824
+#: src/cfg_styles.c:844
 msgid "Visual"
-msgstr "Îòîáðàæåíèå"
+msgstr "ÐÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_styles.c:826
+#: src/cfg_styles.c:846
 msgid "Actions"
-msgstr "Äåéñòâèÿ"
+msgstr "ÐÐµÐ¹ÑÑÐ²Ð¸Ñ"
 
-#: src/cfg_styles.c:843
+#: src/cfg_styles.c:863
 msgid "File Recognition"
-msgstr "Òèïû ôàéëîâ"
+msgstr "Ð¢Ð¸Ð¿Ñ ÑÐ°Ð¹Ð»Ð¾Ð²"
 
-#: src/cfg_styles.c:844
+#: src/cfg_styles.c:864
 msgid "Styles"
-msgstr "Êëàññû"
+msgstr "ÐÐ»Ð°ÑÑÑ"
 
-#: src/cfg_types.c:193
+#: src/cfg_types.c:192
 #, c-format
 msgid "%s - Click to Change..."
-msgstr "%s - Ùåëêíèòå äëÿ ñìåíû..."
+msgstr "%s - Ð©ÐµÐ»ÐºÐ½Ð¸ÑÐµ Ð´Ð»Ñ ÑÐ¼ÐµÐ½Ñ..."
 
-#: src/cfg_types.c:508
+#: src/cfg_types.c:507
 msgid "(New Type)"
-msgstr "(Íîâûé òèï)"
+msgstr "(ÐÐ¾Ð²ÑÐ¹ ÑÐ¸Ð¿)"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "B-Dev"
-msgstr "B-Óñòð"
+msgstr "B-Ð£ÑÑÑ"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "C-Dev"
-msgstr "C-Óñòð"
+msgstr "C-Ð£ÑÑÑ"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Dir"
-msgstr "Êàòàëîã"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "FIFO"
 msgstr "FIFO"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "File"
-msgstr "Ôàéë"
+msgstr "Ð¤Ð°Ð¹Ð»"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Link"
-msgstr "Ññûëêà"
+msgstr "Ð¡ÑÑÐ»ÐºÐ°"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Socket"
-msgstr "Ïîðò"
+msgstr "ÐÐ¾ÑÑ"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "Readable"
-msgstr "×òåíèå"
+msgstr "Ð§ÑÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetGID"
-msgstr "Ñ GID"
+msgstr "Ð¡ GID"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetUID"
-msgstr "Ñ UID"
+msgstr "Ð¡ UID"
 
-#: src/cfg_types.c:648 src/cmd_chmod.c:209
+#: src/cfg_types.c:647 src/cmd_chmod.c:200
 msgid "Sticky"
-msgstr "Ôèêñàöèÿ"
+msgstr "Ð¤Ð¸ÐºÑÐ°ÑÐ¸Ñ"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Executable"
-msgstr "Âûïîëíåíèå"
+msgstr "ÐÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Writable"
-msgstr "Çàïèñü"
+msgstr "ÐÐ°Ð¿Ð¸ÑÑ"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match 'file' (RE)"
-msgstr "Óñëîâèå íà ôàéë"
+msgstr "Ð£ÑÐ»Ð¾Ð²Ð¸Ðµ Ð½Ð° ÑÐ°Ð¹Ð»"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match Name (RE)"
-msgstr "Óñëîâèå íà èìÿ"
+msgstr "Ð£ÑÐ»Ð¾Ð²Ð¸Ðµ Ð½Ð° Ð¸Ð¼Ñ"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Require Suffix"
-msgstr "Ñ ðàñøèðåíèåì"
+msgstr "Ð¡ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸ÐµÐ¼"
 
 #: src/cfg_types.c:687
 msgid "Identification"
-msgstr "Ðàñïîçíàâàíèå"
+msgstr "Ð Ð°ÑÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°Ð½Ð¸Ðµ"
 
 #: src/cfg_types.c:689
 msgid "Require Type"
-msgstr "Ïðèçíàêè"
+msgstr "ÐÑÐ¸Ð·Ð½Ð°ÐºÐ¸"
 
 #: src/cfg_types.c:703
 msgid "Require Protection"
-msgstr "Àòðèáóòû"
+msgstr "ÐÑÑÐ¸Ð±ÑÑÑ"
 
-#: src/cfg_types.c:738
+#: src/cfg_types.c:739
 msgid "Glob?"
-msgstr "Âñå?"
+msgstr "ÐÑÐµ?"
 
-#: src/cfg_types.c:754
+#: src/cfg_types.c:755
 msgid "Type's Style"
-msgstr "Êëàññ ýòîãî òèïà"
+msgstr "ÐÐ»Ð°ÑÑ ÑÑÐ¾Ð³Ð¾ ÑÐ¸Ð¿Ð°"
 
-#: src/cfg_types.c:756
+#: src/cfg_types.c:757
 msgid "Style"
-msgstr "Êëàññ"
+msgstr "ÐÐ»Ð°ÑÑ"
 
-#: src/cfg_types.c:796
+#: src/cfg_types.c:797
 msgid "Types"
-msgstr "Òèïû"
+msgstr "Ð¢Ð¸Ð¿Ñ"
 
 #: src/cfg_windows.c:86
 msgid "Dialog Windows Center On Screen"
-msgstr "Äèàëîãîâûå îêíà â öåíòðå ýêðàíà"
+msgstr "ÐÐ¸Ð°Ð»Ð¾Ð³Ð¾Ð²ÑÐµ Ð¾ÐºÐ½Ð° Ð² ÑÐµÐ½ÑÑÐµ ÑÐºÑÐ°Ð½Ð°"
 
 #: src/cfg_windows.c:86
 msgid "Dialog Windows Follow Mouse"
-msgstr "Äèàëîãîâûå îêíà ðÿäîì ñ ìûøêîé"
+msgstr "ÐÐ¸Ð°Ð»Ð¾Ð³Ð¾Ð²ÑÐµ Ð¾ÐºÐ½Ð° ÑÑÐ´Ð¾Ð¼ Ñ Ð¼ÑÑÐºÐ¾Ð¹"
 
 #: src/cfg_windows.c:86
 msgid "Dialog Windows Positioned by Window Manager"
-msgstr "Äèàëîãîâûå îêíà ðàññòàâëÿþòñÿ îêîííûì ìåíåäæåðîì"
+msgstr "ÐÐ¸Ð°Ð»Ð¾Ð³Ð¾Ð²ÑÐµ Ð¾ÐºÐ½Ð° ÑÐ°ÑÑÑÐ°Ð²Ð»ÑÑÑÑÑ Ð¾ÐºÐ¾Ð½Ð½ÑÐ¼ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑÐ¾Ð¼"
 
 #: src/cfg_windows.c:94
 msgid "Windows"
-msgstr "Îêíà"
+msgstr "ÐÐºÐ½Ð°"
 
 #: src/cfg_windows.c:102
 #, fuzzy
 msgid "Window Borders"
-msgstr "Îêíà"
+msgstr "ÐÐºÐ½Ð°"
 
 #: src/cfg_windows.c:118
 msgid "Dialog Positioning"
-msgstr "Ðàñïîëîæåíèå äèàëîãîâûõ îêîí"
+msgstr "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð´Ð¸Ð°Ð»Ð¾Ð³Ð¾Ð²ÑÑ Ð¾ÐºÐ¾Ð½"
 
-#: src/children.c:94
+#: src/children.c:88
 #, c-format
 msgid "Execution of \"%s\" Failed"
-msgstr "Âûïîëíåíèå \"%s\" ñîðâàíî"
+msgstr "ÐÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ \"%s\" ÑÐ¾ÑÐ²Ð°Ð½Ð¾"
 
-#: src/children.c:95 src/dialog.c:285
+#: src/children.c:89 src/dialog.c:290
 msgid "Error"
-msgstr "Îøèáêà"
+msgstr "ÐÑÐ¸Ð±ÐºÐ°"
 
-#: src/children.c:274
+#: src/children.c:227
 #, c-format
 msgid "Couldn't terminate child \"%s\" (pid=%d)--zombie alert"
-msgstr "Íå ìîãó âûãðóçèòü ïðîöåññ \"%s\" (pid=%d) -- çîìáè"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð²ÑÐ³ÑÑÐ·Ð¸ÑÑ Ð¿ÑÐ¾ÑÐµÑÑ \"%s\" (pid=%d) -- Ð·Ð¾Ð¼Ð±Ð¸"
 
 #: src/cmd_about.c:54
 #, c-format
@@ -1179,11 +1184,11 @@
 #: src/cmd_about.c:85
 #, c-format
 msgid "Version %s (GTK+ version %d.%d.%d)."
-msgstr "Âåðñèÿ %s (GTK+ âåðñèÿ %d.%d.%d)."
+msgstr "ÐÐµÑÑÐ¸Ñ %s (GTK+ Ð²ÐµÑÑÐ¸Ñ %d.%d.%d)."
 
 #: src/cmd_about.c:97
 #, fuzzy
-msgid "(c) 1998-2009 by Emil Brink, Obsession Development.\n"
+msgid "(c) 1998-2011 by Emil Brink, Obsession Development.\n"
 msgstr "(c) 1998-2008 - Emil Brink, Obsession Development.\n"
 
 #: src/cmd_about.c:99
@@ -1191,241 +1196,222 @@
 "This is free software, and there is ABSOLUTELY NO\n"
 "WARRANTY. Read the file COPYING for more details.\n"
 msgstr ""
-"Ýòî îòêðûòîå ÏÎ è îíî íå äàåò ÀÁÑÎËÞÒÍÎ ÍÈÊÀÊÈÕ \n"
-"ÃÀÐÀÍÒÈÉ. Ïîäðîáíîñòè ïðî÷òèòå â ôàéëå COPYING.\n"
+"ÐÑÐ¾ Ð¾ÑÐºÑÑÑÐ¾Ðµ ÐÐ Ð¸ Ð¾Ð½Ð¾ Ð½Ðµ Ð´Ð°ÐµÑ ÐÐÐ¡ÐÐÐ®Ð¢ÐÐ ÐÐÐÐÐÐÐ¥ \n"
+"ÐÐÐ ÐÐÐ¢ÐÐ. ÐÐ¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸ Ð¿ÑÐ¾ÑÑÐ¸ÑÐµ Ð² ÑÐ°Ð¹Ð»Ðµ COPYING.\n"
 
-#: src/cmd_about.c:106
-msgid "FAM: Supported and active."
-msgstr "FAM: Ïîääåðæèâàåòñÿ è âêëþ÷åíî"
-
-#: src/cmd_about.c:108
-msgid "FAM: Supported, but not active."
-msgstr "FAM: Ïîääåðæèâàåòñÿ, íî íå âêëþ÷åíî."
-
-#: src/cmd_about.c:110
-msgid "FAM: Not supported."
-msgstr "FAM: Íå ïîääåðæèâàåòñÿ."
-
-#: src/cmd_about.c:116
+#: src/cmd_about.c:105
 msgid "NLS: Supported, using built-in English strings."
-msgstr "NLS: Ïîääåðæèâàåòñÿ, ñ ïîìîùüþ âñòðîåííûõ àíãëèéñêèõ ñòðîê."
+msgstr "NLS: ÐÐ¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ, Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ Ð²ÑÑÑÐ¾ÐµÐ½Ð½ÑÑ Ð°Ð½Ð³Ð»Ð¸Ð¹ÑÐºÐ¸Ñ ÑÑÑÐ¾Ðº."
 
-#: src/cmd_about.c:129
-#, fuzzy
+#: src/cmd_about.c:118
+#, fuzzy, c-format
 msgid ""
 "The author of gentoo can be reached via Internet\n"
-"e-mail at <emil@obsession.se>; feel free to let\n"
+"e-mail at <a href=\"mailto:%s\">%s</a>; feel free to let\n"
 "me know what you think of this software, give\n"
 "suggestions/bug reports, and so on.\n"
 "\n"
 "The latest release of gentoo can always be down-\n"
 "loaded from the official gentoo project homepage at\n"
-"<http://www.obsession.se/gentoo/>. New releases are\n"
+"<a href=\"%s\">%s</a>. New releases are\n"
 "typically announced on the Freshmeat service at\n"
-"<http://freshmeat.net/>."
-msgstr ""
-"Àâòîð ýòîé ïðîãðàììû äîñòóïåí ÷åðåç ýëåêòðîííóþ\n"
-"ïî÷òó ïî àäðåñó: <emil@obsession.se>; íàïèøèòå åìó\n"
-"÷òî âû äóìàåòå îá ýòîé ïðîãðàììå, ñîîáùàéòå î \n"
-"íàéäåííûé îùèáêàõ è ïîæåëàíèÿõ.\n"
-"Íàñòðîéêè ïî óìîë÷àíèþ - J. Hanson <johan@tiq.com>.\n"
-"Ïîñëåäíÿÿ âåðñèÿ ïðîãðàììû ìîæåò áûòü çàãðóæåíà\n"
-"ñ îôèöèàëüíîé ñòðàíèöû <http://www.obsession.se/gentoo/>.\n"
-"Íîâûå âåðñèè îáû÷íî ñíà÷àëà âûêëàäûâàþòñÿ \n"
-"â \"Ñâåæåì ìÿñå\" - <http://freshmeat.net/>.\n"
-"Î íåòî÷íîñòÿõ ïåðåâîäà ïèøèòå Ì.Çàðèïîâó <m3for@mail.ru>"
-
-#: src/cmd_about.c:142
+"<a href=\"http://freshmeat.net/\">freshmeat.net</a>."
+msgstr ""
+"ÐÐ²ÑÐ¾Ñ ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð´Ð¾ÑÑÑÐ¿ÐµÐ½ ÑÐµÑÐµÐ· ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÑ\n"
+"Ð¿Ð¾ÑÑÑ Ð¿Ð¾ Ð°Ð´ÑÐµÑÑ: <emil@obsession.se>; Ð½Ð°Ð¿Ð¸ÑÐ¸ÑÐµ ÐµÐ¼Ñ\n"
+"ÑÑÐ¾ Ð²Ñ Ð´ÑÐ¼Ð°ÐµÑÐµ Ð¾Ð± ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ, ÑÐ¾Ð¾Ð±ÑÐ°Ð¹ÑÐµ Ð¾ \n"
+"Ð½Ð°Ð¹Ð´ÐµÐ½Ð½ÑÐ¹ Ð¾ÑÐ¸Ð±ÐºÐ°Ñ Ð¸ Ð¿Ð¾Ð¶ÐµÐ»Ð°Ð½Ð¸ÑÑ.\n"
+"ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ - J. Hanson <johan@tiq.com>.\n"
+"ÐÐ¾ÑÐ»ÐµÐ´Ð½ÑÑ Ð²ÐµÑÑÐ¸Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ð°\n"
+"Ñ Ð¾ÑÐ¸ÑÐ¸Ð°Ð»ÑÐ½Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ <http://www.obsession.se/gentoo/>.\n"
+"ÐÐ¾Ð²ÑÐµ Ð²ÐµÑÑÐ¸Ð¸ Ð¾Ð±ÑÑÐ½Ð¾ ÑÐ½Ð°ÑÐ°Ð»Ð° Ð²ÑÐºÐ»Ð°Ð´ÑÐ²Ð°ÑÑÑÑ \n"
+"Ð² \"Ð¡Ð²ÐµÐ¶ÐµÐ¼ Ð¼ÑÑÐµ\" - <http://freshmeat.net/>.\n"
+"Ð Ð½ÐµÑÐ¾ÑÐ½Ð¾ÑÑÑÑ Ð¿ÐµÑÐµÐ²Ð¾Ð´Ð° Ð¿Ð¸ÑÐ¸ÑÐµ Ð.ÐÐ°ÑÐ¸Ð¿Ð¾Ð²Ñ <m3for@mail.ru>"
+
+#: src/cmd_about.c:135
 msgid "About gentoo"
-msgstr "Î ïðîãðàììå"
+msgstr "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ"
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "_OK (Wait for More)"
-msgstr "_ÄÀ (Ïîäîæäèòå ïðîäîëæåíèÿ)"
+msgstr "_ÐÐ (ÐÐ¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ)"
 
 #: src/cmd_chmod.c:98
 #, c-format
 msgid "Set protection bits for \"%s\":"
-msgstr "Óñòàíîâèòü ïðàâà äëÿ \"%s\":"
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¿ÑÐ°Ð²Ð° Ð´Ð»Ñ \"%s\":"
 
-#: src/cmd_chmod.c:208 src/cmd_chown.c:184 src/cmd_info.c:202
+#: src/cmd_chmod.c:199 src/cmd_chown.c:176 src/cmd_info.c:274
 msgid "Group"
-msgstr "Ãðóïïà"
+msgstr "ÐÑÑÐ¿Ð¿Ð°"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Others"
-msgstr "Äðóãèå"
+msgstr "ÐÑÑÐ³Ð¸Ðµ"
 
-#: src/cmd_chmod.c:208 src/cmd_info.c:195
+#: src/cmd_chmod.c:199 src/cmd_info.c:267
 msgid "Owner"
-msgstr "Âëàäåëåö"
+msgstr "ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Special"
-msgstr "Ñïåöèàëüíûå"
+msgstr "Ð¡Ð¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÐµ"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Execute"
-msgstr "Çàïóñê"
+msgstr "ÐÐ°Ð¿ÑÑÐº"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Read"
-msgstr "×òåíèå"
+msgstr "Ð§ÑÐµÐ½Ð¸Ðµ"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set GID"
-msgstr "Èñï. GID"
+msgstr "ÐÑÐ¿. GID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set UID"
-msgstr "Èñï. UID"
+msgstr "ÐÑÐ¿. UID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Write"
-msgstr "Çàïèñü"
+msgstr "ÐÐ°Ð¿Ð¸ÑÑ"
 
-#: src/cmd_chmod.c:231
+#: src/cmd_chmod.c:222
 msgid "Protection Bits"
-msgstr "Áèòû ïðàâ"
+msgstr "ÐÐ¸ÑÑ Ð¿ÑÐ°Ð²"
 
-#: src/cmd_chmod.c:242
+#: src/cmd_chmod.c:233
 msgid "Textual"
 msgstr ""
 
-#: src/cmd_chmod.c:253
+#: src/cmd_chmod.c:246
 #, fuzzy
 msgid "Octal"
-msgstr "8, Âîñüìåðè÷íàÿ"
+msgstr "8, ÐÐ¾ÑÑÐ¼ÐµÑÐ¸ÑÐ½Ð°Ñ"
 
-#: src/cmd_chmod.c:258 src/menus.c:511
+#: src/cmd_chmod.c:251 src/menus.c:518
 msgid "All"
-msgstr "Âñå"
+msgstr "ÐÑÐµ"
+
+#: src/cmd_chmod.c:253 src/menus.c:520
+msgid "Toggle"
+msgstr "ÐÐµÑÐµÐºÐ»ÑÑÐ¸ÑÑ"
 
-#: src/cmd_chmod.c:261
+#: src/cmd_chmod.c:254
 msgid "Revert"
-msgstr "Ñáðîñèòü"
+msgstr "Ð¡Ð±ÑÐ¾ÑÐ¸ÑÑ"
 
-#: src/cmd_chmod.c:273 src/cmd_chown.c:208 src/cmd_info.c:304
+#: src/cmd_chmod.c:266 src/cmd_chown.c:201 src/cmd_info.c:372
 msgid "Recurse Directories?"
-msgstr "Äëÿ ñîäåðæèìîãî òîæå?"
+msgstr "ÐÐ»Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ ÑÐ¾Ð¶Ðµ?"
 
-#: src/cmd_chmod.c:276
+#: src/cmd_chmod.c:269
 msgid "Don't Touch Directories?"
-msgstr "Êðîìå êàòàëîãîâ?"
+msgstr "ÐÑÐ¾Ð¼Ðµ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð²?"
 
-#: src/cmd_chmod.c:281
+#: src/cmd_chmod.c:274
 msgid "Change Mode"
-msgstr "Ñìåíà ðåæèìà"
+msgstr "Ð¡Ð¼ÐµÐ½Ð° ÑÐµÐ¶Ð¸Ð¼Ð°"
 
-#: src/cmd_chown.c:56
+#: src/cmd_chown.c:57
 #, c-format
 msgid "Set Ownership for '%s':"
-msgstr "Óñòàíîâêà âëàäåëüöà äëÿ '%s':"
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð²Ð»Ð°Ð´ÐµÐ»ÑÑÐ° Ð´Ð»Ñ '%s':"
 
-#: src/cmd_chown.c:184
+#: src/cmd_chown.c:176
 msgid "User"
-msgstr "Ïîëüçîâàòåëü"
+msgstr "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
 
-#: src/cmd_chown.c:213
+#: src/cmd_chown.c:206
 msgid "Change Ownership"
-msgstr "Ñìåíà âëàäåëüöà"
+msgstr "Ð¡Ð¼ÐµÐ½Ð° Ð²Ð»Ð°Ð´ÐµÐ»ÑÑÐ°"
 
 #: src/cmd_configure.c:50
 msgid "Automatically Save Changed Configuration on Exit?"
-msgstr "Àâòîìàòè÷åñêè ñîõðàíÿòü íàñòðîéêè ïðè âûõîäå?"
+msgstr "ÐÐ²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸ ÑÐ¾ÑÑÐ°Ð½ÑÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿ÑÐ¸ Ð²ÑÑÐ¾Ð´Ðµ?"
 
-#: src/cmd_copy.c:302
-#, c-format
-msgid ""
-"Can't copy directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"Íå ìîãó êîïèðîâàòü \"%s\"\n"
-"â \"%s\"\n"
-"(êîïèðîâàíèå ñàìîãî â ñåáÿ)."
-
-#: src/cmd_copy.c:392 src/cmd_copyas.c:62
+#: src/cmd_copy.c:175 src/cmd_copyas.c:62
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Copy?"
-msgstr "\"%s\" Óæå ñóùåñòâóåò - Ïðîäîëæèòü êîïèðîâàíèå?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ?"
 
-#: src/cmd_copy.c:393
+#: src/cmd_copy.c:176
 msgid "Copying..."
-msgstr "Êîïèðîâàíèå..."
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ..."
 
-#: src/cmd_copy.c:440
+#: src/cmd_copy.c:217
 msgid "Preserve Dates During Copy?"
-msgstr "Ñîõðàíÿòü äàòû ïðè êîïèðîâàíèè?"
+msgstr "Ð¡Ð¾ÑÑÐ°Ð½ÑÑÑ Ð´Ð°ÑÑ Ð¿ÑÐ¸ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ð¸?"
 
-#: src/cmd_copy.c:441
+#: src/cmd_copy.c:218
 msgid "Ignore Failure to Copy Attributes (Date, Owner, Mode)?"
 msgstr ""
-"Èãíîðèðîâàòü íåâîçìîæíîñòü êîïèðîâàíèÿ àòðèáóòîâ (Äàòà, Ïðàâà, Âëàäåëåö)?"
+"ÐÐ³Ð½Ð¾ÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð°ÑÑÐ¸Ð±ÑÑÐ¾Ð² (ÐÐ°ÑÐ°, ÐÑÐ°Ð²Ð°, ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ)?"
 
-#: src/cmd_copy.c:442
+#: src/cmd_copy.c:219
 msgid "Leave Failed Destination if Full Size?"
-msgstr "Îñòàâëÿòü íåçàâåðøåííûå ôàéëû åñëè íåò ìåñòà?"
+msgstr "ÐÑÑÐ°Ð²Ð»ÑÑÑ Ð½ÐµÐ·Ð°Ð²ÐµÑÑÐµÐ½Ð½ÑÐµ ÑÐ°Ð¹Ð»Ñ ÐµÑÐ»Ð¸ Ð½ÐµÑ Ð¼ÐµÑÑÐ°?"
 
-#: src/cmd_copy.c:443 src/cmd_viewtext.c:207
+#: src/cmd_copy.c:220 src/cmd_viewtext.c:204
 msgid "Buffer Size"
-msgstr "Ðàçìåð áóôåðà"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ Ð±ÑÑÐµÑÐ°"
 
-#: src/cmd_copyas.c:51
+#: src/cmd_copyas.c:49
 #, c-format
 msgid "Enter Name for Copy of \"%s\""
-msgstr "Ââåäèòå èìÿ äëÿ êîïèðîâàíèÿ \"%s\""
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ Ð´Ð»Ñ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ \"%s\""
 
-#: src/cmd_copyas.c:53
+#: src/cmd_copyas.c:51
 #, c-format
 msgid "Enter Name for Clone of \"%s\""
-msgstr "Ââåäèòå èìÿ êëîíà \"%s\""
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ ÐºÐ»Ð¾Ð½Ð° \"%s\""
 
 #: src/cmd_copyas.c:64
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Clone?"
-msgstr "\"%s\" Óæå ñóùåñòâóåò - ïðîäîëæèòü êëîíèðîâàíèå?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÐºÐ»Ð¾Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ?"
 
 #: src/cmd_copyas.c:65
 msgid "Cloning..."
-msgstr "Êëîíèðóþ..."
+msgstr "ÐÐ»Ð¾Ð½Ð¸ÑÑÑ..."
 
 #: src/cmd_copyas.c:65
 msgid "Copying As..."
-msgstr "Êîïèðîâàòü êàê..."
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ°Ðº..."
 
 #: src/cmd_copyas.c:79
 #, c-format
 msgid "Enter Name to Link \"%s\" As"
-msgstr "Ââåäèòå èìÿ äëÿ ññûëêè \"%s\" "
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ Ð´Ð»Ñ ÑÑÑÐ»ÐºÐ¸ \"%s\" "
 
 #: src/cmd_copyas.c:81
 #, c-format
 msgid "Enter Name for Link Clone of \"%s\""
-msgstr "Ââåäèòå èìÿ äëÿ êëîíà ññûëêè \"%s\""
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ Ð´Ð»Ñ ÐºÐ»Ð¾Ð½Ð° ÑÑÑÐ»ÐºÐ¸ \"%s\""
 
-#: src/cmd_copyas.c:89
+#: src/cmd_copyas.c:91
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Symlink?"
-msgstr "\"%s\" Óæå ñóùåñòâóåò - Ïðîäîëæèòü ñîçäàíèå ññûëêè?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÑÑÐ»ÐºÐ¸?"
 
-#: src/cmd_copyas.c:204 src/cmd_copyas.c:210
+#: src/cmd_copyas.c:200 src/cmd_copyas.c:207
 msgid "Copy As"
-msgstr "Êîïèðîâàòü êàê"
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ°Ðº"
 
-#: src/cmd_copyas.c:212
+#: src/cmd_copyas.c:209
 msgid "Clone"
-msgstr "Êëîíèðîâàòü"
+msgstr "ÐÐ»Ð¾Ð½Ð¸ÑÐ¾Ð²Ð°ÑÑ"
 
-#: src/cmd_copyas.c:214
+#: src/cmd_copyas.c:211
 msgid "Symbolic Link As"
-msgstr "Ññûëêà ñ èìåíåì"
+msgstr "Ð¡ÑÑÐ»ÐºÐ° Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼"
 
-#: src/cmd_copyas.c:216
+#: src/cmd_copyas.c:213
 msgid "Symbolic Link Clone"
-msgstr "Êëîíèðîâàíèå ññûëêè"
+msgstr "ÐÐ»Ð¾Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÑÑÐ»ÐºÐ¸"
 
-#: src/cmd_delete.c:55
+#: src/cmd_delete.c:56
 #, c-format
 msgid ""
 "%s\n"
@@ -1433,309 +1419,318 @@
 "Attempt to change protection and retry?"
 msgstr ""
 "%s\n"
-"íå ìîæåò áûòü óäàëåí èç-çà îãðàíè÷åíèÿ äîñòóïà.\n"
-"Ïîïðîáîâàòü ñíÿòü çàùèòó è ïðîäîëæèòü?"
+"Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÐ´Ð°Ð»ÐµÐ½ Ð¸Ð·-Ð·Ð° Ð¾Ð³ÑÐ°Ð½Ð¸ÑÐµÐ½Ð¸Ñ Ð´Ð¾ÑÑÑÐ¿Ð°.\n"
+"ÐÐ¾Ð¿ÑÐ¾Ð±Ð¾Ð²Ð°ÑÑ ÑÐ½ÑÑÑ Ð·Ð°ÑÐ¸ÑÑ Ð¸ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?"
 
-#: src/cmd_delete.c:58
+#: src/cmd_delete.c:59
 msgid "Remember the answer (alters config)"
-msgstr "Çàïîìíèòü îòâåò (ìåíÿåò íàñòðîéêó)"
+msgstr "ÐÐ°Ð¿Ð¾Ð¼Ð½Ð¸ÑÑ Ð¾ÑÐ²ÐµÑ (Ð¼ÐµÐ½ÑÐµÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÑ)"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Access Problem"
-msgstr "Ïðîáëåìà äîñòóïà"
+msgstr "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ð´Ð¾ÑÑÑÐ¿Ð°"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Change|Leave Alone"
-msgstr "Ñìåíèòü|Îñòàâèòü"
+msgstr "Ð¡Ð¼ÐµÐ½Ð¸ÑÑ|ÐÑÑÐ°Ð²Ð¸ÑÑ"
 
-#: src/cmd_delete.c:236
+#: src/cmd_delete.c:215
 #, c-format
 msgid "Really Delete \"%s\"?"
-msgstr "Äåéñòâèòåëüíî óäàëèòü \"%s\" ?"
+msgstr "ÐÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ´Ð°Ð»Ð¸ÑÑ \"%s\" ?"
 
-#: src/cmd_delete.c:237
+#: src/cmd_delete.c:216
 msgid "Deleting..."
-msgstr "Óäàëåíèå..."
+msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ..."
 
-#: src/cmd_delete.c:292
+#: src/cmd_delete.c:279
 msgid "On Access Failure"
-msgstr "Â ñëó÷àå íåõâàòêè ïðàâ"
+msgstr "Ð ÑÐ»ÑÑÐ°Ðµ Ð½ÐµÑÐ²Ð°ÑÐºÐ¸ Ð¿ÑÐ°Ð²"
 
-#: src/cmd_delete.c:293
+#: src/cmd_delete.c:280
 msgid "Ask User|Automatically Try Changing, and Retry|Fail"
-msgstr "Ñïðîñèòü|Ïîïûòàòüñÿ ñìåíèòü è ïðîäîëæèòü|Ïðåðâàòü"
+msgstr "Ð¡Ð¿ÑÐ¾ÑÐ¸ÑÑ|ÐÐ¾Ð¿ÑÑÐ°ÑÑÑÑ ÑÐ¼ÐµÐ½Ð¸ÑÑ Ð¸ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ|ÐÑÐµÑÐ²Ð°ÑÑ"
 
-#: src/cmd_dpfocus.c:183
-msgid "Wrap Around At Top And Bottom?"
-msgstr "Ïåðåñêàêèâàòü â äðóãîé êîíåö ñïèñêà?"
+#: src/cmd_dpfocus.c:33
+msgid "DpFocus Command is Deprecated"
+msgstr ""
+
+#: src/cmd_dpfocus.c:34
+msgid ""
+"The <tt>DpFocus</tt> command has been deprecated and is no longer supported. "
+"Please remove any keyboard or mouse bindings that use it and look into using "
+"the default GTK+ list view's cursor controls."
+msgstr ""
 
-#: src/cmd_dpfocus.c:184
+#: src/cmd_dpfocus.c:64
 msgid "Treat Focused Row As Selection If No \"Real\" Selection Exists?"
-msgstr "Îáðàáàòûâàòü êóðñîð êàê âûäåëåíèå, åñëè íåò \"Íàñòîÿùåãî\" âûäåëåíèÿ"
+msgstr "ÐÐ±ÑÐ°Ð±Ð°ÑÑÐ²Ð°ÑÑ ÐºÑÑÑÐ¾Ñ ÐºÐ°Ðº Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ, ÐµÑÐ»Ð¸ Ð½ÐµÑ \"ÐÐ°ÑÑÐ¾ÑÑÐµÐ³Ð¾\" Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ñ"
 
-#: src/cmd_dpfocus.c:186
+#: src/cmd_dpfocus.c:66
 msgid "Move Focus to Last Selected/Deselected Row?"
-msgstr "Ñòàâèòü êóðñîð íà ïîñëåäíèé âûáðàííûé ýëåìåíò?"
+msgstr "Ð¡ÑÐ°Ð²Ð¸ÑÑ ÐºÑÑÑÐ¾Ñ Ð½Ð° Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹ ÑÐ»ÐµÐ¼ÐµÐ½Ñ?"
 
-#: src/cmd_dpfocusisrch.c:220
+#: src/cmd_dpfocusisrch.c:163
 msgid "ISearch"
-msgstr "Ïîèñê"
+msgstr "ÐÐ¾Ð¸ÑÐº"
 
-#: src/cmd_generic.c:136
+#: src/cmd_generic.c:143
 msgid "_OK|A_ll|_Skip|_Cancel"
-msgstr "ÄÀ|Âñå|Íåò|Îòìåíà"
+msgstr "ÐÐ|ÐÑÐµ|ÐÐµÑ|ÐÑÐ¼ÐµÐ½Ð°"
 
-#: src/cmd_generic.c:137
+#: src/cmd_generic.c:144
 msgid "_OK|_Skip|_Cancel"
-msgstr "_ÄÀ|_Íåò|_Îòìåíà"
+msgstr "_ÐÐ|_ÐÐµÑ|_ÐÑÐ¼ÐµÐ½Ð°"
 
-#: src/cmd_getsize.c:49
+#: src/cmd_getsize.c:51
 msgid "Getting sizes..."
-msgstr "Ñ÷èòàþ ðàçìåð..."
+msgstr "Ð¡ÑÐ¸ÑÐ°Ñ ÑÐ°Ð·Ð¼ÐµÑ..."
 
-#: src/cmd_getsize.c:141
+#: src/cmd_getsize.c:134
 msgid "Unselect Rows When Done?"
-msgstr "Ñíÿòü âûäåëåíèå ïîñëå âûïîëíåíèÿ?"
+msgstr "Ð¡Ð½ÑÑÑ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð¿Ð¾ÑÐ»Ðµ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ?"
 
-#: src/cmd_info.c:71 src/cmd_info.c:163
-#, c-format
+#: src/cmd_info.c:68 src/errors.c:84
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr ", %s Ð·Ð°Ð½ÑÑÐ¾"
+
+#: src/cmd_info.c:72
+#, fuzzy, c-format
 msgid ""
-"%s (%s bytes,\n"
-"%s blocks)"
-msgstr ""
-"%s (%s áàéò),\n"
-"%s áëîêîâ)"
+"%u dirs, %u files,\n"
+"%u symlinks, %u special files"
+msgstr "%u ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð², %u ÑÐ°Ð¹Ð»Ð¾Ð², %u ÑÑÑÐ»Ð¾Ðº"
 
-#: src/cmd_info.c:75
-#, c-format
-msgid "%u dirs, %u files, %u symlinks"
-msgstr "%u êàòàëîãîâ, %u ôàéëîâ, %u ññûëîê"
+#: src/cmd_info.c:153
+msgid "Value"
+msgstr ""
 
-#: src/cmd_info.c:134
+#: src/cmd_info.c:198
 msgid "Link To"
-msgstr "Ññûëêà íà"
+msgstr "Ð¡ÑÑÐ»ÐºÐ° Ð½Ð°"
 
-#: src/cmd_info.c:145 src/cmd_select.c:399 src/dpformat.c:52
+#: src/cmd_info.c:213 src/cmd_select.c:368 src/dpformat.c:54
 msgid "Type"
-msgstr "Òèï"
+msgstr "Ð¢Ð¸Ð¿"
 
-#: src/cmd_info.c:148
+#: src/cmd_info.c:216
 msgid "Location"
-msgstr "Ðàñïîëîæåíèå"
+msgstr "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: src/cmd_info.c:151 src/dpformat.c:36 src/window.c:200
+#: src/cmd_info.c:219 src/cmd_split.c:653 src/dpformat.c:37 src/window.c:199
 msgid "Size"
-msgstr "Ðàçìåð"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ"
 
-#: src/cmd_info.c:172
+#: src/cmd_info.c:229
+#, fuzzy, c-format
+msgid "%s (%s bytes)"
+msgstr "%Lu Ð±Ð°Ð¹Ñ"
+
+#: src/cmd_info.c:240
 msgid "Contains"
-msgstr "Ñîäåðæàíèå"
+msgstr "Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ"
 
-#: src/cmd_info.c:186
+#: src/cmd_info.c:257
 msgid "'File' Info"
-msgstr "Èíôîðìàöèÿ î ôàéëå"
+msgstr "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÑÐ°Ð¹Ð»Ðµ"
 
-#: src/cmd_info.c:213 src/dpformat.c:49
+#: src/cmd_info.c:285 src/dpformat.c:50
 msgid "Accessed"
-msgstr "Ïðî÷èòàí"
+msgstr "ÐÑÐ¾ÑÐ¸ÑÐ°Ð½"
 
-#: src/cmd_info.c:214 src/dpformat.c:50
+#: src/cmd_info.c:286 src/dpformat.c:51
 msgid "Modified"
-msgstr "Ìîäèôèöèðîâàí"
+msgstr "ÐÐ¾Ð´Ð¸ÑÐ¸ÑÐ¸ÑÐ¾Ð²Ð°Ð½"
 
-#: src/cmd_info.c:215
+#: src/cmd_info.c:287 src/dpformat.c:53
 msgid "Changed"
-msgstr "Èçìåíåí"
+msgstr "ÐÐ·Ð¼ÐµÐ½ÐµÐ½"
+
+#: src/cmd_info.c:288 src/dpformat.c:52
+msgid "Created"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½"
 
-#: src/cmd_info.c:263
+#: src/cmd_info.c:290
+#, fuzzy
+msgid "Basic"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°"
+
+#: src/cmd_info.c:294
+msgid "Attributes"
+msgstr ""
+
+#: src/cmd_info.c:338
 msgid "Getting Information..."
-msgstr "Ñáîð èíôîðìàöèè..."
+msgstr "Ð¡Ð±Ð¾Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸..."
 
-#: src/cmd_info.c:302
+#: src/cmd_info.c:370
 msgid "Show 'file' Output?"
-msgstr "Ïîêàçûâàòü âûâîä?"
+msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð²ÑÐ²Ð¾Ð´?"
 
-#: src/cmd_info.c:305
+#: src/cmd_info.c:373
 msgid "Access Date Format"
-msgstr "Ôîðìàò äàòû äîñòóïà"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð´Ð°ÑÑ Ð´Ð¾ÑÑÑÐ¿Ð°"
 
-#: src/cmd_info.c:306
+#: src/cmd_info.c:374
 msgid "Modify Date Format"
-msgstr "Ôîðìàò äàòû ìîäèôèêàöèè"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð´Ð°ÑÑ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¸Ð¸"
 
-#: src/cmd_info.c:307
+#: src/cmd_info.c:375
 msgid "Change Date Format"
-msgstr "Ôîðìàò äàòû èçìåíåíèÿ"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð´Ð°ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ"
 
-#: src/cmd_info.c:308
+#: src/cmd_info.c:376
 msgid "Size Tick Mark"
-msgstr "Çíàê ðàçäåëèòåëü òûñÿ÷"
+msgstr "ÐÐ½Ð°Ðº ÑÐ°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ ÑÑÑÑÑ"
 
-#: src/cmd_join.c:47
+#: src/cmd_join.c:46
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Join?"
-msgstr "\"%s\" Óæå ñóùåñòâóåò - Ïðîäîëæèòü îáúåäèíåíèå?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ Ð¾Ð±ÑÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ?"
 
-#: src/cmd_join.c:76
+#: src/cmd_join.c:73
 msgid "Joining..."
-msgstr "Îáúåäèíåíèå..."
+msgstr "ÐÐ±ÑÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ..."
 
-#: src/cmd_join.c:162
+#: src/cmd_join.c:167
 msgid "Click and Drag Files to Reorder, Then Click Join."
-msgstr "Âûäåëèòå ôàéëû, ðàñïîëîæèòå ïî ïîðÿäêó è íàæìèòå Ñîáðàòü."
+msgstr "ÐÑÐ´ÐµÐ»Ð¸ÑÐµ ÑÐ°Ð¹Ð»Ñ, ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶Ð¸ÑÐµ Ð¿Ð¾ Ð¿Ð¾ÑÑÐ´ÐºÑ Ð¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ Ð¡Ð¾Ð±ÑÐ°ÑÑ."
 
-#: src/cmd_join.c:170
+#: src/cmd_join.c:175
 #, c-format
 msgid "The total size is %s (%lu bytes)."
-msgstr "Îáùèé ðàçìåð %s (%lu áàéò)."
+msgstr "ÐÐ±ÑÐ¸Ð¹ ÑÐ°Ð·Ð¼ÐµÑ %s (%lu Ð±Ð°Ð¹Ñ)."
 
-#: src/cmd_join.c:173
+#: src/cmd_join.c:178
 #, c-format
 msgid "The total size is %lu bytes."
-msgstr "Îáùèé ðàçìåð %lu áàéò."
+msgstr "ÐÐ±ÑÐ¸Ð¹ ÑÐ°Ð·Ð¼ÐµÑ %lu Ð±Ð°Ð¹Ñ."
 
-#: src/cmd_join.c:215
+#: src/cmd_join.c:220
 msgid "Enter Destination File Name"
-msgstr "Ââåäèòå èìÿ ôàéëà"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ ÑÐ°Ð¹Ð»Ð°"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "Join"
-msgstr "Ñîáðàòü"
+msgstr "Ð¡Ð¾Ð±ÑÐ°ÑÑ"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "_Join|_Cancel"
-msgstr "_Ñîáðàòü|_Îòìåíà"
+msgstr "_Ð¡Ð¾Ð±ÑÐ°ÑÑ|_ÐÑÐ¼ÐµÐ½Ð°"
 
 # c-format
-#: src/cmd_mkdir.c:75
+#: src/cmd_mkdir.c:65
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With MkDir?"
-msgstr "\"%s\" Óæå ñóùåñòâóåò - ñîçäàòü êàòàëîã?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - ÑÐ¾Ð·Ð´Ð°ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³?"
 
-#: src/cmd_mkdir.c:125
+#: src/cmd_mkdir.c:119
 msgid "Enter Name of Directory to Create"
-msgstr "Ââåäèòå èìÿ êàòàëîãà"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð°"
 
-#: src/cmd_mkdir.c:133
+#: src/cmd_mkdir.c:128
 msgid "Make Directory"
-msgstr "Ñîçäàòü êàòàëîã"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³"
 
-#: src/cmd_mkdir.c:156
+#: src/cmd_mkdir.c:151
 msgid "CD Into New Directory?"
-msgstr "Ïåðåéòè â êàòàëîã?"
+msgstr "ÐÐµÑÐµÐ¹ÑÐ¸ Ð² ÐºÐ°ÑÐ°Ð»Ð¾Ð³?"
 
-#: src/cmd_mkdir.c:157
+#: src/cmd_mkdir.c:152
 msgid "Focus New Directory?"
-msgstr "Óñòàíîâèòü êóðñîð?"
-
-#: src/cmd_move.c:81
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"Íå ìîãó ïåðåìåñòèòü êàòàëîã \"%s\"\n"
-"â \"%s\"\n"
-"(íàçíà÷åíèå - ïîäïàïêà èñòî÷íèêà)."
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÐºÑÑÑÐ¾Ñ?"
 
-#: src/cmd_move.c:92
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the destination contains the source."
-msgstr ""
-"Íå ìîãó ïåðåìåñòèòü \"%s\"\n"
-"â \"%s\"\n"
-"(èñòî÷íèê - ïîäïàïêà íàçíà÷åíèÿ)."
-
-#: src/cmd_move.c:188 src/cmd_moveas.c:48
+#: src/cmd_move.c:128 src/cmd_moveas.c:51
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Move?"
-msgstr "\"%s\" Óæå ñóùåñòâóåò - ïðîäîëæèòü ïåðåìåùåíèå?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ Ð¿ÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ðµ?"
 
-#: src/cmd_move.c:189
+#: src/cmd_move.c:129
 msgid "Moving..."
-msgstr "Ïåðåìåùåíèå..."
+msgstr "ÐÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ðµ..."
 
-#: src/cmd_moveas.c:40
+#: src/cmd_moveas.c:41
 #, c-format
 msgid "Enter Name to Move \"%s\" As"
-msgstr "Ââåäèòå èìÿ äëÿ ïåðåìåùåíèÿ\"%s\" êàê"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ Ð´Ð»Ñ Ð¿ÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ñ\"%s\" ÐºÐ°Ðº"
+
+#: src/cmd_moveas.c:66
+msgid "Invalid destination name for MoveAs"
+msgstr ""
 
 #: src/cmd_moveas.c:74
 msgid "Moving As..."
-msgstr "Ïåðåìåñòèòü êàê..."
+msgstr "ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÐºÐ°Ðº..."
 
-#: src/cmd_moveas.c:105 src/cmd_moveas.c:110
+#: src/cmd_moveas.c:105 src/cmd_moveas.c:113
 msgid "Move As"
-msgstr "Ïåðåìåñòèòü êàê"
+msgstr "ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÐºÐ°Ðº"
 
 #: src/cmd_quit.c:40
 msgid ""
 "You may have some unsaved configuration changes.\n"
 "Quitting without saving will lose them. Really quit?"
 msgstr ""
-"Ó âàñ ìîãóò áûòü íåñîõðàíåííûå èçìåíåíèÿ íàñòðîåê.\n"
-"Âûõîä áåç ñîõðàíåíèÿ ïðèâåäåò ê ïîòåðå èçìåíåíèé. Óâåðåíû?"
+"Ð£ Ð²Ð°Ñ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð½ÐµÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½ÑÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð°ÑÑÑÐ¾ÐµÐº.\n"
+"ÐÑÑÐ¾Ð´ Ð±ÐµÐ· ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ Ð¿ÑÐ¸Ð²ÐµÐ´ÐµÑ Ðº Ð¿Ð¾ÑÐµÑÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹. Ð£Ð²ÐµÑÐµÐ½Ñ?"
 
 #: src/cmd_quit.c:42 src/cmd_quit.c:54
 msgid "Confirm Quitting"
-msgstr "Ïîòâåðäèòå âûõîä"
+msgstr "ÐÐ¾ÑÐ²ÐµÑÐ´Ð¸ÑÐµ Ð²ÑÑÐ¾Ð´"
 
 #: src/cmd_quit.c:42
 msgid "_Quit|_Save, then Quit|_Cancel"
-msgstr "_Âûéòè|_Ñîõðàíèòü,âûéòè|_Îòìåíà"
+msgstr "_ÐÑÐ¹ÑÐ¸|_Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ,Ð²ÑÐ¹ÑÐ¸|_ÐÑÐ¼ÐµÐ½Ð°"
 
 #: src/cmd_quit.c:54
 msgid "Are you sure you want to quit?"
-msgstr "Äåñòâèòåëüíî õîòèòå âûéòè?"
+msgstr "ÐÐµÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð²ÑÐ¹ÑÐ¸?"
 
-#: src/cmd_rename.c:44
+#: src/cmd_rename.c:57
 #, c-format
 msgid "Enter New Name For \"%s\""
-msgstr "Ââåäèòå íîâîå èìÿ äëÿ \"%s\""
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð½Ð¾Ð²Ð¾Ðµ Ð¸Ð¼Ñ Ð´Ð»Ñ \"%s\""
 
-#: src/cmd_rename.c:52 src/cmd_renamere.c:147 src/cmd_renamere.c:243
-#: src/cmd_renamere.c:293 src/cmd_renamere.c:388 src/cmd_renameseq.c:161
+#: src/cmd_rename.c:67 src/cmd_renamere.c:142 src/cmd_renamere.c:225
+#: src/cmd_renamere.c:268 src/cmd_renamere.c:367 src/cmd_renameseq.c:152
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Rename?"
-msgstr "\"%s\" Óæå ñóùåñòâóåò - ïðîäîëæèòü ïåðåèìåíîâàíèå?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ðµ?"
 
-#: src/cmd_rename.c:132
+#: src/cmd_rename.c:245
 msgid "Rename"
-msgstr "Ïåðåèìåíîâàòü"
+msgstr "ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ"
 
-#: src/cmd_renamere.c:260
-msgid "Regular expression error:\n"
-msgstr "Îøèáêà âûðàæåíèÿ:\n"
+#: src/cmd_rename.c:261
+msgid "Rename Single File In-Place (Without Dialog)?"
+msgstr ""
 
-#: src/cmd_renamere.c:446
+#: src/cmd_renamere.c:419
 msgid ""
 "Look for substring in all filenames, and replace\n"
 "it with another string."
 msgstr ""
-"Èùåò ïîäñòðîêó âî âñåõ èìåíàõ ôàéëîâ è çàìåíÿåò\n"
-"íà äðóãóþ ïîäñòðîêó."
+"ÐÑÐµÑ Ð¿Ð¾Ð´ÑÑÑÐ¾ÐºÑ Ð²Ð¾ Ð²ÑÐµÑ Ð¸Ð¼ÐµÐ½Ð°Ñ ÑÐ°Ð¹Ð»Ð¾Ð² Ð¸ Ð·Ð°Ð¼ÐµÐ½ÑÐµÑ\n"
+"Ð½Ð° Ð´ÑÑÐ³ÑÑ Ð¿Ð¾Ð´ÑÑÑÐ¾ÐºÑ."
 
-#: src/cmd_renamere.c:449
+#: src/cmd_renamere.c:422
 msgid "Replace"
-msgstr "Çàìåíèòü"
+msgstr "ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ"
 
-#: src/cmd_renamere.c:453
+#: src/cmd_renamere.c:426
 msgid "With"
-msgstr "Íà"
+msgstr "ÐÐ°"
 
-#: src/cmd_renamere.c:461
+#: src/cmd_renamere.c:434
 msgid "Replace All?"
-msgstr "Âñå âõîæäåíèÿ?"
+msgstr "ÐÑÐµ Ð²ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ñ?"
 
-#: src/cmd_renamere.c:465
+#: src/cmd_renamere.c:438
 msgid "Simple"
-msgstr "Ïðîñòàÿ"
+msgstr "ÐÑÐ¾ÑÑÐ°Ñ"
 
-#: src/cmd_renamere.c:469
+#: src/cmd_renamere.c:442
 msgid ""
 "Execute the 'From' RE on each filename, storing\n"
 "parenthesised subexpression matches. Then replace\n"
@@ -1743,25 +1738,25 @@
 "(counting from 1) of a subexpression, with the text\n"
 "that matched, and use the result as a new filename."
 msgstr ""
-"Âû÷èñëèòü âûðàæåíèå \"Íàéòè\" íà êàæäîì ôàéëå\n"
-"ñîäåðæàùåì ïîäñòðîêó èç âûðàæåíèÿ. Çàòåì çàìåíèòü \n"
-"âñå âõîæäåíèÿ $n â \"Çàìåíèòü\" ãäå n - íîìåð \n"
-"(íà÷èíàÿ ñ 1) ïîäâûðàæåíèÿ ñ ñîâïàäàþùèì òåêñòîì\n"
-"ïîèñêà è èñïîëüçîâàòü ðåçóëüòàò êàê íîâîå èìÿ ôàéëà."
+"ÐÑÑÐ¸ÑÐ»Ð¸ÑÑ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ \"ÐÐ°Ð¹ÑÐ¸\" Ð½Ð° ÐºÐ°Ð¶Ð´Ð¾Ð¼ ÑÐ°Ð¹Ð»Ðµ\n"
+"ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÐµÐ¼ Ð¿Ð¾Ð´ÑÑÑÐ¾ÐºÑ Ð¸Ð· Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ. ÐÐ°ÑÐµÐ¼ Ð·Ð°Ð¼ÐµÐ½Ð¸ÑÑ \n"
+"Ð²ÑÐµ Ð²ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ñ $n Ð² \"ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ\" Ð³Ð´Ðµ n - Ð½Ð¾Ð¼ÐµÑ \n"
+"(Ð½Ð°ÑÐ¸Ð½Ð°Ñ Ñ 1) Ð¿Ð¾Ð´Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ñ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑÑÐ¸Ð¼ ÑÐµÐºÑÑÐ¾Ð¼\n"
+"Ð¿Ð¾Ð¸ÑÐºÐ° Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐµÐ·ÑÐ»ÑÑÐ°Ñ ÐºÐ°Ðº Ð½Ð¾Ð²Ð¾Ðµ Ð¸Ð¼Ñ ÑÐ°Ð¹Ð»Ð°."
 
-#: src/cmd_renamere.c:477 src/cmd_renamere.c:500
+#: src/cmd_renamere.c:450 src/cmd_renamere.c:473
 msgid "From"
-msgstr "Íàéòè"
+msgstr "ÐÐ°Ð¹ÑÐ¸"
 
-#: src/cmd_renamere.c:481 src/cmd_renamere.c:504
+#: src/cmd_renamere.c:454 src/cmd_renamere.c:477
 msgid "To"
-msgstr "Çàìåíèòü"
+msgstr "ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ"
 
-#: src/cmd_renamere.c:489
+#: src/cmd_renamere.c:462
 msgid "Reg Exp"
-msgstr "Âûðàæåíèå"
+msgstr "ÐÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: src/cmd_renamere.c:494
+#: src/cmd_renamere.c:467
 msgid ""
 "Look for each character in the 'From' string, and replace\n"
 "any hits with the corresponding character in the 'To' string.\n"
@@ -1769,902 +1764,1140 @@
 "the filename, and the result used as the new name for each file."
 msgstr ""
 
-#: src/cmd_renamere.c:513
+#: src/cmd_renamere.c:486
 msgid "Map"
 msgstr ""
 
-#: src/cmd_renamere.c:517
+#: src/cmd_renamere.c:490
 msgid ""
 "Changes the case (upper/lower) of the characters\n"
 "in the selected filename(s)."
 msgstr ""
 
-#: src/cmd_renamere.c:519
+#: src/cmd_renamere.c:492
 msgid "Lower Case?"
-msgstr "Íèæíèé ðåãèñòð?"
+msgstr "ÐÐ¸Ð¶Ð½Ð¸Ð¹ ÑÐµÐ³Ð¸ÑÑÑ?"
 
-#: src/cmd_renamere.c:521
+#: src/cmd_renamere.c:494
 msgid "Upper Case?"
-msgstr "Âåðõíèé ðåãèñòð?"
+msgstr "ÐÐµÑÑÐ½Ð¸Ð¹ ÑÐµÐ³Ð¸ÑÑÑ?"
 
-#: src/cmd_renamere.c:523
+#: src/cmd_renamere.c:496
 #, fuzzy
 msgid "Upper Case Initial?"
-msgstr "Âåðõíèé ðåãèñòð?"
+msgstr "ÐÐµÑÑÐ½Ð¸Ð¹ ÑÐµÐ³Ð¸ÑÑÑ?"
 
-#: src/cmd_renamere.c:526
+#: src/cmd_renamere.c:499
 msgid "Case"
-msgstr "Ôîðìà"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°"
 
-#: src/cmd_renamere.c:528
+#: src/cmd_renamere.c:501
 msgid "RenameRE"
-msgstr "ÏåðåèìåíîâàòüÓÑË"
+msgstr "ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑÐ£Ð¡Ð"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "10, Decimal"
-msgstr "10, Äåñÿòè÷íàÿ"
+msgstr "10, ÐÐµÑÑÑÐ¸ÑÐ½Ð°Ñ"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (A-F)"
-msgstr "16, Øåñòíàäöåòåðè÷íàÿ (A-F)"
+msgstr "16, Ð¨ÐµÑÑÐ½Ð°Ð´ÑÐµÑÐµÑÐ¸ÑÐ½Ð°Ñ (A-F)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (a-f)"
-msgstr "16, Øåñòíàäöåòåðè÷íàÿ (a-f)"
+msgstr "16, Ð¨ÐµÑÑÐ½Ð°Ð´ÑÐµÑÐµÑÐ¸ÑÐ½Ð°Ñ (a-f)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "8, Octal"
-msgstr "8, Âîñüìåðè÷íàÿ"
+msgstr "8, ÐÐ¾ÑÑÐ¼ÐµÑÐ¸ÑÐ½Ð°Ñ"
 
-#: src/cmd_renameseq.c:328
+#: src/cmd_renameseq.c:306
 msgid ""
 "This command renames all selected files\n"
 "into a numbered sequence. The controls\n"
 "below let you define how the names are\n"
 "formed."
 msgstr ""
-"Ýòà êîìàíäà ïåðåèìåíîâûâàåò âñå âûäåëåííûå\n"
-"ôàéëû â íóìåðîâàííóþ ïîñëåäîâàòåëüíîñòü.\n"
-"Êíîïêè óïðàâëåíèÿ íèæå ïîçâîëÿþò îïðåäåëèòü\n"
-"ïîðÿäîê ôîðìèðîâàíèÿ èìåí ôàéëîâ."
+"ÐÑÐ° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²ÑÐ²Ð°ÐµÑ Ð²ÑÐµ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð½ÑÐµ\n"
+"ÑÐ°Ð¹Ð»Ñ Ð² Ð½ÑÐ¼ÐµÑÐ¾Ð²Ð°Ð½Ð½ÑÑ Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»ÑÐ½Ð¾ÑÑÑ.\n"
+"ÐÐ½Ð¾Ð¿ÐºÐ¸ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¸Ð¶Ðµ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑÑ Ð¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ\n"
+"Ð¿Ð¾ÑÑÐ´Ð¾Ðº ÑÐ¾ÑÐ¼Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð¼ÐµÐ½ ÑÐ°Ð¹Ð»Ð¾Ð²."
 
-#: src/cmd_renameseq.c:335
+#: src/cmd_renameseq.c:313
 msgid "Start At"
-msgstr "Íà÷àòü ñ"
+msgstr "ÐÐ°ÑÐ°ÑÑ Ñ"
 
-#: src/cmd_renameseq.c:343 src/cmd_split.c:247
+#: src/cmd_renameseq.c:323 src/cmd_split.c:609
 msgid "Base"
-msgstr "Ôîðìà"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°"
 
-#: src/cmd_renameseq.c:359
+#: src/cmd_renameseq.c:333
 msgid "Precision"
-msgstr "Êîë-âî çíàêîâ"
+msgstr "ÐÐ¾Ð»-Ð²Ð¾ Ð·Ð½Ð°ÐºÐ¾Ð²"
 
-#: src/cmd_renameseq.c:367
+#: src/cmd_renameseq.c:340
 msgid "Head"
-msgstr "Íà÷àëî"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾"
 
-#: src/cmd_renameseq.c:374
+#: src/cmd_renameseq.c:347
 msgid "Tail"
-msgstr "Îêîí÷àíèå"
+msgstr "ÐÐºÐ¾Ð½ÑÐ°Ð½Ð¸Ðµ"
 
-#: src/cmd_renameseq.c:382
+#: src/cmd_renameseq.c:354
 msgid "Guess"
-msgstr "Ïîäñòàâèòü"
+msgstr "ÐÐ¾Ð´ÑÑÐ°Ð²Ð¸ÑÑ"
 
-#: src/cmd_renameseq.c:396
+#: src/cmd_renameseq.c:369
 msgid "Sequential Rename"
-msgstr "Ïåðåèìåíîâàíèå â ïîñëåäîâàòåëüíîñòü"
+msgstr "ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð² Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»ÑÐ½Ð¾ÑÑÑ"
 
-#: src/cmd_select.c:396
+#: src/cmd_select.c:365
 msgid "All rows|Selected|Unselected|"
-msgstr "Âñå ýëåìåíòû|Îòìå÷åííûå|Ðàçîòìå÷åííûå|"
+msgstr "ÐÑÐµ ÑÐ»ÐµÐ¼ÐµÐ½ÑÑ|ÐÑÐ¼ÐµÑÐµÐ½Ð½ÑÐµ|Ð Ð°Ð·Ð¾ÑÐ¼ÐµÑÐµÐ½Ð½ÑÐµ|"
 
-#: src/cmd_select.c:397
+#: src/cmd_select.c:366
 msgid "All types|Directories only|Non-directories only|"
-msgstr "Âñå òèïû|Êàòàëîãè|Áåç êàòàëîãîâ|"
+msgstr "ÐÑÐµ ÑÐ¸Ð¿Ñ|ÐÐ°ÑÐ°Ð»Ð¾Ð³Ð¸|ÐÐµÐ· ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð²|"
 
-#: src/cmd_select.c:398
+#: src/cmd_select.c:367
 msgid "Select|Unselect|Toggle|"
-msgstr "Îòìåòèòü|Ðàçîòìåòèòü|Ïåðåâåðíóòü|"
+msgstr "ÐÑÐ¼ÐµÑÐ¸ÑÑ|Ð Ð°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ|ÐÐµÑÐµÐ²ÐµÑÐ½ÑÑÑ|"
 
-#: src/cmd_select.c:399 src/menus.c:530
+#: src/cmd_select.c:368 src/menus.c:537
 msgid "Action"
-msgstr "Äåéñòâèå"
+msgstr "ÐÐµÐ¹ÑÑÐ²Ð¸Ðµ"
 
-#: src/cmd_select.c:399
+#: src/cmd_select.c:368
 msgid "Set"
-msgstr "Óñòàíîâèòü"
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ"
 
-#: src/cmd_select.c:511
+#: src/cmd_select.c:469
 msgid "Treat RE as Glob Pattern?"
-msgstr "Èñïîëüçîâàòü âûðàæåíèå êàê ãëîá. ìàñêó?"
+msgstr "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ ÐºÐ°Ðº Ð³Ð»Ð¾Ð±. Ð¼Ð°ÑÐºÑ?"
 
-#: src/cmd_select.c:514
+#: src/cmd_select.c:472
 msgid "Invert RE Matching?"
-msgstr "Íå óäîâëåòâîðÿþùèå âûðàæåíèþ?"
+msgstr "ÐÐµ ÑÐ´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÑÑÑÐ¸Ðµ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ?"
 
-#: src/cmd_select.c:517
+#: src/cmd_select.c:475
 msgid "Require Match on Full Name?"
-msgstr "Ïî ïîëíîìó èìåíè?"
+msgstr "ÐÐ¾ Ð¿Ð¾Ð»Ð½Ð¾Ð¼Ñ Ð¸Ð¼ÐµÐ½Ð¸?"
 
-#: src/cmd_select.c:531
+#: src/cmd_select.c:489
 msgid "Select Using RE"
-msgstr "Âûáîð èñïîëüçóÿ âûðàæåíèå"
+msgstr "ÐÑÐ±Ð¾Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: src/cmd_select.c:815
+#: src/cmd_select.c:727
 msgid ""
 "Enter shell command to run. The command\n"
 "will have the selected content appended.\n"
 "Action is performed on successful exit."
 msgstr ""
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "OK|Cancel"
-msgstr "_ÄÀ|_Îòìåíà"
+msgstr "_ÐÐ|_ÐÑÐ¼ÐµÐ½Ð°"
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "Select using shell command"
-msgstr "Âûáåð ïî êîíñîëüíîé êîìàíäå"
+msgstr "ÐÑÐ±ÐµÑ Ð¿Ð¾ ÐºÐ¾Ð½ÑÐ¾Ð»ÑÐ½Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ"
 
-#: src/cmd_split.c:68
+#: src/cmd_split.c:269
 #, c-format
 msgid ""
 "Split \"%s\".\n"
 "File is %s (%s)."
 msgstr ""
-"Ðàçáèòü \"%s\".\n"
-"ôàéë %s (%s)."
+"Ð Ð°Ð·Ð±Ð¸ÑÑ \"%s\".\n"
+"ÑÐ°Ð¹Ð» %s (%s)."
 
-#: src/cmd_split.c:70
+#: src/cmd_split.c:271
 #, c-format
 msgid ""
 "Split \"%s\".\n"
 "File is %s."
 msgstr ""
-"Ðàçáèòü \"%s\".\n"
-"Ôàéë %s."
+"Ð Ð°Ð·Ð±Ð¸ÑÑ \"%s\".\n"
+"Ð¤Ð°Ð¹Ð» %s."
 
-#: src/cmd_split.c:106
+#: src/cmd_split.c:348
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Split?"
-msgstr "\"%s\" Óæå ñóùåñòâóåò - ïðîäîëæèòü ðàçáèâêó?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÑÐ°Ð·Ð±Ð¸Ð²ÐºÑ?"
 
-#: src/cmd_split.c:171
-msgid "Beta Software"
-msgstr "Áåòà âåðñèÿ"
+#: src/cmd_split.c:422
+msgid "Fixed Size Split"
+msgstr "Ð Ð°Ð·Ð±Ð¸Ð²ÐºÐ° Ð¿Ð¾ ÑÐ°Ð·Ð¼ÐµÑÑ"
 
-#: src/cmd_split.c:171
-msgid "Next Version?"
-msgstr "Ñëåäóþùàÿ âåðñèÿ?"
+#: src/cmd_split.c:424
+msgid "Segment Size"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ ÐºÑÑÐºÐ°"
 
-#: src/cmd_split.c:171
-msgid ""
-"This splitting mode has not been\n"
-"implemented yet... Sorry."
+#: src/cmd_split.c:427
+#, fuzzy
+msgid "1457000 bytes (3.5\" floppy)"
+msgstr " 1457000 Ð±Ð°Ð¹Ñ (3.5\" Ð´Ð¸ÑÐºÐµÑÐ°)"
+
+#: src/cmd_split.c:428
+#, fuzzy
+msgid "10485760 bytes (10 MB)"
+msgstr " 1457000 Ð±Ð°Ð¹Ñ (3.5\" Ð´Ð¸ÑÐºÐµÑÐ°)"
+
+#: src/cmd_split.c:429
+#, fuzzy
+msgid "26214400 bytes (25 MB)"
+msgstr " 1457000 Ð±Ð°Ð¹Ñ (3.5\" Ð´Ð¸ÑÐºÐµÑÐ°)"
+
+#: src/cmd_split.c:430
+#, fuzzy
+msgid "52428800 bytes (50 MB)"
+msgstr " 1457000 Ð±Ð°Ð¹Ñ (3.5\" Ð´Ð¸ÑÐºÐµÑÐ°)"
+
+#: src/cmd_split.c:431
+#, fuzzy
+msgid "78643200 bytes (75 MB)"
+msgstr " 1457000 Ð±Ð°Ð¹Ñ (3.5\" Ð´Ð¸ÑÐºÐµÑÐ°)"
+
+#: src/cmd_split.c:432
+#, fuzzy
+msgid "100431360 bytes (95 MB, Zip disk)"
+msgstr "100431360 Ð±Ð°Ð¹Ñ (ÐÐ¸ÑÐº ZIP)"
+
+#: src/cmd_split.c:454
+#, fuzzy
+msgid "Fixed Count Split"
+msgstr "Ð Ð°Ð·Ð±Ð¸Ð²ÐºÐ° Ð¿Ð¾ ÑÐ°Ð·Ð¼ÐµÑÑ"
+
+#: src/cmd_split.c:457
+#, fuzzy
+msgid "Segment Count"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ ÐºÑÑÐºÐ°"
+
+#: src/cmd_split.c:503
+msgid "Current part number, unique for every created file"
 msgstr ""
-"Ðåæèì ðàçáèâêè åùå íå \n"
-"ðåàëèçîâàí... Èçâèíèòå."
 
-#: src/cmd_split.c:187
-msgid "  1457000 bytes (3.5\" floppy)"
-msgstr " 1457000 áàéò (3.5\" äèñêåòà)"
+#: src/cmd_split.c:504
+msgid "The value from the Base box"
+msgstr ""
 
-#: src/cmd_split.c:188
-msgid "100431360 bytes (Zip disk)"
-msgstr "100431360 áàéò (Äèñê ZIP)"
+#: src/cmd_split.c:505
+msgid "The amount that index will change for each file"
+msgstr ""
 
-#: src/cmd_split.c:190
-msgid "Fixed Size Split"
-msgstr "Ðàçáèâêà ïî ðàçìåðó"
+#: src/cmd_split.c:506
+msgid "The total number of files that will be created"
+msgstr ""
 
-#: src/cmd_split.c:193
-msgid "Segment Size"
-msgstr "Ðàçìåð êóñêà"
+#: src/cmd_split.c:507
+msgid "The value of index for the last file to be created"
+msgstr ""
 
-#: src/cmd_split.c:221
+#: src/cmd_split.c:570
 msgid "Fixed size, variable number of parts"
-msgstr "Ïî îïðåäåëåííîìó ðàçìåðó ÷àñòè"
+msgstr "ÐÐ¾ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½Ð¾Ð¼Ñ ÑÐ°Ð·Ð¼ÐµÑÑ ÑÐ°ÑÑÐ¸"
 
-#: src/cmd_split.c:222
+#: src/cmd_split.c:571
 msgid "Fixed number of parts, variable sizes"
-msgstr "Íà îïðåäåëåííîå êîëè÷åñòâî ÷àñòåé"
+msgstr "ÐÐ° Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½Ð¾Ðµ ÐºÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ ÑÐ°ÑÑÐµÐ¹"
 
-#: src/cmd_split.c:230 src/cmd_split.c:261
+#: src/cmd_split.c:580 src/cmd_split.c:663
 msgid "Split"
-msgstr "Ðàçáèòü"
+msgstr "Ð Ð°Ð·Ð±Ð¸ÑÑ"
 
-#: src/cmd_split.c:243
+#: src/cmd_split.c:599
 msgid "Name Format"
-msgstr "Ôîðìàò èìåíè"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð¸Ð¼ÐµÐ½Ð¸"
 
-#: src/cmd_split.c:252
+#: src/cmd_split.c:615
 msgid "Step"
-msgstr "Øàã"
+msgstr "Ð¨Ð°Ð³"
 
-#: src/cmd_symlink.c:77 src/cmd_symlink.c:246
+#: src/cmd_split.c:624
+msgid "Zero-Fill Numbers?"
+msgstr ""
+
+#: src/cmd_split.c:645
+msgid "Offset"
+msgstr ""
+
+#: src/cmd_symlink.c:68 src/cmd_symlink.c:252
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Link?"
-msgstr "\"%s\" Óæå ñóùåñòâóåò - ïðîäîëæèòü ñîçäàíèå ññûëêè?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÑÑÐ»ÐºÐ¸?"
+
+#: src/cmd_symlink.c:161 src/configure.c:239 src/icon_dialog.c:59
+#: src/progress.c:220
+msgid "Cancel"
+msgstr "ÐÑÐ¼ÐµÐ½Ð°"
+
+#: src/cmd_symlink.c:161 src/configure.c:233 src/dialog.c:290
+#: src/nag_dialog.c:36
+msgid "OK"
+msgstr "ÐÐ"
 
-#: src/cmd_symlink.c:184
+#: src/cmd_symlink.c:161
 msgid "Select Link Target"
-msgstr "Âûáåðèòå öåëü ññûëêè"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐµÐ»Ñ ÑÑÑÐ»ÐºÐ¸"
 
-#: src/cmd_symlink.c:213
+#: src/cmd_symlink.c:218
 msgid "Contents"
-msgstr "Ñîäåðæàíèå"
+msgstr "Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ"
 
-#: src/cmd_symlink.c:225
+#: src/cmd_symlink.c:231
 msgid "Edit Symbolic Link"
-msgstr "Èçìåíèòü ññûëêó"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÑÑÐ»ÐºÑ"
 
-#: src/cmd_symlink.c:231
+#: src/cmd_symlink.c:236
 msgid "Create Symbolic Link"
-msgstr "Ñîçäàíèå ññûëêè"
-
-#: src/cmd_viewtext.c:206
-msgid "Use mmap() to Speed Loading?"
-msgstr "Èñïîëüçîâàòü mmap() äëÿ óñêîðåíèÿ çàãðóçêè?"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÑÑÐ»ÐºÐ¸"
 
-#: src/cmd_viewtext.c:208
+#: src/cmd_viewtext.c:205
 msgid "Hex-Check First"
-msgstr "Ïðîâåðèòü ñèìâîëû"
+msgstr "ÐÑÐ¾Ð²ÐµÑÐ¸ÑÑ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ"
 
-#: src/cmd_viewtext.c:209
+#: src/cmd_viewtext.c:206
 msgid "Exit on Left Arrow Key?"
 msgstr ""
 
 #: src/cmdarg.c:201
 msgid "on"
-msgstr "âêë"
+msgstr "Ð²ÐºÐ»"
 
 #: src/cmdarg.c:201
 msgid "true"
-msgstr "Èñòèíà"
+msgstr "ÐÑÑÐ¸Ð½Ð°"
 
 #: src/cmdarg.c:201
 msgid "yes"
-msgstr "äà"
+msgstr "Ð´Ð°"
 
-#: src/cmdgrab.c:222
+#: src/cmdgrab.c:177
 #, c-format
 msgid "Output of %s (pid %d)"
-msgstr "Âûâîä %s (pid %d)"
+msgstr "ÐÑÐ²Ð¾Ð´ %s (pid %d)"
 
 #: src/cmdseq.c:354 src/cmdseq.c:369
 #, c-format
 msgid ""
 "Unable to execute unknown\n"
 "command \"%s\"."
-msgstr "Íå èçâåñòíàÿ êîìàíäà \"%s\"."
+msgstr "ÐÐµ Ð¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° \"%s\"."
 
-#: src/cmdseq_dialog.c:126
+#: src/cmdseq_dialog.c:134
 #, c-format
 msgid "Built-Ins (%u)"
-msgstr "Âñòðîåíûå (%u)"
+msgstr "ÐÑÑÑÐ¾ÐµÐ½ÑÐµ (%u)"
 
-#: src/cmdseq_dialog.c:131
+#: src/cmdseq_dialog.c:139
 #, c-format
 msgid "User Defined (%u)"
-msgstr "Îïðåäåëåííûå (%u)"
+msgstr "ÐÐ¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½ÑÐµ (%u)"
 
-#: src/cmdseq_dialog.c:302
+#: src/cmdseq_dialog.c:313
 msgid ""
 "Select a command, or type start\n"
 "of name and press TAB."
 msgstr ""
-"Âûáåðèòå êîìàíäó èëè íàáåðèòå\n"
-"íà÷àëî è íàæìèòå TAB"
+"ÐÑÐ±ÐµÑÐ¸ÑÐµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð¸Ð»Ð¸ Ð½Ð°Ð±ÐµÑÐ¸ÑÐµ\n"
+"Ð½Ð°ÑÐ°Ð»Ð¾ Ð¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ TAB"
 
-#: src/cmdseq_dialog.c:319
+#: src/cmdseq_dialog.c:330
 msgid "Select Command"
-msgstr "Âûáåðèòå êîìàíäó"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ"
 
-#: src/configure.c:198
+#: src/configure.c:197
 msgid "Couldn't open configuration file for output"
-msgstr "Íå ìîãó îòêðûòü ôàéë íàñòðîéêè äëÿ çàïèñè"
-
-#: src/configure.c:234 src/dialog.c:285
-msgid "OK"
-msgstr "ÄÀ"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¾ÑÐºÑÑÑÑ ÑÐ°Ð¹Ð» Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸ÑÐ¸"
 
-#: src/configure.c:240
+#: src/configure.c:236
 msgid "Save"
-msgstr "Ñîõðàíèòü"
+msgstr "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ"
 
-#: src/configure.c:244 src/icon_dialog.c:59 src/progress.c:219
-msgid "Cancel"
-msgstr "Îòìåíà"
-
-#: src/configure.c:455
+#: src/configure.c:463
 #, c-format
 msgid "Config file version (%s) doesn't match program version (%s)"
-msgstr "Âåðñèÿ ôàéëà íàñòðîåê (%s) íå ñîâïàäàåò ñ âåðñèåé ïðîãðàììû (%s)"
+msgstr "ÐÐµÑÑÐ¸Ñ ÑÐ°Ð¹Ð»Ð° Ð½Ð°ÑÑÑÐ¾ÐµÐº (%s) Ð½Ðµ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÐµÑ Ñ Ð²ÐµÑÑÐ¸ÐµÐ¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ (%s)"
 
-#: src/configure.c:467
+#: src/configure.c:475
 #, c-format
 msgid ""
 "Couldn't find any configuration file; checked\n"
 "both \"%s\" and \"%s\".\n"
 "Using built-in minimal configuration."
 msgstr ""
-"Íå ìîãó íàéòè ôàéë íàñòðîåê; åãî íåò\n"
-"íè â \"%s\" íè â \"%s\".\n"
-"Èñïîëüçóþ âñòðîåííóþ ìèíèìàëüíóþ íàñòðîéêó."
+"ÐÐµ Ð¼Ð¾Ð³Ñ Ð½Ð°Ð¹ÑÐ¸ ÑÐ°Ð¹Ð» Ð½Ð°ÑÑÑÐ¾ÐµÐº; ÐµÐ³Ð¾ Ð½ÐµÑ\n"
+"Ð½Ð¸ Ð² \"%s\" Ð½Ð¸ Ð² \"%s\".\n"
+"ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÑ Ð²ÑÑÑÐ¾ÐµÐ½Ð½ÑÑ Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»ÑÐ½ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÑ."
 
-#: src/dialog.c:123 src/dialog.c:253
+#: src/dialog.c:124 src/dialog.c:260
 msgid "_OK|_Cancel"
-msgstr "_ÄÀ|_Îòìåíà"
-
-#: src/dirpane.c:134
-msgid ""
-"Case-sensitive sorting will not work correctly with non-ASCII characters"
-msgstr "Ñîðòèðîâêà ñ ó÷åòîì ðåãèñòðà ðàáîòàåò íåâåðíî ñ ðóññêèìè áóêâàìè"
+msgstr "_ÐÐ|_ÐÑÐ¼ÐµÐ½Ð°"
 
-#: src/dirpane.c:143
-msgid ""
-"Case-insensitive sorting will not work correctly with non-ASCII characters"
-msgstr "Ñîðòèðîâêà áåç ó÷åòà ðåãèñòðà ðàáîòàåò íåâåðíî ñ ðóññêèìè áóêâàìè"
-
-#: src/dirpane.c:1189
+#: src/dirpane.c:541
 #, c-format
 msgid "%u/%u dirs, %u/%u files"
-msgstr "%u/%u êàòàëîãîâ, %u/%u ôàéëîâ"
+msgstr "%u/%u ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð², %u/%u ÑÐ°Ð¹Ð»Ð¾Ð²"
 
-#: src/dirpane.c:1197
-#, fuzzy, c-format
-msgid " (%%s/%%s, %%%s/%%%s blocks)"
-msgstr " (%s/%s, %Lu/%Lu áëîêîâ)"
+#: src/dirpane.c:546
+#, c-format
+msgid " (%s/%s)"
+msgstr ""
 
-#: src/dirpane.c:1210
+#: src/dirpane.c:557
 #, fuzzy, c-format
 msgid ", %s (%s) used"
-msgstr ", %s çàíÿòî"
+msgstr ", %s Ð·Ð°Ð½ÑÑÐ¾"
 
-#: src/dirpane.c:1212
+#: src/dirpane.c:559
 #, c-format
 msgid ", %s free"
-msgstr ", %s ñâîáîäíî"
-
-#: src/dirpane.c:1560
-msgid "!!Invalid filename!!"
-msgstr ""
+msgstr ", %s ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾"
 
-#: src/dirpane.c:2004 src/dirpane.c:2053
+#: src/dirpane.c:2084 src/dirpane.c:2131
 msgid "Move up to the parent directory"
-msgstr "Ïåðåéòè â ðîäèòåëüñêèé êàòàëîã"
+msgstr "ÐÐµÑÐµÐ¹ÑÐ¸ Ð² ÑÐ¾Ð´Ð¸ÑÐµÐ»ÑÑÐºÐ¸Ð¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³"
 
-#: src/dirpane.c:2026
+#: src/dirpane.c:2106
 msgid "Enter path, then press Return to go there"
-msgstr "Ââåäèòå ïóòü è íàæìèòå Ââîä äëÿ ïåðåõîäà"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¿ÑÑÑ Ð¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐÐ²Ð¾Ð´ Ð´Ð»Ñ Ð¿ÐµÑÐµÑÐ¾Ð´Ð°"
 
-#: src/dirpane.c:2027
+#: src/dirpane.c:2107
 msgid "H"
-msgstr "Ñ"
+msgstr "Ð¡"
 
-#: src/dirpane.c:2031
+#: src/dirpane.c:2111
 msgid ""
 "Click to enable/disable Hide rule (When pressed in, the hide rule is active, "
 "and matching entries are hidden)"
 msgstr ""
-"Íàæìèòå äëÿ âêëþ÷åíèÿ/âûêëþ÷åíèÿ ïîêàçà ñêðûòûõ ýëåìåíòîâ(íàæàòîå ñîñòîÿíèå "
-"îáîçíà÷àåò ñêðûòèå)"
+"ÐÐ°Ð¶Ð¼Ð¸ÑÐµ Ð´Ð»Ñ Ð²ÐºÐ»ÑÑÐµÐ½Ð¸Ñ/Ð²ÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ð¿Ð¾ÐºÐ°Ð·Ð° ÑÐºÑÑÑÑÑ ÑÐ»ÐµÐ¼ÐµÐ½ÑÐ¾Ð²(Ð½Ð°Ð¶Ð°ÑÐ¾Ðµ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ðµ "
+"Ð¾Ð±Ð¾Ð·Ð½Ð°ÑÐ°ÐµÑ ÑÐºÑÑÑÐ¸Ðµ)"
 
-#: src/dpformat.c:37
+#: src/dpformat.c:38
 msgid "Blocks"
-msgstr "Áëîêîâ"
+msgstr "ÐÐ»Ð¾ÐºÐ¾Ð²"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "BSize"
-msgstr "Áëîê"
+msgstr "ÐÐ»Ð¾Ðº"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "Block Size"
-msgstr "Ðàçìåð áëîêà"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ Ð±Ð»Ð¾ÐºÐ°"
 
-#: src/dpformat.c:39
+#: src/dpformat.c:40
 msgid "Mode, numerical"
-msgstr "Ïðàâà, â öèôðàõ"
+msgstr "ÐÑÐ°Ð²Ð°, Ð² ÑÐ¸ÑÑÐ°Ñ"
 
-#: src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode, string"
-msgstr "Ïðàâà, ñòðîêîé"
+msgstr "ÐÑÐ°Ð²Ð°, ÑÑÑÐ¾ÐºÐ¾Ð¹"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Nlink"
-msgstr "Ññûëîê"
+msgstr "Ð¡ÑÑÐ»Ð¾Ðº"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Number of links"
-msgstr "×èñëî ññûëîê"
+msgstr "Ð§Ð¸ÑÐ»Ð¾ ÑÑÑÐ»Ð¾Ðº"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Owner ID"
-msgstr "Íîìåð âëàäåëüöà"
+msgstr "ÐÐ¾Ð¼ÐµÑ Ð²Ð»Ð°Ð´ÐµÐ»ÑÑÐ°"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Uid"
-msgstr "Nâëàä"
+msgstr "NÐ²Ð»Ð°Ð´"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Owner Name"
-msgstr "Èìÿ âëàäåëüöà"
+msgstr "ÐÐ¼Ñ Ð²Ð»Ð°Ð´ÐµÐ»ÑÑÐ°"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Uname"
-msgstr "Âëàäåëåö"
+msgstr "ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Gid"
-msgstr "Nãðóï"
+msgstr "NÐ³ÑÑÐ¿"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Group ID"
-msgstr "Íîìåð ãðóïïû"
+msgstr "ÐÐ¾Ð¼ÐµÑ Ð³ÑÑÐ¿Ð¿Ñ"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Gname"
-msgstr "Ãðóïïà"
+msgstr "ÐÑÑÐ¿Ð¿Ð°"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Group Name"
-msgstr "Èìÿ ãðóïïû"
+msgstr "ÐÐ¼Ñ Ð³ÑÑÐ¿Ð¿Ñ"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device"
-msgstr "Óñòðîéñòâî"
+msgstr "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device Number"
-msgstr "Íîìåð óñòðîéñòâà"
+msgstr "ÐÐ¾Ð¼ÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "DevMaj"
-msgstr "NÓñòðÎ"
+msgstr "NÐ£ÑÑÑÐ"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "Device Number, major"
-msgstr "Íîìåð óñòðîéñòâà, îñíîâíîé"
+msgstr "ÐÐ¾Ð¼ÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð¹"
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "DevMin"
-msgstr "NÓñòðÍÎ"
-
-#: src/dpformat.c:48
-msgid "Device Number, minor"
-msgstr "Íîìåð óñòðîéñòâà, íåîñíîâíîé"
+msgstr "NÐ£ÑÑÑÐÐ"
 
 #: src/dpformat.c:49
-msgid "Date of last Access"
-msgstr "Âðåìÿ ïîñëåäíåãî äîñòóïà"
+msgid "Device Number, minor"
+msgstr "ÐÐ¾Ð¼ÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, Ð½ÐµÐ¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð¹"
 
 #: src/dpformat.c:50
-msgid "Date of last Modification"
-msgstr "Âðåìÿ ïîñëåäíåé ìîäèôèêàöèè"
-
-#: src/dpformat.c:51
-msgid "Created"
-msgstr "Ñîçäàí"
+#, fuzzy
+msgid "Time of Last Access"
+msgstr "ÐÑÐµÐ¼Ñ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÐµÐ³Ð¾ Ð´Ð¾ÑÑÑÐ¿Ð°"
 
 #: src/dpformat.c:51
-msgid "Date of Creation"
-msgstr "Âðåìÿ ñîçäàíèÿ"
+#, fuzzy
+msgid "Time of Last Modification"
+msgstr "ÐÑÐµÐ¼Ñ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÐµÐ¹ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¸Ð¸"
 
 #: src/dpformat.c:52
-msgid "Type Name"
-msgstr "Èìÿ òèïà"
+#, fuzzy
+msgid "Time of Creation"
+msgstr "ÐÑÐµÐ¼Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ"
 
 #: src/dpformat.c:53
-msgid "I"
-msgstr "Ç"
+msgid "Time of Last Change"
+msgstr ""
 
-#: src/dpformat.c:334
-msgid "B"
-msgstr "Á"
+#: src/dpformat.c:54
+msgid "Type Name"
+msgstr "ÐÐ¼Ñ ÑÐ¸Ð¿Ð°"
 
-#: src/dpformat.c:338 src/sizeutil.c:32
-msgid "KB"
-msgstr "ÊÁ"
+#: src/dpformat.c:55
+msgid "I"
+msgstr "Ð"
 
-#: src/dpformat.c:343 src/sizeutil.c:33
-msgid "MB"
-msgstr "ÌÁ"
+#: src/dpformat.c:56
+msgid "URI"
+msgstr ""
 
-#: src/dpformat.c:348 src/sizeutil.c:31
-msgid "GB"
-msgstr "ÃÁ"
+#: src/dpformat.c:56
+msgid "URI (without file prefix)"
+msgstr ""
 
-#: src/errors.c:69
+#: src/errors.c:59
 #, c-format
 msgid "Couldn't %s \"%s\": %s (code %d)"
-msgstr "Íå ìîãó %s \"%s\": %s (êîä %d)"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ %s \"%s\": %s (ÐºÐ¾Ð´ %d)"
 
-#: src/errors.c:71
+#: src/errors.c:61
 #, c-format
 msgid "Couldn't %s \"%s\" (code %d)"
-msgstr "Íå ìîãó %s \"%s\" (êîä %d)"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ %s \"%s\" (ÐºÐ¾Ð´ %d)"
 
-#: src/errors.c:76
+#: src/errors.c:66
 #, c-format
 msgid "Couldn't %s \"%s\""
-msgstr "Íå ìîãó %s \"%s\""
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ %s \"%s\""
 
-#: src/errors.c:78
+#: src/errors.c:68
 #, c-format
 msgid "Couldn't %s"
-msgstr "Íå ìîãó %s"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ %s"
+
+#: src/errors.c:88
+#, c-format
+msgid "%s"
+msgstr ""
 
 # src/gentoo.c:440
-#: src/gentoo.c:421
+#: src/gentoo.c:427
 msgid "Report the version to standard output, and exit."
-msgstr "Âûâåñòè íîìåð âåðñèè è âûéòè."
+msgstr "ÐÑÐ²ÐµÑÑÐ¸ Ð½Ð¾Ð¼ÐµÑ Ð²ÐµÑÑÐ¸Ð¸ Ð¸ Ð²ÑÐ¹ÑÐ¸."
 
 # src/gentoo.c:440
-#: src/gentoo.c:423
+#: src/gentoo.c:429
 msgid "Report internal locale details, and exit."
-msgstr "Âûâåñòè äåòàëè âíóòðåííåé ëîêàëèçàöèè è âûéòè."
+msgstr "ÐÑÐ²ÐµÑÑÐ¸ Ð´ÐµÑÐ°Ð»Ð¸ Ð²Ð½ÑÑÑÐµÐ½Ð½ÐµÐ¹ Ð»Ð¾ÐºÐ°Ð»Ð¸Ð·Ð°ÑÐ¸Ð¸ Ð¸ Ð²ÑÐ¹ÑÐ¸."
 
 # src/gentoo.c:441
-#: src/gentoo.c:425
+#: src/gentoo.c:431
 msgid "Allows gentoo to be run by the root user. Could be dangerous."
 msgstr ""
-"Ïîçâîëÿåò çàïóñêàòü gentoo ïîä root'îì. Ìîæåò ïðèâåñòè ê ïå÷àëüíûì "
-"ïîñëåäñòâèÿì. "
+"ÐÐ¾Ð·Ð²Ð¾Ð»ÑÐµÑ Ð·Ð°Ð¿ÑÑÐºÐ°ÑÑ gentoo Ð¿Ð¾Ð´ root'Ð¾Ð¼. ÐÐ¾Ð¶ÐµÑ Ð¿ÑÐ¸Ð²ÐµÑÑÐ¸ Ðº Ð¿ÐµÑÐ°Ð»ÑÐ½ÑÐ¼ "
+"Ð¿Ð¾ÑÐ»ÐµÐ´ÑÑÐ²Ð¸ÑÐ¼. "
 
 # src/gentoo.c:442
-#: src/gentoo.c:426
+#: src/gentoo.c:432
 msgid ""
 "Do not load the ~/.gentoorc configuration file; instead, use default values."
 msgstr ""
-"Íå çàãðóæàòü ôàéë íàñòðîåê ~/.gentoorc; èñïîëüçîâàòü íàñòðîéêè ïî óìîë÷àíèþ."
+"ÐÐµ Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑ ÑÐ°Ð¹Ð» Ð½Ð°ÑÑÑÐ¾ÐµÐº ~/.gentoorc; Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ."
 
 # src/gentoo.c:443
-#: src/gentoo.c:427
+#: src/gentoo.c:433
 msgid ""
 "Do not load the ~/.gentoogtkrc GTK+ configuration file; instead, use system "
 "defaults."
 msgstr ""
-"Íå çàãðóæàòü íàñòðîéêè GTK+ : ~/.gentoogtkrc; èñïîëüçîâàòü ñèñòåìíûå "
-"çíà÷åíèÿ ïî óìîë÷àíèþ."
+"ÐÐµ Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ GTK+ : ~/.gentoogtkrc; Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐµ "
+"Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ."
 
-# src/gentoo.c:445
-#: src/gentoo.c:429
-msgid "Do not use FAM to automatically detect changes in viewed directories."
+#: src/gentoo.c:434
+#, fuzzy
+msgid ""
+"Run COMMAND, a gentoo command. Done before user interaction allowed, but "
+"after configuration file has been read in. Can be used many times to run "
+"several commands in sequence."
+msgstr ""
+"ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ARG, ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ gentoo. ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð·Ð°Ð¿ÑÑÐºÐ°ÐµÑÑÑ Ð´Ð¾ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð¾ÐºÐ½Ð°, Ð½Ð¾ "
+"Ð¿Ð¾ÑÐ»Ðµ ÑÑÐµÐ½Ð¸Ñ ÑÐ°Ð¹Ð»Ð° Ð½Ð°ÑÑÑÐ¾ÐµÐº. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¾ ÑÐ°Ð· Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÐ° "
+"Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¸Ñ ÑÐ°Ð·Ð½ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´."
+
+#: src/gentoo.c:435
+msgid "COMMAND"
+msgstr ""
+
+#: src/gentoo.c:436 src/gentoo.c:437
+msgid "DIR"
 msgstr ""
-"Íå èñïîëüçîâàòü FAM äëÿ îïðåäåëåíèÿ èçìåíåíèé â ïðîñìîòðèâàåìûé êàòàëîãàõ."
 
 # src/gentoo.c:447
-#: src/gentoo.c:431
+#: src/gentoo.c:436
+#, fuzzy
 msgid ""
-"Use ARG as path for the left directory pane. Overrides default (and history)."
+"Use DIR as path for the left directory pane. Overrides default (and history)."
 msgstr ""
-"Èñïîëüçîâàòü ARG êàê ïóòü äëÿ ëåâîé ïàíåëè. Ïåðåîïðåäåëèòü ïóòü ïî óìîë÷àíèþ"
-"(è èñòîðèþ)."
+"ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ARG ÐºÐ°Ðº Ð¿ÑÑÑ Ð´Ð»Ñ Ð»ÐµÐ²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸. ÐÐµÑÐµÐ¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ Ð¿ÑÑÑ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
+"(Ð¸ Ð¸ÑÑÐ¾ÑÐ¸Ñ)."
 
 # src/gentoo.c:448
-#: src/gentoo.c:432
+#: src/gentoo.c:437
+#, fuzzy
 msgid ""
-"Use ARG as path for the right directory pane. Overrides default (and "
+"Use DIR as path for the right directory pane. Overrides default (and "
 "history)."
 msgstr ""
-"Èñïîëüçîâàòü ARG êàê ïóòü äëÿ ïðàâîé ïàíåëè. Ïåðåîïðåäåëèòü ïóòü ïî óìîë÷àíèþ"
-"(è èñòîðèþ)."
+"ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ARG ÐºÐ°Ðº Ð¿ÑÑÑ Ð´Ð»Ñ Ð¿ÑÐ°Ð²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸. ÐÐµÑÐµÐ¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ Ð¿ÑÑÑ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
+"(Ð¸ Ð¸ÑÑÐ¾ÑÐ¸Ñ)."
 
-#: src/gentoo.c:433
-msgid ""
-"Run ARG, a gentoo command. Done before user interaction allowed, but after "
-"configuration file has been read in. Can be used many times to run several "
-"commands in sequence."
+#: src/gentoo.c:461
+msgid "- a graphical file manager using GTK+"
+msgstr ""
+
+#: src/gentoo.c:466
+#, c-format
+msgid "Failed to parse command line options: %s\n"
 msgstr ""
-"Çàïóñòèòü ARG, êîìàíäó gentoo. Êîìàíäà çàïóñêàåòñÿ äî îòîáðàæåíèÿ îêíà, íî "
-"ïîñëå ÷òåíèÿ ôàéëà íàñòðîåê. Âîçìîæíî èñïîëüçîâàòü íåñêîëüêî ðàç äëÿ çàïóñêà "
-"íåñêîëüêèõ ðàçíûõ êîìàíä."
 
-#: src/gentoo.c:492
+#: src/gentoo.c:506
 #, c-format
 msgid "%s: To run as root, envoke with the '--root-ok' option\n"
-msgstr "%s: ×òîáû çàïóñòèòü ïîä root èñïîëüçóéòå --root-ok\n"
+msgstr "%s: Ð§ÑÐ¾Ð±Ñ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ Ð¿Ð¾Ð´ root Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ --root-ok\n"
 
-#: src/gentoo.c:524
+#: src/gentoo.c:538
 msgid "Couldn't initialize userinfo module - username resolving won't work"
 msgstr ""
-"Íå ìîãó íàéòè ìîäóëü userinfo - îïðåäåëåíèå èìåí ïîëüçîâàòåëåé íå áóäåò "
-"ðàáîòàòü."
-
-#: src/gentoo.c:529
-msgid "Couldn't initialize mount data - automounting won't work"
-msgstr ""
-"Íå ìîãó íàéòè îïèñàíèå ïîäêëþ÷åíèé äèñêîâ - àâòîïîäêëþ÷åíèå íå áóäåò "
-"ðàáîòàòü."
+"ÐÐµ Ð¼Ð¾Ð³Ñ Ð½Ð°Ð¹ÑÐ¸ Ð¼Ð¾Ð´ÑÐ»Ñ userinfo - Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð¸Ð¼ÐµÐ½ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ Ð½Ðµ Ð±ÑÐ´ÐµÑ "
+"ÑÐ°Ð±Ð¾ÑÐ°ÑÑ."
 
-#: src/gentoo.c:560
+#: src/gentoo.c:570
 #, c-format
 msgid "gentoo v%s by Emil Brink <emil@obsession.se>"
 msgstr "gentoo v%s - Emil Brink <emil@obsession.se>"
 
-#: src/gfam.c:216
-#, c-format
-msgid "FAM open failed, error %d--FAM will not be used"
-msgstr "Íå ìîãó îòêðûòü FAM, îøèáêà %d - FAM íå èñïîëüçóþ"
-
-#: src/gfam.c:235
-#, fuzzy, c-format
-msgid ""
-"Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, perhaps)"
+#: src/gentoo.c:577
+msgid "Development Version Warning"
 msgstr ""
-"Íå ìîãó äîáàâèòü ìîíèòîð FAM \"%s\", îøèáêà %s (ìîæåò çàïóñòèòü ñ --no-fam ?)"
 
-#: src/gfam.c:241
-#, fuzzy, c-format
+#: src/gentoo.c:577
 msgid ""
-"Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go around, "
-"perhaps)"
+"This version of gentoo is considered somewhat new and untested. There have "
+"been major changes to almost all parts of the program since the previous "
+"version. Please be a bit careful, and make sure you report any problem to "
+"the author. Thanks."
 msgstr ""
-"Íå ìîãó äîáàâèòü ìîíèòîð FAM \"%s\", îøèáêà %s (ìîæåò çàïóñòèòü ñ --no-fam ?)"
 
-#: src/guiutil.c:118
+#: src/guiutil.c:124
 msgid "Progress"
-msgstr "Ñîñòîÿíèå"
+msgstr "Ð¡Ð¾ÑÑÐ¾ÑÐ½Ð¸Ðµ"
 
 #: src/icon_dialog.c:52
 msgid "Pick Icon"
-msgstr "Âûáåðèòå çíà÷îê"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð·Ð½Ð°ÑÐ¾Ðº"
 
 #: src/icon_dialog.c:59
 msgid "Loading Icon Graphics..."
-msgstr "Çàãðóçêà çíà÷êà ..."
+msgstr "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð·Ð½Ð°ÑÐºÐ° ..."
 
-#: src/menus.c:278
+#: src/menus.c:284
 msgid "(No Selection)"
-msgstr "(íåò âûäåëåíèÿ)"
+msgstr "(Ð½ÐµÑ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ñ)"
 
-#: src/menus.c:514
+#: src/menus.c:521
 msgid "RegExp..."
-msgstr "Âûðàæåíèå"
+msgstr "ÐÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: src/menus.c:526
+#: src/menus.c:533
 msgid "Other"
-msgstr "Ñ äðóãîé ïàíåëè"
+msgstr "Ð¡ Ð´ÑÑÐ³Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/menus.c:527
+#: src/menus.c:534
 msgid "Rescan"
-msgstr "Îáíîâèòü"
+msgstr "ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ"
 
-#: src/menus.c:528
+#: src/menus.c:535
 msgid "Select"
-msgstr "Âûáîð"
+msgstr "ÐÑÐ±Ð¾Ñ"
 
-#: src/menus.c:532
+#: src/menus.c:539
 msgid "Run..."
-msgstr "Âûïîëíèòü..."
+msgstr "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ..."
 
-#: src/menus.c:534
+#: src/menus.c:541
 msgid "Configure..."
-msgstr "Íàñòðîèòü..."
+msgstr "ÐÐ°ÑÑÑÐ¾Ð¸ÑÑ..."
 
-#: src/menus.c:610
+#: src/menus.c:618
 msgid "Select Menu"
-msgstr "Âûáåðèòå ìåíþ"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¼ÐµÐ½Ñ"
 
-#: src/mount.c:222
-#, c-format
-msgid "Execution of \"%s %s\" failed:\n"
-msgstr "Âûïîëíåíèå \"%s %s\" ïðåðâàíî:\n"
-
-#: src/mount.c:318
-#, c-format
-msgid "Mounting \"%s\" on \"%s\"..."
-msgstr "Ïîäêëþ÷åíèå \"%s\" â \"%s\"..."
+#: src/nag_dialog.c:37
+msgid "_Don't show this dialog again"
+msgstr ""
 
 #: src/overwrite.c:49
 msgid "_OK|A_ll|_Skip|Skip _All|_Cancel"
-msgstr "_ÄÀ|_Âñå|_Íåò|Íè îäíîãî|_Îòìåíà"
-
-# c-format
-#: src/overwrite.c:73
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Old: %%%s bytes, changed on %%s,\n"
-"New: %%%s bytes, changed on %%s."
-msgstr ""
-"\n"
-"Ñòàðîå: %llu áàéò, èçìåíåí %s.\n"
-"Íîâîå: %llu áàéò, èçìåíåí %s."
+msgstr "_ÐÐ|_ÐÑÐµ|_ÐÐµÑ|ÐÐ¸ Ð¾Ð´Ð½Ð¾Ð³Ð¾|_ÐÑÐ¼ÐµÐ½Ð°"
 
-#: src/progress.c:195
+#: src/progress.c:196
 #, c-format
 msgid "Total (%s)"
-msgstr "Âñåãî (%s)"
+msgstr "ÐÑÐµÐ³Ð¾ (%s)"
 
-#: src/progress.c:315
+#: src/progress.c:305
 #, c-format
 msgid "Elapsed %02d:%02d  Speed %s/s  ETA %02u:%02u"
-msgstr "Âðåìÿ %02d:%02d  Ñêîðîñòü %s/c Îñòàëîñü %02u:%02u"
+msgstr "ÐÑÐµÐ¼Ñ %02d:%02d  Ð¡ÐºÐ¾ÑÐ¾ÑÑÑ %s/c ÐÑÑÐ°Ð»Ð¾ÑÑ %02u:%02u"
 
-#: src/sizeutil.c:30
-msgid "BYTES"
-msgstr "Áàéò"
+#: src/sizeutil.c:31
+#, fuzzy
+msgid "Unformatted Size"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² Ð±Ð°Ð¹ÑÐ°Ñ"
 
-#: src/sizeutil.c:69
-#, c-format
-msgid "%%%s"
-msgstr ""
+#: src/sizeutil.c:32
+#, fuzzy
+msgid "Formatted Size, Without Unit"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ,Ð² \"ÑÐ¼Ð½ÑÑ\" ÐµÐ´Ð¸Ð½Ð¸ÑÐ°Ñ"
 
-#: src/sizeutil.c:70
-#, fuzzy, c-format
-msgid "%%%s bytes"
-msgstr "%Lu áàéò"
+#: src/sizeutil.c:33
+#, fuzzy
+msgid "Formatted Size, in Bytes"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² Ð±Ð°Ð¹ÑÐ°Ñ"
 
-#: src/sizeutil.c:71
-#, fuzzy, c-format
-msgid "%%%s KB"
-msgstr "%Lu ÊÁ"
+#: src/sizeutil.c:33 src/sizeutil.c:159
+#, fuzzy
+msgid "bytes"
+msgstr "Ð´Ð°"
 
-#: src/sizeutil.c:72
-#, fuzzy, c-format
-msgid "%%%s MB"
-msgstr "%Lu ÌÁ"
+#: src/sizeutil.c:34
+#, fuzzy
+msgid "Formatted Size, in Kilobytes"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² ÐºÐ¸Ð»Ð¾Ð±Ð°Ð¹ÑÐ°Ñ"
 
-#: src/sizeutil.c:73
-#, fuzzy, c-format
-msgid "%%%s GB"
-msgstr "%Lu ÃÁ"
+#: src/sizeutil.c:34 src/sizeutil.c:163
+msgid "KB"
+msgstr "ÐÐ"
 
-#: src/sizeutil.c:164 src/sizeutil.c:211
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f ÊÁ"
+#: src/sizeutil.c:35
+#, fuzzy
+msgid "Formatted Size, in Megabytes"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² Ð¼ÐµÐ³Ð°Ð±Ð°Ð¹ÑÐ°Ñ"
 
-#: src/sizeutil.c:170 src/sizeutil.c:217
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f ÌÁ"
+#: src/sizeutil.c:35 src/sizeutil.c:167
+msgid "MB"
+msgstr "ÐÐ"
 
-#: src/sizeutil.c:176 src/sizeutil.c:223
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f ÃÁ"
+#: src/sizeutil.c:36
+#, fuzzy
+msgid "Formatted Size, in Gigabytes"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² Ð³Ð¸Ð³Ð°Ð±Ð°Ð¹ÑÐ°Ñ"
+
+#: src/sizeutil.c:36 src/sizeutil.c:171
+msgid "GB"
+msgstr "ÐÐ"
+
+#: src/sizeutil.c:37
+#, fuzzy
+msgid "Formatted Size, in Terabytes"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² Ð¼ÐµÐ³Ð°Ð±Ð°Ð¹ÑÐ°Ñ"
+
+#: src/sizeutil.c:37 src/sizeutil.c:175
+#, fuzzy
+msgid "TB"
+msgstr "Ð"
+
+#: src/sizeutil.c:38
+#, fuzzy
+msgid "Formatted Size, Automatic Unit"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ,Ð² \"ÑÐ¼Ð½ÑÑ\" ÐµÐ´Ð¸Ð½Ð¸ÑÐ°Ñ"
 
 #: src/style_dialog.c:40
 msgid "Select Style"
-msgstr "Âûáåðèòå êëàññ"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÐºÐ»Ð°ÑÑ"
 
-#: src/styles.c:112
+#: src/styles.c:114
 msgid "Root"
 msgstr "Root"
 
-#: src/styles.c:118 src/types.c:485 src/types.c:488
+#: src/styles.c:120 src/types.c:292 src/types.c:295
 msgid "Directory"
-msgstr "Êàòàëîã"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³"
 
-#: src/styles.c:961
+#: src/styles.c:889
 msgid "New Style"
-msgstr "Íîâûé êëàññ"
+msgstr "ÐÐ¾Ð²ÑÐ¹ ÐºÐ»Ð°ÑÑ"
 
-#: src/styles.c:961
+#: src/styles.c:889
 #, c-format
 msgid "New Style %u"
-msgstr "Íîâûé êëàññ %u"
+msgstr "ÐÐ¾Ð²ÑÐ¹ ÐºÐ»Ð°ÑÑ %u"
 
-#: src/textview.c:152
+#: src/textview.c:190
 #, c-format
-msgid "Unable to convert text from native character set (%s) to UTF-8: %s"
+msgid ""
+"\n"
+"** Text conversion from charset '%s' failed, aborting."
 msgstr ""
 
-#: src/textview.c:252 src/textview.c:353
-msgid "File reading"
-msgstr "×òåíèå ôàéëà"
-
-#: src/textview.c:419
+#: src/textview.c:405
 #, c-format
 msgid "Line %d (%.0f%%)"
-msgstr "Ñòðîêà %d (%.0f%%)"
+msgstr "Ð¡ÑÑÐ¾ÐºÐ° %d (%.0f%%)"
 
-#: src/textview.c:472
+#: src/textview.c:455
 msgid "Enter Line Number or Percentage:"
-msgstr "Ââåäèòå íîìåð ñòðîêè èëè ïðîöåíò:"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð½Ð¾Ð¼ÐµÑ ÑÑÑÐ¾ÐºÐ¸ Ð¸Ð»Ð¸ Ð¿ÑÐ¾ÑÐµÐ½Ñ:"
 
-#: src/textview.c:478
+#: src/textview.c:461
 msgid "Goto"
-msgstr "Ïåðåéòè"
+msgstr "ÐÐµÑÐµÐ¹ÑÐ¸"
 
-#: src/textview.c:613
+#: src/textview.c:596
 msgid "Enter Text to Search For (RE)"
-msgstr "Ââåäèòå òåêñò äëÿ ïîèñêà (Âûðàæåíèå)"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ ÑÐµÐºÑÑ Ð´Ð»Ñ Ð¿Ð¾Ð¸ÑÐºÐ° (ÐÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ)"
 
-#: src/textview.c:623
+#: src/textview.c:607
 msgid "Don't Span Newlines?"
-msgstr "Íå ðàñïðåäåëÿòü íîâûå ëèíèè?"
+msgstr "ÐÐµ ÑÐ°ÑÐ¿ÑÐµÐ´ÐµÐ»ÑÑÑ Ð½Ð¾Ð²ÑÐµ Ð»Ð¸Ð½Ð¸Ð¸?"
 
-#: src/textview.c:629
+#: src/textview.c:613
 msgid "Search"
-msgstr "Ïîèñê"
+msgstr "ÐÐ¾Ð¸ÑÐº"
+
+#: src/types.c:287
+msgid "Unknown"
+msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÐ¹"
 
-#: src/types.c:454
+#: src/types.c:572
 #, c-format
 msgid ""
 "Got SIGPIPE when writing to 'file' process (%s), it seems to have terminated "
 "prematurely."
 msgstr ""
 
-#: src/types.c:461
+#: src/types.c:578
 msgid "Unable to run spawn 'file' command: "
 msgstr ""
 
-#: src/types.c:480
-msgid "Unknown"
-msgstr "Íåèçâåñòíûé"
-
-#: src/window.c:82
+#: src/window.c:83
 msgid "Configure gentoo"
-msgstr "Íàñòðîéêà"
+msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ°"
 
-#: src/window.c:89
+#: src/window.c:90
 msgid "Text Viewer"
-msgstr "Ïðîñìîòð òåêñòà"
+msgstr "ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÐµÐºÑÑÐ°"
 
-#: src/window.c:200
+#: src/window.c:199
 msgid "Position"
-msgstr "Ïîçèöèÿ"
+msgstr "ÐÐ¾Ð·Ð¸ÑÐ¸Ñ"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Height"
-msgstr "Âûñîòà"
+msgstr "ÐÑÑÐ¾ÑÐ°"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "X"
 msgstr "X"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Y"
 msgstr "Y"
 
-#: src/window.c:208
+#: src/window.c:207
 msgid "Set on Open?"
-msgstr "Óñòàíîâèòü ïðè îòêðûòèè?"
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¿ÑÐ¸ Ð¾ÑÐºÑÑÑÐ¸Ð¸?"
 
-#: src/window.c:214
+#: src/window.c:213
 msgid "Update on Close?"
-msgstr "Ñîõðàíèòü ïðè çàêðûòèè?"
+msgstr "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¿ÑÐ¸ Ð·Ð°ÐºÑÑÑÐ¸Ð¸?"
 
-#: src/window.c:245
+#: src/window.c:244
 msgid "Grab"
-msgstr "Çàõâàòèòü"
+msgstr "ÐÐ°ÑÐ²Ð°ÑÐ¸ÑÑ"
 
 #: src/xmlutil.c:225
 msgid "XML module emitted locale-dependant real number"
-msgstr "XML ìîäóëü âûäàë ëîêàëüíî-çàâèñèìûé íîìåð"
+msgstr "XML Ð¼Ð¾Ð´ÑÐ»Ñ Ð²ÑÐ´Ð°Ð» Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾-Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ"
+
+#~ msgid "Use Dialog to Report Errors?"
+#~ msgstr "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³ Ð´Ð»Ñ Ð¾ÑÐ¸Ð±Ð¾Ðº?"
+
+#~ msgid "Path Right Click"
+#~ msgstr "ÐÑÐ°Ð²ÑÐ¹ ÑÐµÐ»ÑÐ¾Ðº Ð½Ð° Ð¿ÑÑÐ¸"
+
+#~ msgid "Raw Size, in Bytes"
+#~ msgstr "Ð¡ÑÑÐ¾Ð¹ ÑÐ°Ð·Ð¼ÐµÑ, Ð² Ð±Ð°Ð¹ÑÐ°Ñ"
+
+#~ msgid "Always Set"
+#~ msgstr "ÐÑÐµÐ³Ð´Ð° Ð²ÐºÐ»ÑÑÐµÐ½Ð¾"
+
+#~ msgid "Modify 'Control' Key State"
+#~ msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ðµ ÐºÐ½Ð¾Ð¿ÐºÐ¸ 'Control'"
+
+#~ msgid "Active Pane Titles"
+#~ msgstr "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð°ÐºÑÐ¸Ð²Ð½Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
+
+#~ msgid "Focused Row, Unselected"
+#~ msgstr "ÐÑÐ±ÑÐ°Ð½Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ°, Ð½Ðµ Ð¾ÑÐ¼ÐµÑÐµÐ½Ð°Ñ"
+
+#~ msgid "Focused Row, Selected"
+#~ msgstr "ÐÑÐ±ÑÐ°Ð½Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ°, Ð¾ÑÐ¼ÐµÑÐµÐ½Ð½Ð°Ñ"
+
+#~ msgid "Beta Software"
+#~ msgstr "ÐÐµÑÐ° Ð²ÐµÑÑÐ¸Ñ"
+
+#~ msgid "Next Version?"
+#~ msgstr "Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ Ð²ÐµÑÑÐ¸Ñ?"
+
+#~ msgid ""
+#~ "This splitting mode has not been\n"
+#~ "implemented yet... Sorry."
+#~ msgstr ""
+#~ "Ð ÐµÐ¶Ð¸Ð¼ ÑÐ°Ð·Ð±Ð¸Ð²ÐºÐ¸ ÐµÑÐµ Ð½Ðµ \n"
+#~ "ÑÐµÐ°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½... ÐÐ·Ð²Ð¸Ð½Ð¸ÑÐµ."
+
+#~ msgid ""
+#~ "Case-sensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ° Ñ ÑÑÐµÑÐ¾Ð¼ ÑÐµÐ³Ð¸ÑÑÑÐ° ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ²ÐµÑÐ½Ð¾ Ñ ÑÑÑÑÐºÐ¸Ð¼Ð¸ Ð±ÑÐºÐ²Ð°Ð¼Ð¸"
+
+#~ msgid ""
+#~ "Case-insensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ° Ð±ÐµÐ· ÑÑÐµÑÐ° ÑÐµÐ³Ð¸ÑÑÑÐ° ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ²ÐµÑÐ½Ð¾ Ñ ÑÑÑÑÐºÐ¸Ð¼Ð¸ Ð±ÑÐºÐ²Ð°Ð¼Ð¸"
+
+#~ msgid "BYTES"
+#~ msgstr "ÐÐ°Ð¹Ñ"
+
+#, fuzzy
+#~ msgid "%%%s bytes"
+#~ msgstr "%Lu Ð±Ð°Ð¹Ñ"
+
+#, fuzzy
+#~ msgid "%%%s KB"
+#~ msgstr "%Lu ÐÐ"
+
+#, fuzzy
+#~ msgid "%%%s MB"
+#~ msgstr "%Lu ÐÐ"
+
+#, fuzzy
+#~ msgid "%%%s GB"
+#~ msgstr "%Lu ÐÐ"
+
+#~ msgid "%.2f KB"
+#~ msgstr "%.2f ÐÐ"
+
+#~ msgid "%.2f MB"
+#~ msgstr "%.2f ÐÐ"
+
+#~ msgid "%.2f GB"
+#~ msgstr "%.2f ÐÐ"
+
+#~ msgid "Numerical Mode?"
+#~ msgstr "Ð£ÑÐ¸ÑÑÐ²Ð°ÑÑ Ð´Ð»Ð¸Ð½Ñ?"
+
+#~ msgid "Never"
+#~ msgstr "ÐÐ¸ÐºÐ¾Ð³Ð´Ð°"
+
+#~ msgid "On Every Access"
+#~ msgstr "ÐÑÐ¸ ÐºÐ°Ð¶Ð´Ð¾Ð¼ Ð¾Ð±ÑÐ°ÑÐµÐ½Ð¸Ð¸"
+
+#~ msgid "Mounting"
+#~ msgstr "ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ"
+
+#~ msgid "Mount When?"
+#~ msgstr "ÐÐ¾Ð³Ð´Ð° Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ°ÑÑ?"
+
+#~ msgid "Mount Options"
+#~ msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ð´Ð¸ÑÐºÐ¾Ð²"
+
+#~ msgid "Mount Command"
+#~ msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ"
+
+#~ msgid "Unmount Command"
+#~ msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ"
+
+#~ msgid "Only Mount on Toplevel Directories?"
+#~ msgstr "ÐÐ¾Ð´ÐºÐ»ÑÑÐ°ÑÑ ÑÐ¾Ð»ÑÐºÐ¾ Ð² ÐºÐ¾ÑÐ½ÐµÐ²Ð¾Ð¼ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ðµ?"
+
+#~ msgid "Use Command Error Dialog?"
+#~ msgstr "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³ Ð´Ð»Ñ Ð¾ÑÐ¸Ð±Ð¾Ðº"
+
+#~ msgid "Unmount When gentoo Quits?"
+#~ msgstr "ÐÑÐºÐ»ÑÑÐ°ÑÑ Ð¿ÑÐ¸ Ð²ÑÑÐ¾Ð´Ðµ?"
+
+#~ msgid "FAM: Supported and active."
+#~ msgstr "FAM: ÐÐ¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ Ð¸ Ð²ÐºÐ»ÑÑÐµÐ½Ð¾"
+
+#~ msgid "FAM: Supported, but not active."
+#~ msgstr "FAM: ÐÐ¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ, Ð½Ð¾ Ð½Ðµ Ð²ÐºÐ»ÑÑÐµÐ½Ð¾."
+
+#~ msgid "FAM: Not supported."
+#~ msgstr "FAM: ÐÐµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ."
+
+#~ msgid ""
+#~ "Can't copy directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ \"%s\"\n"
+#~ "Ð² \"%s\"\n"
+#~ "(ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ°Ð¼Ð¾Ð³Ð¾ Ð² ÑÐµÐ±Ñ)."
+
+#~ msgid "Wrap Around At Top And Bottom?"
+#~ msgstr "ÐÐµÑÐµÑÐºÐ°ÐºÐ¸Ð²Ð°ÑÑ Ð² Ð´ÑÑÐ³Ð¾Ð¹ ÐºÐ¾Ð½ÐµÑ ÑÐ¿Ð¸ÑÐºÐ°?"
+
+#~ msgid ""
+#~ "%s (%s bytes,\n"
+#~ "%s blocks)"
+#~ msgstr ""
+#~ "%s (%s Ð±Ð°Ð¹Ñ),\n"
+#~ "%s Ð±Ð»Ð¾ÐºÐ¾Ð²)"
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¿ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ \"%s\"\n"
+#~ "Ð² \"%s\"\n"
+#~ "(Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ - Ð¿Ð¾Ð´Ð¿Ð°Ð¿ÐºÐ° Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ°)."
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the destination contains the source."
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¿ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ \"%s\"\n"
+#~ "Ð² \"%s\"\n"
+#~ "(Ð¸ÑÑÐ¾ÑÐ½Ð¸Ðº - Ð¿Ð¾Ð´Ð¿Ð°Ð¿ÐºÐ° Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ)."
+
+#~ msgid "Regular expression error:\n"
+#~ msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ:\n"
+
+#~ msgid "Use mmap() to Speed Loading?"
+#~ msgstr "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ mmap() Ð´Ð»Ñ ÑÑÐºÐ¾ÑÐµÐ½Ð¸Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸?"
+
+#, fuzzy
+#~ msgid " (%%s/%%s, %%%s/%%%s blocks)"
+#~ msgstr " (%s/%s, %Lu/%Lu Ð±Ð»Ð¾ÐºÐ¾Ð²)"
+
+# src/gentoo.c:445
+#~ msgid ""
+#~ "Do not use FAM to automatically detect changes in viewed directories."
+#~ msgstr ""
+#~ "ÐÐµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ FAM Ð´Ð»Ñ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð² Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÐµÐ¼ÑÐ¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð°Ñ."
+
+#~ msgid "Couldn't initialize mount data - automounting won't work"
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ Ð½Ð°Ð¹ÑÐ¸ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ð¹ Ð´Ð¸ÑÐºÐ¾Ð² - Ð°Ð²ÑÐ¾Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ð½Ðµ Ð±ÑÐ´ÐµÑ "
+#~ "ÑÐ°Ð±Ð¾ÑÐ°ÑÑ."
+
+#~ msgid "FAM open failed, error %d--FAM will not be used"
+#~ msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¾ÑÐºÑÑÑÑ FAM, Ð¾ÑÐ¸Ð±ÐºÐ° %d - FAM Ð½Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, "
+#~ "perhaps)"
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð¼Ð¾Ð½Ð¸ÑÐ¾Ñ FAM \"%s\", Ð¾ÑÐ¸Ð±ÐºÐ° %s (Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ Ñ --no-"
+#~ "fam ?)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go "
+#~ "around, perhaps)"
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð¼Ð¾Ð½Ð¸ÑÐ¾Ñ FAM \"%s\", Ð¾ÑÐ¸Ð±ÐºÐ° %s (Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ Ñ --no-"
+#~ "fam ?)"
+
+#~ msgid "Execution of \"%s %s\" failed:\n"
+#~ msgstr "ÐÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ \"%s %s\" Ð¿ÑÐµÑÐ²Ð°Ð½Ð¾:\n"
+
+#~ msgid "Mounting \"%s\" on \"%s\"..."
+#~ msgstr "ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ \"%s\" Ð² \"%s\"..."
+
+# c-format
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Old: %%%s bytes, changed on %%s,\n"
+#~ "New: %%%s bytes, changed on %%s."
+#~ msgstr ""
+#~ "\n"
+#~ "Ð¡ÑÐ°ÑÐ¾Ðµ: %llu Ð±Ð°Ð¹Ñ, Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½ %s.\n"
+#~ "ÐÐ¾Ð²Ð¾Ðµ: %llu Ð±Ð°Ð¹Ñ, Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½ %s."
+
+#~ msgid "File reading"
+#~ msgstr "Ð§ÑÐµÐ½Ð¸Ðµ ÑÐ°Ð¹Ð»Ð°"
 
 #, fuzzy
 #~ msgid "Pick Command ..."
-#~ msgstr "Âûáðàòü êîä"
+#~ msgstr "ÐÑÐ±ÑÐ°ÑÑ ÐºÐ¾Ð´"
 
 #~ msgid "Clr"
-#~ msgstr "Íåò"
+#~ msgstr "ÐÐµÑ"
 
 #~ msgid "Buffer Size for mmap()"
-#~ msgstr "Ðàçìåð áóôåðà äëÿ mmap()"
+#~ msgstr "Ð Ð°Ð·Ð¼ÐµÑ Ð±ÑÑÐµÑÐ° Ð´Ð»Ñ mmap()"
 
 #~ msgid "Top"
-#~ msgstr "Íà÷àëî"
+#~ msgstr "ÐÐ°ÑÐ°Ð»Ð¾"
 
 #~ msgid "Bottom"
-#~ msgstr "Êîíåö"
+#~ msgstr "ÐÐ¾Ð½ÐµÑ"
 
 #~ msgid "_Goto..."
-#~ msgstr "Ïåðåéòè..."
+#~ msgstr "ÐÐµÑÐµÐ¹ÑÐ¸..."
 
 #~ msgid "_Search..."
-#~ msgstr "Ïîèñê..."
+#~ msgstr "ÐÐ¾Ð¸ÑÐº..."
 
 #~ msgid "_Quit"
-#~ msgstr "Âûõîä"
+#~ msgstr "ÐÑÑÐ¾Ð´"
 
 #, fuzzy
 #~ msgid "SelectShell"
-#~ msgstr "Âûáîð"
+#~ msgstr "ÐÑÐ±Ð¾Ñ"
 
 #~ msgid "Close"
-#~ msgstr "Çàêðûòü"
+#~ msgstr "ÐÐ°ÐºÑÑÑÑ"

gentoo-0.15.6.tar.bz2/po/ru_RU.KOI8-R.gmo -> gentoo-0.19.9.tar.gz/po/ru_RU.KOI8-R.gmo Changed

gentoo-0.15.6.tar.bz2/po/ru_RU.KOI8-R.po -> gentoo-0.19.9.tar.gz/po/ru_RU.KOI8-R.po Changed

@@ -7,33 +7,34 @@
 msgstr ""
 "Project-Id-Version: gentoo 0.11.51\n"
 "Report-Msgid-Bugs-To: Emil Brink\n"
-"POT-Creation-Date: 2009-07-11 19:05+0200\n"
+"POT-Creation-Date: 2011-01-26 21:54+0100\n"
 "PO-Revision-Date: 2008-07-13 20:20+0200\n"
 "Last-Translator: Michael Y. Zaripov <m3@mail.ru>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=KOI8-R\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/cfg_buttonlayout.c:65
 msgid "Left of Command Buttons"
-msgstr "ó ÌÅ×ÏÊ ÓÔÏÒÏÎÙ ÐÁÎÅÌÉ ËÏÍÁÎÄ"
+msgstr "Ð¡ Ð»ÐµÐ²Ð¾Ð¹ ÑÑÐ¾ÑÐ¾Ð½Ñ Ð¿Ð°Ð½ÐµÐ»Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´"
 
 #: src/cfg_buttonlayout.c:65
 msgid "Right of Command Buttons"
-msgstr "ó ÐÒÁ×ÏÊ ÓÔÏÒÏÎÙ ÐÁÎÅÌÉ ËÏÍÁÎÄ"
+msgstr "Ð¡ Ð¿ÑÐ°Ð²Ð¾Ð¹ ÑÑÐ¾ÑÐ¾Ð½Ñ Ð¿Ð°Ð½ÐµÐ»Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´"
 
 #: src/cfg_buttonlayout.c:66
 msgid "No Padding"
-msgstr "âÅÚ ÒÁÚÄÅÌÅÎÉÑ"
+msgstr "ÐÐµÐ· ÑÐ°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ñ"
 
 #: src/cfg_buttonlayout.c:66
 msgid "Paned"
-msgstr "ðÁÎÅÌØ"
+msgstr "ÐÐ°Ð½ÐµÐ»Ñ"
 
 #: src/cfg_buttonlayout.c:66
 msgid "Static"
-msgstr "ðÏÓÔÏÑÎÎÙÊ"
+msgstr "ÐÐ¾ÑÑÐ¾ÑÐ½Ð½ÑÐ¹"
 
 #: src/cfg_buttonlayout.c:75
 msgid ""
@@ -56,1115 +57,1119 @@
 "option menu widget\n"
 "in the top left corner of the page."
 msgstr ""
-"üÔÁ ÓÔÒÁÎÉÃÁ ÐÏÚ×ÏÌÑÅÔ ×ÙÂÒÁÔØ ÒÁÓÐÏÌÏÖÅÎÉÅ ÐÁÎÅÌÉ ÚÁËÌÁÄÏË \n"
-"ÏÔÎÏÓÉÔÅÌØÎÏ ÐÁÎÅÌÉ ËÏÍÁÎÄ. úÁËÌÁÄËÉ ÐÏÚ×ÏÌÑÀÔ ÷ÁÍ ÎÁÚÎÁÞÉÔØ\n"
-"ÎÁ ÞÁÓÔÏ ÉÓÐÏÌØÚÕÅÍÙÅ ËÁÔÁÌÏÇÉ ÓÐÅÃÉÁÌØÎÕÀ ËÎÏÐËÕ É ÐÅÒÅÈÏÄÉÔØ \n"
-"× ÜÔÉ ÐÁÐËÉ ÎÁÖÁÔÉÅÍ ÌÅ×ÏÊ ÉÌÉ ÓÒÅÄÎÅÊ ËÎÏÐËÉ ÍÙÛËÉ \n"
-"÷Ù ÍÏÖÅÔÅ ÒÁÚÍÅÓÔÉÔØ ÐÁÎÅÌØ ÚÁËÌÁÄÏË ÓÌÅ×Á ÉÌÉ ÓÐÒÁ×Á.\n"
-"ôÁËÖÅ ×ÙÂÅÒÉÔÅ ÔÉÐ ÒÁÚÄÅÌÉÔÅÌÑ.\n"
+"ÐÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ° Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐµÑ Ð²ÑÐ±ÑÐ°ÑÑ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº \n"
+"Ð¾ÑÐ½Ð¾ÑÐ¸ÑÐµÐ»ÑÐ½Ð¾ Ð¿Ð°Ð½ÐµÐ»Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´. ÐÐ°ÐºÐ»Ð°Ð´ÐºÐ¸ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑÑ ÐÐ°Ð¼ Ð½Ð°Ð·Ð½Ð°ÑÐ¸ÑÑ\n"
+"Ð½Ð° ÑÐ°ÑÑÐ¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÐ¼ÑÐµ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¸ ÑÐ¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ Ð¸ Ð¿ÐµÑÐµÑÐ¾Ð´Ð¸ÑÑ \n"
+"Ð² ÑÑÐ¸ Ð¿Ð°Ð¿ÐºÐ¸ Ð½Ð°Ð¶Ð°ÑÐ¸ÐµÐ¼ Ð»ÐµÐ²Ð¾Ð¹ Ð¸Ð»Ð¸ ÑÑÐµÐ´Ð½ÐµÐ¹ ÐºÐ½Ð¾Ð¿ÐºÐ¸ Ð¼ÑÑÐºÐ¸ \n"
+"ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ°Ð·Ð¼ÐµÑÑÐ¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº ÑÐ»ÐµÐ²Ð° Ð¸Ð»Ð¸ ÑÐ¿ÑÐ°Ð²Ð°.\n"
+"Ð¢Ð°ÐºÐ¶Ðµ Ð²ÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ¸Ð¿ ÑÐ°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ.\n"
 "\n"
-"îÁÓÔÒÏÉÔØ ÓÁÍÕ ÐÁÎÅÌØ ÍÏÖÎÏ ÐÅÒÅËÌÀÞÉ×ÛÉÓØ × ÒÁÚÄÅÌ \n"
-"ëÎÏÐËÉ - ïÐÒÅÄÅÌÅÎÉÑ É Ó ÐÏÍÏÝØÀ ËÎÏÐËÉ ×ÓÐÌÙ×ÁÀÝÅÇÏ ÍÅÎÀ, \n"
-"ÒÁÓÐÏÌÏÖÅÎÎÏÊ × ×ÅÒÈÎÅÍ ÌÅ×ÏÍ ÕÇÌÕ, ×ÙÂÒÁÔØ úÁËÌÁÄËÉ"
+"ÐÐ°ÑÑÑÐ¾Ð¸ÑÑ ÑÐ°Ð¼Ñ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑÐµÐºÐ»ÑÑÐ¸Ð²ÑÐ¸ÑÑ Ð² ÑÐ°Ð·Ð´ÐµÐ» \n"
+"ÐÐ½Ð¾Ð¿ÐºÐ¸ - ÐÐ¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¸ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÐ¸ Ð²ÑÐ¿Ð»ÑÐ²Ð°ÑÑÐµÐ³Ð¾ Ð¼ÐµÐ½Ñ, \n"
+"ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ð¾Ð¹ Ð² Ð²ÐµÑÑÐ½ÐµÐ¼ Ð»ÐµÐ²Ð¾Ð¼ ÑÐ³Ð»Ñ, Ð²ÑÐ±ÑÐ°ÑÑ ÐÐ°ÐºÐ»Ð°Ð´ÐºÐ¸"
 
 #: src/cfg_buttonlayout.c:88
 msgid "Shortcut Sheet Position"
-msgstr "òÁÓÐÏÌÏÖÅÎÉÅ ÐÁÎÅÌÉ ÚÁËÌÁÄÏË"
+msgstr "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº"
 
 #: src/cfg_buttonlayout.c:102
 msgid "Separation Style"
-msgstr "ôÉÐ ÒÁÚÄÅÌÉÔÅÌÑ"
+msgstr "Ð¢Ð¸Ð¿ ÑÐ°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ"
 
 #: src/cfg_buttonlayout.c:116
 msgid "Layout"
-msgstr "÷ÉÄ"
+msgstr "ÐÐ¸Ð´"
 
 #: src/cfg_buttons.c:308
 msgid "Set Row Width"
-msgstr "õÓÔÁÎÏ×ÉÔØ ÛÉÒÉÎÕ"
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÑÐ¸ÑÐ¸Ð½Ñ"
 
-#: src/cfg_buttons.c:326 src/cfg_buttons.c:749
+#: src/cfg_buttons.c:326 src/cfg_buttons.c:748
 msgid "Default"
-msgstr "ðÏ ÕÍÏÌÞÁÎÉÀ"
+msgstr "ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
 
 #: src/cfg_buttons.c:439 src/overwrite.c:49
 msgid "Please Confirm"
-msgstr "ðÏÄÔ×ÅÒÄÉÔÅ"
+msgstr "ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ"
 
 #: src/cfg_buttons.c:439
 msgid "Really delete current button row?"
-msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÕÄÁÌÉÔØ ÔÅËÕÝÕÀ ÓÔÒÏËÕ ËÎÏÐÏË?"
+msgstr "ÐÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÐµÐºÑÑÑÑ ÑÑÑÐ¾ÐºÑ ÐºÐ½Ð¾Ð¿Ð¾Ðº?"
 
-#: src/cfg_buttons.c:439 src/cfg_styles.c:671
+#: src/cfg_buttons.c:439 src/cfg_styles.c:680
 msgid "_Delete|_Cancel"
-msgstr "_õÄÁÌÉÔØ|_ïÔÍÅÎÁ"
+msgstr "_Ð£Ð´Ð°Ð»Ð¸ÑÑ|_ÐÑÐ¼ÐµÐ½Ð°"
 
 #: src/cfg_buttons.c:463
 msgid "Select Width for New Row"
-msgstr "÷ÙÂÅÒÉÔÅ ÛÉÒÉÎÕ ÎÏ×ÏÊ ÓÔÒÏËÉ"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ¸ÑÐ¸Ð½Ñ Ð½Ð¾Ð²Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸"
 
 #: src/cfg_buttons.c:466
 msgid "Change Width of Row"
-msgstr "éÚÍÅÎÉÔØ ÛÉÒÉÎÕ ÓÔÒÏËÉ"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ¸ÑÐ¸Ð½Ñ ÑÑÑÐ¾ÐºÐ¸"
 
 #: src/cfg_buttons.c:609
 msgid "Edit Background Color"
-msgstr "éÚÍÅÎÉÔØ Ã×ÅÔ ÆÏÎÁ"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ²ÐµÑ ÑÐ¾Ð½Ð°"
 
 #: src/cfg_buttons.c:653
 msgid "Edit Foreground Color"
-msgstr "éÚÍÅÎÉÔØ Ã×ÅÔ"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ²ÐµÑ"
 
 #: src/cfg_buttons.c:678
 msgid "Label"
-msgstr "úÁÇÏÌÏ×ÏË"
+msgstr "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº"
 
-#: src/cfg_buttons.c:685 src/cfg_controls.c:645 src/cfg_controls.c:696
-#: src/cfg_controls.c:718 src/cfg_controls.c:739
+#: src/cfg_buttons.c:686 src/cfg_controls.c:612 src/cfg_controls.c:663
+#: src/cfg_controls.c:685
 msgid "Command"
-msgstr "ëÏÍÁÎÄÁ"
+msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð°"
 
-#: src/cfg_buttons.c:696 src/cfg_controls.c:639
+#: src/cfg_buttons.c:697 src/cfg_controls.c:606
 msgid "Key"
-msgstr "ëÎÏÐËÁ"
+msgstr "ÐÐ½Ð¾Ð¿ÐºÐ°"
 
-#: src/cfg_buttons.c:711 src/cfg_dirpane.c:1373
+#: src/cfg_buttons.c:712
 msgid "Colors"
-msgstr "ã×ÅÔÁ"
+msgstr "Ð¦Ð²ÐµÑÐ°"
 
-#: src/cfg_buttons.c:715
+#: src/cfg_buttons.c:716
 msgid "Background..."
-msgstr "æÏÎ..."
+msgstr "Ð¤Ð¾Ð½..."
 
-#: src/cfg_buttons.c:716 src/cfg_buttons.c:722
+#: src/cfg_buttons.c:717 src/cfg_buttons.c:723
 msgid "Reset to Default"
-msgstr "÷ÅÒÎÕÔØ ÎÁÞÁÌØÎÙÅ"
+msgstr "ÐÐµÑÐ½ÑÑÑ Ð½Ð°ÑÐ°Ð»ÑÐ½ÑÐµ"
 
-#: src/cfg_buttons.c:721
+#: src/cfg_buttons.c:722
 msgid "Foreground..."
-msgstr "ã×ÅÔ"
+msgstr "Ð¦Ð²ÐµÑ"
 
-#: src/cfg_buttons.c:749
+#: src/cfg_buttons.c:748
 msgid "Shortcuts"
-msgstr "úÁËÌÁÄËÉ"
+msgstr "ÐÐ°ÐºÐ»Ð°Ð´ÐºÐ¸"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Clear"
-msgstr "õÂÒÁÔØ"
+msgstr "Ð£Ð±ÑÐ°ÑÑ"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy Colors To"
-msgstr "ëÏÐÉÒÏ×ÁÔØ Ã×ÅÔÁ"
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ ÑÐ²ÐµÑÐ°"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy To"
-msgstr "ëÏÐÉÒÏ×ÁÔØ"
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Swap With"
-msgstr "ïÂÍÅÎÑÔØ"
+msgstr "ÐÐ±Ð¼ÐµÐ½ÑÑÑ"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Add Row..."
-msgstr "äÏÂÁ×ÉÔØ ÓÔÒÏËÕ..."
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÑÑÑÐ¾ÐºÑ..."
 
-#: src/cfg_buttons.c:751 src/cfg_cmdseq.c:951
+#: src/cfg_buttons.c:750 src/cfg_cmdseq.c:966
 msgid "Delete Row"
-msgstr "õÂÒÁÔØ ÓÔÒÏËÕ"
+msgstr "Ð£Ð±ÑÐ°ÑÑ ÑÑÑÐ¾ÐºÑ"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Down"
-msgstr "÷ÎÉÚ"
+msgstr "ÐÐ½Ð¸Ð·"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Row Width..."
-msgstr "ûÉÒÉÎÁ ÓÔÒÏËÉ..."
+msgstr "Ð¨Ð¸ÑÐ¸Ð½Ð° ÑÑÑÐ¾ÐºÐ¸..."
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Up"
-msgstr "÷×ÅÒÈ"
+msgstr "ÐÐ²ÐµÑÑ"
 
-#: src/cfg_buttons.c:762
+#: src/cfg_buttons.c:761
 msgid "Sheet"
-msgstr "ìÉÓÔ"
+msgstr "ÐÐ¸ÑÑ"
 
-#: src/cfg_buttons.c:778
+#: src/cfg_buttons.c:775
 msgid "Primary"
-msgstr "ïÓÎÏ×ÎÁÑ"
+msgstr "ÐÑÐ½Ð¾Ð²Ð½Ð°Ñ"
 
-#: src/cfg_buttons.c:780
+#: src/cfg_buttons.c:777
 msgid "Secondary"
-msgstr "÷ÔÏÒÉÞÎÁÑ"
+msgstr "ÐÑÐ¾ÑÐ¸ÑÐ½Ð°Ñ"
 
-#: src/cfg_buttons.c:785
+#: src/cfg_buttons.c:782
 msgid "Tooltip"
-msgstr "ðÏÄÓËÁÚËÁ"
+msgstr "ÐÐ¾Ð´ÑÐºÐ°Ð·ÐºÐ°"
 
-#: src/cfg_buttons.c:792 src/cfg_dirpane.c:1145
+#: src/cfg_buttons.c:790 src/cfg_dirpane.c:1107
 msgid "Flags"
-msgstr "æÌÁÇÉ"
+msgstr "Ð¤Ð»Ð°Ð³Ð¸"
 
-#: src/cfg_buttons.c:794
+#: src/cfg_buttons.c:792
 msgid "Narrow?"
-msgstr "óÕÚÉÔØ?"
+msgstr "Ð¡ÑÐ·Ð¸ÑÑ?"
 
-#: src/cfg_buttons.c:798
+#: src/cfg_buttons.c:796
 msgid "Show Tooltip?"
-msgstr "ðÏËÁÚÙ×ÁÔØ ÐÏÄÓËÁÚËÉ"
+msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð¿Ð¾Ð´ÑÐºÐ°Ð·ÐºÐ¸"
 
-#: src/cfg_buttons.c:833
+#: src/cfg_buttons.c:831
 msgid "Buttons"
-msgstr "ëÎÏÐËÉ"
+msgstr "ÐÐ½Ð¾Ð¿ÐºÐ¸"
 
-#: src/cfg_buttons.c:834 src/cfg_cmdseq.c:1067
+#: src/cfg_buttons.c:832 src/cfg_cmdseq.c:1081
 msgid "Definitions"
-msgstr "ïÐÒÅÄÅÌÅÎÉÑ"
+msgstr "ÐÐ¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ"
 
 #: src/cfg_cmdcfg.c:66
 msgid "Options"
-msgstr "äÅÔÁÌÉ"
+msgstr "ÐÐµÑÐ°Ð»Ð¸"
 
-#: src/cfg_cmdseq.c:610
+#: src/cfg_cmdseq.c:611
 msgid "Select Builtin"
-msgstr "÷ÙÂÒÁÔØ ×ÓÔÒÏÅÎÙÅ"
+msgstr "ÐÑÐ±ÑÐ°ÑÑ Ð²ÑÑÑÐ¾ÐµÐ½ÑÐµ"
 
-#: src/cfg_cmdseq.c:626
+#: src/cfg_cmdseq.c:627
 msgid "Opening brace"
-msgstr "ïÔËÒÙÔØ ÓËÏÂÕ"
+msgstr "ÐÑÐºÑÑÑÑ ÑÐºÐ¾Ð±Ñ"
 
-#: src/cfg_cmdseq.c:627
+#: src/cfg_cmdseq.c:628
 msgid "Closing brace"
-msgstr "úÁËÒÙÔØ ÓËÏÂÕ"
+msgstr "ÐÐ°ÐºÑÑÑÑ ÑÐºÐ¾Ð±Ñ"
 
-#: src/cfg_cmdseq.c:628
+#: src/cfg_cmdseq.c:629
 msgid "First selected"
-msgstr "ðÅÒ×ÙÊ ×ÙÂÒÁÎÎÙÊ"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹"
 
-#: src/cfg_cmdseq.c:629
+#: src/cfg_cmdseq.c:630
 msgid "First selected, unselect"
-msgstr "ðÅÒ×ÙÊ ×ÙÂÒÁÎÎÙÊ, ÒÁÚÏÔÍÅÔÉÔØ"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
 
-#: src/cfg_cmdseq.c:630
+#: src/cfg_cmdseq.c:631
 msgid "First selected, with path"
-msgstr "ðÅÒ×ÙÊ ×ÙÂÒÁÎÎÙÊ, Ó ÐÕÔÅÍ"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, Ñ Ð¿ÑÑÐµÐ¼"
 
-#: src/cfg_cmdseq.c:631
+#: src/cfg_cmdseq.c:632
 msgid "First selected, with path, unselect"
-msgstr "ðÅÒ×ÙÊ ×ÙÂÒÁÎÎÙÊ, Ó ÐÕÔÅÍ, ÒÁÚÏÔÍÅÔÉÔØ"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, Ñ Ð¿ÑÑÐµÐ¼, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
 
-#: src/cfg_cmdseq.c:632
+#: src/cfg_cmdseq.c:633
 msgid "First selected (destination pane)"
-msgstr "ðÅÒ×ÙÊ ×ÙÂÒÁÎÎÙÊ (ÐÁÎÅÌØ ÎÁÚÎÁÞÅÎÉÑ)"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹ (Ð¿Ð°Ð½ÐµÐ»Ñ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ)"
 
-#: src/cfg_cmdseq.c:633
+#: src/cfg_cmdseq.c:634
 msgid "First selected, no quotes"
-msgstr "ðÅÒ×ÙÊ ×ÙÂÒÁÎÎÙÊ, ÂÅÚ ËÁ×ÙÞÅË"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, Ð±ÐµÐ· ÐºÐ°Ð²ÑÑÐµÐº"
 
-#: src/cfg_cmdseq.c:634
+#: src/cfg_cmdseq.c:635
 msgid "All selected"
-msgstr "÷ÓÅ ×ÙÂÒÁÎÎÙÅ"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ"
 
-#: src/cfg_cmdseq.c:635
+#: src/cfg_cmdseq.c:636
 msgid "All selected, unselect"
-msgstr "÷ÓÅ ×ÙÂÒÁÎÎÙÅ, ÒÁÚÏÔÍÅÔÉÔØ"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
 
-#: src/cfg_cmdseq.c:636
+#: src/cfg_cmdseq.c:637
 msgid "All selected, with paths"
-msgstr "÷ÓÅ ×ÙÂÒÁÎÎÙÅ, Ó ÐÕÔÑÍÉ"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, Ñ Ð¿ÑÑÑÐ¼Ð¸"
 
-#: src/cfg_cmdseq.c:637
+#: src/cfg_cmdseq.c:638
 msgid "All selected, with paths, unselect"
-msgstr "÷ÓÅ ×ÙÂÒÁÎÎÙÅ, Ó ÐÕÔÑÍÉ, ÒÁÚÏÔÍÅÔÉÔØ"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, Ñ Ð¿ÑÑÑÐ¼Ð¸, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
 
-#: src/cfg_cmdseq.c:638
+#: src/cfg_cmdseq.c:639
 msgid "All selected (destination pane)"
-msgstr "÷ÓÅ ×ÙÂÒÁÎÎÙÅ(ÐÁÎÅÌØ ÎÁÚÎÁÞÅÎÉÑ)"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ(Ð¿Ð°Ð½ÐµÐ»Ñ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ)"
 
-#: src/cfg_cmdseq.c:639
+#: src/cfg_cmdseq.c:640
 msgid "All selected, no quotes"
-msgstr "÷ÓÅ ×ÙÂÒÁÎÎÙÅ, ÂÅÚ ËÁ×ÙÞÅË"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, Ð±ÐµÐ· ÐºÐ°Ð²ÑÑÐµÐº"
 
-#: src/cfg_cmdseq.c:640
+#: src/cfg_cmdseq.c:641
 msgid "Path to source pane's directory"
-msgstr "ðÕÔØ ÎÁ ÐÁÎÅÌÉ ÉÓÔÏÞÎÉËÁ"
+msgstr "ÐÑÑÑ Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ°"
 
-#: src/cfg_cmdseq.c:641
+#: src/cfg_cmdseq.c:642
 msgid "Path to destination pane's directory"
-msgstr "ðÕÔØ ÎÁ ÐÁÎÅÌÉ ÎÁÚÎÁÞÅÎÉÑ"
+msgstr "ÐÑÑÑ Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ"
 
-#: src/cfg_cmdseq.c:642
+#: src/cfg_cmdseq.c:643
 msgid "Path to home directory"
-msgstr "äÏÍÁÛÎÉÊ ËÁÔÁÌÏÇ"
+msgstr "ÐÐ¾Ð¼Ð°ÑÐ½Ð¸Ð¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³"
 
-#: src/cfg_cmdseq.c:643
+#: src/cfg_cmdseq.c:644
 msgid "Path of left pane"
-msgstr "ðÕÔØ ÎÁ ÌÅ×ÏÊ ÐÁÎÅÌÉ"
+msgstr "ÐÑÑÑ Ð½Ð° Ð»ÐµÐ²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_cmdseq.c:644
+#: src/cfg_cmdseq.c:645
 msgid "Path of right pane"
-msgstr "ðÕÔØ ÎÁ ÐÒÁ×ÏÊ ÐÁÎÅÌÉ"
+msgstr "ÐÑÑÑ Ð½Ð° Ð¿ÑÐ°Ð²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_cmdseq.c:645
+#: src/cfg_cmdseq.c:646
+#, fuzzy
+msgid "URI of first selected"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹"
+
+#: src/cfg_cmdseq.c:647
+#, fuzzy
+msgid "URI of first selected, unselect"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
+
+#: src/cfg_cmdseq.c:648
+#, fuzzy
+msgid "URI of first selected, no quotes"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, Ð±ÐµÐ· ÐºÐ°Ð²ÑÑÐµÐº"
+
+#: src/cfg_cmdseq.c:649
+#, fuzzy
+msgid "URIs of all selected"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ"
+
+#: src/cfg_cmdseq.c:650
+#, fuzzy
+msgid "URIs of all selected, unselect"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
+
+#: src/cfg_cmdseq.c:651
+#, fuzzy
+msgid "URIs of all selected, no quotes"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, Ð±ÐµÐ· ÐºÐ°Ð²ÑÑÐµÐº"
+
+#: src/cfg_cmdseq.c:652
+#, fuzzy
+msgid "URIs of all selected, unselect, no quotes"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, Ð±ÐµÐ· ÐºÐ°Ð²ÑÑÐµÐº"
+
+#: src/cfg_cmdseq.c:653
+#, fuzzy
+msgid "URI of first selected (destination pane)"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹ (Ð¿Ð°Ð½ÐµÐ»Ñ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ)"
+
+#: src/cfg_cmdseq.c:654
 msgid "Input combo box"
-msgstr "ëÎÏÐËÁ ×ÙÂÏÒÁ"
+msgstr "ÐÐ½Ð¾Ð¿ÐºÐ° Ð²ÑÐ±Ð¾ÑÐ°"
 
-#: src/cfg_cmdseq.c:646
+#: src/cfg_cmdseq.c:655
 msgid "Input using menu"
-msgstr "íÅÎÀ ×ÙÂÏÒÁ"
+msgstr "ÐÐµÐ½Ñ Ð²ÑÐ±Ð¾ÑÐ°"
 
-#: src/cfg_cmdseq.c:647
+#: src/cfg_cmdseq.c:656
 msgid "Input string"
-msgstr "÷×ÏÄ ÓÔÒÏËÁ"
+msgstr "ÐÐ²Ð¾Ð´ ÑÑÑÐ¾ÐºÐ°"
 
-#: src/cfg_cmdseq.c:648
+#: src/cfg_cmdseq.c:657
 msgid "Input check button (gives TRUE or FALSE)"
-msgstr "ëÎÏÐËÉ - ÆÌÁÖËÉ (äá/îåô)"
+msgstr "ÐÐ½Ð¾Ð¿ÐºÐ¸ - ÑÐ»Ð°Ð¶ÐºÐ¸ (ÐÐ/ÐÐÐ¢)"
 
-#: src/cfg_cmdseq.c:649
+#: src/cfg_cmdseq.c:658
 msgid "Add label to input window"
-msgstr "úÁÇÏÌÏ×ÏË ÏËÎÁ ÄÉÁÌÏÇÁ"
+msgstr "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð¾ÐºÐ½Ð° Ð´Ð¸Ð°Ð»Ð¾Ð³Ð°"
 
-#: src/cfg_cmdseq.c:650
+#: src/cfg_cmdseq.c:659
 msgid "Add a separator bar to input window"
-msgstr "ìÉÎÉÑ-ÒÁÚÄÅÌÉÔÅÌØ × ÏËÎÅ ××ÏÄÁ"
+msgstr "ÐÐ¸Ð½Ð¸Ñ-ÑÐ°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ Ð² Ð¾ÐºÐ½Ðµ Ð²Ð²Ð¾Ð´Ð°"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "$NAME"
 msgstr "$NAME"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "Value of $NAME (environment)"
-msgstr "úÎÁÞÅÎÉÅ $NAME (ÉÚ ÏËÒÕÖÅÎÉÑ)"
+msgstr "ÐÐ½Ð°ÑÐµÐ½Ð¸Ðµ $NAME (Ð¸Ð· Ð¾ÐºÑÑÐ¶ÐµÐ½Ð¸Ñ)"
 
-#: src/cfg_cmdseq.c:652
+#: src/cfg_cmdseq.c:661
 msgid "gentoo's PID"
 msgstr "PID gentoo"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "Home directory for user NAME"
-msgstr "äÏÍÁÛÎÉÊ ËÁÔÁÌÏÇ ÐÏÌØÚÏ×ÁÔÅÌÑ NAME"
+msgstr "ÐÐ¾Ð¼Ð°ÑÐ½Ð¸Ð¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ NAME"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "~NAME"
 msgstr "~NAME"
 
-#: src/cfg_cmdseq.c:677
+#: src/cfg_cmdseq.c:686 src/cmd_split.c:536
 msgid "Pick Code"
-msgstr "÷ÙÂÒÁÔØ ËÏÄ"
+msgstr "ÐÑÐ±ÑÐ°ÑÑ ÐºÐ¾Ð´"
 
-#: src/cfg_cmdseq.c:765
+#: src/cfg_cmdseq.c:778
 msgid "(No Options Available)"
-msgstr "(îÅÔ ÎÁÓÔÒÏÅË)"
+msgstr "(ÐÐµÑ Ð½Ð°ÑÑÑÐ¾ÐµÐº)"
 
-#: src/cfg_cmdseq.c:801
+#: src/cfg_cmdseq.c:814
 msgid "Run in Background?"
-msgstr "úÁÐÕÓÔÉÔØ ÆÏÎÏÍ?"
+msgstr "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÑÐ¾Ð½Ð¾Ð¼?"
 
-#: src/cfg_cmdseq.c:805
+#: src/cfg_cmdseq.c:818
 msgid "Kill Previous Instance?"
-msgstr "óÎÑÔØ ÐÒÅÄÙÄÕÝÕÀ ÚÁÄÁÞÕ?"
+msgstr "Ð¡Ð½ÑÑÑ Ð¿ÑÐµÐ´ÑÐ´ÑÑÑÑ Ð·Ð°Ð´Ð°ÑÑ?"
 
-#: src/cfg_cmdseq.c:809
+#: src/cfg_cmdseq.c:822
 msgid "Survive Quit?"
-msgstr "îÅ ÓÎÉÍÁÔØ ÐÒÉ ×ÙÈÏÄÅ?"
+msgstr "ÐÐµ ÑÐ½Ð¸Ð¼Ð°ÑÑ Ð¿ÑÐ¸ Ð²ÑÑÐ¾Ð´Ðµ?"
 
-#: src/cfg_cmdseq.c:815
+#: src/cfg_cmdseq.c:828
 msgid "Capture Output?"
-msgstr "ðÏËÁÚÙ×ÁÔØ ×Ù×ÏÄ?"
+msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð²ÑÐ²Ð¾Ð´?"
 
-#: src/cfg_cmdseq.c:900
+#: src/cfg_cmdseq.c:913
 msgid "Before Execution"
-msgstr "ðÅÒÅÄ ÚÁÐÕÓËÏÍ"
+msgstr "ÐÐµÑÐµÐ´ Ð·Ð°Ð¿ÑÑÐºÐ¾Ð¼"
 
-#: src/cfg_cmdseq.c:903
+#: src/cfg_cmdseq.c:916
 msgid "Require Source Selection?"
-msgstr "ïÂÑÚÁÔÅÌÅÎ ×ÙÂÏÒ ÉÓÔÏÞÎÉËÁ?"
+msgstr "ÐÐ±ÑÐ·Ð°ÑÐµÐ»ÐµÐ½ Ð²ÑÐ±Ð¾Ñ Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ°?"
 
-#: src/cfg_cmdseq.c:907
+#: src/cfg_cmdseq.c:920
 msgid "Require Destination Selection?"
-msgstr "ïÂÑÚÁÔÅÌÅÎ ×ÙÂÏÒ ÎÁÚÎÁÞÅÎÉÑ?"
+msgstr "ÐÐ±ÑÐ·Ð°ÑÐµÐ»ÐµÐ½ Ð²ÑÐ±Ð¾Ñ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ?"
 
-#: src/cfg_cmdseq.c:912
+#: src/cfg_cmdseq.c:926
 msgid "CD Source?"
-msgstr "ðÅÒÅÊÔÉ × ËÁÔÁÌÏÇ ÉÓÔÏÞÎÉËÁ?"
+msgstr "ÐÐµÑÐµÐ¹ÑÐ¸ Ð² ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ°?"
 
-#: src/cfg_cmdseq.c:915
+#: src/cfg_cmdseq.c:929
 msgid "CD Destination?"
-msgstr "ðÅÒÅÊÔÉ × ËÁÔÁÌÏÇ ÎÁÚÎÁÞÅÎÉÑ?"
+msgstr "ÐÐµÑÐµÐ¹ÑÐ¸ Ð² ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ?"
 
-#: src/cfg_cmdseq.c:922
+#: src/cfg_cmdseq.c:937
 msgid "After Execution"
-msgstr "ðÏÓÌÅ ÚÁÐÕÓËÁ"
+msgstr "ÐÐ¾ÑÐ»Ðµ Ð·Ð°Ð¿ÑÑÐºÐ°"
 
-#: src/cfg_cmdseq.c:924
+#: src/cfg_cmdseq.c:939
 msgid "Rescan Source?"
-msgstr "ðÅÒÅÞÉÔÁÔØ ËÁÔÁÌÏÇ ÉÓÔÏÞÎÉËÁ?"
+msgstr "ÐÐµÑÐµÑÐ¸ÑÐ°ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ°?"
 
-#: src/cfg_cmdseq.c:928
+#: src/cfg_cmdseq.c:943
 msgid "Rescan Destination?"
-msgstr "ðÅÒÅÞÉÔÁÔØ ËÁÔÁÌÏÇ ÎÁÚÎÁÞÅÎÉÑ?"
+msgstr "ÐÐµÑÐµÑÐ¸ÑÐ°ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ?"
 
-#: src/cfg_cmdseq.c:942
+#: src/cfg_cmdseq.c:957
 msgid "General"
-msgstr "ïÓÎÏ×ÎÙÅ"
+msgstr "ÐÑÐ½Ð¾Ð²Ð½ÑÐµ"
 
-#: src/cfg_cmdseq.c:945
+#: src/cfg_cmdseq.c:960
 msgid "Before&After"
-msgstr "äÏ É ÐÏÓÌÅ"
+msgstr "ÐÐ¾ Ð¸ Ð¿Ð¾ÑÐ»Ðµ"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "Built-In"
-msgstr "÷ÓÔÒÏÅÎÙÅ"
+msgstr "ÐÑÑÑÐ¾ÐµÐ½ÑÐµ"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "External"
-msgstr "÷ÎÅÛÎÉÅ"
+msgstr "ÐÐ½ÐµÑÐ½Ð¸Ðµ"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Add Row"
-msgstr "äÏÂÁ×ÉÔØ ÓÔÒÏËÕ"
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÑÑÑÐ¾ÐºÑ"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Duplicate"
-msgstr "óÏÚÄÁÔØ ËÏÐÉÀ"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°ÑÑ ÐºÐ¾Ð¿Ð¸Ñ"
 
-#: src/cfg_cmdseq.c:978 src/cfg_styles.c:588 src/cfg_styles.c:805
-#: src/cfg_types.c:679 src/cmd_symlink.c:209 src/dpformat.c:35
+#: src/cfg_cmdseq.c:993 src/cfg_styles.c:596 src/cfg_styles.c:823
+#: src/cfg_types.c:678 src/cmd_info.c:151 src/cmd_split.c:648
+#: src/cmd_symlink.c:213 src/dpformat.c:36
 msgid "Name"
-msgstr "éÍÑ"
+msgstr "ÐÐ¼Ñ"
 
-#: src/cfg_cmdseq.c:988
+#: src/cfg_cmdseq.c:1004
 msgid "Definition"
-msgstr "ïÐÉÓÁÎÉÅ"
+msgstr "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
-#: src/cfg_cmdseq.c:1044
+#: src/cfg_cmdseq.c:1058
 msgid "Repeat Sequence Until No Source Selection?"
-msgstr "ðÏ×ÔÏÒÑÔØ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÐÏËÁ ÅÓÔØ ×ÙÂÒÁÎÙÅ?"
+msgstr "ÐÐ¾Ð²ÑÐ¾ÑÑÑÑ Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»ÑÐ½Ð¾ÑÑÑ Ð¿Ð¾ÐºÐ° ÐµÑÑÑ Ð²ÑÐ±ÑÐ°Ð½ÑÐµ?"
 
-#: src/cfg_cmdseq.c:1056 src/cfg_controls.c:655 src/cfg_controls.c:706
-#: src/cfg_styles.c:833 src/cfg_types.c:775
+#: src/cfg_cmdseq.c:1070 src/cfg_controls.c:622 src/cfg_controls.c:673
+#: src/cfg_styles.c:853 src/cfg_types.c:776
 msgid "Add"
-msgstr "äÏÂÁ×ÉÔØ"
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ"
 
-#: src/cfg_cmdseq.c:1059 src/cfg_controls.c:658 src/cfg_controls.c:709
-#: src/cfg_styles.c:836 src/cfg_types.c:788
+#: src/cfg_cmdseq.c:1073 src/cfg_controls.c:625 src/cfg_controls.c:676
+#: src/cfg_styles.c:856 src/cfg_types.c:789
 msgid "Delete"
-msgstr "õÂÒÁÔØ"
+msgstr "Ð£Ð±ÑÐ°ÑÑ"
 
-#: src/cfg_cmdseq.c:1066
+#: src/cfg_cmdseq.c:1080
 msgid "Commands"
-msgstr "ëÏÍÁÎÄÙ"
+msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ñ"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1365 src/cfg_dirpane.c:1371
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1288 src/cfg_dirpane.c:1293
 msgid "Left"
-msgstr "ìÅ×ÁÑ"
+msgstr "ÐÐµÐ²Ð°Ñ"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Middle"
-msgstr "óÒÅÄÎÑÑ"
+msgstr "Ð¡ÑÐµÐ´Ð½ÑÑ"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1364 src/cfg_dirpane.c:1372
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1287 src/cfg_dirpane.c:1294
 msgid "Right"
-msgstr "ðÒÁ×ÁÑ"
+msgstr "ÐÑÐ°Ð²Ð°Ñ"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Down"
-msgstr "ëÏÌÅÓÏÍ ×ÎÉÚ"
+msgstr "ÐÐ¾Ð»ÐµÑÐ¾Ð¼ Ð²Ð½Ð¸Ð·"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Up"
-msgstr "ëÏÌÅÓÏÍ ××ÅÒÈ"
+msgstr "ÐÐ¾Ð»ÐµÑÐ¾Ð¼ Ð²Ð²ÐµÑÑ"
 
-#: src/cfg_controls.c:382
+#: src/cfg_controls.c:378
 msgid ""
 "The following modifier key(s) must\n"
 "be held down when the mouse button\n"
 "is clicked to trigger the command"
 msgstr ""
-"óÌÅÄÕÀÝÉÅ ËÎÏÐËÉ ÍÏÄÉÆÉËÁÔÏÒÙ ÄÏÌÖÎÙ\n"
-"ÂÙÔØ ÎÁÖÁÔÙ ×Ï ×ÒÅÍÑ ÝÅÌÞËÁ ÍÙÛËÉ"
+"Ð¡Ð»ÐµÐ´ÑÑÑÐ¸Ðµ ÐºÐ½Ð¾Ð¿ÐºÐ¸ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÑ Ð´Ð¾Ð»Ð¶Ð½Ñ\n"
+"Ð±ÑÑÑ Ð½Ð°Ð¶Ð°ÑÑ Ð²Ð¾ Ð²ÑÐµÐ¼Ñ ÑÐµÐ»ÑÐºÐ° Ð¼ÑÑÐºÐ¸"
 
-#: src/cfg_controls.c:395
+#: src/cfg_controls.c:391
 msgid "Edit Modifiers"
-msgstr "éÚÍÅÎÉÔØ ÍÏÄÉÆÉËÁÔÏÒÙ"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÑ"
 
-#: src/cfg_controls.c:613
+#: src/cfg_controls.c:580
 msgid "Controls"
-msgstr "õÐÒÁ×ÌÅÎÉÅ"
+msgstr "Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_controls.c:620
+#: src/cfg_controls.c:587
 msgid "Global Keyboard Shortcuts"
-msgstr "ïÓÎÏ×ÎÙÅ ËÏÍÂÉÎÁÃÉÉ ËÎÏÐÏË"
+msgstr "ÐÑÐ½Ð¾Ð²Ð½ÑÐµ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°ÑÐ¸Ð¸ ÐºÐ½Ð¾Ð¿Ð¾Ðº"
 
-#: src/cfg_controls.c:665
+#: src/cfg_controls.c:632
 msgid "Dirpane Mouse Buttons"
-msgstr "ëÌÁ×ÉÛÉ ÍÙÛËÉ"
+msgstr "ÐÐ»Ð°Ð²Ð¸ÑÐ¸ Ð¼ÑÑÐºÐ¸"
 
-#: src/cfg_controls.c:690
+#: src/cfg_controls.c:657
 msgid "Button"
-msgstr "ëÎÏÐËÁ"
+msgstr "ÐÐ½Ð¾Ð¿ÐºÐ°"
 
-#: src/cfg_controls.c:693
+#: src/cfg_controls.c:660
 msgid "Edit Modifiers..."
-msgstr "éÚÍÅÎÉÔØ ÍÏÄÉÆÉËÁÔÏÒÙ..."
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÑ..."
 
-#: src/cfg_controls.c:716
+#: src/cfg_controls.c:683
 msgid "Click-M-Click Gesture"
-msgstr "ýÅÌË-í-ýÅÌË ×ÏÚÍÏÖÎÏÓÔØ"
+msgstr "Ð©ÐµÐ»Ðº-Ð-Ð©ÐµÐ»Ðº Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ"
 
-#: src/cfg_controls.c:726
+#: src/cfg_controls.c:693
 msgid "Time Limit"
-msgstr "úÁÄÅÒÖËÁ"
+msgstr "ÐÐ°Ð´ÐµÑÐ¶ÐºÐ°"
 
-#: src/cfg_controls.c:737
-msgid "Path Right Click"
-msgstr "ðÒÁ×ÙÊ ÝÅÌÞÏË ÎÁ ÐÕÔÉ"
-
-#: src/cfg_controls.c:750
+#: src/cfg_controls.c:704
 msgid "Ignore Num Lock For All Bindings?"
-msgstr "îÅ ÕÞÉÔÙ×ÁÔØ Num Lock ÄÌÑ ×ÓÅÈ ËÏÍÂÉÎÁÃÉÊ?"
+msgstr "ÐÐµ ÑÑÐ¸ÑÑÐ²Ð°ÑÑ Num Lock Ð´Ð»Ñ Ð²ÑÐµÑ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°ÑÐ¸Ð¹?"
 
-#: src/cfg_controls.c:780
+#: src/cfg_controls.c:734
 msgid ""
 "Note: The mouse button control settings\n"
 "are ambiguous: the same button+modifier\n"
 "is used for more than one function. This\n"
 "might make their behaviour pretty weird..."
 msgstr ""
-"÷ÁÖÎÏ: úÎÁÞÅÎÉÑ ËÌÁ×ÉÛ ÍÙÛËÉ ÎÅÏÄÎÏÚÎÁÞÎÙ:\n"
-"ÏÄÎÁ ËÏÍÂÉÎÁÃÉÑ ËÎÏÐËÉ É ÍÏÄÉÆÉËÁÔÏÒÁ\n"
-"ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÂÏÌÅÅ ÞÅÍ ÏÄÎÏÊ ÃÅÌÉ. üÔÏ\n"
-"ÍÏÖÅÔ ÐÒÉ×ÅÓÔÉ Ë ÉÈ ÎÅÏÖÉÄÁÎÎÏÍÕ ÐÏ×ÅÄÅÎÉÀ..."
+"ÐÐ°Ð¶Ð½Ð¾: ÐÐ½Ð°ÑÐµÐ½Ð¸Ñ ÐºÐ»Ð°Ð²Ð¸Ñ Ð¼ÑÑÐºÐ¸ Ð½ÐµÐ¾Ð´Ð½Ð¾Ð·Ð½Ð°ÑÐ½Ñ:\n"
+"Ð¾Ð´Ð½Ð° ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°ÑÐ¸Ñ ÐºÐ½Ð¾Ð¿ÐºÐ¸ Ð¸ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÐ°\n"
+"Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð´Ð»Ñ Ð±Ð¾Ð»ÐµÐµ ÑÐµÐ¼ Ð¾Ð´Ð½Ð¾Ð¹ ÑÐµÐ»Ð¸. ÐÑÐ¾\n"
+"Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑÐ¸Ð²ÐµÑÑÐ¸ Ðº Ð¸Ñ Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð¾Ð¼Ñ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ñ..."
 
-#: src/cfg_controls.c:784
+#: src/cfg_controls.c:738
 msgid "Warning"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ"
+msgstr "ÐÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_controls.c:784 src/children.c:95 src/cmd_info.c:246
+#: src/cfg_controls.c:738 src/children.c:89 src/cmd_info.c:320
 msgid "_OK"
-msgstr "_äÁ"
-
-#: src/cfg_dirpane.c:365
-msgid "Formatted Size, in bytes"
-msgstr "òÁÚÍÅÒ, × ÂÁÊÔÁÈ"
-
-#: src/cfg_dirpane.c:365
-msgid "Raw Size, in Bytes"
-msgstr "óÙÒÏÊ ÒÁÚÍÅÒ, × ÂÁÊÔÁÈ"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in kilobytes"
-msgstr "òÁÚÍÅÒ, × ËÉÌÏÂÁÊÔÁÈ"
+msgstr "_ÐÐ°"
 
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in megabytes"
-msgstr "òÁÚÍÅÒ, × ÍÅÇÁÂÁÊÔÁÈ"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, \"Smart\" Unit"
-msgstr "òÁÚÍÅÒ,× \"ÕÍÎÙÈ\" ÅÄÉÎÉÃÁÈ"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, in gigabytes"
-msgstr "òÁÚÍÅÒ, × ÇÉÇÁÂÁÊÔÁÈ"
-
-#: src/cfg_dirpane.c:383
+#: src/cfg_dirpane.c:333
 msgid "Append Type Character?"
-msgstr "äÏÂÁ×ÉÔØ ÔÉÐ ÓÉÍ×ÏÌÁ?"
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÑÐ¸Ð¿ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°?"
 
-#: src/cfg_dirpane.c:386
-msgid "Append \"-> destination\" on Links?"
-msgstr "äÏÂÁ×ÉÔØ \"->ÎÁÚÎÁÞÅÎÉÅ\" × ÓÓÙÌËÉ?"
+#: src/cfg_dirpane.c:336
+#, fuzzy
+msgid "Append \"â destination\" on Links?"
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ \"->Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ\" Ð² ÑÑÑÐ»ÐºÐ¸?"
 
-#: src/cfg_dirpane.c:406
+#: src/cfg_dirpane.c:358
 msgid "Place Tick Every 3 Digits?"
-msgstr "òÁÚÄÅÌÉÔØ ÒÁÚÒÑÄÙ?"
+msgstr "Ð Ð°Ð·Ð´ÐµÐ»Ð¸ÑÑ ÑÐ°Ð·ÑÑÐ´Ñ?"
 
-#: src/cfg_dirpane.c:416
+#: src/cfg_dirpane.c:369
 msgid "Digits of Precision"
-msgstr "ôÏÞÎÏÓÔØ"
+msgstr "Ð¢Ð¾ÑÐ½Ð¾ÑÑÑ"
 
-#: src/cfg_dirpane.c:429
+#: src/cfg_dirpane.c:382
 msgid "Show Dir's File System Size?"
-msgstr "ðÏËÁÚÁÔØ ÒÁÚÍÅÒ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ?"
+msgstr "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ ÑÐ°Ð·Ð¼ÐµÑ ÑÐ°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑÐµÐ¼Ñ?"
 
-#: src/cfg_dirpane.c:435 src/cfg_dirpane.c:439 src/cfg_dirpane.c:443
-#: src/cfg_dirpane.c:447 src/cfg_dirpane.c:451 src/cfg_dirpane.c:455
-#: src/cfg_dirpane.c:459 src/cfg_dirpane.c:463 src/cfg_dirpane.c:467
-#: src/cfg_dirpane.c:474
+#: src/cfg_dirpane.c:388 src/cfg_dirpane.c:392 src/cfg_dirpane.c:396
+#: src/cfg_dirpane.c:400 src/cfg_dirpane.c:404 src/cfg_dirpane.c:408
+#: src/cfg_dirpane.c:412 src/cfg_dirpane.c:416 src/cfg_dirpane.c:420
+#: src/cfg_dirpane.c:428
 msgid "Format"
-msgstr "æÏÒÍÁÔ"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°Ñ"
 
-#: src/cfg_dirpane.c:497
+#: src/cfg_dirpane.c:454
 #, c-format
 msgid "%s Settings"
-msgstr "%s ÎÁÓÔÒÏÊËÉ"
+msgstr "%s Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1002 src/cfg_dirpane.c:1003
-#: src/cmd_select.c:414
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:970 src/cfg_dirpane.c:971
+#: src/cmd_select.c:381
 msgid "Content"
-msgstr "óÏÄÅÒÖÁÎÉÅ"
+msgstr "Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ"
 
-#: src/cfg_dirpane.c:611
+#: src/cfg_dirpane.c:571
 msgid "Justification"
-msgstr "÷ÙÒÁ×ÎÉ×ÁÎÉÅ"
+msgstr "ÐÑÑÐ°Ð²Ð½Ð¸Ð²Ð°Ð½Ð¸Ðµ"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1003
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:971
 msgid "Title"
-msgstr "úÁÇÏÌÏ×ÏË"
+msgstr "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº"
 
-#: src/cfg_dirpane.c:611 src/window.c:201
+#: src/cfg_dirpane.c:571 src/window.c:200
 msgid "Width"
-msgstr "ûÉÒÉÎÁ"
+msgstr "Ð¨Ð¸ÑÐ¸Ð½Ð°"
 
-#: src/cfg_dirpane.c:612
+#: src/cfg_dirpane.c:572
 msgid "Center"
-msgstr "ðÏ ÃÅÎÔÒÕ"
+msgstr "ÐÐ¾ ÑÐµÐ½ÑÑÑ"
 
-#: src/cfg_dirpane.c:621
+#: src/cfg_dirpane.c:581
 msgid "Basic Settings"
-msgstr "ïÓÎÏ×ÎÙÅ ÎÁÓÔÒÏÊËÉ"
+msgstr "ÐÑÐ½Ð¾Ð²Ð½ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸"
 
-#: src/cfg_dirpane.c:669
+#: src/cfg_dirpane.c:628
 msgid "Edit Column Content"
-msgstr "éÚÍÅÎÉÔØ ÓÏÄÅÒÖÉÍÏÅ ËÏÌÏÎÏË"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ ÐºÐ¾Ð»Ð¾Ð½Ð¾Ðº"
 
-#: src/cfg_dirpane.c:1002
+#: src/cfg_dirpane.c:970
 msgid "Default Title"
-msgstr "úÁÇÏÌÏ×ÏË ÐÏ ÕÍÏÌÞÁÎÉÀ"
+msgstr "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories First"
-msgstr "ëÁÔÁÌÏÇÉ ××ÅÒÈÕ"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³Ð¸ Ð²Ð²ÐµÑÑÑ"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Last"
-msgstr "ëÁÔÁÌÏÇÉ ×ÎÉÚÕ"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³Ð¸ Ð²Ð½Ð¸Ð·Ñ"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Mixed"
-msgstr "ëÁÔÁÌÏÇÉ ËÁË ÆÁÊÌÙ"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³Ð¸ ÐºÐ°Ðº ÑÐ°Ð¹Ð»Ñ"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Left of List"
-msgstr "óÌÅ×Á ÏÔ ÓÐÉÓËÁ"
+msgstr "Ð¡Ð»ÐµÐ²Ð° Ð¾Ñ ÑÐ¿Ð¸ÑÐºÐ°"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Right of List"
-msgstr "óÐÒÁ×Á ÏÔ ÓÐÉÓËÁ"
+msgstr "Ð¡Ð¿ÑÐ°Ð²Ð° Ð¾Ñ ÑÐ¿Ð¸ÑÐºÐ°"
 
-#: src/cfg_dirpane.c:1029 src/cfg_dirpane.c:1030
+#: src/cfg_dirpane.c:997
 msgid "System Default"
-msgstr "ðÏ ÕÍÏÌÞÁÎÉÀ"
+msgstr "ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
 
-#: src/cfg_dirpane.c:1030
-msgid "Always Set"
-msgstr "÷ÓÅÇÄÁ ×ËÌÀÞÅÎÏ"
-
-#: src/cfg_dirpane.c:1030 src/cmd_chmod.c:260 src/menus.c:513
-msgid "Toggle"
-msgstr "ðÅÒÅËÌÀÞÉÔØ"
-
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy From %s"
-msgstr "óËÏÐÉÒÏ×ÁÔØ ÉÚ %s"
+msgstr "Ð¡ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð¸Ð· %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy To %s"
-msgstr "ëÏÐÉÒÏ×ÁÔØ × %s"
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð² %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Swap With %s"
-msgstr "ïÂÍÅÎÑÔØ Ó %s"
+msgstr "ÐÐ±Ð¼ÐµÐ½ÑÑÑ Ñ %s"
 
-#: src/cfg_dirpane.c:1048
+#: src/cfg_dirpane.c:1015
 msgid "Columns"
-msgstr "ëÏÌÏÎËÉ"
+msgstr "ÐÐ¾Ð»Ð¾Ð½ÐºÐ¸"
 
-#: src/cfg_dirpane.c:1053
+#: src/cfg_dirpane.c:1020
 msgid "Available Content Types"
-msgstr "äÏÓÔÕÐÎÙÅ ÔÉÐÙ ÓÏÄÅÒÖÉÍÏÇÏ"
+msgstr "ÐÐ¾ÑÑÑÐ¿Ð½ÑÐµ ÑÐ¸Ð¿Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾"
 
-#: src/cfg_dirpane.c:1070
+#: src/cfg_dirpane.c:1037
 msgid "Selected Content Types"
-msgstr "÷ÙÂÒÁÎÙÅ ÔÉÐÙ ÓÏÄÅÒÖÉÍÏÇÏ"
+msgstr "ÐÑÐ±ÑÐ°Ð½ÑÐµ ÑÐ¸Ð¿Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾"
 
-#: src/cfg_dirpane.c:1081 src/cfg_styles.c:723
+#: src/cfg_dirpane.c:1049 src/cfg_styles.c:741
 msgid "Edit..."
-msgstr "éÚÍÅÎÉÔØ..."
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ..."
 
-#: src/cfg_dirpane.c:1082 src/cmd_renamere.c:508
+#: src/cfg_dirpane.c:1050 src/cmd_renamere.c:481
 msgid "Remove"
-msgstr "õÂÒÁÔØ"
+msgstr "Ð£Ð±ÑÐ°ÑÑ"
 
-#: src/cfg_dirpane.c:1096
+#: src/cfg_dirpane.c:1064
 msgid "Sorting"
-msgstr "óÏÒÔÉÒÏ×ËÁ"
+msgstr "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ°"
 
-#: src/cfg_dirpane.c:1099
+#: src/cfg_dirpane.c:1067
 msgid "Sort On"
-msgstr "óÏÒÔÉÒÏ×ÁÔØ"
+msgstr "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ"
 
-#: src/cfg_dirpane.c:1106 src/cmd_split.c:233 src/dpformat.c:39
-#: src/dpformat.c:40
+#: src/cfg_dirpane.c:1071 src/cmd_split.c:590 src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode"
-msgstr "òÅÖÉÍ"
+msgstr "Ð ÐµÐ¶Ð¸Ð¼"
 
-#: src/cfg_dirpane.c:1113
+#: src/cfg_dirpane.c:1077
 msgid "Inverse Sorting?"
-msgstr "ïÂÒÁÔÎÁÑ ÓÏÒÔÉÒÏ×ËÁ?"
+msgstr "ÐÐ±ÑÐ°ÑÐ½Ð°Ñ ÑÐ¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ°?"
 
-#: src/cfg_dirpane.c:1116 src/cfg_paths.c:187 src/cfg_types.c:743
-#: src/cmd_renamere.c:459 src/cmd_renamere.c:486 src/cmd_select.c:520
-#: src/textview.c:620
+#: src/cfg_dirpane.c:1080 src/cfg_paths.c:228 src/cfg_types.c:744
+#: src/cmd_renamere.c:432 src/cmd_renamere.c:459 src/cmd_select.c:478
+#: src/textview.c:604
 msgid "Ignore Case?"
-msgstr "îÅ ÕÞÉÔÙ×ÁÔØ ÒÅÇÉÓÔÒ?"
-
-#: src/cfg_dirpane.c:1119
-msgid "Numerical Mode?"
-msgstr "õÞÉÔÙ×ÁÔØ ÄÌÉÎÕ?"
+msgstr "ÐÐµ ÑÑÐ¸ÑÑÐ²Ð°ÑÑ ÑÐµÐ³Ð¸ÑÑÑ?"
 
-#: src/cfg_dirpane.c:1127
+#: src/cfg_dirpane.c:1088
 msgid "Default Directory"
-msgstr "ëÁÔÁÌÏÇ ÐÏ ÕÍÏÌÞÁÎÉÀ"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
 
-#: src/cfg_dirpane.c:1132
+#: src/cfg_dirpane.c:1094
 msgid "Grab Current"
-msgstr "÷ÚÑÔØ ÔÅËÕÝÉÅ"
+msgstr "ÐÐ·ÑÑÑ ÑÐµÐºÑÑÐ¸Ðµ"
 
-#: src/cfg_dirpane.c:1135
+#: src/cfg_dirpane.c:1097
 msgid "From History"
-msgstr "ðÏÓÌÅÄÎÉÊ"
+msgstr "ÐÐ¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹"
 
-#: src/cfg_dirpane.c:1148
+#: src/cfg_dirpane.c:1110
 msgid "Path Above?"
-msgstr "ðÕÔØ Ó×ÅÒÈÕ?"
+msgstr "ÐÑÑÑ ÑÐ²ÐµÑÑÑ?"
 
-#: src/cfg_dirpane.c:1152
+#: src/cfg_dirpane.c:1114
 msgid "Hide Allowed?"
-msgstr "òÁÚÒÅÛÉÔØ ÓËÒÙÔÉÅ?"
+msgstr "Ð Ð°Ð·ÑÐµÑÐ¸ÑÑ ÑÐºÑÑÑÐ¸Ðµ?"
 
-#: src/cfg_dirpane.c:1156
+#: src/cfg_dirpane.c:1118
 msgid "Scrollbar Always?"
-msgstr "âÅÇÕÎÏË ×ÓÅÇÄÁ?"
+msgstr "ÐÐµÐ³ÑÐ½Ð¾Ðº Ð²ÑÐµÐ³Ð´Ð°?"
 
-#: src/cfg_dirpane.c:1160
+#: src/cfg_dirpane.c:1122
 msgid "Huge Parent Button?"
-msgstr "âÏÌØÛÁÑ ËÎÏÐËÁ ÷×ÅÒÈ?"
+msgstr "ÐÐ¾Ð»ÑÑÐ°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° ÐÐ²ÐµÑÑ?"
 
-#: src/cfg_dirpane.c:1168
-msgid "Scrollbar Position"
-msgstr "òÁÓÐÏÌÏÖÅÎÉÅ ÂÅÇÕÎËÁ"
-
-#: src/cfg_dirpane.c:1180
-msgid "Modify 'Control' Key State"
-msgstr "éÚÍÅÎÉÔØ ÓÏÓÔÏÑÎÉÅ ËÎÏÐËÉ 'Control'"
-
-#: src/cfg_dirpane.c:1225
-msgid "Active Pane Titles"
-msgstr "úÁÇÏÌÏ×ÏË ÁËÔÉ×ÎÏÊ ÐÁÎÅÌÉ"
-
-#: src/cfg_dirpane.c:1225
-msgid "Focused Row, Unselected"
-msgstr "÷ÙÂÒÁÎÎÁÑ ÓÔÒÏËÁ, ÎÅ ÏÔÍÅÞÅÎÁÑ"
+#: src/cfg_dirpane.c:1127
+msgid "Set Custom Font?"
+msgstr ""
 
-#: src/cfg_dirpane.c:1226
-msgid "Focused Row, Selected"
-msgstr "÷ÙÂÒÁÎÎÁÑ ÓÔÒÏËÁ, ÏÔÍÅÞÅÎÎÁÑ"
+#: src/cfg_dirpane.c:1140
+msgid "Scrollbar Position"
+msgstr "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð±ÐµÐ³ÑÐ½ÐºÐ°"
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Horizontal"
-msgstr "çÏÒÉÚÏÎÔÁÌØÎÏ"
+msgstr "ÐÐ¾ÑÐ¸Ð·Ð¾Ð½ÑÐ°Ð»ÑÐ½Ð¾"
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Vertical"
-msgstr "÷ÅÒÔÉËÁÌØÎÏ"
+msgstr "ÐÐµÑÑÐ¸ÐºÐ°Ð»ÑÐ½Ð¾"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Don't Track"
-msgstr "îÅ ÉÚÍÅÎÑÔØ"
+msgstr "ÐÐµ Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Ratio"
-msgstr "óÏÏÔÎÏÛÅÎÉÅ"
+msgstr "Ð¡Ð¾Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Left Pane"
-msgstr "òÁÚÍÅÒ ÌÅ×ÏÊ ÐÁÎÅÌÉ"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ Ð»ÐµÐ²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Right Pane"
-msgstr "òÁÚÍÅÒ ÐÒÁ×ÏÊ ÐÁÎÅÌÉ"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ Ð¿ÑÐ°Ð²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_dirpane.c:1275
+#: src/cfg_dirpane.c:1198
 msgid "Pane Orientation"
-msgstr "ïÒÉÅÎÔÁÃÉÑ ÐÁÎÅÌÉ"
+msgstr "ÐÑÐ¸ÐµÐ½ÑÐ°ÑÐ¸Ñ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_dirpane.c:1289
+#: src/cfg_dirpane.c:1212
 msgid "Split Tracking"
-msgstr "òÁÚÄÅÌÉÔÅÌØ"
+msgstr "Ð Ð°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ"
 
-#: src/cfg_dirpane.c:1312
+#: src/cfg_dirpane.c:1235
 msgid "pixels"
-msgstr "ÔÏÞËÉ"
+msgstr "ÑÐ¾ÑÐºÐ¸"
 
-#: src/cfg_dirpane.c:1340
+#: src/cfg_dirpane.c:1263
 msgid "Remember Selected Rows?"
-msgstr "úÁÐÏÍÉÎÁÔØ ×ÙÂÒÁÎÙÅ ÜÌÅÍÅÎÔÙ?"
+msgstr "ÐÐ°Ð¿Ð¾Ð¼Ð¸Ð½Ð°ÑÑ Ð²ÑÐ±ÑÐ°Ð½ÑÐµ ÑÐ»ÐµÐ¼ÐµÐ½ÑÑ?"
 
-#: src/cfg_dirpane.c:1343
+#: src/cfg_dirpane.c:1266
 msgid "Save History Lists?"
-msgstr "óÏÈÒÁÎÑÔØ ÉÓÔÏÒÉÀ?"
+msgstr "Ð¡Ð¾ÑÑÐ°Ð½ÑÑÑ Ð¸ÑÑÐ¾ÑÐ¸Ñ?"
 
-#: src/cfg_dirpane.c:1360 src/cfg_dirpane.c:1370
+#: src/cfg_dirpane.c:1283 src/cfg_dirpane.c:1292
 msgid "Dir Panes"
-msgstr "ðÁÎÅÌÉ"
+msgstr "ÐÐ°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_dirpane.c:1374
+#: src/cfg_dirpane.c:1295
 msgid "Pane Split"
-msgstr "òÁÚÄÅÌÉÔÅÌØ"
+msgstr "Ð Ð°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ"
 
-#: src/cfg_dirpane.c:1375
+#: src/cfg_dirpane.c:1296
 msgid "History"
-msgstr "éÓÔÏÒÉÑ"
+msgstr "ÐÑÑÐ¾ÑÐ¸Ñ"
 
-#: src/cfg_errors.c:45
-msgid "Errors"
-msgstr "ïÛÉÂËÉ"
+#: src/cfg_dirpane.c:1725
+msgid "'Blocks' Content Deprecated"
+msgstr ""
 
-#: src/cfg_errors.c:52
-msgid "Use Dialog to Report Errors?"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÄÉÁÌÏÇ ÄÌÑ ÏÛÉÂÏË?"
+#: src/cfg_dirpane.c:1726
+msgid ""
+"The 'Blocks' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
 
-#: src/cfg_errors.c:56
-msgid "Cause Console Beep on Error?"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÓÉÇÎÁÌ ÄÉÎÁÍÉËÁ?"
+#: src/cfg_dirpane.c:1732
+msgid "'Block Size' Content Deprecated"
+msgstr ""
 
-#: src/cfg_menus.c:44
-msgid "Menus"
-msgstr "íÅÎÀ"
+#: src/cfg_dirpane.c:1733
+msgid ""
+"The 'Block Size' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
 
-#: src/cfg_mount.c:168
-msgid "Never"
-msgstr "îÉËÏÇÄÁ"
+#: src/cfg_errors.c:48
+msgid "Errors"
+msgstr "ÐÑÐ¸Ð±ÐºÐ¸"
 
-#: src/cfg_mount.c:168
-msgid "On Every Access"
-msgstr "ðÒÉ ËÁÖÄÏÍ ÏÂÒÁÝÅÎÉÉ"
+#: src/cfg_errors.c:55
+msgid "Error and Status Message Display"
+msgstr ""
 
-#: src/cfg_mount.c:177
-msgid "Mounting"
-msgstr "ðÏÄËÌÀÞÅÎÉÅ"
+#: src/cfg_errors.c:57
+msgid "Status Bar, Above Panes"
+msgstr ""
 
-#: src/cfg_mount.c:184
-msgid "Mount When?"
-msgstr "ëÏÇÄÁ ÐÏÄËÌÀÞÁÔØ?"
+#: src/cfg_errors.c:60
+msgid "Main Window's Title Bar"
+msgstr ""
 
-#: src/cfg_mount.c:196
-msgid "Mount Options"
-msgstr "îÁÓÔÒÏÊËÁ ÐÏÄËÌÀÞÅÎÉÑ ÄÉÓËÏ×"
+#: src/cfg_errors.c:63
+msgid "Separate Dialog"
+msgstr ""
 
-#: src/cfg_mount.c:199
-msgid "Mount Command"
-msgstr "ëÏÍÁÎÄÁ ÐÏÄËÌÀÞÅÎÉÑ"
+#: src/cfg_errors.c:69
+msgid "Cause Console Beep on Error?"
+msgstr "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐ¸Ð³Ð½Ð°Ð» Ð´Ð¸Ð½Ð°Ð¼Ð¸ÐºÐ°?"
 
-#: src/cfg_mount.c:204
-msgid "Unmount Command"
-msgstr "ëÏÍÁÎÄÁ ÏÔËÌÀÞÅÎÉÑ"
+#: src/cfg_menus.c:44
+msgid "Menus"
+msgstr "ÐÐµÐ½Ñ"
 
-#: src/cfg_mount.c:211
-msgid "Only Mount on Toplevel Directories?"
-msgstr "ðÏÄËÌÀÞÁÔØ ÔÏÌØËÏ × ËÏÒÎÅ×ÏÍ ËÁÔÁÌÏÇÅ?"
+#: src/cfg_nag.c:78
+#, c-format
+msgid ""
+"Click the button below to reset the %zu stored 'Don't show this dialog "
+"again' responses."
+msgstr ""
 
-#: src/cfg_mount.c:214
-msgid "Use Command Error Dialog?"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÄÉÁÌÏÇ ÄÌÑ ÏÛÉÂÏË"
+#: src/cfg_nag.c:100
+msgid "Nagging"
+msgstr ""
 
-#: src/cfg_mount.c:217
-msgid "Unmount When gentoo Quits?"
-msgstr "ïÔËÌÀÞÁÔØ ÐÒÉ ×ÙÈÏÄÅ?"
+#: src/cfg_nag.c:110
+#, fuzzy
+msgid "Reset All"
+msgstr "ÐÐµÑÐ½ÑÑÑ Ð½Ð°ÑÐ°Ð»ÑÐ½ÑÐµ"
 
-#: src/cfg_paths.c:128
-msgid "GTK+ RC"
-msgstr "GTK+ RC"
+#: src/cfg_paths.c:78
+msgid "Edit path"
+msgstr ""
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:152
 msgid "Icons"
-msgstr "úÎÁÞËÉ"
+msgstr "ÐÐ½Ð°ÑÐºÐ¸"
+
+#: src/cfg_paths.c:153
+msgid "GTK+ RC"
+msgstr "GTK+ RC"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:154
 msgid "fstab"
 msgstr "fstab"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:155
 msgid "mtab"
 msgstr "mtab"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Beginning With Dot (.)"
-msgstr "îÁÞÉÎÁÀÝÉÅÓÑ Ó ÔÏÞËÉ (.)"
+msgstr "ÐÐ°ÑÐ¸Ð½Ð°ÑÑÐ¸ÐµÑÑ Ñ ÑÐ¾ÑÐºÐ¸ (.)"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Matching RE"
-msgstr "õÄÏ×ÌÅÔ×ÏÒÑÀÝÉÅ ÕÓÌÏ×ÉÀ"
+msgstr "Ð£Ð´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÑÑÑÐ¸Ðµ ÑÑÐ»Ð¾Ð²Ð¸Ñ"
 
-#: src/cfg_paths.c:129 src/cmd_chmod.c:259 src/menus.c:512
+#: src/cfg_paths.c:157 src/cmd_chmod.c:252 src/menus.c:519
 msgid "None"
-msgstr "îÅÔ"
+msgstr "ÐÐµÑ"
 
-#: src/cfg_paths.c:135
+#: src/cfg_paths.c:163
 msgid "Paths & Hide"
-msgstr "ðÕÔÉ & óËÒÙÔÉÅ"
+msgstr "ÐÑÑÐ¸ & Ð¡ÐºÑÑÑÐ¸Ðµ"
 
-#: src/cfg_paths.c:142
+#: src/cfg_paths.c:170
 msgid "Paths"
-msgstr "ðÕÔÉ"
+msgstr "ÐÑÑÐ¸"
 
-#: src/cfg_paths.c:169
+#: src/cfg_paths.c:209
 msgid "Hide Entries"
-msgstr "óËÒÙÔÉÅ"
+msgstr "Ð¡ÐºÑÑÑÐ¸Ðµ"
 
-#: src/cfg_styles.c:170 src/cfg_types.c:234 src/iconutil.c:29 src/menus.c:19
+#: src/cfg_styles.c:178 src/cfg_types.c:233 src/iconutil.c:31 src/menus.c:19
 msgid "(None)"
-msgstr "(îÅÔ)"
+msgstr "(ÐÐµÑ)"
 
-#: src/cfg_styles.c:191 src/cfg_styles.c:428 src/cfg_styles.c:767
+#: src/cfg_styles.c:199 src/cfg_styles.c:436 src/cfg_styles.c:785
 msgid "Delete Action"
-msgstr "õÄÁÌÅÎÉÅ"
+msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_styles.c:411 src/color_dialog.c:48
+#: src/cfg_styles.c:419 src/color_dialog.c:47
 msgid "Edit Color"
-msgstr "éÚÍÅÎÉÔØ Ã×ÅÔ"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ²ÐµÑ"
 
-#: src/cfg_styles.c:428
+#: src/cfg_styles.c:436
 msgid "Revert to Inherited Command"
-msgstr "ïÓÔÁ×ÉÔØ ÔÏÌØËÏ ÎÁÓÌÅÄÕÅÍÙÅ"
+msgstr "ÐÑÑÐ°Ð²Ð¸ÑÑ ÑÐ¾Ð»ÑÐºÐ¾ Ð½Ð°ÑÐ»ÐµÐ´ÑÐµÐ¼ÑÐµ"
 
-#: src/cfg_styles.c:529
+#: src/cfg_styles.c:537
 #, fuzzy
 msgid "Select Command ..."
-msgstr "÷ÙÂÅÒÉÔÅ ËÏÍÁÎÄÕ"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ"
 
-#: src/cfg_styles.c:592
+#: src/cfg_styles.c:601
 msgid "New Action Property"
-msgstr "ó×ÏÊÓÔ×Á ÎÏ×ÏÇÏ ÓÏÂÙÔÉÑ"
+msgstr "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° Ð½Ð¾Ð²Ð¾Ð³Ð¾ ÑÐ¾Ð±ÑÑÐ¸Ñ"
 
-#: src/cfg_styles.c:600
+#: src/cfg_styles.c:609
 msgid "something"
-msgstr "ÎÅÞÔÏ"
+msgstr "Ð½ÐµÑÑÐ¾"
 
-#: src/cfg_styles.c:670
+#: src/cfg_styles.c:679
 msgid ""
 "Deleting this style will also delete\n"
 "all its children. Are you sure?"
 msgstr ""
-"õÄÁÌÅÎÉÅ ÜÔÏÇÏ ËÌÁÓÓÁ ÐÏ×ÌÅÞÅÔ ÔÁËÖÅ\n"
-"ÕÄÁÌÅÎÉÅ ×ÓÅÈ ÐÏÔÏÍËÏ×. õ×ÅÒÅÎÙ?"
+"Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ ÑÑÐ¾Ð³Ð¾ ÐºÐ»Ð°ÑÑÐ° Ð¿Ð¾Ð²Ð»ÐµÑÐµÑ ÑÐ°ÐºÐ¶Ðµ\n"
+"ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð²ÑÐµÑ Ð¿Ð¾ÑÐ¾Ð¼ÐºÐ¾Ð². Ð£Ð²ÐµÑÐµÐ½Ñ?"
 
-#: src/cfg_styles.c:671
+#: src/cfg_styles.c:680
 msgid "Confirm Delete"
-msgstr "ðÏÄÔ×ÅÒÄÉÔÅ ÕÄÁÌÅÎÉÅ"
+msgstr "ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Background Color"
-msgstr "ã×ÅÔ ÆÏÎÁ"
+msgstr "Ð¦Ð²ÐµÑ ÑÐ¾Ð½Ð°"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Foreground Color"
-msgstr "ã×ÅÔ"
+msgstr "Ð¦Ð²ÐµÑ"
 
-#: src/cfg_styles.c:694 src/dpformat.c:53
+#: src/cfg_styles.c:703 src/dpformat.c:55
 msgid "Icon"
-msgstr "úÎÁÞÏË"
+msgstr "ÐÐ½Ð°ÑÐ¾Ðº"
 
-#: src/cfg_styles.c:696
+#: src/cfg_styles.c:705
 msgid "(Row Style Preview Text)"
-msgstr "(ôÁË ÂÕÄÅÔ ×ÙÇÌÑÄÅÔØ)"
+msgstr "(Ð¢Ð°Ðº Ð±ÑÐ´ÐµÑ Ð²ÑÐ³Ð»ÑÐ´ÐµÑÑ)"
 
-#: src/cfg_styles.c:702 src/cmd_renameseq.c:386
+#: src/cfg_styles.c:713 src/cmd_renameseq.c:358 src/cmd_split.c:656
 msgid "Preview"
-msgstr "ðÒÅÄÐÒÏÓÍÏÔÒ"
+msgstr "ÐÑÐµÐ´Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑ"
 
-#: src/cfg_styles.c:719
+#: src/cfg_styles.c:737
 msgid "Override Parent's?"
-msgstr "ðÅÒÅÏÐÒÅÄÅÌÉÔØ?"
+msgstr "ÐÐµÑÐµÐ¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ?"
 
-#: src/cfg_styles.c:723
+#: src/cfg_styles.c:741
 msgid "Pick..."
-msgstr "÷ÙÂÅÒÉÔÅ..."
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ..."
 
-#: src/cfg_styles.c:764
+#: src/cfg_styles.c:782
 msgid "Add Action..."
-msgstr "äÏÂÁ×ÉÔØ ÄÅÊÓÔ×ÉÅ..."
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ..."
 
-#: src/cfg_styles.c:810 src/menus.c:525
+#: src/cfg_styles.c:829 src/menus.c:532
 msgid "Parent"
-msgstr "òÏÄÉÔÅÌØ"
+msgstr "Ð Ð¾Ð´Ð¸ÑÐµÐ»Ñ"
 
-#: src/cfg_styles.c:820
+#: src/cfg_styles.c:840
 msgid "Inherited Properties"
-msgstr "îÁÓÌÅÄÕÅÍÙÅ Ó×ÏÊÓÔ×Á"
+msgstr "ÐÐ°ÑÐ»ÐµÐ´ÑÐµÐ¼ÑÐµ ÑÐ²Ð¾Ð¹ÑÑÐ²Ð°"
 
-#: src/cfg_styles.c:824
+#: src/cfg_styles.c:844
 msgid "Visual"
-msgstr "ïÔÏÂÒÁÖÅÎÉÅ"
+msgstr "ÐÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_styles.c:826
+#: src/cfg_styles.c:846
 msgid "Actions"
-msgstr "äÅÊÓÔ×ÉÑ"
+msgstr "ÐÐµÐ¹ÑÑÐ²Ð¸Ñ"
 
-#: src/cfg_styles.c:843
+#: src/cfg_styles.c:863
 msgid "File Recognition"
-msgstr "ôÉÐÙ ÆÁÊÌÏ×"
+msgstr "Ð¢Ð¸Ð¿Ñ ÑÐ°Ð¹Ð»Ð¾Ð²"
 
-#: src/cfg_styles.c:844
+#: src/cfg_styles.c:864
 msgid "Styles"
-msgstr "ëÌÁÓÓÙ"
+msgstr "ÐÐ»Ð°ÑÑÑ"
 
-#: src/cfg_types.c:193
+#: src/cfg_types.c:192
 #, c-format
 msgid "%s - Click to Change..."
-msgstr "%s - ýÅÌËÎÉÔÅ ÄÌÑ ÓÍÅÎÙ..."
+msgstr "%s - Ð©ÐµÐ»ÐºÐ½Ð¸ÑÐµ Ð´Ð»Ñ ÑÐ¼ÐµÐ½Ñ..."
 
-#: src/cfg_types.c:508
+#: src/cfg_types.c:507
 msgid "(New Type)"
-msgstr "(îÏ×ÙÊ ÔÉÐ)"
+msgstr "(ÐÐ¾Ð²ÑÐ¹ ÑÐ¸Ð¿)"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "B-Dev"
-msgstr "B-õÓÔÒ"
+msgstr "B-Ð£ÑÑÑ"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "C-Dev"
-msgstr "C-õÓÔÒ"
+msgstr "C-Ð£ÑÑÑ"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Dir"
-msgstr "ëÁÔÁÌÏÇ"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "FIFO"
 msgstr "FIFO"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "File"
-msgstr "æÁÊÌ"
+msgstr "Ð¤Ð°Ð¹Ð»"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Link"
-msgstr "óÓÙÌËÁ"
+msgstr "Ð¡ÑÑÐ»ÐºÐ°"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Socket"
-msgstr "ðÏÒÔ"
+msgstr "ÐÐ¾ÑÑ"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "Readable"
-msgstr "þÔÅÎÉÅ"
+msgstr "Ð§ÑÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetGID"
-msgstr "ó GID"
+msgstr "Ð¡ GID"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetUID"
-msgstr "ó UID"
+msgstr "Ð¡ UID"
 
-#: src/cfg_types.c:648 src/cmd_chmod.c:209
+#: src/cfg_types.c:647 src/cmd_chmod.c:200
 msgid "Sticky"
-msgstr "æÉËÓÁÃÉÑ"
+msgstr "Ð¤Ð¸ÐºÑÐ°ÑÐ¸Ñ"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Executable"
-msgstr "÷ÙÐÏÌÎÅÎÉÅ"
+msgstr "ÐÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Writable"
-msgstr "úÁÐÉÓØ"
+msgstr "ÐÐ°Ð¿Ð¸ÑÑ"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match 'file' (RE)"
-msgstr "õÓÌÏ×ÉÅ ÎÁ ÆÁÊÌ"
+msgstr "Ð£ÑÐ»Ð¾Ð²Ð¸Ðµ Ð½Ð° ÑÐ°Ð¹Ð»"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match Name (RE)"
-msgstr "õÓÌÏ×ÉÅ ÎÁ ÉÍÑ"
+msgstr "Ð£ÑÐ»Ð¾Ð²Ð¸Ðµ Ð½Ð° Ð¸Ð¼Ñ"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Require Suffix"
-msgstr "ó ÒÁÓÛÉÒÅÎÉÅÍ"
+msgstr "Ð¡ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸ÐµÐ¼"
 
 #: src/cfg_types.c:687
 msgid "Identification"
-msgstr "òÁÓÐÏÚÎÁ×ÁÎÉÅ"
+msgstr "Ð Ð°ÑÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°Ð½Ð¸Ðµ"
 
 #: src/cfg_types.c:689
 msgid "Require Type"
-msgstr "ðÒÉÚÎÁËÉ"
+msgstr "ÐÑÐ¸Ð·Ð½Ð°ÐºÐ¸"
 
 #: src/cfg_types.c:703
 msgid "Require Protection"
-msgstr "áÔÒÉÂÕÔÙ"
+msgstr "ÐÑÑÐ¸Ð±ÑÑÑ"
 
-#: src/cfg_types.c:738
+#: src/cfg_types.c:739
 msgid "Glob?"
-msgstr "÷ÓÅ?"
+msgstr "ÐÑÐµ?"
 
-#: src/cfg_types.c:754
+#: src/cfg_types.c:755
 msgid "Type's Style"
-msgstr "ëÌÁÓÓ ÜÔÏÇÏ ÔÉÐÁ"
+msgstr "ÐÐ»Ð°ÑÑ ÑÑÐ¾Ð³Ð¾ ÑÐ¸Ð¿Ð°"
 
-#: src/cfg_types.c:756
+#: src/cfg_types.c:757
 msgid "Style"
-msgstr "ëÌÁÓÓ"
+msgstr "ÐÐ»Ð°ÑÑ"
 
-#: src/cfg_types.c:796
+#: src/cfg_types.c:797
 msgid "Types"
-msgstr "ôÉÐÙ"
+msgstr "Ð¢Ð¸Ð¿Ñ"
 
 #: src/cfg_windows.c:86
 msgid "Dialog Windows Center On Screen"
-msgstr "äÉÁÌÏÇÏ×ÙÅ ÏËÎÁ × ÃÅÎÔÒÅ ÜËÒÁÎÁ"
+msgstr "ÐÐ¸Ð°Ð»Ð¾Ð³Ð¾Ð²ÑÐµ Ð¾ÐºÐ½Ð° Ð² ÑÐµÐ½ÑÑÐµ ÑÐºÑÐ°Ð½Ð°"
 
 #: src/cfg_windows.c:86
 msgid "Dialog Windows Follow Mouse"
-msgstr "äÉÁÌÏÇÏ×ÙÅ ÏËÎÁ ÒÑÄÏÍ Ó ÍÙÛËÏÊ"
+msgstr "ÐÐ¸Ð°Ð»Ð¾Ð³Ð¾Ð²ÑÐµ Ð¾ÐºÐ½Ð° ÑÑÐ´Ð¾Ð¼ Ñ Ð¼ÑÑÐºÐ¾Ð¹"
 
 #: src/cfg_windows.c:86
 msgid "Dialog Windows Positioned by Window Manager"
-msgstr "äÉÁÌÏÇÏ×ÙÅ ÏËÎÁ ÒÁÓÓÔÁ×ÌÑÀÔÓÑ ÏËÏÎÎÙÍ ÍÅÎÅÄÖÅÒÏÍ"
+msgstr "ÐÐ¸Ð°Ð»Ð¾Ð³Ð¾Ð²ÑÐµ Ð¾ÐºÐ½Ð° ÑÐ°ÑÑÑÐ°Ð²Ð»ÑÑÑÑÑ Ð¾ÐºÐ¾Ð½Ð½ÑÐ¼ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑÐ¾Ð¼"
 
 #: src/cfg_windows.c:94
 msgid "Windows"
-msgstr "ïËÎÁ"
+msgstr "ÐÐºÐ½Ð°"
 
 #: src/cfg_windows.c:102
 #, fuzzy
 msgid "Window Borders"
-msgstr "ïËÎÁ"
+msgstr "ÐÐºÐ½Ð°"
 
 #: src/cfg_windows.c:118
 msgid "Dialog Positioning"
-msgstr "òÁÓÐÏÌÏÖÅÎÉÅ ÄÉÁÌÏÇÏ×ÙÈ ÏËÏÎ"
+msgstr "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð´Ð¸Ð°Ð»Ð¾Ð³Ð¾Ð²ÑÑ Ð¾ÐºÐ¾Ð½"
 
-#: src/children.c:94
+#: src/children.c:88
 #, c-format
 msgid "Execution of \"%s\" Failed"
-msgstr "÷ÙÐÏÌÎÅÎÉÅ \"%s\" ÓÏÒ×ÁÎÏ"
+msgstr "ÐÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ \"%s\" ÑÐ¾ÑÐ²Ð°Ð½Ð¾"
 
-#: src/children.c:95 src/dialog.c:285
+#: src/children.c:89 src/dialog.c:290
 msgid "Error"
-msgstr "ïÛÉÂËÁ"
+msgstr "ÐÑÐ¸Ð±ÐºÐ°"
 
-#: src/children.c:274
+#: src/children.c:227
 #, c-format
 msgid "Couldn't terminate child \"%s\" (pid=%d)--zombie alert"
-msgstr "îÅ ÍÏÇÕ ×ÙÇÒÕÚÉÔØ ÐÒÏÃÅÓÓ \"%s\" (pid=%d) -- ÚÏÍÂÉ"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð²ÑÐ³ÑÑÐ·Ð¸ÑÑ Ð¿ÑÐ¾ÑÐµÑÑ \"%s\" (pid=%d) -- Ð·Ð¾Ð¼Ð±Ð¸"
 
 #: src/cmd_about.c:54
 #, c-format
@@ -1179,11 +1184,11 @@
 #: src/cmd_about.c:85
 #, c-format
 msgid "Version %s (GTK+ version %d.%d.%d)."
-msgstr "÷ÅÒÓÉÑ %s (GTK+ ×ÅÒÓÉÑ %d.%d.%d)."
+msgstr "ÐÐµÑÑÐ¸Ñ %s (GTK+ Ð²ÐµÑÑÐ¸Ñ %d.%d.%d)."
 
 #: src/cmd_about.c:97
 #, fuzzy
-msgid "(c) 1998-2009 by Emil Brink, Obsession Development.\n"
+msgid "(c) 1998-2011 by Emil Brink, Obsession Development.\n"
 msgstr "(c) 1998-2008 - Emil Brink, Obsession Development.\n"
 
 #: src/cmd_about.c:99
@@ -1191,241 +1196,222 @@
 "This is free software, and there is ABSOLUTELY NO\n"
 "WARRANTY. Read the file COPYING for more details.\n"
 msgstr ""
-"üÔÏ ÏÔËÒÙÔÏÅ ðï É ÏÎÏ ÎÅ ÄÁÅÔ áâóïìàôîï îéëáëéè \n"
-"çáòáîôéê. ðÏÄÒÏÂÎÏÓÔÉ ÐÒÏÞÔÉÔÅ × ÆÁÊÌÅ COPYING.\n"
+"ÐÑÐ¾ Ð¾ÑÐºÑÑÑÐ¾Ðµ ÐÐ Ð¸ Ð¾Ð½Ð¾ Ð½Ðµ Ð´Ð°ÐµÑ ÐÐÐ¡ÐÐÐ®Ð¢ÐÐ ÐÐÐÐÐÐÐ¥ \n"
+"ÐÐÐ ÐÐÐ¢ÐÐ. ÐÐ¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸ Ð¿ÑÐ¾ÑÑÐ¸ÑÐµ Ð² ÑÐ°Ð¹Ð»Ðµ COPYING.\n"
 
-#: src/cmd_about.c:106
-msgid "FAM: Supported and active."
-msgstr "FAM: ðÏÄÄÅÒÖÉ×ÁÅÔÓÑ É ×ËÌÀÞÅÎÏ"
-
-#: src/cmd_about.c:108
-msgid "FAM: Supported, but not active."
-msgstr "FAM: ðÏÄÄÅÒÖÉ×ÁÅÔÓÑ, ÎÏ ÎÅ ×ËÌÀÞÅÎÏ."
-
-#: src/cmd_about.c:110
-msgid "FAM: Not supported."
-msgstr "FAM: îÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ."
-
-#: src/cmd_about.c:116
+#: src/cmd_about.c:105
 msgid "NLS: Supported, using built-in English strings."
-msgstr "NLS: ðÏÄÄÅÒÖÉ×ÁÅÔÓÑ, Ó ÐÏÍÏÝØÀ ×ÓÔÒÏÅÎÎÙÈ ÁÎÇÌÉÊÓËÉÈ ÓÔÒÏË."
+msgstr "NLS: ÐÐ¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ, Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ Ð²ÑÑÑÐ¾ÐµÐ½Ð½ÑÑ Ð°Ð½Ð³Ð»Ð¸Ð¹ÑÐºÐ¸Ñ ÑÑÑÐ¾Ðº."
 
-#: src/cmd_about.c:129
-#, fuzzy
+#: src/cmd_about.c:118
+#, fuzzy, c-format
 msgid ""
 "The author of gentoo can be reached via Internet\n"
-"e-mail at <emil@obsession.se>; feel free to let\n"
+"e-mail at <a href=\"mailto:%s\">%s</a>; feel free to let\n"
 "me know what you think of this software, give\n"
 "suggestions/bug reports, and so on.\n"
 "\n"
 "The latest release of gentoo can always be down-\n"
 "loaded from the official gentoo project homepage at\n"
-"<http://www.obsession.se/gentoo/>. New releases are\n"
+"<a href=\"%s\">%s</a>. New releases are\n"
 "typically announced on the Freshmeat service at\n"
-"<http://freshmeat.net/>."
-msgstr ""
-"á×ÔÏÒ ÜÔÏÊ ÐÒÏÇÒÁÍÍÙ ÄÏÓÔÕÐÅÎ ÞÅÒÅÚ ÜÌÅËÔÒÏÎÎÕÀ\n"
-"ÐÏÞÔÕ ÐÏ ÁÄÒÅÓÕ: <emil@obsession.se>; ÎÁÐÉÛÉÔÅ ÅÍÕ\n"
-"ÞÔÏ ×Ù ÄÕÍÁÅÔÅ ÏÂ ÜÔÏÊ ÐÒÏÇÒÁÍÍÅ, ÓÏÏÂÝÁÊÔÅ Ï \n"
-"ÎÁÊÄÅÎÎÙÊ ÏÝÉÂËÁÈ É ÐÏÖÅÌÁÎÉÑÈ.\n"
-"îÁÓÔÒÏÊËÉ ÐÏ ÕÍÏÌÞÁÎÉÀ - J. Hanson <johan@tiq.com>.\n"
-"ðÏÓÌÅÄÎÑÑ ×ÅÒÓÉÑ ÐÒÏÇÒÁÍÍÙ ÍÏÖÅÔ ÂÙÔØ ÚÁÇÒÕÖÅÎÁ\n"
-"Ó ÏÆÉÃÉÁÌØÎÏÊ ÓÔÒÁÎÉÃÙ <http://www.obsession.se/gentoo/>.\n"
-"îÏ×ÙÅ ×ÅÒÓÉÉ ÏÂÙÞÎÏ ÓÎÁÞÁÌÁ ×ÙËÌÁÄÙ×ÁÀÔÓÑ \n"
-"× \"ó×ÅÖÅÍ ÍÑÓÅ\" - <http://freshmeat.net/>.\n"
-"ï ÎÅÔÏÞÎÏÓÔÑÈ ÐÅÒÅ×ÏÄÁ ÐÉÛÉÔÅ í.úÁÒÉÐÏ×Õ <m3for@mail.ru>"
-
-#: src/cmd_about.c:142
+"<a href=\"http://freshmeat.net/\">freshmeat.net</a>."
+msgstr ""
+"ÐÐ²ÑÐ¾Ñ ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð´Ð¾ÑÑÑÐ¿ÐµÐ½ ÑÐµÑÐµÐ· ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÑ\n"
+"Ð¿Ð¾ÑÑÑ Ð¿Ð¾ Ð°Ð´ÑÐµÑÑ: <emil@obsession.se>; Ð½Ð°Ð¿Ð¸ÑÐ¸ÑÐµ ÐµÐ¼Ñ\n"
+"ÑÑÐ¾ Ð²Ñ Ð´ÑÐ¼Ð°ÐµÑÐµ Ð¾Ð± ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ, ÑÐ¾Ð¾Ð±ÑÐ°Ð¹ÑÐµ Ð¾ \n"
+"Ð½Ð°Ð¹Ð´ÐµÐ½Ð½ÑÐ¹ Ð¾ÑÐ¸Ð±ÐºÐ°Ñ Ð¸ Ð¿Ð¾Ð¶ÐµÐ»Ð°Ð½Ð¸ÑÑ.\n"
+"ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ - J. Hanson <johan@tiq.com>.\n"
+"ÐÐ¾ÑÐ»ÐµÐ´Ð½ÑÑ Ð²ÐµÑÑÐ¸Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ð°\n"
+"Ñ Ð¾ÑÐ¸ÑÐ¸Ð°Ð»ÑÐ½Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ <http://www.obsession.se/gentoo/>.\n"
+"ÐÐ¾Ð²ÑÐµ Ð²ÐµÑÑÐ¸Ð¸ Ð¾Ð±ÑÑÐ½Ð¾ ÑÐ½Ð°ÑÐ°Ð»Ð° Ð²ÑÐºÐ»Ð°Ð´ÑÐ²Ð°ÑÑÑÑ \n"
+"Ð² \"Ð¡Ð²ÐµÐ¶ÐµÐ¼ Ð¼ÑÑÐµ\" - <http://freshmeat.net/>.\n"
+"Ð Ð½ÐµÑÐ¾ÑÐ½Ð¾ÑÑÑÑ Ð¿ÐµÑÐµÐ²Ð¾Ð´Ð° Ð¿Ð¸ÑÐ¸ÑÐµ Ð.ÐÐ°ÑÐ¸Ð¿Ð¾Ð²Ñ <m3for@mail.ru>"
+
+#: src/cmd_about.c:135
 msgid "About gentoo"
-msgstr "ï ÐÒÏÇÒÁÍÍÅ"
+msgstr "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ"
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "_OK (Wait for More)"
-msgstr "_äá (ðÏÄÏÖÄÉÔÅ ÐÒÏÄÏÌÖÅÎÉÑ)"
+msgstr "_ÐÐ (ÐÐ¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ)"
 
 #: src/cmd_chmod.c:98
 #, c-format
 msgid "Set protection bits for \"%s\":"
-msgstr "õÓÔÁÎÏ×ÉÔØ ÐÒÁ×Á ÄÌÑ \"%s\":"
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¿ÑÐ°Ð²Ð° Ð´Ð»Ñ \"%s\":"
 
-#: src/cmd_chmod.c:208 src/cmd_chown.c:184 src/cmd_info.c:202
+#: src/cmd_chmod.c:199 src/cmd_chown.c:176 src/cmd_info.c:274
 msgid "Group"
-msgstr "çÒÕÐÐÁ"
+msgstr "ÐÑÑÐ¿Ð¿Ð°"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Others"
-msgstr "äÒÕÇÉÅ"
+msgstr "ÐÑÑÐ³Ð¸Ðµ"
 
-#: src/cmd_chmod.c:208 src/cmd_info.c:195
+#: src/cmd_chmod.c:199 src/cmd_info.c:267
 msgid "Owner"
-msgstr "÷ÌÁÄÅÌÅÃ"
+msgstr "ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Special"
-msgstr "óÐÅÃÉÁÌØÎÙÅ"
+msgstr "Ð¡Ð¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÐµ"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Execute"
-msgstr "úÁÐÕÓË"
+msgstr "ÐÐ°Ð¿ÑÑÐº"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Read"
-msgstr "þÔÅÎÉÅ"
+msgstr "Ð§ÑÐµÐ½Ð¸Ðµ"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set GID"
-msgstr "éÓÐ. GID"
+msgstr "ÐÑÐ¿. GID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set UID"
-msgstr "éÓÐ. UID"
+msgstr "ÐÑÐ¿. UID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Write"
-msgstr "úÁÐÉÓØ"
+msgstr "ÐÐ°Ð¿Ð¸ÑÑ"
 
-#: src/cmd_chmod.c:231
+#: src/cmd_chmod.c:222
 msgid "Protection Bits"
-msgstr "âÉÔÙ ÐÒÁ×"
+msgstr "ÐÐ¸ÑÑ Ð¿ÑÐ°Ð²"
 
-#: src/cmd_chmod.c:242
+#: src/cmd_chmod.c:233
 msgid "Textual"
 msgstr ""
 
-#: src/cmd_chmod.c:253
+#: src/cmd_chmod.c:246
 #, fuzzy
 msgid "Octal"
-msgstr "8, ÷ÏÓØÍÅÒÉÞÎÁÑ"
+msgstr "8, ÐÐ¾ÑÑÐ¼ÐµÑÐ¸ÑÐ½Ð°Ñ"
 
-#: src/cmd_chmod.c:258 src/menus.c:511
+#: src/cmd_chmod.c:251 src/menus.c:518
 msgid "All"
-msgstr "÷ÓÅ"
+msgstr "ÐÑÐµ"
+
+#: src/cmd_chmod.c:253 src/menus.c:520
+msgid "Toggle"
+msgstr "ÐÐµÑÐµÐºÐ»ÑÑÐ¸ÑÑ"
 
-#: src/cmd_chmod.c:261
+#: src/cmd_chmod.c:254
 msgid "Revert"
-msgstr "óÂÒÏÓÉÔØ"
+msgstr "Ð¡Ð±ÑÐ¾ÑÐ¸ÑÑ"
 
-#: src/cmd_chmod.c:273 src/cmd_chown.c:208 src/cmd_info.c:304
+#: src/cmd_chmod.c:266 src/cmd_chown.c:201 src/cmd_info.c:372
 msgid "Recurse Directories?"
-msgstr "äÌÑ ÓÏÄÅÒÖÉÍÏÇÏ ÔÏÖÅ?"
+msgstr "ÐÐ»Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ ÑÐ¾Ð¶Ðµ?"
 
-#: src/cmd_chmod.c:276
+#: src/cmd_chmod.c:269
 msgid "Don't Touch Directories?"
-msgstr "ëÒÏÍÅ ËÁÔÁÌÏÇÏ×?"
+msgstr "ÐÑÐ¾Ð¼Ðµ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð²?"
 
-#: src/cmd_chmod.c:281
+#: src/cmd_chmod.c:274
 msgid "Change Mode"
-msgstr "óÍÅÎÁ ÒÅÖÉÍÁ"
+msgstr "Ð¡Ð¼ÐµÐ½Ð° ÑÐµÐ¶Ð¸Ð¼Ð°"
 
-#: src/cmd_chown.c:56
+#: src/cmd_chown.c:57
 #, c-format
 msgid "Set Ownership for '%s':"
-msgstr "õÓÔÁÎÏ×ËÁ ×ÌÁÄÅÌØÃÁ ÄÌÑ '%s':"
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð²Ð»Ð°Ð´ÐµÐ»ÑÑÐ° Ð´Ð»Ñ '%s':"
 
-#: src/cmd_chown.c:184
+#: src/cmd_chown.c:176
 msgid "User"
-msgstr "ðÏÌØÚÏ×ÁÔÅÌØ"
+msgstr "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
 
-#: src/cmd_chown.c:213
+#: src/cmd_chown.c:206
 msgid "Change Ownership"
-msgstr "óÍÅÎÁ ×ÌÁÄÅÌØÃÁ"
+msgstr "Ð¡Ð¼ÐµÐ½Ð° Ð²Ð»Ð°Ð´ÐµÐ»ÑÑÐ°"
 
 #: src/cmd_configure.c:50
 msgid "Automatically Save Changed Configuration on Exit?"
-msgstr "á×ÔÏÍÁÔÉÞÅÓËÉ ÓÏÈÒÁÎÑÔØ ÎÁÓÔÒÏÊËÉ ÐÒÉ ×ÙÈÏÄÅ?"
+msgstr "ÐÐ²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸ ÑÐ¾ÑÑÐ°Ð½ÑÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿ÑÐ¸ Ð²ÑÑÐ¾Ð´Ðµ?"
 
-#: src/cmd_copy.c:302
-#, c-format
-msgid ""
-"Can't copy directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"îÅ ÍÏÇÕ ËÏÐÉÒÏ×ÁÔØ \"%s\"\n"
-"× \"%s\"\n"
-"(ËÏÐÉÒÏ×ÁÎÉÅ ÓÁÍÏÇÏ × ÓÅÂÑ)."
-
-#: src/cmd_copy.c:392 src/cmd_copyas.c:62
+#: src/cmd_copy.c:175 src/cmd_copyas.c:62
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Copy?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ðÒÏÄÏÌÖÉÔØ ËÏÐÉÒÏ×ÁÎÉÅ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ?"
 
-#: src/cmd_copy.c:393
+#: src/cmd_copy.c:176
 msgid "Copying..."
-msgstr "ëÏÐÉÒÏ×ÁÎÉÅ..."
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ..."
 
-#: src/cmd_copy.c:440
+#: src/cmd_copy.c:217
 msgid "Preserve Dates During Copy?"
-msgstr "óÏÈÒÁÎÑÔØ ÄÁÔÙ ÐÒÉ ËÏÐÉÒÏ×ÁÎÉÉ?"
+msgstr "Ð¡Ð¾ÑÑÐ°Ð½ÑÑÑ Ð´Ð°ÑÑ Ð¿ÑÐ¸ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ð¸?"
 
-#: src/cmd_copy.c:441
+#: src/cmd_copy.c:218
 msgid "Ignore Failure to Copy Attributes (Date, Owner, Mode)?"
 msgstr ""
-"éÇÎÏÒÉÒÏ×ÁÔØ ÎÅ×ÏÚÍÏÖÎÏÓÔØ ËÏÐÉÒÏ×ÁÎÉÑ ÁÔÒÉÂÕÔÏ× (äÁÔÁ, ðÒÁ×Á, ÷ÌÁÄÅÌÅÃ)?"
+"ÐÐ³Ð½Ð¾ÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð°ÑÑÐ¸Ð±ÑÑÐ¾Ð² (ÐÐ°ÑÐ°, ÐÑÐ°Ð²Ð°, ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ)?"
 
-#: src/cmd_copy.c:442
+#: src/cmd_copy.c:219
 msgid "Leave Failed Destination if Full Size?"
-msgstr "ïÓÔÁ×ÌÑÔØ ÎÅÚÁ×ÅÒÛÅÎÎÙÅ ÆÁÊÌÙ ÅÓÌÉ ÎÅÔ ÍÅÓÔÁ?"
+msgstr "ÐÑÑÐ°Ð²Ð»ÑÑÑ Ð½ÐµÐ·Ð°Ð²ÐµÑÑÐµÐ½Ð½ÑÐµ ÑÐ°Ð¹Ð»Ñ ÐµÑÐ»Ð¸ Ð½ÐµÑ Ð¼ÐµÑÑÐ°?"
 
-#: src/cmd_copy.c:443 src/cmd_viewtext.c:207
+#: src/cmd_copy.c:220 src/cmd_viewtext.c:204
 msgid "Buffer Size"
-msgstr "òÁÚÍÅÒ ÂÕÆÅÒÁ"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ Ð±ÑÑÐµÑÐ°"
 
-#: src/cmd_copyas.c:51
+#: src/cmd_copyas.c:49
 #, c-format
 msgid "Enter Name for Copy of \"%s\""
-msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÄÌÑ ËÏÐÉÒÏ×ÁÎÉÑ \"%s\""
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ Ð´Ð»Ñ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ \"%s\""
 
-#: src/cmd_copyas.c:53
+#: src/cmd_copyas.c:51
 #, c-format
 msgid "Enter Name for Clone of \"%s\""
-msgstr "÷×ÅÄÉÔÅ ÉÍÑ ËÌÏÎÁ \"%s\""
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ ÐºÐ»Ð¾Ð½Ð° \"%s\""
 
 #: src/cmd_copyas.c:64
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Clone?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ÐÒÏÄÏÌÖÉÔØ ËÌÏÎÉÒÏ×ÁÎÉÅ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÐºÐ»Ð¾Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ?"
 
 #: src/cmd_copyas.c:65
 msgid "Cloning..."
-msgstr "ëÌÏÎÉÒÕÀ..."
+msgstr "ÐÐ»Ð¾Ð½Ð¸ÑÑÑ..."
 
 #: src/cmd_copyas.c:65
 msgid "Copying As..."
-msgstr "ëÏÐÉÒÏ×ÁÔØ ËÁË..."
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ°Ðº..."
 
 #: src/cmd_copyas.c:79
 #, c-format
 msgid "Enter Name to Link \"%s\" As"
-msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÄÌÑ ÓÓÙÌËÉ \"%s\" "
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ Ð´Ð»Ñ ÑÑÑÐ»ÐºÐ¸ \"%s\" "
 
 #: src/cmd_copyas.c:81
 #, c-format
 msgid "Enter Name for Link Clone of \"%s\""
-msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÄÌÑ ËÌÏÎÁ ÓÓÙÌËÉ \"%s\""
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ Ð´Ð»Ñ ÐºÐ»Ð¾Ð½Ð° ÑÑÑÐ»ÐºÐ¸ \"%s\""
 
-#: src/cmd_copyas.c:89
+#: src/cmd_copyas.c:91
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Symlink?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ðÒÏÄÏÌÖÉÔØ ÓÏÚÄÁÎÉÅ ÓÓÙÌËÉ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÑÑÐ»ÐºÐ¸?"
 
-#: src/cmd_copyas.c:204 src/cmd_copyas.c:210
+#: src/cmd_copyas.c:200 src/cmd_copyas.c:207
 msgid "Copy As"
-msgstr "ëÏÐÉÒÏ×ÁÔØ ËÁË"
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ°Ðº"
 
-#: src/cmd_copyas.c:212
+#: src/cmd_copyas.c:209
 msgid "Clone"
-msgstr "ëÌÏÎÉÒÏ×ÁÔØ"
+msgstr "ÐÐ»Ð¾Ð½Ð¸ÑÐ¾Ð²Ð°ÑÑ"
 
-#: src/cmd_copyas.c:214
+#: src/cmd_copyas.c:211
 msgid "Symbolic Link As"
-msgstr "óÓÙÌËÁ Ó ÉÍÅÎÅÍ"
+msgstr "Ð¡ÑÑÐ»ÐºÐ° Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼"
 
-#: src/cmd_copyas.c:216
+#: src/cmd_copyas.c:213
 msgid "Symbolic Link Clone"
-msgstr "ëÌÏÎÉÒÏ×ÁÎÉÅ ÓÓÙÌËÉ"
+msgstr "ÐÐ»Ð¾Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÑÑÐ»ÐºÐ¸"
 
-#: src/cmd_delete.c:55
+#: src/cmd_delete.c:56
 #, c-format
 msgid ""
 "%s\n"
@@ -1433,309 +1419,318 @@
 "Attempt to change protection and retry?"
 msgstr ""
 "%s\n"
-"ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÄÁÌÅÎ ÉÚ-ÚÁ ÏÇÒÁÎÉÞÅÎÉÑ ÄÏÓÔÕÐÁ.\n"
-"ðÏÐÒÏÂÏ×ÁÔØ ÓÎÑÔØ ÚÁÝÉÔÕ É ÐÒÏÄÏÌÖÉÔØ?"
+"Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÐ´Ð°Ð»ÐµÐ½ Ð¸Ð·-Ð·Ð° Ð¾Ð³ÑÐ°Ð½Ð¸ÑÐµÐ½Ð¸Ñ Ð´Ð¾ÑÑÑÐ¿Ð°.\n"
+"ÐÐ¾Ð¿ÑÐ¾Ð±Ð¾Ð²Ð°ÑÑ ÑÐ½ÑÑÑ Ð·Ð°ÑÐ¸ÑÑ Ð¸ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?"
 
-#: src/cmd_delete.c:58
+#: src/cmd_delete.c:59
 msgid "Remember the answer (alters config)"
-msgstr "úÁÐÏÍÎÉÔØ ÏÔ×ÅÔ (ÍÅÎÑÅÔ ÎÁÓÔÒÏÊËÕ)"
+msgstr "ÐÐ°Ð¿Ð¾Ð¼Ð½Ð¸ÑÑ Ð¾ÑÐ²ÐµÑ (Ð¼ÐµÐ½ÑÐµÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÑ)"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Access Problem"
-msgstr "ðÒÏÂÌÅÍÁ ÄÏÓÔÕÐÁ"
+msgstr "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ð´Ð¾ÑÑÑÐ¿Ð°"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Change|Leave Alone"
-msgstr "óÍÅÎÉÔØ|ïÓÔÁ×ÉÔØ"
+msgstr "Ð¡Ð¼ÐµÐ½Ð¸ÑÑ|ÐÑÑÐ°Ð²Ð¸ÑÑ"
 
-#: src/cmd_delete.c:236
+#: src/cmd_delete.c:215
 #, c-format
 msgid "Really Delete \"%s\"?"
-msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÕÄÁÌÉÔØ \"%s\" ?"
+msgstr "ÐÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ´Ð°Ð»Ð¸ÑÑ \"%s\" ?"
 
-#: src/cmd_delete.c:237
+#: src/cmd_delete.c:216
 msgid "Deleting..."
-msgstr "õÄÁÌÅÎÉÅ..."
+msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ..."
 
-#: src/cmd_delete.c:292
+#: src/cmd_delete.c:279
 msgid "On Access Failure"
-msgstr "÷ ÓÌÕÞÁÅ ÎÅÈ×ÁÔËÉ ÐÒÁ×"
+msgstr "Ð ÑÐ»ÑÑÐ°Ðµ Ð½ÐµÑÐ²Ð°ÑÐºÐ¸ Ð¿ÑÐ°Ð²"
 
-#: src/cmd_delete.c:293
+#: src/cmd_delete.c:280
 msgid "Ask User|Automatically Try Changing, and Retry|Fail"
-msgstr "óÐÒÏÓÉÔØ|ðÏÐÙÔÁÔØÓÑ ÓÍÅÎÉÔØ É ÐÒÏÄÏÌÖÉÔØ|ðÒÅÒ×ÁÔØ"
+msgstr "Ð¡Ð¿ÑÐ¾ÑÐ¸ÑÑ|ÐÐ¾Ð¿ÑÑÐ°ÑÑÑÑ ÑÐ¼ÐµÐ½Ð¸ÑÑ Ð¸ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ|ÐÑÐµÑÐ²Ð°ÑÑ"
 
-#: src/cmd_dpfocus.c:183
-msgid "Wrap Around At Top And Bottom?"
-msgstr "ðÅÒÅÓËÁËÉ×ÁÔØ × ÄÒÕÇÏÊ ËÏÎÅÃ ÓÐÉÓËÁ?"
+#: src/cmd_dpfocus.c:33
+msgid "DpFocus Command is Deprecated"
+msgstr ""
+
+#: src/cmd_dpfocus.c:34
+msgid ""
+"The <tt>DpFocus</tt> command has been deprecated and is no longer supported. "
+"Please remove any keyboard or mouse bindings that use it and look into using "
+"the default GTK+ list view's cursor controls."
+msgstr ""
 
-#: src/cmd_dpfocus.c:184
+#: src/cmd_dpfocus.c:64
 msgid "Treat Focused Row As Selection If No \"Real\" Selection Exists?"
-msgstr "ïÂÒÁÂÁÔÙ×ÁÔØ ËÕÒÓÏÒ ËÁË ×ÙÄÅÌÅÎÉÅ, ÅÓÌÉ ÎÅÔ \"îÁÓÔÏÑÝÅÇÏ\" ×ÙÄÅÌÅÎÉÑ"
+msgstr "ÐÐ±ÑÐ°Ð±Ð°ÑÑÐ²Ð°ÑÑ ÐºÑÑÑÐ¾Ñ ÐºÐ°Ðº Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ, ÐµÑÐ»Ð¸ Ð½ÐµÑ \"ÐÐ°ÑÑÐ¾ÑÑÐµÐ³Ð¾\" Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ñ"
 
-#: src/cmd_dpfocus.c:186
+#: src/cmd_dpfocus.c:66
 msgid "Move Focus to Last Selected/Deselected Row?"
-msgstr "óÔÁ×ÉÔØ ËÕÒÓÏÒ ÎÁ ÐÏÓÌÅÄÎÉÊ ×ÙÂÒÁÎÎÙÊ ÜÌÅÍÅÎÔ?"
+msgstr "Ð¡ÑÐ°Ð²Ð¸ÑÑ ÐºÑÑÑÐ¾Ñ Ð½Ð° Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹ ÑÐ»ÐµÐ¼ÐµÐ½Ñ?"
 
-#: src/cmd_dpfocusisrch.c:220
+#: src/cmd_dpfocusisrch.c:163
 msgid "ISearch"
-msgstr "ðÏÉÓË"
+msgstr "ÐÐ¾Ð¸ÑÐº"
 
-#: src/cmd_generic.c:136
+#: src/cmd_generic.c:143
 msgid "_OK|A_ll|_Skip|_Cancel"
-msgstr "äá|÷ÓÅ|îÅÔ|ïÔÍÅÎÁ"
+msgstr "ÐÐ|ÐÑÐµ|ÐÐµÑ|ÐÑÐ¼ÐµÐ½Ð°"
 
-#: src/cmd_generic.c:137
+#: src/cmd_generic.c:144
 msgid "_OK|_Skip|_Cancel"
-msgstr "_äá|_îÅÔ|_ïÔÍÅÎÁ"
+msgstr "_ÐÐ|_ÐÐµÑ|_ÐÑÐ¼ÐµÐ½Ð°"
 
-#: src/cmd_getsize.c:49
+#: src/cmd_getsize.c:51
 msgid "Getting sizes..."
-msgstr "óÞÉÔÁÀ ÒÁÚÍÅÒ..."
+msgstr "Ð¡ÑÐ¸ÑÐ°Ñ ÑÐ°Ð·Ð¼ÐµÑ..."
 
-#: src/cmd_getsize.c:141
+#: src/cmd_getsize.c:134
 msgid "Unselect Rows When Done?"
-msgstr "óÎÑÔØ ×ÙÄÅÌÅÎÉÅ ÐÏÓÌÅ ×ÙÐÏÌÎÅÎÉÑ?"
+msgstr "Ð¡Ð½ÑÑÑ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð¿Ð¾ÑÐ»Ðµ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ?"
 
-#: src/cmd_info.c:71 src/cmd_info.c:163
-#, c-format
+#: src/cmd_info.c:68 src/errors.c:84
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr ", %s Ð·Ð°Ð½ÑÑÐ¾"
+
+#: src/cmd_info.c:72
+#, fuzzy, c-format
 msgid ""
-"%s (%s bytes,\n"
-"%s blocks)"
-msgstr ""
-"%s (%s ÂÁÊÔ),\n"
-"%s ÂÌÏËÏ×)"
+"%u dirs, %u files,\n"
+"%u symlinks, %u special files"
+msgstr "%u ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð², %u ÑÐ°Ð¹Ð»Ð¾Ð², %u ÑÑÑÐ»Ð¾Ðº"
 
-#: src/cmd_info.c:75
-#, c-format
-msgid "%u dirs, %u files, %u symlinks"
-msgstr "%u ËÁÔÁÌÏÇÏ×, %u ÆÁÊÌÏ×, %u ÓÓÙÌÏË"
+#: src/cmd_info.c:153
+msgid "Value"
+msgstr ""
 
-#: src/cmd_info.c:134
+#: src/cmd_info.c:198
 msgid "Link To"
-msgstr "óÓÙÌËÁ ÎÁ"
+msgstr "Ð¡ÑÑÐ»ÐºÐ° Ð½Ð°"
 
-#: src/cmd_info.c:145 src/cmd_select.c:399 src/dpformat.c:52
+#: src/cmd_info.c:213 src/cmd_select.c:368 src/dpformat.c:54
 msgid "Type"
-msgstr "ôÉÐ"
+msgstr "Ð¢Ð¸Ð¿"
 
-#: src/cmd_info.c:148
+#: src/cmd_info.c:216
 msgid "Location"
-msgstr "òÁÓÐÏÌÏÖÅÎÉÅ"
+msgstr "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: src/cmd_info.c:151 src/dpformat.c:36 src/window.c:200
+#: src/cmd_info.c:219 src/cmd_split.c:653 src/dpformat.c:37 src/window.c:199
 msgid "Size"
-msgstr "òÁÚÍÅÒ"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ"
 
-#: src/cmd_info.c:172
+#: src/cmd_info.c:229
+#, fuzzy, c-format
+msgid "%s (%s bytes)"
+msgstr "%Lu Ð±Ð°Ð¹Ñ"
+
+#: src/cmd_info.c:240
 msgid "Contains"
-msgstr "óÏÄÅÒÖÁÎÉÅ"
+msgstr "Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ"
 
-#: src/cmd_info.c:186
+#: src/cmd_info.c:257
 msgid "'File' Info"
-msgstr "éÎÆÏÒÍÁÃÉÑ Ï ÆÁÊÌÅ"
+msgstr "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÑÐ°Ð¹Ð»Ðµ"
 
-#: src/cmd_info.c:213 src/dpformat.c:49
+#: src/cmd_info.c:285 src/dpformat.c:50
 msgid "Accessed"
-msgstr "ðÒÏÞÉÔÁÎ"
+msgstr "ÐÑÐ¾ÑÐ¸ÑÐ°Ð½"
 
-#: src/cmd_info.c:214 src/dpformat.c:50
+#: src/cmd_info.c:286 src/dpformat.c:51
 msgid "Modified"
-msgstr "íÏÄÉÆÉÃÉÒÏ×ÁÎ"
+msgstr "ÐÐ¾Ð´Ð¸ÑÐ¸ÑÐ¸ÑÐ¾Ð²Ð°Ð½"
 
-#: src/cmd_info.c:215
+#: src/cmd_info.c:287 src/dpformat.c:53
 msgid "Changed"
-msgstr "éÚÍÅÎÅÎ"
+msgstr "ÐÐ·Ð¼ÐµÐ½ÐµÐ½"
+
+#: src/cmd_info.c:288 src/dpformat.c:52
+msgid "Created"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½"
 
-#: src/cmd_info.c:263
+#: src/cmd_info.c:290
+#, fuzzy
+msgid "Basic"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°"
+
+#: src/cmd_info.c:294
+msgid "Attributes"
+msgstr ""
+
+#: src/cmd_info.c:338
 msgid "Getting Information..."
-msgstr "óÂÏÒ ÉÎÆÏÒÍÁÃÉÉ..."
+msgstr "Ð¡Ð±Ð¾Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸..."
 
-#: src/cmd_info.c:302
+#: src/cmd_info.c:370
 msgid "Show 'file' Output?"
-msgstr "ðÏËÁÚÙ×ÁÔØ ×Ù×ÏÄ?"
+msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð²ÑÐ²Ð¾Ð´?"
 
-#: src/cmd_info.c:305
+#: src/cmd_info.c:373
 msgid "Access Date Format"
-msgstr "æÏÒÍÁÔ ÄÁÔÙ ÄÏÓÔÕÐÁ"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð´Ð°ÑÑ Ð´Ð¾ÑÑÑÐ¿Ð°"
 
-#: src/cmd_info.c:306
+#: src/cmd_info.c:374
 msgid "Modify Date Format"
-msgstr "æÏÒÍÁÔ ÄÁÔÙ ÍÏÄÉÆÉËÁÃÉÉ"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð´Ð°ÑÑ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¸Ð¸"
 
-#: src/cmd_info.c:307
+#: src/cmd_info.c:375
 msgid "Change Date Format"
-msgstr "æÏÒÍÁÔ ÄÁÔÙ ÉÚÍÅÎÅÎÉÑ"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð´Ð°ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ"
 
-#: src/cmd_info.c:308
+#: src/cmd_info.c:376
 msgid "Size Tick Mark"
-msgstr "úÎÁË ÒÁÚÄÅÌÉÔÅÌØ ÔÙÓÑÞ"
+msgstr "ÐÐ½Ð°Ðº ÑÐ°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ ÑÑÑÑÑ"
 
-#: src/cmd_join.c:47
+#: src/cmd_join.c:46
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Join?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ðÒÏÄÏÌÖÉÔØ ÏÂßÅÄÉÎÅÎÉÅ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ Ð¾Ð±ÑÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ?"
 
-#: src/cmd_join.c:76
+#: src/cmd_join.c:73
 msgid "Joining..."
-msgstr "ïÂßÅÄÉÎÅÎÉÅ..."
+msgstr "ÐÐ±ÑÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ..."
 
-#: src/cmd_join.c:162
+#: src/cmd_join.c:167
 msgid "Click and Drag Files to Reorder, Then Click Join."
-msgstr "÷ÙÄÅÌÉÔÅ ÆÁÊÌÙ, ÒÁÓÐÏÌÏÖÉÔÅ ÐÏ ÐÏÒÑÄËÕ É ÎÁÖÍÉÔÅ óÏÂÒÁÔØ."
+msgstr "ÐÑÐ´ÐµÐ»Ð¸ÑÐµ ÑÐ°Ð¹Ð»Ñ, ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶Ð¸ÑÐµ Ð¿Ð¾ Ð¿Ð¾ÑÑÐ´ÐºÑ Ð¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ Ð¡Ð¾Ð±ÑÐ°ÑÑ."
 
-#: src/cmd_join.c:170
+#: src/cmd_join.c:175
 #, c-format
 msgid "The total size is %s (%lu bytes)."
-msgstr "ïÂÝÉÊ ÒÁÚÍÅÒ %s (%lu ÂÁÊÔ)."
+msgstr "ÐÐ±ÑÐ¸Ð¹ ÑÐ°Ð·Ð¼ÐµÑ %s (%lu Ð±Ð°Ð¹Ñ)."
 
-#: src/cmd_join.c:173
+#: src/cmd_join.c:178
 #, c-format
 msgid "The total size is %lu bytes."
-msgstr "ïÂÝÉÊ ÒÁÚÍÅÒ %lu ÂÁÊÔ."
+msgstr "ÐÐ±ÑÐ¸Ð¹ ÑÐ°Ð·Ð¼ÐµÑ %lu Ð±Ð°Ð¹Ñ."
 
-#: src/cmd_join.c:215
+#: src/cmd_join.c:220
 msgid "Enter Destination File Name"
-msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÆÁÊÌÁ"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ ÑÐ°Ð¹Ð»Ð°"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "Join"
-msgstr "óÏÂÒÁÔØ"
+msgstr "Ð¡Ð¾Ð±ÑÐ°ÑÑ"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "_Join|_Cancel"
-msgstr "_óÏÂÒÁÔØ|_ïÔÍÅÎÁ"
+msgstr "_Ð¡Ð¾Ð±ÑÐ°ÑÑ|_ÐÑÐ¼ÐµÐ½Ð°"
 
 # c-format
-#: src/cmd_mkdir.c:75
+#: src/cmd_mkdir.c:65
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With MkDir?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - ÑÐ¾Ð·Ð´Ð°ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³?"
 
-#: src/cmd_mkdir.c:125
+#: src/cmd_mkdir.c:119
 msgid "Enter Name of Directory to Create"
-msgstr "÷×ÅÄÉÔÅ ÉÍÑ ËÁÔÁÌÏÇÁ"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð°"
 
-#: src/cmd_mkdir.c:133
+#: src/cmd_mkdir.c:128
 msgid "Make Directory"
-msgstr "óÏÚÄÁÔØ ËÁÔÁÌÏÇ"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³"
 
-#: src/cmd_mkdir.c:156
+#: src/cmd_mkdir.c:151
 msgid "CD Into New Directory?"
-msgstr "ðÅÒÅÊÔÉ × ËÁÔÁÌÏÇ?"
+msgstr "ÐÐµÑÐµÐ¹ÑÐ¸ Ð² ÐºÐ°ÑÐ°Ð»Ð¾Ð³?"
 
-#: src/cmd_mkdir.c:157
+#: src/cmd_mkdir.c:152
 msgid "Focus New Directory?"
-msgstr "õÓÔÁÎÏ×ÉÔØ ËÕÒÓÏÒ?"
-
-#: src/cmd_move.c:81
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"îÅ ÍÏÇÕ ÐÅÒÅÍÅÓÔÉÔØ ËÁÔÁÌÏÇ \"%s\"\n"
-"× \"%s\"\n"
-"(ÎÁÚÎÁÞÅÎÉÅ - ÐÏÄÐÁÐËÁ ÉÓÔÏÞÎÉËÁ)."
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÐºÑÑÑÐ¾Ñ?"
 
-#: src/cmd_move.c:92
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the destination contains the source."
-msgstr ""
-"îÅ ÍÏÇÕ ÐÅÒÅÍÅÓÔÉÔØ \"%s\"\n"
-"× \"%s\"\n"
-"(ÉÓÔÏÞÎÉË - ÐÏÄÐÁÐËÁ ÎÁÚÎÁÞÅÎÉÑ)."
-
-#: src/cmd_move.c:188 src/cmd_moveas.c:48
+#: src/cmd_move.c:128 src/cmd_moveas.c:51
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Move?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ÐÒÏÄÏÌÖÉÔØ ÐÅÒÅÍÅÝÅÎÉÅ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ Ð¿ÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ðµ?"
 
-#: src/cmd_move.c:189
+#: src/cmd_move.c:129
 msgid "Moving..."
-msgstr "ðÅÒÅÍÅÝÅÎÉÅ..."
+msgstr "ÐÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ðµ..."
 
-#: src/cmd_moveas.c:40
+#: src/cmd_moveas.c:41
 #, c-format
 msgid "Enter Name to Move \"%s\" As"
-msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÄÌÑ ÐÅÒÅÍÅÝÅÎÉÑ\"%s\" ËÁË"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ Ð´Ð»Ñ Ð¿ÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ñ\"%s\" ÐºÐ°Ðº"
+
+#: src/cmd_moveas.c:66
+msgid "Invalid destination name for MoveAs"
+msgstr ""
 
 #: src/cmd_moveas.c:74
 msgid "Moving As..."
-msgstr "ðÅÒÅÍÅÓÔÉÔØ ËÁË..."
+msgstr "ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÐºÐ°Ðº..."
 
-#: src/cmd_moveas.c:105 src/cmd_moveas.c:110
+#: src/cmd_moveas.c:105 src/cmd_moveas.c:113
 msgid "Move As"
-msgstr "ðÅÒÅÍÅÓÔÉÔØ ËÁË"
+msgstr "ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÐºÐ°Ðº"
 
 #: src/cmd_quit.c:40
 msgid ""
 "You may have some unsaved configuration changes.\n"
 "Quitting without saving will lose them. Really quit?"
 msgstr ""
-"õ ×ÁÓ ÍÏÇÕÔ ÂÙÔØ ÎÅÓÏÈÒÁÎÅÎÎÙÅ ÉÚÍÅÎÅÎÉÑ ÎÁÓÔÒÏÅË.\n"
-"÷ÙÈÏÄ ÂÅÚ ÓÏÈÒÁÎÅÎÉÑ ÐÒÉ×ÅÄÅÔ Ë ÐÏÔÅÒÅ ÉÚÍÅÎÅÎÉÊ. õ×ÅÒÅÎÙ?"
+"Ð£ Ð²Ð°Ñ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð½ÐµÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½ÑÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð°ÑÑÑÐ¾ÐµÐº.\n"
+"ÐÑÑÐ¾Ð´ Ð±ÐµÐ· ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ Ð¿ÑÐ¸Ð²ÐµÐ´ÐµÑ Ðº Ð¿Ð¾ÑÐµÑÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹. Ð£Ð²ÐµÑÐµÐ½Ñ?"
 
 #: src/cmd_quit.c:42 src/cmd_quit.c:54
 msgid "Confirm Quitting"
-msgstr "ðÏÔ×ÅÒÄÉÔÅ ×ÙÈÏÄ"
+msgstr "ÐÐ¾ÑÐ²ÐµÑÐ´Ð¸ÑÐµ Ð²ÑÑÐ¾Ð´"
 
 #: src/cmd_quit.c:42
 msgid "_Quit|_Save, then Quit|_Cancel"
-msgstr "_÷ÙÊÔÉ|_óÏÈÒÁÎÉÔØ,×ÙÊÔÉ|_ïÔÍÅÎÁ"
+msgstr "_ÐÑÐ¹ÑÐ¸|_Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ,Ð²ÑÐ¹ÑÐ¸|_ÐÑÐ¼ÐµÐ½Ð°"
 
 #: src/cmd_quit.c:54
 msgid "Are you sure you want to quit?"
-msgstr "äÅÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ×ÙÊÔÉ?"
+msgstr "ÐÐµÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð²ÑÐ¹ÑÐ¸?"
 
-#: src/cmd_rename.c:44
+#: src/cmd_rename.c:57
 #, c-format
 msgid "Enter New Name For \"%s\""
-msgstr "÷×ÅÄÉÔÅ ÎÏ×ÏÅ ÉÍÑ ÄÌÑ \"%s\""
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð½Ð¾Ð²Ð¾Ðµ Ð¸Ð¼Ñ Ð´Ð»Ñ \"%s\""
 
-#: src/cmd_rename.c:52 src/cmd_renamere.c:147 src/cmd_renamere.c:243
-#: src/cmd_renamere.c:293 src/cmd_renamere.c:388 src/cmd_renameseq.c:161
+#: src/cmd_rename.c:67 src/cmd_renamere.c:142 src/cmd_renamere.c:225
+#: src/cmd_renamere.c:268 src/cmd_renamere.c:367 src/cmd_renameseq.c:152
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Rename?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ÐÒÏÄÏÌÖÉÔØ ÐÅÒÅÉÍÅÎÏ×ÁÎÉÅ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ðµ?"
 
-#: src/cmd_rename.c:132
+#: src/cmd_rename.c:245
 msgid "Rename"
-msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ"
+msgstr "ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ"
 
-#: src/cmd_renamere.c:260
-msgid "Regular expression error:\n"
-msgstr "ïÛÉÂËÁ ×ÙÒÁÖÅÎÉÑ:\n"
+#: src/cmd_rename.c:261
+msgid "Rename Single File In-Place (Without Dialog)?"
+msgstr ""
 
-#: src/cmd_renamere.c:446
+#: src/cmd_renamere.c:419
 msgid ""
 "Look for substring in all filenames, and replace\n"
 "it with another string."
 msgstr ""
-"éÝÅÔ ÐÏÄÓÔÒÏËÕ ×Ï ×ÓÅÈ ÉÍÅÎÁÈ ÆÁÊÌÏ× É ÚÁÍÅÎÑÅÔ\n"
-"ÎÁ ÄÒÕÇÕÀ ÐÏÄÓÔÒÏËÕ."
+"ÐÑÐµÑ Ð¿Ð¾Ð´ÑÑÑÐ¾ÐºÑ Ð²Ð¾ Ð²ÑÐµÑ Ð¸Ð¼ÐµÐ½Ð°Ñ ÑÐ°Ð¹Ð»Ð¾Ð² Ð¸ Ð·Ð°Ð¼ÐµÐ½ÑÐµÑ\n"
+"Ð½Ð° Ð´ÑÑÐ³ÑÑ Ð¿Ð¾Ð´ÑÑÑÐ¾ÐºÑ."
 
-#: src/cmd_renamere.c:449
+#: src/cmd_renamere.c:422
 msgid "Replace"
-msgstr "úÁÍÅÎÉÔØ"
+msgstr "ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ"
 
-#: src/cmd_renamere.c:453
+#: src/cmd_renamere.c:426
 msgid "With"
-msgstr "îÁ"
+msgstr "ÐÐ°"
 
-#: src/cmd_renamere.c:461
+#: src/cmd_renamere.c:434
 msgid "Replace All?"
-msgstr "÷ÓÅ ×ÈÏÖÄÅÎÉÑ?"
+msgstr "ÐÑÐµ Ð²ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ñ?"
 
-#: src/cmd_renamere.c:465
+#: src/cmd_renamere.c:438
 msgid "Simple"
-msgstr "ðÒÏÓÔÁÑ"
+msgstr "ÐÑÐ¾ÑÑÐ°Ñ"
 
-#: src/cmd_renamere.c:469
+#: src/cmd_renamere.c:442
 msgid ""
 "Execute the 'From' RE on each filename, storing\n"
 "parenthesised subexpression matches. Then replace\n"
@@ -1743,25 +1738,25 @@
 "(counting from 1) of a subexpression, with the text\n"
 "that matched, and use the result as a new filename."
 msgstr ""
-"÷ÙÞÉÓÌÉÔØ ×ÙÒÁÖÅÎÉÅ \"îÁÊÔÉ\" ÎÁ ËÁÖÄÏÍ ÆÁÊÌÅ\n"
-"ÓÏÄÅÒÖÁÝÅÍ ÐÏÄÓÔÒÏËÕ ÉÚ ×ÙÒÁÖÅÎÉÑ. úÁÔÅÍ ÚÁÍÅÎÉÔØ \n"
-"×ÓÅ ×ÈÏÖÄÅÎÉÑ $n × \"úÁÍÅÎÉÔØ\" ÇÄÅ n - ÎÏÍÅÒ \n"
-"(ÎÁÞÉÎÁÑ Ó 1) ÐÏÄ×ÙÒÁÖÅÎÉÑ Ó ÓÏ×ÐÁÄÁÀÝÉÍ ÔÅËÓÔÏÍ\n"
-"ÐÏÉÓËÁ É ÉÓÐÏÌØÚÏ×ÁÔØ ÒÅÚÕÌØÔÁÔ ËÁË ÎÏ×ÏÅ ÉÍÑ ÆÁÊÌÁ."
+"ÐÑÑÐ¸ÑÐ»Ð¸ÑÑ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ \"ÐÐ°Ð¹ÑÐ¸\" Ð½Ð° ÐºÐ°Ð¶Ð´Ð¾Ð¼ ÑÐ°Ð¹Ð»Ðµ\n"
+"ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÐµÐ¼ Ð¿Ð¾Ð´ÑÑÑÐ¾ÐºÑ Ð¸Ð· Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ. ÐÐ°ÑÐµÐ¼ Ð·Ð°Ð¼ÐµÐ½Ð¸ÑÑ \n"
+"Ð²ÑÐµ Ð²ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ñ $n Ð² \"ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ\" Ð³Ð´Ðµ n - Ð½Ð¾Ð¼ÐµÑ \n"
+"(Ð½Ð°ÑÐ¸Ð½Ð°Ñ Ñ 1) Ð¿Ð¾Ð´Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ñ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑÑÐ¸Ð¼ ÑÐµÐºÑÑÐ¾Ð¼\n"
+"Ð¿Ð¾Ð¸ÑÐºÐ° Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐµÐ·ÑÐ»ÑÑÐ°Ñ ÐºÐ°Ðº Ð½Ð¾Ð²Ð¾Ðµ Ð¸Ð¼Ñ ÑÐ°Ð¹Ð»Ð°."
 
-#: src/cmd_renamere.c:477 src/cmd_renamere.c:500
+#: src/cmd_renamere.c:450 src/cmd_renamere.c:473
 msgid "From"
-msgstr "îÁÊÔÉ"
+msgstr "ÐÐ°Ð¹ÑÐ¸"
 
-#: src/cmd_renamere.c:481 src/cmd_renamere.c:504
+#: src/cmd_renamere.c:454 src/cmd_renamere.c:477
 msgid "To"
-msgstr "úÁÍÅÎÉÔØ"
+msgstr "ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ"
 
-#: src/cmd_renamere.c:489
+#: src/cmd_renamere.c:462
 msgid "Reg Exp"
-msgstr "÷ÙÒÁÖÅÎÉÅ"
+msgstr "ÐÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: src/cmd_renamere.c:494
+#: src/cmd_renamere.c:467
 msgid ""
 "Look for each character in the 'From' string, and replace\n"
 "any hits with the corresponding character in the 'To' string.\n"
@@ -1769,902 +1764,1140 @@
 "the filename, and the result used as the new name for each file."
 msgstr ""
 
-#: src/cmd_renamere.c:513
+#: src/cmd_renamere.c:486
 msgid "Map"
 msgstr ""
 
-#: src/cmd_renamere.c:517
+#: src/cmd_renamere.c:490
 msgid ""
 "Changes the case (upper/lower) of the characters\n"
 "in the selected filename(s)."
 msgstr ""
 
-#: src/cmd_renamere.c:519
+#: src/cmd_renamere.c:492
 msgid "Lower Case?"
-msgstr "îÉÖÎÉÊ ÒÅÇÉÓÔÒ?"
+msgstr "ÐÐ¸Ð¶Ð½Ð¸Ð¹ ÑÐµÐ³Ð¸ÑÑÑ?"
 
-#: src/cmd_renamere.c:521
+#: src/cmd_renamere.c:494
 msgid "Upper Case?"
-msgstr "÷ÅÒÈÎÉÊ ÒÅÇÉÓÔÒ?"
+msgstr "ÐÐµÑÑÐ½Ð¸Ð¹ ÑÐµÐ³Ð¸ÑÑÑ?"
 
-#: src/cmd_renamere.c:523
+#: src/cmd_renamere.c:496
 #, fuzzy
 msgid "Upper Case Initial?"
-msgstr "÷ÅÒÈÎÉÊ ÒÅÇÉÓÔÒ?"
+msgstr "ÐÐµÑÑÐ½Ð¸Ð¹ ÑÐµÐ³Ð¸ÑÑÑ?"
 
-#: src/cmd_renamere.c:526
+#: src/cmd_renamere.c:499
 msgid "Case"
-msgstr "æÏÒÍÁ"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°"
 
-#: src/cmd_renamere.c:528
+#: src/cmd_renamere.c:501
 msgid "RenameRE"
-msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØõóì"
+msgstr "ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑÐ£Ð¡Ð"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "10, Decimal"
-msgstr "10, äÅÓÑÔÉÞÎÁÑ"
+msgstr "10, ÐÐµÑÑÑÐ¸ÑÐ½Ð°Ñ"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (A-F)"
-msgstr "16, ûÅÓÔÎÁÄÃÅÔÅÒÉÞÎÁÑ (A-F)"
+msgstr "16, Ð¨ÐµÑÑÐ½Ð°Ð´ÑÐµÑÐµÑÐ¸ÑÐ½Ð°Ñ (A-F)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (a-f)"
-msgstr "16, ûÅÓÔÎÁÄÃÅÔÅÒÉÞÎÁÑ (a-f)"
+msgstr "16, Ð¨ÐµÑÑÐ½Ð°Ð´ÑÐµÑÐµÑÐ¸ÑÐ½Ð°Ñ (a-f)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "8, Octal"
-msgstr "8, ÷ÏÓØÍÅÒÉÞÎÁÑ"
+msgstr "8, ÐÐ¾ÑÑÐ¼ÐµÑÐ¸ÑÐ½Ð°Ñ"
 
-#: src/cmd_renameseq.c:328
+#: src/cmd_renameseq.c:306
 msgid ""
 "This command renames all selected files\n"
 "into a numbered sequence. The controls\n"
 "below let you define how the names are\n"
 "formed."
 msgstr ""
-"üÔÁ ËÏÍÁÎÄÁ ÐÅÒÅÉÍÅÎÏ×Ù×ÁÅÔ ×ÓÅ ×ÙÄÅÌÅÎÎÙÅ\n"
-"ÆÁÊÌÙ × ÎÕÍÅÒÏ×ÁÎÎÕÀ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ.\n"
-"ëÎÏÐËÉ ÕÐÒÁ×ÌÅÎÉÑ ÎÉÖÅ ÐÏÚ×ÏÌÑÀÔ ÏÐÒÅÄÅÌÉÔØ\n"
-"ÐÏÒÑÄÏË ÆÏÒÍÉÒÏ×ÁÎÉÑ ÉÍÅÎ ÆÁÊÌÏ×."
+"ÐÑÐ° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²ÑÐ²Ð°ÐµÑ Ð²ÑÐµ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð½ÑÐµ\n"
+"ÑÐ°Ð¹Ð»Ñ Ð² Ð½ÑÐ¼ÐµÑÐ¾Ð²Ð°Ð½Ð½ÑÑ Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»ÑÐ½Ð¾ÑÑÑ.\n"
+"ÐÐ½Ð¾Ð¿ÐºÐ¸ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¸Ð¶Ðµ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑÑ Ð¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ\n"
+"Ð¿Ð¾ÑÑÐ´Ð¾Ðº ÑÐ¾ÑÐ¼Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð¼ÐµÐ½ ÑÐ°Ð¹Ð»Ð¾Ð²."
 
-#: src/cmd_renameseq.c:335
+#: src/cmd_renameseq.c:313
 msgid "Start At"
-msgstr "îÁÞÁÔØ Ó"
+msgstr "ÐÐ°ÑÐ°ÑÑ Ñ"
 
-#: src/cmd_renameseq.c:343 src/cmd_split.c:247
+#: src/cmd_renameseq.c:323 src/cmd_split.c:609
 msgid "Base"
-msgstr "æÏÒÍÁ"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°"
 
-#: src/cmd_renameseq.c:359
+#: src/cmd_renameseq.c:333
 msgid "Precision"
-msgstr "ëÏÌ-×Ï ÚÎÁËÏ×"
+msgstr "ÐÐ¾Ð»-Ð²Ð¾ Ð·Ð½Ð°ÐºÐ¾Ð²"
 
-#: src/cmd_renameseq.c:367
+#: src/cmd_renameseq.c:340
 msgid "Head"
-msgstr "îÁÞÁÌÏ"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾"
 
-#: src/cmd_renameseq.c:374
+#: src/cmd_renameseq.c:347
 msgid "Tail"
-msgstr "ïËÏÎÞÁÎÉÅ"
+msgstr "ÐÐºÐ¾Ð½ÑÐ°Ð½Ð¸Ðµ"
 
-#: src/cmd_renameseq.c:382
+#: src/cmd_renameseq.c:354
 msgid "Guess"
-msgstr "ðÏÄÓÔÁ×ÉÔØ"
+msgstr "ÐÐ¾Ð´ÑÑÐ°Ð²Ð¸ÑÑ"
 
-#: src/cmd_renameseq.c:396
+#: src/cmd_renameseq.c:369
 msgid "Sequential Rename"
-msgstr "ðÅÒÅÉÍÅÎÏ×ÁÎÉÅ × ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
+msgstr "ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð² Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»ÑÐ½Ð¾ÑÑÑ"
 
-#: src/cmd_select.c:396
+#: src/cmd_select.c:365
 msgid "All rows|Selected|Unselected|"
-msgstr "÷ÓÅ ÜÌÅÍÅÎÔÙ|ïÔÍÅÞÅÎÎÙÅ|òÁÚÏÔÍÅÞÅÎÎÙÅ|"
+msgstr "ÐÑÐµ ÑÐ»ÐµÐ¼ÐµÐ½ÑÑ|ÐÑÐ¼ÐµÑÐµÐ½Ð½ÑÐµ|Ð Ð°Ð·Ð¾ÑÐ¼ÐµÑÐµÐ½Ð½ÑÐµ|"
 
-#: src/cmd_select.c:397
+#: src/cmd_select.c:366
 msgid "All types|Directories only|Non-directories only|"
-msgstr "÷ÓÅ ÔÉÐÙ|ëÁÔÁÌÏÇÉ|âÅÚ ËÁÔÁÌÏÇÏ×|"
+msgstr "ÐÑÐµ ÑÐ¸Ð¿Ñ|ÐÐ°ÑÐ°Ð»Ð¾Ð³Ð¸|ÐÐµÐ· ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð²|"
 
-#: src/cmd_select.c:398
+#: src/cmd_select.c:367
 msgid "Select|Unselect|Toggle|"
-msgstr "ïÔÍÅÔÉÔØ|òÁÚÏÔÍÅÔÉÔØ|ðÅÒÅ×ÅÒÎÕÔØ|"
+msgstr "ÐÑÐ¼ÐµÑÐ¸ÑÑ|Ð Ð°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ|ÐÐµÑÐµÐ²ÐµÑÐ½ÑÑÑ|"
 
-#: src/cmd_select.c:399 src/menus.c:530
+#: src/cmd_select.c:368 src/menus.c:537
 msgid "Action"
-msgstr "äÅÊÓÔ×ÉÅ"
+msgstr "ÐÐµÐ¹ÑÑÐ²Ð¸Ðµ"
 
-#: src/cmd_select.c:399
+#: src/cmd_select.c:368
 msgid "Set"
-msgstr "õÓÔÁÎÏ×ÉÔØ"
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ"
 
-#: src/cmd_select.c:511
+#: src/cmd_select.c:469
 msgid "Treat RE as Glob Pattern?"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ ×ÙÒÁÖÅÎÉÅ ËÁË ÇÌÏÂ. ÍÁÓËÕ?"
+msgstr "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ ÐºÐ°Ðº Ð³Ð»Ð¾Ð±. Ð¼Ð°ÑÐºÑ?"
 
-#: src/cmd_select.c:514
+#: src/cmd_select.c:472
 msgid "Invert RE Matching?"
-msgstr "îÅ ÕÄÏ×ÌÅÔ×ÏÒÑÀÝÉÅ ×ÙÒÁÖÅÎÉÀ?"
+msgstr "ÐÐµ ÑÐ´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÑÑÑÐ¸Ðµ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ?"
 
-#: src/cmd_select.c:517
+#: src/cmd_select.c:475
 msgid "Require Match on Full Name?"
-msgstr "ðÏ ÐÏÌÎÏÍÕ ÉÍÅÎÉ?"
+msgstr "ÐÐ¾ Ð¿Ð¾Ð»Ð½Ð¾Ð¼Ñ Ð¸Ð¼ÐµÐ½Ð¸?"
 
-#: src/cmd_select.c:531
+#: src/cmd_select.c:489
 msgid "Select Using RE"
-msgstr "÷ÙÂÏÒ ÉÓÐÏÌØÚÕÑ ×ÙÒÁÖÅÎÉÅ"
+msgstr "ÐÑÐ±Ð¾Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: src/cmd_select.c:815
+#: src/cmd_select.c:727
 msgid ""
 "Enter shell command to run. The command\n"
 "will have the selected content appended.\n"
 "Action is performed on successful exit."
 msgstr ""
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "OK|Cancel"
-msgstr "_äá|_ïÔÍÅÎÁ"
+msgstr "_ÐÐ|_ÐÑÐ¼ÐµÐ½Ð°"
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "Select using shell command"
-msgstr "÷ÙÂÅÒ ÐÏ ËÏÎÓÏÌØÎÏÊ ËÏÍÁÎÄÅ"
+msgstr "ÐÑÐ±ÐµÑ Ð¿Ð¾ ÐºÐ¾Ð½ÑÐ¾Ð»ÑÐ½Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ"
 
-#: src/cmd_split.c:68
+#: src/cmd_split.c:269
 #, c-format
 msgid ""
 "Split \"%s\".\n"
 "File is %s (%s)."
 msgstr ""
-"òÁÚÂÉÔØ \"%s\".\n"
-"ÆÁÊÌ %s (%s)."
+"Ð Ð°Ð·Ð±Ð¸ÑÑ \"%s\".\n"
+"ÑÐ°Ð¹Ð» %s (%s)."
 
-#: src/cmd_split.c:70
+#: src/cmd_split.c:271
 #, c-format
 msgid ""
 "Split \"%s\".\n"
 "File is %s."
 msgstr ""
-"òÁÚÂÉÔØ \"%s\".\n"
-"æÁÊÌ %s."
+"Ð Ð°Ð·Ð±Ð¸ÑÑ \"%s\".\n"
+"Ð¤Ð°Ð¹Ð» %s."
 
-#: src/cmd_split.c:106
+#: src/cmd_split.c:348
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Split?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ÐÒÏÄÏÌÖÉÔØ ÒÁÚÂÉ×ËÕ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÑÐ°Ð·Ð±Ð¸Ð²ÐºÑ?"
 
-#: src/cmd_split.c:171
-msgid "Beta Software"
-msgstr "âÅÔÁ ×ÅÒÓÉÑ"
+#: src/cmd_split.c:422
+msgid "Fixed Size Split"
+msgstr "Ð Ð°Ð·Ð±Ð¸Ð²ÐºÐ° Ð¿Ð¾ ÑÐ°Ð·Ð¼ÐµÑÑ"
 
-#: src/cmd_split.c:171
-msgid "Next Version?"
-msgstr "óÌÅÄÕÀÝÁÑ ×ÅÒÓÉÑ?"
+#: src/cmd_split.c:424
+msgid "Segment Size"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ ÐºÑÑÐºÐ°"
 
-#: src/cmd_split.c:171
-msgid ""
-"This splitting mode has not been\n"
-"implemented yet... Sorry."
+#: src/cmd_split.c:427
+#, fuzzy
+msgid "1457000 bytes (3.5\" floppy)"
+msgstr " 1457000 Ð±Ð°Ð¹Ñ (3.5\" Ð´Ð¸ÑÐºÐµÑÐ°)"
+
+#: src/cmd_split.c:428
+#, fuzzy
+msgid "10485760 bytes (10 MB)"
+msgstr " 1457000 Ð±Ð°Ð¹Ñ (3.5\" Ð´Ð¸ÑÐºÐµÑÐ°)"
+
+#: src/cmd_split.c:429
+#, fuzzy
+msgid "26214400 bytes (25 MB)"
+msgstr " 1457000 Ð±Ð°Ð¹Ñ (3.5\" Ð´Ð¸ÑÐºÐµÑÐ°)"
+
+#: src/cmd_split.c:430
+#, fuzzy
+msgid "52428800 bytes (50 MB)"
+msgstr " 1457000 Ð±Ð°Ð¹Ñ (3.5\" Ð´Ð¸ÑÐºÐµÑÐ°)"
+
+#: src/cmd_split.c:431
+#, fuzzy
+msgid "78643200 bytes (75 MB)"
+msgstr " 1457000 Ð±Ð°Ð¹Ñ (3.5\" Ð´Ð¸ÑÐºÐµÑÐ°)"
+
+#: src/cmd_split.c:432
+#, fuzzy
+msgid "100431360 bytes (95 MB, Zip disk)"
+msgstr "100431360 Ð±Ð°Ð¹Ñ (ÐÐ¸ÑÐº ZIP)"
+
+#: src/cmd_split.c:454
+#, fuzzy
+msgid "Fixed Count Split"
+msgstr "Ð Ð°Ð·Ð±Ð¸Ð²ÐºÐ° Ð¿Ð¾ ÑÐ°Ð·Ð¼ÐµÑÑ"
+
+#: src/cmd_split.c:457
+#, fuzzy
+msgid "Segment Count"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ ÐºÑÑÐºÐ°"
+
+#: src/cmd_split.c:503
+msgid "Current part number, unique for every created file"
 msgstr ""
-"òÅÖÉÍ ÒÁÚÂÉ×ËÉ ÅÝÅ ÎÅ \n"
-"ÒÅÁÌÉÚÏ×ÁÎ... éÚ×ÉÎÉÔÅ."
 
-#: src/cmd_split.c:187
-msgid "  1457000 bytes (3.5\" floppy)"
-msgstr " 1457000 ÂÁÊÔ (3.5\" ÄÉÓËÅÔÁ)"
+#: src/cmd_split.c:504
+msgid "The value from the Base box"
+msgstr ""
 
-#: src/cmd_split.c:188
-msgid "100431360 bytes (Zip disk)"
-msgstr "100431360 ÂÁÊÔ (äÉÓË ZIP)"
+#: src/cmd_split.c:505
+msgid "The amount that index will change for each file"
+msgstr ""
 
-#: src/cmd_split.c:190
-msgid "Fixed Size Split"
-msgstr "òÁÚÂÉ×ËÁ ÐÏ ÒÁÚÍÅÒÕ"
+#: src/cmd_split.c:506
+msgid "The total number of files that will be created"
+msgstr ""
 
-#: src/cmd_split.c:193
-msgid "Segment Size"
-msgstr "òÁÚÍÅÒ ËÕÓËÁ"
+#: src/cmd_split.c:507
+msgid "The value of index for the last file to be created"
+msgstr ""
 
-#: src/cmd_split.c:221
+#: src/cmd_split.c:570
 msgid "Fixed size, variable number of parts"
-msgstr "ðÏ ÏÐÒÅÄÅÌÅÎÎÏÍÕ ÒÁÚÍÅÒÕ ÞÁÓÔÉ"
+msgstr "ÐÐ¾ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½Ð¾Ð¼Ñ ÑÐ°Ð·Ð¼ÐµÑÑ ÑÐ°ÑÑÐ¸"
 
-#: src/cmd_split.c:222
+#: src/cmd_split.c:571
 msgid "Fixed number of parts, variable sizes"
-msgstr "îÁ ÏÐÒÅÄÅÌÅÎÎÏÅ ËÏÌÉÞÅÓÔ×Ï ÞÁÓÔÅÊ"
+msgstr "ÐÐ° Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½Ð¾Ðµ ÐºÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ ÑÐ°ÑÑÐµÐ¹"
 
-#: src/cmd_split.c:230 src/cmd_split.c:261
+#: src/cmd_split.c:580 src/cmd_split.c:663
 msgid "Split"
-msgstr "òÁÚÂÉÔØ"
+msgstr "Ð Ð°Ð·Ð±Ð¸ÑÑ"
 
-#: src/cmd_split.c:243
+#: src/cmd_split.c:599
 msgid "Name Format"
-msgstr "æÏÒÍÁÔ ÉÍÅÎÉ"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð¸Ð¼ÐµÐ½Ð¸"
 
-#: src/cmd_split.c:252
+#: src/cmd_split.c:615
 msgid "Step"
-msgstr "ûÁÇ"
+msgstr "Ð¨Ð°Ð³"
 
-#: src/cmd_symlink.c:77 src/cmd_symlink.c:246
+#: src/cmd_split.c:624
+msgid "Zero-Fill Numbers?"
+msgstr ""
+
+#: src/cmd_split.c:645
+msgid "Offset"
+msgstr ""
+
+#: src/cmd_symlink.c:68 src/cmd_symlink.c:252
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Link?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ÐÒÏÄÏÌÖÉÔØ ÓÏÚÄÁÎÉÅ ÓÓÙÌËÉ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÑÑÐ»ÐºÐ¸?"
+
+#: src/cmd_symlink.c:161 src/configure.c:239 src/icon_dialog.c:59
+#: src/progress.c:220
+msgid "Cancel"
+msgstr "ÐÑÐ¼ÐµÐ½Ð°"
+
+#: src/cmd_symlink.c:161 src/configure.c:233 src/dialog.c:290
+#: src/nag_dialog.c:36
+msgid "OK"
+msgstr "ÐÐ"
 
-#: src/cmd_symlink.c:184
+#: src/cmd_symlink.c:161
 msgid "Select Link Target"
-msgstr "÷ÙÂÅÒÉÔÅ ÃÅÌØ ÓÓÙÌËÉ"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐµÐ»Ñ ÑÑÑÐ»ÐºÐ¸"
 
-#: src/cmd_symlink.c:213
+#: src/cmd_symlink.c:218
 msgid "Contents"
-msgstr "óÏÄÅÒÖÁÎÉÅ"
+msgstr "Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ"
 
-#: src/cmd_symlink.c:225
+#: src/cmd_symlink.c:231
 msgid "Edit Symbolic Link"
-msgstr "éÚÍÅÎÉÔØ ÓÓÙÌËÕ"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÑÑÐ»ÐºÑ"
 
-#: src/cmd_symlink.c:231
+#: src/cmd_symlink.c:236
 msgid "Create Symbolic Link"
-msgstr "óÏÚÄÁÎÉÅ ÓÓÙÌËÉ"
-
-#: src/cmd_viewtext.c:206
-msgid "Use mmap() to Speed Loading?"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ mmap() ÄÌÑ ÕÓËÏÒÅÎÉÑ ÚÁÇÒÕÚËÉ?"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÑÑÐ»ÐºÐ¸"
 
-#: src/cmd_viewtext.c:208
+#: src/cmd_viewtext.c:205
 msgid "Hex-Check First"
-msgstr "ðÒÏ×ÅÒÉÔØ ÓÉÍ×ÏÌÙ"
+msgstr "ÐÑÐ¾Ð²ÐµÑÐ¸ÑÑ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ"
 
-#: src/cmd_viewtext.c:209
+#: src/cmd_viewtext.c:206
 msgid "Exit on Left Arrow Key?"
 msgstr ""
 
 #: src/cmdarg.c:201
 msgid "on"
-msgstr "×ËÌ"
+msgstr "Ð²ÐºÐ»"
 
 #: src/cmdarg.c:201
 msgid "true"
-msgstr "éÓÔÉÎÁ"
+msgstr "ÐÑÑÐ¸Ð½Ð°"
 
 #: src/cmdarg.c:201
 msgid "yes"
-msgstr "ÄÁ"
+msgstr "Ð´Ð°"
 
-#: src/cmdgrab.c:222
+#: src/cmdgrab.c:177
 #, c-format
 msgid "Output of %s (pid %d)"
-msgstr "÷Ù×ÏÄ %s (pid %d)"
+msgstr "ÐÑÐ²Ð¾Ð´ %s (pid %d)"
 
 #: src/cmdseq.c:354 src/cmdseq.c:369
 #, c-format
 msgid ""
 "Unable to execute unknown\n"
 "command \"%s\"."
-msgstr "îÅ ÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ \"%s\"."
+msgstr "ÐÐµ Ð¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° \"%s\"."
 
-#: src/cmdseq_dialog.c:126
+#: src/cmdseq_dialog.c:134
 #, c-format
 msgid "Built-Ins (%u)"
-msgstr "÷ÓÔÒÏÅÎÙÅ (%u)"
+msgstr "ÐÑÑÑÐ¾ÐµÐ½ÑÐµ (%u)"
 
-#: src/cmdseq_dialog.c:131
+#: src/cmdseq_dialog.c:139
 #, c-format
 msgid "User Defined (%u)"
-msgstr "ïÐÒÅÄÅÌÅÎÎÙÅ (%u)"
+msgstr "ÐÐ¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½ÑÐµ (%u)"
 
-#: src/cmdseq_dialog.c:302
+#: src/cmdseq_dialog.c:313
 msgid ""
 "Select a command, or type start\n"
 "of name and press TAB."
 msgstr ""
-"÷ÙÂÅÒÉÔÅ ËÏÍÁÎÄÕ ÉÌÉ ÎÁÂÅÒÉÔÅ\n"
-"ÎÁÞÁÌÏ É ÎÁÖÍÉÔÅ TAB"
+"ÐÑÐ±ÐµÑÐ¸ÑÐµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð¸Ð»Ð¸ Ð½Ð°Ð±ÐµÑÐ¸ÑÐµ\n"
+"Ð½Ð°ÑÐ°Ð»Ð¾ Ð¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ TAB"
 
-#: src/cmdseq_dialog.c:319
+#: src/cmdseq_dialog.c:330
 msgid "Select Command"
-msgstr "÷ÙÂÅÒÉÔÅ ËÏÍÁÎÄÕ"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ"
 
-#: src/configure.c:198
+#: src/configure.c:197
 msgid "Couldn't open configuration file for output"
-msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ ÎÁÓÔÒÏÊËÉ ÄÌÑ ÚÁÐÉÓÉ"
-
-#: src/configure.c:234 src/dialog.c:285
-msgid "OK"
-msgstr "äá"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¾ÑÐºÑÑÑÑ ÑÐ°Ð¹Ð» Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸ÑÐ¸"
 
-#: src/configure.c:240
+#: src/configure.c:236
 msgid "Save"
-msgstr "óÏÈÒÁÎÉÔØ"
+msgstr "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ"
 
-#: src/configure.c:244 src/icon_dialog.c:59 src/progress.c:219
-msgid "Cancel"
-msgstr "ïÔÍÅÎÁ"
-
-#: src/configure.c:455
+#: src/configure.c:463
 #, c-format
 msgid "Config file version (%s) doesn't match program version (%s)"
-msgstr "÷ÅÒÓÉÑ ÆÁÊÌÁ ÎÁÓÔÒÏÅË (%s) ÎÅ ÓÏ×ÐÁÄÁÅÔ Ó ×ÅÒÓÉÅÊ ÐÒÏÇÒÁÍÍÙ (%s)"
+msgstr "ÐÐµÑÑÐ¸Ñ ÑÐ°Ð¹Ð»Ð° Ð½Ð°ÑÑÑÐ¾ÐµÐº (%s) Ð½Ðµ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÐµÑ Ñ Ð²ÐµÑÑÐ¸ÐµÐ¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ (%s)"
 
-#: src/configure.c:467
+#: src/configure.c:475
 #, c-format
 msgid ""
 "Couldn't find any configuration file; checked\n"
 "both \"%s\" and \"%s\".\n"
 "Using built-in minimal configuration."
 msgstr ""
-"îÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ ÎÁÓÔÒÏÅË; ÅÇÏ ÎÅÔ\n"
-"ÎÉ × \"%s\" ÎÉ × \"%s\".\n"
-"éÓÐÏÌØÚÕÀ ×ÓÔÒÏÅÎÎÕÀ ÍÉÎÉÍÁÌØÎÕÀ ÎÁÓÔÒÏÊËÕ."
+"ÐÐµ Ð¼Ð¾Ð³Ñ Ð½Ð°Ð¹ÑÐ¸ ÑÐ°Ð¹Ð» Ð½Ð°ÑÑÑÐ¾ÐµÐº; ÐµÐ³Ð¾ Ð½ÐµÑ\n"
+"Ð½Ð¸ Ð² \"%s\" Ð½Ð¸ Ð² \"%s\".\n"
+"ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÑ Ð²ÑÑÑÐ¾ÐµÐ½Ð½ÑÑ Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»ÑÐ½ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÑ."
 
-#: src/dialog.c:123 src/dialog.c:253
+#: src/dialog.c:124 src/dialog.c:260
 msgid "_OK|_Cancel"
-msgstr "_äá|_ïÔÍÅÎÁ"
-
-#: src/dirpane.c:134
-msgid ""
-"Case-sensitive sorting will not work correctly with non-ASCII characters"
-msgstr "óÏÒÔÉÒÏ×ËÁ Ó ÕÞÅÔÏÍ ÒÅÇÉÓÔÒÁ ÒÁÂÏÔÁÅÔ ÎÅ×ÅÒÎÏ Ó ÒÕÓÓËÉÍÉ ÂÕË×ÁÍÉ"
+msgstr "_ÐÐ|_ÐÑÐ¼ÐµÐ½Ð°"
 
-#: src/dirpane.c:143
-msgid ""
-"Case-insensitive sorting will not work correctly with non-ASCII characters"
-msgstr "óÏÒÔÉÒÏ×ËÁ ÂÅÚ ÕÞÅÔÁ ÒÅÇÉÓÔÒÁ ÒÁÂÏÔÁÅÔ ÎÅ×ÅÒÎÏ Ó ÒÕÓÓËÉÍÉ ÂÕË×ÁÍÉ"
-
-#: src/dirpane.c:1189
+#: src/dirpane.c:541
 #, c-format
 msgid "%u/%u dirs, %u/%u files"
-msgstr "%u/%u ËÁÔÁÌÏÇÏ×, %u/%u ÆÁÊÌÏ×"
+msgstr "%u/%u ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð², %u/%u ÑÐ°Ð¹Ð»Ð¾Ð²"
 
-#: src/dirpane.c:1197
-#, fuzzy, c-format
-msgid " (%%s/%%s, %%%s/%%%s blocks)"
-msgstr " (%s/%s, %Lu/%Lu ÂÌÏËÏ×)"
+#: src/dirpane.c:546
+#, c-format
+msgid " (%s/%s)"
+msgstr ""
 
-#: src/dirpane.c:1210
+#: src/dirpane.c:557
 #, fuzzy, c-format
 msgid ", %s (%s) used"
-msgstr ", %s ÚÁÎÑÔÏ"
+msgstr ", %s Ð·Ð°Ð½ÑÑÐ¾"
 
-#: src/dirpane.c:1212
+#: src/dirpane.c:559
 #, c-format
 msgid ", %s free"
-msgstr ", %s Ó×ÏÂÏÄÎÏ"
-
-#: src/dirpane.c:1560
-msgid "!!Invalid filename!!"
-msgstr ""
+msgstr ", %s ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾"
 
-#: src/dirpane.c:2004 src/dirpane.c:2053
+#: src/dirpane.c:2084 src/dirpane.c:2131
 msgid "Move up to the parent directory"
-msgstr "ðÅÒÅÊÔÉ × ÒÏÄÉÔÅÌØÓËÉÊ ËÁÔÁÌÏÇ"
+msgstr "ÐÐµÑÐµÐ¹ÑÐ¸ Ð² ÑÐ¾Ð´Ð¸ÑÐµÐ»ÑÑÐºÐ¸Ð¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³"
 
-#: src/dirpane.c:2026
+#: src/dirpane.c:2106
 msgid "Enter path, then press Return to go there"
-msgstr "÷×ÅÄÉÔÅ ÐÕÔØ É ÎÁÖÍÉÔÅ ÷×ÏÄ ÄÌÑ ÐÅÒÅÈÏÄÁ"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¿ÑÑÑ Ð¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐÐ²Ð¾Ð´ Ð´Ð»Ñ Ð¿ÐµÑÐµÑÐ¾Ð´Ð°"
 
-#: src/dirpane.c:2027
+#: src/dirpane.c:2107
 msgid "H"
-msgstr "ó"
+msgstr "Ð¡"
 
-#: src/dirpane.c:2031
+#: src/dirpane.c:2111
 msgid ""
 "Click to enable/disable Hide rule (When pressed in, the hide rule is active, "
 "and matching entries are hidden)"
 msgstr ""
-"îÁÖÍÉÔÅ ÄÌÑ ×ËÌÀÞÅÎÉÑ/×ÙËÌÀÞÅÎÉÑ ÐÏËÁÚÁ ÓËÒÙÔÙÈ ÜÌÅÍÅÎÔÏ×(ÎÁÖÁÔÏÅ ÓÏÓÔÏÑÎÉÅ "
-"ÏÂÏÚÎÁÞÁÅÔ ÓËÒÙÔÉÅ)"
+"ÐÐ°Ð¶Ð¼Ð¸ÑÐµ Ð´Ð»Ñ Ð²ÐºÐ»ÑÑÐµÐ½Ð¸Ñ/Ð²ÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ð¿Ð¾ÐºÐ°Ð·Ð° ÑÐºÑÑÑÑÑ ÑÐ»ÐµÐ¼ÐµÐ½ÑÐ¾Ð²(Ð½Ð°Ð¶Ð°ÑÐ¾Ðµ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ðµ "
+"Ð¾Ð±Ð¾Ð·Ð½Ð°ÑÐ°ÐµÑ ÑÐºÑÑÑÐ¸Ðµ)"
 
-#: src/dpformat.c:37
+#: src/dpformat.c:38
 msgid "Blocks"
-msgstr "âÌÏËÏ×"
+msgstr "ÐÐ»Ð¾ÐºÐ¾Ð²"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "BSize"
-msgstr "âÌÏË"
+msgstr "ÐÐ»Ð¾Ðº"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "Block Size"
-msgstr "òÁÚÍÅÒ ÂÌÏËÁ"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ Ð±Ð»Ð¾ÐºÐ°"
 
-#: src/dpformat.c:39
+#: src/dpformat.c:40
 msgid "Mode, numerical"
-msgstr "ðÒÁ×Á, × ÃÉÆÒÁÈ"
+msgstr "ÐÑÐ°Ð²Ð°, Ð² ÑÐ¸ÑÑÐ°Ñ"
 
-#: src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode, string"
-msgstr "ðÒÁ×Á, ÓÔÒÏËÏÊ"
+msgstr "ÐÑÐ°Ð²Ð°, ÑÑÑÐ¾ÐºÐ¾Ð¹"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Nlink"
-msgstr "óÓÙÌÏË"
+msgstr "Ð¡ÑÑÐ»Ð¾Ðº"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Number of links"
-msgstr "þÉÓÌÏ ÓÓÙÌÏË"
+msgstr "Ð§Ð¸ÑÐ»Ð¾ ÑÑÑÐ»Ð¾Ðº"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Owner ID"
-msgstr "îÏÍÅÒ ×ÌÁÄÅÌØÃÁ"
+msgstr "ÐÐ¾Ð¼ÐµÑ Ð²Ð»Ð°Ð´ÐµÐ»ÑÑÐ°"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Uid"
-msgstr "N×ÌÁÄ"
+msgstr "NÐ²Ð»Ð°Ð´"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Owner Name"
-msgstr "éÍÑ ×ÌÁÄÅÌØÃÁ"
+msgstr "ÐÐ¼Ñ Ð²Ð»Ð°Ð´ÐµÐ»ÑÑÐ°"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Uname"
-msgstr "÷ÌÁÄÅÌÅÃ"
+msgstr "ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Gid"
-msgstr "NÇÒÕÐ"
+msgstr "NÐ³ÑÑÐ¿"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Group ID"
-msgstr "îÏÍÅÒ ÇÒÕÐÐÙ"
+msgstr "ÐÐ¾Ð¼ÐµÑ Ð³ÑÑÐ¿Ð¿Ñ"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Gname"
-msgstr "çÒÕÐÐÁ"
+msgstr "ÐÑÑÐ¿Ð¿Ð°"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Group Name"
-msgstr "éÍÑ ÇÒÕÐÐÙ"
+msgstr "ÐÐ¼Ñ Ð³ÑÑÐ¿Ð¿Ñ"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device"
-msgstr "õÓÔÒÏÊÓÔ×Ï"
+msgstr "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device Number"
-msgstr "îÏÍÅÒ ÕÓÔÒÏÊÓÔ×Á"
+msgstr "ÐÐ¾Ð¼ÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "DevMaj"
-msgstr "NõÓÔÒï"
+msgstr "NÐ£ÑÑÑÐ"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "Device Number, major"
-msgstr "îÏÍÅÒ ÕÓÔÒÏÊÓÔ×Á, ÏÓÎÏ×ÎÏÊ"
+msgstr "ÐÐ¾Ð¼ÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð¹"
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "DevMin"
-msgstr "NõÓÔÒîï"
-
-#: src/dpformat.c:48
-msgid "Device Number, minor"
-msgstr "îÏÍÅÒ ÕÓÔÒÏÊÓÔ×Á, ÎÅÏÓÎÏ×ÎÏÊ"
+msgstr "NÐ£ÑÑÑÐÐ"
 
 #: src/dpformat.c:49
-msgid "Date of last Access"
-msgstr "÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÇÏ ÄÏÓÔÕÐÁ"
+msgid "Device Number, minor"
+msgstr "ÐÐ¾Ð¼ÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, Ð½ÐµÐ¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð¹"
 
 #: src/dpformat.c:50
-msgid "Date of last Modification"
-msgstr "÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÍÏÄÉÆÉËÁÃÉÉ"
-
-#: src/dpformat.c:51
-msgid "Created"
-msgstr "óÏÚÄÁÎ"
+#, fuzzy
+msgid "Time of Last Access"
+msgstr "ÐÑÐµÐ¼Ñ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÐµÐ³Ð¾ Ð´Ð¾ÑÑÑÐ¿Ð°"
 
 #: src/dpformat.c:51
-msgid "Date of Creation"
-msgstr "÷ÒÅÍÑ ÓÏÚÄÁÎÉÑ"
+#, fuzzy
+msgid "Time of Last Modification"
+msgstr "ÐÑÐµÐ¼Ñ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÐµÐ¹ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¸Ð¸"
 
 #: src/dpformat.c:52
-msgid "Type Name"
-msgstr "éÍÑ ÔÉÐÁ"
+#, fuzzy
+msgid "Time of Creation"
+msgstr "ÐÑÐµÐ¼Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ"
 
 #: src/dpformat.c:53
-msgid "I"
-msgstr "ú"
+msgid "Time of Last Change"
+msgstr ""
 
-#: src/dpformat.c:334
-msgid "B"
-msgstr "â"
+#: src/dpformat.c:54
+msgid "Type Name"
+msgstr "ÐÐ¼Ñ ÑÐ¸Ð¿Ð°"
 
-#: src/dpformat.c:338 src/sizeutil.c:32
-msgid "KB"
-msgstr "ëâ"
+#: src/dpformat.c:55
+msgid "I"
+msgstr "Ð"
 
-#: src/dpformat.c:343 src/sizeutil.c:33
-msgid "MB"
-msgstr "íâ"
+#: src/dpformat.c:56
+msgid "URI"
+msgstr ""
 
-#: src/dpformat.c:348 src/sizeutil.c:31
-msgid "GB"
-msgstr "çâ"
+#: src/dpformat.c:56
+msgid "URI (without file prefix)"
+msgstr ""
 
-#: src/errors.c:69
+#: src/errors.c:59
 #, c-format
 msgid "Couldn't %s \"%s\": %s (code %d)"
-msgstr "îÅ ÍÏÇÕ %s \"%s\": %s (ËÏÄ %d)"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ %s \"%s\": %s (ÐºÐ¾Ð´ %d)"
 
-#: src/errors.c:71
+#: src/errors.c:61
 #, c-format
 msgid "Couldn't %s \"%s\" (code %d)"
-msgstr "îÅ ÍÏÇÕ %s \"%s\" (ËÏÄ %d)"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ %s \"%s\" (ÐºÐ¾Ð´ %d)"
 
-#: src/errors.c:76
+#: src/errors.c:66
 #, c-format
 msgid "Couldn't %s \"%s\""
-msgstr "îÅ ÍÏÇÕ %s \"%s\""
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ %s \"%s\""
 
-#: src/errors.c:78
+#: src/errors.c:68
 #, c-format
 msgid "Couldn't %s"
-msgstr "îÅ ÍÏÇÕ %s"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ %s"
+
+#: src/errors.c:88
+#, c-format
+msgid "%s"
+msgstr ""
 
 # src/gentoo.c:440
-#: src/gentoo.c:421
+#: src/gentoo.c:427
 msgid "Report the version to standard output, and exit."
-msgstr "÷Ù×ÅÓÔÉ ÎÏÍÅÒ ×ÅÒÓÉÉ É ×ÙÊÔÉ."
+msgstr "ÐÑÐ²ÐµÑÑÐ¸ Ð½Ð¾Ð¼ÐµÑ Ð²ÐµÑÑÐ¸Ð¸ Ð¸ Ð²ÑÐ¹ÑÐ¸."
 
 # src/gentoo.c:440
-#: src/gentoo.c:423
+#: src/gentoo.c:429
 msgid "Report internal locale details, and exit."
-msgstr "÷Ù×ÅÓÔÉ ÄÅÔÁÌÉ ×ÎÕÔÒÅÎÎÅÊ ÌÏËÁÌÉÚÁÃÉÉ É ×ÙÊÔÉ."
+msgstr "ÐÑÐ²ÐµÑÑÐ¸ Ð´ÐµÑÐ°Ð»Ð¸ Ð²Ð½ÑÑÑÐµÐ½Ð½ÐµÐ¹ Ð»Ð¾ÐºÐ°Ð»Ð¸Ð·Ð°ÑÐ¸Ð¸ Ð¸ Ð²ÑÐ¹ÑÐ¸."
 
 # src/gentoo.c:441
-#: src/gentoo.c:425
+#: src/gentoo.c:431
 msgid "Allows gentoo to be run by the root user. Could be dangerous."
 msgstr ""
-"ðÏÚ×ÏÌÑÅÔ ÚÁÐÕÓËÁÔØ gentoo ÐÏÄ root'ÏÍ. íÏÖÅÔ ÐÒÉ×ÅÓÔÉ Ë ÐÅÞÁÌØÎÙÍ "
-"ÐÏÓÌÅÄÓÔ×ÉÑÍ. "
+"ÐÐ¾Ð·Ð²Ð¾Ð»ÑÐµÑ Ð·Ð°Ð¿ÑÑÐºÐ°ÑÑ gentoo Ð¿Ð¾Ð´ root'Ð¾Ð¼. ÐÐ¾Ð¶ÐµÑ Ð¿ÑÐ¸Ð²ÐµÑÑÐ¸ Ðº Ð¿ÐµÑÐ°Ð»ÑÐ½ÑÐ¼ "
+"Ð¿Ð¾ÑÐ»ÐµÐ´ÑÑÐ²Ð¸ÑÐ¼. "
 
 # src/gentoo.c:442
-#: src/gentoo.c:426
+#: src/gentoo.c:432
 msgid ""
 "Do not load the ~/.gentoorc configuration file; instead, use default values."
 msgstr ""
-"îÅ ÚÁÇÒÕÖÁÔØ ÆÁÊÌ ÎÁÓÔÒÏÅË ~/.gentoorc; ÉÓÐÏÌØÚÏ×ÁÔØ ÎÁÓÔÒÏÊËÉ ÐÏ ÕÍÏÌÞÁÎÉÀ."
+"ÐÐµ Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑ ÑÐ°Ð¹Ð» Ð½Ð°ÑÑÑÐ¾ÐµÐº ~/.gentoorc; Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ."
 
 # src/gentoo.c:443
-#: src/gentoo.c:427
+#: src/gentoo.c:433
 msgid ""
 "Do not load the ~/.gentoogtkrc GTK+ configuration file; instead, use system "
 "defaults."
 msgstr ""
-"îÅ ÚÁÇÒÕÖÁÔØ ÎÁÓÔÒÏÊËÉ GTK+ : ~/.gentoogtkrc; ÉÓÐÏÌØÚÏ×ÁÔØ ÓÉÓÔÅÍÎÙÅ "
-"ÚÎÁÞÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ."
+"ÐÐµ Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ GTK+ : ~/.gentoogtkrc; Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐµ "
+"Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ."
 
-# src/gentoo.c:445
-#: src/gentoo.c:429
-msgid "Do not use FAM to automatically detect changes in viewed directories."
+#: src/gentoo.c:434
+#, fuzzy
+msgid ""
+"Run COMMAND, a gentoo command. Done before user interaction allowed, but "
+"after configuration file has been read in. Can be used many times to run "
+"several commands in sequence."
+msgstr ""
+"ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ARG, ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ gentoo. ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð·Ð°Ð¿ÑÑÐºÐ°ÐµÑÑÑ Ð´Ð¾ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð¾ÐºÐ½Ð°, Ð½Ð¾ "
+"Ð¿Ð¾ÑÐ»Ðµ ÑÑÐµÐ½Ð¸Ñ ÑÐ°Ð¹Ð»Ð° Ð½Ð°ÑÑÑÐ¾ÐµÐº. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¾ ÑÐ°Ð· Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÐ° "
+"Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¸Ñ ÑÐ°Ð·Ð½ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´."
+
+#: src/gentoo.c:435
+msgid "COMMAND"
+msgstr ""
+
+#: src/gentoo.c:436 src/gentoo.c:437
+msgid "DIR"
 msgstr ""
-"îÅ ÉÓÐÏÌØÚÏ×ÁÔØ FAM ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÉÚÍÅÎÅÎÉÊ × ÐÒÏÓÍÏÔÒÉ×ÁÅÍÙÊ ËÁÔÁÌÏÇÁÈ."
 
 # src/gentoo.c:447
-#: src/gentoo.c:431
+#: src/gentoo.c:436
+#, fuzzy
 msgid ""
-"Use ARG as path for the left directory pane. Overrides default (and history)."
+"Use DIR as path for the left directory pane. Overrides default (and history)."
 msgstr ""
-"éÓÐÏÌØÚÏ×ÁÔØ ARG ËÁË ÐÕÔØ ÄÌÑ ÌÅ×ÏÊ ÐÁÎÅÌÉ. ðÅÒÅÏÐÒÅÄÅÌÉÔØ ÐÕÔØ ÐÏ ÕÍÏÌÞÁÎÉÀ"
-"(É ÉÓÔÏÒÉÀ)."
+"ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ARG ÐºÐ°Ðº Ð¿ÑÑÑ Ð´Ð»Ñ Ð»ÐµÐ²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸. ÐÐµÑÐµÐ¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ Ð¿ÑÑÑ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
+"(Ð¸ Ð¸ÑÑÐ¾ÑÐ¸Ñ)."
 
 # src/gentoo.c:448
-#: src/gentoo.c:432
+#: src/gentoo.c:437
+#, fuzzy
 msgid ""
-"Use ARG as path for the right directory pane. Overrides default (and "
+"Use DIR as path for the right directory pane. Overrides default (and "
 "history)."
 msgstr ""
-"éÓÐÏÌØÚÏ×ÁÔØ ARG ËÁË ÐÕÔØ ÄÌÑ ÐÒÁ×ÏÊ ÐÁÎÅÌÉ. ðÅÒÅÏÐÒÅÄÅÌÉÔØ ÐÕÔØ ÐÏ ÕÍÏÌÞÁÎÉÀ"
-"(É ÉÓÔÏÒÉÀ)."
+"ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ARG ÐºÐ°Ðº Ð¿ÑÑÑ Ð´Ð»Ñ Ð¿ÑÐ°Ð²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸. ÐÐµÑÐµÐ¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ Ð¿ÑÑÑ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
+"(Ð¸ Ð¸ÑÑÐ¾ÑÐ¸Ñ)."
 
-#: src/gentoo.c:433
-msgid ""
-"Run ARG, a gentoo command. Done before user interaction allowed, but after "
-"configuration file has been read in. Can be used many times to run several "
-"commands in sequence."
+#: src/gentoo.c:461
+msgid "- a graphical file manager using GTK+"
+msgstr ""
+
+#: src/gentoo.c:466
+#, c-format
+msgid "Failed to parse command line options: %s\n"
 msgstr ""
-"úÁÐÕÓÔÉÔØ ARG, ËÏÍÁÎÄÕ gentoo. ëÏÍÁÎÄÁ ÚÁÐÕÓËÁÅÔÓÑ ÄÏ ÏÔÏÂÒÁÖÅÎÉÑ ÏËÎÁ, ÎÏ "
-"ÐÏÓÌÅ ÞÔÅÎÉÑ ÆÁÊÌÁ ÎÁÓÔÒÏÅË. ÷ÏÚÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÎÅÓËÏÌØËÏ ÒÁÚ ÄÌÑ ÚÁÐÕÓËÁ "
-"ÎÅÓËÏÌØËÉÈ ÒÁÚÎÙÈ ËÏÍÁÎÄ."
 
-#: src/gentoo.c:492
+#: src/gentoo.c:506
 #, c-format
 msgid "%s: To run as root, envoke with the '--root-ok' option\n"
-msgstr "%s: þÔÏÂÙ ÚÁÐÕÓÔÉÔØ ÐÏÄ root ÉÓÐÏÌØÚÕÊÔÅ --root-ok\n"
+msgstr "%s: Ð§ÑÐ¾Ð±Ñ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ Ð¿Ð¾Ð´ root Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ --root-ok\n"
 
-#: src/gentoo.c:524
+#: src/gentoo.c:538
 msgid "Couldn't initialize userinfo module - username resolving won't work"
 msgstr ""
-"îÅ ÍÏÇÕ ÎÁÊÔÉ ÍÏÄÕÌØ userinfo - ÏÐÒÅÄÅÌÅÎÉÅ ÉÍÅÎ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÎÅ ÂÕÄÅÔ "
-"ÒÁÂÏÔÁÔØ."
-
-#: src/gentoo.c:529
-msgid "Couldn't initialize mount data - automounting won't work"
-msgstr ""
-"îÅ ÍÏÇÕ ÎÁÊÔÉ ÏÐÉÓÁÎÉÅ ÐÏÄËÌÀÞÅÎÉÊ ÄÉÓËÏ× - Á×ÔÏÐÏÄËÌÀÞÅÎÉÅ ÎÅ ÂÕÄÅÔ "
-"ÒÁÂÏÔÁÔØ."
+"ÐÐµ Ð¼Ð¾Ð³Ñ Ð½Ð°Ð¹ÑÐ¸ Ð¼Ð¾Ð´ÑÐ»Ñ userinfo - Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð¸Ð¼ÐµÐ½ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ Ð½Ðµ Ð±ÑÐ´ÐµÑ "
+"ÑÐ°Ð±Ð¾ÑÐ°ÑÑ."
 
-#: src/gentoo.c:560
+#: src/gentoo.c:570
 #, c-format
 msgid "gentoo v%s by Emil Brink <emil@obsession.se>"
 msgstr "gentoo v%s - Emil Brink <emil@obsession.se>"
 
-#: src/gfam.c:216
-#, c-format
-msgid "FAM open failed, error %d--FAM will not be used"
-msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ FAM, ÏÛÉÂËÁ %d - FAM ÎÅ ÉÓÐÏÌØÚÕÀ"
-
-#: src/gfam.c:235
-#, fuzzy, c-format
-msgid ""
-"Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, perhaps)"
+#: src/gentoo.c:577
+msgid "Development Version Warning"
 msgstr ""
-"îÅ ÍÏÇÕ ÄÏÂÁ×ÉÔØ ÍÏÎÉÔÏÒ FAM \"%s\", ÏÛÉÂËÁ %s (ÍÏÖÅÔ ÚÁÐÕÓÔÉÔØ Ó --no-fam ?)"
 
-#: src/gfam.c:241
-#, fuzzy, c-format
+#: src/gentoo.c:577
 msgid ""
-"Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go around, "
-"perhaps)"
+"This version of gentoo is considered somewhat new and untested. There have "
+"been major changes to almost all parts of the program since the previous "
+"version. Please be a bit careful, and make sure you report any problem to "
+"the author. Thanks."
 msgstr ""
-"îÅ ÍÏÇÕ ÄÏÂÁ×ÉÔØ ÍÏÎÉÔÏÒ FAM \"%s\", ÏÛÉÂËÁ %s (ÍÏÖÅÔ ÚÁÐÕÓÔÉÔØ Ó --no-fam ?)"
 
-#: src/guiutil.c:118
+#: src/guiutil.c:124
 msgid "Progress"
-msgstr "óÏÓÔÏÑÎÉÅ"
+msgstr "Ð¡Ð¾ÑÑÐ¾ÑÐ½Ð¸Ðµ"
 
 #: src/icon_dialog.c:52
 msgid "Pick Icon"
-msgstr "÷ÙÂÅÒÉÔÅ ÚÎÁÞÏË"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð·Ð½Ð°ÑÐ¾Ðº"
 
 #: src/icon_dialog.c:59
 msgid "Loading Icon Graphics..."
-msgstr "úÁÇÒÕÚËÁ ÚÎÁÞËÁ ..."
+msgstr "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð·Ð½Ð°ÑÐºÐ° ..."
 
-#: src/menus.c:278
+#: src/menus.c:284
 msgid "(No Selection)"
-msgstr "(ÎÅÔ ×ÙÄÅÌÅÎÉÑ)"
+msgstr "(Ð½ÐµÑ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ñ)"
 
-#: src/menus.c:514
+#: src/menus.c:521
 msgid "RegExp..."
-msgstr "÷ÙÒÁÖÅÎÉÅ"
+msgstr "ÐÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: src/menus.c:526
+#: src/menus.c:533
 msgid "Other"
-msgstr "ó ÄÒÕÇÏÊ ÐÁÎÅÌÉ"
+msgstr "Ð¡ Ð´ÑÑÐ³Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/menus.c:527
+#: src/menus.c:534
 msgid "Rescan"
-msgstr "ïÂÎÏ×ÉÔØ"
+msgstr "ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ"
 
-#: src/menus.c:528
+#: src/menus.c:535
 msgid "Select"
-msgstr "÷ÙÂÏÒ"
+msgstr "ÐÑÐ±Ð¾Ñ"
 
-#: src/menus.c:532
+#: src/menus.c:539
 msgid "Run..."
-msgstr "÷ÙÐÏÌÎÉÔØ..."
+msgstr "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ..."
 
-#: src/menus.c:534
+#: src/menus.c:541
 msgid "Configure..."
-msgstr "îÁÓÔÒÏÉÔØ..."
+msgstr "ÐÐ°ÑÑÑÐ¾Ð¸ÑÑ..."
 
-#: src/menus.c:610
+#: src/menus.c:618
 msgid "Select Menu"
-msgstr "÷ÙÂÅÒÉÔÅ ÍÅÎÀ"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¼ÐµÐ½Ñ"
 
-#: src/mount.c:222
-#, c-format
-msgid "Execution of \"%s %s\" failed:\n"
-msgstr "÷ÙÐÏÌÎÅÎÉÅ \"%s %s\" ÐÒÅÒ×ÁÎÏ:\n"
-
-#: src/mount.c:318
-#, c-format
-msgid "Mounting \"%s\" on \"%s\"..."
-msgstr "ðÏÄËÌÀÞÅÎÉÅ \"%s\" × \"%s\"..."
+#: src/nag_dialog.c:37
+msgid "_Don't show this dialog again"
+msgstr ""
 
 #: src/overwrite.c:49
 msgid "_OK|A_ll|_Skip|Skip _All|_Cancel"
-msgstr "_äá|_÷ÓÅ|_îÅÔ|îÉ ÏÄÎÏÇÏ|_ïÔÍÅÎÁ"
-
-# c-format
-#: src/overwrite.c:73
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Old: %%%s bytes, changed on %%s,\n"
-"New: %%%s bytes, changed on %%s."
-msgstr ""
-"\n"
-"óÔÁÒÏÅ: %llu ÂÁÊÔ, ÉÚÍÅÎÅÎ %s.\n"
-"îÏ×ÏÅ: %llu ÂÁÊÔ, ÉÚÍÅÎÅÎ %s."
+msgstr "_ÐÐ|_ÐÑÐµ|_ÐÐµÑ|ÐÐ¸ Ð¾Ð´Ð½Ð¾Ð³Ð¾|_ÐÑÐ¼ÐµÐ½Ð°"
 
-#: src/progress.c:195
+#: src/progress.c:196
 #, c-format
 msgid "Total (%s)"
-msgstr "÷ÓÅÇÏ (%s)"
+msgstr "ÐÑÐµÐ³Ð¾ (%s)"
 
-#: src/progress.c:315
+#: src/progress.c:305
 #, c-format
 msgid "Elapsed %02d:%02d  Speed %s/s  ETA %02u:%02u"
-msgstr "÷ÒÅÍÑ %02d:%02d  óËÏÒÏÓÔØ %s/c ïÓÔÁÌÏÓØ %02u:%02u"
+msgstr "ÐÑÐµÐ¼Ñ %02d:%02d  Ð¡ÐºÐ¾ÑÐ¾ÑÑÑ %s/c ÐÑÑÐ°Ð»Ð¾ÑÑ %02u:%02u"
 
-#: src/sizeutil.c:30
-msgid "BYTES"
-msgstr "âÁÊÔ"
+#: src/sizeutil.c:31
+#, fuzzy
+msgid "Unformatted Size"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² Ð±Ð°Ð¹ÑÐ°Ñ"
 
-#: src/sizeutil.c:69
-#, c-format
-msgid "%%%s"
-msgstr ""
+#: src/sizeutil.c:32
+#, fuzzy
+msgid "Formatted Size, Without Unit"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ,Ð² \"ÑÐ¼Ð½ÑÑ\" ÐµÐ´Ð¸Ð½Ð¸ÑÐ°Ñ"
 
-#: src/sizeutil.c:70
-#, fuzzy, c-format
-msgid "%%%s bytes"
-msgstr "%Lu ÂÁÊÔ"
+#: src/sizeutil.c:33
+#, fuzzy
+msgid "Formatted Size, in Bytes"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² Ð±Ð°Ð¹ÑÐ°Ñ"
 
-#: src/sizeutil.c:71
-#, fuzzy, c-format
-msgid "%%%s KB"
-msgstr "%Lu ëâ"
+#: src/sizeutil.c:33 src/sizeutil.c:159
+#, fuzzy
+msgid "bytes"
+msgstr "Ð´Ð°"
 
-#: src/sizeutil.c:72
-#, fuzzy, c-format
-msgid "%%%s MB"
-msgstr "%Lu íâ"
+#: src/sizeutil.c:34
+#, fuzzy
+msgid "Formatted Size, in Kilobytes"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² ÐºÐ¸Ð»Ð¾Ð±Ð°Ð¹ÑÐ°Ñ"
 
-#: src/sizeutil.c:73
-#, fuzzy, c-format
-msgid "%%%s GB"
-msgstr "%Lu çâ"
+#: src/sizeutil.c:34 src/sizeutil.c:163
+msgid "KB"
+msgstr "ÐÐ"
 
-#: src/sizeutil.c:164 src/sizeutil.c:211
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f ëâ"
+#: src/sizeutil.c:35
+#, fuzzy
+msgid "Formatted Size, in Megabytes"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² Ð¼ÐµÐ³Ð°Ð±Ð°Ð¹ÑÐ°Ñ"
 
-#: src/sizeutil.c:170 src/sizeutil.c:217
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f íâ"
+#: src/sizeutil.c:35 src/sizeutil.c:167
+msgid "MB"
+msgstr "ÐÐ"
 
-#: src/sizeutil.c:176 src/sizeutil.c:223
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f çâ"
+#: src/sizeutil.c:36
+#, fuzzy
+msgid "Formatted Size, in Gigabytes"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² Ð³Ð¸Ð³Ð°Ð±Ð°Ð¹ÑÐ°Ñ"
+
+#: src/sizeutil.c:36 src/sizeutil.c:171
+msgid "GB"
+msgstr "ÐÐ"
+
+#: src/sizeutil.c:37
+#, fuzzy
+msgid "Formatted Size, in Terabytes"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² Ð¼ÐµÐ³Ð°Ð±Ð°Ð¹ÑÐ°Ñ"
+
+#: src/sizeutil.c:37 src/sizeutil.c:175
+#, fuzzy
+msgid "TB"
+msgstr "Ð"
+
+#: src/sizeutil.c:38
+#, fuzzy
+msgid "Formatted Size, Automatic Unit"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ,Ð² \"ÑÐ¼Ð½ÑÑ\" ÐµÐ´Ð¸Ð½Ð¸ÑÐ°Ñ"
 
 #: src/style_dialog.c:40
 msgid "Select Style"
-msgstr "÷ÙÂÅÒÉÔÅ ËÌÁÓÓ"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÐºÐ»Ð°ÑÑ"
 
-#: src/styles.c:112
+#: src/styles.c:114
 msgid "Root"
 msgstr "Root"
 
-#: src/styles.c:118 src/types.c:485 src/types.c:488
+#: src/styles.c:120 src/types.c:292 src/types.c:295
 msgid "Directory"
-msgstr "ëÁÔÁÌÏÇ"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³"
 
-#: src/styles.c:961
+#: src/styles.c:889
 msgid "New Style"
-msgstr "îÏ×ÙÊ ËÌÁÓÓ"
+msgstr "ÐÐ¾Ð²ÑÐ¹ ÐºÐ»Ð°ÑÑ"
 
-#: src/styles.c:961
+#: src/styles.c:889
 #, c-format
 msgid "New Style %u"
-msgstr "îÏ×ÙÊ ËÌÁÓÓ %u"
+msgstr "ÐÐ¾Ð²ÑÐ¹ ÐºÐ»Ð°ÑÑ %u"
 
-#: src/textview.c:152
+#: src/textview.c:190
 #, c-format
-msgid "Unable to convert text from native character set (%s) to UTF-8: %s"
+msgid ""
+"\n"
+"** Text conversion from charset '%s' failed, aborting."
 msgstr ""
 
-#: src/textview.c:252 src/textview.c:353
-msgid "File reading"
-msgstr "þÔÅÎÉÅ ÆÁÊÌÁ"
-
-#: src/textview.c:419
+#: src/textview.c:405
 #, c-format
 msgid "Line %d (%.0f%%)"
-msgstr "óÔÒÏËÁ %d (%.0f%%)"
+msgstr "Ð¡ÑÑÐ¾ÐºÐ° %d (%.0f%%)"
 
-#: src/textview.c:472
+#: src/textview.c:455
 msgid "Enter Line Number or Percentage:"
-msgstr "÷×ÅÄÉÔÅ ÎÏÍÅÒ ÓÔÒÏËÉ ÉÌÉ ÐÒÏÃÅÎÔ:"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð½Ð¾Ð¼ÐµÑ ÑÑÑÐ¾ÐºÐ¸ Ð¸Ð»Ð¸ Ð¿ÑÐ¾ÑÐµÐ½Ñ:"
 
-#: src/textview.c:478
+#: src/textview.c:461
 msgid "Goto"
-msgstr "ðÅÒÅÊÔÉ"
+msgstr "ÐÐµÑÐµÐ¹ÑÐ¸"
 
-#: src/textview.c:613
+#: src/textview.c:596
 msgid "Enter Text to Search For (RE)"
-msgstr "÷×ÅÄÉÔÅ ÔÅËÓÔ ÄÌÑ ÐÏÉÓËÁ (÷ÙÒÁÖÅÎÉÅ)"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ ÑÐµÐºÑÑ Ð´Ð»Ñ Ð¿Ð¾Ð¸ÑÐºÐ° (ÐÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ)"
 
-#: src/textview.c:623
+#: src/textview.c:607
 msgid "Don't Span Newlines?"
-msgstr "îÅ ÒÁÓÐÒÅÄÅÌÑÔØ ÎÏ×ÙÅ ÌÉÎÉÉ?"
+msgstr "ÐÐµ ÑÐ°ÑÐ¿ÑÐµÐ´ÐµÐ»ÑÑÑ Ð½Ð¾Ð²ÑÐµ Ð»Ð¸Ð½Ð¸Ð¸?"
 
-#: src/textview.c:629
+#: src/textview.c:613
 msgid "Search"
-msgstr "ðÏÉÓË"
+msgstr "ÐÐ¾Ð¸ÑÐº"
+
+#: src/types.c:287
+msgid "Unknown"
+msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÐ¹"
 
-#: src/types.c:454
+#: src/types.c:572
 #, c-format
 msgid ""
 "Got SIGPIPE when writing to 'file' process (%s), it seems to have terminated "
 "prematurely."
 msgstr ""
 
-#: src/types.c:461
+#: src/types.c:578
 msgid "Unable to run spawn 'file' command: "
 msgstr ""
 
-#: src/types.c:480
-msgid "Unknown"
-msgstr "îÅÉÚ×ÅÓÔÎÙÊ"
-
-#: src/window.c:82
+#: src/window.c:83
 msgid "Configure gentoo"
-msgstr "îÁÓÔÒÏÊËÁ"
+msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ°"
 
-#: src/window.c:89
+#: src/window.c:90
 msgid "Text Viewer"
-msgstr "ðÒÏÓÍÏÔÒ ÔÅËÓÔÁ"
+msgstr "ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÐµÐºÑÑÐ°"
 
-#: src/window.c:200
+#: src/window.c:199
 msgid "Position"
-msgstr "ðÏÚÉÃÉÑ"
+msgstr "ÐÐ¾Ð·Ð¸ÑÐ¸Ñ"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Height"
-msgstr "÷ÙÓÏÔÁ"
+msgstr "ÐÑÑÐ¾ÑÐ°"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "X"
 msgstr "X"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Y"
 msgstr "Y"
 
-#: src/window.c:208
+#: src/window.c:207
 msgid "Set on Open?"
-msgstr "õÓÔÁÎÏ×ÉÔØ ÐÒÉ ÏÔËÒÙÔÉÉ?"
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¿ÑÐ¸ Ð¾ÑÐºÑÑÑÐ¸Ð¸?"
 
-#: src/window.c:214
+#: src/window.c:213
 msgid "Update on Close?"
-msgstr "óÏÈÒÁÎÉÔØ ÐÒÉ ÚÁËÒÙÔÉÉ?"
+msgstr "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¿ÑÐ¸ Ð·Ð°ÐºÑÑÑÐ¸Ð¸?"
 
-#: src/window.c:245
+#: src/window.c:244
 msgid "Grab"
-msgstr "úÁÈ×ÁÔÉÔØ"
+msgstr "ÐÐ°ÑÐ²Ð°ÑÐ¸ÑÑ"
 
 #: src/xmlutil.c:225
 msgid "XML module emitted locale-dependant real number"
-msgstr "XML ÍÏÄÕÌØ ×ÙÄÁÌ ÌÏËÁÌØÎÏ-ÚÁ×ÉÓÉÍÙÊ ÎÏÍÅÒ"
+msgstr "XML Ð¼Ð¾Ð´ÑÐ»Ñ Ð²ÑÐ´Ð°Ð» Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾-Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ"
+
+#~ msgid "Use Dialog to Report Errors?"
+#~ msgstr "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³ Ð´Ð»Ñ Ð¾ÑÐ¸Ð±Ð¾Ðº?"
+
+#~ msgid "Path Right Click"
+#~ msgstr "ÐÑÐ°Ð²ÑÐ¹ ÑÐµÐ»ÑÐ¾Ðº Ð½Ð° Ð¿ÑÑÐ¸"
+
+#~ msgid "Raw Size, in Bytes"
+#~ msgstr "Ð¡ÑÑÐ¾Ð¹ ÑÐ°Ð·Ð¼ÐµÑ, Ð² Ð±Ð°Ð¹ÑÐ°Ñ"
+
+#~ msgid "Always Set"
+#~ msgstr "ÐÑÐµÐ³Ð´Ð° Ð²ÐºÐ»ÑÑÐµÐ½Ð¾"
+
+#~ msgid "Modify 'Control' Key State"
+#~ msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ðµ ÐºÐ½Ð¾Ð¿ÐºÐ¸ 'Control'"
+
+#~ msgid "Active Pane Titles"
+#~ msgstr "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð°ÐºÑÐ¸Ð²Ð½Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
+
+#~ msgid "Focused Row, Unselected"
+#~ msgstr "ÐÑÐ±ÑÐ°Ð½Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ°, Ð½Ðµ Ð¾ÑÐ¼ÐµÑÐµÐ½Ð°Ñ"
+
+#~ msgid "Focused Row, Selected"
+#~ msgstr "ÐÑÐ±ÑÐ°Ð½Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ°, Ð¾ÑÐ¼ÐµÑÐµÐ½Ð½Ð°Ñ"
+
+#~ msgid "Beta Software"
+#~ msgstr "ÐÐµÑÐ° Ð²ÐµÑÑÐ¸Ñ"
+
+#~ msgid "Next Version?"
+#~ msgstr "Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ Ð²ÐµÑÑÐ¸Ñ?"
+
+#~ msgid ""
+#~ "This splitting mode has not been\n"
+#~ "implemented yet... Sorry."
+#~ msgstr ""
+#~ "Ð ÐµÐ¶Ð¸Ð¼ ÑÐ°Ð·Ð±Ð¸Ð²ÐºÐ¸ ÐµÑÐµ Ð½Ðµ \n"
+#~ "ÑÐµÐ°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½... ÐÐ·Ð²Ð¸Ð½Ð¸ÑÐµ."
+
+#~ msgid ""
+#~ "Case-sensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ° Ñ ÑÑÐµÑÐ¾Ð¼ ÑÐµÐ³Ð¸ÑÑÑÐ° ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ²ÐµÑÐ½Ð¾ Ñ ÑÑÑÑÐºÐ¸Ð¼Ð¸ Ð±ÑÐºÐ²Ð°Ð¼Ð¸"
+
+#~ msgid ""
+#~ "Case-insensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ° Ð±ÐµÐ· ÑÑÐµÑÐ° ÑÐµÐ³Ð¸ÑÑÑÐ° ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ²ÐµÑÐ½Ð¾ Ñ ÑÑÑÑÐºÐ¸Ð¼Ð¸ Ð±ÑÐºÐ²Ð°Ð¼Ð¸"
+
+#~ msgid "BYTES"
+#~ msgstr "ÐÐ°Ð¹Ñ"
+
+#, fuzzy
+#~ msgid "%%%s bytes"
+#~ msgstr "%Lu Ð±Ð°Ð¹Ñ"
+
+#, fuzzy
+#~ msgid "%%%s KB"
+#~ msgstr "%Lu ÐÐ"
+
+#, fuzzy
+#~ msgid "%%%s MB"
+#~ msgstr "%Lu ÐÐ"
+
+#, fuzzy
+#~ msgid "%%%s GB"
+#~ msgstr "%Lu ÐÐ"
+
+#~ msgid "%.2f KB"
+#~ msgstr "%.2f ÐÐ"
+
+#~ msgid "%.2f MB"
+#~ msgstr "%.2f ÐÐ"
+
+#~ msgid "%.2f GB"
+#~ msgstr "%.2f ÐÐ"
+
+#~ msgid "Numerical Mode?"
+#~ msgstr "Ð£ÑÐ¸ÑÑÐ²Ð°ÑÑ Ð´Ð»Ð¸Ð½Ñ?"
+
+#~ msgid "Never"
+#~ msgstr "ÐÐ¸ÐºÐ¾Ð³Ð´Ð°"
+
+#~ msgid "On Every Access"
+#~ msgstr "ÐÑÐ¸ ÐºÐ°Ð¶Ð´Ð¾Ð¼ Ð¾Ð±ÑÐ°ÑÐµÐ½Ð¸Ð¸"
+
+#~ msgid "Mounting"
+#~ msgstr "ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ"
+
+#~ msgid "Mount When?"
+#~ msgstr "ÐÐ¾Ð³Ð´Ð° Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ°ÑÑ?"
+
+#~ msgid "Mount Options"
+#~ msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ð´Ð¸ÑÐºÐ¾Ð²"
+
+#~ msgid "Mount Command"
+#~ msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ"
+
+#~ msgid "Unmount Command"
+#~ msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ"
+
+#~ msgid "Only Mount on Toplevel Directories?"
+#~ msgstr "ÐÐ¾Ð´ÐºÐ»ÑÑÐ°ÑÑ ÑÐ¾Ð»ÑÐºÐ¾ Ð² ÐºÐ¾ÑÐ½ÐµÐ²Ð¾Ð¼ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ðµ?"
+
+#~ msgid "Use Command Error Dialog?"
+#~ msgstr "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³ Ð´Ð»Ñ Ð¾ÑÐ¸Ð±Ð¾Ðº"
+
+#~ msgid "Unmount When gentoo Quits?"
+#~ msgstr "ÐÑÐºÐ»ÑÑÐ°ÑÑ Ð¿ÑÐ¸ Ð²ÑÑÐ¾Ð´Ðµ?"
+
+#~ msgid "FAM: Supported and active."
+#~ msgstr "FAM: ÐÐ¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ Ð¸ Ð²ÐºÐ»ÑÑÐµÐ½Ð¾"
+
+#~ msgid "FAM: Supported, but not active."
+#~ msgstr "FAM: ÐÐ¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ, Ð½Ð¾ Ð½Ðµ Ð²ÐºÐ»ÑÑÐµÐ½Ð¾."
+
+#~ msgid "FAM: Not supported."
+#~ msgstr "FAM: ÐÐµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ."
+
+#~ msgid ""
+#~ "Can't copy directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ \"%s\"\n"
+#~ "Ð² \"%s\"\n"
+#~ "(ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ°Ð¼Ð¾Ð³Ð¾ Ð² ÑÐµÐ±Ñ)."
+
+#~ msgid "Wrap Around At Top And Bottom?"
+#~ msgstr "ÐÐµÑÐµÑÐºÐ°ÐºÐ¸Ð²Ð°ÑÑ Ð² Ð´ÑÑÐ³Ð¾Ð¹ ÐºÐ¾Ð½ÐµÑ ÑÐ¿Ð¸ÑÐºÐ°?"
+
+#~ msgid ""
+#~ "%s (%s bytes,\n"
+#~ "%s blocks)"
+#~ msgstr ""
+#~ "%s (%s Ð±Ð°Ð¹Ñ),\n"
+#~ "%s Ð±Ð»Ð¾ÐºÐ¾Ð²)"
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¿ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ \"%s\"\n"
+#~ "Ð² \"%s\"\n"
+#~ "(Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ - Ð¿Ð¾Ð´Ð¿Ð°Ð¿ÐºÐ° Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ°)."
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the destination contains the source."
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¿ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ \"%s\"\n"
+#~ "Ð² \"%s\"\n"
+#~ "(Ð¸ÑÑÐ¾ÑÐ½Ð¸Ðº - Ð¿Ð¾Ð´Ð¿Ð°Ð¿ÐºÐ° Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ)."
+
+#~ msgid "Regular expression error:\n"
+#~ msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ:\n"
+
+#~ msgid "Use mmap() to Speed Loading?"
+#~ msgstr "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ mmap() Ð´Ð»Ñ ÑÑÐºÐ¾ÑÐµÐ½Ð¸Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸?"
+
+#, fuzzy
+#~ msgid " (%%s/%%s, %%%s/%%%s blocks)"
+#~ msgstr " (%s/%s, %Lu/%Lu Ð±Ð»Ð¾ÐºÐ¾Ð²)"
+
+# src/gentoo.c:445
+#~ msgid ""
+#~ "Do not use FAM to automatically detect changes in viewed directories."
+#~ msgstr ""
+#~ "ÐÐµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ FAM Ð´Ð»Ñ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð² Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÐµÐ¼ÑÐ¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð°Ñ."
+
+#~ msgid "Couldn't initialize mount data - automounting won't work"
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ Ð½Ð°Ð¹ÑÐ¸ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ð¹ Ð´Ð¸ÑÐºÐ¾Ð² - Ð°Ð²ÑÐ¾Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ð½Ðµ Ð±ÑÐ´ÐµÑ "
+#~ "ÑÐ°Ð±Ð¾ÑÐ°ÑÑ."
+
+#~ msgid "FAM open failed, error %d--FAM will not be used"
+#~ msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¾ÑÐºÑÑÑÑ FAM, Ð¾ÑÐ¸Ð±ÐºÐ° %d - FAM Ð½Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, "
+#~ "perhaps)"
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð¼Ð¾Ð½Ð¸ÑÐ¾Ñ FAM \"%s\", Ð¾ÑÐ¸Ð±ÐºÐ° %s (Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ Ñ --no-"
+#~ "fam ?)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go "
+#~ "around, perhaps)"
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð¼Ð¾Ð½Ð¸ÑÐ¾Ñ FAM \"%s\", Ð¾ÑÐ¸Ð±ÐºÐ° %s (Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ Ñ --no-"
+#~ "fam ?)"
+
+#~ msgid "Execution of \"%s %s\" failed:\n"
+#~ msgstr "ÐÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ \"%s %s\" Ð¿ÑÐµÑÐ²Ð°Ð½Ð¾:\n"
+
+#~ msgid "Mounting \"%s\" on \"%s\"..."
+#~ msgstr "ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ \"%s\" Ð² \"%s\"..."
+
+# c-format
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Old: %%%s bytes, changed on %%s,\n"
+#~ "New: %%%s bytes, changed on %%s."
+#~ msgstr ""
+#~ "\n"
+#~ "Ð¡ÑÐ°ÑÐ¾Ðµ: %llu Ð±Ð°Ð¹Ñ, Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½ %s.\n"
+#~ "ÐÐ¾Ð²Ð¾Ðµ: %llu Ð±Ð°Ð¹Ñ, Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½ %s."
+
+#~ msgid "File reading"
+#~ msgstr "Ð§ÑÐµÐ½Ð¸Ðµ ÑÐ°Ð¹Ð»Ð°"
 
 #, fuzzy
 #~ msgid "Pick Command ..."
-#~ msgstr "÷ÙÂÒÁÔØ ËÏÄ"
+#~ msgstr "ÐÑÐ±ÑÐ°ÑÑ ÐºÐ¾Ð´"
 
 #~ msgid "Clr"
-#~ msgstr "îÅÔ"
+#~ msgstr "ÐÐµÑ"
 
 #~ msgid "Buffer Size for mmap()"
-#~ msgstr "òÁÚÍÅÒ ÂÕÆÅÒÁ ÄÌÑ mmap()"
+#~ msgstr "Ð Ð°Ð·Ð¼ÐµÑ Ð±ÑÑÐµÑÐ° Ð´Ð»Ñ mmap()"
 
 #~ msgid "Top"
-#~ msgstr "îÁÞÁÌÏ"
+#~ msgstr "ÐÐ°ÑÐ°Ð»Ð¾"
 
 #~ msgid "Bottom"
-#~ msgstr "ëÏÎÅÃ"
+#~ msgstr "ÐÐ¾Ð½ÐµÑ"
 
 #~ msgid "_Goto..."
-#~ msgstr "ðÅÒÅÊÔÉ..."
+#~ msgstr "ÐÐµÑÐµÐ¹ÑÐ¸..."
 
 #~ msgid "_Search..."
-#~ msgstr "ðÏÉÓË..."
+#~ msgstr "ÐÐ¾Ð¸ÑÐº..."
 
 #~ msgid "_Quit"
-#~ msgstr "÷ÙÈÏÄ"
+#~ msgstr "ÐÑÑÐ¾Ð´"
 
 #, fuzzy
 #~ msgid "SelectShell"
-#~ msgstr "÷ÙÂÏÒ"
+#~ msgstr "ÐÑÐ±Ð¾Ñ"
 
 #~ msgid "Close"
-#~ msgstr "úÁËÒÙÔØ"
+#~ msgstr "ÐÐ°ÐºÑÑÑÑ"

gentoo-0.15.6.tar.bz2/po/ru_RU.UTF-8.gmo -> gentoo-0.19.9.tar.gz/po/ru_RU.UTF-8.gmo Changed

gentoo-0.15.6.tar.bz2/po/ru_RU.UTF-8.po -> gentoo-0.19.9.tar.gz/po/ru_RU.UTF-8.po Changed

@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: gentoo 0.11.51\n"
 "Report-Msgid-Bugs-To: Emil Brink\n"
-"POT-Creation-Date: 2009-07-11 19:05+0200\n"
+"POT-Creation-Date: 2011-01-26 21:54+0100\n"
 "PO-Revision-Date: 2008-07-13 20:20+0200\n"
 "Last-Translator: Michael Y. Zaripov <m3@mail.ru>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -83,7 +84,7 @@
 msgid "Set Row Width"
 msgstr "Установить ширину"
 
-#: src/cfg_buttons.c:326 src/cfg_buttons.c:749
+#: src/cfg_buttons.c:326 src/cfg_buttons.c:748
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -95,7 +96,7 @@
 msgid "Really delete current button row?"
 msgstr "Действительно удалить текущую строку кнопок?"
 
-#: src/cfg_buttons.c:439 src/cfg_styles.c:671
+#: src/cfg_buttons.c:439 src/cfg_styles.c:680
 msgid "_Delete|_Cancel"
 msgstr "_Удалить|_Отмена"
 
@@ -119,104 +120,104 @@
 msgid "Label"
 msgstr "Заголовок"
 
-#: src/cfg_buttons.c:685 src/cfg_controls.c:645 src/cfg_controls.c:696
-#: src/cfg_controls.c:718 src/cfg_controls.c:739
+#: src/cfg_buttons.c:686 src/cfg_controls.c:612 src/cfg_controls.c:663
+#: src/cfg_controls.c:685
 msgid "Command"
 msgstr "Команда"
 
-#: src/cfg_buttons.c:696 src/cfg_controls.c:639
+#: src/cfg_buttons.c:697 src/cfg_controls.c:606
 msgid "Key"
 msgstr "Кнопка"
 
-#: src/cfg_buttons.c:711 src/cfg_dirpane.c:1373
+#: src/cfg_buttons.c:712
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/cfg_buttons.c:715
+#: src/cfg_buttons.c:716
 msgid "Background..."
 msgstr "Фон..."
 
-#: src/cfg_buttons.c:716 src/cfg_buttons.c:722
+#: src/cfg_buttons.c:717 src/cfg_buttons.c:723
 msgid "Reset to Default"
 msgstr "Вернуть начальные"
 
-#: src/cfg_buttons.c:721
+#: src/cfg_buttons.c:722
 msgid "Foreground..."
 msgstr "Цвет"
 
-#: src/cfg_buttons.c:749
+#: src/cfg_buttons.c:748
 msgid "Shortcuts"
 msgstr "Закладки"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Clear"
 msgstr "Убрать"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy Colors To"
 msgstr "Копировать цвета"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy To"
 msgstr "Копировать"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Swap With"
 msgstr "Обменять"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Add Row..."
 msgstr "Добавить строку..."
 
-#: src/cfg_buttons.c:751 src/cfg_cmdseq.c:951
+#: src/cfg_buttons.c:750 src/cfg_cmdseq.c:966
 msgid "Delete Row"
 msgstr "Убрать строку"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Down"
 msgstr "Вниз"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Row Width..."
 msgstr "Ширина строки..."
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Up"
 msgstr "Вверх"
 
-#: src/cfg_buttons.c:762
+#: src/cfg_buttons.c:761
 msgid "Sheet"
 msgstr "Лист"
 
-#: src/cfg_buttons.c:778
+#: src/cfg_buttons.c:775
 msgid "Primary"
 msgstr "Основная"
 
-#: src/cfg_buttons.c:780
+#: src/cfg_buttons.c:777
 msgid "Secondary"
 msgstr "Вторичная"
 
-#: src/cfg_buttons.c:785
+#: src/cfg_buttons.c:782
 msgid "Tooltip"
 msgstr "Подсказка"
 
-#: src/cfg_buttons.c:792 src/cfg_dirpane.c:1145
+#: src/cfg_buttons.c:790 src/cfg_dirpane.c:1107
 msgid "Flags"
 msgstr "Флаги"
 
-#: src/cfg_buttons.c:794
+#: src/cfg_buttons.c:792
 msgid "Narrow?"
 msgstr "Сузить?"
 
-#: src/cfg_buttons.c:798
+#: src/cfg_buttons.c:796
 msgid "Show Tooltip?"
 msgstr "Показывать подсказки"
 
-#: src/cfg_buttons.c:833
+#: src/cfg_buttons.c:831
 msgid "Buttons"
 msgstr "Кнопки"
 
-#: src/cfg_buttons.c:834 src/cfg_cmdseq.c:1067
+#: src/cfg_buttons.c:832 src/cfg_cmdseq.c:1081
 msgid "Definitions"
 msgstr "Определения"
 
@@ -224,260 +225,301 @@
 msgid "Options"
 msgstr "Детали"
 
-#: src/cfg_cmdseq.c:610
+#: src/cfg_cmdseq.c:611
 msgid "Select Builtin"
 msgstr "Выбрать встроеные"
 
-#: src/cfg_cmdseq.c:626
+#: src/cfg_cmdseq.c:627
 msgid "Opening brace"
 msgstr "Открыть скобу"
 
-#: src/cfg_cmdseq.c:627
+#: src/cfg_cmdseq.c:628
 msgid "Closing brace"
 msgstr "Закрыть скобу"
 
-#: src/cfg_cmdseq.c:628
+#: src/cfg_cmdseq.c:629
 msgid "First selected"
 msgstr "Первый выбранный"
 
-#: src/cfg_cmdseq.c:629
+#: src/cfg_cmdseq.c:630
 msgid "First selected, unselect"
 msgstr "Первый выбранный, разотметить"
 
-#: src/cfg_cmdseq.c:630
+#: src/cfg_cmdseq.c:631
 msgid "First selected, with path"
 msgstr "Первый выбранный, с путем"
 
-#: src/cfg_cmdseq.c:631
+#: src/cfg_cmdseq.c:632
 msgid "First selected, with path, unselect"
 msgstr "Первый выбранный, с путем, разотметить"
 
-#: src/cfg_cmdseq.c:632
+#: src/cfg_cmdseq.c:633
 msgid "First selected (destination pane)"
 msgstr "Первый выбранный (панель назначения)"
 
-#: src/cfg_cmdseq.c:633
+#: src/cfg_cmdseq.c:634
 msgid "First selected, no quotes"
 msgstr "Первый выбранный, без кавычек"
 
-#: src/cfg_cmdseq.c:634
+#: src/cfg_cmdseq.c:635
 msgid "All selected"
 msgstr "Все выбранные"
 
-#: src/cfg_cmdseq.c:635
+#: src/cfg_cmdseq.c:636
 msgid "All selected, unselect"
 msgstr "Все выбранные, разотметить"
 
-#: src/cfg_cmdseq.c:636
+#: src/cfg_cmdseq.c:637
 msgid "All selected, with paths"
 msgstr "Все выбранные, с путями"
 
-#: src/cfg_cmdseq.c:637
+#: src/cfg_cmdseq.c:638
 msgid "All selected, with paths, unselect"
 msgstr "Все выбранные, с путями, разотметить"
 
-#: src/cfg_cmdseq.c:638
+#: src/cfg_cmdseq.c:639
 msgid "All selected (destination pane)"
 msgstr "Все выбранные(панель назначения)"
 
-#: src/cfg_cmdseq.c:639
+#: src/cfg_cmdseq.c:640
 msgid "All selected, no quotes"
 msgstr "Все выбранные, без кавычек"
 
-#: src/cfg_cmdseq.c:640
+#: src/cfg_cmdseq.c:641
 msgid "Path to source pane's directory"
 msgstr "Путь на панели источника"
 
-#: src/cfg_cmdseq.c:641
+#: src/cfg_cmdseq.c:642
 msgid "Path to destination pane's directory"
 msgstr "Путь на панели назначения"
 
-#: src/cfg_cmdseq.c:642
+#: src/cfg_cmdseq.c:643
 msgid "Path to home directory"
 msgstr "Домашний каталог"
 
-#: src/cfg_cmdseq.c:643
+#: src/cfg_cmdseq.c:644
 msgid "Path of left pane"
 msgstr "Путь на левой панели"
 
-#: src/cfg_cmdseq.c:644
+#: src/cfg_cmdseq.c:645
 msgid "Path of right pane"
 msgstr "Путь на правой панели"
 
-#: src/cfg_cmdseq.c:645
+#: src/cfg_cmdseq.c:646
+#, fuzzy
+msgid "URI of first selected"
+msgstr "Первый выбранный"
+
+#: src/cfg_cmdseq.c:647
+#, fuzzy
+msgid "URI of first selected, unselect"
+msgstr "Первый выбранный, разотметить"
+
+#: src/cfg_cmdseq.c:648
+#, fuzzy
+msgid "URI of first selected, no quotes"
+msgstr "Первый выбранный, без кавычек"
+
+#: src/cfg_cmdseq.c:649
+#, fuzzy
+msgid "URIs of all selected"
+msgstr "Все выбранные"
+
+#: src/cfg_cmdseq.c:650
+#, fuzzy
+msgid "URIs of all selected, unselect"
+msgstr "Все выбранные, разотметить"
+
+#: src/cfg_cmdseq.c:651
+#, fuzzy
+msgid "URIs of all selected, no quotes"
+msgstr "Все выбранные, без кавычек"
+
+#: src/cfg_cmdseq.c:652
+#, fuzzy
+msgid "URIs of all selected, unselect, no quotes"
+msgstr "Все выбранные, без кавычек"
+
+#: src/cfg_cmdseq.c:653
+#, fuzzy
+msgid "URI of first selected (destination pane)"
+msgstr "Первый выбранный (панель назначения)"
+
+#: src/cfg_cmdseq.c:654
 msgid "Input combo box"
 msgstr "Кнопка выбора"
 
-#: src/cfg_cmdseq.c:646
+#: src/cfg_cmdseq.c:655
 msgid "Input using menu"
 msgstr "Меню выбора"
 
-#: src/cfg_cmdseq.c:647
+#: src/cfg_cmdseq.c:656
 msgid "Input string"
 msgstr "Ввод строка"
 
-#: src/cfg_cmdseq.c:648
+#: src/cfg_cmdseq.c:657
 msgid "Input check button (gives TRUE or FALSE)"
 msgstr "Кнопки - флажки (ДА/НЕТ)"
 
-#: src/cfg_cmdseq.c:649
+#: src/cfg_cmdseq.c:658
 msgid "Add label to input window"
 msgstr "Заголовок окна диалога"
 
-#: src/cfg_cmdseq.c:650
+#: src/cfg_cmdseq.c:659
 msgid "Add a separator bar to input window"
 msgstr "Линия-разделитель в окне ввода"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "$NAME"
 msgstr "$NAME"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "Value of $NAME (environment)"
 msgstr "Значение $NAME (из окружения)"
 
-#: src/cfg_cmdseq.c:652
+#: src/cfg_cmdseq.c:661
 msgid "gentoo's PID"
 msgstr "PID gentoo"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "Home directory for user NAME"
 msgstr "Домашний каталог пользователя NAME"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "~NAME"
 msgstr "~NAME"
 
-#: src/cfg_cmdseq.c:677
+#: src/cfg_cmdseq.c:686 src/cmd_split.c:536
 msgid "Pick Code"
 msgstr "Выбрать код"
 
-#: src/cfg_cmdseq.c:765
+#: src/cfg_cmdseq.c:778
 msgid "(No Options Available)"
 msgstr "(Нет настроек)"
 
-#: src/cfg_cmdseq.c:801
+#: src/cfg_cmdseq.c:814
 msgid "Run in Background?"
 msgstr "Запустить фоном?"
 
-#: src/cfg_cmdseq.c:805
+#: src/cfg_cmdseq.c:818
 msgid "Kill Previous Instance?"
 msgstr "Снять предыдущую задачу?"
 
-#: src/cfg_cmdseq.c:809
+#: src/cfg_cmdseq.c:822
 msgid "Survive Quit?"
 msgstr "Не снимать при выходе?"
 
-#: src/cfg_cmdseq.c:815
+#: src/cfg_cmdseq.c:828
 msgid "Capture Output?"
 msgstr "Показывать вывод?"
 
-#: src/cfg_cmdseq.c:900
+#: src/cfg_cmdseq.c:913
 msgid "Before Execution"
 msgstr "Перед запуском"
 
-#: src/cfg_cmdseq.c:903
+#: src/cfg_cmdseq.c:916
 msgid "Require Source Selection?"
 msgstr "Обязателен выбор источника?"
 
-#: src/cfg_cmdseq.c:907
+#: src/cfg_cmdseq.c:920
 msgid "Require Destination Selection?"
 msgstr "Обязателен выбор назначения?"
 
-#: src/cfg_cmdseq.c:912
+#: src/cfg_cmdseq.c:926
 msgid "CD Source?"
 msgstr "Перейти в каталог источника?"
 
-#: src/cfg_cmdseq.c:915
+#: src/cfg_cmdseq.c:929
 msgid "CD Destination?"
 msgstr "Перейти в каталог назначения?"
 
-#: src/cfg_cmdseq.c:922
+#: src/cfg_cmdseq.c:937
 msgid "After Execution"
 msgstr "После запуска"
 
-#: src/cfg_cmdseq.c:924
+#: src/cfg_cmdseq.c:939
 msgid "Rescan Source?"
 msgstr "Перечитать каталог источника?"
 
-#: src/cfg_cmdseq.c:928
+#: src/cfg_cmdseq.c:943
 msgid "Rescan Destination?"
 msgstr "Перечитать каталог назначения?"
 
-#: src/cfg_cmdseq.c:942
+#: src/cfg_cmdseq.c:957
 msgid "General"
 msgstr "Основные"
 
-#: src/cfg_cmdseq.c:945
+#: src/cfg_cmdseq.c:960
 msgid "Before&After"
 msgstr "До и после"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "Built-In"
 msgstr "Встроеные"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "External"
 msgstr "Внешние"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Add Row"
 msgstr "Добавить строку"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Duplicate"
 msgstr "Создать копию"
 
-#: src/cfg_cmdseq.c:978 src/cfg_styles.c:588 src/cfg_styles.c:805
-#: src/cfg_types.c:679 src/cmd_symlink.c:209 src/dpformat.c:35
+#: src/cfg_cmdseq.c:993 src/cfg_styles.c:596 src/cfg_styles.c:823
+#: src/cfg_types.c:678 src/cmd_info.c:151 src/cmd_split.c:648
+#: src/cmd_symlink.c:213 src/dpformat.c:36
 msgid "Name"
 msgstr "Имя"
 
-#: src/cfg_cmdseq.c:988
+#: src/cfg_cmdseq.c:1004
 msgid "Definition"
 msgstr "Описание"
 
-#: src/cfg_cmdseq.c:1044
+#: src/cfg_cmdseq.c:1058
 msgid "Repeat Sequence Until No Source Selection?"
 msgstr "Повторять последовательность пока есть выбраные?"
 
-#: src/cfg_cmdseq.c:1056 src/cfg_controls.c:655 src/cfg_controls.c:706
-#: src/cfg_styles.c:833 src/cfg_types.c:775
+#: src/cfg_cmdseq.c:1070 src/cfg_controls.c:622 src/cfg_controls.c:673
+#: src/cfg_styles.c:853 src/cfg_types.c:776
 msgid "Add"
 msgstr "Добавить"
 
-#: src/cfg_cmdseq.c:1059 src/cfg_controls.c:658 src/cfg_controls.c:709
-#: src/cfg_styles.c:836 src/cfg_types.c:788
+#: src/cfg_cmdseq.c:1073 src/cfg_controls.c:625 src/cfg_controls.c:676
+#: src/cfg_styles.c:856 src/cfg_types.c:789
 msgid "Delete"
 msgstr "Убрать"
 
-#: src/cfg_cmdseq.c:1066
+#: src/cfg_cmdseq.c:1080
 msgid "Commands"
 msgstr "Команды"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1365 src/cfg_dirpane.c:1371
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1288 src/cfg_dirpane.c:1293
 msgid "Left"
 msgstr "Левая"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Middle"
 msgstr "Средняя"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1364 src/cfg_dirpane.c:1372
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1287 src/cfg_dirpane.c:1294
 msgid "Right"
 msgstr "Правая"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Down"
 msgstr "Колесом вниз"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Up"
 msgstr "Колесом вверх"
 
-#: src/cfg_controls.c:382
+#: src/cfg_controls.c:378
 msgid ""
 "The following modifier key(s) must\n"
 "be held down when the mouse button\n"
@@ -486,47 +528,43 @@
 "Следующие кнопки модификаторы должны\n"
 "быть нажаты во время щелчка мышки"
 
-#: src/cfg_controls.c:395
+#: src/cfg_controls.c:391
 msgid "Edit Modifiers"
 msgstr "Изменить модификаторы"
 
-#: src/cfg_controls.c:613
+#: src/cfg_controls.c:580
 msgid "Controls"
 msgstr "Управление"
 
-#: src/cfg_controls.c:620
+#: src/cfg_controls.c:587
 msgid "Global Keyboard Shortcuts"
 msgstr "Основные комбинации кнопок"
 
-#: src/cfg_controls.c:665
+#: src/cfg_controls.c:632
 msgid "Dirpane Mouse Buttons"
 msgstr "Клавиши мышки"
 
-#: src/cfg_controls.c:690
+#: src/cfg_controls.c:657
 msgid "Button"
 msgstr "Кнопка"
 
-#: src/cfg_controls.c:693
+#: src/cfg_controls.c:660
 msgid "Edit Modifiers..."
 msgstr "Изменить модификаторы..."
 
-#: src/cfg_controls.c:716
+#: src/cfg_controls.c:683
 msgid "Click-M-Click Gesture"
 msgstr "Щелк-М-Щелк возможность"
 
-#: src/cfg_controls.c:726
+#: src/cfg_controls.c:693
 msgid "Time Limit"
 msgstr "Задержка"
 
-#: src/cfg_controls.c:737
-msgid "Path Right Click"
-msgstr "Правый щелчок на пути"
-
-#: src/cfg_controls.c:750
+#: src/cfg_controls.c:704
 msgid "Ignore Num Lock For All Bindings?"
 msgstr "Не учитывать Num Lock для всех комбинаций?"
 
-#: src/cfg_controls.c:780
+#: src/cfg_controls.c:734
 msgid ""
 "Note: The mouse button control settings\n"
 "are ambiguous: the same button+modifier\n"
@@ -538,310 +576,297 @@
 "используется для более чем одной цели. Это\n"
 "может привести к их неожиданному поведению..."
 
-#: src/cfg_controls.c:784
+#: src/cfg_controls.c:738
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/cfg_controls.c:784 src/children.c:95 src/cmd_info.c:246
+#: src/cfg_controls.c:738 src/children.c:89 src/cmd_info.c:320
 msgid "_OK"
 msgstr "_Да"
 
-#: src/cfg_dirpane.c:365
-msgid "Formatted Size, in bytes"
-msgstr "Размер, в байтах"
-
-#: src/cfg_dirpane.c:365
-msgid "Raw Size, in Bytes"
-msgstr "Сырой размер, в байтах"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in kilobytes"
-msgstr "Размер, в килобайтах"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in megabytes"
-msgstr "Размер, в мегабайтах"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, \"Smart\" Unit"
-msgstr "Размер,в \"умных\" единицах"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, in gigabytes"
-msgstr "Размер, в гигабайтах"
-
-#: src/cfg_dirpane.c:383
+#: src/cfg_dirpane.c:333
 msgid "Append Type Character?"
 msgstr "Добавить тип символа?"
 
-#: src/cfg_dirpane.c:386
-msgid "Append \"-> destination\" on Links?"
+#: src/cfg_dirpane.c:336
+#, fuzzy
+msgid "Append \"→ destination\" on Links?"
 msgstr "Добавить \"->назначение\" в ссылки?"
 
-#: src/cfg_dirpane.c:406
+#: src/cfg_dirpane.c:358
 msgid "Place Tick Every 3 Digits?"
 msgstr "Разделить разряды?"
 
-#: src/cfg_dirpane.c:416
+#: src/cfg_dirpane.c:369
 msgid "Digits of Precision"
 msgstr "Точность"
 
-#: src/cfg_dirpane.c:429
+#: src/cfg_dirpane.c:382
 msgid "Show Dir's File System Size?"
 msgstr "Показать размер файловой системы?"
 
-#: src/cfg_dirpane.c:435 src/cfg_dirpane.c:439 src/cfg_dirpane.c:443
-#: src/cfg_dirpane.c:447 src/cfg_dirpane.c:451 src/cfg_dirpane.c:455
-#: src/cfg_dirpane.c:459 src/cfg_dirpane.c:463 src/cfg_dirpane.c:467
-#: src/cfg_dirpane.c:474
+#: src/cfg_dirpane.c:388 src/cfg_dirpane.c:392 src/cfg_dirpane.c:396
+#: src/cfg_dirpane.c:400 src/cfg_dirpane.c:404 src/cfg_dirpane.c:408
+#: src/cfg_dirpane.c:412 src/cfg_dirpane.c:416 src/cfg_dirpane.c:420
+#: src/cfg_dirpane.c:428
 msgid "Format"
 msgstr "Формат"
 
-#: src/cfg_dirpane.c:497
+#: src/cfg_dirpane.c:454
 #, c-format
 msgid "%s Settings"
 msgstr "%s настройки"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1002 src/cfg_dirpane.c:1003
-#: src/cmd_select.c:414
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:970 src/cfg_dirpane.c:971
+#: src/cmd_select.c:381
 msgid "Content"
 msgstr "Содержание"
 
-#: src/cfg_dirpane.c:611
+#: src/cfg_dirpane.c:571
 msgid "Justification"
 msgstr "Выравнивание"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1003
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:971
 msgid "Title"
 msgstr "Заголовок"
 
-#: src/cfg_dirpane.c:611 src/window.c:201
+#: src/cfg_dirpane.c:571 src/window.c:200
 msgid "Width"
 msgstr "Ширина"
 
-#: src/cfg_dirpane.c:612
+#: src/cfg_dirpane.c:572
 msgid "Center"
 msgstr "По центру"
 
-#: src/cfg_dirpane.c:621
+#: src/cfg_dirpane.c:581
 msgid "Basic Settings"
 msgstr "Основные настройки"
 
-#: src/cfg_dirpane.c:669
+#: src/cfg_dirpane.c:628
 msgid "Edit Column Content"
 msgstr "Изменить содержимое колонок"
 
-#: src/cfg_dirpane.c:1002
+#: src/cfg_dirpane.c:970
 msgid "Default Title"
 msgstr "Заголовок по умолчанию"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories First"
 msgstr "Каталоги вверху"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Last"
 msgstr "Каталоги внизу"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Mixed"
 msgstr "Каталоги как файлы"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Left of List"
 msgstr "Слева от списка"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Right of List"
 msgstr "Справа от списка"
 
-#: src/cfg_dirpane.c:1029 src/cfg_dirpane.c:1030
+#: src/cfg_dirpane.c:997
 msgid "System Default"
 msgstr "По умолчанию"
 
-#: src/cfg_dirpane.c:1030
-msgid "Always Set"
-msgstr "Всегда включено"
-
-#: src/cfg_dirpane.c:1030 src/cmd_chmod.c:260 src/menus.c:513
-msgid "Toggle"
-msgstr "Переключить"
-
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy From %s"
 msgstr "Скопировать из %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy To %s"
 msgstr "Копировать в %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Swap With %s"
 msgstr "Обменять с %s"
 
-#: src/cfg_dirpane.c:1048
+#: src/cfg_dirpane.c:1015
 msgid "Columns"
 msgstr "Колонки"
 
-#: src/cfg_dirpane.c:1053
+#: src/cfg_dirpane.c:1020
 msgid "Available Content Types"
 msgstr "Доступные типы содержимого"
 
-#: src/cfg_dirpane.c:1070
+#: src/cfg_dirpane.c:1037
 msgid "Selected Content Types"
 msgstr "Выбраные типы содержимого"
 
-#: src/cfg_dirpane.c:1081 src/cfg_styles.c:723
+#: src/cfg_dirpane.c:1049 src/cfg_styles.c:741
 msgid "Edit..."
 msgstr "Изменить..."
 
-#: src/cfg_dirpane.c:1082 src/cmd_renamere.c:508
+#: src/cfg_dirpane.c:1050 src/cmd_renamere.c:481
 msgid "Remove"
 msgstr "Убрать"
 
-#: src/cfg_dirpane.c:1096
+#: src/cfg_dirpane.c:1064
 msgid "Sorting"
 msgstr "Сортировка"
 
-#: src/cfg_dirpane.c:1099
+#: src/cfg_dirpane.c:1067
 msgid "Sort On"
 msgstr "Сортировать"
 
-#: src/cfg_dirpane.c:1106 src/cmd_split.c:233 src/dpformat.c:39
-#: src/dpformat.c:40
+#: src/cfg_dirpane.c:1071 src/cmd_split.c:590 src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode"
 msgstr "Режим"
 
-#: src/cfg_dirpane.c:1113
+#: src/cfg_dirpane.c:1077
 msgid "Inverse Sorting?"
 msgstr "Обратная сортировка?"
 
-#: src/cfg_dirpane.c:1116 src/cfg_paths.c:187 src/cfg_types.c:743
-#: src/cmd_renamere.c:459 src/cmd_renamere.c:486 src/cmd_select.c:520
-#: src/textview.c:620
+#: src/cfg_dirpane.c:1080 src/cfg_paths.c:228 src/cfg_types.c:744
+#: src/cmd_renamere.c:432 src/cmd_renamere.c:459 src/cmd_select.c:478
+#: src/textview.c:604
 msgid "Ignore Case?"
 msgstr "Не учитывать регистр?"
 
-#: src/cfg_dirpane.c:1119
-msgid "Numerical Mode?"
-msgstr "Учитывать длину?"
-
-#: src/cfg_dirpane.c:1127
+#: src/cfg_dirpane.c:1088
 msgid "Default Directory"
 msgstr "Каталог по умолчанию"
 
-#: src/cfg_dirpane.c:1132
+#: src/cfg_dirpane.c:1094
 msgid "Grab Current"
 msgstr "Взять текущие"
 
-#: src/cfg_dirpane.c:1135
+#: src/cfg_dirpane.c:1097
 msgid "From History"
 msgstr "Последний"
 
-#: src/cfg_dirpane.c:1148
+#: src/cfg_dirpane.c:1110
 msgid "Path Above?"
 msgstr "Путь сверху?"
 
-#: src/cfg_dirpane.c:1152
+#: src/cfg_dirpane.c:1114
 msgid "Hide Allowed?"
 msgstr "Разрешить скрытие?"
 
-#: src/cfg_dirpane.c:1156
+#: src/cfg_dirpane.c:1118
 msgid "Scrollbar Always?"
 msgstr "Бегунок всегда?"
 
-#: src/cfg_dirpane.c:1160
+#: src/cfg_dirpane.c:1122
 msgid "Huge Parent Button?"
 msgstr "Большая кнопка Вверх?"
 
-#: src/cfg_dirpane.c:1168
+#: src/cfg_dirpane.c:1127
+msgid "Set Custom Font?"
+msgstr ""
+
+#: src/cfg_dirpane.c:1140
 msgid "Scrollbar Position"
 msgstr "Расположение бегунка"
 
-#: src/cfg_dirpane.c:1180
-msgid "Modify 'Control' Key State"
-msgstr "Изменить состояние кнопки 'Control'"
-
-#: src/cfg_dirpane.c:1225
-msgid "Active Pane Titles"
-msgstr "Заголовок активной панели"
-
-#: src/cfg_dirpane.c:1225
-msgid "Focused Row, Unselected"
-msgstr "Выбранная строка, не отмеченая"
-
-#: src/cfg_dirpane.c:1226
-msgid "Focused Row, Selected"
-msgstr "Выбранная строка, отмеченная"
-
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Horizontal"
 msgstr "Горизонтально"
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Vertical"
 msgstr "Вертикально"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Don't Track"
 msgstr "Не изменять"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Ratio"
 msgstr "Соотношение"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Left Pane"
 msgstr "Размер левой панели"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Right Pane"
 msgstr "Размер правой панели"
 
-#: src/cfg_dirpane.c:1275
+#: src/cfg_dirpane.c:1198
 msgid "Pane Orientation"
 msgstr "Ориентация панели"
 
-#: src/cfg_dirpane.c:1289
+#: src/cfg_dirpane.c:1212
 msgid "Split Tracking"
 msgstr "Разделитель"
 
-#: src/cfg_dirpane.c:1312
+#: src/cfg_dirpane.c:1235
 msgid "pixels"
 msgstr "точки"
 
-#: src/cfg_dirpane.c:1340
+#: src/cfg_dirpane.c:1263
 msgid "Remember Selected Rows?"
 msgstr "Запоминать выбраные элементы?"
 
-#: src/cfg_dirpane.c:1343
+#: src/cfg_dirpane.c:1266
 msgid "Save History Lists?"
 msgstr "Сохранять историю?"
 
-#: src/cfg_dirpane.c:1360 src/cfg_dirpane.c:1370
+#: src/cfg_dirpane.c:1283 src/cfg_dirpane.c:1292
 msgid "Dir Panes"
 msgstr "Панели"
 
-#: src/cfg_dirpane.c:1374
+#: src/cfg_dirpane.c:1295
 msgid "Pane Split"
 msgstr "Разделитель"
 
-#: src/cfg_dirpane.c:1375
+#: src/cfg_dirpane.c:1296
 msgid "History"
 msgstr "История"
 
-#: src/cfg_errors.c:45
+#: src/cfg_dirpane.c:1725
+msgid "'Blocks' Content Deprecated"
+msgstr ""
+
+#: src/cfg_dirpane.c:1726
+msgid ""
+"The 'Blocks' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
+
+#: src/cfg_dirpane.c:1732
+msgid "'Block Size' Content Deprecated"
+msgstr ""
+
+#: src/cfg_dirpane.c:1733
+msgid ""
+"The 'Block Size' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
+
+#: src/cfg_errors.c:48
 msgid "Errors"
 msgstr "Ошибки"
 
-#: src/cfg_errors.c:52
-msgid "Use Dialog to Report Errors?"
-msgstr "Использовать диалог для ошибок?"
+#: src/cfg_errors.c:55
+msgid "Error and Status Message Display"
+msgstr ""
+
+#: src/cfg_errors.c:57
+msgid "Status Bar, Above Panes"
+msgstr ""
+
+#: src/cfg_errors.c:60
+msgid "Main Window's Title Bar"
+msgstr ""
+
+#: src/cfg_errors.c:63
+msgid "Separate Dialog"
+msgstr ""
 
-#: src/cfg_errors.c:56
+#: src/cfg_errors.c:69
 msgid "Cause Console Beep on Error?"
 msgstr "Использовать сигнал динамика?"
 
@@ -849,116 +874,96 @@
 msgid "Menus"
 msgstr "Меню"
 
-#: src/cfg_mount.c:168
-msgid "Never"
-msgstr "Никогда"
-
-#: src/cfg_mount.c:168
-msgid "On Every Access"
-msgstr "При каждом обращении"
-
-#: src/cfg_mount.c:177
-msgid "Mounting"
-msgstr "Подключение"
-
-#: src/cfg_mount.c:184
-msgid "Mount When?"
-msgstr "Когда подключать?"
-
-#: src/cfg_mount.c:196
-msgid "Mount Options"
-msgstr "Настройка подключения дисков"
-
-#: src/cfg_mount.c:199
-msgid "Mount Command"
-msgstr "Команда подключения"
+#: src/cfg_nag.c:78
+#, c-format
+msgid ""
+"Click the button below to reset the %zu stored 'Don't show this dialog "
+"again' responses."
+msgstr ""
 
-#: src/cfg_mount.c:204
-msgid "Unmount Command"
-msgstr "Команда отключения"
+#: src/cfg_nag.c:100
+msgid "Nagging"
+msgstr ""
 
-#: src/cfg_mount.c:211
-msgid "Only Mount on Toplevel Directories?"
-msgstr "Подключать только в корневом каталоге?"
+#: src/cfg_nag.c:110
+#, fuzzy
+msgid "Reset All"
+msgstr "Вернуть начальные"
 
-#: src/cfg_mount.c:214
-msgid "Use Command Error Dialog?"
-msgstr "Использовать диалог для ошибок"
+#: src/cfg_paths.c:78
+msgid "Edit path"
+msgstr ""
 
-#: src/cfg_mount.c:217
-msgid "Unmount When gentoo Quits?"
-msgstr "Отключать при выходе?"
+#: src/cfg_paths.c:152
+msgid "Icons"
+msgstr "Значки"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:153
 msgid "GTK+ RC"
 msgstr "GTK+ RC"
 
-#: src/cfg_paths.c:128
-msgid "Icons"
-msgstr "Значки"
-
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:154
 msgid "fstab"
 msgstr "fstab"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:155
 msgid "mtab"
 msgstr "mtab"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Beginning With Dot (.)"
 msgstr "Начинающиеся с точки (.)"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Matching RE"
 msgstr "Удовлетворяющие условию"
 
-#: src/cfg_paths.c:129 src/cmd_chmod.c:259 src/menus.c:512
+#: src/cfg_paths.c:157 src/cmd_chmod.c:252 src/menus.c:519
 msgid "None"
 msgstr "Нет"
 
-#: src/cfg_paths.c:135
+#: src/cfg_paths.c:163
 msgid "Paths & Hide"
 msgstr "Пути & Скрытие"
 
-#: src/cfg_paths.c:142
+#: src/cfg_paths.c:170
 msgid "Paths"
 msgstr "Пути"
 
-#: src/cfg_paths.c:169
+#: src/cfg_paths.c:209
 msgid "Hide Entries"
 msgstr "Скрытие"
 
-#: src/cfg_styles.c:170 src/cfg_types.c:234 src/iconutil.c:29 src/menus.c:19
+#: src/cfg_styles.c:178 src/cfg_types.c:233 src/iconutil.c:31 src/menus.c:19
 msgid "(None)"
 msgstr "(Нет)"
 
-#: src/cfg_styles.c:191 src/cfg_styles.c:428 src/cfg_styles.c:767
+#: src/cfg_styles.c:199 src/cfg_styles.c:436 src/cfg_styles.c:785
 msgid "Delete Action"
 msgstr "Удаление"
 
-#: src/cfg_styles.c:411 src/color_dialog.c:48
+#: src/cfg_styles.c:419 src/color_dialog.c:47
 msgid "Edit Color"
 msgstr "Изменить цвет"
 
-#: src/cfg_styles.c:428
+#: src/cfg_styles.c:436
 msgid "Revert to Inherited Command"
 msgstr "Оставить только наследуемые"
 
-#: src/cfg_styles.c:529
+#: src/cfg_styles.c:537
 #, fuzzy
 msgid "Select Command ..."
 msgstr "Выберите команду"
 
-#: src/cfg_styles.c:592
+#: src/cfg_styles.c:601
 msgid "New Action Property"
 msgstr "Свойства нового события"
 
-#: src/cfg_styles.c:600
+#: src/cfg_styles.c:609
 msgid "something"
 msgstr "нечто"
 
-#: src/cfg_styles.c:670
+#: src/cfg_styles.c:679
 msgid ""
 "Deleting this style will also delete\n"
 "all its children. Are you sure?"
@@ -966,136 +971,136 @@
 "Удаление этого класса повлечет также\n"
 "удаление всех потомков. Уверены?"
 
-#: src/cfg_styles.c:671
+#: src/cfg_styles.c:680
 msgid "Confirm Delete"
 msgstr "Подтвердите удаление"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Background Color"
 msgstr "Цвет фона"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Foreground Color"
 msgstr "Цвет"
 
-#: src/cfg_styles.c:694 src/dpformat.c:53
+#: src/cfg_styles.c:703 src/dpformat.c:55
 msgid "Icon"
 msgstr "Значок"
 
-#: src/cfg_styles.c:696
+#: src/cfg_styles.c:705
 msgid "(Row Style Preview Text)"
 msgstr "(Так будет выглядеть)"
 
-#: src/cfg_styles.c:702 src/cmd_renameseq.c:386
+#: src/cfg_styles.c:713 src/cmd_renameseq.c:358 src/cmd_split.c:656
 msgid "Preview"
 msgstr "Предпросмотр"
 
-#: src/cfg_styles.c:719
+#: src/cfg_styles.c:737
 msgid "Override Parent's?"
 msgstr "Переопределить?"
 
-#: src/cfg_styles.c:723
+#: src/cfg_styles.c:741
 msgid "Pick..."
 msgstr "Выберите..."
 
-#: src/cfg_styles.c:764
+#: src/cfg_styles.c:782
 msgid "Add Action..."
 msgstr "Добавить действие..."
 
-#: src/cfg_styles.c:810 src/menus.c:525
+#: src/cfg_styles.c:829 src/menus.c:532
 msgid "Parent"
 msgstr "Родитель"
 
-#: src/cfg_styles.c:820
+#: src/cfg_styles.c:840
 msgid "Inherited Properties"
 msgstr "Наследуемые свойства"
 
-#: src/cfg_styles.c:824
+#: src/cfg_styles.c:844
 msgid "Visual"
 msgstr "Отображение"
 
-#: src/cfg_styles.c:826
+#: src/cfg_styles.c:846
 msgid "Actions"
 msgstr "Действия"
 
-#: src/cfg_styles.c:843
+#: src/cfg_styles.c:863
 msgid "File Recognition"
 msgstr "Типы файлов"
 
-#: src/cfg_styles.c:844
+#: src/cfg_styles.c:864
 msgid "Styles"
 msgstr "Классы"
 
-#: src/cfg_types.c:193
+#: src/cfg_types.c:192
 #, c-format
 msgid "%s - Click to Change..."
 msgstr "%s - Щелкните для смены..."
 
-#: src/cfg_types.c:508
+#: src/cfg_types.c:507
 msgid "(New Type)"
 msgstr "(Новый тип)"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "B-Dev"
 msgstr "B-Устр"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "C-Dev"
 msgstr "C-Устр"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Dir"
 msgstr "Каталог"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "FIFO"
 msgstr "FIFO"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "File"
 msgstr "Файл"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Link"
 msgstr "Ссылка"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Socket"
 msgstr "Порт"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "Readable"
 msgstr "Чтение"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetGID"
 msgstr "С GID"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetUID"
 msgstr "С UID"
 
-#: src/cfg_types.c:648 src/cmd_chmod.c:209
+#: src/cfg_types.c:647 src/cmd_chmod.c:200
 msgid "Sticky"
 msgstr "Фиксация"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Executable"
 msgstr "Выполнение"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Writable"
 msgstr "Запись"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match 'file' (RE)"
 msgstr "Условие на файл"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match Name (RE)"
 msgstr "Условие на имя"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Require Suffix"
 msgstr "С расширением"
 
@@ -1111,19 +1116,19 @@
 msgid "Require Protection"
 msgstr "Атрибуты"
 
-#: src/cfg_types.c:738
+#: src/cfg_types.c:739
 msgid "Glob?"
 msgstr "Все?"
 
-#: src/cfg_types.c:754
+#: src/cfg_types.c:755
 msgid "Type's Style"
 msgstr "Класс этого типа"
 
-#: src/cfg_types.c:756
+#: src/cfg_types.c:757
 msgid "Style"
 msgstr "Класс"
 
-#: src/cfg_types.c:796
+#: src/cfg_types.c:797
 msgid "Types"
 msgstr "Типы"
 
@@ -1152,16 +1157,16 @@
 msgid "Dialog Positioning"
 msgstr "Расположение диалоговых окон"
 
-#: src/children.c:94
+#: src/children.c:88
 #, c-format
 msgid "Execution of \"%s\" Failed"
 msgstr "Выполнение \"%s\" сорвано"
 
-#: src/children.c:95 src/dialog.c:285
+#: src/children.c:89 src/dialog.c:290
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/children.c:274
+#: src/children.c:227
 #, c-format
 msgid "Couldn't terminate child \"%s\" (pid=%d)--zombie alert"
 msgstr "Не могу выгрузить процесс \"%s\" (pid=%d) -- зомби"
@@ -1183,7 +1188,7 @@
 
 #: src/cmd_about.c:97
 #, fuzzy
-msgid "(c) 1998-2009 by Emil Brink, Obsession Development.\n"
+msgid "(c) 1998-2011 by Emil Brink, Obsession Development.\n"
 msgstr "(c) 1998-2008 - Emil Brink, Obsession Development.\n"
 
 #: src/cmd_about.c:99
@@ -1194,35 +1199,23 @@
 "Это открытое ПО и оно не дает АБСОЛЮТНО НИКАКИХ \n"
 "ГАРАНТИЙ. Подробности прочтите в файле COPYING.\n"
 
-#: src/cmd_about.c:106
-msgid "FAM: Supported and active."
-msgstr "FAM: Поддерживается и включено"
-
-#: src/cmd_about.c:108
-msgid "FAM: Supported, but not active."
-msgstr "FAM: Поддерживается, но не включено."
-
-#: src/cmd_about.c:110
-msgid "FAM: Not supported."
-msgstr "FAM: Не поддерживается."
-
-#: src/cmd_about.c:116
+#: src/cmd_about.c:105
 msgid "NLS: Supported, using built-in English strings."
 msgstr "NLS: Поддерживается, с помощью встроенных английских строк."
 
-#: src/cmd_about.c:129
-#, fuzzy
+#: src/cmd_about.c:118
+#, fuzzy, c-format
 msgid ""
 "The author of gentoo can be reached via Internet\n"
-"e-mail at <emil@obsession.se>; feel free to let\n"
+"e-mail at <a href=\"mailto:%s\">%s</a>; feel free to let\n"
 "me know what you think of this software, give\n"
 "suggestions/bug reports, and so on.\n"
 "\n"
 "The latest release of gentoo can always be down-\n"
 "loaded from the official gentoo project homepage at\n"
-"<http://www.obsession.se/gentoo/>. New releases are\n"
+"<a href=\"%s\">%s</a>. New releases are\n"
 "typically announced on the Freshmeat service at\n"
-"<http://freshmeat.net/>."
+"<a href=\"http://freshmeat.net/\">freshmeat.net</a>."
 msgstr ""
 "Автор этой программы доступен через электронную\n"
 "почту по адресу: <emil@obsession.se>; напишите ему\n"
@@ -1235,11 +1228,11 @@
 "в \"Свежем мясе\" - <http://freshmeat.net/>.\n"
 "О неточностях перевода пишите М.Зарипову <m3for@mail.ru>"
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "About gentoo"
 msgstr "О программе"
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "_OK (Wait for More)"
 msgstr "_ДА (Подождите продолжения)"
 
@@ -1248,85 +1241,89 @@
 msgid "Set protection bits for \"%s\":"
 msgstr "Установить права для \"%s\":"
 
-#: src/cmd_chmod.c:208 src/cmd_chown.c:184 src/cmd_info.c:202
+#: src/cmd_chmod.c:199 src/cmd_chown.c:176 src/cmd_info.c:274
 msgid "Group"
 msgstr "Группа"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Others"
 msgstr "Другие"
 
-#: src/cmd_chmod.c:208 src/cmd_info.c:195
+#: src/cmd_chmod.c:199 src/cmd_info.c:267
 msgid "Owner"
 msgstr "Владелец"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Special"
 msgstr "Специальные"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Execute"
 msgstr "Запуск"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Read"
 msgstr "Чтение"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set GID"
 msgstr "Исп. GID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set UID"
 msgstr "Исп. UID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Write"
 msgstr "Запись"
 
-#: src/cmd_chmod.c:231
+#: src/cmd_chmod.c:222
 msgid "Protection Bits"
 msgstr "Биты прав"
 
-#: src/cmd_chmod.c:242
+#: src/cmd_chmod.c:233
 msgid "Textual"
 msgstr ""
 
-#: src/cmd_chmod.c:253
+#: src/cmd_chmod.c:246
 #, fuzzy
 msgid "Octal"
 msgstr "8, Восьмеричная"
 
-#: src/cmd_chmod.c:258 src/menus.c:511
+#: src/cmd_chmod.c:251 src/menus.c:518
 msgid "All"
 msgstr "Все"
 
-#: src/cmd_chmod.c:261
+#: src/cmd_chmod.c:253 src/menus.c:520
+msgid "Toggle"
+msgstr "Переключить"
+
+#: src/cmd_chmod.c:254
 msgid "Revert"
 msgstr "Сбросить"
 
-#: src/cmd_chmod.c:273 src/cmd_chown.c:208 src/cmd_info.c:304
+#: src/cmd_chmod.c:266 src/cmd_chown.c:201 src/cmd_info.c:372
 msgid "Recurse Directories?"
 msgstr "Для содержимого тоже?"
 
-#: src/cmd_chmod.c:276
+#: src/cmd_chmod.c:269
 msgid "Don't Touch Directories?"
 msgstr "Кроме каталогов?"
 
-#: src/cmd_chmod.c:281
+#: src/cmd_chmod.c:274
 msgid "Change Mode"
 msgstr "Смена режима"
 
-#: src/cmd_chown.c:56
+#: src/cmd_chown.c:57
 #, c-format
 msgid "Set Ownership for '%s':"
 msgstr "Установка владельца для '%s':"
 
-#: src/cmd_chown.c:184
+#: src/cmd_chown.c:176
 msgid "User"
 msgstr "Пользователь"
 
-#: src/cmd_chown.c:213
+#: src/cmd_chown.c:206
 msgid "Change Ownership"
 msgstr "Смена владельца"
 
@@ -1334,49 +1331,38 @@
 msgid "Automatically Save Changed Configuration on Exit?"
 msgstr "Автоматически сохранять настройки при выходе?"
 
-#: src/cmd_copy.c:302
-#, c-format
-msgid ""
-"Can't copy directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"Не могу копировать \"%s\"\n"
-"в \"%s\"\n"
-"(копирование самого в себя)."
-
-#: src/cmd_copy.c:392 src/cmd_copyas.c:62
+#: src/cmd_copy.c:175 src/cmd_copyas.c:62
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Copy?"
 msgstr "\"%s\" Уже существует - Продолжить копирование?"
 
-#: src/cmd_copy.c:393
+#: src/cmd_copy.c:176
 msgid "Copying..."
 msgstr "Копирование..."
 
-#: src/cmd_copy.c:440
+#: src/cmd_copy.c:217
 msgid "Preserve Dates During Copy?"
 msgstr "Сохранять даты при копировании?"
 
-#: src/cmd_copy.c:441
+#: src/cmd_copy.c:218
 msgid "Ignore Failure to Copy Attributes (Date, Owner, Mode)?"
 msgstr ""
 "Игнорировать невозможность копирования атрибутов (Дата, Права, Владелец)?"
 
-#: src/cmd_copy.c:442
+#: src/cmd_copy.c:219
 msgid "Leave Failed Destination if Full Size?"
 msgstr "Оставлять незавершенные файлы если нет места?"
 
-#: src/cmd_copy.c:443 src/cmd_viewtext.c:207
+#: src/cmd_copy.c:220 src/cmd_viewtext.c:204
 msgid "Buffer Size"
 msgstr "Размер буфера"
 
-#: src/cmd_copyas.c:51
+#: src/cmd_copyas.c:49
 #, c-format
 msgid "Enter Name for Copy of \"%s\""
 msgstr "Введите имя для копирования \"%s\""
 
-#: src/cmd_copyas.c:53
+#: src/cmd_copyas.c:51
 #, c-format
 msgid "Enter Name for Clone of \"%s\""
 msgstr "Введите имя клона \"%s\""
@@ -1404,28 +1390,28 @@
 msgid "Enter Name for Link Clone of \"%s\""
 msgstr "Введите имя для клона ссылки \"%s\""
 
-#: src/cmd_copyas.c:89
+#: src/cmd_copyas.c:91
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Symlink?"
 msgstr "\"%s\" Уже существует - Продолжить создание ссылки?"
 
-#: src/cmd_copyas.c:204 src/cmd_copyas.c:210
+#: src/cmd_copyas.c:200 src/cmd_copyas.c:207
 msgid "Copy As"
 msgstr "Копировать как"
 
-#: src/cmd_copyas.c:212
+#: src/cmd_copyas.c:209
 msgid "Clone"
 msgstr "Клонировать"
 
-#: src/cmd_copyas.c:214
+#: src/cmd_copyas.c:211
 msgid "Symbolic Link As"
 msgstr "Ссылка с именем"
 
-#: src/cmd_copyas.c:216
+#: src/cmd_copyas.c:213
 msgid "Symbolic Link Clone"
 msgstr "Клонирование ссылки"
 
-#: src/cmd_delete.c:55
+#: src/cmd_delete.c:56
 #, c-format
 msgid ""
 "%s\n"
@@ -1436,239 +1422,248 @@
 "не может быть удален из-за ограничения доступа.\n"
 "Попробовать снять защиту и продолжить?"
 
-#: src/cmd_delete.c:58
+#: src/cmd_delete.c:59
 msgid "Remember the answer (alters config)"
 msgstr "Запомнить ответ (меняет настройку)"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Access Problem"
 msgstr "Проблема доступа"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Change|Leave Alone"
 msgstr "Сменить|Оставить"
 
-#: src/cmd_delete.c:236
+#: src/cmd_delete.c:215
 #, c-format
 msgid "Really Delete \"%s\"?"
 msgstr "Действительно удалить \"%s\" ?"
 
-#: src/cmd_delete.c:237
+#: src/cmd_delete.c:216
 msgid "Deleting..."
 msgstr "Удаление..."
 
-#: src/cmd_delete.c:292
+#: src/cmd_delete.c:279
 msgid "On Access Failure"
 msgstr "В случае нехватки прав"
 
-#: src/cmd_delete.c:293
+#: src/cmd_delete.c:280
 msgid "Ask User|Automatically Try Changing, and Retry|Fail"
 msgstr "Спросить|Попытаться сменить и продолжить|Прервать"
 
-#: src/cmd_dpfocus.c:183
-msgid "Wrap Around At Top And Bottom?"
-msgstr "Перескакивать в другой конец списка?"
+#: src/cmd_dpfocus.c:33
+msgid "DpFocus Command is Deprecated"
+msgstr ""
+
+#: src/cmd_dpfocus.c:34
+msgid ""
+"The <tt>DpFocus</tt> command has been deprecated and is no longer supported. "
+"Please remove any keyboard or mouse bindings that use it and look into using "
+"the default GTK+ list view's cursor controls."
+msgstr ""
 
-#: src/cmd_dpfocus.c:184
+#: src/cmd_dpfocus.c:64
 msgid "Treat Focused Row As Selection If No \"Real\" Selection Exists?"
 msgstr "Обрабатывать курсор как выделение, если нет \"Настоящего\" выделения"
 
-#: src/cmd_dpfocus.c:186
+#: src/cmd_dpfocus.c:66
 msgid "Move Focus to Last Selected/Deselected Row?"
 msgstr "Ставить курсор на последний выбранный элемент?"
 
-#: src/cmd_dpfocusisrch.c:220
+#: src/cmd_dpfocusisrch.c:163
 msgid "ISearch"
 msgstr "Поиск"
 
-#: src/cmd_generic.c:136
+#: src/cmd_generic.c:143
 msgid "_OK|A_ll|_Skip|_Cancel"
 msgstr "ДА|Все|Нет|Отмена"
 
-#: src/cmd_generic.c:137
+#: src/cmd_generic.c:144
 msgid "_OK|_Skip|_Cancel"
 msgstr "_ДА|_Нет|_Отмена"
 
-#: src/cmd_getsize.c:49
+#: src/cmd_getsize.c:51
 msgid "Getting sizes..."
 msgstr "Считаю размер..."
 
-#: src/cmd_getsize.c:141
+#: src/cmd_getsize.c:134
 msgid "Unselect Rows When Done?"
 msgstr "Снять выделение после выполнения?"
 
-#: src/cmd_info.c:71 src/cmd_info.c:163
-#, c-format
-msgid ""
-"%s (%s bytes,\n"
-"%s blocks)"
-msgstr ""
-"%s (%s байт),\n"
-"%s блоков)"
+#: src/cmd_info.c:68 src/errors.c:84
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr ", %s занято"
 
-#: src/cmd_info.c:75
-#, c-format
-msgid "%u dirs, %u files, %u symlinks"
+#: src/cmd_info.c:72
+#, fuzzy, c-format
+msgid ""
+"%u dirs, %u files,\n"
+"%u symlinks, %u special files"
 msgstr "%u каталогов, %u файлов, %u ссылок"
 
-#: src/cmd_info.c:134
+#: src/cmd_info.c:153
+msgid "Value"
+msgstr ""
+
+#: src/cmd_info.c:198
 msgid "Link To"
 msgstr "Ссылка на"
 
-#: src/cmd_info.c:145 src/cmd_select.c:399 src/dpformat.c:52
+#: src/cmd_info.c:213 src/cmd_select.c:368 src/dpformat.c:54
 msgid "Type"
 msgstr "Тип"
 
-#: src/cmd_info.c:148
+#: src/cmd_info.c:216
 msgid "Location"
 msgstr "Расположение"
 
-#: src/cmd_info.c:151 src/dpformat.c:36 src/window.c:200
+#: src/cmd_info.c:219 src/cmd_split.c:653 src/dpformat.c:37 src/window.c:199
 msgid "Size"
 msgstr "Размер"
 
-#: src/cmd_info.c:172
+#: src/cmd_info.c:229
+#, fuzzy, c-format
+msgid "%s (%s bytes)"
+msgstr "%Lu байт"
+
+#: src/cmd_info.c:240
 msgid "Contains"
 msgstr "Содержание"
 
-#: src/cmd_info.c:186
+#: src/cmd_info.c:257
 msgid "'File' Info"
 msgstr "Информация о файле"
 
-#: src/cmd_info.c:213 src/dpformat.c:49
+#: src/cmd_info.c:285 src/dpformat.c:50
 msgid "Accessed"
 msgstr "Прочитан"
 
-#: src/cmd_info.c:214 src/dpformat.c:50
+#: src/cmd_info.c:286 src/dpformat.c:51
 msgid "Modified"
 msgstr "Модифицирован"
 
-#: src/cmd_info.c:215
+#: src/cmd_info.c:287 src/dpformat.c:53
 msgid "Changed"
 msgstr "Изменен"
 
-#: src/cmd_info.c:263
+#: src/cmd_info.c:288 src/dpformat.c:52
+msgid "Created"
+msgstr "Создан"
+
+#: src/cmd_info.c:290
+#, fuzzy
+msgid "Basic"
+msgstr "Форма"
+
+#: src/cmd_info.c:294
+msgid "Attributes"
+msgstr ""
+
+#: src/cmd_info.c:338
 msgid "Getting Information..."
 msgstr "Сбор информации..."
 
-#: src/cmd_info.c:302
+#: src/cmd_info.c:370
 msgid "Show 'file' Output?"
 msgstr "Показывать вывод?"
 
-#: src/cmd_info.c:305
+#: src/cmd_info.c:373
 msgid "Access Date Format"
 msgstr "Формат даты доступа"
 
-#: src/cmd_info.c:306
+#: src/cmd_info.c:374
 msgid "Modify Date Format"
 msgstr "Формат даты модификации"
 
-#: src/cmd_info.c:307
+#: src/cmd_info.c:375
 msgid "Change Date Format"
 msgstr "Формат даты изменения"
 
-#: src/cmd_info.c:308
+#: src/cmd_info.c:376
 msgid "Size Tick Mark"
 msgstr "Знак разделитель тысяч"
 
-#: src/cmd_join.c:47
+#: src/cmd_join.c:46
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Join?"
 msgstr "\"%s\" Уже существует - Продолжить объединение?"
 
-#: src/cmd_join.c:76
+#: src/cmd_join.c:73
 msgid "Joining..."
 msgstr "Объединение..."
 
-#: src/cmd_join.c:162
+#: src/cmd_join.c:167
 msgid "Click and Drag Files to Reorder, Then Click Join."
 msgstr "Выделите файлы, расположите по порядку и нажмите Собрать."
 
-#: src/cmd_join.c:170
+#: src/cmd_join.c:175
 #, c-format
 msgid "The total size is %s (%lu bytes)."
 msgstr "Общий размер %s (%lu байт)."
 
-#: src/cmd_join.c:173
+#: src/cmd_join.c:178
 #, c-format
 msgid "The total size is %lu bytes."
 msgstr "Общий размер %lu байт."
 
-#: src/cmd_join.c:215
+#: src/cmd_join.c:220
 msgid "Enter Destination File Name"
 msgstr "Введите имя файла"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "Join"
 msgstr "Собрать"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "_Join|_Cancel"
 msgstr "_Собрать|_Отмена"
 
 # c-format
-#: src/cmd_mkdir.c:75
+#: src/cmd_mkdir.c:65
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With MkDir?"
 msgstr "\"%s\" Уже существует - создать каталог?"
 
-#: src/cmd_mkdir.c:125
+#: src/cmd_mkdir.c:119
 msgid "Enter Name of Directory to Create"
 msgstr "Введите имя каталога"
 
-#: src/cmd_mkdir.c:133
+#: src/cmd_mkdir.c:128
 msgid "Make Directory"
 msgstr "Создать каталог"
 
-#: src/cmd_mkdir.c:156
+#: src/cmd_mkdir.c:151
 msgid "CD Into New Directory?"
 msgstr "Перейти в каталог?"
 
-#: src/cmd_mkdir.c:157
+#: src/cmd_mkdir.c:152
 msgid "Focus New Directory?"
 msgstr "Установить курсор?"
 
-#: src/cmd_move.c:81
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"Не могу переместить каталог \"%s\"\n"
-"в \"%s\"\n"
-"(назначение - подпапка источника)."
-
-#: src/cmd_move.c:92
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the destination contains the source."
-msgstr ""
-"Не могу переместить \"%s\"\n"
-"в \"%s\"\n"
-"(источник - подпапка назначения)."
-
-#: src/cmd_move.c:188 src/cmd_moveas.c:48
+#: src/cmd_move.c:128 src/cmd_moveas.c:51
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Move?"
 msgstr "\"%s\" Уже существует - продолжить перемещение?"
 
-#: src/cmd_move.c:189
+#: src/cmd_move.c:129
 msgid "Moving..."
 msgstr "Перемещение..."
 
-#: src/cmd_moveas.c:40
+#: src/cmd_moveas.c:41
 #, c-format
 msgid "Enter Name to Move \"%s\" As"
 msgstr "Введите имя для перемещения\"%s\" как"
 
+#: src/cmd_moveas.c:66
+msgid "Invalid destination name for MoveAs"
+msgstr ""
+
 #: src/cmd_moveas.c:74
 msgid "Moving As..."
 msgstr "Переместить как..."
 
-#: src/cmd_moveas.c:105 src/cmd_moveas.c:110
+#: src/cmd_moveas.c:105 src/cmd_moveas.c:113
 msgid "Move As"
 msgstr "Переместить как"
 
@@ -1692,26 +1687,26 @@
 msgid "Are you sure you want to quit?"
 msgstr "Дествительно хотите выйти?"
 
-#: src/cmd_rename.c:44
+#: src/cmd_rename.c:57
 #, c-format
 msgid "Enter New Name For \"%s\""
 msgstr "Введите новое имя для \"%s\""
 
-#: src/cmd_rename.c:52 src/cmd_renamere.c:147 src/cmd_renamere.c:243
-#: src/cmd_renamere.c:293 src/cmd_renamere.c:388 src/cmd_renameseq.c:161
+#: src/cmd_rename.c:67 src/cmd_renamere.c:142 src/cmd_renamere.c:225
+#: src/cmd_renamere.c:268 src/cmd_renamere.c:367 src/cmd_renameseq.c:152
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Rename?"
 msgstr "\"%s\" Уже существует - продолжить переименование?"
 
-#: src/cmd_rename.c:132
+#: src/cmd_rename.c:245
 msgid "Rename"
 msgstr "Переименовать"
 
-#: src/cmd_renamere.c:260
-msgid "Regular expression error:\n"
-msgstr "Ошибка выражения:\n"
+#: src/cmd_rename.c:261
+msgid "Rename Single File In-Place (Without Dialog)?"
+msgstr ""
 
-#: src/cmd_renamere.c:446
+#: src/cmd_renamere.c:419
 msgid ""
 "Look for substring in all filenames, and replace\n"
 "it with another string."
@@ -1719,23 +1714,23 @@
 "Ищет подстроку во всех именах файлов и заменяет\n"
 "на другую подстроку."
 
-#: src/cmd_renamere.c:449
+#: src/cmd_renamere.c:422
 msgid "Replace"
 msgstr "Заменить"
 
-#: src/cmd_renamere.c:453
+#: src/cmd_renamere.c:426
 msgid "With"
 msgstr "На"
 
-#: src/cmd_renamere.c:461
+#: src/cmd_renamere.c:434
 msgid "Replace All?"
 msgstr "Все вхождения?"
 
-#: src/cmd_renamere.c:465
+#: src/cmd_renamere.c:438
 msgid "Simple"
 msgstr "Простая"
 
-#: src/cmd_renamere.c:469
+#: src/cmd_renamere.c:442
 msgid ""
 "Execute the 'From' RE on each filename, storing\n"
 "parenthesised subexpression matches. Then replace\n"
@@ -1749,19 +1744,19 @@
 "(начиная с 1) подвыражения с совпадающим текстом\n"
 "поиска и использовать результат как новое имя файла."
 
-#: src/cmd_renamere.c:477 src/cmd_renamere.c:500
+#: src/cmd_renamere.c:450 src/cmd_renamere.c:473
 msgid "From"
 msgstr "Найти"
 
-#: src/cmd_renamere.c:481 src/cmd_renamere.c:504
+#: src/cmd_renamere.c:454 src/cmd_renamere.c:477
 msgid "To"
 msgstr "Заменить"
 
-#: src/cmd_renamere.c:489
+#: src/cmd_renamere.c:462
 msgid "Reg Exp"
 msgstr "Выражение"
 
-#: src/cmd_renamere.c:494
+#: src/cmd_renamere.c:467
 msgid ""
 "Look for each character in the 'From' string, and replace\n"
 "any hits with the corresponding character in the 'To' string.\n"
@@ -1769,54 +1764,54 @@
 "the filename, and the result used as the new name for each file."
 msgstr ""
 
-#: src/cmd_renamere.c:513
+#: src/cmd_renamere.c:486
 msgid "Map"
 msgstr ""
 
-#: src/cmd_renamere.c:517
+#: src/cmd_renamere.c:490
 msgid ""
 "Changes the case (upper/lower) of the characters\n"
 "in the selected filename(s)."
 msgstr ""
 
-#: src/cmd_renamere.c:519
+#: src/cmd_renamere.c:492
 msgid "Lower Case?"
 msgstr "Нижний регистр?"
 
-#: src/cmd_renamere.c:521
+#: src/cmd_renamere.c:494
 msgid "Upper Case?"
 msgstr "Верхний регистр?"
 
-#: src/cmd_renamere.c:523
+#: src/cmd_renamere.c:496
 #, fuzzy
 msgid "Upper Case Initial?"
 msgstr "Верхний регистр?"
 
-#: src/cmd_renamere.c:526
+#: src/cmd_renamere.c:499
 msgid "Case"
 msgstr "Форма"
 
-#: src/cmd_renamere.c:528
+#: src/cmd_renamere.c:501
 msgid "RenameRE"
 msgstr "ПереименоватьУСЛ"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "10, Decimal"
 msgstr "10, Десятичная"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (A-F)"
 msgstr "16, Шестнадцетеричная (A-F)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (a-f)"
 msgstr "16, Шестнадцетеричная (a-f)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "8, Octal"
 msgstr "8, Восьмеричная"
 
-#: src/cmd_renameseq.c:328
+#: src/cmd_renameseq.c:306
 msgid ""
 "This command renames all selected files\n"
 "into a numbered sequence. The controls\n"
@@ -1828,86 +1823,86 @@
 "Кнопки управления ниже позволяют определить\n"
 "порядок формирования имен файлов."
 
-#: src/cmd_renameseq.c:335
+#: src/cmd_renameseq.c:313
 msgid "Start At"
 msgstr "Начать с"
 
-#: src/cmd_renameseq.c:343 src/cmd_split.c:247
+#: src/cmd_renameseq.c:323 src/cmd_split.c:609
 msgid "Base"
 msgstr "Форма"
 
-#: src/cmd_renameseq.c:359
+#: src/cmd_renameseq.c:333
 msgid "Precision"
 msgstr "Кол-во знаков"
 
-#: src/cmd_renameseq.c:367
+#: src/cmd_renameseq.c:340
 msgid "Head"
 msgstr "Начало"
 
-#: src/cmd_renameseq.c:374
+#: src/cmd_renameseq.c:347
 msgid "Tail"
 msgstr "Окончание"
 
-#: src/cmd_renameseq.c:382
+#: src/cmd_renameseq.c:354
 msgid "Guess"
 msgstr "Подставить"
 
-#: src/cmd_renameseq.c:396
+#: src/cmd_renameseq.c:369
 msgid "Sequential Rename"
 msgstr "Переименование в последовательность"
 
-#: src/cmd_select.c:396
+#: src/cmd_select.c:365
 msgid "All rows|Selected|Unselected|"
 msgstr "Все элементы|Отмеченные|Разотмеченные|"
 
-#: src/cmd_select.c:397
+#: src/cmd_select.c:366
 msgid "All types|Directories only|Non-directories only|"
 msgstr "Все типы|Каталоги|Без каталогов|"
 
-#: src/cmd_select.c:398
+#: src/cmd_select.c:367
 msgid "Select|Unselect|Toggle|"
 msgstr "Отметить|Разотметить|Перевернуть|"
 
-#: src/cmd_select.c:399 src/menus.c:530
+#: src/cmd_select.c:368 src/menus.c:537
 msgid "Action"
 msgstr "Действие"
 
-#: src/cmd_select.c:399
+#: src/cmd_select.c:368
 msgid "Set"
 msgstr "Установить"
 
-#: src/cmd_select.c:511
+#: src/cmd_select.c:469
 msgid "Treat RE as Glob Pattern?"
 msgstr "Использовать выражение как глоб. маску?"
 
-#: src/cmd_select.c:514
+#: src/cmd_select.c:472
 msgid "Invert RE Matching?"
 msgstr "Не удовлетворяющие выражению?"
 
-#: src/cmd_select.c:517
+#: src/cmd_select.c:475
 msgid "Require Match on Full Name?"
 msgstr "По полному имени?"
 
-#: src/cmd_select.c:531
+#: src/cmd_select.c:489
 msgid "Select Using RE"
 msgstr "Выбор используя выражение"
 
-#: src/cmd_select.c:815
+#: src/cmd_select.c:727
 msgid ""
 "Enter shell command to run. The command\n"
 "will have the selected content appended.\n"
 "Action is performed on successful exit."
 msgstr ""
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "OK|Cancel"
 msgstr "_ДА|_Отмена"
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "Select using shell command"
 msgstr "Выбер по консольной команде"
 
-#: src/cmd_split.c:68
+#: src/cmd_split.c:269
 #, c-format
 msgid ""
 "Split \"%s\".\n"
@@ -1916,7 +1911,7 @@
 "Разбить \"%s\".\n"
 "файл %s (%s)."
 
-#: src/cmd_split.c:70
+#: src/cmd_split.c:271
 #, c-format
 msgid ""
 "Split \"%s\".\n"
@@ -1925,93 +1920,143 @@
 "Разбить \"%s\".\n"
 "Файл %s."
 
-#: src/cmd_split.c:106
+#: src/cmd_split.c:348
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Split?"
 msgstr "\"%s\" Уже существует - продолжить разбивку?"
 
-#: src/cmd_split.c:171
-msgid "Beta Software"
-msgstr "Бета версия"
+#: src/cmd_split.c:422
+msgid "Fixed Size Split"
+msgstr "Разбивка по размеру"
+
+#: src/cmd_split.c:424
+msgid "Segment Size"
+msgstr "Размер куска"
 
-#: src/cmd_split.c:171
-msgid "Next Version?"
-msgstr "Следующая версия?"
+#: src/cmd_split.c:427
+#, fuzzy
+msgid "1457000 bytes (3.5\" floppy)"
+msgstr " 1457000 байт (3.5\" дискета)"
 
-#: src/cmd_split.c:171
-msgid ""
-"This splitting mode has not been\n"
-"implemented yet... Sorry."
-msgstr ""
-"Режим разбивки еще не \n"
-"реализован... Извините."
+#: src/cmd_split.c:428
+#, fuzzy
+msgid "10485760 bytes (10 MB)"
+msgstr " 1457000 байт (3.5\" дискета)"
+
+#: src/cmd_split.c:429
+#, fuzzy
+msgid "26214400 bytes (25 MB)"
+msgstr " 1457000 байт (3.5\" дискета)"
+
+#: src/cmd_split.c:430
+#, fuzzy
+msgid "52428800 bytes (50 MB)"
+msgstr " 1457000 байт (3.5\" дискета)"
 
-#: src/cmd_split.c:187
-msgid "  1457000 bytes (3.5\" floppy)"
+#: src/cmd_split.c:431
+#, fuzzy
+msgid "78643200 bytes (75 MB)"
 msgstr " 1457000 байт (3.5\" дискета)"
 
-#: src/cmd_split.c:188
-msgid "100431360 bytes (Zip disk)"
+#: src/cmd_split.c:432
+#, fuzzy
+msgid "100431360 bytes (95 MB, Zip disk)"
 msgstr "100431360 байт (Диск ZIP)"
 
-#: src/cmd_split.c:190
-msgid "Fixed Size Split"
+#: src/cmd_split.c:454
+#, fuzzy
+msgid "Fixed Count Split"
 msgstr "Разбивка по размеру"
 
-#: src/cmd_split.c:193
-msgid "Segment Size"
+#: src/cmd_split.c:457
+#, fuzzy
+msgid "Segment Count"
 msgstr "Размер куска"
 
-#: src/cmd_split.c:221
-msgid "Fixed size, variable number of parts"
-msgstr "По определенному размеру части"
+#: src/cmd_split.c:503
+msgid "Current part number, unique for every created file"
+msgstr ""
+
+#: src/cmd_split.c:504
+msgid "The value from the Base box"
+msgstr ""
+
+#: src/cmd_split.c:505
+msgid "The amount that index will change for each file"
+msgstr ""
+
+#: src/cmd_split.c:506
+msgid "The total number of files that will be created"
+msgstr ""
+
+#: src/cmd_split.c:507
+msgid "The value of index for the last file to be created"
+msgstr ""
 
-#: src/cmd_split.c:222
+#: src/cmd_split.c:570
+msgid "Fixed size, variable number of parts"
+msgstr "По определенному размеру части"
+
+#: src/cmd_split.c:571
 msgid "Fixed number of parts, variable sizes"
 msgstr "На определенное количество частей"
 
-#: src/cmd_split.c:230 src/cmd_split.c:261
+#: src/cmd_split.c:580 src/cmd_split.c:663
 msgid "Split"
 msgstr "Разбить"
 
-#: src/cmd_split.c:243
+#: src/cmd_split.c:599
 msgid "Name Format"
 msgstr "Формат имени"
 
-#: src/cmd_split.c:252
+#: src/cmd_split.c:615
 msgid "Step"
 msgstr "Шаг"
 
-#: src/cmd_symlink.c:77 src/cmd_symlink.c:246
+#: src/cmd_split.c:624
+msgid "Zero-Fill Numbers?"
+msgstr ""
+
+#: src/cmd_split.c:645
+msgid "Offset"
+msgstr ""
+
+#: src/cmd_symlink.c:68 src/cmd_symlink.c:252
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Link?"
 msgstr "\"%s\" Уже существует - продолжить создание ссылки?"
 
-#: src/cmd_symlink.c:184
+#: src/cmd_symlink.c:161 src/configure.c:239 src/icon_dialog.c:59
+#: src/progress.c:220
+msgid "Cancel"
+msgstr "Отмена"
+
+#: src/cmd_symlink.c:161 src/configure.c:233 src/dialog.c:290
+#: src/nag_dialog.c:36
+msgid "OK"
+msgstr "ДА"
+
+#: src/cmd_symlink.c:161
 msgid "Select Link Target"
 msgstr "Выберите цель ссылки"
 
-#: src/cmd_symlink.c:213
+#: src/cmd_symlink.c:218
 msgid "Contents"
 msgstr "Содержание"
 
-#: src/cmd_symlink.c:225
+#: src/cmd_symlink.c:231
 msgid "Edit Symbolic Link"
 msgstr "Изменить ссылку"
 
-#: src/cmd_symlink.c:231
+#: src/cmd_symlink.c:236
 msgid "Create Symbolic Link"
 msgstr "Создание ссылки"
 
-#: src/cmd_viewtext.c:206
-msgid "Use mmap() to Speed Loading?"
-msgstr "Использовать mmap() для ускорения загрузки?"
-
-#: src/cmd_viewtext.c:208
+#: src/cmd_viewtext.c:205
 msgid "Hex-Check First"
 msgstr "Проверить символы"
 
-#: src/cmd_viewtext.c:209
+#: src/cmd_viewtext.c:206
 msgid "Exit on Left Arrow Key?"
 msgstr ""
 
@@ -2027,7 +2072,7 @@
 msgid "yes"
 msgstr "да"
 
-#: src/cmdgrab.c:222
+#: src/cmdgrab.c:177
 #, c-format
 msgid "Output of %s (pid %d)"
 msgstr "Вывод %s (pid %d)"
@@ -2039,17 +2084,17 @@
 "command \"%s\"."
 msgstr "Не известная команда \"%s\"."
 
-#: src/cmdseq_dialog.c:126
+#: src/cmdseq_dialog.c:134
 #, c-format
 msgid "Built-Ins (%u)"
 msgstr "Встроеные (%u)"
 
-#: src/cmdseq_dialog.c:131
+#: src/cmdseq_dialog.c:139
 #, c-format
 msgid "User Defined (%u)"
 msgstr "Определенные (%u)"
 
-#: src/cmdseq_dialog.c:302
+#: src/cmdseq_dialog.c:313
 msgid ""
 "Select a command, or type start\n"
 "of name and press TAB."
@@ -2057,32 +2102,24 @@
 "Выберите команду или наберите\n"
 "начало и нажмите TAB"
 
-#: src/cmdseq_dialog.c:319
+#: src/cmdseq_dialog.c:330
 msgid "Select Command"
 msgstr "Выберите команду"
 
-#: src/configure.c:198
+#: src/configure.c:197
 msgid "Couldn't open configuration file for output"
 msgstr "Не могу открыть файл настройки для записи"
 
-#: src/configure.c:234 src/dialog.c:285
-msgid "OK"
-msgstr "ДА"
-
-#: src/configure.c:240
+#: src/configure.c:236
 msgid "Save"
 msgstr "Сохранить"
 
-#: src/configure.c:244 src/icon_dialog.c:59 src/progress.c:219
-msgid "Cancel"
-msgstr "Отмена"
-
-#: src/configure.c:455
+#: src/configure.c:463
 #, c-format
 msgid "Config file version (%s) doesn't match program version (%s)"
 msgstr "Версия файла настроек (%s) не совпадает с версией программы (%s)"
 
-#: src/configure.c:467
+#: src/configure.c:475
 #, c-format
 msgid ""
 "Couldn't find any configuration file; checked\n"
@@ -2093,57 +2130,43 @@
 "ни в \"%s\" ни в \"%s\".\n"
 "Использую встроенную минимальную настройку."
 
-#: src/dialog.c:123 src/dialog.c:253
+#: src/dialog.c:124 src/dialog.c:260
 msgid "_OK|_Cancel"
 msgstr "_ДА|_Отмена"
 
-#: src/dirpane.c:134
-msgid ""
-"Case-sensitive sorting will not work correctly with non-ASCII characters"
-msgstr "Сортировка с учетом регистра работает неверно с русскими буквами"
-
-#: src/dirpane.c:143
-msgid ""
-"Case-insensitive sorting will not work correctly with non-ASCII characters"
-msgstr "Сортировка без учета регистра работает неверно с русскими буквами"
-
-#: src/dirpane.c:1189
+#: src/dirpane.c:541
 #, c-format
 msgid "%u/%u dirs, %u/%u files"
 msgstr "%u/%u каталогов, %u/%u файлов"
 
-#: src/dirpane.c:1197
-#, fuzzy, c-format
-msgid " (%%s/%%s, %%%s/%%%s blocks)"
-msgstr " (%s/%s, %Lu/%Lu блоков)"
+#: src/dirpane.c:546
+#, c-format
+msgid " (%s/%s)"
+msgstr ""
 
-#: src/dirpane.c:1210
+#: src/dirpane.c:557
 #, fuzzy, c-format
 msgid ", %s (%s) used"
 msgstr ", %s занято"
 
-#: src/dirpane.c:1212
+#: src/dirpane.c:559
 #, c-format
 msgid ", %s free"
 msgstr ", %s свободно"
 
-#: src/dirpane.c:1560
-msgid "!!Invalid filename!!"
-msgstr ""
-
-#: src/dirpane.c:2004 src/dirpane.c:2053
+#: src/dirpane.c:2084 src/dirpane.c:2131
 msgid "Move up to the parent directory"
 msgstr "Перейти в родительский каталог"
 
-#: src/dirpane.c:2026
+#: src/dirpane.c:2106
 msgid "Enter path, then press Return to go there"
 msgstr "Введите путь и нажмите Ввод для перехода"
 
-#: src/dirpane.c:2027
+#: src/dirpane.c:2107
 msgid "H"
 msgstr "С"
 
-#: src/dirpane.c:2031
+#: src/dirpane.c:2111
 msgid ""
 "Click to enable/disable Hide rule (When pressed in, the hide rule is active, "
 "and matching entries are hidden)"
@@ -2151,176 +2174,176 @@
 "Нажмите для включения/выключения показа скрытых элементов(нажатое состояние "
 "обозначает скрытие)"
 
-#: src/dpformat.c:37
+#: src/dpformat.c:38
 msgid "Blocks"
 msgstr "Блоков"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "BSize"
 msgstr "Блок"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "Block Size"
 msgstr "Размер блока"
 
-#: src/dpformat.c:39
+#: src/dpformat.c:40
 msgid "Mode, numerical"
 msgstr "Права, в цифрах"
 
-#: src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode, string"
 msgstr "Права, строкой"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Nlink"
 msgstr "Ссылок"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Number of links"
 msgstr "Число ссылок"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Owner ID"
 msgstr "Номер владельца"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Uid"
 msgstr "Nвлад"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Owner Name"
 msgstr "Имя владельца"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Uname"
 msgstr "Владелец"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Gid"
 msgstr "Nгруп"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Group ID"
 msgstr "Номер группы"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Gname"
 msgstr "Группа"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Group Name"
 msgstr "Имя группы"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device"
 msgstr "Устройство"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device Number"
 msgstr "Номер устройства"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "DevMaj"
 msgstr "NУстрО"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "Device Number, major"
 msgstr "Номер устройства, основной"
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "DevMin"
 msgstr "NУстрНО"
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "Device Number, minor"
 msgstr "Номер устройства, неосновной"
 
-#: src/dpformat.c:49
-msgid "Date of last Access"
-msgstr "Время последнего доступа"
-
 #: src/dpformat.c:50
-msgid "Date of last Modification"
-msgstr "Время последней модификации"
+#, fuzzy
+msgid "Time of Last Access"
+msgstr "Время последнего доступа"
 
 #: src/dpformat.c:51
-msgid "Created"
-msgstr "Создан"
+#, fuzzy
+msgid "Time of Last Modification"
+msgstr "Время последней модификации"
 
-#: src/dpformat.c:51
-msgid "Date of Creation"
+#: src/dpformat.c:52
+#, fuzzy
+msgid "Time of Creation"
 msgstr "Время создания"
 
-#: src/dpformat.c:52
+#: src/dpformat.c:53
+msgid "Time of Last Change"
+msgstr ""
+
+#: src/dpformat.c:54
 msgid "Type Name"
 msgstr "Имя типа"
 
-#: src/dpformat.c:53
+#: src/dpformat.c:55
 msgid "I"
 msgstr "З"
 
-#: src/dpformat.c:334
-msgid "B"
-msgstr "Б"
-
-#: src/dpformat.c:338 src/sizeutil.c:32
-msgid "KB"
-msgstr "КБ"
-
-#: src/dpformat.c:343 src/sizeutil.c:33
-msgid "MB"
-msgstr "МБ"
+#: src/dpformat.c:56
+msgid "URI"
+msgstr ""
 
-#: src/dpformat.c:348 src/sizeutil.c:31
-msgid "GB"
-msgstr "ГБ"
+#: src/dpformat.c:56
+msgid "URI (without file prefix)"
+msgstr ""
 
-#: src/errors.c:69
+#: src/errors.c:59
 #, c-format
 msgid "Couldn't %s \"%s\": %s (code %d)"
 msgstr "Не могу %s \"%s\": %s (код %d)"
 
-#: src/errors.c:71
+#: src/errors.c:61
 #, c-format
 msgid "Couldn't %s \"%s\" (code %d)"
 msgstr "Не могу %s \"%s\" (код %d)"
 
-#: src/errors.c:76
+#: src/errors.c:66
 #, c-format
 msgid "Couldn't %s \"%s\""
 msgstr "Не могу %s \"%s\""
 
-#: src/errors.c:78
+#: src/errors.c:68
 #, c-format
 msgid "Couldn't %s"
 msgstr "Не могу %s"
 
+#: src/errors.c:88
+#, c-format
+msgid "%s"
+msgstr ""
+
 # src/gentoo.c:440
-#: src/gentoo.c:421
+#: src/gentoo.c:427
 msgid "Report the version to standard output, and exit."
 msgstr "Вывести номер версии и выйти."
 
 # src/gentoo.c:440
-#: src/gentoo.c:423
+#: src/gentoo.c:429
 msgid "Report internal locale details, and exit."
 msgstr "Вывести детали внутренней локализации и выйти."
 
 # src/gentoo.c:441
-#: src/gentoo.c:425
+#: src/gentoo.c:431
 msgid "Allows gentoo to be run by the root user. Could be dangerous."
 msgstr ""
 "Позволяет запускать gentoo под root'ом. Может привести к печальным "
 "последствиям. "
 
 # src/gentoo.c:442
-#: src/gentoo.c:426
+#: src/gentoo.c:432
 msgid ""
 "Do not load the ~/.gentoorc configuration file; instead, use default values."
 msgstr ""
 "Не загружать файл настроек ~/.gentoorc; использовать настройки по умолчанию."
 
 # src/gentoo.c:443
-#: src/gentoo.c:427
+#: src/gentoo.c:433
 msgid ""
 "Do not load the ~/.gentoogtkrc GTK+ configuration file; instead, use system "
 "defaults."
@@ -2328,82 +2351,82 @@
 "Не загружать настройки GTK+ : ~/.gentoogtkrc; использовать системные "
 "значения по умолчанию."
 
-# src/gentoo.c:445
-#: src/gentoo.c:429
-msgid "Do not use FAM to automatically detect changes in viewed directories."
+#: src/gentoo.c:434
+#, fuzzy
+msgid ""
+"Run COMMAND, a gentoo command. Done before user interaction allowed, but "
+"after configuration file has been read in. Can be used many times to run "
+"several commands in sequence."
+msgstr ""
+"Запустить ARG, команду gentoo. Команда запускается до отображения окна, но "
+"после чтения файла настроек. Возможно использовать несколько раз для запуска "
+"нескольких разных команд."
+
+#: src/gentoo.c:435
+msgid "COMMAND"
+msgstr ""
+
+#: src/gentoo.c:436 src/gentoo.c:437
+msgid "DIR"
 msgstr ""
-"Не использовать FAM для определения изменений в просмотриваемый каталогах."
 
 # src/gentoo.c:447
-#: src/gentoo.c:431
+#: src/gentoo.c:436
+#, fuzzy
 msgid ""
-"Use ARG as path for the left directory pane. Overrides default (and history)."
+"Use DIR as path for the left directory pane. Overrides default (and history)."
 msgstr ""
 "Использовать ARG как путь для левой панели. Переопределить путь по умолчанию"
 "(и историю)."
 
 # src/gentoo.c:448
-#: src/gentoo.c:432
+#: src/gentoo.c:437
+#, fuzzy
 msgid ""
-"Use ARG as path for the right directory pane. Overrides default (and "
+"Use DIR as path for the right directory pane. Overrides default (and "
 "history)."
 msgstr ""
 "Использовать ARG как путь для правой панели. Переопределить путь по умолчанию"
 "(и историю)."
 
-#: src/gentoo.c:433
-msgid ""
-"Run ARG, a gentoo command. Done before user interaction allowed, but after "
-"configuration file has been read in. Can be used many times to run several "
-"commands in sequence."
+#: src/gentoo.c:461
+msgid "- a graphical file manager using GTK+"
 msgstr ""
-"Запустить ARG, команду gentoo. Команда запускается до отображения окна, но "
-"после чтения файла настроек. Возможно использовать несколько раз для запуска "
-"нескольких разных команд."
 
-#: src/gentoo.c:492
+#: src/gentoo.c:466
+#, c-format
+msgid "Failed to parse command line options: %s\n"
+msgstr ""
+
+#: src/gentoo.c:506
 #, c-format
 msgid "%s: To run as root, envoke with the '--root-ok' option\n"
 msgstr "%s: Чтобы запустить под root используйте --root-ok\n"
 
-#: src/gentoo.c:524
+#: src/gentoo.c:538
 msgid "Couldn't initialize userinfo module - username resolving won't work"
 msgstr ""
 "Не могу найти модуль userinfo - определение имен пользователей не будет "
 "работать."
 
-#: src/gentoo.c:529
-msgid "Couldn't initialize mount data - automounting won't work"
-msgstr ""
-"Не могу найти описание подключений дисков - автоподключение не будет "
-"работать."
-
-#: src/gentoo.c:560
+#: src/gentoo.c:570
 #, c-format
 msgid "gentoo v%s by Emil Brink <emil@obsession.se>"
 msgstr "gentoo v%s - Emil Brink <emil@obsession.se>"
 
-#: src/gfam.c:216
-#, c-format
-msgid "FAM open failed, error %d--FAM will not be used"
-msgstr "Не могу открыть FAM, ошибка %d - FAM не использую"
-
-#: src/gfam.c:235
-#, fuzzy, c-format
-msgid ""
-"Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, perhaps)"
+#: src/gentoo.c:577
+msgid "Development Version Warning"
 msgstr ""
-"Не могу добавить монитор FAM \"%s\", ошибка %s (может запустить с --no-fam ?)"
 
-#: src/gfam.c:241
-#, fuzzy, c-format
+#: src/gentoo.c:577
 msgid ""
-"Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go around, "
-"perhaps)"
+"This version of gentoo is considered somewhat new and untested. There have "
+"been major changes to almost all parts of the program since the previous "
+"version. Please be a bit careful, and make sure you report any problem to "
+"the author. Thanks."
 msgstr ""
-"Не могу добавить монитор FAM \"%s\", ошибка %s (может запустить с --no-fam ?)"
 
-#: src/guiutil.c:118
+#: src/guiutil.c:124
 msgid "Progress"
 msgstr "Состояние"
 
@@ -2415,221 +2438,219 @@
 msgid "Loading Icon Graphics..."
 msgstr "Загрузка значка ..."
 
-#: src/menus.c:278
+#: src/menus.c:284
 msgid "(No Selection)"
 msgstr "(нет выделения)"
 
-#: src/menus.c:514
+#: src/menus.c:521
 msgid "RegExp..."
 msgstr "Выражение"
 
-#: src/menus.c:526
+#: src/menus.c:533
 msgid "Other"
 msgstr "С другой панели"
 
-#: src/menus.c:527
+#: src/menus.c:534
 msgid "Rescan"
 msgstr "Обновить"
 
-#: src/menus.c:528
+#: src/menus.c:535
 msgid "Select"
 msgstr "Выбор"
 
-#: src/menus.c:532
+#: src/menus.c:539
 msgid "Run..."
 msgstr "Выполнить..."
 
-#: src/menus.c:534
+#: src/menus.c:541
 msgid "Configure..."
 msgstr "Настроить..."
 
-#: src/menus.c:610
+#: src/menus.c:618
 msgid "Select Menu"
 msgstr "Выберите меню"
 
-#: src/mount.c:222
-#, c-format
-msgid "Execution of \"%s %s\" failed:\n"
-msgstr "Выполнение \"%s %s\" прервано:\n"
-
-#: src/mount.c:318
-#, c-format
-msgid "Mounting \"%s\" on \"%s\"..."
-msgstr "Подключение \"%s\" в \"%s\"..."
+#: src/nag_dialog.c:37
+msgid "_Don't show this dialog again"
+msgstr ""
 
 #: src/overwrite.c:49
 msgid "_OK|A_ll|_Skip|Skip _All|_Cancel"
 msgstr "_ДА|_Все|_Нет|Ни одного|_Отмена"
 
-# c-format
-#: src/overwrite.c:73
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Old: %%%s bytes, changed on %%s,\n"
-"New: %%%s bytes, changed on %%s."
-msgstr ""
-"\n"
-"Старое: %llu байт, изменен %s.\n"
-"Новое: %llu байт, изменен %s."
-
-#: src/progress.c:195
+#: src/progress.c:196
 #, c-format
 msgid "Total (%s)"
 msgstr "Всего (%s)"
 
-#: src/progress.c:315
+#: src/progress.c:305
 #, c-format
 msgid "Elapsed %02d:%02d  Speed %s/s  ETA %02u:%02u"
 msgstr "Время %02d:%02d  Скорость %s/c Осталось %02u:%02u"
 
-#: src/sizeutil.c:30
-msgid "BYTES"
-msgstr "Байт"
+#: src/sizeutil.c:31
+#, fuzzy
+msgid "Unformatted Size"
+msgstr "Размер, в байтах"
 
-#: src/sizeutil.c:69
-#, c-format
-msgid "%%%s"
-msgstr ""
+#: src/sizeutil.c:32
+#, fuzzy
+msgid "Formatted Size, Without Unit"
+msgstr "Размер,в \"умных\" единицах"
 
-#: src/sizeutil.c:70
-#, fuzzy, c-format
-msgid "%%%s bytes"
-msgstr "%Lu байт"
+#: src/sizeutil.c:33
+#, fuzzy
+msgid "Formatted Size, in Bytes"
+msgstr "Размер, в байтах"
 
-#: src/sizeutil.c:71
-#, fuzzy, c-format
-msgid "%%%s KB"
-msgstr "%Lu КБ"
+#: src/sizeutil.c:33 src/sizeutil.c:159
+#, fuzzy
+msgid "bytes"
+msgstr "да"
 
-#: src/sizeutil.c:72
-#, fuzzy, c-format
-msgid "%%%s MB"
-msgstr "%Lu МБ"
+#: src/sizeutil.c:34
+#, fuzzy
+msgid "Formatted Size, in Kilobytes"
+msgstr "Размер, в килобайтах"
 
-#: src/sizeutil.c:73
-#, fuzzy, c-format
-msgid "%%%s GB"
-msgstr "%Lu ГБ"
+#: src/sizeutil.c:34 src/sizeutil.c:163
+msgid "KB"
+msgstr "КБ"
 
-#: src/sizeutil.c:164 src/sizeutil.c:211
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f КБ"
+#: src/sizeutil.c:35
+#, fuzzy
+msgid "Formatted Size, in Megabytes"
+msgstr "Размер, в мегабайтах"
 
-#: src/sizeutil.c:170 src/sizeutil.c:217
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f МБ"
+#: src/sizeutil.c:35 src/sizeutil.c:167
+msgid "MB"
+msgstr "МБ"
 
-#: src/sizeutil.c:176 src/sizeutil.c:223
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f ГБ"
+#: src/sizeutil.c:36
+#, fuzzy
+msgid "Formatted Size, in Gigabytes"
+msgstr "Размер, в гигабайтах"
+
+#: src/sizeutil.c:36 src/sizeutil.c:171
+msgid "GB"
+msgstr "ГБ"
+
+#: src/sizeutil.c:37
+#, fuzzy
+msgid "Formatted Size, in Terabytes"
+msgstr "Размер, в мегабайтах"
+
+#: src/sizeutil.c:37 src/sizeutil.c:175
+#, fuzzy
+msgid "TB"
+msgstr "Б"
+
+#: src/sizeutil.c:38
+#, fuzzy
+msgid "Formatted Size, Automatic Unit"
+msgstr "Размер,в \"умных\" единицах"
 
 #: src/style_dialog.c:40
 msgid "Select Style"
 msgstr "Выберите класс"
 
-#: src/styles.c:112
+#: src/styles.c:114
 msgid "Root"
 msgstr "Root"
 
-#: src/styles.c:118 src/types.c:485 src/types.c:488
+#: src/styles.c:120 src/types.c:292 src/types.c:295
 msgid "Directory"
 msgstr "Каталог"
 
-#: src/styles.c:961
+#: src/styles.c:889
 msgid "New Style"
 msgstr "Новый класс"
 
-#: src/styles.c:961
+#: src/styles.c:889
 #, c-format
 msgid "New Style %u"
 msgstr "Новый класс %u"
 
-#: src/textview.c:152
+#: src/textview.c:190
 #, c-format
-msgid "Unable to convert text from native character set (%s) to UTF-8: %s"
+msgid ""
+"\n"
+"** Text conversion from charset '%s' failed, aborting."
 msgstr ""
 
-#: src/textview.c:252 src/textview.c:353
-msgid "File reading"
-msgstr "Чтение файла"
-
-#: src/textview.c:419
+#: src/textview.c:405
 #, c-format
 msgid "Line %d (%.0f%%)"
 msgstr "Строка %d (%.0f%%)"
 
-#: src/textview.c:472
+#: src/textview.c:455
 msgid "Enter Line Number or Percentage:"
 msgstr "Введите номер строки или процент:"
 
-#: src/textview.c:478
+#: src/textview.c:461
 msgid "Goto"
 msgstr "Перейти"
 
-#: src/textview.c:613
+#: src/textview.c:596
 msgid "Enter Text to Search For (RE)"
 msgstr "Введите текст для поиска (Выражение)"
 
-#: src/textview.c:623
+#: src/textview.c:607
 msgid "Don't Span Newlines?"
 msgstr "Не распределять новые линии?"
 
-#: src/textview.c:629
+#: src/textview.c:613
 msgid "Search"
 msgstr "Поиск"
 
-#: src/types.c:454
+#: src/types.c:287
+msgid "Unknown"
+msgstr "Неизвестный"
+
+#: src/types.c:572
 #, c-format
 msgid ""
 "Got SIGPIPE when writing to 'file' process (%s), it seems to have terminated "
 "prematurely."
 msgstr ""
 
-#: src/types.c:461
+#: src/types.c:578
 msgid "Unable to run spawn 'file' command: "
 msgstr ""
 
-#: src/types.c:480
-msgid "Unknown"
-msgstr "Неизвестный"
-
-#: src/window.c:82
+#: src/window.c:83
 msgid "Configure gentoo"
 msgstr "Настройка"
 
-#: src/window.c:89
+#: src/window.c:90
 msgid "Text Viewer"
 msgstr "Просмотр текста"
 
-#: src/window.c:200
+#: src/window.c:199
 msgid "Position"
 msgstr "Позиция"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Height"
 msgstr "Высота"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "X"
 msgstr "X"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Y"
 msgstr "Y"
 
-#: src/window.c:208
+#: src/window.c:207
 msgid "Set on Open?"
 msgstr "Установить при открытии?"
 
-#: src/window.c:214
+#: src/window.c:213
 msgid "Update on Close?"
 msgstr "Сохранить при закрытии?"
 
-#: src/window.c:245
+#: src/window.c:244
 msgid "Grab"
 msgstr "Захватить"
 
@@ -2637,6 +2658,218 @@
 msgid "XML module emitted locale-dependant real number"
 msgstr "XML модуль выдал локально-зависимый номер"
 
+#~ msgid "Use Dialog to Report Errors?"
+#~ msgstr "Использовать диалог для ошибок?"
+
+#~ msgid "Path Right Click"
+#~ msgstr "Правый щелчок на пути"
+
+#~ msgid "Raw Size, in Bytes"
+#~ msgstr "Сырой размер, в байтах"
+
+#~ msgid "Always Set"
+#~ msgstr "Всегда включено"
+
+#~ msgid "Modify 'Control' Key State"
+#~ msgstr "Изменить состояние кнопки 'Control'"
+
+#~ msgid "Active Pane Titles"
+#~ msgstr "Заголовок активной панели"
+
+#~ msgid "Focused Row, Unselected"
+#~ msgstr "Выбранная строка, не отмеченая"
+
+#~ msgid "Focused Row, Selected"
+#~ msgstr "Выбранная строка, отмеченная"
+
+#~ msgid "Beta Software"
+#~ msgstr "Бета версия"
+
+#~ msgid "Next Version?"
+#~ msgstr "Следующая версия?"
+
+#~ msgid ""
+#~ "This splitting mode has not been\n"
+#~ "implemented yet... Sorry."
+#~ msgstr ""
+#~ "Режим разбивки еще не \n"
+#~ "реализован... Извините."
+
+#~ msgid ""
+#~ "Case-sensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr "Сортировка с учетом регистра работает неверно с русскими буквами"
+
+#~ msgid ""
+#~ "Case-insensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr "Сортировка без учета регистра работает неверно с русскими буквами"
+
+#~ msgid "BYTES"
+#~ msgstr "Байт"
+
+#, fuzzy
+#~ msgid "%%%s bytes"
+#~ msgstr "%Lu байт"
+
+#, fuzzy
+#~ msgid "%%%s KB"
+#~ msgstr "%Lu КБ"
+
+#, fuzzy
+#~ msgid "%%%s MB"
+#~ msgstr "%Lu МБ"
+
+#, fuzzy
+#~ msgid "%%%s GB"
+#~ msgstr "%Lu ГБ"
+
+#~ msgid "%.2f KB"
+#~ msgstr "%.2f КБ"
+
+#~ msgid "%.2f MB"
+#~ msgstr "%.2f МБ"
+
+#~ msgid "%.2f GB"
+#~ msgstr "%.2f ГБ"
+
+#~ msgid "Numerical Mode?"
+#~ msgstr "Учитывать длину?"
+
+#~ msgid "Never"
+#~ msgstr "Никогда"
+
+#~ msgid "On Every Access"
+#~ msgstr "При каждом обращении"
+
+#~ msgid "Mounting"
+#~ msgstr "Подключение"
+
+#~ msgid "Mount When?"
+#~ msgstr "Когда подключать?"
+
+#~ msgid "Mount Options"
+#~ msgstr "Настройка подключения дисков"
+
+#~ msgid "Mount Command"
+#~ msgstr "Команда подключения"
+
+#~ msgid "Unmount Command"
+#~ msgstr "Команда отключения"
+
+#~ msgid "Only Mount on Toplevel Directories?"
+#~ msgstr "Подключать только в корневом каталоге?"
+
+#~ msgid "Use Command Error Dialog?"
+#~ msgstr "Использовать диалог для ошибок"
+
+#~ msgid "Unmount When gentoo Quits?"
+#~ msgstr "Отключать при выходе?"
+
+#~ msgid "FAM: Supported and active."
+#~ msgstr "FAM: Поддерживается и включено"
+
+#~ msgid "FAM: Supported, but not active."
+#~ msgstr "FAM: Поддерживается, но не включено."
+
+#~ msgid "FAM: Not supported."
+#~ msgstr "FAM: Не поддерживается."
+
+#~ msgid ""
+#~ "Can't copy directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "Не могу копировать \"%s\"\n"
+#~ "в \"%s\"\n"
+#~ "(копирование самого в себя)."
+
+#~ msgid "Wrap Around At Top And Bottom?"
+#~ msgstr "Перескакивать в другой конец списка?"
+
+#~ msgid ""
+#~ "%s (%s bytes,\n"
+#~ "%s blocks)"
+#~ msgstr ""
+#~ "%s (%s байт),\n"
+#~ "%s блоков)"
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "Не могу переместить каталог \"%s\"\n"
+#~ "в \"%s\"\n"
+#~ "(назначение - подпапка источника)."
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the destination contains the source."
+#~ msgstr ""
+#~ "Не могу переместить \"%s\"\n"
+#~ "в \"%s\"\n"
+#~ "(источник - подпапка назначения)."
+
+#~ msgid "Regular expression error:\n"
+#~ msgstr "Ошибка выражения:\n"
+
+#~ msgid "Use mmap() to Speed Loading?"
+#~ msgstr "Использовать mmap() для ускорения загрузки?"
+
+#, fuzzy
+#~ msgid " (%%s/%%s, %%%s/%%%s blocks)"
+#~ msgstr " (%s/%s, %Lu/%Lu блоков)"
+
+# src/gentoo.c:445
+#~ msgid ""
+#~ "Do not use FAM to automatically detect changes in viewed directories."
+#~ msgstr ""
+#~ "Не использовать FAM для определения изменений в просмотриваемый каталогах."
+
+#~ msgid "Couldn't initialize mount data - automounting won't work"
+#~ msgstr ""
+#~ "Не могу найти описание подключений дисков - автоподключение не будет "
+#~ "работать."
+
+#~ msgid "FAM open failed, error %d--FAM will not be used"
+#~ msgstr "Не могу открыть FAM, ошибка %d - FAM не использую"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, "
+#~ "perhaps)"
+#~ msgstr ""
+#~ "Не могу добавить монитор FAM \"%s\", ошибка %s (может запустить с --no-"
+#~ "fam ?)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go "
+#~ "around, perhaps)"
+#~ msgstr ""
+#~ "Не могу добавить монитор FAM \"%s\", ошибка %s (может запустить с --no-"
+#~ "fam ?)"
+
+#~ msgid "Execution of \"%s %s\" failed:\n"
+#~ msgstr "Выполнение \"%s %s\" прервано:\n"
+
+#~ msgid "Mounting \"%s\" on \"%s\"..."
+#~ msgstr "Подключение \"%s\" в \"%s\"..."
+
+# c-format
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Old: %%%s bytes, changed on %%s,\n"
+#~ "New: %%%s bytes, changed on %%s."
+#~ msgstr ""
+#~ "\n"
+#~ "Старое: %llu байт, изменен %s.\n"
+#~ "Новое: %llu байт, изменен %s."
+
+#~ msgid "File reading"
+#~ msgstr "Чтение файла"
+
 #, fuzzy
 #~ msgid "Pick Command ..."
 #~ msgstr "Выбрать код"

gentoo-0.15.6.tar.bz2/po/ru_RU.cp1251.gmo -> gentoo-0.19.9.tar.gz/po/ru_RU.cp1251.gmo Changed

gentoo-0.15.6.tar.bz2/po/ru_RU.cp1251.po -> gentoo-0.19.9.tar.gz/po/ru_RU.cp1251.po Changed

gentoo-0.15.6.tar.bz2/po/ru_RU.koi8r.gmo -> gentoo-0.19.9.tar.gz/po/ru_RU.koi8r.gmo Changed

gentoo-0.15.6.tar.bz2/po/ru_RU.koi8r.po -> gentoo-0.19.9.tar.gz/po/ru_RU.koi8r.po Changed

@@ -7,33 +7,34 @@
 msgstr ""
 "Project-Id-Version: gentoo 0.11.51\n"
 "Report-Msgid-Bugs-To: Emil Brink\n"
-"POT-Creation-Date: 2009-07-11 19:05+0200\n"
+"POT-Creation-Date: 2011-01-26 21:54+0100\n"
 "PO-Revision-Date: 2008-07-13 20:20+0200\n"
 "Last-Translator: Michael Y. Zaripov <m3@mail.ru>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=KOI8-R\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/cfg_buttonlayout.c:65
 msgid "Left of Command Buttons"
-msgstr "ó ÌÅ×ÏÊ ÓÔÏÒÏÎÙ ÐÁÎÅÌÉ ËÏÍÁÎÄ"
+msgstr "Ð¡ Ð»ÐµÐ²Ð¾Ð¹ ÑÑÐ¾ÑÐ¾Ð½Ñ Ð¿Ð°Ð½ÐµÐ»Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´"
 
 #: src/cfg_buttonlayout.c:65
 msgid "Right of Command Buttons"
-msgstr "ó ÐÒÁ×ÏÊ ÓÔÏÒÏÎÙ ÐÁÎÅÌÉ ËÏÍÁÎÄ"
+msgstr "Ð¡ Ð¿ÑÐ°Ð²Ð¾Ð¹ ÑÑÐ¾ÑÐ¾Ð½Ñ Ð¿Ð°Ð½ÐµÐ»Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´"
 
 #: src/cfg_buttonlayout.c:66
 msgid "No Padding"
-msgstr "âÅÚ ÒÁÚÄÅÌÅÎÉÑ"
+msgstr "ÐÐµÐ· ÑÐ°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ñ"
 
 #: src/cfg_buttonlayout.c:66
 msgid "Paned"
-msgstr "ðÁÎÅÌØ"
+msgstr "ÐÐ°Ð½ÐµÐ»Ñ"
 
 #: src/cfg_buttonlayout.c:66
 msgid "Static"
-msgstr "ðÏÓÔÏÑÎÎÙÊ"
+msgstr "ÐÐ¾ÑÑÐ¾ÑÐ½Ð½ÑÐ¹"
 
 #: src/cfg_buttonlayout.c:75
 msgid ""
@@ -56,1115 +57,1119 @@
 "option menu widget\n"
 "in the top left corner of the page."
 msgstr ""
-"üÔÁ ÓÔÒÁÎÉÃÁ ÐÏÚ×ÏÌÑÅÔ ×ÙÂÒÁÔØ ÒÁÓÐÏÌÏÖÅÎÉÅ ÐÁÎÅÌÉ ÚÁËÌÁÄÏË \n"
-"ÏÔÎÏÓÉÔÅÌØÎÏ ÐÁÎÅÌÉ ËÏÍÁÎÄ. úÁËÌÁÄËÉ ÐÏÚ×ÏÌÑÀÔ ÷ÁÍ ÎÁÚÎÁÞÉÔØ\n"
-"ÎÁ ÞÁÓÔÏ ÉÓÐÏÌØÚÕÅÍÙÅ ËÁÔÁÌÏÇÉ ÓÐÅÃÉÁÌØÎÕÀ ËÎÏÐËÕ É ÐÅÒÅÈÏÄÉÔØ \n"
-"× ÜÔÉ ÐÁÐËÉ ÎÁÖÁÔÉÅÍ ÌÅ×ÏÊ ÉÌÉ ÓÒÅÄÎÅÊ ËÎÏÐËÉ ÍÙÛËÉ \n"
-"÷Ù ÍÏÖÅÔÅ ÒÁÚÍÅÓÔÉÔØ ÐÁÎÅÌØ ÚÁËÌÁÄÏË ÓÌÅ×Á ÉÌÉ ÓÐÒÁ×Á.\n"
-"ôÁËÖÅ ×ÙÂÅÒÉÔÅ ÔÉÐ ÒÁÚÄÅÌÉÔÅÌÑ.\n"
+"ÐÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ° Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐµÑ Ð²ÑÐ±ÑÐ°ÑÑ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº \n"
+"Ð¾ÑÐ½Ð¾ÑÐ¸ÑÐµÐ»ÑÐ½Ð¾ Ð¿Ð°Ð½ÐµÐ»Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´. ÐÐ°ÐºÐ»Ð°Ð´ÐºÐ¸ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑÑ ÐÐ°Ð¼ Ð½Ð°Ð·Ð½Ð°ÑÐ¸ÑÑ\n"
+"Ð½Ð° ÑÐ°ÑÑÐ¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÐ¼ÑÐµ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¸ ÑÐ¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ Ð¸ Ð¿ÐµÑÐµÑÐ¾Ð´Ð¸ÑÑ \n"
+"Ð² ÑÑÐ¸ Ð¿Ð°Ð¿ÐºÐ¸ Ð½Ð°Ð¶Ð°ÑÐ¸ÐµÐ¼ Ð»ÐµÐ²Ð¾Ð¹ Ð¸Ð»Ð¸ ÑÑÐµÐ´Ð½ÐµÐ¹ ÐºÐ½Ð¾Ð¿ÐºÐ¸ Ð¼ÑÑÐºÐ¸ \n"
+"ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ°Ð·Ð¼ÐµÑÑÐ¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº ÑÐ»ÐµÐ²Ð° Ð¸Ð»Ð¸ ÑÐ¿ÑÐ°Ð²Ð°.\n"
+"Ð¢Ð°ÐºÐ¶Ðµ Ð²ÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ¸Ð¿ ÑÐ°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ.\n"
 "\n"
-"îÁÓÔÒÏÉÔØ ÓÁÍÕ ÐÁÎÅÌØ ÍÏÖÎÏ ÐÅÒÅËÌÀÞÉ×ÛÉÓØ × ÒÁÚÄÅÌ \n"
-"ëÎÏÐËÉ - ïÐÒÅÄÅÌÅÎÉÑ É Ó ÐÏÍÏÝØÀ ËÎÏÐËÉ ×ÓÐÌÙ×ÁÀÝÅÇÏ ÍÅÎÀ, \n"
-"ÒÁÓÐÏÌÏÖÅÎÎÏÊ × ×ÅÒÈÎÅÍ ÌÅ×ÏÍ ÕÇÌÕ, ×ÙÂÒÁÔØ úÁËÌÁÄËÉ"
+"ÐÐ°ÑÑÑÐ¾Ð¸ÑÑ ÑÐ°Ð¼Ñ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑÐµÐºÐ»ÑÑÐ¸Ð²ÑÐ¸ÑÑ Ð² ÑÐ°Ð·Ð´ÐµÐ» \n"
+"ÐÐ½Ð¾Ð¿ÐºÐ¸ - ÐÐ¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¸ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÐ¸ Ð²ÑÐ¿Ð»ÑÐ²Ð°ÑÑÐµÐ³Ð¾ Ð¼ÐµÐ½Ñ, \n"
+"ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ð¾Ð¹ Ð² Ð²ÐµÑÑÐ½ÐµÐ¼ Ð»ÐµÐ²Ð¾Ð¼ ÑÐ³Ð»Ñ, Ð²ÑÐ±ÑÐ°ÑÑ ÐÐ°ÐºÐ»Ð°Ð´ÐºÐ¸"
 
 #: src/cfg_buttonlayout.c:88
 msgid "Shortcut Sheet Position"
-msgstr "òÁÓÐÏÌÏÖÅÎÉÅ ÐÁÎÅÌÉ ÚÁËÌÁÄÏË"
+msgstr "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº"
 
 #: src/cfg_buttonlayout.c:102
 msgid "Separation Style"
-msgstr "ôÉÐ ÒÁÚÄÅÌÉÔÅÌÑ"
+msgstr "Ð¢Ð¸Ð¿ ÑÐ°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ"
 
 #: src/cfg_buttonlayout.c:116
 msgid "Layout"
-msgstr "÷ÉÄ"
+msgstr "ÐÐ¸Ð´"
 
 #: src/cfg_buttons.c:308
 msgid "Set Row Width"
-msgstr "õÓÔÁÎÏ×ÉÔØ ÛÉÒÉÎÕ"
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÑÐ¸ÑÐ¸Ð½Ñ"
 
-#: src/cfg_buttons.c:326 src/cfg_buttons.c:749
+#: src/cfg_buttons.c:326 src/cfg_buttons.c:748
 msgid "Default"
-msgstr "ðÏ ÕÍÏÌÞÁÎÉÀ"
+msgstr "ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
 
 #: src/cfg_buttons.c:439 src/overwrite.c:49
 msgid "Please Confirm"
-msgstr "ðÏÄÔ×ÅÒÄÉÔÅ"
+msgstr "ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ"
 
 #: src/cfg_buttons.c:439
 msgid "Really delete current button row?"
-msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÕÄÁÌÉÔØ ÔÅËÕÝÕÀ ÓÔÒÏËÕ ËÎÏÐÏË?"
+msgstr "ÐÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÐµÐºÑÑÑÑ ÑÑÑÐ¾ÐºÑ ÐºÐ½Ð¾Ð¿Ð¾Ðº?"
 
-#: src/cfg_buttons.c:439 src/cfg_styles.c:671
+#: src/cfg_buttons.c:439 src/cfg_styles.c:680
 msgid "_Delete|_Cancel"
-msgstr "_õÄÁÌÉÔØ|_ïÔÍÅÎÁ"
+msgstr "_Ð£Ð´Ð°Ð»Ð¸ÑÑ|_ÐÑÐ¼ÐµÐ½Ð°"
 
 #: src/cfg_buttons.c:463
 msgid "Select Width for New Row"
-msgstr "÷ÙÂÅÒÉÔÅ ÛÉÒÉÎÕ ÎÏ×ÏÊ ÓÔÒÏËÉ"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ¸ÑÐ¸Ð½Ñ Ð½Ð¾Ð²Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸"
 
 #: src/cfg_buttons.c:466
 msgid "Change Width of Row"
-msgstr "éÚÍÅÎÉÔØ ÛÉÒÉÎÕ ÓÔÒÏËÉ"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ¸ÑÐ¸Ð½Ñ ÑÑÑÐ¾ÐºÐ¸"
 
 #: src/cfg_buttons.c:609
 msgid "Edit Background Color"
-msgstr "éÚÍÅÎÉÔØ Ã×ÅÔ ÆÏÎÁ"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ²ÐµÑ ÑÐ¾Ð½Ð°"
 
 #: src/cfg_buttons.c:653
 msgid "Edit Foreground Color"
-msgstr "éÚÍÅÎÉÔØ Ã×ÅÔ"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ²ÐµÑ"
 
 #: src/cfg_buttons.c:678
 msgid "Label"
-msgstr "úÁÇÏÌÏ×ÏË"
+msgstr "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº"
 
-#: src/cfg_buttons.c:685 src/cfg_controls.c:645 src/cfg_controls.c:696
-#: src/cfg_controls.c:718 src/cfg_controls.c:739
+#: src/cfg_buttons.c:686 src/cfg_controls.c:612 src/cfg_controls.c:663
+#: src/cfg_controls.c:685
 msgid "Command"
-msgstr "ëÏÍÁÎÄÁ"
+msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð°"
 
-#: src/cfg_buttons.c:696 src/cfg_controls.c:639
+#: src/cfg_buttons.c:697 src/cfg_controls.c:606
 msgid "Key"
-msgstr "ëÎÏÐËÁ"
+msgstr "ÐÐ½Ð¾Ð¿ÐºÐ°"
 
-#: src/cfg_buttons.c:711 src/cfg_dirpane.c:1373
+#: src/cfg_buttons.c:712
 msgid "Colors"
-msgstr "ã×ÅÔÁ"
+msgstr "Ð¦Ð²ÐµÑÐ°"
 
-#: src/cfg_buttons.c:715
+#: src/cfg_buttons.c:716
 msgid "Background..."
-msgstr "æÏÎ..."
+msgstr "Ð¤Ð¾Ð½..."
 
-#: src/cfg_buttons.c:716 src/cfg_buttons.c:722
+#: src/cfg_buttons.c:717 src/cfg_buttons.c:723
 msgid "Reset to Default"
-msgstr "÷ÅÒÎÕÔØ ÎÁÞÁÌØÎÙÅ"
+msgstr "ÐÐµÑÐ½ÑÑÑ Ð½Ð°ÑÐ°Ð»ÑÐ½ÑÐµ"
 
-#: src/cfg_buttons.c:721
+#: src/cfg_buttons.c:722
 msgid "Foreground..."
-msgstr "ã×ÅÔ"
+msgstr "Ð¦Ð²ÐµÑ"
 
-#: src/cfg_buttons.c:749
+#: src/cfg_buttons.c:748
 msgid "Shortcuts"
-msgstr "úÁËÌÁÄËÉ"
+msgstr "ÐÐ°ÐºÐ»Ð°Ð´ÐºÐ¸"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Clear"
-msgstr "õÂÒÁÔØ"
+msgstr "Ð£Ð±ÑÐ°ÑÑ"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy Colors To"
-msgstr "ëÏÐÉÒÏ×ÁÔØ Ã×ÅÔÁ"
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ ÑÐ²ÐµÑÐ°"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy To"
-msgstr "ëÏÐÉÒÏ×ÁÔØ"
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Swap With"
-msgstr "ïÂÍÅÎÑÔØ"
+msgstr "ÐÐ±Ð¼ÐµÐ½ÑÑÑ"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Add Row..."
-msgstr "äÏÂÁ×ÉÔØ ÓÔÒÏËÕ..."
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÑÑÑÐ¾ÐºÑ..."
 
-#: src/cfg_buttons.c:751 src/cfg_cmdseq.c:951
+#: src/cfg_buttons.c:750 src/cfg_cmdseq.c:966
 msgid "Delete Row"
-msgstr "õÂÒÁÔØ ÓÔÒÏËÕ"
+msgstr "Ð£Ð±ÑÐ°ÑÑ ÑÑÑÐ¾ÐºÑ"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Down"
-msgstr "÷ÎÉÚ"
+msgstr "ÐÐ½Ð¸Ð·"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Row Width..."
-msgstr "ûÉÒÉÎÁ ÓÔÒÏËÉ..."
+msgstr "Ð¨Ð¸ÑÐ¸Ð½Ð° ÑÑÑÐ¾ÐºÐ¸..."
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Up"
-msgstr "÷×ÅÒÈ"
+msgstr "ÐÐ²ÐµÑÑ"
 
-#: src/cfg_buttons.c:762
+#: src/cfg_buttons.c:761
 msgid "Sheet"
-msgstr "ìÉÓÔ"
+msgstr "ÐÐ¸ÑÑ"
 
-#: src/cfg_buttons.c:778
+#: src/cfg_buttons.c:775
 msgid "Primary"
-msgstr "ïÓÎÏ×ÎÁÑ"
+msgstr "ÐÑÐ½Ð¾Ð²Ð½Ð°Ñ"
 
-#: src/cfg_buttons.c:780
+#: src/cfg_buttons.c:777
 msgid "Secondary"
-msgstr "÷ÔÏÒÉÞÎÁÑ"
+msgstr "ÐÑÐ¾ÑÐ¸ÑÐ½Ð°Ñ"
 
-#: src/cfg_buttons.c:785
+#: src/cfg_buttons.c:782
 msgid "Tooltip"
-msgstr "ðÏÄÓËÁÚËÁ"
+msgstr "ÐÐ¾Ð´ÑÐºÐ°Ð·ÐºÐ°"
 
-#: src/cfg_buttons.c:792 src/cfg_dirpane.c:1145
+#: src/cfg_buttons.c:790 src/cfg_dirpane.c:1107
 msgid "Flags"
-msgstr "æÌÁÇÉ"
+msgstr "Ð¤Ð»Ð°Ð³Ð¸"
 
-#: src/cfg_buttons.c:794
+#: src/cfg_buttons.c:792
 msgid "Narrow?"
-msgstr "óÕÚÉÔØ?"
+msgstr "Ð¡ÑÐ·Ð¸ÑÑ?"
 
-#: src/cfg_buttons.c:798
+#: src/cfg_buttons.c:796
 msgid "Show Tooltip?"
-msgstr "ðÏËÁÚÙ×ÁÔØ ÐÏÄÓËÁÚËÉ"
+msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð¿Ð¾Ð´ÑÐºÐ°Ð·ÐºÐ¸"
 
-#: src/cfg_buttons.c:833
+#: src/cfg_buttons.c:831
 msgid "Buttons"
-msgstr "ëÎÏÐËÉ"
+msgstr "ÐÐ½Ð¾Ð¿ÐºÐ¸"
 
-#: src/cfg_buttons.c:834 src/cfg_cmdseq.c:1067
+#: src/cfg_buttons.c:832 src/cfg_cmdseq.c:1081
 msgid "Definitions"
-msgstr "ïÐÒÅÄÅÌÅÎÉÑ"
+msgstr "ÐÐ¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ"
 
 #: src/cfg_cmdcfg.c:66
 msgid "Options"
-msgstr "äÅÔÁÌÉ"
+msgstr "ÐÐµÑÐ°Ð»Ð¸"
 
-#: src/cfg_cmdseq.c:610
+#: src/cfg_cmdseq.c:611
 msgid "Select Builtin"
-msgstr "÷ÙÂÒÁÔØ ×ÓÔÒÏÅÎÙÅ"
+msgstr "ÐÑÐ±ÑÐ°ÑÑ Ð²ÑÑÑÐ¾ÐµÐ½ÑÐµ"
 
-#: src/cfg_cmdseq.c:626
+#: src/cfg_cmdseq.c:627
 msgid "Opening brace"
-msgstr "ïÔËÒÙÔØ ÓËÏÂÕ"
+msgstr "ÐÑÐºÑÑÑÑ ÑÐºÐ¾Ð±Ñ"
 
-#: src/cfg_cmdseq.c:627
+#: src/cfg_cmdseq.c:628
 msgid "Closing brace"
-msgstr "úÁËÒÙÔØ ÓËÏÂÕ"
+msgstr "ÐÐ°ÐºÑÑÑÑ ÑÐºÐ¾Ð±Ñ"
 
-#: src/cfg_cmdseq.c:628
+#: src/cfg_cmdseq.c:629
 msgid "First selected"
-msgstr "ðÅÒ×ÙÊ ×ÙÂÒÁÎÎÙÊ"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹"
 
-#: src/cfg_cmdseq.c:629
+#: src/cfg_cmdseq.c:630
 msgid "First selected, unselect"
-msgstr "ðÅÒ×ÙÊ ×ÙÂÒÁÎÎÙÊ, ÒÁÚÏÔÍÅÔÉÔØ"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
 
-#: src/cfg_cmdseq.c:630
+#: src/cfg_cmdseq.c:631
 msgid "First selected, with path"
-msgstr "ðÅÒ×ÙÊ ×ÙÂÒÁÎÎÙÊ, Ó ÐÕÔÅÍ"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, Ñ Ð¿ÑÑÐµÐ¼"
 
-#: src/cfg_cmdseq.c:631
+#: src/cfg_cmdseq.c:632
 msgid "First selected, with path, unselect"
-msgstr "ðÅÒ×ÙÊ ×ÙÂÒÁÎÎÙÊ, Ó ÐÕÔÅÍ, ÒÁÚÏÔÍÅÔÉÔØ"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, Ñ Ð¿ÑÑÐµÐ¼, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
 
-#: src/cfg_cmdseq.c:632
+#: src/cfg_cmdseq.c:633
 msgid "First selected (destination pane)"
-msgstr "ðÅÒ×ÙÊ ×ÙÂÒÁÎÎÙÊ (ÐÁÎÅÌØ ÎÁÚÎÁÞÅÎÉÑ)"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹ (Ð¿Ð°Ð½ÐµÐ»Ñ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ)"
 
-#: src/cfg_cmdseq.c:633
+#: src/cfg_cmdseq.c:634
 msgid "First selected, no quotes"
-msgstr "ðÅÒ×ÙÊ ×ÙÂÒÁÎÎÙÊ, ÂÅÚ ËÁ×ÙÞÅË"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, Ð±ÐµÐ· ÐºÐ°Ð²ÑÑÐµÐº"
 
-#: src/cfg_cmdseq.c:634
+#: src/cfg_cmdseq.c:635
 msgid "All selected"
-msgstr "÷ÓÅ ×ÙÂÒÁÎÎÙÅ"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ"
 
-#: src/cfg_cmdseq.c:635
+#: src/cfg_cmdseq.c:636
 msgid "All selected, unselect"
-msgstr "÷ÓÅ ×ÙÂÒÁÎÎÙÅ, ÒÁÚÏÔÍÅÔÉÔØ"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
 
-#: src/cfg_cmdseq.c:636
+#: src/cfg_cmdseq.c:637
 msgid "All selected, with paths"
-msgstr "÷ÓÅ ×ÙÂÒÁÎÎÙÅ, Ó ÐÕÔÑÍÉ"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, Ñ Ð¿ÑÑÑÐ¼Ð¸"
 
-#: src/cfg_cmdseq.c:637
+#: src/cfg_cmdseq.c:638
 msgid "All selected, with paths, unselect"
-msgstr "÷ÓÅ ×ÙÂÒÁÎÎÙÅ, Ó ÐÕÔÑÍÉ, ÒÁÚÏÔÍÅÔÉÔØ"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, Ñ Ð¿ÑÑÑÐ¼Ð¸, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
 
-#: src/cfg_cmdseq.c:638
+#: src/cfg_cmdseq.c:639
 msgid "All selected (destination pane)"
-msgstr "÷ÓÅ ×ÙÂÒÁÎÎÙÅ(ÐÁÎÅÌØ ÎÁÚÎÁÞÅÎÉÑ)"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ(Ð¿Ð°Ð½ÐµÐ»Ñ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ)"
 
-#: src/cfg_cmdseq.c:639
+#: src/cfg_cmdseq.c:640
 msgid "All selected, no quotes"
-msgstr "÷ÓÅ ×ÙÂÒÁÎÎÙÅ, ÂÅÚ ËÁ×ÙÞÅË"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, Ð±ÐµÐ· ÐºÐ°Ð²ÑÑÐµÐº"
 
-#: src/cfg_cmdseq.c:640
+#: src/cfg_cmdseq.c:641
 msgid "Path to source pane's directory"
-msgstr "ðÕÔØ ÎÁ ÐÁÎÅÌÉ ÉÓÔÏÞÎÉËÁ"
+msgstr "ÐÑÑÑ Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ°"
 
-#: src/cfg_cmdseq.c:641
+#: src/cfg_cmdseq.c:642
 msgid "Path to destination pane's directory"
-msgstr "ðÕÔØ ÎÁ ÐÁÎÅÌÉ ÎÁÚÎÁÞÅÎÉÑ"
+msgstr "ÐÑÑÑ Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ"
 
-#: src/cfg_cmdseq.c:642
+#: src/cfg_cmdseq.c:643
 msgid "Path to home directory"
-msgstr "äÏÍÁÛÎÉÊ ËÁÔÁÌÏÇ"
+msgstr "ÐÐ¾Ð¼Ð°ÑÐ½Ð¸Ð¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³"
 
-#: src/cfg_cmdseq.c:643
+#: src/cfg_cmdseq.c:644
 msgid "Path of left pane"
-msgstr "ðÕÔØ ÎÁ ÌÅ×ÏÊ ÐÁÎÅÌÉ"
+msgstr "ÐÑÑÑ Ð½Ð° Ð»ÐµÐ²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_cmdseq.c:644
+#: src/cfg_cmdseq.c:645
 msgid "Path of right pane"
-msgstr "ðÕÔØ ÎÁ ÐÒÁ×ÏÊ ÐÁÎÅÌÉ"
+msgstr "ÐÑÑÑ Ð½Ð° Ð¿ÑÐ°Ð²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_cmdseq.c:645
+#: src/cfg_cmdseq.c:646
+#, fuzzy
+msgid "URI of first selected"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹"
+
+#: src/cfg_cmdseq.c:647
+#, fuzzy
+msgid "URI of first selected, unselect"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
+
+#: src/cfg_cmdseq.c:648
+#, fuzzy
+msgid "URI of first selected, no quotes"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹, Ð±ÐµÐ· ÐºÐ°Ð²ÑÑÐµÐº"
+
+#: src/cfg_cmdseq.c:649
+#, fuzzy
+msgid "URIs of all selected"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ"
+
+#: src/cfg_cmdseq.c:650
+#, fuzzy
+msgid "URIs of all selected, unselect"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, ÑÐ°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ"
+
+#: src/cfg_cmdseq.c:651
+#, fuzzy
+msgid "URIs of all selected, no quotes"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, Ð±ÐµÐ· ÐºÐ°Ð²ÑÑÐµÐº"
+
+#: src/cfg_cmdseq.c:652
+#, fuzzy
+msgid "URIs of all selected, unselect, no quotes"
+msgstr "ÐÑÐµ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ, Ð±ÐµÐ· ÐºÐ°Ð²ÑÑÐµÐº"
+
+#: src/cfg_cmdseq.c:653
+#, fuzzy
+msgid "URI of first selected (destination pane)"
+msgstr "ÐÐµÑÐ²ÑÐ¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹ (Ð¿Ð°Ð½ÐµÐ»Ñ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ)"
+
+#: src/cfg_cmdseq.c:654
 msgid "Input combo box"
-msgstr "ëÎÏÐËÁ ×ÙÂÏÒÁ"
+msgstr "ÐÐ½Ð¾Ð¿ÐºÐ° Ð²ÑÐ±Ð¾ÑÐ°"
 
-#: src/cfg_cmdseq.c:646
+#: src/cfg_cmdseq.c:655
 msgid "Input using menu"
-msgstr "íÅÎÀ ×ÙÂÏÒÁ"
+msgstr "ÐÐµÐ½Ñ Ð²ÑÐ±Ð¾ÑÐ°"
 
-#: src/cfg_cmdseq.c:647
+#: src/cfg_cmdseq.c:656
 msgid "Input string"
-msgstr "÷×ÏÄ ÓÔÒÏËÁ"
+msgstr "ÐÐ²Ð¾Ð´ ÑÑÑÐ¾ÐºÐ°"
 
-#: src/cfg_cmdseq.c:648
+#: src/cfg_cmdseq.c:657
 msgid "Input check button (gives TRUE or FALSE)"
-msgstr "ëÎÏÐËÉ - ÆÌÁÖËÉ (äá/îåô)"
+msgstr "ÐÐ½Ð¾Ð¿ÐºÐ¸ - ÑÐ»Ð°Ð¶ÐºÐ¸ (ÐÐ/ÐÐÐ¢)"
 
-#: src/cfg_cmdseq.c:649
+#: src/cfg_cmdseq.c:658
 msgid "Add label to input window"
-msgstr "úÁÇÏÌÏ×ÏË ÏËÎÁ ÄÉÁÌÏÇÁ"
+msgstr "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð¾ÐºÐ½Ð° Ð´Ð¸Ð°Ð»Ð¾Ð³Ð°"
 
-#: src/cfg_cmdseq.c:650
+#: src/cfg_cmdseq.c:659
 msgid "Add a separator bar to input window"
-msgstr "ìÉÎÉÑ-ÒÁÚÄÅÌÉÔÅÌØ × ÏËÎÅ ××ÏÄÁ"
+msgstr "ÐÐ¸Ð½Ð¸Ñ-ÑÐ°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ Ð² Ð¾ÐºÐ½Ðµ Ð²Ð²Ð¾Ð´Ð°"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "$NAME"
 msgstr "$NAME"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "Value of $NAME (environment)"
-msgstr "úÎÁÞÅÎÉÅ $NAME (ÉÚ ÏËÒÕÖÅÎÉÑ)"
+msgstr "ÐÐ½Ð°ÑÐµÐ½Ð¸Ðµ $NAME (Ð¸Ð· Ð¾ÐºÑÑÐ¶ÐµÐ½Ð¸Ñ)"
 
-#: src/cfg_cmdseq.c:652
+#: src/cfg_cmdseq.c:661
 msgid "gentoo's PID"
 msgstr "PID gentoo"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "Home directory for user NAME"
-msgstr "äÏÍÁÛÎÉÊ ËÁÔÁÌÏÇ ÐÏÌØÚÏ×ÁÔÅÌÑ NAME"
+msgstr "ÐÐ¾Ð¼Ð°ÑÐ½Ð¸Ð¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ NAME"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "~NAME"
 msgstr "~NAME"
 
-#: src/cfg_cmdseq.c:677
+#: src/cfg_cmdseq.c:686 src/cmd_split.c:536
 msgid "Pick Code"
-msgstr "÷ÙÂÒÁÔØ ËÏÄ"
+msgstr "ÐÑÐ±ÑÐ°ÑÑ ÐºÐ¾Ð´"
 
-#: src/cfg_cmdseq.c:765
+#: src/cfg_cmdseq.c:778
 msgid "(No Options Available)"
-msgstr "(îÅÔ ÎÁÓÔÒÏÅË)"
+msgstr "(ÐÐµÑ Ð½Ð°ÑÑÑÐ¾ÐµÐº)"
 
-#: src/cfg_cmdseq.c:801
+#: src/cfg_cmdseq.c:814
 msgid "Run in Background?"
-msgstr "úÁÐÕÓÔÉÔØ ÆÏÎÏÍ?"
+msgstr "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÑÐ¾Ð½Ð¾Ð¼?"
 
-#: src/cfg_cmdseq.c:805
+#: src/cfg_cmdseq.c:818
 msgid "Kill Previous Instance?"
-msgstr "óÎÑÔØ ÐÒÅÄÙÄÕÝÕÀ ÚÁÄÁÞÕ?"
+msgstr "Ð¡Ð½ÑÑÑ Ð¿ÑÐµÐ´ÑÐ´ÑÑÑÑ Ð·Ð°Ð´Ð°ÑÑ?"
 
-#: src/cfg_cmdseq.c:809
+#: src/cfg_cmdseq.c:822
 msgid "Survive Quit?"
-msgstr "îÅ ÓÎÉÍÁÔØ ÐÒÉ ×ÙÈÏÄÅ?"
+msgstr "ÐÐµ ÑÐ½Ð¸Ð¼Ð°ÑÑ Ð¿ÑÐ¸ Ð²ÑÑÐ¾Ð´Ðµ?"
 
-#: src/cfg_cmdseq.c:815
+#: src/cfg_cmdseq.c:828
 msgid "Capture Output?"
-msgstr "ðÏËÁÚÙ×ÁÔØ ×Ù×ÏÄ?"
+msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð²ÑÐ²Ð¾Ð´?"
 
-#: src/cfg_cmdseq.c:900
+#: src/cfg_cmdseq.c:913
 msgid "Before Execution"
-msgstr "ðÅÒÅÄ ÚÁÐÕÓËÏÍ"
+msgstr "ÐÐµÑÐµÐ´ Ð·Ð°Ð¿ÑÑÐºÐ¾Ð¼"
 
-#: src/cfg_cmdseq.c:903
+#: src/cfg_cmdseq.c:916
 msgid "Require Source Selection?"
-msgstr "ïÂÑÚÁÔÅÌÅÎ ×ÙÂÏÒ ÉÓÔÏÞÎÉËÁ?"
+msgstr "ÐÐ±ÑÐ·Ð°ÑÐµÐ»ÐµÐ½ Ð²ÑÐ±Ð¾Ñ Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ°?"
 
-#: src/cfg_cmdseq.c:907
+#: src/cfg_cmdseq.c:920
 msgid "Require Destination Selection?"
-msgstr "ïÂÑÚÁÔÅÌÅÎ ×ÙÂÏÒ ÎÁÚÎÁÞÅÎÉÑ?"
+msgstr "ÐÐ±ÑÐ·Ð°ÑÐµÐ»ÐµÐ½ Ð²ÑÐ±Ð¾Ñ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ?"
 
-#: src/cfg_cmdseq.c:912
+#: src/cfg_cmdseq.c:926
 msgid "CD Source?"
-msgstr "ðÅÒÅÊÔÉ × ËÁÔÁÌÏÇ ÉÓÔÏÞÎÉËÁ?"
+msgstr "ÐÐµÑÐµÐ¹ÑÐ¸ Ð² ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ°?"
 
-#: src/cfg_cmdseq.c:915
+#: src/cfg_cmdseq.c:929
 msgid "CD Destination?"
-msgstr "ðÅÒÅÊÔÉ × ËÁÔÁÌÏÇ ÎÁÚÎÁÞÅÎÉÑ?"
+msgstr "ÐÐµÑÐµÐ¹ÑÐ¸ Ð² ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ?"
 
-#: src/cfg_cmdseq.c:922
+#: src/cfg_cmdseq.c:937
 msgid "After Execution"
-msgstr "ðÏÓÌÅ ÚÁÐÕÓËÁ"
+msgstr "ÐÐ¾ÑÐ»Ðµ Ð·Ð°Ð¿ÑÑÐºÐ°"
 
-#: src/cfg_cmdseq.c:924
+#: src/cfg_cmdseq.c:939
 msgid "Rescan Source?"
-msgstr "ðÅÒÅÞÉÔÁÔØ ËÁÔÁÌÏÇ ÉÓÔÏÞÎÉËÁ?"
+msgstr "ÐÐµÑÐµÑÐ¸ÑÐ°ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ°?"
 
-#: src/cfg_cmdseq.c:928
+#: src/cfg_cmdseq.c:943
 msgid "Rescan Destination?"
-msgstr "ðÅÒÅÞÉÔÁÔØ ËÁÔÁÌÏÇ ÎÁÚÎÁÞÅÎÉÑ?"
+msgstr "ÐÐµÑÐµÑÐ¸ÑÐ°ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ?"
 
-#: src/cfg_cmdseq.c:942
+#: src/cfg_cmdseq.c:957
 msgid "General"
-msgstr "ïÓÎÏ×ÎÙÅ"
+msgstr "ÐÑÐ½Ð¾Ð²Ð½ÑÐµ"
 
-#: src/cfg_cmdseq.c:945
+#: src/cfg_cmdseq.c:960
 msgid "Before&After"
-msgstr "äÏ É ÐÏÓÌÅ"
+msgstr "ÐÐ¾ Ð¸ Ð¿Ð¾ÑÐ»Ðµ"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "Built-In"
-msgstr "÷ÓÔÒÏÅÎÙÅ"
+msgstr "ÐÑÑÑÐ¾ÐµÐ½ÑÐµ"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "External"
-msgstr "÷ÎÅÛÎÉÅ"
+msgstr "ÐÐ½ÐµÑÐ½Ð¸Ðµ"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Add Row"
-msgstr "äÏÂÁ×ÉÔØ ÓÔÒÏËÕ"
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÑÑÑÐ¾ÐºÑ"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Duplicate"
-msgstr "óÏÚÄÁÔØ ËÏÐÉÀ"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°ÑÑ ÐºÐ¾Ð¿Ð¸Ñ"
 
-#: src/cfg_cmdseq.c:978 src/cfg_styles.c:588 src/cfg_styles.c:805
-#: src/cfg_types.c:679 src/cmd_symlink.c:209 src/dpformat.c:35
+#: src/cfg_cmdseq.c:993 src/cfg_styles.c:596 src/cfg_styles.c:823
+#: src/cfg_types.c:678 src/cmd_info.c:151 src/cmd_split.c:648
+#: src/cmd_symlink.c:213 src/dpformat.c:36
 msgid "Name"
-msgstr "éÍÑ"
+msgstr "ÐÐ¼Ñ"
 
-#: src/cfg_cmdseq.c:988
+#: src/cfg_cmdseq.c:1004
 msgid "Definition"
-msgstr "ïÐÉÓÁÎÉÅ"
+msgstr "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
-#: src/cfg_cmdseq.c:1044
+#: src/cfg_cmdseq.c:1058
 msgid "Repeat Sequence Until No Source Selection?"
-msgstr "ðÏ×ÔÏÒÑÔØ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÐÏËÁ ÅÓÔØ ×ÙÂÒÁÎÙÅ?"
+msgstr "ÐÐ¾Ð²ÑÐ¾ÑÑÑÑ Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»ÑÐ½Ð¾ÑÑÑ Ð¿Ð¾ÐºÐ° ÐµÑÑÑ Ð²ÑÐ±ÑÐ°Ð½ÑÐµ?"
 
-#: src/cfg_cmdseq.c:1056 src/cfg_controls.c:655 src/cfg_controls.c:706
-#: src/cfg_styles.c:833 src/cfg_types.c:775
+#: src/cfg_cmdseq.c:1070 src/cfg_controls.c:622 src/cfg_controls.c:673
+#: src/cfg_styles.c:853 src/cfg_types.c:776
 msgid "Add"
-msgstr "äÏÂÁ×ÉÔØ"
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ"
 
-#: src/cfg_cmdseq.c:1059 src/cfg_controls.c:658 src/cfg_controls.c:709
-#: src/cfg_styles.c:836 src/cfg_types.c:788
+#: src/cfg_cmdseq.c:1073 src/cfg_controls.c:625 src/cfg_controls.c:676
+#: src/cfg_styles.c:856 src/cfg_types.c:789
 msgid "Delete"
-msgstr "õÂÒÁÔØ"
+msgstr "Ð£Ð±ÑÐ°ÑÑ"
 
-#: src/cfg_cmdseq.c:1066
+#: src/cfg_cmdseq.c:1080
 msgid "Commands"
-msgstr "ëÏÍÁÎÄÙ"
+msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ñ"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1365 src/cfg_dirpane.c:1371
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1288 src/cfg_dirpane.c:1293
 msgid "Left"
-msgstr "ìÅ×ÁÑ"
+msgstr "ÐÐµÐ²Ð°Ñ"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Middle"
-msgstr "óÒÅÄÎÑÑ"
+msgstr "Ð¡ÑÐµÐ´Ð½ÑÑ"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1364 src/cfg_dirpane.c:1372
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1287 src/cfg_dirpane.c:1294
 msgid "Right"
-msgstr "ðÒÁ×ÁÑ"
+msgstr "ÐÑÐ°Ð²Ð°Ñ"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Down"
-msgstr "ëÏÌÅÓÏÍ ×ÎÉÚ"
+msgstr "ÐÐ¾Ð»ÐµÑÐ¾Ð¼ Ð²Ð½Ð¸Ð·"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Up"
-msgstr "ëÏÌÅÓÏÍ ××ÅÒÈ"
+msgstr "ÐÐ¾Ð»ÐµÑÐ¾Ð¼ Ð²Ð²ÐµÑÑ"
 
-#: src/cfg_controls.c:382
+#: src/cfg_controls.c:378
 msgid ""
 "The following modifier key(s) must\n"
 "be held down when the mouse button\n"
 "is clicked to trigger the command"
 msgstr ""
-"óÌÅÄÕÀÝÉÅ ËÎÏÐËÉ ÍÏÄÉÆÉËÁÔÏÒÙ ÄÏÌÖÎÙ\n"
-"ÂÙÔØ ÎÁÖÁÔÙ ×Ï ×ÒÅÍÑ ÝÅÌÞËÁ ÍÙÛËÉ"
+"Ð¡Ð»ÐµÐ´ÑÑÑÐ¸Ðµ ÐºÐ½Ð¾Ð¿ÐºÐ¸ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÑ Ð´Ð¾Ð»Ð¶Ð½Ñ\n"
+"Ð±ÑÑÑ Ð½Ð°Ð¶Ð°ÑÑ Ð²Ð¾ Ð²ÑÐµÐ¼Ñ ÑÐµÐ»ÑÐºÐ° Ð¼ÑÑÐºÐ¸"
 
-#: src/cfg_controls.c:395
+#: src/cfg_controls.c:391
 msgid "Edit Modifiers"
-msgstr "éÚÍÅÎÉÔØ ÍÏÄÉÆÉËÁÔÏÒÙ"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÑ"
 
-#: src/cfg_controls.c:613
+#: src/cfg_controls.c:580
 msgid "Controls"
-msgstr "õÐÒÁ×ÌÅÎÉÅ"
+msgstr "Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_controls.c:620
+#: src/cfg_controls.c:587
 msgid "Global Keyboard Shortcuts"
-msgstr "ïÓÎÏ×ÎÙÅ ËÏÍÂÉÎÁÃÉÉ ËÎÏÐÏË"
+msgstr "ÐÑÐ½Ð¾Ð²Ð½ÑÐµ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°ÑÐ¸Ð¸ ÐºÐ½Ð¾Ð¿Ð¾Ðº"
 
-#: src/cfg_controls.c:665
+#: src/cfg_controls.c:632
 msgid "Dirpane Mouse Buttons"
-msgstr "ëÌÁ×ÉÛÉ ÍÙÛËÉ"
+msgstr "ÐÐ»Ð°Ð²Ð¸ÑÐ¸ Ð¼ÑÑÐºÐ¸"
 
-#: src/cfg_controls.c:690
+#: src/cfg_controls.c:657
 msgid "Button"
-msgstr "ëÎÏÐËÁ"
+msgstr "ÐÐ½Ð¾Ð¿ÐºÐ°"
 
-#: src/cfg_controls.c:693
+#: src/cfg_controls.c:660
 msgid "Edit Modifiers..."
-msgstr "éÚÍÅÎÉÔØ ÍÏÄÉÆÉËÁÔÏÒÙ..."
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÑ..."
 
-#: src/cfg_controls.c:716
+#: src/cfg_controls.c:683
 msgid "Click-M-Click Gesture"
-msgstr "ýÅÌË-í-ýÅÌË ×ÏÚÍÏÖÎÏÓÔØ"
+msgstr "Ð©ÐµÐ»Ðº-Ð-Ð©ÐµÐ»Ðº Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ"
 
-#: src/cfg_controls.c:726
+#: src/cfg_controls.c:693
 msgid "Time Limit"
-msgstr "úÁÄÅÒÖËÁ"
+msgstr "ÐÐ°Ð´ÐµÑÐ¶ÐºÐ°"
 
-#: src/cfg_controls.c:737
-msgid "Path Right Click"
-msgstr "ðÒÁ×ÙÊ ÝÅÌÞÏË ÎÁ ÐÕÔÉ"
-
-#: src/cfg_controls.c:750
+#: src/cfg_controls.c:704
 msgid "Ignore Num Lock For All Bindings?"
-msgstr "îÅ ÕÞÉÔÙ×ÁÔØ Num Lock ÄÌÑ ×ÓÅÈ ËÏÍÂÉÎÁÃÉÊ?"
+msgstr "ÐÐµ ÑÑÐ¸ÑÑÐ²Ð°ÑÑ Num Lock Ð´Ð»Ñ Ð²ÑÐµÑ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°ÑÐ¸Ð¹?"
 
-#: src/cfg_controls.c:780
+#: src/cfg_controls.c:734
 msgid ""
 "Note: The mouse button control settings\n"
 "are ambiguous: the same button+modifier\n"
 "is used for more than one function. This\n"
 "might make their behaviour pretty weird..."
 msgstr ""
-"÷ÁÖÎÏ: úÎÁÞÅÎÉÑ ËÌÁ×ÉÛ ÍÙÛËÉ ÎÅÏÄÎÏÚÎÁÞÎÙ:\n"
-"ÏÄÎÁ ËÏÍÂÉÎÁÃÉÑ ËÎÏÐËÉ É ÍÏÄÉÆÉËÁÔÏÒÁ\n"
-"ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÂÏÌÅÅ ÞÅÍ ÏÄÎÏÊ ÃÅÌÉ. üÔÏ\n"
-"ÍÏÖÅÔ ÐÒÉ×ÅÓÔÉ Ë ÉÈ ÎÅÏÖÉÄÁÎÎÏÍÕ ÐÏ×ÅÄÅÎÉÀ..."
+"ÐÐ°Ð¶Ð½Ð¾: ÐÐ½Ð°ÑÐµÐ½Ð¸Ñ ÐºÐ»Ð°Ð²Ð¸Ñ Ð¼ÑÑÐºÐ¸ Ð½ÐµÐ¾Ð´Ð½Ð¾Ð·Ð½Ð°ÑÐ½Ñ:\n"
+"Ð¾Ð´Ð½Ð° ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°ÑÐ¸Ñ ÐºÐ½Ð¾Ð¿ÐºÐ¸ Ð¸ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÐ°\n"
+"Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð´Ð»Ñ Ð±Ð¾Ð»ÐµÐµ ÑÐµÐ¼ Ð¾Ð´Ð½Ð¾Ð¹ ÑÐµÐ»Ð¸. ÐÑÐ¾\n"
+"Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑÐ¸Ð²ÐµÑÑÐ¸ Ðº Ð¸Ñ Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð¾Ð¼Ñ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ñ..."
 
-#: src/cfg_controls.c:784
+#: src/cfg_controls.c:738
 msgid "Warning"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ"
+msgstr "ÐÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_controls.c:784 src/children.c:95 src/cmd_info.c:246
+#: src/cfg_controls.c:738 src/children.c:89 src/cmd_info.c:320
 msgid "_OK"
-msgstr "_äÁ"
-
-#: src/cfg_dirpane.c:365
-msgid "Formatted Size, in bytes"
-msgstr "òÁÚÍÅÒ, × ÂÁÊÔÁÈ"
-
-#: src/cfg_dirpane.c:365
-msgid "Raw Size, in Bytes"
-msgstr "óÙÒÏÊ ÒÁÚÍÅÒ, × ÂÁÊÔÁÈ"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in kilobytes"
-msgstr "òÁÚÍÅÒ, × ËÉÌÏÂÁÊÔÁÈ"
+msgstr "_ÐÐ°"
 
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in megabytes"
-msgstr "òÁÚÍÅÒ, × ÍÅÇÁÂÁÊÔÁÈ"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, \"Smart\" Unit"
-msgstr "òÁÚÍÅÒ,× \"ÕÍÎÙÈ\" ÅÄÉÎÉÃÁÈ"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, in gigabytes"
-msgstr "òÁÚÍÅÒ, × ÇÉÇÁÂÁÊÔÁÈ"
-
-#: src/cfg_dirpane.c:383
+#: src/cfg_dirpane.c:333
 msgid "Append Type Character?"
-msgstr "äÏÂÁ×ÉÔØ ÔÉÐ ÓÉÍ×ÏÌÁ?"
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÑÐ¸Ð¿ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°?"
 
-#: src/cfg_dirpane.c:386
-msgid "Append \"-> destination\" on Links?"
-msgstr "äÏÂÁ×ÉÔØ \"->ÎÁÚÎÁÞÅÎÉÅ\" × ÓÓÙÌËÉ?"
+#: src/cfg_dirpane.c:336
+#, fuzzy
+msgid "Append \"â destination\" on Links?"
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ \"->Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ\" Ð² ÑÑÑÐ»ÐºÐ¸?"
 
-#: src/cfg_dirpane.c:406
+#: src/cfg_dirpane.c:358
 msgid "Place Tick Every 3 Digits?"
-msgstr "òÁÚÄÅÌÉÔØ ÒÁÚÒÑÄÙ?"
+msgstr "Ð Ð°Ð·Ð´ÐµÐ»Ð¸ÑÑ ÑÐ°Ð·ÑÑÐ´Ñ?"
 
-#: src/cfg_dirpane.c:416
+#: src/cfg_dirpane.c:369
 msgid "Digits of Precision"
-msgstr "ôÏÞÎÏÓÔØ"
+msgstr "Ð¢Ð¾ÑÐ½Ð¾ÑÑÑ"
 
-#: src/cfg_dirpane.c:429
+#: src/cfg_dirpane.c:382
 msgid "Show Dir's File System Size?"
-msgstr "ðÏËÁÚÁÔØ ÒÁÚÍÅÒ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ?"
+msgstr "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ ÑÐ°Ð·Ð¼ÐµÑ ÑÐ°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑÐµÐ¼Ñ?"
 
-#: src/cfg_dirpane.c:435 src/cfg_dirpane.c:439 src/cfg_dirpane.c:443
-#: src/cfg_dirpane.c:447 src/cfg_dirpane.c:451 src/cfg_dirpane.c:455
-#: src/cfg_dirpane.c:459 src/cfg_dirpane.c:463 src/cfg_dirpane.c:467
-#: src/cfg_dirpane.c:474
+#: src/cfg_dirpane.c:388 src/cfg_dirpane.c:392 src/cfg_dirpane.c:396
+#: src/cfg_dirpane.c:400 src/cfg_dirpane.c:404 src/cfg_dirpane.c:408
+#: src/cfg_dirpane.c:412 src/cfg_dirpane.c:416 src/cfg_dirpane.c:420
+#: src/cfg_dirpane.c:428
 msgid "Format"
-msgstr "æÏÒÍÁÔ"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°Ñ"
 
-#: src/cfg_dirpane.c:497
+#: src/cfg_dirpane.c:454
 #, c-format
 msgid "%s Settings"
-msgstr "%s ÎÁÓÔÒÏÊËÉ"
+msgstr "%s Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1002 src/cfg_dirpane.c:1003
-#: src/cmd_select.c:414
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:970 src/cfg_dirpane.c:971
+#: src/cmd_select.c:381
 msgid "Content"
-msgstr "óÏÄÅÒÖÁÎÉÅ"
+msgstr "Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ"
 
-#: src/cfg_dirpane.c:611
+#: src/cfg_dirpane.c:571
 msgid "Justification"
-msgstr "÷ÙÒÁ×ÎÉ×ÁÎÉÅ"
+msgstr "ÐÑÑÐ°Ð²Ð½Ð¸Ð²Ð°Ð½Ð¸Ðµ"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1003
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:971
 msgid "Title"
-msgstr "úÁÇÏÌÏ×ÏË"
+msgstr "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº"
 
-#: src/cfg_dirpane.c:611 src/window.c:201
+#: src/cfg_dirpane.c:571 src/window.c:200
 msgid "Width"
-msgstr "ûÉÒÉÎÁ"
+msgstr "Ð¨Ð¸ÑÐ¸Ð½Ð°"
 
-#: src/cfg_dirpane.c:612
+#: src/cfg_dirpane.c:572
 msgid "Center"
-msgstr "ðÏ ÃÅÎÔÒÕ"
+msgstr "ÐÐ¾ ÑÐµÐ½ÑÑÑ"
 
-#: src/cfg_dirpane.c:621
+#: src/cfg_dirpane.c:581
 msgid "Basic Settings"
-msgstr "ïÓÎÏ×ÎÙÅ ÎÁÓÔÒÏÊËÉ"
+msgstr "ÐÑÐ½Ð¾Ð²Ð½ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸"
 
-#: src/cfg_dirpane.c:669
+#: src/cfg_dirpane.c:628
 msgid "Edit Column Content"
-msgstr "éÚÍÅÎÉÔØ ÓÏÄÅÒÖÉÍÏÅ ËÏÌÏÎÏË"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ ÐºÐ¾Ð»Ð¾Ð½Ð¾Ðº"
 
-#: src/cfg_dirpane.c:1002
+#: src/cfg_dirpane.c:970
 msgid "Default Title"
-msgstr "úÁÇÏÌÏ×ÏË ÐÏ ÕÍÏÌÞÁÎÉÀ"
+msgstr "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories First"
-msgstr "ëÁÔÁÌÏÇÉ ××ÅÒÈÕ"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³Ð¸ Ð²Ð²ÐµÑÑÑ"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Last"
-msgstr "ëÁÔÁÌÏÇÉ ×ÎÉÚÕ"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³Ð¸ Ð²Ð½Ð¸Ð·Ñ"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Mixed"
-msgstr "ëÁÔÁÌÏÇÉ ËÁË ÆÁÊÌÙ"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³Ð¸ ÐºÐ°Ðº ÑÐ°Ð¹Ð»Ñ"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Left of List"
-msgstr "óÌÅ×Á ÏÔ ÓÐÉÓËÁ"
+msgstr "Ð¡Ð»ÐµÐ²Ð° Ð¾Ñ ÑÐ¿Ð¸ÑÐºÐ°"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Right of List"
-msgstr "óÐÒÁ×Á ÏÔ ÓÐÉÓËÁ"
+msgstr "Ð¡Ð¿ÑÐ°Ð²Ð° Ð¾Ñ ÑÐ¿Ð¸ÑÐºÐ°"
 
-#: src/cfg_dirpane.c:1029 src/cfg_dirpane.c:1030
+#: src/cfg_dirpane.c:997
 msgid "System Default"
-msgstr "ðÏ ÕÍÏÌÞÁÎÉÀ"
+msgstr "ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
 
-#: src/cfg_dirpane.c:1030
-msgid "Always Set"
-msgstr "÷ÓÅÇÄÁ ×ËÌÀÞÅÎÏ"
-
-#: src/cfg_dirpane.c:1030 src/cmd_chmod.c:260 src/menus.c:513
-msgid "Toggle"
-msgstr "ðÅÒÅËÌÀÞÉÔØ"
-
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy From %s"
-msgstr "óËÏÐÉÒÏ×ÁÔØ ÉÚ %s"
+msgstr "Ð¡ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð¸Ð· %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy To %s"
-msgstr "ëÏÐÉÒÏ×ÁÔØ × %s"
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð² %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Swap With %s"
-msgstr "ïÂÍÅÎÑÔØ Ó %s"
+msgstr "ÐÐ±Ð¼ÐµÐ½ÑÑÑ Ñ %s"
 
-#: src/cfg_dirpane.c:1048
+#: src/cfg_dirpane.c:1015
 msgid "Columns"
-msgstr "ëÏÌÏÎËÉ"
+msgstr "ÐÐ¾Ð»Ð¾Ð½ÐºÐ¸"
 
-#: src/cfg_dirpane.c:1053
+#: src/cfg_dirpane.c:1020
 msgid "Available Content Types"
-msgstr "äÏÓÔÕÐÎÙÅ ÔÉÐÙ ÓÏÄÅÒÖÉÍÏÇÏ"
+msgstr "ÐÐ¾ÑÑÑÐ¿Ð½ÑÐµ ÑÐ¸Ð¿Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾"
 
-#: src/cfg_dirpane.c:1070
+#: src/cfg_dirpane.c:1037
 msgid "Selected Content Types"
-msgstr "÷ÙÂÒÁÎÙÅ ÔÉÐÙ ÓÏÄÅÒÖÉÍÏÇÏ"
+msgstr "ÐÑÐ±ÑÐ°Ð½ÑÐµ ÑÐ¸Ð¿Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾"
 
-#: src/cfg_dirpane.c:1081 src/cfg_styles.c:723
+#: src/cfg_dirpane.c:1049 src/cfg_styles.c:741
 msgid "Edit..."
-msgstr "éÚÍÅÎÉÔØ..."
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ..."
 
-#: src/cfg_dirpane.c:1082 src/cmd_renamere.c:508
+#: src/cfg_dirpane.c:1050 src/cmd_renamere.c:481
 msgid "Remove"
-msgstr "õÂÒÁÔØ"
+msgstr "Ð£Ð±ÑÐ°ÑÑ"
 
-#: src/cfg_dirpane.c:1096
+#: src/cfg_dirpane.c:1064
 msgid "Sorting"
-msgstr "óÏÒÔÉÒÏ×ËÁ"
+msgstr "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ°"
 
-#: src/cfg_dirpane.c:1099
+#: src/cfg_dirpane.c:1067
 msgid "Sort On"
-msgstr "óÏÒÔÉÒÏ×ÁÔØ"
+msgstr "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ"
 
-#: src/cfg_dirpane.c:1106 src/cmd_split.c:233 src/dpformat.c:39
-#: src/dpformat.c:40
+#: src/cfg_dirpane.c:1071 src/cmd_split.c:590 src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode"
-msgstr "òÅÖÉÍ"
+msgstr "Ð ÐµÐ¶Ð¸Ð¼"
 
-#: src/cfg_dirpane.c:1113
+#: src/cfg_dirpane.c:1077
 msgid "Inverse Sorting?"
-msgstr "ïÂÒÁÔÎÁÑ ÓÏÒÔÉÒÏ×ËÁ?"
+msgstr "ÐÐ±ÑÐ°ÑÐ½Ð°Ñ ÑÐ¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ°?"
 
-#: src/cfg_dirpane.c:1116 src/cfg_paths.c:187 src/cfg_types.c:743
-#: src/cmd_renamere.c:459 src/cmd_renamere.c:486 src/cmd_select.c:520
-#: src/textview.c:620
+#: src/cfg_dirpane.c:1080 src/cfg_paths.c:228 src/cfg_types.c:744
+#: src/cmd_renamere.c:432 src/cmd_renamere.c:459 src/cmd_select.c:478
+#: src/textview.c:604
 msgid "Ignore Case?"
-msgstr "îÅ ÕÞÉÔÙ×ÁÔØ ÒÅÇÉÓÔÒ?"
-
-#: src/cfg_dirpane.c:1119
-msgid "Numerical Mode?"
-msgstr "õÞÉÔÙ×ÁÔØ ÄÌÉÎÕ?"
+msgstr "ÐÐµ ÑÑÐ¸ÑÑÐ²Ð°ÑÑ ÑÐµÐ³Ð¸ÑÑÑ?"
 
-#: src/cfg_dirpane.c:1127
+#: src/cfg_dirpane.c:1088
 msgid "Default Directory"
-msgstr "ëÁÔÁÌÏÇ ÐÏ ÕÍÏÌÞÁÎÉÀ"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
 
-#: src/cfg_dirpane.c:1132
+#: src/cfg_dirpane.c:1094
 msgid "Grab Current"
-msgstr "÷ÚÑÔØ ÔÅËÕÝÉÅ"
+msgstr "ÐÐ·ÑÑÑ ÑÐµÐºÑÑÐ¸Ðµ"
 
-#: src/cfg_dirpane.c:1135
+#: src/cfg_dirpane.c:1097
 msgid "From History"
-msgstr "ðÏÓÌÅÄÎÉÊ"
+msgstr "ÐÐ¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹"
 
-#: src/cfg_dirpane.c:1148
+#: src/cfg_dirpane.c:1110
 msgid "Path Above?"
-msgstr "ðÕÔØ Ó×ÅÒÈÕ?"
+msgstr "ÐÑÑÑ ÑÐ²ÐµÑÑÑ?"
 
-#: src/cfg_dirpane.c:1152
+#: src/cfg_dirpane.c:1114
 msgid "Hide Allowed?"
-msgstr "òÁÚÒÅÛÉÔØ ÓËÒÙÔÉÅ?"
+msgstr "Ð Ð°Ð·ÑÐµÑÐ¸ÑÑ ÑÐºÑÑÑÐ¸Ðµ?"
 
-#: src/cfg_dirpane.c:1156
+#: src/cfg_dirpane.c:1118
 msgid "Scrollbar Always?"
-msgstr "âÅÇÕÎÏË ×ÓÅÇÄÁ?"
+msgstr "ÐÐµÐ³ÑÐ½Ð¾Ðº Ð²ÑÐµÐ³Ð´Ð°?"
 
-#: src/cfg_dirpane.c:1160
+#: src/cfg_dirpane.c:1122
 msgid "Huge Parent Button?"
-msgstr "âÏÌØÛÁÑ ËÎÏÐËÁ ÷×ÅÒÈ?"
+msgstr "ÐÐ¾Ð»ÑÑÐ°Ñ ÐºÐ½Ð¾Ð¿ÐºÐ° ÐÐ²ÐµÑÑ?"
 
-#: src/cfg_dirpane.c:1168
-msgid "Scrollbar Position"
-msgstr "òÁÓÐÏÌÏÖÅÎÉÅ ÂÅÇÕÎËÁ"
-
-#: src/cfg_dirpane.c:1180
-msgid "Modify 'Control' Key State"
-msgstr "éÚÍÅÎÉÔØ ÓÏÓÔÏÑÎÉÅ ËÎÏÐËÉ 'Control'"
-
-#: src/cfg_dirpane.c:1225
-msgid "Active Pane Titles"
-msgstr "úÁÇÏÌÏ×ÏË ÁËÔÉ×ÎÏÊ ÐÁÎÅÌÉ"
-
-#: src/cfg_dirpane.c:1225
-msgid "Focused Row, Unselected"
-msgstr "÷ÙÂÒÁÎÎÁÑ ÓÔÒÏËÁ, ÎÅ ÏÔÍÅÞÅÎÁÑ"
+#: src/cfg_dirpane.c:1127
+msgid "Set Custom Font?"
+msgstr ""
 
-#: src/cfg_dirpane.c:1226
-msgid "Focused Row, Selected"
-msgstr "÷ÙÂÒÁÎÎÁÑ ÓÔÒÏËÁ, ÏÔÍÅÞÅÎÎÁÑ"
+#: src/cfg_dirpane.c:1140
+msgid "Scrollbar Position"
+msgstr "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð±ÐµÐ³ÑÐ½ÐºÐ°"
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Horizontal"
-msgstr "çÏÒÉÚÏÎÔÁÌØÎÏ"
+msgstr "ÐÐ¾ÑÐ¸Ð·Ð¾Ð½ÑÐ°Ð»ÑÐ½Ð¾"
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Vertical"
-msgstr "÷ÅÒÔÉËÁÌØÎÏ"
+msgstr "ÐÐµÑÑÐ¸ÐºÐ°Ð»ÑÐ½Ð¾"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Don't Track"
-msgstr "îÅ ÉÚÍÅÎÑÔØ"
+msgstr "ÐÐµ Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Ratio"
-msgstr "óÏÏÔÎÏÛÅÎÉÅ"
+msgstr "Ð¡Ð¾Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Left Pane"
-msgstr "òÁÚÍÅÒ ÌÅ×ÏÊ ÐÁÎÅÌÉ"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ Ð»ÐµÐ²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Right Pane"
-msgstr "òÁÚÍÅÒ ÐÒÁ×ÏÊ ÐÁÎÅÌÉ"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ Ð¿ÑÐ°Ð²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_dirpane.c:1275
+#: src/cfg_dirpane.c:1198
 msgid "Pane Orientation"
-msgstr "ïÒÉÅÎÔÁÃÉÑ ÐÁÎÅÌÉ"
+msgstr "ÐÑÐ¸ÐµÐ½ÑÐ°ÑÐ¸Ñ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_dirpane.c:1289
+#: src/cfg_dirpane.c:1212
 msgid "Split Tracking"
-msgstr "òÁÚÄÅÌÉÔÅÌØ"
+msgstr "Ð Ð°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ"
 
-#: src/cfg_dirpane.c:1312
+#: src/cfg_dirpane.c:1235
 msgid "pixels"
-msgstr "ÔÏÞËÉ"
+msgstr "ÑÐ¾ÑÐºÐ¸"
 
-#: src/cfg_dirpane.c:1340
+#: src/cfg_dirpane.c:1263
 msgid "Remember Selected Rows?"
-msgstr "úÁÐÏÍÉÎÁÔØ ×ÙÂÒÁÎÙÅ ÜÌÅÍÅÎÔÙ?"
+msgstr "ÐÐ°Ð¿Ð¾Ð¼Ð¸Ð½Ð°ÑÑ Ð²ÑÐ±ÑÐ°Ð½ÑÐµ ÑÐ»ÐµÐ¼ÐµÐ½ÑÑ?"
 
-#: src/cfg_dirpane.c:1343
+#: src/cfg_dirpane.c:1266
 msgid "Save History Lists?"
-msgstr "óÏÈÒÁÎÑÔØ ÉÓÔÏÒÉÀ?"
+msgstr "Ð¡Ð¾ÑÑÐ°Ð½ÑÑÑ Ð¸ÑÑÐ¾ÑÐ¸Ñ?"
 
-#: src/cfg_dirpane.c:1360 src/cfg_dirpane.c:1370
+#: src/cfg_dirpane.c:1283 src/cfg_dirpane.c:1292
 msgid "Dir Panes"
-msgstr "ðÁÎÅÌÉ"
+msgstr "ÐÐ°Ð½ÐµÐ»Ð¸"
 
-#: src/cfg_dirpane.c:1374
+#: src/cfg_dirpane.c:1295
 msgid "Pane Split"
-msgstr "òÁÚÄÅÌÉÔÅÌØ"
+msgstr "Ð Ð°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ"
 
-#: src/cfg_dirpane.c:1375
+#: src/cfg_dirpane.c:1296
 msgid "History"
-msgstr "éÓÔÏÒÉÑ"
+msgstr "ÐÑÑÐ¾ÑÐ¸Ñ"
 
-#: src/cfg_errors.c:45
-msgid "Errors"
-msgstr "ïÛÉÂËÉ"
+#: src/cfg_dirpane.c:1725
+msgid "'Blocks' Content Deprecated"
+msgstr ""
 
-#: src/cfg_errors.c:52
-msgid "Use Dialog to Report Errors?"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÄÉÁÌÏÇ ÄÌÑ ÏÛÉÂÏË?"
+#: src/cfg_dirpane.c:1726
+msgid ""
+"The 'Blocks' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
 
-#: src/cfg_errors.c:56
-msgid "Cause Console Beep on Error?"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÓÉÇÎÁÌ ÄÉÎÁÍÉËÁ?"
+#: src/cfg_dirpane.c:1732
+msgid "'Block Size' Content Deprecated"
+msgstr ""
 
-#: src/cfg_menus.c:44
-msgid "Menus"
-msgstr "íÅÎÀ"
+#: src/cfg_dirpane.c:1733
+msgid ""
+"The 'Block Size' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
 
-#: src/cfg_mount.c:168
-msgid "Never"
-msgstr "îÉËÏÇÄÁ"
+#: src/cfg_errors.c:48
+msgid "Errors"
+msgstr "ÐÑÐ¸Ð±ÐºÐ¸"
 
-#: src/cfg_mount.c:168
-msgid "On Every Access"
-msgstr "ðÒÉ ËÁÖÄÏÍ ÏÂÒÁÝÅÎÉÉ"
+#: src/cfg_errors.c:55
+msgid "Error and Status Message Display"
+msgstr ""
 
-#: src/cfg_mount.c:177
-msgid "Mounting"
-msgstr "ðÏÄËÌÀÞÅÎÉÅ"
+#: src/cfg_errors.c:57
+msgid "Status Bar, Above Panes"
+msgstr ""
 
-#: src/cfg_mount.c:184
-msgid "Mount When?"
-msgstr "ëÏÇÄÁ ÐÏÄËÌÀÞÁÔØ?"
+#: src/cfg_errors.c:60
+msgid "Main Window's Title Bar"
+msgstr ""
 
-#: src/cfg_mount.c:196
-msgid "Mount Options"
-msgstr "îÁÓÔÒÏÊËÁ ÐÏÄËÌÀÞÅÎÉÑ ÄÉÓËÏ×"
+#: src/cfg_errors.c:63
+msgid "Separate Dialog"
+msgstr ""
 
-#: src/cfg_mount.c:199
-msgid "Mount Command"
-msgstr "ëÏÍÁÎÄÁ ÐÏÄËÌÀÞÅÎÉÑ"
+#: src/cfg_errors.c:69
+msgid "Cause Console Beep on Error?"
+msgstr "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐ¸Ð³Ð½Ð°Ð» Ð´Ð¸Ð½Ð°Ð¼Ð¸ÐºÐ°?"
 
-#: src/cfg_mount.c:204
-msgid "Unmount Command"
-msgstr "ëÏÍÁÎÄÁ ÏÔËÌÀÞÅÎÉÑ"
+#: src/cfg_menus.c:44
+msgid "Menus"
+msgstr "ÐÐµÐ½Ñ"
 
-#: src/cfg_mount.c:211
-msgid "Only Mount on Toplevel Directories?"
-msgstr "ðÏÄËÌÀÞÁÔØ ÔÏÌØËÏ × ËÏÒÎÅ×ÏÍ ËÁÔÁÌÏÇÅ?"
+#: src/cfg_nag.c:78
+#, c-format
+msgid ""
+"Click the button below to reset the %zu stored 'Don't show this dialog "
+"again' responses."
+msgstr ""
 
-#: src/cfg_mount.c:214
-msgid "Use Command Error Dialog?"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÄÉÁÌÏÇ ÄÌÑ ÏÛÉÂÏË"
+#: src/cfg_nag.c:100
+msgid "Nagging"
+msgstr ""
 
-#: src/cfg_mount.c:217
-msgid "Unmount When gentoo Quits?"
-msgstr "ïÔËÌÀÞÁÔØ ÐÒÉ ×ÙÈÏÄÅ?"
+#: src/cfg_nag.c:110
+#, fuzzy
+msgid "Reset All"
+msgstr "ÐÐµÑÐ½ÑÑÑ Ð½Ð°ÑÐ°Ð»ÑÐ½ÑÐµ"
 
-#: src/cfg_paths.c:128
-msgid "GTK+ RC"
-msgstr "GTK+ RC"
+#: src/cfg_paths.c:78
+msgid "Edit path"
+msgstr ""
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:152
 msgid "Icons"
-msgstr "úÎÁÞËÉ"
+msgstr "ÐÐ½Ð°ÑÐºÐ¸"
+
+#: src/cfg_paths.c:153
+msgid "GTK+ RC"
+msgstr "GTK+ RC"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:154
 msgid "fstab"
 msgstr "fstab"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:155
 msgid "mtab"
 msgstr "mtab"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Beginning With Dot (.)"
-msgstr "îÁÞÉÎÁÀÝÉÅÓÑ Ó ÔÏÞËÉ (.)"
+msgstr "ÐÐ°ÑÐ¸Ð½Ð°ÑÑÐ¸ÐµÑÑ Ñ ÑÐ¾ÑÐºÐ¸ (.)"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Matching RE"
-msgstr "õÄÏ×ÌÅÔ×ÏÒÑÀÝÉÅ ÕÓÌÏ×ÉÀ"
+msgstr "Ð£Ð´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÑÑÑÐ¸Ðµ ÑÑÐ»Ð¾Ð²Ð¸Ñ"
 
-#: src/cfg_paths.c:129 src/cmd_chmod.c:259 src/menus.c:512
+#: src/cfg_paths.c:157 src/cmd_chmod.c:252 src/menus.c:519
 msgid "None"
-msgstr "îÅÔ"
+msgstr "ÐÐµÑ"
 
-#: src/cfg_paths.c:135
+#: src/cfg_paths.c:163
 msgid "Paths & Hide"
-msgstr "ðÕÔÉ & óËÒÙÔÉÅ"
+msgstr "ÐÑÑÐ¸ & Ð¡ÐºÑÑÑÐ¸Ðµ"
 
-#: src/cfg_paths.c:142
+#: src/cfg_paths.c:170
 msgid "Paths"
-msgstr "ðÕÔÉ"
+msgstr "ÐÑÑÐ¸"
 
-#: src/cfg_paths.c:169
+#: src/cfg_paths.c:209
 msgid "Hide Entries"
-msgstr "óËÒÙÔÉÅ"
+msgstr "Ð¡ÐºÑÑÑÐ¸Ðµ"
 
-#: src/cfg_styles.c:170 src/cfg_types.c:234 src/iconutil.c:29 src/menus.c:19
+#: src/cfg_styles.c:178 src/cfg_types.c:233 src/iconutil.c:31 src/menus.c:19
 msgid "(None)"
-msgstr "(îÅÔ)"
+msgstr "(ÐÐµÑ)"
 
-#: src/cfg_styles.c:191 src/cfg_styles.c:428 src/cfg_styles.c:767
+#: src/cfg_styles.c:199 src/cfg_styles.c:436 src/cfg_styles.c:785
 msgid "Delete Action"
-msgstr "õÄÁÌÅÎÉÅ"
+msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_styles.c:411 src/color_dialog.c:48
+#: src/cfg_styles.c:419 src/color_dialog.c:47
 msgid "Edit Color"
-msgstr "éÚÍÅÎÉÔØ Ã×ÅÔ"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ²ÐµÑ"
 
-#: src/cfg_styles.c:428
+#: src/cfg_styles.c:436
 msgid "Revert to Inherited Command"
-msgstr "ïÓÔÁ×ÉÔØ ÔÏÌØËÏ ÎÁÓÌÅÄÕÅÍÙÅ"
+msgstr "ÐÑÑÐ°Ð²Ð¸ÑÑ ÑÐ¾Ð»ÑÐºÐ¾ Ð½Ð°ÑÐ»ÐµÐ´ÑÐµÐ¼ÑÐµ"
 
-#: src/cfg_styles.c:529
+#: src/cfg_styles.c:537
 #, fuzzy
 msgid "Select Command ..."
-msgstr "÷ÙÂÅÒÉÔÅ ËÏÍÁÎÄÕ"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ"
 
-#: src/cfg_styles.c:592
+#: src/cfg_styles.c:601
 msgid "New Action Property"
-msgstr "ó×ÏÊÓÔ×Á ÎÏ×ÏÇÏ ÓÏÂÙÔÉÑ"
+msgstr "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° Ð½Ð¾Ð²Ð¾Ð³Ð¾ ÑÐ¾Ð±ÑÑÐ¸Ñ"
 
-#: src/cfg_styles.c:600
+#: src/cfg_styles.c:609
 msgid "something"
-msgstr "ÎÅÞÔÏ"
+msgstr "Ð½ÐµÑÑÐ¾"
 
-#: src/cfg_styles.c:670
+#: src/cfg_styles.c:679
 msgid ""
 "Deleting this style will also delete\n"
 "all its children. Are you sure?"
 msgstr ""
-"õÄÁÌÅÎÉÅ ÜÔÏÇÏ ËÌÁÓÓÁ ÐÏ×ÌÅÞÅÔ ÔÁËÖÅ\n"
-"ÕÄÁÌÅÎÉÅ ×ÓÅÈ ÐÏÔÏÍËÏ×. õ×ÅÒÅÎÙ?"
+"Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ ÑÑÐ¾Ð³Ð¾ ÐºÐ»Ð°ÑÑÐ° Ð¿Ð¾Ð²Ð»ÐµÑÐµÑ ÑÐ°ÐºÐ¶Ðµ\n"
+"ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð²ÑÐµÑ Ð¿Ð¾ÑÐ¾Ð¼ÐºÐ¾Ð². Ð£Ð²ÐµÑÐµÐ½Ñ?"
 
-#: src/cfg_styles.c:671
+#: src/cfg_styles.c:680
 msgid "Confirm Delete"
-msgstr "ðÏÄÔ×ÅÒÄÉÔÅ ÕÄÁÌÅÎÉÅ"
+msgstr "ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Background Color"
-msgstr "ã×ÅÔ ÆÏÎÁ"
+msgstr "Ð¦Ð²ÐµÑ ÑÐ¾Ð½Ð°"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Foreground Color"
-msgstr "ã×ÅÔ"
+msgstr "Ð¦Ð²ÐµÑ"
 
-#: src/cfg_styles.c:694 src/dpformat.c:53
+#: src/cfg_styles.c:703 src/dpformat.c:55
 msgid "Icon"
-msgstr "úÎÁÞÏË"
+msgstr "ÐÐ½Ð°ÑÐ¾Ðº"
 
-#: src/cfg_styles.c:696
+#: src/cfg_styles.c:705
 msgid "(Row Style Preview Text)"
-msgstr "(ôÁË ÂÕÄÅÔ ×ÙÇÌÑÄÅÔØ)"
+msgstr "(Ð¢Ð°Ðº Ð±ÑÐ´ÐµÑ Ð²ÑÐ³Ð»ÑÐ´ÐµÑÑ)"
 
-#: src/cfg_styles.c:702 src/cmd_renameseq.c:386
+#: src/cfg_styles.c:713 src/cmd_renameseq.c:358 src/cmd_split.c:656
 msgid "Preview"
-msgstr "ðÒÅÄÐÒÏÓÍÏÔÒ"
+msgstr "ÐÑÐµÐ´Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑ"
 
-#: src/cfg_styles.c:719
+#: src/cfg_styles.c:737
 msgid "Override Parent's?"
-msgstr "ðÅÒÅÏÐÒÅÄÅÌÉÔØ?"
+msgstr "ÐÐµÑÐµÐ¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ?"
 
-#: src/cfg_styles.c:723
+#: src/cfg_styles.c:741
 msgid "Pick..."
-msgstr "÷ÙÂÅÒÉÔÅ..."
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ..."
 
-#: src/cfg_styles.c:764
+#: src/cfg_styles.c:782
 msgid "Add Action..."
-msgstr "äÏÂÁ×ÉÔØ ÄÅÊÓÔ×ÉÅ..."
+msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ..."
 
-#: src/cfg_styles.c:810 src/menus.c:525
+#: src/cfg_styles.c:829 src/menus.c:532
 msgid "Parent"
-msgstr "òÏÄÉÔÅÌØ"
+msgstr "Ð Ð¾Ð´Ð¸ÑÐµÐ»Ñ"
 
-#: src/cfg_styles.c:820
+#: src/cfg_styles.c:840
 msgid "Inherited Properties"
-msgstr "îÁÓÌÅÄÕÅÍÙÅ Ó×ÏÊÓÔ×Á"
+msgstr "ÐÐ°ÑÐ»ÐµÐ´ÑÐµÐ¼ÑÐµ ÑÐ²Ð¾Ð¹ÑÑÐ²Ð°"
 
-#: src/cfg_styles.c:824
+#: src/cfg_styles.c:844
 msgid "Visual"
-msgstr "ïÔÏÂÒÁÖÅÎÉÅ"
+msgstr "ÐÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_styles.c:826
+#: src/cfg_styles.c:846
 msgid "Actions"
-msgstr "äÅÊÓÔ×ÉÑ"
+msgstr "ÐÐµÐ¹ÑÑÐ²Ð¸Ñ"
 
-#: src/cfg_styles.c:843
+#: src/cfg_styles.c:863
 msgid "File Recognition"
-msgstr "ôÉÐÙ ÆÁÊÌÏ×"
+msgstr "Ð¢Ð¸Ð¿Ñ ÑÐ°Ð¹Ð»Ð¾Ð²"
 
-#: src/cfg_styles.c:844
+#: src/cfg_styles.c:864
 msgid "Styles"
-msgstr "ëÌÁÓÓÙ"
+msgstr "ÐÐ»Ð°ÑÑÑ"
 
-#: src/cfg_types.c:193
+#: src/cfg_types.c:192
 #, c-format
 msgid "%s - Click to Change..."
-msgstr "%s - ýÅÌËÎÉÔÅ ÄÌÑ ÓÍÅÎÙ..."
+msgstr "%s - Ð©ÐµÐ»ÐºÐ½Ð¸ÑÐµ Ð´Ð»Ñ ÑÐ¼ÐµÐ½Ñ..."
 
-#: src/cfg_types.c:508
+#: src/cfg_types.c:507
 msgid "(New Type)"
-msgstr "(îÏ×ÙÊ ÔÉÐ)"
+msgstr "(ÐÐ¾Ð²ÑÐ¹ ÑÐ¸Ð¿)"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "B-Dev"
-msgstr "B-õÓÔÒ"
+msgstr "B-Ð£ÑÑÑ"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "C-Dev"
-msgstr "C-õÓÔÒ"
+msgstr "C-Ð£ÑÑÑ"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Dir"
-msgstr "ëÁÔÁÌÏÇ"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "FIFO"
 msgstr "FIFO"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "File"
-msgstr "æÁÊÌ"
+msgstr "Ð¤Ð°Ð¹Ð»"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Link"
-msgstr "óÓÙÌËÁ"
+msgstr "Ð¡ÑÑÐ»ÐºÐ°"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Socket"
-msgstr "ðÏÒÔ"
+msgstr "ÐÐ¾ÑÑ"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "Readable"
-msgstr "þÔÅÎÉÅ"
+msgstr "Ð§ÑÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetGID"
-msgstr "ó GID"
+msgstr "Ð¡ GID"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetUID"
-msgstr "ó UID"
+msgstr "Ð¡ UID"
 
-#: src/cfg_types.c:648 src/cmd_chmod.c:209
+#: src/cfg_types.c:647 src/cmd_chmod.c:200
 msgid "Sticky"
-msgstr "æÉËÓÁÃÉÑ"
+msgstr "Ð¤Ð¸ÐºÑÐ°ÑÐ¸Ñ"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Executable"
-msgstr "÷ÙÐÏÌÎÅÎÉÅ"
+msgstr "ÐÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Writable"
-msgstr "úÁÐÉÓØ"
+msgstr "ÐÐ°Ð¿Ð¸ÑÑ"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match 'file' (RE)"
-msgstr "õÓÌÏ×ÉÅ ÎÁ ÆÁÊÌ"
+msgstr "Ð£ÑÐ»Ð¾Ð²Ð¸Ðµ Ð½Ð° ÑÐ°Ð¹Ð»"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match Name (RE)"
-msgstr "õÓÌÏ×ÉÅ ÎÁ ÉÍÑ"
+msgstr "Ð£ÑÐ»Ð¾Ð²Ð¸Ðµ Ð½Ð° Ð¸Ð¼Ñ"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Require Suffix"
-msgstr "ó ÒÁÓÛÉÒÅÎÉÅÍ"
+msgstr "Ð¡ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸ÐµÐ¼"
 
 #: src/cfg_types.c:687
 msgid "Identification"
-msgstr "òÁÓÐÏÚÎÁ×ÁÎÉÅ"
+msgstr "Ð Ð°ÑÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°Ð½Ð¸Ðµ"
 
 #: src/cfg_types.c:689
 msgid "Require Type"
-msgstr "ðÒÉÚÎÁËÉ"
+msgstr "ÐÑÐ¸Ð·Ð½Ð°ÐºÐ¸"
 
 #: src/cfg_types.c:703
 msgid "Require Protection"
-msgstr "áÔÒÉÂÕÔÙ"
+msgstr "ÐÑÑÐ¸Ð±ÑÑÑ"
 
-#: src/cfg_types.c:738
+#: src/cfg_types.c:739
 msgid "Glob?"
-msgstr "÷ÓÅ?"
+msgstr "ÐÑÐµ?"
 
-#: src/cfg_types.c:754
+#: src/cfg_types.c:755
 msgid "Type's Style"
-msgstr "ëÌÁÓÓ ÜÔÏÇÏ ÔÉÐÁ"
+msgstr "ÐÐ»Ð°ÑÑ ÑÑÐ¾Ð³Ð¾ ÑÐ¸Ð¿Ð°"
 
-#: src/cfg_types.c:756
+#: src/cfg_types.c:757
 msgid "Style"
-msgstr "ëÌÁÓÓ"
+msgstr "ÐÐ»Ð°ÑÑ"
 
-#: src/cfg_types.c:796
+#: src/cfg_types.c:797
 msgid "Types"
-msgstr "ôÉÐÙ"
+msgstr "Ð¢Ð¸Ð¿Ñ"
 
 #: src/cfg_windows.c:86
 msgid "Dialog Windows Center On Screen"
-msgstr "äÉÁÌÏÇÏ×ÙÅ ÏËÎÁ × ÃÅÎÔÒÅ ÜËÒÁÎÁ"
+msgstr "ÐÐ¸Ð°Ð»Ð¾Ð³Ð¾Ð²ÑÐµ Ð¾ÐºÐ½Ð° Ð² ÑÐµÐ½ÑÑÐµ ÑÐºÑÐ°Ð½Ð°"
 
 #: src/cfg_windows.c:86
 msgid "Dialog Windows Follow Mouse"
-msgstr "äÉÁÌÏÇÏ×ÙÅ ÏËÎÁ ÒÑÄÏÍ Ó ÍÙÛËÏÊ"
+msgstr "ÐÐ¸Ð°Ð»Ð¾Ð³Ð¾Ð²ÑÐµ Ð¾ÐºÐ½Ð° ÑÑÐ´Ð¾Ð¼ Ñ Ð¼ÑÑÐºÐ¾Ð¹"
 
 #: src/cfg_windows.c:86
 msgid "Dialog Windows Positioned by Window Manager"
-msgstr "äÉÁÌÏÇÏ×ÙÅ ÏËÎÁ ÒÁÓÓÔÁ×ÌÑÀÔÓÑ ÏËÏÎÎÙÍ ÍÅÎÅÄÖÅÒÏÍ"
+msgstr "ÐÐ¸Ð°Ð»Ð¾Ð³Ð¾Ð²ÑÐµ Ð¾ÐºÐ½Ð° ÑÐ°ÑÑÑÐ°Ð²Ð»ÑÑÑÑÑ Ð¾ÐºÐ¾Ð½Ð½ÑÐ¼ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑÐ¾Ð¼"
 
 #: src/cfg_windows.c:94
 msgid "Windows"
-msgstr "ïËÎÁ"
+msgstr "ÐÐºÐ½Ð°"
 
 #: src/cfg_windows.c:102
 #, fuzzy
 msgid "Window Borders"
-msgstr "ïËÎÁ"
+msgstr "ÐÐºÐ½Ð°"
 
 #: src/cfg_windows.c:118
 msgid "Dialog Positioning"
-msgstr "òÁÓÐÏÌÏÖÅÎÉÅ ÄÉÁÌÏÇÏ×ÙÈ ÏËÏÎ"
+msgstr "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð´Ð¸Ð°Ð»Ð¾Ð³Ð¾Ð²ÑÑ Ð¾ÐºÐ¾Ð½"
 
-#: src/children.c:94
+#: src/children.c:88
 #, c-format
 msgid "Execution of \"%s\" Failed"
-msgstr "÷ÙÐÏÌÎÅÎÉÅ \"%s\" ÓÏÒ×ÁÎÏ"
+msgstr "ÐÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ \"%s\" ÑÐ¾ÑÐ²Ð°Ð½Ð¾"
 
-#: src/children.c:95 src/dialog.c:285
+#: src/children.c:89 src/dialog.c:290
 msgid "Error"
-msgstr "ïÛÉÂËÁ"
+msgstr "ÐÑÐ¸Ð±ÐºÐ°"
 
-#: src/children.c:274
+#: src/children.c:227
 #, c-format
 msgid "Couldn't terminate child \"%s\" (pid=%d)--zombie alert"
-msgstr "îÅ ÍÏÇÕ ×ÙÇÒÕÚÉÔØ ÐÒÏÃÅÓÓ \"%s\" (pid=%d) -- ÚÏÍÂÉ"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð²ÑÐ³ÑÑÐ·Ð¸ÑÑ Ð¿ÑÐ¾ÑÐµÑÑ \"%s\" (pid=%d) -- Ð·Ð¾Ð¼Ð±Ð¸"
 
 #: src/cmd_about.c:54
 #, c-format
@@ -1179,11 +1184,11 @@
 #: src/cmd_about.c:85
 #, c-format
 msgid "Version %s (GTK+ version %d.%d.%d)."
-msgstr "÷ÅÒÓÉÑ %s (GTK+ ×ÅÒÓÉÑ %d.%d.%d)."
+msgstr "ÐÐµÑÑÐ¸Ñ %s (GTK+ Ð²ÐµÑÑÐ¸Ñ %d.%d.%d)."
 
 #: src/cmd_about.c:97
 #, fuzzy
-msgid "(c) 1998-2009 by Emil Brink, Obsession Development.\n"
+msgid "(c) 1998-2011 by Emil Brink, Obsession Development.\n"
 msgstr "(c) 1998-2008 - Emil Brink, Obsession Development.\n"
 
 #: src/cmd_about.c:99
@@ -1191,241 +1196,222 @@
 "This is free software, and there is ABSOLUTELY NO\n"
 "WARRANTY. Read the file COPYING for more details.\n"
 msgstr ""
-"üÔÏ ÏÔËÒÙÔÏÅ ðï É ÏÎÏ ÎÅ ÄÁÅÔ áâóïìàôîï îéëáëéè \n"
-"çáòáîôéê. ðÏÄÒÏÂÎÏÓÔÉ ÐÒÏÞÔÉÔÅ × ÆÁÊÌÅ COPYING.\n"
+"ÐÑÐ¾ Ð¾ÑÐºÑÑÑÐ¾Ðµ ÐÐ Ð¸ Ð¾Ð½Ð¾ Ð½Ðµ Ð´Ð°ÐµÑ ÐÐÐ¡ÐÐÐ®Ð¢ÐÐ ÐÐÐÐÐÐÐ¥ \n"
+"ÐÐÐ ÐÐÐ¢ÐÐ. ÐÐ¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸ Ð¿ÑÐ¾ÑÑÐ¸ÑÐµ Ð² ÑÐ°Ð¹Ð»Ðµ COPYING.\n"
 
-#: src/cmd_about.c:106
-msgid "FAM: Supported and active."
-msgstr "FAM: ðÏÄÄÅÒÖÉ×ÁÅÔÓÑ É ×ËÌÀÞÅÎÏ"
-
-#: src/cmd_about.c:108
-msgid "FAM: Supported, but not active."
-msgstr "FAM: ðÏÄÄÅÒÖÉ×ÁÅÔÓÑ, ÎÏ ÎÅ ×ËÌÀÞÅÎÏ."
-
-#: src/cmd_about.c:110
-msgid "FAM: Not supported."
-msgstr "FAM: îÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ."
-
-#: src/cmd_about.c:116
+#: src/cmd_about.c:105
 msgid "NLS: Supported, using built-in English strings."
-msgstr "NLS: ðÏÄÄÅÒÖÉ×ÁÅÔÓÑ, Ó ÐÏÍÏÝØÀ ×ÓÔÒÏÅÎÎÙÈ ÁÎÇÌÉÊÓËÉÈ ÓÔÒÏË."
+msgstr "NLS: ÐÐ¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ, Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ Ð²ÑÑÑÐ¾ÐµÐ½Ð½ÑÑ Ð°Ð½Ð³Ð»Ð¸Ð¹ÑÐºÐ¸Ñ ÑÑÑÐ¾Ðº."
 
-#: src/cmd_about.c:129
-#, fuzzy
+#: src/cmd_about.c:118
+#, fuzzy, c-format
 msgid ""
 "The author of gentoo can be reached via Internet\n"
-"e-mail at <emil@obsession.se>; feel free to let\n"
+"e-mail at <a href=\"mailto:%s\">%s</a>; feel free to let\n"
 "me know what you think of this software, give\n"
 "suggestions/bug reports, and so on.\n"
 "\n"
 "The latest release of gentoo can always be down-\n"
 "loaded from the official gentoo project homepage at\n"
-"<http://www.obsession.se/gentoo/>. New releases are\n"
+"<a href=\"%s\">%s</a>. New releases are\n"
 "typically announced on the Freshmeat service at\n"
-"<http://freshmeat.net/>."
-msgstr ""
-"á×ÔÏÒ ÜÔÏÊ ÐÒÏÇÒÁÍÍÙ ÄÏÓÔÕÐÅÎ ÞÅÒÅÚ ÜÌÅËÔÒÏÎÎÕÀ\n"
-"ÐÏÞÔÕ ÐÏ ÁÄÒÅÓÕ: <emil@obsession.se>; ÎÁÐÉÛÉÔÅ ÅÍÕ\n"
-"ÞÔÏ ×Ù ÄÕÍÁÅÔÅ ÏÂ ÜÔÏÊ ÐÒÏÇÒÁÍÍÅ, ÓÏÏÂÝÁÊÔÅ Ï \n"
-"ÎÁÊÄÅÎÎÙÊ ÏÝÉÂËÁÈ É ÐÏÖÅÌÁÎÉÑÈ.\n"
-"îÁÓÔÒÏÊËÉ ÐÏ ÕÍÏÌÞÁÎÉÀ - J. Hanson <johan@tiq.com>.\n"
-"ðÏÓÌÅÄÎÑÑ ×ÅÒÓÉÑ ÐÒÏÇÒÁÍÍÙ ÍÏÖÅÔ ÂÙÔØ ÚÁÇÒÕÖÅÎÁ\n"
-"Ó ÏÆÉÃÉÁÌØÎÏÊ ÓÔÒÁÎÉÃÙ <http://www.obsession.se/gentoo/>.\n"
-"îÏ×ÙÅ ×ÅÒÓÉÉ ÏÂÙÞÎÏ ÓÎÁÞÁÌÁ ×ÙËÌÁÄÙ×ÁÀÔÓÑ \n"
-"× \"ó×ÅÖÅÍ ÍÑÓÅ\" - <http://freshmeat.net/>.\n"
-"ï ÎÅÔÏÞÎÏÓÔÑÈ ÐÅÒÅ×ÏÄÁ ÐÉÛÉÔÅ í.úÁÒÉÐÏ×Õ <m3for@mail.ru>"
-
-#: src/cmd_about.c:142
+"<a href=\"http://freshmeat.net/\">freshmeat.net</a>."
+msgstr ""
+"ÐÐ²ÑÐ¾Ñ ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð´Ð¾ÑÑÑÐ¿ÐµÐ½ ÑÐµÑÐµÐ· ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÑ\n"
+"Ð¿Ð¾ÑÑÑ Ð¿Ð¾ Ð°Ð´ÑÐµÑÑ: <emil@obsession.se>; Ð½Ð°Ð¿Ð¸ÑÐ¸ÑÐµ ÐµÐ¼Ñ\n"
+"ÑÑÐ¾ Ð²Ñ Ð´ÑÐ¼Ð°ÐµÑÐµ Ð¾Ð± ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ, ÑÐ¾Ð¾Ð±ÑÐ°Ð¹ÑÐµ Ð¾ \n"
+"Ð½Ð°Ð¹Ð´ÐµÐ½Ð½ÑÐ¹ Ð¾ÑÐ¸Ð±ÐºÐ°Ñ Ð¸ Ð¿Ð¾Ð¶ÐµÐ»Ð°Ð½Ð¸ÑÑ.\n"
+"ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ - J. Hanson <johan@tiq.com>.\n"
+"ÐÐ¾ÑÐ»ÐµÐ´Ð½ÑÑ Ð²ÐµÑÑÐ¸Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ð°\n"
+"Ñ Ð¾ÑÐ¸ÑÐ¸Ð°Ð»ÑÐ½Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ <http://www.obsession.se/gentoo/>.\n"
+"ÐÐ¾Ð²ÑÐµ Ð²ÐµÑÑÐ¸Ð¸ Ð¾Ð±ÑÑÐ½Ð¾ ÑÐ½Ð°ÑÐ°Ð»Ð° Ð²ÑÐºÐ»Ð°Ð´ÑÐ²Ð°ÑÑÑÑ \n"
+"Ð² \"Ð¡Ð²ÐµÐ¶ÐµÐ¼ Ð¼ÑÑÐµ\" - <http://freshmeat.net/>.\n"
+"Ð Ð½ÐµÑÐ¾ÑÐ½Ð¾ÑÑÑÑ Ð¿ÐµÑÐµÐ²Ð¾Ð´Ð° Ð¿Ð¸ÑÐ¸ÑÐµ Ð.ÐÐ°ÑÐ¸Ð¿Ð¾Ð²Ñ <m3for@mail.ru>"
+
+#: src/cmd_about.c:135
 msgid "About gentoo"
-msgstr "ï ÐÒÏÇÒÁÍÍÅ"
+msgstr "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ"
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "_OK (Wait for More)"
-msgstr "_äá (ðÏÄÏÖÄÉÔÅ ÐÒÏÄÏÌÖÅÎÉÑ)"
+msgstr "_ÐÐ (ÐÐ¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ)"
 
 #: src/cmd_chmod.c:98
 #, c-format
 msgid "Set protection bits for \"%s\":"
-msgstr "õÓÔÁÎÏ×ÉÔØ ÐÒÁ×Á ÄÌÑ \"%s\":"
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¿ÑÐ°Ð²Ð° Ð´Ð»Ñ \"%s\":"
 
-#: src/cmd_chmod.c:208 src/cmd_chown.c:184 src/cmd_info.c:202
+#: src/cmd_chmod.c:199 src/cmd_chown.c:176 src/cmd_info.c:274
 msgid "Group"
-msgstr "çÒÕÐÐÁ"
+msgstr "ÐÑÑÐ¿Ð¿Ð°"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Others"
-msgstr "äÒÕÇÉÅ"
+msgstr "ÐÑÑÐ³Ð¸Ðµ"
 
-#: src/cmd_chmod.c:208 src/cmd_info.c:195
+#: src/cmd_chmod.c:199 src/cmd_info.c:267
 msgid "Owner"
-msgstr "÷ÌÁÄÅÌÅÃ"
+msgstr "ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Special"
-msgstr "óÐÅÃÉÁÌØÎÙÅ"
+msgstr "Ð¡Ð¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÐµ"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Execute"
-msgstr "úÁÐÕÓË"
+msgstr "ÐÐ°Ð¿ÑÑÐº"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Read"
-msgstr "þÔÅÎÉÅ"
+msgstr "Ð§ÑÐµÐ½Ð¸Ðµ"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set GID"
-msgstr "éÓÐ. GID"
+msgstr "ÐÑÐ¿. GID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set UID"
-msgstr "éÓÐ. UID"
+msgstr "ÐÑÐ¿. UID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Write"
-msgstr "úÁÐÉÓØ"
+msgstr "ÐÐ°Ð¿Ð¸ÑÑ"
 
-#: src/cmd_chmod.c:231
+#: src/cmd_chmod.c:222
 msgid "Protection Bits"
-msgstr "âÉÔÙ ÐÒÁ×"
+msgstr "ÐÐ¸ÑÑ Ð¿ÑÐ°Ð²"
 
-#: src/cmd_chmod.c:242
+#: src/cmd_chmod.c:233
 msgid "Textual"
 msgstr ""
 
-#: src/cmd_chmod.c:253
+#: src/cmd_chmod.c:246
 #, fuzzy
 msgid "Octal"
-msgstr "8, ÷ÏÓØÍÅÒÉÞÎÁÑ"
+msgstr "8, ÐÐ¾ÑÑÐ¼ÐµÑÐ¸ÑÐ½Ð°Ñ"
 
-#: src/cmd_chmod.c:258 src/menus.c:511
+#: src/cmd_chmod.c:251 src/menus.c:518
 msgid "All"
-msgstr "÷ÓÅ"
+msgstr "ÐÑÐµ"
+
+#: src/cmd_chmod.c:253 src/menus.c:520
+msgid "Toggle"
+msgstr "ÐÐµÑÐµÐºÐ»ÑÑÐ¸ÑÑ"
 
-#: src/cmd_chmod.c:261
+#: src/cmd_chmod.c:254
 msgid "Revert"
-msgstr "óÂÒÏÓÉÔØ"
+msgstr "Ð¡Ð±ÑÐ¾ÑÐ¸ÑÑ"
 
-#: src/cmd_chmod.c:273 src/cmd_chown.c:208 src/cmd_info.c:304
+#: src/cmd_chmod.c:266 src/cmd_chown.c:201 src/cmd_info.c:372
 msgid "Recurse Directories?"
-msgstr "äÌÑ ÓÏÄÅÒÖÉÍÏÇÏ ÔÏÖÅ?"
+msgstr "ÐÐ»Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ ÑÐ¾Ð¶Ðµ?"
 
-#: src/cmd_chmod.c:276
+#: src/cmd_chmod.c:269
 msgid "Don't Touch Directories?"
-msgstr "ëÒÏÍÅ ËÁÔÁÌÏÇÏ×?"
+msgstr "ÐÑÐ¾Ð¼Ðµ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð²?"
 
-#: src/cmd_chmod.c:281
+#: src/cmd_chmod.c:274
 msgid "Change Mode"
-msgstr "óÍÅÎÁ ÒÅÖÉÍÁ"
+msgstr "Ð¡Ð¼ÐµÐ½Ð° ÑÐµÐ¶Ð¸Ð¼Ð°"
 
-#: src/cmd_chown.c:56
+#: src/cmd_chown.c:57
 #, c-format
 msgid "Set Ownership for '%s':"
-msgstr "õÓÔÁÎÏ×ËÁ ×ÌÁÄÅÌØÃÁ ÄÌÑ '%s':"
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð²Ð»Ð°Ð´ÐµÐ»ÑÑÐ° Ð´Ð»Ñ '%s':"
 
-#: src/cmd_chown.c:184
+#: src/cmd_chown.c:176
 msgid "User"
-msgstr "ðÏÌØÚÏ×ÁÔÅÌØ"
+msgstr "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
 
-#: src/cmd_chown.c:213
+#: src/cmd_chown.c:206
 msgid "Change Ownership"
-msgstr "óÍÅÎÁ ×ÌÁÄÅÌØÃÁ"
+msgstr "Ð¡Ð¼ÐµÐ½Ð° Ð²Ð»Ð°Ð´ÐµÐ»ÑÑÐ°"
 
 #: src/cmd_configure.c:50
 msgid "Automatically Save Changed Configuration on Exit?"
-msgstr "á×ÔÏÍÁÔÉÞÅÓËÉ ÓÏÈÒÁÎÑÔØ ÎÁÓÔÒÏÊËÉ ÐÒÉ ×ÙÈÏÄÅ?"
+msgstr "ÐÐ²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸ ÑÐ¾ÑÑÐ°Ð½ÑÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿ÑÐ¸ Ð²ÑÑÐ¾Ð´Ðµ?"
 
-#: src/cmd_copy.c:302
-#, c-format
-msgid ""
-"Can't copy directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"îÅ ÍÏÇÕ ËÏÐÉÒÏ×ÁÔØ \"%s\"\n"
-"× \"%s\"\n"
-"(ËÏÐÉÒÏ×ÁÎÉÅ ÓÁÍÏÇÏ × ÓÅÂÑ)."
-
-#: src/cmd_copy.c:392 src/cmd_copyas.c:62
+#: src/cmd_copy.c:175 src/cmd_copyas.c:62
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Copy?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ðÒÏÄÏÌÖÉÔØ ËÏÐÉÒÏ×ÁÎÉÅ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ?"
 
-#: src/cmd_copy.c:393
+#: src/cmd_copy.c:176
 msgid "Copying..."
-msgstr "ëÏÐÉÒÏ×ÁÎÉÅ..."
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ..."
 
-#: src/cmd_copy.c:440
+#: src/cmd_copy.c:217
 msgid "Preserve Dates During Copy?"
-msgstr "óÏÈÒÁÎÑÔØ ÄÁÔÙ ÐÒÉ ËÏÐÉÒÏ×ÁÎÉÉ?"
+msgstr "Ð¡Ð¾ÑÑÐ°Ð½ÑÑÑ Ð´Ð°ÑÑ Ð¿ÑÐ¸ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ð¸?"
 
-#: src/cmd_copy.c:441
+#: src/cmd_copy.c:218
 msgid "Ignore Failure to Copy Attributes (Date, Owner, Mode)?"
 msgstr ""
-"éÇÎÏÒÉÒÏ×ÁÔØ ÎÅ×ÏÚÍÏÖÎÏÓÔØ ËÏÐÉÒÏ×ÁÎÉÑ ÁÔÒÉÂÕÔÏ× (äÁÔÁ, ðÒÁ×Á, ÷ÌÁÄÅÌÅÃ)?"
+"ÐÐ³Ð½Ð¾ÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð°ÑÑÐ¸Ð±ÑÑÐ¾Ð² (ÐÐ°ÑÐ°, ÐÑÐ°Ð²Ð°, ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ)?"
 
-#: src/cmd_copy.c:442
+#: src/cmd_copy.c:219
 msgid "Leave Failed Destination if Full Size?"
-msgstr "ïÓÔÁ×ÌÑÔØ ÎÅÚÁ×ÅÒÛÅÎÎÙÅ ÆÁÊÌÙ ÅÓÌÉ ÎÅÔ ÍÅÓÔÁ?"
+msgstr "ÐÑÑÐ°Ð²Ð»ÑÑÑ Ð½ÐµÐ·Ð°Ð²ÐµÑÑÐµÐ½Ð½ÑÐµ ÑÐ°Ð¹Ð»Ñ ÐµÑÐ»Ð¸ Ð½ÐµÑ Ð¼ÐµÑÑÐ°?"
 
-#: src/cmd_copy.c:443 src/cmd_viewtext.c:207
+#: src/cmd_copy.c:220 src/cmd_viewtext.c:204
 msgid "Buffer Size"
-msgstr "òÁÚÍÅÒ ÂÕÆÅÒÁ"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ Ð±ÑÑÐµÑÐ°"
 
-#: src/cmd_copyas.c:51
+#: src/cmd_copyas.c:49
 #, c-format
 msgid "Enter Name for Copy of \"%s\""
-msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÄÌÑ ËÏÐÉÒÏ×ÁÎÉÑ \"%s\""
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ Ð´Ð»Ñ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ \"%s\""
 
-#: src/cmd_copyas.c:53
+#: src/cmd_copyas.c:51
 #, c-format
 msgid "Enter Name for Clone of \"%s\""
-msgstr "÷×ÅÄÉÔÅ ÉÍÑ ËÌÏÎÁ \"%s\""
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ ÐºÐ»Ð¾Ð½Ð° \"%s\""
 
 #: src/cmd_copyas.c:64
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Clone?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ÐÒÏÄÏÌÖÉÔØ ËÌÏÎÉÒÏ×ÁÎÉÅ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÐºÐ»Ð¾Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ?"
 
 #: src/cmd_copyas.c:65
 msgid "Cloning..."
-msgstr "ëÌÏÎÉÒÕÀ..."
+msgstr "ÐÐ»Ð¾Ð½Ð¸ÑÑÑ..."
 
 #: src/cmd_copyas.c:65
 msgid "Copying As..."
-msgstr "ëÏÐÉÒÏ×ÁÔØ ËÁË..."
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ°Ðº..."
 
 #: src/cmd_copyas.c:79
 #, c-format
 msgid "Enter Name to Link \"%s\" As"
-msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÄÌÑ ÓÓÙÌËÉ \"%s\" "
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ Ð´Ð»Ñ ÑÑÑÐ»ÐºÐ¸ \"%s\" "
 
 #: src/cmd_copyas.c:81
 #, c-format
 msgid "Enter Name for Link Clone of \"%s\""
-msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÄÌÑ ËÌÏÎÁ ÓÓÙÌËÉ \"%s\""
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ Ð´Ð»Ñ ÐºÐ»Ð¾Ð½Ð° ÑÑÑÐ»ÐºÐ¸ \"%s\""
 
-#: src/cmd_copyas.c:89
+#: src/cmd_copyas.c:91
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Symlink?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ðÒÏÄÏÌÖÉÔØ ÓÏÚÄÁÎÉÅ ÓÓÙÌËÉ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÑÑÐ»ÐºÐ¸?"
 
-#: src/cmd_copyas.c:204 src/cmd_copyas.c:210
+#: src/cmd_copyas.c:200 src/cmd_copyas.c:207
 msgid "Copy As"
-msgstr "ëÏÐÉÒÏ×ÁÔØ ËÁË"
+msgstr "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ°Ðº"
 
-#: src/cmd_copyas.c:212
+#: src/cmd_copyas.c:209
 msgid "Clone"
-msgstr "ëÌÏÎÉÒÏ×ÁÔØ"
+msgstr "ÐÐ»Ð¾Ð½Ð¸ÑÐ¾Ð²Ð°ÑÑ"
 
-#: src/cmd_copyas.c:214
+#: src/cmd_copyas.c:211
 msgid "Symbolic Link As"
-msgstr "óÓÙÌËÁ Ó ÉÍÅÎÅÍ"
+msgstr "Ð¡ÑÑÐ»ÐºÐ° Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼"
 
-#: src/cmd_copyas.c:216
+#: src/cmd_copyas.c:213
 msgid "Symbolic Link Clone"
-msgstr "ëÌÏÎÉÒÏ×ÁÎÉÅ ÓÓÙÌËÉ"
+msgstr "ÐÐ»Ð¾Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÑÑÐ»ÐºÐ¸"
 
-#: src/cmd_delete.c:55
+#: src/cmd_delete.c:56
 #, c-format
 msgid ""
 "%s\n"
@@ -1433,309 +1419,318 @@
 "Attempt to change protection and retry?"
 msgstr ""
 "%s\n"
-"ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÄÁÌÅÎ ÉÚ-ÚÁ ÏÇÒÁÎÉÞÅÎÉÑ ÄÏÓÔÕÐÁ.\n"
-"ðÏÐÒÏÂÏ×ÁÔØ ÓÎÑÔØ ÚÁÝÉÔÕ É ÐÒÏÄÏÌÖÉÔØ?"
+"Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÐ´Ð°Ð»ÐµÐ½ Ð¸Ð·-Ð·Ð° Ð¾Ð³ÑÐ°Ð½Ð¸ÑÐµÐ½Ð¸Ñ Ð´Ð¾ÑÑÑÐ¿Ð°.\n"
+"ÐÐ¾Ð¿ÑÐ¾Ð±Ð¾Ð²Ð°ÑÑ ÑÐ½ÑÑÑ Ð·Ð°ÑÐ¸ÑÑ Ð¸ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?"
 
-#: src/cmd_delete.c:58
+#: src/cmd_delete.c:59
 msgid "Remember the answer (alters config)"
-msgstr "úÁÐÏÍÎÉÔØ ÏÔ×ÅÔ (ÍÅÎÑÅÔ ÎÁÓÔÒÏÊËÕ)"
+msgstr "ÐÐ°Ð¿Ð¾Ð¼Ð½Ð¸ÑÑ Ð¾ÑÐ²ÐµÑ (Ð¼ÐµÐ½ÑÐµÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÑ)"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Access Problem"
-msgstr "ðÒÏÂÌÅÍÁ ÄÏÓÔÕÐÁ"
+msgstr "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ð´Ð¾ÑÑÑÐ¿Ð°"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Change|Leave Alone"
-msgstr "óÍÅÎÉÔØ|ïÓÔÁ×ÉÔØ"
+msgstr "Ð¡Ð¼ÐµÐ½Ð¸ÑÑ|ÐÑÑÐ°Ð²Ð¸ÑÑ"
 
-#: src/cmd_delete.c:236
+#: src/cmd_delete.c:215
 #, c-format
 msgid "Really Delete \"%s\"?"
-msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÕÄÁÌÉÔØ \"%s\" ?"
+msgstr "ÐÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ´Ð°Ð»Ð¸ÑÑ \"%s\" ?"
 
-#: src/cmd_delete.c:237
+#: src/cmd_delete.c:216
 msgid "Deleting..."
-msgstr "õÄÁÌÅÎÉÅ..."
+msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ..."
 
-#: src/cmd_delete.c:292
+#: src/cmd_delete.c:279
 msgid "On Access Failure"
-msgstr "÷ ÓÌÕÞÁÅ ÎÅÈ×ÁÔËÉ ÐÒÁ×"
+msgstr "Ð ÑÐ»ÑÑÐ°Ðµ Ð½ÐµÑÐ²Ð°ÑÐºÐ¸ Ð¿ÑÐ°Ð²"
 
-#: src/cmd_delete.c:293
+#: src/cmd_delete.c:280
 msgid "Ask User|Automatically Try Changing, and Retry|Fail"
-msgstr "óÐÒÏÓÉÔØ|ðÏÐÙÔÁÔØÓÑ ÓÍÅÎÉÔØ É ÐÒÏÄÏÌÖÉÔØ|ðÒÅÒ×ÁÔØ"
+msgstr "Ð¡Ð¿ÑÐ¾ÑÐ¸ÑÑ|ÐÐ¾Ð¿ÑÑÐ°ÑÑÑÑ ÑÐ¼ÐµÐ½Ð¸ÑÑ Ð¸ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ|ÐÑÐµÑÐ²Ð°ÑÑ"
 
-#: src/cmd_dpfocus.c:183
-msgid "Wrap Around At Top And Bottom?"
-msgstr "ðÅÒÅÓËÁËÉ×ÁÔØ × ÄÒÕÇÏÊ ËÏÎÅÃ ÓÐÉÓËÁ?"
+#: src/cmd_dpfocus.c:33
+msgid "DpFocus Command is Deprecated"
+msgstr ""
+
+#: src/cmd_dpfocus.c:34
+msgid ""
+"The <tt>DpFocus</tt> command has been deprecated and is no longer supported. "
+"Please remove any keyboard or mouse bindings that use it and look into using "
+"the default GTK+ list view's cursor controls."
+msgstr ""
 
-#: src/cmd_dpfocus.c:184
+#: src/cmd_dpfocus.c:64
 msgid "Treat Focused Row As Selection If No \"Real\" Selection Exists?"
-msgstr "ïÂÒÁÂÁÔÙ×ÁÔØ ËÕÒÓÏÒ ËÁË ×ÙÄÅÌÅÎÉÅ, ÅÓÌÉ ÎÅÔ \"îÁÓÔÏÑÝÅÇÏ\" ×ÙÄÅÌÅÎÉÑ"
+msgstr "ÐÐ±ÑÐ°Ð±Ð°ÑÑÐ²Ð°ÑÑ ÐºÑÑÑÐ¾Ñ ÐºÐ°Ðº Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ, ÐµÑÐ»Ð¸ Ð½ÐµÑ \"ÐÐ°ÑÑÐ¾ÑÑÐµÐ³Ð¾\" Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ñ"
 
-#: src/cmd_dpfocus.c:186
+#: src/cmd_dpfocus.c:66
 msgid "Move Focus to Last Selected/Deselected Row?"
-msgstr "óÔÁ×ÉÔØ ËÕÒÓÏÒ ÎÁ ÐÏÓÌÅÄÎÉÊ ×ÙÂÒÁÎÎÙÊ ÜÌÅÍÅÎÔ?"
+msgstr "Ð¡ÑÐ°Ð²Ð¸ÑÑ ÐºÑÑÑÐ¾Ñ Ð½Ð° Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐ¹ ÑÐ»ÐµÐ¼ÐµÐ½Ñ?"
 
-#: src/cmd_dpfocusisrch.c:220
+#: src/cmd_dpfocusisrch.c:163
 msgid "ISearch"
-msgstr "ðÏÉÓË"
+msgstr "ÐÐ¾Ð¸ÑÐº"
 
-#: src/cmd_generic.c:136
+#: src/cmd_generic.c:143
 msgid "_OK|A_ll|_Skip|_Cancel"
-msgstr "äá|÷ÓÅ|îÅÔ|ïÔÍÅÎÁ"
+msgstr "ÐÐ|ÐÑÐµ|ÐÐµÑ|ÐÑÐ¼ÐµÐ½Ð°"
 
-#: src/cmd_generic.c:137
+#: src/cmd_generic.c:144
 msgid "_OK|_Skip|_Cancel"
-msgstr "_äá|_îÅÔ|_ïÔÍÅÎÁ"
+msgstr "_ÐÐ|_ÐÐµÑ|_ÐÑÐ¼ÐµÐ½Ð°"
 
-#: src/cmd_getsize.c:49
+#: src/cmd_getsize.c:51
 msgid "Getting sizes..."
-msgstr "óÞÉÔÁÀ ÒÁÚÍÅÒ..."
+msgstr "Ð¡ÑÐ¸ÑÐ°Ñ ÑÐ°Ð·Ð¼ÐµÑ..."
 
-#: src/cmd_getsize.c:141
+#: src/cmd_getsize.c:134
 msgid "Unselect Rows When Done?"
-msgstr "óÎÑÔØ ×ÙÄÅÌÅÎÉÅ ÐÏÓÌÅ ×ÙÐÏÌÎÅÎÉÑ?"
+msgstr "Ð¡Ð½ÑÑÑ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð¿Ð¾ÑÐ»Ðµ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ?"
 
-#: src/cmd_info.c:71 src/cmd_info.c:163
-#, c-format
+#: src/cmd_info.c:68 src/errors.c:84
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr ", %s Ð·Ð°Ð½ÑÑÐ¾"
+
+#: src/cmd_info.c:72
+#, fuzzy, c-format
 msgid ""
-"%s (%s bytes,\n"
-"%s blocks)"
-msgstr ""
-"%s (%s ÂÁÊÔ),\n"
-"%s ÂÌÏËÏ×)"
+"%u dirs, %u files,\n"
+"%u symlinks, %u special files"
+msgstr "%u ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð², %u ÑÐ°Ð¹Ð»Ð¾Ð², %u ÑÑÑÐ»Ð¾Ðº"
 
-#: src/cmd_info.c:75
-#, c-format
-msgid "%u dirs, %u files, %u symlinks"
-msgstr "%u ËÁÔÁÌÏÇÏ×, %u ÆÁÊÌÏ×, %u ÓÓÙÌÏË"
+#: src/cmd_info.c:153
+msgid "Value"
+msgstr ""
 
-#: src/cmd_info.c:134
+#: src/cmd_info.c:198
 msgid "Link To"
-msgstr "óÓÙÌËÁ ÎÁ"
+msgstr "Ð¡ÑÑÐ»ÐºÐ° Ð½Ð°"
 
-#: src/cmd_info.c:145 src/cmd_select.c:399 src/dpformat.c:52
+#: src/cmd_info.c:213 src/cmd_select.c:368 src/dpformat.c:54
 msgid "Type"
-msgstr "ôÉÐ"
+msgstr "Ð¢Ð¸Ð¿"
 
-#: src/cmd_info.c:148
+#: src/cmd_info.c:216
 msgid "Location"
-msgstr "òÁÓÐÏÌÏÖÅÎÉÅ"
+msgstr "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: src/cmd_info.c:151 src/dpformat.c:36 src/window.c:200
+#: src/cmd_info.c:219 src/cmd_split.c:653 src/dpformat.c:37 src/window.c:199
 msgid "Size"
-msgstr "òÁÚÍÅÒ"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ"
 
-#: src/cmd_info.c:172
+#: src/cmd_info.c:229
+#, fuzzy, c-format
+msgid "%s (%s bytes)"
+msgstr "%Lu Ð±Ð°Ð¹Ñ"
+
+#: src/cmd_info.c:240
 msgid "Contains"
-msgstr "óÏÄÅÒÖÁÎÉÅ"
+msgstr "Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ"
 
-#: src/cmd_info.c:186
+#: src/cmd_info.c:257
 msgid "'File' Info"
-msgstr "éÎÆÏÒÍÁÃÉÑ Ï ÆÁÊÌÅ"
+msgstr "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÑÐ°Ð¹Ð»Ðµ"
 
-#: src/cmd_info.c:213 src/dpformat.c:49
+#: src/cmd_info.c:285 src/dpformat.c:50
 msgid "Accessed"
-msgstr "ðÒÏÞÉÔÁÎ"
+msgstr "ÐÑÐ¾ÑÐ¸ÑÐ°Ð½"
 
-#: src/cmd_info.c:214 src/dpformat.c:50
+#: src/cmd_info.c:286 src/dpformat.c:51
 msgid "Modified"
-msgstr "íÏÄÉÆÉÃÉÒÏ×ÁÎ"
+msgstr "ÐÐ¾Ð´Ð¸ÑÐ¸ÑÐ¸ÑÐ¾Ð²Ð°Ð½"
 
-#: src/cmd_info.c:215
+#: src/cmd_info.c:287 src/dpformat.c:53
 msgid "Changed"
-msgstr "éÚÍÅÎÅÎ"
+msgstr "ÐÐ·Ð¼ÐµÐ½ÐµÐ½"
+
+#: src/cmd_info.c:288 src/dpformat.c:52
+msgid "Created"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½"
 
-#: src/cmd_info.c:263
+#: src/cmd_info.c:290
+#, fuzzy
+msgid "Basic"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°"
+
+#: src/cmd_info.c:294
+msgid "Attributes"
+msgstr ""
+
+#: src/cmd_info.c:338
 msgid "Getting Information..."
-msgstr "óÂÏÒ ÉÎÆÏÒÍÁÃÉÉ..."
+msgstr "Ð¡Ð±Ð¾Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸..."
 
-#: src/cmd_info.c:302
+#: src/cmd_info.c:370
 msgid "Show 'file' Output?"
-msgstr "ðÏËÁÚÙ×ÁÔØ ×Ù×ÏÄ?"
+msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð²ÑÐ²Ð¾Ð´?"
 
-#: src/cmd_info.c:305
+#: src/cmd_info.c:373
 msgid "Access Date Format"
-msgstr "æÏÒÍÁÔ ÄÁÔÙ ÄÏÓÔÕÐÁ"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð´Ð°ÑÑ Ð´Ð¾ÑÑÑÐ¿Ð°"
 
-#: src/cmd_info.c:306
+#: src/cmd_info.c:374
 msgid "Modify Date Format"
-msgstr "æÏÒÍÁÔ ÄÁÔÙ ÍÏÄÉÆÉËÁÃÉÉ"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð´Ð°ÑÑ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¸Ð¸"
 
-#: src/cmd_info.c:307
+#: src/cmd_info.c:375
 msgid "Change Date Format"
-msgstr "æÏÒÍÁÔ ÄÁÔÙ ÉÚÍÅÎÅÎÉÑ"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð´Ð°ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ"
 
-#: src/cmd_info.c:308
+#: src/cmd_info.c:376
 msgid "Size Tick Mark"
-msgstr "úÎÁË ÒÁÚÄÅÌÉÔÅÌØ ÔÙÓÑÞ"
+msgstr "ÐÐ½Ð°Ðº ÑÐ°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ ÑÑÑÑÑ"
 
-#: src/cmd_join.c:47
+#: src/cmd_join.c:46
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Join?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ðÒÏÄÏÌÖÉÔØ ÏÂßÅÄÉÎÅÎÉÅ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ Ð¾Ð±ÑÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ?"
 
-#: src/cmd_join.c:76
+#: src/cmd_join.c:73
 msgid "Joining..."
-msgstr "ïÂßÅÄÉÎÅÎÉÅ..."
+msgstr "ÐÐ±ÑÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ..."
 
-#: src/cmd_join.c:162
+#: src/cmd_join.c:167
 msgid "Click and Drag Files to Reorder, Then Click Join."
-msgstr "÷ÙÄÅÌÉÔÅ ÆÁÊÌÙ, ÒÁÓÐÏÌÏÖÉÔÅ ÐÏ ÐÏÒÑÄËÕ É ÎÁÖÍÉÔÅ óÏÂÒÁÔØ."
+msgstr "ÐÑÐ´ÐµÐ»Ð¸ÑÐµ ÑÐ°Ð¹Ð»Ñ, ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶Ð¸ÑÐµ Ð¿Ð¾ Ð¿Ð¾ÑÑÐ´ÐºÑ Ð¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ Ð¡Ð¾Ð±ÑÐ°ÑÑ."
 
-#: src/cmd_join.c:170
+#: src/cmd_join.c:175
 #, c-format
 msgid "The total size is %s (%lu bytes)."
-msgstr "ïÂÝÉÊ ÒÁÚÍÅÒ %s (%lu ÂÁÊÔ)."
+msgstr "ÐÐ±ÑÐ¸Ð¹ ÑÐ°Ð·Ð¼ÐµÑ %s (%lu Ð±Ð°Ð¹Ñ)."
 
-#: src/cmd_join.c:173
+#: src/cmd_join.c:178
 #, c-format
 msgid "The total size is %lu bytes."
-msgstr "ïÂÝÉÊ ÒÁÚÍÅÒ %lu ÂÁÊÔ."
+msgstr "ÐÐ±ÑÐ¸Ð¹ ÑÐ°Ð·Ð¼ÐµÑ %lu Ð±Ð°Ð¹Ñ."
 
-#: src/cmd_join.c:215
+#: src/cmd_join.c:220
 msgid "Enter Destination File Name"
-msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÆÁÊÌÁ"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ ÑÐ°Ð¹Ð»Ð°"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "Join"
-msgstr "óÏÂÒÁÔØ"
+msgstr "Ð¡Ð¾Ð±ÑÐ°ÑÑ"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "_Join|_Cancel"
-msgstr "_óÏÂÒÁÔØ|_ïÔÍÅÎÁ"
+msgstr "_Ð¡Ð¾Ð±ÑÐ°ÑÑ|_ÐÑÐ¼ÐµÐ½Ð°"
 
 # c-format
-#: src/cmd_mkdir.c:75
+#: src/cmd_mkdir.c:65
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With MkDir?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - ÑÐ¾Ð·Ð´Ð°ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³?"
 
-#: src/cmd_mkdir.c:125
+#: src/cmd_mkdir.c:119
 msgid "Enter Name of Directory to Create"
-msgstr "÷×ÅÄÉÔÅ ÉÍÑ ËÁÔÁÌÏÇÁ"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð°"
 
-#: src/cmd_mkdir.c:133
+#: src/cmd_mkdir.c:128
 msgid "Make Directory"
-msgstr "óÏÚÄÁÔØ ËÁÔÁÌÏÇ"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³"
 
-#: src/cmd_mkdir.c:156
+#: src/cmd_mkdir.c:151
 msgid "CD Into New Directory?"
-msgstr "ðÅÒÅÊÔÉ × ËÁÔÁÌÏÇ?"
+msgstr "ÐÐµÑÐµÐ¹ÑÐ¸ Ð² ÐºÐ°ÑÐ°Ð»Ð¾Ð³?"
 
-#: src/cmd_mkdir.c:157
+#: src/cmd_mkdir.c:152
 msgid "Focus New Directory?"
-msgstr "õÓÔÁÎÏ×ÉÔØ ËÕÒÓÏÒ?"
-
-#: src/cmd_move.c:81
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"îÅ ÍÏÇÕ ÐÅÒÅÍÅÓÔÉÔØ ËÁÔÁÌÏÇ \"%s\"\n"
-"× \"%s\"\n"
-"(ÎÁÚÎÁÞÅÎÉÅ - ÐÏÄÐÁÐËÁ ÉÓÔÏÞÎÉËÁ)."
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÐºÑÑÑÐ¾Ñ?"
 
-#: src/cmd_move.c:92
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the destination contains the source."
-msgstr ""
-"îÅ ÍÏÇÕ ÐÅÒÅÍÅÓÔÉÔØ \"%s\"\n"
-"× \"%s\"\n"
-"(ÉÓÔÏÞÎÉË - ÐÏÄÐÁÐËÁ ÎÁÚÎÁÞÅÎÉÑ)."
-
-#: src/cmd_move.c:188 src/cmd_moveas.c:48
+#: src/cmd_move.c:128 src/cmd_moveas.c:51
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Move?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ÐÒÏÄÏÌÖÉÔØ ÐÅÒÅÍÅÝÅÎÉÅ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ Ð¿ÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ðµ?"
 
-#: src/cmd_move.c:189
+#: src/cmd_move.c:129
 msgid "Moving..."
-msgstr "ðÅÒÅÍÅÝÅÎÉÅ..."
+msgstr "ÐÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ðµ..."
 
-#: src/cmd_moveas.c:40
+#: src/cmd_moveas.c:41
 #, c-format
 msgid "Enter Name to Move \"%s\" As"
-msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÄÌÑ ÐÅÒÅÍÅÝÅÎÉÑ\"%s\" ËÁË"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ Ð´Ð»Ñ Ð¿ÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ñ\"%s\" ÐºÐ°Ðº"
+
+#: src/cmd_moveas.c:66
+msgid "Invalid destination name for MoveAs"
+msgstr ""
 
 #: src/cmd_moveas.c:74
 msgid "Moving As..."
-msgstr "ðÅÒÅÍÅÓÔÉÔØ ËÁË..."
+msgstr "ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÐºÐ°Ðº..."
 
-#: src/cmd_moveas.c:105 src/cmd_moveas.c:110
+#: src/cmd_moveas.c:105 src/cmd_moveas.c:113
 msgid "Move As"
-msgstr "ðÅÒÅÍÅÓÔÉÔØ ËÁË"
+msgstr "ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÐºÐ°Ðº"
 
 #: src/cmd_quit.c:40
 msgid ""
 "You may have some unsaved configuration changes.\n"
 "Quitting without saving will lose them. Really quit?"
 msgstr ""
-"õ ×ÁÓ ÍÏÇÕÔ ÂÙÔØ ÎÅÓÏÈÒÁÎÅÎÎÙÅ ÉÚÍÅÎÅÎÉÑ ÎÁÓÔÒÏÅË.\n"
-"÷ÙÈÏÄ ÂÅÚ ÓÏÈÒÁÎÅÎÉÑ ÐÒÉ×ÅÄÅÔ Ë ÐÏÔÅÒÅ ÉÚÍÅÎÅÎÉÊ. õ×ÅÒÅÎÙ?"
+"Ð£ Ð²Ð°Ñ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð½ÐµÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½ÑÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð°ÑÑÑÐ¾ÐµÐº.\n"
+"ÐÑÑÐ¾Ð´ Ð±ÐµÐ· ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ Ð¿ÑÐ¸Ð²ÐµÐ´ÐµÑ Ðº Ð¿Ð¾ÑÐµÑÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹. Ð£Ð²ÐµÑÐµÐ½Ñ?"
 
 #: src/cmd_quit.c:42 src/cmd_quit.c:54
 msgid "Confirm Quitting"
-msgstr "ðÏÔ×ÅÒÄÉÔÅ ×ÙÈÏÄ"
+msgstr "ÐÐ¾ÑÐ²ÐµÑÐ´Ð¸ÑÐµ Ð²ÑÑÐ¾Ð´"
 
 #: src/cmd_quit.c:42
 msgid "_Quit|_Save, then Quit|_Cancel"
-msgstr "_÷ÙÊÔÉ|_óÏÈÒÁÎÉÔØ,×ÙÊÔÉ|_ïÔÍÅÎÁ"
+msgstr "_ÐÑÐ¹ÑÐ¸|_Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ,Ð²ÑÐ¹ÑÐ¸|_ÐÑÐ¼ÐµÐ½Ð°"
 
 #: src/cmd_quit.c:54
 msgid "Are you sure you want to quit?"
-msgstr "äÅÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ×ÙÊÔÉ?"
+msgstr "ÐÐµÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð²ÑÐ¹ÑÐ¸?"
 
-#: src/cmd_rename.c:44
+#: src/cmd_rename.c:57
 #, c-format
 msgid "Enter New Name For \"%s\""
-msgstr "÷×ÅÄÉÔÅ ÎÏ×ÏÅ ÉÍÑ ÄÌÑ \"%s\""
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð½Ð¾Ð²Ð¾Ðµ Ð¸Ð¼Ñ Ð´Ð»Ñ \"%s\""
 
-#: src/cmd_rename.c:52 src/cmd_renamere.c:147 src/cmd_renamere.c:243
-#: src/cmd_renamere.c:293 src/cmd_renamere.c:388 src/cmd_renameseq.c:161
+#: src/cmd_rename.c:67 src/cmd_renamere.c:142 src/cmd_renamere.c:225
+#: src/cmd_renamere.c:268 src/cmd_renamere.c:367 src/cmd_renameseq.c:152
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Rename?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ÐÒÏÄÏÌÖÉÔØ ÐÅÒÅÉÍÅÎÏ×ÁÎÉÅ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ðµ?"
 
-#: src/cmd_rename.c:132
+#: src/cmd_rename.c:245
 msgid "Rename"
-msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ"
+msgstr "ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ"
 
-#: src/cmd_renamere.c:260
-msgid "Regular expression error:\n"
-msgstr "ïÛÉÂËÁ ×ÙÒÁÖÅÎÉÑ:\n"
+#: src/cmd_rename.c:261
+msgid "Rename Single File In-Place (Without Dialog)?"
+msgstr ""
 
-#: src/cmd_renamere.c:446
+#: src/cmd_renamere.c:419
 msgid ""
 "Look for substring in all filenames, and replace\n"
 "it with another string."
 msgstr ""
-"éÝÅÔ ÐÏÄÓÔÒÏËÕ ×Ï ×ÓÅÈ ÉÍÅÎÁÈ ÆÁÊÌÏ× É ÚÁÍÅÎÑÅÔ\n"
-"ÎÁ ÄÒÕÇÕÀ ÐÏÄÓÔÒÏËÕ."
+"ÐÑÐµÑ Ð¿Ð¾Ð´ÑÑÑÐ¾ÐºÑ Ð²Ð¾ Ð²ÑÐµÑ Ð¸Ð¼ÐµÐ½Ð°Ñ ÑÐ°Ð¹Ð»Ð¾Ð² Ð¸ Ð·Ð°Ð¼ÐµÐ½ÑÐµÑ\n"
+"Ð½Ð° Ð´ÑÑÐ³ÑÑ Ð¿Ð¾Ð´ÑÑÑÐ¾ÐºÑ."
 
-#: src/cmd_renamere.c:449
+#: src/cmd_renamere.c:422
 msgid "Replace"
-msgstr "úÁÍÅÎÉÔØ"
+msgstr "ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ"
 
-#: src/cmd_renamere.c:453
+#: src/cmd_renamere.c:426
 msgid "With"
-msgstr "îÁ"
+msgstr "ÐÐ°"
 
-#: src/cmd_renamere.c:461
+#: src/cmd_renamere.c:434
 msgid "Replace All?"
-msgstr "÷ÓÅ ×ÈÏÖÄÅÎÉÑ?"
+msgstr "ÐÑÐµ Ð²ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ñ?"
 
-#: src/cmd_renamere.c:465
+#: src/cmd_renamere.c:438
 msgid "Simple"
-msgstr "ðÒÏÓÔÁÑ"
+msgstr "ÐÑÐ¾ÑÑÐ°Ñ"
 
-#: src/cmd_renamere.c:469
+#: src/cmd_renamere.c:442
 msgid ""
 "Execute the 'From' RE on each filename, storing\n"
 "parenthesised subexpression matches. Then replace\n"
@@ -1743,25 +1738,25 @@
 "(counting from 1) of a subexpression, with the text\n"
 "that matched, and use the result as a new filename."
 msgstr ""
-"÷ÙÞÉÓÌÉÔØ ×ÙÒÁÖÅÎÉÅ \"îÁÊÔÉ\" ÎÁ ËÁÖÄÏÍ ÆÁÊÌÅ\n"
-"ÓÏÄÅÒÖÁÝÅÍ ÐÏÄÓÔÒÏËÕ ÉÚ ×ÙÒÁÖÅÎÉÑ. úÁÔÅÍ ÚÁÍÅÎÉÔØ \n"
-"×ÓÅ ×ÈÏÖÄÅÎÉÑ $n × \"úÁÍÅÎÉÔØ\" ÇÄÅ n - ÎÏÍÅÒ \n"
-"(ÎÁÞÉÎÁÑ Ó 1) ÐÏÄ×ÙÒÁÖÅÎÉÑ Ó ÓÏ×ÐÁÄÁÀÝÉÍ ÔÅËÓÔÏÍ\n"
-"ÐÏÉÓËÁ É ÉÓÐÏÌØÚÏ×ÁÔØ ÒÅÚÕÌØÔÁÔ ËÁË ÎÏ×ÏÅ ÉÍÑ ÆÁÊÌÁ."
+"ÐÑÑÐ¸ÑÐ»Ð¸ÑÑ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ \"ÐÐ°Ð¹ÑÐ¸\" Ð½Ð° ÐºÐ°Ð¶Ð´Ð¾Ð¼ ÑÐ°Ð¹Ð»Ðµ\n"
+"ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÐµÐ¼ Ð¿Ð¾Ð´ÑÑÑÐ¾ÐºÑ Ð¸Ð· Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ. ÐÐ°ÑÐµÐ¼ Ð·Ð°Ð¼ÐµÐ½Ð¸ÑÑ \n"
+"Ð²ÑÐµ Ð²ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ñ $n Ð² \"ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ\" Ð³Ð´Ðµ n - Ð½Ð¾Ð¼ÐµÑ \n"
+"(Ð½Ð°ÑÐ¸Ð½Ð°Ñ Ñ 1) Ð¿Ð¾Ð´Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ñ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑÑÐ¸Ð¼ ÑÐµÐºÑÑÐ¾Ð¼\n"
+"Ð¿Ð¾Ð¸ÑÐºÐ° Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐµÐ·ÑÐ»ÑÑÐ°Ñ ÐºÐ°Ðº Ð½Ð¾Ð²Ð¾Ðµ Ð¸Ð¼Ñ ÑÐ°Ð¹Ð»Ð°."
 
-#: src/cmd_renamere.c:477 src/cmd_renamere.c:500
+#: src/cmd_renamere.c:450 src/cmd_renamere.c:473
 msgid "From"
-msgstr "îÁÊÔÉ"
+msgstr "ÐÐ°Ð¹ÑÐ¸"
 
-#: src/cmd_renamere.c:481 src/cmd_renamere.c:504
+#: src/cmd_renamere.c:454 src/cmd_renamere.c:477
 msgid "To"
-msgstr "úÁÍÅÎÉÔØ"
+msgstr "ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ"
 
-#: src/cmd_renamere.c:489
+#: src/cmd_renamere.c:462
 msgid "Reg Exp"
-msgstr "÷ÙÒÁÖÅÎÉÅ"
+msgstr "ÐÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: src/cmd_renamere.c:494
+#: src/cmd_renamere.c:467
 msgid ""
 "Look for each character in the 'From' string, and replace\n"
 "any hits with the corresponding character in the 'To' string.\n"
@@ -1769,902 +1764,1140 @@
 "the filename, and the result used as the new name for each file."
 msgstr ""
 
-#: src/cmd_renamere.c:513
+#: src/cmd_renamere.c:486
 msgid "Map"
 msgstr ""
 
-#: src/cmd_renamere.c:517
+#: src/cmd_renamere.c:490
 msgid ""
 "Changes the case (upper/lower) of the characters\n"
 "in the selected filename(s)."
 msgstr ""
 
-#: src/cmd_renamere.c:519
+#: src/cmd_renamere.c:492
 msgid "Lower Case?"
-msgstr "îÉÖÎÉÊ ÒÅÇÉÓÔÒ?"
+msgstr "ÐÐ¸Ð¶Ð½Ð¸Ð¹ ÑÐµÐ³Ð¸ÑÑÑ?"
 
-#: src/cmd_renamere.c:521
+#: src/cmd_renamere.c:494
 msgid "Upper Case?"
-msgstr "÷ÅÒÈÎÉÊ ÒÅÇÉÓÔÒ?"
+msgstr "ÐÐµÑÑÐ½Ð¸Ð¹ ÑÐµÐ³Ð¸ÑÑÑ?"
 
-#: src/cmd_renamere.c:523
+#: src/cmd_renamere.c:496
 #, fuzzy
 msgid "Upper Case Initial?"
-msgstr "÷ÅÒÈÎÉÊ ÒÅÇÉÓÔÒ?"
+msgstr "ÐÐµÑÑÐ½Ð¸Ð¹ ÑÐµÐ³Ð¸ÑÑÑ?"
 
-#: src/cmd_renamere.c:526
+#: src/cmd_renamere.c:499
 msgid "Case"
-msgstr "æÏÒÍÁ"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°"
 
-#: src/cmd_renamere.c:528
+#: src/cmd_renamere.c:501
 msgid "RenameRE"
-msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØõóì"
+msgstr "ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑÐ£Ð¡Ð"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "10, Decimal"
-msgstr "10, äÅÓÑÔÉÞÎÁÑ"
+msgstr "10, ÐÐµÑÑÑÐ¸ÑÐ½Ð°Ñ"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (A-F)"
-msgstr "16, ûÅÓÔÎÁÄÃÅÔÅÒÉÞÎÁÑ (A-F)"
+msgstr "16, Ð¨ÐµÑÑÐ½Ð°Ð´ÑÐµÑÐµÑÐ¸ÑÐ½Ð°Ñ (A-F)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (a-f)"
-msgstr "16, ûÅÓÔÎÁÄÃÅÔÅÒÉÞÎÁÑ (a-f)"
+msgstr "16, Ð¨ÐµÑÑÐ½Ð°Ð´ÑÐµÑÐµÑÐ¸ÑÐ½Ð°Ñ (a-f)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "8, Octal"
-msgstr "8, ÷ÏÓØÍÅÒÉÞÎÁÑ"
+msgstr "8, ÐÐ¾ÑÑÐ¼ÐµÑÐ¸ÑÐ½Ð°Ñ"
 
-#: src/cmd_renameseq.c:328
+#: src/cmd_renameseq.c:306
 msgid ""
 "This command renames all selected files\n"
 "into a numbered sequence. The controls\n"
 "below let you define how the names are\n"
 "formed."
 msgstr ""
-"üÔÁ ËÏÍÁÎÄÁ ÐÅÒÅÉÍÅÎÏ×Ù×ÁÅÔ ×ÓÅ ×ÙÄÅÌÅÎÎÙÅ\n"
-"ÆÁÊÌÙ × ÎÕÍÅÒÏ×ÁÎÎÕÀ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ.\n"
-"ëÎÏÐËÉ ÕÐÒÁ×ÌÅÎÉÑ ÎÉÖÅ ÐÏÚ×ÏÌÑÀÔ ÏÐÒÅÄÅÌÉÔØ\n"
-"ÐÏÒÑÄÏË ÆÏÒÍÉÒÏ×ÁÎÉÑ ÉÍÅÎ ÆÁÊÌÏ×."
+"ÐÑÐ° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²ÑÐ²Ð°ÐµÑ Ð²ÑÐµ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð½ÑÐµ\n"
+"ÑÐ°Ð¹Ð»Ñ Ð² Ð½ÑÐ¼ÐµÑÐ¾Ð²Ð°Ð½Ð½ÑÑ Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»ÑÐ½Ð¾ÑÑÑ.\n"
+"ÐÐ½Ð¾Ð¿ÐºÐ¸ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¸Ð¶Ðµ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑÑ Ð¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ\n"
+"Ð¿Ð¾ÑÑÐ´Ð¾Ðº ÑÐ¾ÑÐ¼Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð¼ÐµÐ½ ÑÐ°Ð¹Ð»Ð¾Ð²."
 
-#: src/cmd_renameseq.c:335
+#: src/cmd_renameseq.c:313
 msgid "Start At"
-msgstr "îÁÞÁÔØ Ó"
+msgstr "ÐÐ°ÑÐ°ÑÑ Ñ"
 
-#: src/cmd_renameseq.c:343 src/cmd_split.c:247
+#: src/cmd_renameseq.c:323 src/cmd_split.c:609
 msgid "Base"
-msgstr "æÏÒÍÁ"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°"
 
-#: src/cmd_renameseq.c:359
+#: src/cmd_renameseq.c:333
 msgid "Precision"
-msgstr "ëÏÌ-×Ï ÚÎÁËÏ×"
+msgstr "ÐÐ¾Ð»-Ð²Ð¾ Ð·Ð½Ð°ÐºÐ¾Ð²"
 
-#: src/cmd_renameseq.c:367
+#: src/cmd_renameseq.c:340
 msgid "Head"
-msgstr "îÁÞÁÌÏ"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾"
 
-#: src/cmd_renameseq.c:374
+#: src/cmd_renameseq.c:347
 msgid "Tail"
-msgstr "ïËÏÎÞÁÎÉÅ"
+msgstr "ÐÐºÐ¾Ð½ÑÐ°Ð½Ð¸Ðµ"
 
-#: src/cmd_renameseq.c:382
+#: src/cmd_renameseq.c:354
 msgid "Guess"
-msgstr "ðÏÄÓÔÁ×ÉÔØ"
+msgstr "ÐÐ¾Ð´ÑÑÐ°Ð²Ð¸ÑÑ"
 
-#: src/cmd_renameseq.c:396
+#: src/cmd_renameseq.c:369
 msgid "Sequential Rename"
-msgstr "ðÅÒÅÉÍÅÎÏ×ÁÎÉÅ × ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
+msgstr "ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð² Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»ÑÐ½Ð¾ÑÑÑ"
 
-#: src/cmd_select.c:396
+#: src/cmd_select.c:365
 msgid "All rows|Selected|Unselected|"
-msgstr "÷ÓÅ ÜÌÅÍÅÎÔÙ|ïÔÍÅÞÅÎÎÙÅ|òÁÚÏÔÍÅÞÅÎÎÙÅ|"
+msgstr "ÐÑÐµ ÑÐ»ÐµÐ¼ÐµÐ½ÑÑ|ÐÑÐ¼ÐµÑÐµÐ½Ð½ÑÐµ|Ð Ð°Ð·Ð¾ÑÐ¼ÐµÑÐµÐ½Ð½ÑÐµ|"
 
-#: src/cmd_select.c:397
+#: src/cmd_select.c:366
 msgid "All types|Directories only|Non-directories only|"
-msgstr "÷ÓÅ ÔÉÐÙ|ëÁÔÁÌÏÇÉ|âÅÚ ËÁÔÁÌÏÇÏ×|"
+msgstr "ÐÑÐµ ÑÐ¸Ð¿Ñ|ÐÐ°ÑÐ°Ð»Ð¾Ð³Ð¸|ÐÐµÐ· ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð²|"
 
-#: src/cmd_select.c:398
+#: src/cmd_select.c:367
 msgid "Select|Unselect|Toggle|"
-msgstr "ïÔÍÅÔÉÔØ|òÁÚÏÔÍÅÔÉÔØ|ðÅÒÅ×ÅÒÎÕÔØ|"
+msgstr "ÐÑÐ¼ÐµÑÐ¸ÑÑ|Ð Ð°Ð·Ð¾ÑÐ¼ÐµÑÐ¸ÑÑ|ÐÐµÑÐµÐ²ÐµÑÐ½ÑÑÑ|"
 
-#: src/cmd_select.c:399 src/menus.c:530
+#: src/cmd_select.c:368 src/menus.c:537
 msgid "Action"
-msgstr "äÅÊÓÔ×ÉÅ"
+msgstr "ÐÐµÐ¹ÑÑÐ²Ð¸Ðµ"
 
-#: src/cmd_select.c:399
+#: src/cmd_select.c:368
 msgid "Set"
-msgstr "õÓÔÁÎÏ×ÉÔØ"
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ"
 
-#: src/cmd_select.c:511
+#: src/cmd_select.c:469
 msgid "Treat RE as Glob Pattern?"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ ×ÙÒÁÖÅÎÉÅ ËÁË ÇÌÏÂ. ÍÁÓËÕ?"
+msgstr "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ ÐºÐ°Ðº Ð³Ð»Ð¾Ð±. Ð¼Ð°ÑÐºÑ?"
 
-#: src/cmd_select.c:514
+#: src/cmd_select.c:472
 msgid "Invert RE Matching?"
-msgstr "îÅ ÕÄÏ×ÌÅÔ×ÏÒÑÀÝÉÅ ×ÙÒÁÖÅÎÉÀ?"
+msgstr "ÐÐµ ÑÐ´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÑÑÑÐ¸Ðµ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ?"
 
-#: src/cmd_select.c:517
+#: src/cmd_select.c:475
 msgid "Require Match on Full Name?"
-msgstr "ðÏ ÐÏÌÎÏÍÕ ÉÍÅÎÉ?"
+msgstr "ÐÐ¾ Ð¿Ð¾Ð»Ð½Ð¾Ð¼Ñ Ð¸Ð¼ÐµÐ½Ð¸?"
 
-#: src/cmd_select.c:531
+#: src/cmd_select.c:489
 msgid "Select Using RE"
-msgstr "÷ÙÂÏÒ ÉÓÐÏÌØÚÕÑ ×ÙÒÁÖÅÎÉÅ"
+msgstr "ÐÑÐ±Ð¾Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: src/cmd_select.c:815
+#: src/cmd_select.c:727
 msgid ""
 "Enter shell command to run. The command\n"
 "will have the selected content appended.\n"
 "Action is performed on successful exit."
 msgstr ""
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "OK|Cancel"
-msgstr "_äá|_ïÔÍÅÎÁ"
+msgstr "_ÐÐ|_ÐÑÐ¼ÐµÐ½Ð°"
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "Select using shell command"
-msgstr "÷ÙÂÅÒ ÐÏ ËÏÎÓÏÌØÎÏÊ ËÏÍÁÎÄÅ"
+msgstr "ÐÑÐ±ÐµÑ Ð¿Ð¾ ÐºÐ¾Ð½ÑÐ¾Ð»ÑÐ½Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ"
 
-#: src/cmd_split.c:68
+#: src/cmd_split.c:269
 #, c-format
 msgid ""
 "Split \"%s\".\n"
 "File is %s (%s)."
 msgstr ""
-"òÁÚÂÉÔØ \"%s\".\n"
-"ÆÁÊÌ %s (%s)."
+"Ð Ð°Ð·Ð±Ð¸ÑÑ \"%s\".\n"
+"ÑÐ°Ð¹Ð» %s (%s)."
 
-#: src/cmd_split.c:70
+#: src/cmd_split.c:271
 #, c-format
 msgid ""
 "Split \"%s\".\n"
 "File is %s."
 msgstr ""
-"òÁÚÂÉÔØ \"%s\".\n"
-"æÁÊÌ %s."
+"Ð Ð°Ð·Ð±Ð¸ÑÑ \"%s\".\n"
+"Ð¤Ð°Ð¹Ð» %s."
 
-#: src/cmd_split.c:106
+#: src/cmd_split.c:348
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Split?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ÐÒÏÄÏÌÖÉÔØ ÒÁÚÂÉ×ËÕ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÑÐ°Ð·Ð±Ð¸Ð²ÐºÑ?"
 
-#: src/cmd_split.c:171
-msgid "Beta Software"
-msgstr "âÅÔÁ ×ÅÒÓÉÑ"
+#: src/cmd_split.c:422
+msgid "Fixed Size Split"
+msgstr "Ð Ð°Ð·Ð±Ð¸Ð²ÐºÐ° Ð¿Ð¾ ÑÐ°Ð·Ð¼ÐµÑÑ"
 
-#: src/cmd_split.c:171
-msgid "Next Version?"
-msgstr "óÌÅÄÕÀÝÁÑ ×ÅÒÓÉÑ?"
+#: src/cmd_split.c:424
+msgid "Segment Size"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ ÐºÑÑÐºÐ°"
 
-#: src/cmd_split.c:171
-msgid ""
-"This splitting mode has not been\n"
-"implemented yet... Sorry."
+#: src/cmd_split.c:427
+#, fuzzy
+msgid "1457000 bytes (3.5\" floppy)"
+msgstr " 1457000 Ð±Ð°Ð¹Ñ (3.5\" Ð´Ð¸ÑÐºÐµÑÐ°)"
+
+#: src/cmd_split.c:428
+#, fuzzy
+msgid "10485760 bytes (10 MB)"
+msgstr " 1457000 Ð±Ð°Ð¹Ñ (3.5\" Ð´Ð¸ÑÐºÐµÑÐ°)"
+
+#: src/cmd_split.c:429
+#, fuzzy
+msgid "26214400 bytes (25 MB)"
+msgstr " 1457000 Ð±Ð°Ð¹Ñ (3.5\" Ð´Ð¸ÑÐºÐµÑÐ°)"
+
+#: src/cmd_split.c:430
+#, fuzzy
+msgid "52428800 bytes (50 MB)"
+msgstr " 1457000 Ð±Ð°Ð¹Ñ (3.5\" Ð´Ð¸ÑÐºÐµÑÐ°)"
+
+#: src/cmd_split.c:431
+#, fuzzy
+msgid "78643200 bytes (75 MB)"
+msgstr " 1457000 Ð±Ð°Ð¹Ñ (3.5\" Ð´Ð¸ÑÐºÐµÑÐ°)"
+
+#: src/cmd_split.c:432
+#, fuzzy
+msgid "100431360 bytes (95 MB, Zip disk)"
+msgstr "100431360 Ð±Ð°Ð¹Ñ (ÐÐ¸ÑÐº ZIP)"
+
+#: src/cmd_split.c:454
+#, fuzzy
+msgid "Fixed Count Split"
+msgstr "Ð Ð°Ð·Ð±Ð¸Ð²ÐºÐ° Ð¿Ð¾ ÑÐ°Ð·Ð¼ÐµÑÑ"
+
+#: src/cmd_split.c:457
+#, fuzzy
+msgid "Segment Count"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ ÐºÑÑÐºÐ°"
+
+#: src/cmd_split.c:503
+msgid "Current part number, unique for every created file"
 msgstr ""
-"òÅÖÉÍ ÒÁÚÂÉ×ËÉ ÅÝÅ ÎÅ \n"
-"ÒÅÁÌÉÚÏ×ÁÎ... éÚ×ÉÎÉÔÅ."
 
-#: src/cmd_split.c:187
-msgid "  1457000 bytes (3.5\" floppy)"
-msgstr " 1457000 ÂÁÊÔ (3.5\" ÄÉÓËÅÔÁ)"
+#: src/cmd_split.c:504
+msgid "The value from the Base box"
+msgstr ""
 
-#: src/cmd_split.c:188
-msgid "100431360 bytes (Zip disk)"
-msgstr "100431360 ÂÁÊÔ (äÉÓË ZIP)"
+#: src/cmd_split.c:505
+msgid "The amount that index will change for each file"
+msgstr ""
 
-#: src/cmd_split.c:190
-msgid "Fixed Size Split"
-msgstr "òÁÚÂÉ×ËÁ ÐÏ ÒÁÚÍÅÒÕ"
+#: src/cmd_split.c:506
+msgid "The total number of files that will be created"
+msgstr ""
 
-#: src/cmd_split.c:193
-msgid "Segment Size"
-msgstr "òÁÚÍÅÒ ËÕÓËÁ"
+#: src/cmd_split.c:507
+msgid "The value of index for the last file to be created"
+msgstr ""
 
-#: src/cmd_split.c:221
+#: src/cmd_split.c:570
 msgid "Fixed size, variable number of parts"
-msgstr "ðÏ ÏÐÒÅÄÅÌÅÎÎÏÍÕ ÒÁÚÍÅÒÕ ÞÁÓÔÉ"
+msgstr "ÐÐ¾ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½Ð¾Ð¼Ñ ÑÐ°Ð·Ð¼ÐµÑÑ ÑÐ°ÑÑÐ¸"
 
-#: src/cmd_split.c:222
+#: src/cmd_split.c:571
 msgid "Fixed number of parts, variable sizes"
-msgstr "îÁ ÏÐÒÅÄÅÌÅÎÎÏÅ ËÏÌÉÞÅÓÔ×Ï ÞÁÓÔÅÊ"
+msgstr "ÐÐ° Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½Ð¾Ðµ ÐºÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ ÑÐ°ÑÑÐµÐ¹"
 
-#: src/cmd_split.c:230 src/cmd_split.c:261
+#: src/cmd_split.c:580 src/cmd_split.c:663
 msgid "Split"
-msgstr "òÁÚÂÉÔØ"
+msgstr "Ð Ð°Ð·Ð±Ð¸ÑÑ"
 
-#: src/cmd_split.c:243
+#: src/cmd_split.c:599
 msgid "Name Format"
-msgstr "æÏÒÍÁÔ ÉÍÅÎÉ"
+msgstr "Ð¤Ð¾ÑÐ¼Ð°Ñ Ð¸Ð¼ÐµÐ½Ð¸"
 
-#: src/cmd_split.c:252
+#: src/cmd_split.c:615
 msgid "Step"
-msgstr "ûÁÇ"
+msgstr "Ð¨Ð°Ð³"
 
-#: src/cmd_symlink.c:77 src/cmd_symlink.c:246
+#: src/cmd_split.c:624
+msgid "Zero-Fill Numbers?"
+msgstr ""
+
+#: src/cmd_split.c:645
+msgid "Offset"
+msgstr ""
+
+#: src/cmd_symlink.c:68 src/cmd_symlink.c:252
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Link?"
-msgstr "\"%s\" õÖÅ ÓÕÝÅÓÔ×ÕÅÔ - ÐÒÏÄÏÌÖÉÔØ ÓÏÚÄÁÎÉÅ ÓÓÙÌËÉ?"
+msgstr "\"%s\" Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ - Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÑÑÐ»ÐºÐ¸?"
+
+#: src/cmd_symlink.c:161 src/configure.c:239 src/icon_dialog.c:59
+#: src/progress.c:220
+msgid "Cancel"
+msgstr "ÐÑÐ¼ÐµÐ½Ð°"
+
+#: src/cmd_symlink.c:161 src/configure.c:233 src/dialog.c:290
+#: src/nag_dialog.c:36
+msgid "OK"
+msgstr "ÐÐ"
 
-#: src/cmd_symlink.c:184
+#: src/cmd_symlink.c:161
 msgid "Select Link Target"
-msgstr "÷ÙÂÅÒÉÔÅ ÃÅÌØ ÓÓÙÌËÉ"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐµÐ»Ñ ÑÑÑÐ»ÐºÐ¸"
 
-#: src/cmd_symlink.c:213
+#: src/cmd_symlink.c:218
 msgid "Contents"
-msgstr "óÏÄÅÒÖÁÎÉÅ"
+msgstr "Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ"
 
-#: src/cmd_symlink.c:225
+#: src/cmd_symlink.c:231
 msgid "Edit Symbolic Link"
-msgstr "éÚÍÅÎÉÔØ ÓÓÙÌËÕ"
+msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÑÑÐ»ÐºÑ"
 
-#: src/cmd_symlink.c:231
+#: src/cmd_symlink.c:236
 msgid "Create Symbolic Link"
-msgstr "óÏÚÄÁÎÉÅ ÓÓÙÌËÉ"
-
-#: src/cmd_viewtext.c:206
-msgid "Use mmap() to Speed Loading?"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ mmap() ÄÌÑ ÕÓËÏÒÅÎÉÑ ÚÁÇÒÕÚËÉ?"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÑÑÐ»ÐºÐ¸"
 
-#: src/cmd_viewtext.c:208
+#: src/cmd_viewtext.c:205
 msgid "Hex-Check First"
-msgstr "ðÒÏ×ÅÒÉÔØ ÓÉÍ×ÏÌÙ"
+msgstr "ÐÑÐ¾Ð²ÐµÑÐ¸ÑÑ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ"
 
-#: src/cmd_viewtext.c:209
+#: src/cmd_viewtext.c:206
 msgid "Exit on Left Arrow Key?"
 msgstr ""
 
 #: src/cmdarg.c:201
 msgid "on"
-msgstr "×ËÌ"
+msgstr "Ð²ÐºÐ»"
 
 #: src/cmdarg.c:201
 msgid "true"
-msgstr "éÓÔÉÎÁ"
+msgstr "ÐÑÑÐ¸Ð½Ð°"
 
 #: src/cmdarg.c:201
 msgid "yes"
-msgstr "ÄÁ"
+msgstr "Ð´Ð°"
 
-#: src/cmdgrab.c:222
+#: src/cmdgrab.c:177
 #, c-format
 msgid "Output of %s (pid %d)"
-msgstr "÷Ù×ÏÄ %s (pid %d)"
+msgstr "ÐÑÐ²Ð¾Ð´ %s (pid %d)"
 
 #: src/cmdseq.c:354 src/cmdseq.c:369
 #, c-format
 msgid ""
 "Unable to execute unknown\n"
 "command \"%s\"."
-msgstr "îÅ ÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ \"%s\"."
+msgstr "ÐÐµ Ð¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° \"%s\"."
 
-#: src/cmdseq_dialog.c:126
+#: src/cmdseq_dialog.c:134
 #, c-format
 msgid "Built-Ins (%u)"
-msgstr "÷ÓÔÒÏÅÎÙÅ (%u)"
+msgstr "ÐÑÑÑÐ¾ÐµÐ½ÑÐµ (%u)"
 
-#: src/cmdseq_dialog.c:131
+#: src/cmdseq_dialog.c:139
 #, c-format
 msgid "User Defined (%u)"
-msgstr "ïÐÒÅÄÅÌÅÎÎÙÅ (%u)"
+msgstr "ÐÐ¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½ÑÐµ (%u)"
 
-#: src/cmdseq_dialog.c:302
+#: src/cmdseq_dialog.c:313
 msgid ""
 "Select a command, or type start\n"
 "of name and press TAB."
 msgstr ""
-"÷ÙÂÅÒÉÔÅ ËÏÍÁÎÄÕ ÉÌÉ ÎÁÂÅÒÉÔÅ\n"
-"ÎÁÞÁÌÏ É ÎÁÖÍÉÔÅ TAB"
+"ÐÑÐ±ÐµÑÐ¸ÑÐµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð¸Ð»Ð¸ Ð½Ð°Ð±ÐµÑÐ¸ÑÐµ\n"
+"Ð½Ð°ÑÐ°Ð»Ð¾ Ð¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ TAB"
 
-#: src/cmdseq_dialog.c:319
+#: src/cmdseq_dialog.c:330
 msgid "Select Command"
-msgstr "÷ÙÂÅÒÉÔÅ ËÏÍÁÎÄÕ"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ"
 
-#: src/configure.c:198
+#: src/configure.c:197
 msgid "Couldn't open configuration file for output"
-msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ ÎÁÓÔÒÏÊËÉ ÄÌÑ ÚÁÐÉÓÉ"
-
-#: src/configure.c:234 src/dialog.c:285
-msgid "OK"
-msgstr "äá"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¾ÑÐºÑÑÑÑ ÑÐ°Ð¹Ð» Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸ÑÐ¸"
 
-#: src/configure.c:240
+#: src/configure.c:236
 msgid "Save"
-msgstr "óÏÈÒÁÎÉÔØ"
+msgstr "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ"
 
-#: src/configure.c:244 src/icon_dialog.c:59 src/progress.c:219
-msgid "Cancel"
-msgstr "ïÔÍÅÎÁ"
-
-#: src/configure.c:455
+#: src/configure.c:463
 #, c-format
 msgid "Config file version (%s) doesn't match program version (%s)"
-msgstr "÷ÅÒÓÉÑ ÆÁÊÌÁ ÎÁÓÔÒÏÅË (%s) ÎÅ ÓÏ×ÐÁÄÁÅÔ Ó ×ÅÒÓÉÅÊ ÐÒÏÇÒÁÍÍÙ (%s)"
+msgstr "ÐÐµÑÑÐ¸Ñ ÑÐ°Ð¹Ð»Ð° Ð½Ð°ÑÑÑÐ¾ÐµÐº (%s) Ð½Ðµ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÐµÑ Ñ Ð²ÐµÑÑÐ¸ÐµÐ¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ (%s)"
 
-#: src/configure.c:467
+#: src/configure.c:475
 #, c-format
 msgid ""
 "Couldn't find any configuration file; checked\n"
 "both \"%s\" and \"%s\".\n"
 "Using built-in minimal configuration."
 msgstr ""
-"îÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ ÎÁÓÔÒÏÅË; ÅÇÏ ÎÅÔ\n"
-"ÎÉ × \"%s\" ÎÉ × \"%s\".\n"
-"éÓÐÏÌØÚÕÀ ×ÓÔÒÏÅÎÎÕÀ ÍÉÎÉÍÁÌØÎÕÀ ÎÁÓÔÒÏÊËÕ."
+"ÐÐµ Ð¼Ð¾Ð³Ñ Ð½Ð°Ð¹ÑÐ¸ ÑÐ°Ð¹Ð» Ð½Ð°ÑÑÑÐ¾ÐµÐº; ÐµÐ³Ð¾ Ð½ÐµÑ\n"
+"Ð½Ð¸ Ð² \"%s\" Ð½Ð¸ Ð² \"%s\".\n"
+"ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÑ Ð²ÑÑÑÐ¾ÐµÐ½Ð½ÑÑ Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»ÑÐ½ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÑ."
 
-#: src/dialog.c:123 src/dialog.c:253
+#: src/dialog.c:124 src/dialog.c:260
 msgid "_OK|_Cancel"
-msgstr "_äá|_ïÔÍÅÎÁ"
-
-#: src/dirpane.c:134
-msgid ""
-"Case-sensitive sorting will not work correctly with non-ASCII characters"
-msgstr "óÏÒÔÉÒÏ×ËÁ Ó ÕÞÅÔÏÍ ÒÅÇÉÓÔÒÁ ÒÁÂÏÔÁÅÔ ÎÅ×ÅÒÎÏ Ó ÒÕÓÓËÉÍÉ ÂÕË×ÁÍÉ"
+msgstr "_ÐÐ|_ÐÑÐ¼ÐµÐ½Ð°"
 
-#: src/dirpane.c:143
-msgid ""
-"Case-insensitive sorting will not work correctly with non-ASCII characters"
-msgstr "óÏÒÔÉÒÏ×ËÁ ÂÅÚ ÕÞÅÔÁ ÒÅÇÉÓÔÒÁ ÒÁÂÏÔÁÅÔ ÎÅ×ÅÒÎÏ Ó ÒÕÓÓËÉÍÉ ÂÕË×ÁÍÉ"
-
-#: src/dirpane.c:1189
+#: src/dirpane.c:541
 #, c-format
 msgid "%u/%u dirs, %u/%u files"
-msgstr "%u/%u ËÁÔÁÌÏÇÏ×, %u/%u ÆÁÊÌÏ×"
+msgstr "%u/%u ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð², %u/%u ÑÐ°Ð¹Ð»Ð¾Ð²"
 
-#: src/dirpane.c:1197
-#, fuzzy, c-format
-msgid " (%%s/%%s, %%%s/%%%s blocks)"
-msgstr " (%s/%s, %Lu/%Lu ÂÌÏËÏ×)"
+#: src/dirpane.c:546
+#, c-format
+msgid " (%s/%s)"
+msgstr ""
 
-#: src/dirpane.c:1210
+#: src/dirpane.c:557
 #, fuzzy, c-format
 msgid ", %s (%s) used"
-msgstr ", %s ÚÁÎÑÔÏ"
+msgstr ", %s Ð·Ð°Ð½ÑÑÐ¾"
 
-#: src/dirpane.c:1212
+#: src/dirpane.c:559
 #, c-format
 msgid ", %s free"
-msgstr ", %s Ó×ÏÂÏÄÎÏ"
-
-#: src/dirpane.c:1560
-msgid "!!Invalid filename!!"
-msgstr ""
+msgstr ", %s ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾"
 
-#: src/dirpane.c:2004 src/dirpane.c:2053
+#: src/dirpane.c:2084 src/dirpane.c:2131
 msgid "Move up to the parent directory"
-msgstr "ðÅÒÅÊÔÉ × ÒÏÄÉÔÅÌØÓËÉÊ ËÁÔÁÌÏÇ"
+msgstr "ÐÐµÑÐµÐ¹ÑÐ¸ Ð² ÑÐ¾Ð´Ð¸ÑÐµÐ»ÑÑÐºÐ¸Ð¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³"
 
-#: src/dirpane.c:2026
+#: src/dirpane.c:2106
 msgid "Enter path, then press Return to go there"
-msgstr "÷×ÅÄÉÔÅ ÐÕÔØ É ÎÁÖÍÉÔÅ ÷×ÏÄ ÄÌÑ ÐÅÒÅÈÏÄÁ"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¿ÑÑÑ Ð¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐÐ²Ð¾Ð´ Ð´Ð»Ñ Ð¿ÐµÑÐµÑÐ¾Ð´Ð°"
 
-#: src/dirpane.c:2027
+#: src/dirpane.c:2107
 msgid "H"
-msgstr "ó"
+msgstr "Ð¡"
 
-#: src/dirpane.c:2031
+#: src/dirpane.c:2111
 msgid ""
 "Click to enable/disable Hide rule (When pressed in, the hide rule is active, "
 "and matching entries are hidden)"
 msgstr ""
-"îÁÖÍÉÔÅ ÄÌÑ ×ËÌÀÞÅÎÉÑ/×ÙËÌÀÞÅÎÉÑ ÐÏËÁÚÁ ÓËÒÙÔÙÈ ÜÌÅÍÅÎÔÏ×(ÎÁÖÁÔÏÅ ÓÏÓÔÏÑÎÉÅ "
-"ÏÂÏÚÎÁÞÁÅÔ ÓËÒÙÔÉÅ)"
+"ÐÐ°Ð¶Ð¼Ð¸ÑÐµ Ð´Ð»Ñ Ð²ÐºÐ»ÑÑÐµÐ½Ð¸Ñ/Ð²ÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ð¿Ð¾ÐºÐ°Ð·Ð° ÑÐºÑÑÑÑÑ ÑÐ»ÐµÐ¼ÐµÐ½ÑÐ¾Ð²(Ð½Ð°Ð¶Ð°ÑÐ¾Ðµ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ðµ "
+"Ð¾Ð±Ð¾Ð·Ð½Ð°ÑÐ°ÐµÑ ÑÐºÑÑÑÐ¸Ðµ)"
 
-#: src/dpformat.c:37
+#: src/dpformat.c:38
 msgid "Blocks"
-msgstr "âÌÏËÏ×"
+msgstr "ÐÐ»Ð¾ÐºÐ¾Ð²"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "BSize"
-msgstr "âÌÏË"
+msgstr "ÐÐ»Ð¾Ðº"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "Block Size"
-msgstr "òÁÚÍÅÒ ÂÌÏËÁ"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ Ð±Ð»Ð¾ÐºÐ°"
 
-#: src/dpformat.c:39
+#: src/dpformat.c:40
 msgid "Mode, numerical"
-msgstr "ðÒÁ×Á, × ÃÉÆÒÁÈ"
+msgstr "ÐÑÐ°Ð²Ð°, Ð² ÑÐ¸ÑÑÐ°Ñ"
 
-#: src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode, string"
-msgstr "ðÒÁ×Á, ÓÔÒÏËÏÊ"
+msgstr "ÐÑÐ°Ð²Ð°, ÑÑÑÐ¾ÐºÐ¾Ð¹"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Nlink"
-msgstr "óÓÙÌÏË"
+msgstr "Ð¡ÑÑÐ»Ð¾Ðº"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Number of links"
-msgstr "þÉÓÌÏ ÓÓÙÌÏË"
+msgstr "Ð§Ð¸ÑÐ»Ð¾ ÑÑÑÐ»Ð¾Ðº"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Owner ID"
-msgstr "îÏÍÅÒ ×ÌÁÄÅÌØÃÁ"
+msgstr "ÐÐ¾Ð¼ÐµÑ Ð²Ð»Ð°Ð´ÐµÐ»ÑÑÐ°"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Uid"
-msgstr "N×ÌÁÄ"
+msgstr "NÐ²Ð»Ð°Ð´"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Owner Name"
-msgstr "éÍÑ ×ÌÁÄÅÌØÃÁ"
+msgstr "ÐÐ¼Ñ Ð²Ð»Ð°Ð´ÐµÐ»ÑÑÐ°"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Uname"
-msgstr "÷ÌÁÄÅÌÅÃ"
+msgstr "ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Gid"
-msgstr "NÇÒÕÐ"
+msgstr "NÐ³ÑÑÐ¿"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Group ID"
-msgstr "îÏÍÅÒ ÇÒÕÐÐÙ"
+msgstr "ÐÐ¾Ð¼ÐµÑ Ð³ÑÑÐ¿Ð¿Ñ"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Gname"
-msgstr "çÒÕÐÐÁ"
+msgstr "ÐÑÑÐ¿Ð¿Ð°"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Group Name"
-msgstr "éÍÑ ÇÒÕÐÐÙ"
+msgstr "ÐÐ¼Ñ Ð³ÑÑÐ¿Ð¿Ñ"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device"
-msgstr "õÓÔÒÏÊÓÔ×Ï"
+msgstr "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device Number"
-msgstr "îÏÍÅÒ ÕÓÔÒÏÊÓÔ×Á"
+msgstr "ÐÐ¾Ð¼ÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "DevMaj"
-msgstr "NõÓÔÒï"
+msgstr "NÐ£ÑÑÑÐ"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "Device Number, major"
-msgstr "îÏÍÅÒ ÕÓÔÒÏÊÓÔ×Á, ÏÓÎÏ×ÎÏÊ"
+msgstr "ÐÐ¾Ð¼ÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð¹"
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "DevMin"
-msgstr "NõÓÔÒîï"
-
-#: src/dpformat.c:48
-msgid "Device Number, minor"
-msgstr "îÏÍÅÒ ÕÓÔÒÏÊÓÔ×Á, ÎÅÏÓÎÏ×ÎÏÊ"
+msgstr "NÐ£ÑÑÑÐÐ"
 
 #: src/dpformat.c:49
-msgid "Date of last Access"
-msgstr "÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÇÏ ÄÏÓÔÕÐÁ"
+msgid "Device Number, minor"
+msgstr "ÐÐ¾Ð¼ÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, Ð½ÐµÐ¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð¹"
 
 #: src/dpformat.c:50
-msgid "Date of last Modification"
-msgstr "÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÍÏÄÉÆÉËÁÃÉÉ"
-
-#: src/dpformat.c:51
-msgid "Created"
-msgstr "óÏÚÄÁÎ"
+#, fuzzy
+msgid "Time of Last Access"
+msgstr "ÐÑÐµÐ¼Ñ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÐµÐ³Ð¾ Ð´Ð¾ÑÑÑÐ¿Ð°"
 
 #: src/dpformat.c:51
-msgid "Date of Creation"
-msgstr "÷ÒÅÍÑ ÓÏÚÄÁÎÉÑ"
+#, fuzzy
+msgid "Time of Last Modification"
+msgstr "ÐÑÐµÐ¼Ñ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÐµÐ¹ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¸Ð¸"
 
 #: src/dpformat.c:52
-msgid "Type Name"
-msgstr "éÍÑ ÔÉÐÁ"
+#, fuzzy
+msgid "Time of Creation"
+msgstr "ÐÑÐµÐ¼Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ"
 
 #: src/dpformat.c:53
-msgid "I"
-msgstr "ú"
+msgid "Time of Last Change"
+msgstr ""
 
-#: src/dpformat.c:334
-msgid "B"
-msgstr "â"
+#: src/dpformat.c:54
+msgid "Type Name"
+msgstr "ÐÐ¼Ñ ÑÐ¸Ð¿Ð°"
 
-#: src/dpformat.c:338 src/sizeutil.c:32
-msgid "KB"
-msgstr "ëâ"
+#: src/dpformat.c:55
+msgid "I"
+msgstr "Ð"
 
-#: src/dpformat.c:343 src/sizeutil.c:33
-msgid "MB"
-msgstr "íâ"
+#: src/dpformat.c:56
+msgid "URI"
+msgstr ""
 
-#: src/dpformat.c:348 src/sizeutil.c:31
-msgid "GB"
-msgstr "çâ"
+#: src/dpformat.c:56
+msgid "URI (without file prefix)"
+msgstr ""
 
-#: src/errors.c:69
+#: src/errors.c:59
 #, c-format
 msgid "Couldn't %s \"%s\": %s (code %d)"
-msgstr "îÅ ÍÏÇÕ %s \"%s\": %s (ËÏÄ %d)"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ %s \"%s\": %s (ÐºÐ¾Ð´ %d)"
 
-#: src/errors.c:71
+#: src/errors.c:61
 #, c-format
 msgid "Couldn't %s \"%s\" (code %d)"
-msgstr "îÅ ÍÏÇÕ %s \"%s\" (ËÏÄ %d)"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ %s \"%s\" (ÐºÐ¾Ð´ %d)"
 
-#: src/errors.c:76
+#: src/errors.c:66
 #, c-format
 msgid "Couldn't %s \"%s\""
-msgstr "îÅ ÍÏÇÕ %s \"%s\""
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ %s \"%s\""
 
-#: src/errors.c:78
+#: src/errors.c:68
 #, c-format
 msgid "Couldn't %s"
-msgstr "îÅ ÍÏÇÕ %s"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ %s"
+
+#: src/errors.c:88
+#, c-format
+msgid "%s"
+msgstr ""
 
 # src/gentoo.c:440
-#: src/gentoo.c:421
+#: src/gentoo.c:427
 msgid "Report the version to standard output, and exit."
-msgstr "÷Ù×ÅÓÔÉ ÎÏÍÅÒ ×ÅÒÓÉÉ É ×ÙÊÔÉ."
+msgstr "ÐÑÐ²ÐµÑÑÐ¸ Ð½Ð¾Ð¼ÐµÑ Ð²ÐµÑÑÐ¸Ð¸ Ð¸ Ð²ÑÐ¹ÑÐ¸."
 
 # src/gentoo.c:440
-#: src/gentoo.c:423
+#: src/gentoo.c:429
 msgid "Report internal locale details, and exit."
-msgstr "÷Ù×ÅÓÔÉ ÄÅÔÁÌÉ ×ÎÕÔÒÅÎÎÅÊ ÌÏËÁÌÉÚÁÃÉÉ É ×ÙÊÔÉ."
+msgstr "ÐÑÐ²ÐµÑÑÐ¸ Ð´ÐµÑÐ°Ð»Ð¸ Ð²Ð½ÑÑÑÐµÐ½Ð½ÐµÐ¹ Ð»Ð¾ÐºÐ°Ð»Ð¸Ð·Ð°ÑÐ¸Ð¸ Ð¸ Ð²ÑÐ¹ÑÐ¸."
 
 # src/gentoo.c:441
-#: src/gentoo.c:425
+#: src/gentoo.c:431
 msgid "Allows gentoo to be run by the root user. Could be dangerous."
 msgstr ""
-"ðÏÚ×ÏÌÑÅÔ ÚÁÐÕÓËÁÔØ gentoo ÐÏÄ root'ÏÍ. íÏÖÅÔ ÐÒÉ×ÅÓÔÉ Ë ÐÅÞÁÌØÎÙÍ "
-"ÐÏÓÌÅÄÓÔ×ÉÑÍ. "
+"ÐÐ¾Ð·Ð²Ð¾Ð»ÑÐµÑ Ð·Ð°Ð¿ÑÑÐºÐ°ÑÑ gentoo Ð¿Ð¾Ð´ root'Ð¾Ð¼. ÐÐ¾Ð¶ÐµÑ Ð¿ÑÐ¸Ð²ÐµÑÑÐ¸ Ðº Ð¿ÐµÑÐ°Ð»ÑÐ½ÑÐ¼ "
+"Ð¿Ð¾ÑÐ»ÐµÐ´ÑÑÐ²Ð¸ÑÐ¼. "
 
 # src/gentoo.c:442
-#: src/gentoo.c:426
+#: src/gentoo.c:432
 msgid ""
 "Do not load the ~/.gentoorc configuration file; instead, use default values."
 msgstr ""
-"îÅ ÚÁÇÒÕÖÁÔØ ÆÁÊÌ ÎÁÓÔÒÏÅË ~/.gentoorc; ÉÓÐÏÌØÚÏ×ÁÔØ ÎÁÓÔÒÏÊËÉ ÐÏ ÕÍÏÌÞÁÎÉÀ."
+"ÐÐµ Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑ ÑÐ°Ð¹Ð» Ð½Ð°ÑÑÑÐ¾ÐµÐº ~/.gentoorc; Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ."
 
 # src/gentoo.c:443
-#: src/gentoo.c:427
+#: src/gentoo.c:433
 msgid ""
 "Do not load the ~/.gentoogtkrc GTK+ configuration file; instead, use system "
 "defaults."
 msgstr ""
-"îÅ ÚÁÇÒÕÖÁÔØ ÎÁÓÔÒÏÊËÉ GTK+ : ~/.gentoogtkrc; ÉÓÐÏÌØÚÏ×ÁÔØ ÓÉÓÔÅÍÎÙÅ "
-"ÚÎÁÞÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ."
+"ÐÐµ Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ GTK+ : ~/.gentoogtkrc; Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐµ "
+"Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ."
 
-# src/gentoo.c:445
-#: src/gentoo.c:429
-msgid "Do not use FAM to automatically detect changes in viewed directories."
+#: src/gentoo.c:434
+#, fuzzy
+msgid ""
+"Run COMMAND, a gentoo command. Done before user interaction allowed, but "
+"after configuration file has been read in. Can be used many times to run "
+"several commands in sequence."
+msgstr ""
+"ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ARG, ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ gentoo. ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð·Ð°Ð¿ÑÑÐºÐ°ÐµÑÑÑ Ð´Ð¾ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð¾ÐºÐ½Ð°, Ð½Ð¾ "
+"Ð¿Ð¾ÑÐ»Ðµ ÑÑÐµÐ½Ð¸Ñ ÑÐ°Ð¹Ð»Ð° Ð½Ð°ÑÑÑÐ¾ÐµÐº. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¾ ÑÐ°Ð· Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÐ° "
+"Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¸Ñ ÑÐ°Ð·Ð½ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´."
+
+#: src/gentoo.c:435
+msgid "COMMAND"
+msgstr ""
+
+#: src/gentoo.c:436 src/gentoo.c:437
+msgid "DIR"
 msgstr ""
-"îÅ ÉÓÐÏÌØÚÏ×ÁÔØ FAM ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÉÚÍÅÎÅÎÉÊ × ÐÒÏÓÍÏÔÒÉ×ÁÅÍÙÊ ËÁÔÁÌÏÇÁÈ."
 
 # src/gentoo.c:447
-#: src/gentoo.c:431
+#: src/gentoo.c:436
+#, fuzzy
 msgid ""
-"Use ARG as path for the left directory pane. Overrides default (and history)."
+"Use DIR as path for the left directory pane. Overrides default (and history)."
 msgstr ""
-"éÓÐÏÌØÚÏ×ÁÔØ ARG ËÁË ÐÕÔØ ÄÌÑ ÌÅ×ÏÊ ÐÁÎÅÌÉ. ðÅÒÅÏÐÒÅÄÅÌÉÔØ ÐÕÔØ ÐÏ ÕÍÏÌÞÁÎÉÀ"
-"(É ÉÓÔÏÒÉÀ)."
+"ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ARG ÐºÐ°Ðº Ð¿ÑÑÑ Ð´Ð»Ñ Ð»ÐµÐ²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸. ÐÐµÑÐµÐ¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ Ð¿ÑÑÑ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
+"(Ð¸ Ð¸ÑÑÐ¾ÑÐ¸Ñ)."
 
 # src/gentoo.c:448
-#: src/gentoo.c:432
+#: src/gentoo.c:437
+#, fuzzy
 msgid ""
-"Use ARG as path for the right directory pane. Overrides default (and "
+"Use DIR as path for the right directory pane. Overrides default (and "
 "history)."
 msgstr ""
-"éÓÐÏÌØÚÏ×ÁÔØ ARG ËÁË ÐÕÔØ ÄÌÑ ÐÒÁ×ÏÊ ÐÁÎÅÌÉ. ðÅÒÅÏÐÒÅÄÅÌÉÔØ ÐÕÔØ ÐÏ ÕÍÏÌÞÁÎÉÀ"
-"(É ÉÓÔÏÒÉÀ)."
+"ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ARG ÐºÐ°Ðº Ð¿ÑÑÑ Ð´Ð»Ñ Ð¿ÑÐ°Ð²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸. ÐÐµÑÐµÐ¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ Ð¿ÑÑÑ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
+"(Ð¸ Ð¸ÑÑÐ¾ÑÐ¸Ñ)."
 
-#: src/gentoo.c:433
-msgid ""
-"Run ARG, a gentoo command. Done before user interaction allowed, but after "
-"configuration file has been read in. Can be used many times to run several "
-"commands in sequence."
+#: src/gentoo.c:461
+msgid "- a graphical file manager using GTK+"
+msgstr ""
+
+#: src/gentoo.c:466
+#, c-format
+msgid "Failed to parse command line options: %s\n"
 msgstr ""
-"úÁÐÕÓÔÉÔØ ARG, ËÏÍÁÎÄÕ gentoo. ëÏÍÁÎÄÁ ÚÁÐÕÓËÁÅÔÓÑ ÄÏ ÏÔÏÂÒÁÖÅÎÉÑ ÏËÎÁ, ÎÏ "
-"ÐÏÓÌÅ ÞÔÅÎÉÑ ÆÁÊÌÁ ÎÁÓÔÒÏÅË. ÷ÏÚÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÎÅÓËÏÌØËÏ ÒÁÚ ÄÌÑ ÚÁÐÕÓËÁ "
-"ÎÅÓËÏÌØËÉÈ ÒÁÚÎÙÈ ËÏÍÁÎÄ."
 
-#: src/gentoo.c:492
+#: src/gentoo.c:506
 #, c-format
 msgid "%s: To run as root, envoke with the '--root-ok' option\n"
-msgstr "%s: þÔÏÂÙ ÚÁÐÕÓÔÉÔØ ÐÏÄ root ÉÓÐÏÌØÚÕÊÔÅ --root-ok\n"
+msgstr "%s: Ð§ÑÐ¾Ð±Ñ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ Ð¿Ð¾Ð´ root Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ --root-ok\n"
 
-#: src/gentoo.c:524
+#: src/gentoo.c:538
 msgid "Couldn't initialize userinfo module - username resolving won't work"
 msgstr ""
-"îÅ ÍÏÇÕ ÎÁÊÔÉ ÍÏÄÕÌØ userinfo - ÏÐÒÅÄÅÌÅÎÉÅ ÉÍÅÎ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÎÅ ÂÕÄÅÔ "
-"ÒÁÂÏÔÁÔØ."
-
-#: src/gentoo.c:529
-msgid "Couldn't initialize mount data - automounting won't work"
-msgstr ""
-"îÅ ÍÏÇÕ ÎÁÊÔÉ ÏÐÉÓÁÎÉÅ ÐÏÄËÌÀÞÅÎÉÊ ÄÉÓËÏ× - Á×ÔÏÐÏÄËÌÀÞÅÎÉÅ ÎÅ ÂÕÄÅÔ "
-"ÒÁÂÏÔÁÔØ."
+"ÐÐµ Ð¼Ð¾Ð³Ñ Ð½Ð°Ð¹ÑÐ¸ Ð¼Ð¾Ð´ÑÐ»Ñ userinfo - Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð¸Ð¼ÐµÐ½ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ Ð½Ðµ Ð±ÑÐ´ÐµÑ "
+"ÑÐ°Ð±Ð¾ÑÐ°ÑÑ."
 
-#: src/gentoo.c:560
+#: src/gentoo.c:570
 #, c-format
 msgid "gentoo v%s by Emil Brink <emil@obsession.se>"
 msgstr "gentoo v%s - Emil Brink <emil@obsession.se>"
 
-#: src/gfam.c:216
-#, c-format
-msgid "FAM open failed, error %d--FAM will not be used"
-msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ FAM, ÏÛÉÂËÁ %d - FAM ÎÅ ÉÓÐÏÌØÚÕÀ"
-
-#: src/gfam.c:235
-#, fuzzy, c-format
-msgid ""
-"Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, perhaps)"
+#: src/gentoo.c:577
+msgid "Development Version Warning"
 msgstr ""
-"îÅ ÍÏÇÕ ÄÏÂÁ×ÉÔØ ÍÏÎÉÔÏÒ FAM \"%s\", ÏÛÉÂËÁ %s (ÍÏÖÅÔ ÚÁÐÕÓÔÉÔØ Ó --no-fam ?)"
 
-#: src/gfam.c:241
-#, fuzzy, c-format
+#: src/gentoo.c:577
 msgid ""
-"Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go around, "
-"perhaps)"
+"This version of gentoo is considered somewhat new and untested. There have "
+"been major changes to almost all parts of the program since the previous "
+"version. Please be a bit careful, and make sure you report any problem to "
+"the author. Thanks."
 msgstr ""
-"îÅ ÍÏÇÕ ÄÏÂÁ×ÉÔØ ÍÏÎÉÔÏÒ FAM \"%s\", ÏÛÉÂËÁ %s (ÍÏÖÅÔ ÚÁÐÕÓÔÉÔØ Ó --no-fam ?)"
 
-#: src/guiutil.c:118
+#: src/guiutil.c:124
 msgid "Progress"
-msgstr "óÏÓÔÏÑÎÉÅ"
+msgstr "Ð¡Ð¾ÑÑÐ¾ÑÐ½Ð¸Ðµ"
 
 #: src/icon_dialog.c:52
 msgid "Pick Icon"
-msgstr "÷ÙÂÅÒÉÔÅ ÚÎÁÞÏË"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð·Ð½Ð°ÑÐ¾Ðº"
 
 #: src/icon_dialog.c:59
 msgid "Loading Icon Graphics..."
-msgstr "úÁÇÒÕÚËÁ ÚÎÁÞËÁ ..."
+msgstr "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð·Ð½Ð°ÑÐºÐ° ..."
 
-#: src/menus.c:278
+#: src/menus.c:284
 msgid "(No Selection)"
-msgstr "(ÎÅÔ ×ÙÄÅÌÅÎÉÑ)"
+msgstr "(Ð½ÐµÑ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ñ)"
 
-#: src/menus.c:514
+#: src/menus.c:521
 msgid "RegExp..."
-msgstr "÷ÙÒÁÖÅÎÉÅ"
+msgstr "ÐÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: src/menus.c:526
+#: src/menus.c:533
 msgid "Other"
-msgstr "ó ÄÒÕÇÏÊ ÐÁÎÅÌÉ"
+msgstr "Ð¡ Ð´ÑÑÐ³Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
 
-#: src/menus.c:527
+#: src/menus.c:534
 msgid "Rescan"
-msgstr "ïÂÎÏ×ÉÔØ"
+msgstr "ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ"
 
-#: src/menus.c:528
+#: src/menus.c:535
 msgid "Select"
-msgstr "÷ÙÂÏÒ"
+msgstr "ÐÑÐ±Ð¾Ñ"
 
-#: src/menus.c:532
+#: src/menus.c:539
 msgid "Run..."
-msgstr "÷ÙÐÏÌÎÉÔØ..."
+msgstr "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ..."
 
-#: src/menus.c:534
+#: src/menus.c:541
 msgid "Configure..."
-msgstr "îÁÓÔÒÏÉÔØ..."
+msgstr "ÐÐ°ÑÑÑÐ¾Ð¸ÑÑ..."
 
-#: src/menus.c:610
+#: src/menus.c:618
 msgid "Select Menu"
-msgstr "÷ÙÂÅÒÉÔÅ ÍÅÎÀ"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¼ÐµÐ½Ñ"
 
-#: src/mount.c:222
-#, c-format
-msgid "Execution of \"%s %s\" failed:\n"
-msgstr "÷ÙÐÏÌÎÅÎÉÅ \"%s %s\" ÐÒÅÒ×ÁÎÏ:\n"
-
-#: src/mount.c:318
-#, c-format
-msgid "Mounting \"%s\" on \"%s\"..."
-msgstr "ðÏÄËÌÀÞÅÎÉÅ \"%s\" × \"%s\"..."
+#: src/nag_dialog.c:37
+msgid "_Don't show this dialog again"
+msgstr ""
 
 #: src/overwrite.c:49
 msgid "_OK|A_ll|_Skip|Skip _All|_Cancel"
-msgstr "_äá|_÷ÓÅ|_îÅÔ|îÉ ÏÄÎÏÇÏ|_ïÔÍÅÎÁ"
-
-# c-format
-#: src/overwrite.c:73
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Old: %%%s bytes, changed on %%s,\n"
-"New: %%%s bytes, changed on %%s."
-msgstr ""
-"\n"
-"óÔÁÒÏÅ: %llu ÂÁÊÔ, ÉÚÍÅÎÅÎ %s.\n"
-"îÏ×ÏÅ: %llu ÂÁÊÔ, ÉÚÍÅÎÅÎ %s."
+msgstr "_ÐÐ|_ÐÑÐµ|_ÐÐµÑ|ÐÐ¸ Ð¾Ð´Ð½Ð¾Ð³Ð¾|_ÐÑÐ¼ÐµÐ½Ð°"
 
-#: src/progress.c:195
+#: src/progress.c:196
 #, c-format
 msgid "Total (%s)"
-msgstr "÷ÓÅÇÏ (%s)"
+msgstr "ÐÑÐµÐ³Ð¾ (%s)"
 
-#: src/progress.c:315
+#: src/progress.c:305
 #, c-format
 msgid "Elapsed %02d:%02d  Speed %s/s  ETA %02u:%02u"
-msgstr "÷ÒÅÍÑ %02d:%02d  óËÏÒÏÓÔØ %s/c ïÓÔÁÌÏÓØ %02u:%02u"
+msgstr "ÐÑÐµÐ¼Ñ %02d:%02d  Ð¡ÐºÐ¾ÑÐ¾ÑÑÑ %s/c ÐÑÑÐ°Ð»Ð¾ÑÑ %02u:%02u"
 
-#: src/sizeutil.c:30
-msgid "BYTES"
-msgstr "âÁÊÔ"
+#: src/sizeutil.c:31
+#, fuzzy
+msgid "Unformatted Size"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² Ð±Ð°Ð¹ÑÐ°Ñ"
 
-#: src/sizeutil.c:69
-#, c-format
-msgid "%%%s"
-msgstr ""
+#: src/sizeutil.c:32
+#, fuzzy
+msgid "Formatted Size, Without Unit"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ,Ð² \"ÑÐ¼Ð½ÑÑ\" ÐµÐ´Ð¸Ð½Ð¸ÑÐ°Ñ"
 
-#: src/sizeutil.c:70
-#, fuzzy, c-format
-msgid "%%%s bytes"
-msgstr "%Lu ÂÁÊÔ"
+#: src/sizeutil.c:33
+#, fuzzy
+msgid "Formatted Size, in Bytes"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² Ð±Ð°Ð¹ÑÐ°Ñ"
 
-#: src/sizeutil.c:71
-#, fuzzy, c-format
-msgid "%%%s KB"
-msgstr "%Lu ëâ"
+#: src/sizeutil.c:33 src/sizeutil.c:159
+#, fuzzy
+msgid "bytes"
+msgstr "Ð´Ð°"
 
-#: src/sizeutil.c:72
-#, fuzzy, c-format
-msgid "%%%s MB"
-msgstr "%Lu íâ"
+#: src/sizeutil.c:34
+#, fuzzy
+msgid "Formatted Size, in Kilobytes"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² ÐºÐ¸Ð»Ð¾Ð±Ð°Ð¹ÑÐ°Ñ"
 
-#: src/sizeutil.c:73
-#, fuzzy, c-format
-msgid "%%%s GB"
-msgstr "%Lu çâ"
+#: src/sizeutil.c:34 src/sizeutil.c:163
+msgid "KB"
+msgstr "ÐÐ"
 
-#: src/sizeutil.c:164 src/sizeutil.c:211
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f ëâ"
+#: src/sizeutil.c:35
+#, fuzzy
+msgid "Formatted Size, in Megabytes"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² Ð¼ÐµÐ³Ð°Ð±Ð°Ð¹ÑÐ°Ñ"
 
-#: src/sizeutil.c:170 src/sizeutil.c:217
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f íâ"
+#: src/sizeutil.c:35 src/sizeutil.c:167
+msgid "MB"
+msgstr "ÐÐ"
 
-#: src/sizeutil.c:176 src/sizeutil.c:223
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f çâ"
+#: src/sizeutil.c:36
+#, fuzzy
+msgid "Formatted Size, in Gigabytes"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² Ð³Ð¸Ð³Ð°Ð±Ð°Ð¹ÑÐ°Ñ"
+
+#: src/sizeutil.c:36 src/sizeutil.c:171
+msgid "GB"
+msgstr "ÐÐ"
+
+#: src/sizeutil.c:37
+#, fuzzy
+msgid "Formatted Size, in Terabytes"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ, Ð² Ð¼ÐµÐ³Ð°Ð±Ð°Ð¹ÑÐ°Ñ"
+
+#: src/sizeutil.c:37 src/sizeutil.c:175
+#, fuzzy
+msgid "TB"
+msgstr "Ð"
+
+#: src/sizeutil.c:38
+#, fuzzy
+msgid "Formatted Size, Automatic Unit"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ,Ð² \"ÑÐ¼Ð½ÑÑ\" ÐµÐ´Ð¸Ð½Ð¸ÑÐ°Ñ"
 
 #: src/style_dialog.c:40
 msgid "Select Style"
-msgstr "÷ÙÂÅÒÉÔÅ ËÌÁÓÓ"
+msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÐºÐ»Ð°ÑÑ"
 
-#: src/styles.c:112
+#: src/styles.c:114
 msgid "Root"
 msgstr "Root"
 
-#: src/styles.c:118 src/types.c:485 src/types.c:488
+#: src/styles.c:120 src/types.c:292 src/types.c:295
 msgid "Directory"
-msgstr "ëÁÔÁÌÏÇ"
+msgstr "ÐÐ°ÑÐ°Ð»Ð¾Ð³"
 
-#: src/styles.c:961
+#: src/styles.c:889
 msgid "New Style"
-msgstr "îÏ×ÙÊ ËÌÁÓÓ"
+msgstr "ÐÐ¾Ð²ÑÐ¹ ÐºÐ»Ð°ÑÑ"
 
-#: src/styles.c:961
+#: src/styles.c:889
 #, c-format
 msgid "New Style %u"
-msgstr "îÏ×ÙÊ ËÌÁÓÓ %u"
+msgstr "ÐÐ¾Ð²ÑÐ¹ ÐºÐ»Ð°ÑÑ %u"
 
-#: src/textview.c:152
+#: src/textview.c:190
 #, c-format
-msgid "Unable to convert text from native character set (%s) to UTF-8: %s"
+msgid ""
+"\n"
+"** Text conversion from charset '%s' failed, aborting."
 msgstr ""
 
-#: src/textview.c:252 src/textview.c:353
-msgid "File reading"
-msgstr "þÔÅÎÉÅ ÆÁÊÌÁ"
-
-#: src/textview.c:419
+#: src/textview.c:405
 #, c-format
 msgid "Line %d (%.0f%%)"
-msgstr "óÔÒÏËÁ %d (%.0f%%)"
+msgstr "Ð¡ÑÑÐ¾ÐºÐ° %d (%.0f%%)"
 
-#: src/textview.c:472
+#: src/textview.c:455
 msgid "Enter Line Number or Percentage:"
-msgstr "÷×ÅÄÉÔÅ ÎÏÍÅÒ ÓÔÒÏËÉ ÉÌÉ ÐÒÏÃÅÎÔ:"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð½Ð¾Ð¼ÐµÑ ÑÑÑÐ¾ÐºÐ¸ Ð¸Ð»Ð¸ Ð¿ÑÐ¾ÑÐµÐ½Ñ:"
 
-#: src/textview.c:478
+#: src/textview.c:461
 msgid "Goto"
-msgstr "ðÅÒÅÊÔÉ"
+msgstr "ÐÐµÑÐµÐ¹ÑÐ¸"
 
-#: src/textview.c:613
+#: src/textview.c:596
 msgid "Enter Text to Search For (RE)"
-msgstr "÷×ÅÄÉÔÅ ÔÅËÓÔ ÄÌÑ ÐÏÉÓËÁ (÷ÙÒÁÖÅÎÉÅ)"
+msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ ÑÐµÐºÑÑ Ð´Ð»Ñ Ð¿Ð¾Ð¸ÑÐºÐ° (ÐÑÑÐ°Ð¶ÐµÐ½Ð¸Ðµ)"
 
-#: src/textview.c:623
+#: src/textview.c:607
 msgid "Don't Span Newlines?"
-msgstr "îÅ ÒÁÓÐÒÅÄÅÌÑÔØ ÎÏ×ÙÅ ÌÉÎÉÉ?"
+msgstr "ÐÐµ ÑÐ°ÑÐ¿ÑÐµÐ´ÐµÐ»ÑÑÑ Ð½Ð¾Ð²ÑÐµ Ð»Ð¸Ð½Ð¸Ð¸?"
 
-#: src/textview.c:629
+#: src/textview.c:613
 msgid "Search"
-msgstr "ðÏÉÓË"
+msgstr "ÐÐ¾Ð¸ÑÐº"
+
+#: src/types.c:287
+msgid "Unknown"
+msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÐ¹"
 
-#: src/types.c:454
+#: src/types.c:572
 #, c-format
 msgid ""
 "Got SIGPIPE when writing to 'file' process (%s), it seems to have terminated "
 "prematurely."
 msgstr ""
 
-#: src/types.c:461
+#: src/types.c:578
 msgid "Unable to run spawn 'file' command: "
 msgstr ""
 
-#: src/types.c:480
-msgid "Unknown"
-msgstr "îÅÉÚ×ÅÓÔÎÙÊ"
-
-#: src/window.c:82
+#: src/window.c:83
 msgid "Configure gentoo"
-msgstr "îÁÓÔÒÏÊËÁ"
+msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ°"
 
-#: src/window.c:89
+#: src/window.c:90
 msgid "Text Viewer"
-msgstr "ðÒÏÓÍÏÔÒ ÔÅËÓÔÁ"
+msgstr "ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÐµÐºÑÑÐ°"
 
-#: src/window.c:200
+#: src/window.c:199
 msgid "Position"
-msgstr "ðÏÚÉÃÉÑ"
+msgstr "ÐÐ¾Ð·Ð¸ÑÐ¸Ñ"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Height"
-msgstr "÷ÙÓÏÔÁ"
+msgstr "ÐÑÑÐ¾ÑÐ°"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "X"
 msgstr "X"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Y"
 msgstr "Y"
 
-#: src/window.c:208
+#: src/window.c:207
 msgid "Set on Open?"
-msgstr "õÓÔÁÎÏ×ÉÔØ ÐÒÉ ÏÔËÒÙÔÉÉ?"
+msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¿ÑÐ¸ Ð¾ÑÐºÑÑÑÐ¸Ð¸?"
 
-#: src/window.c:214
+#: src/window.c:213
 msgid "Update on Close?"
-msgstr "óÏÈÒÁÎÉÔØ ÐÒÉ ÚÁËÒÙÔÉÉ?"
+msgstr "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¿ÑÐ¸ Ð·Ð°ÐºÑÑÑÐ¸Ð¸?"
 
-#: src/window.c:245
+#: src/window.c:244
 msgid "Grab"
-msgstr "úÁÈ×ÁÔÉÔØ"
+msgstr "ÐÐ°ÑÐ²Ð°ÑÐ¸ÑÑ"
 
 #: src/xmlutil.c:225
 msgid "XML module emitted locale-dependant real number"
-msgstr "XML ÍÏÄÕÌØ ×ÙÄÁÌ ÌÏËÁÌØÎÏ-ÚÁ×ÉÓÉÍÙÊ ÎÏÍÅÒ"
+msgstr "XML Ð¼Ð¾Ð´ÑÐ»Ñ Ð²ÑÐ´Ð°Ð» Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾-Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ"
+
+#~ msgid "Use Dialog to Report Errors?"
+#~ msgstr "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³ Ð´Ð»Ñ Ð¾ÑÐ¸Ð±Ð¾Ðº?"
+
+#~ msgid "Path Right Click"
+#~ msgstr "ÐÑÐ°Ð²ÑÐ¹ ÑÐµÐ»ÑÐ¾Ðº Ð½Ð° Ð¿ÑÑÐ¸"
+
+#~ msgid "Raw Size, in Bytes"
+#~ msgstr "Ð¡ÑÑÐ¾Ð¹ ÑÐ°Ð·Ð¼ÐµÑ, Ð² Ð±Ð°Ð¹ÑÐ°Ñ"
+
+#~ msgid "Always Set"
+#~ msgstr "ÐÑÐµÐ³Ð´Ð° Ð²ÐºÐ»ÑÑÐµÐ½Ð¾"
+
+#~ msgid "Modify 'Control' Key State"
+#~ msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ðµ ÐºÐ½Ð¾Ð¿ÐºÐ¸ 'Control'"
+
+#~ msgid "Active Pane Titles"
+#~ msgstr "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð°ÐºÑÐ¸Ð²Ð½Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸"
+
+#~ msgid "Focused Row, Unselected"
+#~ msgstr "ÐÑÐ±ÑÐ°Ð½Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ°, Ð½Ðµ Ð¾ÑÐ¼ÐµÑÐµÐ½Ð°Ñ"
+
+#~ msgid "Focused Row, Selected"
+#~ msgstr "ÐÑÐ±ÑÐ°Ð½Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ°, Ð¾ÑÐ¼ÐµÑÐµÐ½Ð½Ð°Ñ"
+
+#~ msgid "Beta Software"
+#~ msgstr "ÐÐµÑÐ° Ð²ÐµÑÑÐ¸Ñ"
+
+#~ msgid "Next Version?"
+#~ msgstr "Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ Ð²ÐµÑÑÐ¸Ñ?"
+
+#~ msgid ""
+#~ "This splitting mode has not been\n"
+#~ "implemented yet... Sorry."
+#~ msgstr ""
+#~ "Ð ÐµÐ¶Ð¸Ð¼ ÑÐ°Ð·Ð±Ð¸Ð²ÐºÐ¸ ÐµÑÐµ Ð½Ðµ \n"
+#~ "ÑÐµÐ°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½... ÐÐ·Ð²Ð¸Ð½Ð¸ÑÐµ."
+
+#~ msgid ""
+#~ "Case-sensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ° Ñ ÑÑÐµÑÐ¾Ð¼ ÑÐµÐ³Ð¸ÑÑÑÐ° ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ²ÐµÑÐ½Ð¾ Ñ ÑÑÑÑÐºÐ¸Ð¼Ð¸ Ð±ÑÐºÐ²Ð°Ð¼Ð¸"
+
+#~ msgid ""
+#~ "Case-insensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr "Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ° Ð±ÐµÐ· ÑÑÐµÑÐ° ÑÐµÐ³Ð¸ÑÑÑÐ° ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ Ð½ÐµÐ²ÐµÑÐ½Ð¾ Ñ ÑÑÑÑÐºÐ¸Ð¼Ð¸ Ð±ÑÐºÐ²Ð°Ð¼Ð¸"
+
+#~ msgid "BYTES"
+#~ msgstr "ÐÐ°Ð¹Ñ"
+
+#, fuzzy
+#~ msgid "%%%s bytes"
+#~ msgstr "%Lu Ð±Ð°Ð¹Ñ"
+
+#, fuzzy
+#~ msgid "%%%s KB"
+#~ msgstr "%Lu ÐÐ"
+
+#, fuzzy
+#~ msgid "%%%s MB"
+#~ msgstr "%Lu ÐÐ"
+
+#, fuzzy
+#~ msgid "%%%s GB"
+#~ msgstr "%Lu ÐÐ"
+
+#~ msgid "%.2f KB"
+#~ msgstr "%.2f ÐÐ"
+
+#~ msgid "%.2f MB"
+#~ msgstr "%.2f ÐÐ"
+
+#~ msgid "%.2f GB"
+#~ msgstr "%.2f ÐÐ"
+
+#~ msgid "Numerical Mode?"
+#~ msgstr "Ð£ÑÐ¸ÑÑÐ²Ð°ÑÑ Ð´Ð»Ð¸Ð½Ñ?"
+
+#~ msgid "Never"
+#~ msgstr "ÐÐ¸ÐºÐ¾Ð³Ð´Ð°"
+
+#~ msgid "On Every Access"
+#~ msgstr "ÐÑÐ¸ ÐºÐ°Ð¶Ð´Ð¾Ð¼ Ð¾Ð±ÑÐ°ÑÐµÐ½Ð¸Ð¸"
+
+#~ msgid "Mounting"
+#~ msgstr "ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ"
+
+#~ msgid "Mount When?"
+#~ msgstr "ÐÐ¾Ð³Ð´Ð° Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ°ÑÑ?"
+
+#~ msgid "Mount Options"
+#~ msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ð´Ð¸ÑÐºÐ¾Ð²"
+
+#~ msgid "Mount Command"
+#~ msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ"
+
+#~ msgid "Unmount Command"
+#~ msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ"
+
+#~ msgid "Only Mount on Toplevel Directories?"
+#~ msgstr "ÐÐ¾Ð´ÐºÐ»ÑÑÐ°ÑÑ ÑÐ¾Ð»ÑÐºÐ¾ Ð² ÐºÐ¾ÑÐ½ÐµÐ²Ð¾Ð¼ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ðµ?"
+
+#~ msgid "Use Command Error Dialog?"
+#~ msgstr "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³ Ð´Ð»Ñ Ð¾ÑÐ¸Ð±Ð¾Ðº"
+
+#~ msgid "Unmount When gentoo Quits?"
+#~ msgstr "ÐÑÐºÐ»ÑÑÐ°ÑÑ Ð¿ÑÐ¸ Ð²ÑÑÐ¾Ð´Ðµ?"
+
+#~ msgid "FAM: Supported and active."
+#~ msgstr "FAM: ÐÐ¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ Ð¸ Ð²ÐºÐ»ÑÑÐµÐ½Ð¾"
+
+#~ msgid "FAM: Supported, but not active."
+#~ msgstr "FAM: ÐÐ¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ, Ð½Ð¾ Ð½Ðµ Ð²ÐºÐ»ÑÑÐµÐ½Ð¾."
+
+#~ msgid "FAM: Not supported."
+#~ msgstr "FAM: ÐÐµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ."
+
+#~ msgid ""
+#~ "Can't copy directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ \"%s\"\n"
+#~ "Ð² \"%s\"\n"
+#~ "(ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ°Ð¼Ð¾Ð³Ð¾ Ð² ÑÐµÐ±Ñ)."
+
+#~ msgid "Wrap Around At Top And Bottom?"
+#~ msgstr "ÐÐµÑÐµÑÐºÐ°ÐºÐ¸Ð²Ð°ÑÑ Ð² Ð´ÑÑÐ³Ð¾Ð¹ ÐºÐ¾Ð½ÐµÑ ÑÐ¿Ð¸ÑÐºÐ°?"
+
+#~ msgid ""
+#~ "%s (%s bytes,\n"
+#~ "%s blocks)"
+#~ msgstr ""
+#~ "%s (%s Ð±Ð°Ð¹Ñ),\n"
+#~ "%s Ð±Ð»Ð¾ÐºÐ¾Ð²)"
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¿ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ \"%s\"\n"
+#~ "Ð² \"%s\"\n"
+#~ "(Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ - Ð¿Ð¾Ð´Ð¿Ð°Ð¿ÐºÐ° Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ°)."
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the destination contains the source."
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¿ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ \"%s\"\n"
+#~ "Ð² \"%s\"\n"
+#~ "(Ð¸ÑÑÐ¾ÑÐ½Ð¸Ðº - Ð¿Ð¾Ð´Ð¿Ð°Ð¿ÐºÐ° Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ)."
+
+#~ msgid "Regular expression error:\n"
+#~ msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ:\n"
+
+#~ msgid "Use mmap() to Speed Loading?"
+#~ msgstr "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ mmap() Ð´Ð»Ñ ÑÑÐºÐ¾ÑÐµÐ½Ð¸Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸?"
+
+#, fuzzy
+#~ msgid " (%%s/%%s, %%%s/%%%s blocks)"
+#~ msgstr " (%s/%s, %Lu/%Lu Ð±Ð»Ð¾ÐºÐ¾Ð²)"
+
+# src/gentoo.c:445
+#~ msgid ""
+#~ "Do not use FAM to automatically detect changes in viewed directories."
+#~ msgstr ""
+#~ "ÐÐµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ FAM Ð´Ð»Ñ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð² Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ¸Ð²Ð°ÐµÐ¼ÑÐ¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð°Ñ."
+
+#~ msgid "Couldn't initialize mount data - automounting won't work"
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ Ð½Ð°Ð¹ÑÐ¸ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ð¹ Ð´Ð¸ÑÐºÐ¾Ð² - Ð°Ð²ÑÐ¾Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ð½Ðµ Ð±ÑÐ´ÐµÑ "
+#~ "ÑÐ°Ð±Ð¾ÑÐ°ÑÑ."
+
+#~ msgid "FAM open failed, error %d--FAM will not be used"
+#~ msgstr "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¾ÑÐºÑÑÑÑ FAM, Ð¾ÑÐ¸Ð±ÐºÐ° %d - FAM Ð½Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, "
+#~ "perhaps)"
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð¼Ð¾Ð½Ð¸ÑÐ¾Ñ FAM \"%s\", Ð¾ÑÐ¸Ð±ÐºÐ° %s (Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ Ñ --no-"
+#~ "fam ?)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go "
+#~ "around, perhaps)"
+#~ msgstr ""
+#~ "ÐÐµ Ð¼Ð¾Ð³Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð¼Ð¾Ð½Ð¸ÑÐ¾Ñ FAM \"%s\", Ð¾ÑÐ¸Ð±ÐºÐ° %s (Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ Ñ --no-"
+#~ "fam ?)"
+
+#~ msgid "Execution of \"%s %s\" failed:\n"
+#~ msgstr "ÐÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ \"%s %s\" Ð¿ÑÐµÑÐ²Ð°Ð½Ð¾:\n"
+
+#~ msgid "Mounting \"%s\" on \"%s\"..."
+#~ msgstr "ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ \"%s\" Ð² \"%s\"..."
+
+# c-format
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Old: %%%s bytes, changed on %%s,\n"
+#~ "New: %%%s bytes, changed on %%s."
+#~ msgstr ""
+#~ "\n"
+#~ "Ð¡ÑÐ°ÑÐ¾Ðµ: %llu Ð±Ð°Ð¹Ñ, Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½ %s.\n"
+#~ "ÐÐ¾Ð²Ð¾Ðµ: %llu Ð±Ð°Ð¹Ñ, Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½ %s."
+
+#~ msgid "File reading"
+#~ msgstr "Ð§ÑÐµÐ½Ð¸Ðµ ÑÐ°Ð¹Ð»Ð°"
 
 #, fuzzy
 #~ msgid "Pick Command ..."
-#~ msgstr "÷ÙÂÒÁÔØ ËÏÄ"
+#~ msgstr "ÐÑÐ±ÑÐ°ÑÑ ÐºÐ¾Ð´"
 
 #~ msgid "Clr"
-#~ msgstr "îÅÔ"
+#~ msgstr "ÐÐµÑ"
 
 #~ msgid "Buffer Size for mmap()"
-#~ msgstr "òÁÚÍÅÒ ÂÕÆÅÒÁ ÄÌÑ mmap()"
+#~ msgstr "Ð Ð°Ð·Ð¼ÐµÑ Ð±ÑÑÐµÑÐ° Ð´Ð»Ñ mmap()"
 
 #~ msgid "Top"
-#~ msgstr "îÁÞÁÌÏ"
+#~ msgstr "ÐÐ°ÑÐ°Ð»Ð¾"
 
 #~ msgid "Bottom"
-#~ msgstr "ëÏÎÅÃ"
+#~ msgstr "ÐÐ¾Ð½ÐµÑ"
 
 #~ msgid "_Goto..."
-#~ msgstr "ðÅÒÅÊÔÉ..."
+#~ msgstr "ÐÐµÑÐµÐ¹ÑÐ¸..."
 
 #~ msgid "_Search..."
-#~ msgstr "ðÏÉÓË..."
+#~ msgstr "ÐÐ¾Ð¸ÑÐº..."
 
 #~ msgid "_Quit"
-#~ msgstr "÷ÙÈÏÄ"
+#~ msgstr "ÐÑÑÐ¾Ð´"
 
 #, fuzzy
 #~ msgid "SelectShell"
-#~ msgstr "÷ÙÂÏÒ"
+#~ msgstr "ÐÑÐ±Ð¾Ñ"
 
 #~ msgid "Close"
-#~ msgstr "úÁËÒÙÔØ"
+#~ msgstr "ÐÐ°ÐºÑÑÑÑ"

gentoo-0.15.6.tar.bz2/po/ru_RU.utf8.gmo -> gentoo-0.19.9.tar.gz/po/ru_RU.utf8.gmo Changed

gentoo-0.15.6.tar.bz2/po/ru_RU.utf8.po -> gentoo-0.19.9.tar.gz/po/ru_RU.utf8.po Changed

@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: gentoo 0.11.51\n"
 "Report-Msgid-Bugs-To: Emil Brink\n"
-"POT-Creation-Date: 2009-07-11 19:05+0200\n"
+"POT-Creation-Date: 2011-01-26 21:54+0100\n"
 "PO-Revision-Date: 2008-07-13 20:20+0200\n"
 "Last-Translator: Michael Y. Zaripov <m3@mail.ru>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -83,7 +84,7 @@
 msgid "Set Row Width"
 msgstr "Установить ширину"
 
-#: src/cfg_buttons.c:326 src/cfg_buttons.c:749
+#: src/cfg_buttons.c:326 src/cfg_buttons.c:748
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -95,7 +96,7 @@
 msgid "Really delete current button row?"
 msgstr "Действительно удалить текущую строку кнопок?"
 
-#: src/cfg_buttons.c:439 src/cfg_styles.c:671
+#: src/cfg_buttons.c:439 src/cfg_styles.c:680
 msgid "_Delete|_Cancel"
 msgstr "_Удалить|_Отмена"
 
@@ -119,104 +120,104 @@
 msgid "Label"
 msgstr "Заголовок"
 
-#: src/cfg_buttons.c:685 src/cfg_controls.c:645 src/cfg_controls.c:696
-#: src/cfg_controls.c:718 src/cfg_controls.c:739
+#: src/cfg_buttons.c:686 src/cfg_controls.c:612 src/cfg_controls.c:663
+#: src/cfg_controls.c:685
 msgid "Command"
 msgstr "Команда"
 
-#: src/cfg_buttons.c:696 src/cfg_controls.c:639
+#: src/cfg_buttons.c:697 src/cfg_controls.c:606
 msgid "Key"
 msgstr "Кнопка"
 
-#: src/cfg_buttons.c:711 src/cfg_dirpane.c:1373
+#: src/cfg_buttons.c:712
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/cfg_buttons.c:715
+#: src/cfg_buttons.c:716
 msgid "Background..."
 msgstr "Фон..."
 
-#: src/cfg_buttons.c:716 src/cfg_buttons.c:722
+#: src/cfg_buttons.c:717 src/cfg_buttons.c:723
 msgid "Reset to Default"
 msgstr "Вернуть начальные"
 
-#: src/cfg_buttons.c:721
+#: src/cfg_buttons.c:722
 msgid "Foreground..."
 msgstr "Цвет"
 
-#: src/cfg_buttons.c:749
+#: src/cfg_buttons.c:748
 msgid "Shortcuts"
 msgstr "Закладки"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Clear"
 msgstr "Убрать"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy Colors To"
 msgstr "Копировать цвета"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy To"
 msgstr "Копировать"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Swap With"
 msgstr "Обменять"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Add Row..."
 msgstr "Добавить строку..."
 
-#: src/cfg_buttons.c:751 src/cfg_cmdseq.c:951
+#: src/cfg_buttons.c:750 src/cfg_cmdseq.c:966
 msgid "Delete Row"
 msgstr "Убрать строку"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Down"
 msgstr "Вниз"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Row Width..."
 msgstr "Ширина строки..."
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Up"
 msgstr "Вверх"
 
-#: src/cfg_buttons.c:762
+#: src/cfg_buttons.c:761
 msgid "Sheet"
 msgstr "Лист"
 
-#: src/cfg_buttons.c:778
+#: src/cfg_buttons.c:775
 msgid "Primary"
 msgstr "Основная"
 
-#: src/cfg_buttons.c:780
+#: src/cfg_buttons.c:777
 msgid "Secondary"
 msgstr "Вторичная"
 
-#: src/cfg_buttons.c:785
+#: src/cfg_buttons.c:782
 msgid "Tooltip"
 msgstr "Подсказка"
 
-#: src/cfg_buttons.c:792 src/cfg_dirpane.c:1145
+#: src/cfg_buttons.c:790 src/cfg_dirpane.c:1107
 msgid "Flags"
 msgstr "Флаги"
 
-#: src/cfg_buttons.c:794
+#: src/cfg_buttons.c:792
 msgid "Narrow?"
 msgstr "Сузить?"
 
-#: src/cfg_buttons.c:798
+#: src/cfg_buttons.c:796
 msgid "Show Tooltip?"
 msgstr "Показывать подсказки"
 
-#: src/cfg_buttons.c:833
+#: src/cfg_buttons.c:831
 msgid "Buttons"
 msgstr "Кнопки"
 
-#: src/cfg_buttons.c:834 src/cfg_cmdseq.c:1067
+#: src/cfg_buttons.c:832 src/cfg_cmdseq.c:1081
 msgid "Definitions"
 msgstr "Определения"
 
@@ -224,260 +225,301 @@
 msgid "Options"
 msgstr "Детали"
 
-#: src/cfg_cmdseq.c:610
+#: src/cfg_cmdseq.c:611
 msgid "Select Builtin"
 msgstr "Выбрать встроеные"
 
-#: src/cfg_cmdseq.c:626
+#: src/cfg_cmdseq.c:627
 msgid "Opening brace"
 msgstr "Открыть скобу"
 
-#: src/cfg_cmdseq.c:627
+#: src/cfg_cmdseq.c:628
 msgid "Closing brace"
 msgstr "Закрыть скобу"
 
-#: src/cfg_cmdseq.c:628
+#: src/cfg_cmdseq.c:629
 msgid "First selected"
 msgstr "Первый выбранный"
 
-#: src/cfg_cmdseq.c:629
+#: src/cfg_cmdseq.c:630
 msgid "First selected, unselect"
 msgstr "Первый выбранный, разотметить"
 
-#: src/cfg_cmdseq.c:630
+#: src/cfg_cmdseq.c:631
 msgid "First selected, with path"
 msgstr "Первый выбранный, с путем"
 
-#: src/cfg_cmdseq.c:631
+#: src/cfg_cmdseq.c:632
 msgid "First selected, with path, unselect"
 msgstr "Первый выбранный, с путем, разотметить"
 
-#: src/cfg_cmdseq.c:632
+#: src/cfg_cmdseq.c:633
 msgid "First selected (destination pane)"
 msgstr "Первый выбранный (панель назначения)"
 
-#: src/cfg_cmdseq.c:633
+#: src/cfg_cmdseq.c:634
 msgid "First selected, no quotes"
 msgstr "Первый выбранный, без кавычек"
 
-#: src/cfg_cmdseq.c:634
+#: src/cfg_cmdseq.c:635
 msgid "All selected"
 msgstr "Все выбранные"
 
-#: src/cfg_cmdseq.c:635
+#: src/cfg_cmdseq.c:636
 msgid "All selected, unselect"
 msgstr "Все выбранные, разотметить"
 
-#: src/cfg_cmdseq.c:636
+#: src/cfg_cmdseq.c:637
 msgid "All selected, with paths"
 msgstr "Все выбранные, с путями"
 
-#: src/cfg_cmdseq.c:637
+#: src/cfg_cmdseq.c:638
 msgid "All selected, with paths, unselect"
 msgstr "Все выбранные, с путями, разотметить"
 
-#: src/cfg_cmdseq.c:638
+#: src/cfg_cmdseq.c:639
 msgid "All selected (destination pane)"
 msgstr "Все выбранные(панель назначения)"
 
-#: src/cfg_cmdseq.c:639
+#: src/cfg_cmdseq.c:640
 msgid "All selected, no quotes"
 msgstr "Все выбранные, без кавычек"
 
-#: src/cfg_cmdseq.c:640
+#: src/cfg_cmdseq.c:641
 msgid "Path to source pane's directory"
 msgstr "Путь на панели источника"
 
-#: src/cfg_cmdseq.c:641
+#: src/cfg_cmdseq.c:642
 msgid "Path to destination pane's directory"
 msgstr "Путь на панели назначения"
 
-#: src/cfg_cmdseq.c:642
+#: src/cfg_cmdseq.c:643
 msgid "Path to home directory"
 msgstr "Домашний каталог"
 
-#: src/cfg_cmdseq.c:643
+#: src/cfg_cmdseq.c:644
 msgid "Path of left pane"
 msgstr "Путь на левой панели"
 
-#: src/cfg_cmdseq.c:644
+#: src/cfg_cmdseq.c:645
 msgid "Path of right pane"
 msgstr "Путь на правой панели"
 
-#: src/cfg_cmdseq.c:645
+#: src/cfg_cmdseq.c:646
+#, fuzzy
+msgid "URI of first selected"
+msgstr "Первый выбранный"
+
+#: src/cfg_cmdseq.c:647
+#, fuzzy
+msgid "URI of first selected, unselect"
+msgstr "Первый выбранный, разотметить"
+
+#: src/cfg_cmdseq.c:648
+#, fuzzy
+msgid "URI of first selected, no quotes"
+msgstr "Первый выбранный, без кавычек"
+
+#: src/cfg_cmdseq.c:649
+#, fuzzy
+msgid "URIs of all selected"
+msgstr "Все выбранные"
+
+#: src/cfg_cmdseq.c:650
+#, fuzzy
+msgid "URIs of all selected, unselect"
+msgstr "Все выбранные, разотметить"
+
+#: src/cfg_cmdseq.c:651
+#, fuzzy
+msgid "URIs of all selected, no quotes"
+msgstr "Все выбранные, без кавычек"
+
+#: src/cfg_cmdseq.c:652
+#, fuzzy
+msgid "URIs of all selected, unselect, no quotes"
+msgstr "Все выбранные, без кавычек"
+
+#: src/cfg_cmdseq.c:653
+#, fuzzy
+msgid "URI of first selected (destination pane)"
+msgstr "Первый выбранный (панель назначения)"
+
+#: src/cfg_cmdseq.c:654
 msgid "Input combo box"
 msgstr "Кнопка выбора"
 
-#: src/cfg_cmdseq.c:646
+#: src/cfg_cmdseq.c:655
 msgid "Input using menu"
 msgstr "Меню выбора"
 
-#: src/cfg_cmdseq.c:647
+#: src/cfg_cmdseq.c:656
 msgid "Input string"
 msgstr "Ввод строка"
 
-#: src/cfg_cmdseq.c:648
+#: src/cfg_cmdseq.c:657
 msgid "Input check button (gives TRUE or FALSE)"
 msgstr "Кнопки - флажки (ДА/НЕТ)"
 
-#: src/cfg_cmdseq.c:649
+#: src/cfg_cmdseq.c:658
 msgid "Add label to input window"
 msgstr "Заголовок окна диалога"
 
-#: src/cfg_cmdseq.c:650
+#: src/cfg_cmdseq.c:659
 msgid "Add a separator bar to input window"
 msgstr "Линия-разделитель в окне ввода"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "$NAME"
 msgstr "$NAME"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "Value of $NAME (environment)"
 msgstr "Значение $NAME (из окружения)"
 
-#: src/cfg_cmdseq.c:652
+#: src/cfg_cmdseq.c:661
 msgid "gentoo's PID"
 msgstr "PID gentoo"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "Home directory for user NAME"
 msgstr "Домашний каталог пользователя NAME"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "~NAME"
 msgstr "~NAME"
 
-#: src/cfg_cmdseq.c:677
+#: src/cfg_cmdseq.c:686 src/cmd_split.c:536
 msgid "Pick Code"
 msgstr "Выбрать код"
 
-#: src/cfg_cmdseq.c:765
+#: src/cfg_cmdseq.c:778
 msgid "(No Options Available)"
 msgstr "(Нет настроек)"
 
-#: src/cfg_cmdseq.c:801
+#: src/cfg_cmdseq.c:814
 msgid "Run in Background?"
 msgstr "Запустить фоном?"
 
-#: src/cfg_cmdseq.c:805
+#: src/cfg_cmdseq.c:818
 msgid "Kill Previous Instance?"
 msgstr "Снять предыдущую задачу?"
 
-#: src/cfg_cmdseq.c:809
+#: src/cfg_cmdseq.c:822
 msgid "Survive Quit?"
 msgstr "Не снимать при выходе?"
 
-#: src/cfg_cmdseq.c:815
+#: src/cfg_cmdseq.c:828
 msgid "Capture Output?"
 msgstr "Показывать вывод?"
 
-#: src/cfg_cmdseq.c:900
+#: src/cfg_cmdseq.c:913
 msgid "Before Execution"
 msgstr "Перед запуском"
 
-#: src/cfg_cmdseq.c:903
+#: src/cfg_cmdseq.c:916
 msgid "Require Source Selection?"
 msgstr "Обязателен выбор источника?"
 
-#: src/cfg_cmdseq.c:907
+#: src/cfg_cmdseq.c:920
 msgid "Require Destination Selection?"
 msgstr "Обязателен выбор назначения?"
 
-#: src/cfg_cmdseq.c:912
+#: src/cfg_cmdseq.c:926
 msgid "CD Source?"
 msgstr "Перейти в каталог источника?"
 
-#: src/cfg_cmdseq.c:915
+#: src/cfg_cmdseq.c:929
 msgid "CD Destination?"
 msgstr "Перейти в каталог назначения?"
 
-#: src/cfg_cmdseq.c:922
+#: src/cfg_cmdseq.c:937
 msgid "After Execution"
 msgstr "После запуска"
 
-#: src/cfg_cmdseq.c:924
+#: src/cfg_cmdseq.c:939
 msgid "Rescan Source?"
 msgstr "Перечитать каталог источника?"
 
-#: src/cfg_cmdseq.c:928
+#: src/cfg_cmdseq.c:943
 msgid "Rescan Destination?"
 msgstr "Перечитать каталог назначения?"
 
-#: src/cfg_cmdseq.c:942
+#: src/cfg_cmdseq.c:957
 msgid "General"
 msgstr "Основные"
 
-#: src/cfg_cmdseq.c:945
+#: src/cfg_cmdseq.c:960
 msgid "Before&After"
 msgstr "До и после"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "Built-In"
 msgstr "Встроеные"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "External"
 msgstr "Внешние"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Add Row"
 msgstr "Добавить строку"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Duplicate"
 msgstr "Создать копию"
 
-#: src/cfg_cmdseq.c:978 src/cfg_styles.c:588 src/cfg_styles.c:805
-#: src/cfg_types.c:679 src/cmd_symlink.c:209 src/dpformat.c:35
+#: src/cfg_cmdseq.c:993 src/cfg_styles.c:596 src/cfg_styles.c:823
+#: src/cfg_types.c:678 src/cmd_info.c:151 src/cmd_split.c:648
+#: src/cmd_symlink.c:213 src/dpformat.c:36
 msgid "Name"
 msgstr "Имя"
 
-#: src/cfg_cmdseq.c:988
+#: src/cfg_cmdseq.c:1004
 msgid "Definition"
 msgstr "Описание"
 
-#: src/cfg_cmdseq.c:1044
+#: src/cfg_cmdseq.c:1058
 msgid "Repeat Sequence Until No Source Selection?"
 msgstr "Повторять последовательность пока есть выбраные?"
 
-#: src/cfg_cmdseq.c:1056 src/cfg_controls.c:655 src/cfg_controls.c:706
-#: src/cfg_styles.c:833 src/cfg_types.c:775
+#: src/cfg_cmdseq.c:1070 src/cfg_controls.c:622 src/cfg_controls.c:673
+#: src/cfg_styles.c:853 src/cfg_types.c:776
 msgid "Add"
 msgstr "Добавить"
 
-#: src/cfg_cmdseq.c:1059 src/cfg_controls.c:658 src/cfg_controls.c:709
-#: src/cfg_styles.c:836 src/cfg_types.c:788
+#: src/cfg_cmdseq.c:1073 src/cfg_controls.c:625 src/cfg_controls.c:676
+#: src/cfg_styles.c:856 src/cfg_types.c:789
 msgid "Delete"
 msgstr "Убрать"
 
-#: src/cfg_cmdseq.c:1066
+#: src/cfg_cmdseq.c:1080
 msgid "Commands"
 msgstr "Команды"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1365 src/cfg_dirpane.c:1371
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1288 src/cfg_dirpane.c:1293
 msgid "Left"
 msgstr "Левая"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Middle"
 msgstr "Средняя"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1364 src/cfg_dirpane.c:1372
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1287 src/cfg_dirpane.c:1294
 msgid "Right"
 msgstr "Правая"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Down"
 msgstr "Колесом вниз"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Up"
 msgstr "Колесом вверх"
 
-#: src/cfg_controls.c:382
+#: src/cfg_controls.c:378
 msgid ""
 "The following modifier key(s) must\n"
 "be held down when the mouse button\n"
@@ -486,47 +528,43 @@
 "Следующие кнопки модификаторы должны\n"
 "быть нажаты во время щелчка мышки"
 
-#: src/cfg_controls.c:395
+#: src/cfg_controls.c:391
 msgid "Edit Modifiers"
 msgstr "Изменить модификаторы"
 
-#: src/cfg_controls.c:613
+#: src/cfg_controls.c:580
 msgid "Controls"
 msgstr "Управление"
 
-#: src/cfg_controls.c:620
+#: src/cfg_controls.c:587
 msgid "Global Keyboard Shortcuts"
 msgstr "Основные комбинации кнопок"
 
-#: src/cfg_controls.c:665
+#: src/cfg_controls.c:632
 msgid "Dirpane Mouse Buttons"
 msgstr "Клавиши мышки"
 
-#: src/cfg_controls.c:690
+#: src/cfg_controls.c:657
 msgid "Button"
 msgstr "Кнопка"
 
-#: src/cfg_controls.c:693
+#: src/cfg_controls.c:660
 msgid "Edit Modifiers..."
 msgstr "Изменить модификаторы..."
 
-#: src/cfg_controls.c:716
+#: src/cfg_controls.c:683
 msgid "Click-M-Click Gesture"
 msgstr "Щелк-М-Щелк возможность"
 
-#: src/cfg_controls.c:726
+#: src/cfg_controls.c:693
 msgid "Time Limit"
 msgstr "Задержка"
 
-#: src/cfg_controls.c:737
-msgid "Path Right Click"
-msgstr "Правый щелчок на пути"
-
-#: src/cfg_controls.c:750
+#: src/cfg_controls.c:704
 msgid "Ignore Num Lock For All Bindings?"
 msgstr "Не учитывать Num Lock для всех комбинаций?"
 
-#: src/cfg_controls.c:780
+#: src/cfg_controls.c:734
 msgid ""
 "Note: The mouse button control settings\n"
 "are ambiguous: the same button+modifier\n"
@@ -538,310 +576,297 @@
 "используется для более чем одной цели. Это\n"
 "может привести к их неожиданному поведению..."
 
-#: src/cfg_controls.c:784
+#: src/cfg_controls.c:738
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/cfg_controls.c:784 src/children.c:95 src/cmd_info.c:246
+#: src/cfg_controls.c:738 src/children.c:89 src/cmd_info.c:320
 msgid "_OK"
 msgstr "_Да"
 
-#: src/cfg_dirpane.c:365
-msgid "Formatted Size, in bytes"
-msgstr "Размер, в байтах"
-
-#: src/cfg_dirpane.c:365
-msgid "Raw Size, in Bytes"
-msgstr "Сырой размер, в байтах"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in kilobytes"
-msgstr "Размер, в килобайтах"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in megabytes"
-msgstr "Размер, в мегабайтах"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, \"Smart\" Unit"
-msgstr "Размер,в \"умных\" единицах"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, in gigabytes"
-msgstr "Размер, в гигабайтах"
-
-#: src/cfg_dirpane.c:383
+#: src/cfg_dirpane.c:333
 msgid "Append Type Character?"
 msgstr "Добавить тип символа?"
 
-#: src/cfg_dirpane.c:386
-msgid "Append \"-> destination\" on Links?"
+#: src/cfg_dirpane.c:336
+#, fuzzy
+msgid "Append \"→ destination\" on Links?"
 msgstr "Добавить \"->назначение\" в ссылки?"
 
-#: src/cfg_dirpane.c:406
+#: src/cfg_dirpane.c:358
 msgid "Place Tick Every 3 Digits?"
 msgstr "Разделить разряды?"
 
-#: src/cfg_dirpane.c:416
+#: src/cfg_dirpane.c:369
 msgid "Digits of Precision"
 msgstr "Точность"
 
-#: src/cfg_dirpane.c:429
+#: src/cfg_dirpane.c:382
 msgid "Show Dir's File System Size?"
 msgstr "Показать размер файловой системы?"
 
-#: src/cfg_dirpane.c:435 src/cfg_dirpane.c:439 src/cfg_dirpane.c:443
-#: src/cfg_dirpane.c:447 src/cfg_dirpane.c:451 src/cfg_dirpane.c:455
-#: src/cfg_dirpane.c:459 src/cfg_dirpane.c:463 src/cfg_dirpane.c:467
-#: src/cfg_dirpane.c:474
+#: src/cfg_dirpane.c:388 src/cfg_dirpane.c:392 src/cfg_dirpane.c:396
+#: src/cfg_dirpane.c:400 src/cfg_dirpane.c:404 src/cfg_dirpane.c:408
+#: src/cfg_dirpane.c:412 src/cfg_dirpane.c:416 src/cfg_dirpane.c:420
+#: src/cfg_dirpane.c:428
 msgid "Format"
 msgstr "Формат"
 
-#: src/cfg_dirpane.c:497
+#: src/cfg_dirpane.c:454
 #, c-format
 msgid "%s Settings"
 msgstr "%s настройки"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1002 src/cfg_dirpane.c:1003
-#: src/cmd_select.c:414
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:970 src/cfg_dirpane.c:971
+#: src/cmd_select.c:381
 msgid "Content"
 msgstr "Содержание"
 
-#: src/cfg_dirpane.c:611
+#: src/cfg_dirpane.c:571
 msgid "Justification"
 msgstr "Выравнивание"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1003
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:971
 msgid "Title"
 msgstr "Заголовок"
 
-#: src/cfg_dirpane.c:611 src/window.c:201
+#: src/cfg_dirpane.c:571 src/window.c:200
 msgid "Width"
 msgstr "Ширина"
 
-#: src/cfg_dirpane.c:612
+#: src/cfg_dirpane.c:572
 msgid "Center"
 msgstr "По центру"
 
-#: src/cfg_dirpane.c:621
+#: src/cfg_dirpane.c:581
 msgid "Basic Settings"
 msgstr "Основные настройки"
 
-#: src/cfg_dirpane.c:669
+#: src/cfg_dirpane.c:628
 msgid "Edit Column Content"
 msgstr "Изменить содержимое колонок"
 
-#: src/cfg_dirpane.c:1002
+#: src/cfg_dirpane.c:970
 msgid "Default Title"
 msgstr "Заголовок по умолчанию"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories First"
 msgstr "Каталоги вверху"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Last"
 msgstr "Каталоги внизу"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Mixed"
 msgstr "Каталоги как файлы"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Left of List"
 msgstr "Слева от списка"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Right of List"
 msgstr "Справа от списка"
 
-#: src/cfg_dirpane.c:1029 src/cfg_dirpane.c:1030
+#: src/cfg_dirpane.c:997
 msgid "System Default"
 msgstr "По умолчанию"
 
-#: src/cfg_dirpane.c:1030
-msgid "Always Set"
-msgstr "Всегда включено"
-
-#: src/cfg_dirpane.c:1030 src/cmd_chmod.c:260 src/menus.c:513
-msgid "Toggle"
-msgstr "Переключить"
-
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy From %s"
 msgstr "Скопировать из %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy To %s"
 msgstr "Копировать в %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Swap With %s"
 msgstr "Обменять с %s"
 
-#: src/cfg_dirpane.c:1048
+#: src/cfg_dirpane.c:1015
 msgid "Columns"
 msgstr "Колонки"
 
-#: src/cfg_dirpane.c:1053
+#: src/cfg_dirpane.c:1020
 msgid "Available Content Types"
 msgstr "Доступные типы содержимого"
 
-#: src/cfg_dirpane.c:1070
+#: src/cfg_dirpane.c:1037
 msgid "Selected Content Types"
 msgstr "Выбраные типы содержимого"
 
-#: src/cfg_dirpane.c:1081 src/cfg_styles.c:723
+#: src/cfg_dirpane.c:1049 src/cfg_styles.c:741
 msgid "Edit..."
 msgstr "Изменить..."
 
-#: src/cfg_dirpane.c:1082 src/cmd_renamere.c:508
+#: src/cfg_dirpane.c:1050 src/cmd_renamere.c:481
 msgid "Remove"
 msgstr "Убрать"
 
-#: src/cfg_dirpane.c:1096
+#: src/cfg_dirpane.c:1064
 msgid "Sorting"
 msgstr "Сортировка"
 
-#: src/cfg_dirpane.c:1099
+#: src/cfg_dirpane.c:1067
 msgid "Sort On"
 msgstr "Сортировать"
 
-#: src/cfg_dirpane.c:1106 src/cmd_split.c:233 src/dpformat.c:39
-#: src/dpformat.c:40
+#: src/cfg_dirpane.c:1071 src/cmd_split.c:590 src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode"
 msgstr "Режим"
 
-#: src/cfg_dirpane.c:1113
+#: src/cfg_dirpane.c:1077
 msgid "Inverse Sorting?"
 msgstr "Обратная сортировка?"
 
-#: src/cfg_dirpane.c:1116 src/cfg_paths.c:187 src/cfg_types.c:743
-#: src/cmd_renamere.c:459 src/cmd_renamere.c:486 src/cmd_select.c:520
-#: src/textview.c:620
+#: src/cfg_dirpane.c:1080 src/cfg_paths.c:228 src/cfg_types.c:744
+#: src/cmd_renamere.c:432 src/cmd_renamere.c:459 src/cmd_select.c:478
+#: src/textview.c:604
 msgid "Ignore Case?"
 msgstr "Не учитывать регистр?"
 
-#: src/cfg_dirpane.c:1119
-msgid "Numerical Mode?"
-msgstr "Учитывать длину?"
-
-#: src/cfg_dirpane.c:1127
+#: src/cfg_dirpane.c:1088
 msgid "Default Directory"
 msgstr "Каталог по умолчанию"
 
-#: src/cfg_dirpane.c:1132
+#: src/cfg_dirpane.c:1094
 msgid "Grab Current"
 msgstr "Взять текущие"
 
-#: src/cfg_dirpane.c:1135
+#: src/cfg_dirpane.c:1097
 msgid "From History"
 msgstr "Последний"
 
-#: src/cfg_dirpane.c:1148
+#: src/cfg_dirpane.c:1110
 msgid "Path Above?"
 msgstr "Путь сверху?"
 
-#: src/cfg_dirpane.c:1152
+#: src/cfg_dirpane.c:1114
 msgid "Hide Allowed?"
 msgstr "Разрешить скрытие?"
 
-#: src/cfg_dirpane.c:1156
+#: src/cfg_dirpane.c:1118
 msgid "Scrollbar Always?"
 msgstr "Бегунок всегда?"
 
-#: src/cfg_dirpane.c:1160
+#: src/cfg_dirpane.c:1122
 msgid "Huge Parent Button?"
 msgstr "Большая кнопка Вверх?"
 
-#: src/cfg_dirpane.c:1168
+#: src/cfg_dirpane.c:1127
+msgid "Set Custom Font?"
+msgstr ""
+
+#: src/cfg_dirpane.c:1140
 msgid "Scrollbar Position"
 msgstr "Расположение бегунка"
 
-#: src/cfg_dirpane.c:1180
-msgid "Modify 'Control' Key State"
-msgstr "Изменить состояние кнопки 'Control'"
-
-#: src/cfg_dirpane.c:1225
-msgid "Active Pane Titles"
-msgstr "Заголовок активной панели"
-
-#: src/cfg_dirpane.c:1225
-msgid "Focused Row, Unselected"
-msgstr "Выбранная строка, не отмеченая"
-
-#: src/cfg_dirpane.c:1226
-msgid "Focused Row, Selected"
-msgstr "Выбранная строка, отмеченная"
-
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Horizontal"
 msgstr "Горизонтально"
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Vertical"
 msgstr "Вертикально"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Don't Track"
 msgstr "Не изменять"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Ratio"
 msgstr "Соотношение"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Left Pane"
 msgstr "Размер левой панели"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Right Pane"
 msgstr "Размер правой панели"
 
-#: src/cfg_dirpane.c:1275
+#: src/cfg_dirpane.c:1198
 msgid "Pane Orientation"
 msgstr "Ориентация панели"
 
-#: src/cfg_dirpane.c:1289
+#: src/cfg_dirpane.c:1212
 msgid "Split Tracking"
 msgstr "Разделитель"
 
-#: src/cfg_dirpane.c:1312
+#: src/cfg_dirpane.c:1235
 msgid "pixels"
 msgstr "точки"
 
-#: src/cfg_dirpane.c:1340
+#: src/cfg_dirpane.c:1263
 msgid "Remember Selected Rows?"
 msgstr "Запоминать выбраные элементы?"
 
-#: src/cfg_dirpane.c:1343
+#: src/cfg_dirpane.c:1266
 msgid "Save History Lists?"
 msgstr "Сохранять историю?"
 
-#: src/cfg_dirpane.c:1360 src/cfg_dirpane.c:1370
+#: src/cfg_dirpane.c:1283 src/cfg_dirpane.c:1292
 msgid "Dir Panes"
 msgstr "Панели"
 
-#: src/cfg_dirpane.c:1374
+#: src/cfg_dirpane.c:1295
 msgid "Pane Split"
 msgstr "Разделитель"
 
-#: src/cfg_dirpane.c:1375
+#: src/cfg_dirpane.c:1296
 msgid "History"
 msgstr "История"
 
-#: src/cfg_errors.c:45
+#: src/cfg_dirpane.c:1725
+msgid "'Blocks' Content Deprecated"
+msgstr ""
+
+#: src/cfg_dirpane.c:1726
+msgid ""
+"The 'Blocks' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
+
+#: src/cfg_dirpane.c:1732
+msgid "'Block Size' Content Deprecated"
+msgstr ""
+
+#: src/cfg_dirpane.c:1733
+msgid ""
+"The 'Block Size' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
+
+#: src/cfg_errors.c:48
 msgid "Errors"
 msgstr "Ошибки"
 
-#: src/cfg_errors.c:52
-msgid "Use Dialog to Report Errors?"
-msgstr "Использовать диалог для ошибок?"
+#: src/cfg_errors.c:55
+msgid "Error and Status Message Display"
+msgstr ""
+
+#: src/cfg_errors.c:57
+msgid "Status Bar, Above Panes"
+msgstr ""
+
+#: src/cfg_errors.c:60
+msgid "Main Window's Title Bar"
+msgstr ""
+
+#: src/cfg_errors.c:63
+msgid "Separate Dialog"
+msgstr ""
 
-#: src/cfg_errors.c:56
+#: src/cfg_errors.c:69
 msgid "Cause Console Beep on Error?"
 msgstr "Использовать сигнал динамика?"
 
@@ -849,116 +874,96 @@
 msgid "Menus"
 msgstr "Меню"
 
-#: src/cfg_mount.c:168
-msgid "Never"
-msgstr "Никогда"
-
-#: src/cfg_mount.c:168
-msgid "On Every Access"
-msgstr "При каждом обращении"
-
-#: src/cfg_mount.c:177
-msgid "Mounting"
-msgstr "Подключение"
-
-#: src/cfg_mount.c:184
-msgid "Mount When?"
-msgstr "Когда подключать?"
-
-#: src/cfg_mount.c:196
-msgid "Mount Options"
-msgstr "Настройка подключения дисков"
-
-#: src/cfg_mount.c:199
-msgid "Mount Command"
-msgstr "Команда подключения"
+#: src/cfg_nag.c:78
+#, c-format
+msgid ""
+"Click the button below to reset the %zu stored 'Don't show this dialog "
+"again' responses."
+msgstr ""
 
-#: src/cfg_mount.c:204
-msgid "Unmount Command"
-msgstr "Команда отключения"
+#: src/cfg_nag.c:100
+msgid "Nagging"
+msgstr ""
 
-#: src/cfg_mount.c:211
-msgid "Only Mount on Toplevel Directories?"
-msgstr "Подключать только в корневом каталоге?"
+#: src/cfg_nag.c:110
+#, fuzzy
+msgid "Reset All"
+msgstr "Вернуть начальные"
 
-#: src/cfg_mount.c:214
-msgid "Use Command Error Dialog?"
-msgstr "Использовать диалог для ошибок"
+#: src/cfg_paths.c:78
+msgid "Edit path"
+msgstr ""
 
-#: src/cfg_mount.c:217
-msgid "Unmount When gentoo Quits?"
-msgstr "Отключать при выходе?"
+#: src/cfg_paths.c:152
+msgid "Icons"
+msgstr "Значки"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:153
 msgid "GTK+ RC"
 msgstr "GTK+ RC"
 
-#: src/cfg_paths.c:128
-msgid "Icons"
-msgstr "Значки"
-
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:154
 msgid "fstab"
 msgstr "fstab"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:155
 msgid "mtab"
 msgstr "mtab"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Beginning With Dot (.)"
 msgstr "Начинающиеся с точки (.)"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Matching RE"
 msgstr "Удовлетворяющие условию"
 
-#: src/cfg_paths.c:129 src/cmd_chmod.c:259 src/menus.c:512
+#: src/cfg_paths.c:157 src/cmd_chmod.c:252 src/menus.c:519
 msgid "None"
 msgstr "Нет"
 
-#: src/cfg_paths.c:135
+#: src/cfg_paths.c:163
 msgid "Paths & Hide"
 msgstr "Пути & Скрытие"
 
-#: src/cfg_paths.c:142
+#: src/cfg_paths.c:170
 msgid "Paths"
 msgstr "Пути"
 
-#: src/cfg_paths.c:169
+#: src/cfg_paths.c:209
 msgid "Hide Entries"
 msgstr "Скрытие"
 
-#: src/cfg_styles.c:170 src/cfg_types.c:234 src/iconutil.c:29 src/menus.c:19
+#: src/cfg_styles.c:178 src/cfg_types.c:233 src/iconutil.c:31 src/menus.c:19
 msgid "(None)"
 msgstr "(Нет)"
 
-#: src/cfg_styles.c:191 src/cfg_styles.c:428 src/cfg_styles.c:767
+#: src/cfg_styles.c:199 src/cfg_styles.c:436 src/cfg_styles.c:785
 msgid "Delete Action"
 msgstr "Удаление"
 
-#: src/cfg_styles.c:411 src/color_dialog.c:48
+#: src/cfg_styles.c:419 src/color_dialog.c:47
 msgid "Edit Color"
 msgstr "Изменить цвет"
 
-#: src/cfg_styles.c:428
+#: src/cfg_styles.c:436
 msgid "Revert to Inherited Command"
 msgstr "Оставить только наследуемые"
 
-#: src/cfg_styles.c:529
+#: src/cfg_styles.c:537
 #, fuzzy
 msgid "Select Command ..."
 msgstr "Выберите команду"
 
-#: src/cfg_styles.c:592
+#: src/cfg_styles.c:601
 msgid "New Action Property"
 msgstr "Свойства нового события"
 
-#: src/cfg_styles.c:600
+#: src/cfg_styles.c:609
 msgid "something"
 msgstr "нечто"
 
-#: src/cfg_styles.c:670
+#: src/cfg_styles.c:679
 msgid ""
 "Deleting this style will also delete\n"
 "all its children. Are you sure?"
@@ -966,136 +971,136 @@
 "Удаление этого класса повлечет также\n"
 "удаление всех потомков. Уверены?"
 
-#: src/cfg_styles.c:671
+#: src/cfg_styles.c:680
 msgid "Confirm Delete"
 msgstr "Подтвердите удаление"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Background Color"
 msgstr "Цвет фона"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Foreground Color"
 msgstr "Цвет"
 
-#: src/cfg_styles.c:694 src/dpformat.c:53
+#: src/cfg_styles.c:703 src/dpformat.c:55
 msgid "Icon"
 msgstr "Значок"
 
-#: src/cfg_styles.c:696
+#: src/cfg_styles.c:705
 msgid "(Row Style Preview Text)"
 msgstr "(Так будет выглядеть)"
 
-#: src/cfg_styles.c:702 src/cmd_renameseq.c:386
+#: src/cfg_styles.c:713 src/cmd_renameseq.c:358 src/cmd_split.c:656
 msgid "Preview"
 msgstr "Предпросмотр"
 
-#: src/cfg_styles.c:719
+#: src/cfg_styles.c:737
 msgid "Override Parent's?"
 msgstr "Переопределить?"
 
-#: src/cfg_styles.c:723
+#: src/cfg_styles.c:741
 msgid "Pick..."
 msgstr "Выберите..."
 
-#: src/cfg_styles.c:764
+#: src/cfg_styles.c:782
 msgid "Add Action..."
 msgstr "Добавить действие..."
 
-#: src/cfg_styles.c:810 src/menus.c:525
+#: src/cfg_styles.c:829 src/menus.c:532
 msgid "Parent"
 msgstr "Родитель"
 
-#: src/cfg_styles.c:820
+#: src/cfg_styles.c:840
 msgid "Inherited Properties"
 msgstr "Наследуемые свойства"
 
-#: src/cfg_styles.c:824
+#: src/cfg_styles.c:844
 msgid "Visual"
 msgstr "Отображение"
 
-#: src/cfg_styles.c:826
+#: src/cfg_styles.c:846
 msgid "Actions"
 msgstr "Действия"
 
-#: src/cfg_styles.c:843
+#: src/cfg_styles.c:863
 msgid "File Recognition"
 msgstr "Типы файлов"
 
-#: src/cfg_styles.c:844
+#: src/cfg_styles.c:864
 msgid "Styles"
 msgstr "Классы"
 
-#: src/cfg_types.c:193
+#: src/cfg_types.c:192
 #, c-format
 msgid "%s - Click to Change..."
 msgstr "%s - Щелкните для смены..."
 
-#: src/cfg_types.c:508
+#: src/cfg_types.c:507
 msgid "(New Type)"
 msgstr "(Новый тип)"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "B-Dev"
 msgstr "B-Устр"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "C-Dev"
 msgstr "C-Устр"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Dir"
 msgstr "Каталог"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "FIFO"
 msgstr "FIFO"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "File"
 msgstr "Файл"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Link"
 msgstr "Ссылка"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Socket"
 msgstr "Порт"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "Readable"
 msgstr "Чтение"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetGID"
 msgstr "С GID"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetUID"
 msgstr "С UID"
 
-#: src/cfg_types.c:648 src/cmd_chmod.c:209
+#: src/cfg_types.c:647 src/cmd_chmod.c:200
 msgid "Sticky"
 msgstr "Фиксация"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Executable"
 msgstr "Выполнение"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Writable"
 msgstr "Запись"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match 'file' (RE)"
 msgstr "Условие на файл"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match Name (RE)"
 msgstr "Условие на имя"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Require Suffix"
 msgstr "С расширением"
 
@@ -1111,19 +1116,19 @@
 msgid "Require Protection"
 msgstr "Атрибуты"
 
-#: src/cfg_types.c:738
+#: src/cfg_types.c:739
 msgid "Glob?"
 msgstr "Все?"
 
-#: src/cfg_types.c:754
+#: src/cfg_types.c:755
 msgid "Type's Style"
 msgstr "Класс этого типа"
 
-#: src/cfg_types.c:756
+#: src/cfg_types.c:757
 msgid "Style"
 msgstr "Класс"
 
-#: src/cfg_types.c:796
+#: src/cfg_types.c:797
 msgid "Types"
 msgstr "Типы"
 
@@ -1152,16 +1157,16 @@
 msgid "Dialog Positioning"
 msgstr "Расположение диалоговых окон"
 
-#: src/children.c:94
+#: src/children.c:88
 #, c-format
 msgid "Execution of \"%s\" Failed"
 msgstr "Выполнение \"%s\" сорвано"
 
-#: src/children.c:95 src/dialog.c:285
+#: src/children.c:89 src/dialog.c:290
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/children.c:274
+#: src/children.c:227
 #, c-format
 msgid "Couldn't terminate child \"%s\" (pid=%d)--zombie alert"
 msgstr "Не могу выгрузить процесс \"%s\" (pid=%d) -- зомби"
@@ -1183,7 +1188,7 @@
 
 #: src/cmd_about.c:97
 #, fuzzy
-msgid "(c) 1998-2009 by Emil Brink, Obsession Development.\n"
+msgid "(c) 1998-2011 by Emil Brink, Obsession Development.\n"
 msgstr "(c) 1998-2008 - Emil Brink, Obsession Development.\n"
 
 #: src/cmd_about.c:99
@@ -1194,35 +1199,23 @@
 "Это открытое ПО и оно не дает АБСОЛЮТНО НИКАКИХ \n"
 "ГАРАНТИЙ. Подробности прочтите в файле COPYING.\n"
 
-#: src/cmd_about.c:106
-msgid "FAM: Supported and active."
-msgstr "FAM: Поддерживается и включено"
-
-#: src/cmd_about.c:108
-msgid "FAM: Supported, but not active."
-msgstr "FAM: Поддерживается, но не включено."
-
-#: src/cmd_about.c:110
-msgid "FAM: Not supported."
-msgstr "FAM: Не поддерживается."
-
-#: src/cmd_about.c:116
+#: src/cmd_about.c:105
 msgid "NLS: Supported, using built-in English strings."
 msgstr "NLS: Поддерживается, с помощью встроенных английских строк."
 
-#: src/cmd_about.c:129
-#, fuzzy
+#: src/cmd_about.c:118
+#, fuzzy, c-format
 msgid ""
 "The author of gentoo can be reached via Internet\n"
-"e-mail at <emil@obsession.se>; feel free to let\n"
+"e-mail at <a href=\"mailto:%s\">%s</a>; feel free to let\n"
 "me know what you think of this software, give\n"
 "suggestions/bug reports, and so on.\n"
 "\n"
 "The latest release of gentoo can always be down-\n"
 "loaded from the official gentoo project homepage at\n"
-"<http://www.obsession.se/gentoo/>. New releases are\n"
+"<a href=\"%s\">%s</a>. New releases are\n"
 "typically announced on the Freshmeat service at\n"
-"<http://freshmeat.net/>."
+"<a href=\"http://freshmeat.net/\">freshmeat.net</a>."
 msgstr ""
 "Автор этой программы доступен через электронную\n"
 "почту по адресу: <emil@obsession.se>; напишите ему\n"
@@ -1235,11 +1228,11 @@
 "в \"Свежем мясе\" - <http://freshmeat.net/>.\n"
 "О неточностях перевода пишите М.Зарипову <m3for@mail.ru>"
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "About gentoo"
 msgstr "О программе"
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "_OK (Wait for More)"
 msgstr "_ДА (Подождите продолжения)"
 
@@ -1248,85 +1241,89 @@
 msgid "Set protection bits for \"%s\":"
 msgstr "Установить права для \"%s\":"
 
-#: src/cmd_chmod.c:208 src/cmd_chown.c:184 src/cmd_info.c:202
+#: src/cmd_chmod.c:199 src/cmd_chown.c:176 src/cmd_info.c:274
 msgid "Group"
 msgstr "Группа"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Others"
 msgstr "Другие"
 
-#: src/cmd_chmod.c:208 src/cmd_info.c:195
+#: src/cmd_chmod.c:199 src/cmd_info.c:267
 msgid "Owner"
 msgstr "Владелец"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Special"
 msgstr "Специальные"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Execute"
 msgstr "Запуск"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Read"
 msgstr "Чтение"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set GID"
 msgstr "Исп. GID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set UID"
 msgstr "Исп. UID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Write"
 msgstr "Запись"
 
-#: src/cmd_chmod.c:231
+#: src/cmd_chmod.c:222
 msgid "Protection Bits"
 msgstr "Биты прав"
 
-#: src/cmd_chmod.c:242
+#: src/cmd_chmod.c:233
 msgid "Textual"
 msgstr ""
 
-#: src/cmd_chmod.c:253
+#: src/cmd_chmod.c:246
 #, fuzzy
 msgid "Octal"
 msgstr "8, Восьмеричная"
 
-#: src/cmd_chmod.c:258 src/menus.c:511
+#: src/cmd_chmod.c:251 src/menus.c:518
 msgid "All"
 msgstr "Все"
 
-#: src/cmd_chmod.c:261
+#: src/cmd_chmod.c:253 src/menus.c:520
+msgid "Toggle"
+msgstr "Переключить"
+
+#: src/cmd_chmod.c:254
 msgid "Revert"
 msgstr "Сбросить"
 
-#: src/cmd_chmod.c:273 src/cmd_chown.c:208 src/cmd_info.c:304
+#: src/cmd_chmod.c:266 src/cmd_chown.c:201 src/cmd_info.c:372
 msgid "Recurse Directories?"
 msgstr "Для содержимого тоже?"
 
-#: src/cmd_chmod.c:276
+#: src/cmd_chmod.c:269
 msgid "Don't Touch Directories?"
 msgstr "Кроме каталогов?"
 
-#: src/cmd_chmod.c:281
+#: src/cmd_chmod.c:274
 msgid "Change Mode"
 msgstr "Смена режима"
 
-#: src/cmd_chown.c:56
+#: src/cmd_chown.c:57
 #, c-format
 msgid "Set Ownership for '%s':"
 msgstr "Установка владельца для '%s':"
 
-#: src/cmd_chown.c:184
+#: src/cmd_chown.c:176
 msgid "User"
 msgstr "Пользователь"
 
-#: src/cmd_chown.c:213
+#: src/cmd_chown.c:206
 msgid "Change Ownership"
 msgstr "Смена владельца"
 
@@ -1334,49 +1331,38 @@
 msgid "Automatically Save Changed Configuration on Exit?"
 msgstr "Автоматически сохранять настройки при выходе?"
 
-#: src/cmd_copy.c:302
-#, c-format
-msgid ""
-"Can't copy directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"Не могу копировать \"%s\"\n"
-"в \"%s\"\n"
-"(копирование самого в себя)."
-
-#: src/cmd_copy.c:392 src/cmd_copyas.c:62
+#: src/cmd_copy.c:175 src/cmd_copyas.c:62
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Copy?"
 msgstr "\"%s\" Уже существует - Продолжить копирование?"
 
-#: src/cmd_copy.c:393
+#: src/cmd_copy.c:176
 msgid "Copying..."
 msgstr "Копирование..."
 
-#: src/cmd_copy.c:440
+#: src/cmd_copy.c:217
 msgid "Preserve Dates During Copy?"
 msgstr "Сохранять даты при копировании?"
 
-#: src/cmd_copy.c:441
+#: src/cmd_copy.c:218
 msgid "Ignore Failure to Copy Attributes (Date, Owner, Mode)?"
 msgstr ""
 "Игнорировать невозможность копирования атрибутов (Дата, Права, Владелец)?"
 
-#: src/cmd_copy.c:442
+#: src/cmd_copy.c:219
 msgid "Leave Failed Destination if Full Size?"
 msgstr "Оставлять незавершенные файлы если нет места?"
 
-#: src/cmd_copy.c:443 src/cmd_viewtext.c:207
+#: src/cmd_copy.c:220 src/cmd_viewtext.c:204
 msgid "Buffer Size"
 msgstr "Размер буфера"
 
-#: src/cmd_copyas.c:51
+#: src/cmd_copyas.c:49
 #, c-format
 msgid "Enter Name for Copy of \"%s\""
 msgstr "Введите имя для копирования \"%s\""
 
-#: src/cmd_copyas.c:53
+#: src/cmd_copyas.c:51
 #, c-format
 msgid "Enter Name for Clone of \"%s\""
 msgstr "Введите имя клона \"%s\""
@@ -1404,28 +1390,28 @@
 msgid "Enter Name for Link Clone of \"%s\""
 msgstr "Введите имя для клона ссылки \"%s\""
 
-#: src/cmd_copyas.c:89
+#: src/cmd_copyas.c:91
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Symlink?"
 msgstr "\"%s\" Уже существует - Продолжить создание ссылки?"
 
-#: src/cmd_copyas.c:204 src/cmd_copyas.c:210
+#: src/cmd_copyas.c:200 src/cmd_copyas.c:207
 msgid "Copy As"
 msgstr "Копировать как"
 
-#: src/cmd_copyas.c:212
+#: src/cmd_copyas.c:209
 msgid "Clone"
 msgstr "Клонировать"
 
-#: src/cmd_copyas.c:214
+#: src/cmd_copyas.c:211
 msgid "Symbolic Link As"
 msgstr "Ссылка с именем"
 
-#: src/cmd_copyas.c:216
+#: src/cmd_copyas.c:213
 msgid "Symbolic Link Clone"
 msgstr "Клонирование ссылки"
 
-#: src/cmd_delete.c:55
+#: src/cmd_delete.c:56
 #, c-format
 msgid ""
 "%s\n"
@@ -1436,239 +1422,248 @@
 "не может быть удален из-за ограничения доступа.\n"
 "Попробовать снять защиту и продолжить?"
 
-#: src/cmd_delete.c:58
+#: src/cmd_delete.c:59
 msgid "Remember the answer (alters config)"
 msgstr "Запомнить ответ (меняет настройку)"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Access Problem"
 msgstr "Проблема доступа"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Change|Leave Alone"
 msgstr "Сменить|Оставить"
 
-#: src/cmd_delete.c:236
+#: src/cmd_delete.c:215
 #, c-format
 msgid "Really Delete \"%s\"?"
 msgstr "Действительно удалить \"%s\" ?"
 
-#: src/cmd_delete.c:237
+#: src/cmd_delete.c:216
 msgid "Deleting..."
 msgstr "Удаление..."
 
-#: src/cmd_delete.c:292
+#: src/cmd_delete.c:279
 msgid "On Access Failure"
 msgstr "В случае нехватки прав"
 
-#: src/cmd_delete.c:293
+#: src/cmd_delete.c:280
 msgid "Ask User|Automatically Try Changing, and Retry|Fail"
 msgstr "Спросить|Попытаться сменить и продолжить|Прервать"
 
-#: src/cmd_dpfocus.c:183
-msgid "Wrap Around At Top And Bottom?"
-msgstr "Перескакивать в другой конец списка?"
+#: src/cmd_dpfocus.c:33
+msgid "DpFocus Command is Deprecated"
+msgstr ""
+
+#: src/cmd_dpfocus.c:34
+msgid ""
+"The <tt>DpFocus</tt> command has been deprecated and is no longer supported. "
+"Please remove any keyboard or mouse bindings that use it and look into using "
+"the default GTK+ list view's cursor controls."
+msgstr ""
 
-#: src/cmd_dpfocus.c:184
+#: src/cmd_dpfocus.c:64
 msgid "Treat Focused Row As Selection If No \"Real\" Selection Exists?"
 msgstr "Обрабатывать курсор как выделение, если нет \"Настоящего\" выделения"
 
-#: src/cmd_dpfocus.c:186
+#: src/cmd_dpfocus.c:66
 msgid "Move Focus to Last Selected/Deselected Row?"
 msgstr "Ставить курсор на последний выбранный элемент?"
 
-#: src/cmd_dpfocusisrch.c:220
+#: src/cmd_dpfocusisrch.c:163
 msgid "ISearch"
 msgstr "Поиск"
 
-#: src/cmd_generic.c:136
+#: src/cmd_generic.c:143
 msgid "_OK|A_ll|_Skip|_Cancel"
 msgstr "ДА|Все|Нет|Отмена"
 
-#: src/cmd_generic.c:137
+#: src/cmd_generic.c:144
 msgid "_OK|_Skip|_Cancel"
 msgstr "_ДА|_Нет|_Отмена"
 
-#: src/cmd_getsize.c:49
+#: src/cmd_getsize.c:51
 msgid "Getting sizes..."
 msgstr "Считаю размер..."
 
-#: src/cmd_getsize.c:141
+#: src/cmd_getsize.c:134
 msgid "Unselect Rows When Done?"
 msgstr "Снять выделение после выполнения?"
 
-#: src/cmd_info.c:71 src/cmd_info.c:163
-#, c-format
-msgid ""
-"%s (%s bytes,\n"
-"%s blocks)"
-msgstr ""
-"%s (%s байт),\n"
-"%s блоков)"
+#: src/cmd_info.c:68 src/errors.c:84
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr ", %s занято"
 
-#: src/cmd_info.c:75
-#, c-format
-msgid "%u dirs, %u files, %u symlinks"
+#: src/cmd_info.c:72
+#, fuzzy, c-format
+msgid ""
+"%u dirs, %u files,\n"
+"%u symlinks, %u special files"
 msgstr "%u каталогов, %u файлов, %u ссылок"
 
-#: src/cmd_info.c:134
+#: src/cmd_info.c:153
+msgid "Value"
+msgstr ""
+
+#: src/cmd_info.c:198
 msgid "Link To"
 msgstr "Ссылка на"
 
-#: src/cmd_info.c:145 src/cmd_select.c:399 src/dpformat.c:52
+#: src/cmd_info.c:213 src/cmd_select.c:368 src/dpformat.c:54
 msgid "Type"
 msgstr "Тип"
 
-#: src/cmd_info.c:148
+#: src/cmd_info.c:216
 msgid "Location"
 msgstr "Расположение"
 
-#: src/cmd_info.c:151 src/dpformat.c:36 src/window.c:200
+#: src/cmd_info.c:219 src/cmd_split.c:653 src/dpformat.c:37 src/window.c:199
 msgid "Size"
 msgstr "Размер"
 
-#: src/cmd_info.c:172
+#: src/cmd_info.c:229
+#, fuzzy, c-format
+msgid "%s (%s bytes)"
+msgstr "%Lu байт"
+
+#: src/cmd_info.c:240
 msgid "Contains"
 msgstr "Содержание"
 
-#: src/cmd_info.c:186
+#: src/cmd_info.c:257
 msgid "'File' Info"
 msgstr "Информация о файле"
 
-#: src/cmd_info.c:213 src/dpformat.c:49
+#: src/cmd_info.c:285 src/dpformat.c:50
 msgid "Accessed"
 msgstr "Прочитан"
 
-#: src/cmd_info.c:214 src/dpformat.c:50
+#: src/cmd_info.c:286 src/dpformat.c:51
 msgid "Modified"
 msgstr "Модифицирован"
 
-#: src/cmd_info.c:215
+#: src/cmd_info.c:287 src/dpformat.c:53
 msgid "Changed"
 msgstr "Изменен"
 
-#: src/cmd_info.c:263
+#: src/cmd_info.c:288 src/dpformat.c:52
+msgid "Created"
+msgstr "Создан"
+
+#: src/cmd_info.c:290
+#, fuzzy
+msgid "Basic"
+msgstr "Форма"
+
+#: src/cmd_info.c:294
+msgid "Attributes"
+msgstr ""
+
+#: src/cmd_info.c:338
 msgid "Getting Information..."
 msgstr "Сбор информации..."
 
-#: src/cmd_info.c:302
+#: src/cmd_info.c:370
 msgid "Show 'file' Output?"
 msgstr "Показывать вывод?"
 
-#: src/cmd_info.c:305
+#: src/cmd_info.c:373
 msgid "Access Date Format"
 msgstr "Формат даты доступа"
 
-#: src/cmd_info.c:306
+#: src/cmd_info.c:374
 msgid "Modify Date Format"
 msgstr "Формат даты модификации"
 
-#: src/cmd_info.c:307
+#: src/cmd_info.c:375
 msgid "Change Date Format"
 msgstr "Формат даты изменения"
 
-#: src/cmd_info.c:308
+#: src/cmd_info.c:376
 msgid "Size Tick Mark"
 msgstr "Знак разделитель тысяч"
 
-#: src/cmd_join.c:47
+#: src/cmd_join.c:46
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Join?"
 msgstr "\"%s\" Уже существует - Продолжить объединение?"
 
-#: src/cmd_join.c:76
+#: src/cmd_join.c:73
 msgid "Joining..."
 msgstr "Объединение..."
 
-#: src/cmd_join.c:162
+#: src/cmd_join.c:167
 msgid "Click and Drag Files to Reorder, Then Click Join."
 msgstr "Выделите файлы, расположите по порядку и нажмите Собрать."
 
-#: src/cmd_join.c:170
+#: src/cmd_join.c:175
 #, c-format
 msgid "The total size is %s (%lu bytes)."
 msgstr "Общий размер %s (%lu байт)."
 
-#: src/cmd_join.c:173
+#: src/cmd_join.c:178
 #, c-format
 msgid "The total size is %lu bytes."
 msgstr "Общий размер %lu байт."
 
-#: src/cmd_join.c:215
+#: src/cmd_join.c:220
 msgid "Enter Destination File Name"
 msgstr "Введите имя файла"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "Join"
 msgstr "Собрать"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "_Join|_Cancel"
 msgstr "_Собрать|_Отмена"
 
 # c-format
-#: src/cmd_mkdir.c:75
+#: src/cmd_mkdir.c:65
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With MkDir?"
 msgstr "\"%s\" Уже существует - создать каталог?"
 
-#: src/cmd_mkdir.c:125
+#: src/cmd_mkdir.c:119
 msgid "Enter Name of Directory to Create"
 msgstr "Введите имя каталога"
 
-#: src/cmd_mkdir.c:133
+#: src/cmd_mkdir.c:128
 msgid "Make Directory"
 msgstr "Создать каталог"
 
-#: src/cmd_mkdir.c:156
+#: src/cmd_mkdir.c:151
 msgid "CD Into New Directory?"
 msgstr "Перейти в каталог?"
 
-#: src/cmd_mkdir.c:157
+#: src/cmd_mkdir.c:152
 msgid "Focus New Directory?"
 msgstr "Установить курсор?"
 
-#: src/cmd_move.c:81
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"Не могу переместить каталог \"%s\"\n"
-"в \"%s\"\n"
-"(назначение - подпапка источника)."
-
-#: src/cmd_move.c:92
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the destination contains the source."
-msgstr ""
-"Не могу переместить \"%s\"\n"
-"в \"%s\"\n"
-"(источник - подпапка назначения)."
-
-#: src/cmd_move.c:188 src/cmd_moveas.c:48
+#: src/cmd_move.c:128 src/cmd_moveas.c:51
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Move?"
 msgstr "\"%s\" Уже существует - продолжить перемещение?"
 
-#: src/cmd_move.c:189
+#: src/cmd_move.c:129
 msgid "Moving..."
 msgstr "Перемещение..."
 
-#: src/cmd_moveas.c:40
+#: src/cmd_moveas.c:41
 #, c-format
 msgid "Enter Name to Move \"%s\" As"
 msgstr "Введите имя для перемещения\"%s\" как"
 
+#: src/cmd_moveas.c:66
+msgid "Invalid destination name for MoveAs"
+msgstr ""
+
 #: src/cmd_moveas.c:74
 msgid "Moving As..."
 msgstr "Переместить как..."
 
-#: src/cmd_moveas.c:105 src/cmd_moveas.c:110
+#: src/cmd_moveas.c:105 src/cmd_moveas.c:113
 msgid "Move As"
 msgstr "Переместить как"
 
@@ -1692,26 +1687,26 @@
 msgid "Are you sure you want to quit?"
 msgstr "Дествительно хотите выйти?"
 
-#: src/cmd_rename.c:44
+#: src/cmd_rename.c:57
 #, c-format
 msgid "Enter New Name For \"%s\""
 msgstr "Введите новое имя для \"%s\""
 
-#: src/cmd_rename.c:52 src/cmd_renamere.c:147 src/cmd_renamere.c:243
-#: src/cmd_renamere.c:293 src/cmd_renamere.c:388 src/cmd_renameseq.c:161
+#: src/cmd_rename.c:67 src/cmd_renamere.c:142 src/cmd_renamere.c:225
+#: src/cmd_renamere.c:268 src/cmd_renamere.c:367 src/cmd_renameseq.c:152
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Rename?"
 msgstr "\"%s\" Уже существует - продолжить переименование?"
 
-#: src/cmd_rename.c:132
+#: src/cmd_rename.c:245
 msgid "Rename"
 msgstr "Переименовать"
 
-#: src/cmd_renamere.c:260
-msgid "Regular expression error:\n"
-msgstr "Ошибка выражения:\n"
+#: src/cmd_rename.c:261
+msgid "Rename Single File In-Place (Without Dialog)?"
+msgstr ""
 
-#: src/cmd_renamere.c:446
+#: src/cmd_renamere.c:419
 msgid ""
 "Look for substring in all filenames, and replace\n"
 "it with another string."
@@ -1719,23 +1714,23 @@
 "Ищет подстроку во всех именах файлов и заменяет\n"
 "на другую подстроку."
 
-#: src/cmd_renamere.c:449
+#: src/cmd_renamere.c:422
 msgid "Replace"
 msgstr "Заменить"
 
-#: src/cmd_renamere.c:453
+#: src/cmd_renamere.c:426
 msgid "With"
 msgstr "На"
 
-#: src/cmd_renamere.c:461
+#: src/cmd_renamere.c:434
 msgid "Replace All?"
 msgstr "Все вхождения?"
 
-#: src/cmd_renamere.c:465
+#: src/cmd_renamere.c:438
 msgid "Simple"
 msgstr "Простая"
 
-#: src/cmd_renamere.c:469
+#: src/cmd_renamere.c:442
 msgid ""
 "Execute the 'From' RE on each filename, storing\n"
 "parenthesised subexpression matches. Then replace\n"
@@ -1749,19 +1744,19 @@
 "(начиная с 1) подвыражения с совпадающим текстом\n"
 "поиска и использовать результат как новое имя файла."
 
-#: src/cmd_renamere.c:477 src/cmd_renamere.c:500
+#: src/cmd_renamere.c:450 src/cmd_renamere.c:473
 msgid "From"
 msgstr "Найти"
 
-#: src/cmd_renamere.c:481 src/cmd_renamere.c:504
+#: src/cmd_renamere.c:454 src/cmd_renamere.c:477
 msgid "To"
 msgstr "Заменить"
 
-#: src/cmd_renamere.c:489
+#: src/cmd_renamere.c:462
 msgid "Reg Exp"
 msgstr "Выражение"
 
-#: src/cmd_renamere.c:494
+#: src/cmd_renamere.c:467
 msgid ""
 "Look for each character in the 'From' string, and replace\n"
 "any hits with the corresponding character in the 'To' string.\n"
@@ -1769,54 +1764,54 @@
 "the filename, and the result used as the new name for each file."
 msgstr ""
 
-#: src/cmd_renamere.c:513
+#: src/cmd_renamere.c:486
 msgid "Map"
 msgstr ""
 
-#: src/cmd_renamere.c:517
+#: src/cmd_renamere.c:490
 msgid ""
 "Changes the case (upper/lower) of the characters\n"
 "in the selected filename(s)."
 msgstr ""
 
-#: src/cmd_renamere.c:519
+#: src/cmd_renamere.c:492
 msgid "Lower Case?"
 msgstr "Нижний регистр?"
 
-#: src/cmd_renamere.c:521
+#: src/cmd_renamere.c:494
 msgid "Upper Case?"
 msgstr "Верхний регистр?"
 
-#: src/cmd_renamere.c:523
+#: src/cmd_renamere.c:496
 #, fuzzy
 msgid "Upper Case Initial?"
 msgstr "Верхний регистр?"
 
-#: src/cmd_renamere.c:526
+#: src/cmd_renamere.c:499
 msgid "Case"
 msgstr "Форма"
 
-#: src/cmd_renamere.c:528
+#: src/cmd_renamere.c:501
 msgid "RenameRE"
 msgstr "ПереименоватьУСЛ"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "10, Decimal"
 msgstr "10, Десятичная"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (A-F)"
 msgstr "16, Шестнадцетеричная (A-F)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (a-f)"
 msgstr "16, Шестнадцетеричная (a-f)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "8, Octal"
 msgstr "8, Восьмеричная"
 
-#: src/cmd_renameseq.c:328
+#: src/cmd_renameseq.c:306
 msgid ""
 "This command renames all selected files\n"
 "into a numbered sequence. The controls\n"
@@ -1828,86 +1823,86 @@
 "Кнопки управления ниже позволяют определить\n"
 "порядок формирования имен файлов."
 
-#: src/cmd_renameseq.c:335
+#: src/cmd_renameseq.c:313
 msgid "Start At"
 msgstr "Начать с"
 
-#: src/cmd_renameseq.c:343 src/cmd_split.c:247
+#: src/cmd_renameseq.c:323 src/cmd_split.c:609
 msgid "Base"
 msgstr "Форма"
 
-#: src/cmd_renameseq.c:359
+#: src/cmd_renameseq.c:333
 msgid "Precision"
 msgstr "Кол-во знаков"
 
-#: src/cmd_renameseq.c:367
+#: src/cmd_renameseq.c:340
 msgid "Head"
 msgstr "Начало"
 
-#: src/cmd_renameseq.c:374
+#: src/cmd_renameseq.c:347
 msgid "Tail"
 msgstr "Окончание"
 
-#: src/cmd_renameseq.c:382
+#: src/cmd_renameseq.c:354
 msgid "Guess"
 msgstr "Подставить"
 
-#: src/cmd_renameseq.c:396
+#: src/cmd_renameseq.c:369
 msgid "Sequential Rename"
 msgstr "Переименование в последовательность"
 
-#: src/cmd_select.c:396
+#: src/cmd_select.c:365
 msgid "All rows|Selected|Unselected|"
 msgstr "Все элементы|Отмеченные|Разотмеченные|"
 
-#: src/cmd_select.c:397
+#: src/cmd_select.c:366
 msgid "All types|Directories only|Non-directories only|"
 msgstr "Все типы|Каталоги|Без каталогов|"
 
-#: src/cmd_select.c:398
+#: src/cmd_select.c:367
 msgid "Select|Unselect|Toggle|"
 msgstr "Отметить|Разотметить|Перевернуть|"
 
-#: src/cmd_select.c:399 src/menus.c:530
+#: src/cmd_select.c:368 src/menus.c:537
 msgid "Action"
 msgstr "Действие"
 
-#: src/cmd_select.c:399
+#: src/cmd_select.c:368
 msgid "Set"
 msgstr "Установить"
 
-#: src/cmd_select.c:511
+#: src/cmd_select.c:469
 msgid "Treat RE as Glob Pattern?"
 msgstr "Использовать выражение как глоб. маску?"
 
-#: src/cmd_select.c:514
+#: src/cmd_select.c:472
 msgid "Invert RE Matching?"
 msgstr "Не удовлетворяющие выражению?"
 
-#: src/cmd_select.c:517
+#: src/cmd_select.c:475
 msgid "Require Match on Full Name?"
 msgstr "По полному имени?"
 
-#: src/cmd_select.c:531
+#: src/cmd_select.c:489
 msgid "Select Using RE"
 msgstr "Выбор используя выражение"
 
-#: src/cmd_select.c:815
+#: src/cmd_select.c:727
 msgid ""
 "Enter shell command to run. The command\n"
 "will have the selected content appended.\n"
 "Action is performed on successful exit."
 msgstr ""
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "OK|Cancel"
 msgstr "_ДА|_Отмена"
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "Select using shell command"
 msgstr "Выбер по консольной команде"
 
-#: src/cmd_split.c:68
+#: src/cmd_split.c:269
 #, c-format
 msgid ""
 "Split \"%s\".\n"
@@ -1916,7 +1911,7 @@
 "Разбить \"%s\".\n"
 "файл %s (%s)."
 
-#: src/cmd_split.c:70
+#: src/cmd_split.c:271
 #, c-format
 msgid ""
 "Split \"%s\".\n"
@@ -1925,93 +1920,143 @@
 "Разбить \"%s\".\n"
 "Файл %s."
 
-#: src/cmd_split.c:106
+#: src/cmd_split.c:348
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Split?"
 msgstr "\"%s\" Уже существует - продолжить разбивку?"
 
-#: src/cmd_split.c:171
-msgid "Beta Software"
-msgstr "Бета версия"
+#: src/cmd_split.c:422
+msgid "Fixed Size Split"
+msgstr "Разбивка по размеру"
+
+#: src/cmd_split.c:424
+msgid "Segment Size"
+msgstr "Размер куска"
 
-#: src/cmd_split.c:171
-msgid "Next Version?"
-msgstr "Следующая версия?"
+#: src/cmd_split.c:427
+#, fuzzy
+msgid "1457000 bytes (3.5\" floppy)"
+msgstr " 1457000 байт (3.5\" дискета)"
 
-#: src/cmd_split.c:171
-msgid ""
-"This splitting mode has not been\n"
-"implemented yet... Sorry."
-msgstr ""
-"Режим разбивки еще не \n"
-"реализован... Извините."
+#: src/cmd_split.c:428
+#, fuzzy
+msgid "10485760 bytes (10 MB)"
+msgstr " 1457000 байт (3.5\" дискета)"
+
+#: src/cmd_split.c:429
+#, fuzzy
+msgid "26214400 bytes (25 MB)"
+msgstr " 1457000 байт (3.5\" дискета)"
+
+#: src/cmd_split.c:430
+#, fuzzy
+msgid "52428800 bytes (50 MB)"
+msgstr " 1457000 байт (3.5\" дискета)"
 
-#: src/cmd_split.c:187
-msgid "  1457000 bytes (3.5\" floppy)"
+#: src/cmd_split.c:431
+#, fuzzy
+msgid "78643200 bytes (75 MB)"
 msgstr " 1457000 байт (3.5\" дискета)"
 
-#: src/cmd_split.c:188
-msgid "100431360 bytes (Zip disk)"
+#: src/cmd_split.c:432
+#, fuzzy
+msgid "100431360 bytes (95 MB, Zip disk)"
 msgstr "100431360 байт (Диск ZIP)"
 
-#: src/cmd_split.c:190
-msgid "Fixed Size Split"
+#: src/cmd_split.c:454
+#, fuzzy
+msgid "Fixed Count Split"
 msgstr "Разбивка по размеру"
 
-#: src/cmd_split.c:193
-msgid "Segment Size"
+#: src/cmd_split.c:457
+#, fuzzy
+msgid "Segment Count"
 msgstr "Размер куска"
 
-#: src/cmd_split.c:221
-msgid "Fixed size, variable number of parts"
-msgstr "По определенному размеру части"
+#: src/cmd_split.c:503
+msgid "Current part number, unique for every created file"
+msgstr ""
+
+#: src/cmd_split.c:504
+msgid "The value from the Base box"
+msgstr ""
+
+#: src/cmd_split.c:505
+msgid "The amount that index will change for each file"
+msgstr ""
+
+#: src/cmd_split.c:506
+msgid "The total number of files that will be created"
+msgstr ""
+
+#: src/cmd_split.c:507
+msgid "The value of index for the last file to be created"
+msgstr ""
 
-#: src/cmd_split.c:222
+#: src/cmd_split.c:570
+msgid "Fixed size, variable number of parts"
+msgstr "По определенному размеру части"
+
+#: src/cmd_split.c:571
 msgid "Fixed number of parts, variable sizes"
 msgstr "На определенное количество частей"
 
-#: src/cmd_split.c:230 src/cmd_split.c:261
+#: src/cmd_split.c:580 src/cmd_split.c:663
 msgid "Split"
 msgstr "Разбить"
 
-#: src/cmd_split.c:243
+#: src/cmd_split.c:599
 msgid "Name Format"
 msgstr "Формат имени"
 
-#: src/cmd_split.c:252
+#: src/cmd_split.c:615
 msgid "Step"
 msgstr "Шаг"
 
-#: src/cmd_symlink.c:77 src/cmd_symlink.c:246
+#: src/cmd_split.c:624
+msgid "Zero-Fill Numbers?"
+msgstr ""
+
+#: src/cmd_split.c:645
+msgid "Offset"
+msgstr ""
+
+#: src/cmd_symlink.c:68 src/cmd_symlink.c:252
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Link?"
 msgstr "\"%s\" Уже существует - продолжить создание ссылки?"
 
-#: src/cmd_symlink.c:184
+#: src/cmd_symlink.c:161 src/configure.c:239 src/icon_dialog.c:59
+#: src/progress.c:220
+msgid "Cancel"
+msgstr "Отмена"
+
+#: src/cmd_symlink.c:161 src/configure.c:233 src/dialog.c:290
+#: src/nag_dialog.c:36
+msgid "OK"
+msgstr "ДА"
+
+#: src/cmd_symlink.c:161
 msgid "Select Link Target"
 msgstr "Выберите цель ссылки"
 
-#: src/cmd_symlink.c:213
+#: src/cmd_symlink.c:218
 msgid "Contents"
 msgstr "Содержание"
 
-#: src/cmd_symlink.c:225
+#: src/cmd_symlink.c:231
 msgid "Edit Symbolic Link"
 msgstr "Изменить ссылку"
 
-#: src/cmd_symlink.c:231
+#: src/cmd_symlink.c:236
 msgid "Create Symbolic Link"
 msgstr "Создание ссылки"
 
-#: src/cmd_viewtext.c:206
-msgid "Use mmap() to Speed Loading?"
-msgstr "Использовать mmap() для ускорения загрузки?"
-
-#: src/cmd_viewtext.c:208
+#: src/cmd_viewtext.c:205
 msgid "Hex-Check First"
 msgstr "Проверить символы"
 
-#: src/cmd_viewtext.c:209
+#: src/cmd_viewtext.c:206
 msgid "Exit on Left Arrow Key?"
 msgstr ""
 
@@ -2027,7 +2072,7 @@
 msgid "yes"
 msgstr "да"
 
-#: src/cmdgrab.c:222
+#: src/cmdgrab.c:177
 #, c-format
 msgid "Output of %s (pid %d)"
 msgstr "Вывод %s (pid %d)"
@@ -2039,17 +2084,17 @@
 "command \"%s\"."
 msgstr "Не известная команда \"%s\"."
 
-#: src/cmdseq_dialog.c:126
+#: src/cmdseq_dialog.c:134
 #, c-format
 msgid "Built-Ins (%u)"
 msgstr "Встроеные (%u)"
 
-#: src/cmdseq_dialog.c:131
+#: src/cmdseq_dialog.c:139
 #, c-format
 msgid "User Defined (%u)"
 msgstr "Определенные (%u)"
 
-#: src/cmdseq_dialog.c:302
+#: src/cmdseq_dialog.c:313
 msgid ""
 "Select a command, or type start\n"
 "of name and press TAB."
@@ -2057,32 +2102,24 @@
 "Выберите команду или наберите\n"
 "начало и нажмите TAB"
 
-#: src/cmdseq_dialog.c:319
+#: src/cmdseq_dialog.c:330
 msgid "Select Command"
 msgstr "Выберите команду"
 
-#: src/configure.c:198
+#: src/configure.c:197
 msgid "Couldn't open configuration file for output"
 msgstr "Не могу открыть файл настройки для записи"
 
-#: src/configure.c:234 src/dialog.c:285
-msgid "OK"
-msgstr "ДА"
-
-#: src/configure.c:240
+#: src/configure.c:236
 msgid "Save"
 msgstr "Сохранить"
 
-#: src/configure.c:244 src/icon_dialog.c:59 src/progress.c:219
-msgid "Cancel"
-msgstr "Отмена"
-
-#: src/configure.c:455
+#: src/configure.c:463
 #, c-format
 msgid "Config file version (%s) doesn't match program version (%s)"
 msgstr "Версия файла настроек (%s) не совпадает с версией программы (%s)"
 
-#: src/configure.c:467
+#: src/configure.c:475
 #, c-format
 msgid ""
 "Couldn't find any configuration file; checked\n"
@@ -2093,57 +2130,43 @@
 "ни в \"%s\" ни в \"%s\".\n"
 "Использую встроенную минимальную настройку."
 
-#: src/dialog.c:123 src/dialog.c:253
+#: src/dialog.c:124 src/dialog.c:260
 msgid "_OK|_Cancel"
 msgstr "_ДА|_Отмена"
 
-#: src/dirpane.c:134
-msgid ""
-"Case-sensitive sorting will not work correctly with non-ASCII characters"
-msgstr "Сортировка с учетом регистра работает неверно с русскими буквами"
-
-#: src/dirpane.c:143
-msgid ""
-"Case-insensitive sorting will not work correctly with non-ASCII characters"
-msgstr "Сортировка без учета регистра работает неверно с русскими буквами"
-
-#: src/dirpane.c:1189
+#: src/dirpane.c:541
 #, c-format
 msgid "%u/%u dirs, %u/%u files"
 msgstr "%u/%u каталогов, %u/%u файлов"
 
-#: src/dirpane.c:1197
-#, fuzzy, c-format
-msgid " (%%s/%%s, %%%s/%%%s blocks)"
-msgstr " (%s/%s, %Lu/%Lu блоков)"
+#: src/dirpane.c:546
+#, c-format
+msgid " (%s/%s)"
+msgstr ""
 
-#: src/dirpane.c:1210
+#: src/dirpane.c:557
 #, fuzzy, c-format
 msgid ", %s (%s) used"
 msgstr ", %s занято"
 
-#: src/dirpane.c:1212
+#: src/dirpane.c:559
 #, c-format
 msgid ", %s free"
 msgstr ", %s свободно"
 
-#: src/dirpane.c:1560
-msgid "!!Invalid filename!!"
-msgstr ""
-
-#: src/dirpane.c:2004 src/dirpane.c:2053
+#: src/dirpane.c:2084 src/dirpane.c:2131
 msgid "Move up to the parent directory"
 msgstr "Перейти в родительский каталог"
 
-#: src/dirpane.c:2026
+#: src/dirpane.c:2106
 msgid "Enter path, then press Return to go there"
 msgstr "Введите путь и нажмите Ввод для перехода"
 
-#: src/dirpane.c:2027
+#: src/dirpane.c:2107
 msgid "H"
 msgstr "С"
 
-#: src/dirpane.c:2031
+#: src/dirpane.c:2111
 msgid ""
 "Click to enable/disable Hide rule (When pressed in, the hide rule is active, "
 "and matching entries are hidden)"
@@ -2151,176 +2174,176 @@
 "Нажмите для включения/выключения показа скрытых элементов(нажатое состояние "
 "обозначает скрытие)"
 
-#: src/dpformat.c:37
+#: src/dpformat.c:38
 msgid "Blocks"
 msgstr "Блоков"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "BSize"
 msgstr "Блок"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "Block Size"
 msgstr "Размер блока"
 
-#: src/dpformat.c:39
+#: src/dpformat.c:40
 msgid "Mode, numerical"
 msgstr "Права, в цифрах"
 
-#: src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode, string"
 msgstr "Права, строкой"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Nlink"
 msgstr "Ссылок"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Number of links"
 msgstr "Число ссылок"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Owner ID"
 msgstr "Номер владельца"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Uid"
 msgstr "Nвлад"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Owner Name"
 msgstr "Имя владельца"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Uname"
 msgstr "Владелец"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Gid"
 msgstr "Nгруп"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Group ID"
 msgstr "Номер группы"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Gname"
 msgstr "Группа"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Group Name"
 msgstr "Имя группы"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device"
 msgstr "Устройство"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device Number"
 msgstr "Номер устройства"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "DevMaj"
 msgstr "NУстрО"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "Device Number, major"
 msgstr "Номер устройства, основной"
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "DevMin"
 msgstr "NУстрНО"
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "Device Number, minor"
 msgstr "Номер устройства, неосновной"
 
-#: src/dpformat.c:49
-msgid "Date of last Access"
-msgstr "Время последнего доступа"
-
 #: src/dpformat.c:50
-msgid "Date of last Modification"
-msgstr "Время последней модификации"
+#, fuzzy
+msgid "Time of Last Access"
+msgstr "Время последнего доступа"
 
 #: src/dpformat.c:51
-msgid "Created"
-msgstr "Создан"
+#, fuzzy
+msgid "Time of Last Modification"
+msgstr "Время последней модификации"
 
-#: src/dpformat.c:51
-msgid "Date of Creation"
+#: src/dpformat.c:52
+#, fuzzy
+msgid "Time of Creation"
 msgstr "Время создания"
 
-#: src/dpformat.c:52
+#: src/dpformat.c:53
+msgid "Time of Last Change"
+msgstr ""
+
+#: src/dpformat.c:54
 msgid "Type Name"
 msgstr "Имя типа"
 
-#: src/dpformat.c:53
+#: src/dpformat.c:55
 msgid "I"
 msgstr "З"
 
-#: src/dpformat.c:334
-msgid "B"
-msgstr "Б"
-
-#: src/dpformat.c:338 src/sizeutil.c:32
-msgid "KB"
-msgstr "КБ"
-
-#: src/dpformat.c:343 src/sizeutil.c:33
-msgid "MB"
-msgstr "МБ"
+#: src/dpformat.c:56
+msgid "URI"
+msgstr ""
 
-#: src/dpformat.c:348 src/sizeutil.c:31
-msgid "GB"
-msgstr "ГБ"
+#: src/dpformat.c:56
+msgid "URI (without file prefix)"
+msgstr ""
 
-#: src/errors.c:69
+#: src/errors.c:59
 #, c-format
 msgid "Couldn't %s \"%s\": %s (code %d)"
 msgstr "Не могу %s \"%s\": %s (код %d)"
 
-#: src/errors.c:71
+#: src/errors.c:61
 #, c-format
 msgid "Couldn't %s \"%s\" (code %d)"
 msgstr "Не могу %s \"%s\" (код %d)"
 
-#: src/errors.c:76
+#: src/errors.c:66
 #, c-format
 msgid "Couldn't %s \"%s\""
 msgstr "Не могу %s \"%s\""
 
-#: src/errors.c:78
+#: src/errors.c:68
 #, c-format
 msgid "Couldn't %s"
 msgstr "Не могу %s"
 
+#: src/errors.c:88
+#, c-format
+msgid "%s"
+msgstr ""
+
 # src/gentoo.c:440
-#: src/gentoo.c:421
+#: src/gentoo.c:427
 msgid "Report the version to standard output, and exit."
 msgstr "Вывести номер версии и выйти."
 
 # src/gentoo.c:440
-#: src/gentoo.c:423
+#: src/gentoo.c:429
 msgid "Report internal locale details, and exit."
 msgstr "Вывести детали внутренней локализации и выйти."
 
 # src/gentoo.c:441
-#: src/gentoo.c:425
+#: src/gentoo.c:431
 msgid "Allows gentoo to be run by the root user. Could be dangerous."
 msgstr ""
 "Позволяет запускать gentoo под root'ом. Может привести к печальным "
 "последствиям. "
 
 # src/gentoo.c:442
-#: src/gentoo.c:426
+#: src/gentoo.c:432
 msgid ""
 "Do not load the ~/.gentoorc configuration file; instead, use default values."
 msgstr ""
 "Не загружать файл настроек ~/.gentoorc; использовать настройки по умолчанию."
 
 # src/gentoo.c:443
-#: src/gentoo.c:427
+#: src/gentoo.c:433
 msgid ""
 "Do not load the ~/.gentoogtkrc GTK+ configuration file; instead, use system "
 "defaults."
@@ -2328,82 +2351,82 @@
 "Не загружать настройки GTK+ : ~/.gentoogtkrc; использовать системные "
 "значения по умолчанию."
 
-# src/gentoo.c:445
-#: src/gentoo.c:429
-msgid "Do not use FAM to automatically detect changes in viewed directories."
+#: src/gentoo.c:434
+#, fuzzy
+msgid ""
+"Run COMMAND, a gentoo command. Done before user interaction allowed, but "
+"after configuration file has been read in. Can be used many times to run "
+"several commands in sequence."
+msgstr ""
+"Запустить ARG, команду gentoo. Команда запускается до отображения окна, но "
+"после чтения файла настроек. Возможно использовать несколько раз для запуска "
+"нескольких разных команд."
+
+#: src/gentoo.c:435
+msgid "COMMAND"
+msgstr ""
+
+#: src/gentoo.c:436 src/gentoo.c:437
+msgid "DIR"
 msgstr ""
-"Не использовать FAM для определения изменений в просмотриваемый каталогах."
 
 # src/gentoo.c:447
-#: src/gentoo.c:431
+#: src/gentoo.c:436
+#, fuzzy
 msgid ""
-"Use ARG as path for the left directory pane. Overrides default (and history)."
+"Use DIR as path for the left directory pane. Overrides default (and history)."
 msgstr ""
 "Использовать ARG как путь для левой панели. Переопределить путь по умолчанию"
 "(и историю)."
 
 # src/gentoo.c:448
-#: src/gentoo.c:432
+#: src/gentoo.c:437
+#, fuzzy
 msgid ""
-"Use ARG as path for the right directory pane. Overrides default (and "
+"Use DIR as path for the right directory pane. Overrides default (and "
 "history)."
 msgstr ""
 "Использовать ARG как путь для правой панели. Переопределить путь по умолчанию"
 "(и историю)."
 
-#: src/gentoo.c:433
-msgid ""
-"Run ARG, a gentoo command. Done before user interaction allowed, but after "
-"configuration file has been read in. Can be used many times to run several "
-"commands in sequence."
+#: src/gentoo.c:461
+msgid "- a graphical file manager using GTK+"
 msgstr ""
-"Запустить ARG, команду gentoo. Команда запускается до отображения окна, но "
-"после чтения файла настроек. Возможно использовать несколько раз для запуска "
-"нескольких разных команд."
 
-#: src/gentoo.c:492
+#: src/gentoo.c:466
+#, c-format
+msgid "Failed to parse command line options: %s\n"
+msgstr ""
+
+#: src/gentoo.c:506
 #, c-format
 msgid "%s: To run as root, envoke with the '--root-ok' option\n"
 msgstr "%s: Чтобы запустить под root используйте --root-ok\n"
 
-#: src/gentoo.c:524
+#: src/gentoo.c:538
 msgid "Couldn't initialize userinfo module - username resolving won't work"
 msgstr ""
 "Не могу найти модуль userinfo - определение имен пользователей не будет "
 "работать."
 
-#: src/gentoo.c:529
-msgid "Couldn't initialize mount data - automounting won't work"
-msgstr ""
-"Не могу найти описание подключений дисков - автоподключение не будет "
-"работать."
-
-#: src/gentoo.c:560
+#: src/gentoo.c:570
 #, c-format
 msgid "gentoo v%s by Emil Brink <emil@obsession.se>"
 msgstr "gentoo v%s - Emil Brink <emil@obsession.se>"
 
-#: src/gfam.c:216
-#, c-format
-msgid "FAM open failed, error %d--FAM will not be used"
-msgstr "Не могу открыть FAM, ошибка %d - FAM не использую"
-
-#: src/gfam.c:235
-#, fuzzy, c-format
-msgid ""
-"Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, perhaps)"
+#: src/gentoo.c:577
+msgid "Development Version Warning"
 msgstr ""
-"Не могу добавить монитор FAM \"%s\", ошибка %s (может запустить с --no-fam ?)"
 
-#: src/gfam.c:241
-#, fuzzy, c-format
+#: src/gentoo.c:577
 msgid ""
-"Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go around, "
-"perhaps)"
+"This version of gentoo is considered somewhat new and untested. There have "
+"been major changes to almost all parts of the program since the previous "
+"version. Please be a bit careful, and make sure you report any problem to "
+"the author. Thanks."
 msgstr ""
-"Не могу добавить монитор FAM \"%s\", ошибка %s (может запустить с --no-fam ?)"
 
-#: src/guiutil.c:118
+#: src/guiutil.c:124
 msgid "Progress"
 msgstr "Состояние"
 
@@ -2415,221 +2438,219 @@
 msgid "Loading Icon Graphics..."
 msgstr "Загрузка значка ..."
 
-#: src/menus.c:278
+#: src/menus.c:284
 msgid "(No Selection)"
 msgstr "(нет выделения)"
 
-#: src/menus.c:514
+#: src/menus.c:521
 msgid "RegExp..."
 msgstr "Выражение"
 
-#: src/menus.c:526
+#: src/menus.c:533
 msgid "Other"
 msgstr "С другой панели"
 
-#: src/menus.c:527
+#: src/menus.c:534
 msgid "Rescan"
 msgstr "Обновить"
 
-#: src/menus.c:528
+#: src/menus.c:535
 msgid "Select"
 msgstr "Выбор"
 
-#: src/menus.c:532
+#: src/menus.c:539
 msgid "Run..."
 msgstr "Выполнить..."
 
-#: src/menus.c:534
+#: src/menus.c:541
 msgid "Configure..."
 msgstr "Настроить..."
 
-#: src/menus.c:610
+#: src/menus.c:618
 msgid "Select Menu"
 msgstr "Выберите меню"
 
-#: src/mount.c:222
-#, c-format
-msgid "Execution of \"%s %s\" failed:\n"
-msgstr "Выполнение \"%s %s\" прервано:\n"
-
-#: src/mount.c:318
-#, c-format
-msgid "Mounting \"%s\" on \"%s\"..."
-msgstr "Подключение \"%s\" в \"%s\"..."
+#: src/nag_dialog.c:37
+msgid "_Don't show this dialog again"
+msgstr ""
 
 #: src/overwrite.c:49
 msgid "_OK|A_ll|_Skip|Skip _All|_Cancel"
 msgstr "_ДА|_Все|_Нет|Ни одного|_Отмена"
 
-# c-format
-#: src/overwrite.c:73
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Old: %%%s bytes, changed on %%s,\n"
-"New: %%%s bytes, changed on %%s."
-msgstr ""
-"\n"
-"Старое: %llu байт, изменен %s.\n"
-"Новое: %llu байт, изменен %s."
-
-#: src/progress.c:195
+#: src/progress.c:196
 #, c-format
 msgid "Total (%s)"
 msgstr "Всего (%s)"
 
-#: src/progress.c:315
+#: src/progress.c:305
 #, c-format
 msgid "Elapsed %02d:%02d  Speed %s/s  ETA %02u:%02u"
 msgstr "Время %02d:%02d  Скорость %s/c Осталось %02u:%02u"
 
-#: src/sizeutil.c:30
-msgid "BYTES"
-msgstr "Байт"
+#: src/sizeutil.c:31
+#, fuzzy
+msgid "Unformatted Size"
+msgstr "Размер, в байтах"
 
-#: src/sizeutil.c:69
-#, c-format
-msgid "%%%s"
-msgstr ""
+#: src/sizeutil.c:32
+#, fuzzy
+msgid "Formatted Size, Without Unit"
+msgstr "Размер,в \"умных\" единицах"
 
-#: src/sizeutil.c:70
-#, fuzzy, c-format
-msgid "%%%s bytes"
-msgstr "%Lu байт"
+#: src/sizeutil.c:33
+#, fuzzy
+msgid "Formatted Size, in Bytes"
+msgstr "Размер, в байтах"
 
-#: src/sizeutil.c:71
-#, fuzzy, c-format
-msgid "%%%s KB"
-msgstr "%Lu КБ"
+#: src/sizeutil.c:33 src/sizeutil.c:159
+#, fuzzy
+msgid "bytes"
+msgstr "да"
 
-#: src/sizeutil.c:72
-#, fuzzy, c-format
-msgid "%%%s MB"
-msgstr "%Lu МБ"
+#: src/sizeutil.c:34
+#, fuzzy
+msgid "Formatted Size, in Kilobytes"
+msgstr "Размер, в килобайтах"
 
-#: src/sizeutil.c:73
-#, fuzzy, c-format
-msgid "%%%s GB"
-msgstr "%Lu ГБ"
+#: src/sizeutil.c:34 src/sizeutil.c:163
+msgid "KB"
+msgstr "КБ"
 
-#: src/sizeutil.c:164 src/sizeutil.c:211
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f КБ"
+#: src/sizeutil.c:35
+#, fuzzy
+msgid "Formatted Size, in Megabytes"
+msgstr "Размер, в мегабайтах"
 
-#: src/sizeutil.c:170 src/sizeutil.c:217
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f МБ"
+#: src/sizeutil.c:35 src/sizeutil.c:167
+msgid "MB"
+msgstr "МБ"
 
-#: src/sizeutil.c:176 src/sizeutil.c:223
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f ГБ"
+#: src/sizeutil.c:36
+#, fuzzy
+msgid "Formatted Size, in Gigabytes"
+msgstr "Размер, в гигабайтах"
+
+#: src/sizeutil.c:36 src/sizeutil.c:171
+msgid "GB"
+msgstr "ГБ"
+
+#: src/sizeutil.c:37
+#, fuzzy
+msgid "Formatted Size, in Terabytes"
+msgstr "Размер, в мегабайтах"
+
+#: src/sizeutil.c:37 src/sizeutil.c:175
+#, fuzzy
+msgid "TB"
+msgstr "Б"
+
+#: src/sizeutil.c:38
+#, fuzzy
+msgid "Formatted Size, Automatic Unit"
+msgstr "Размер,в \"умных\" единицах"
 
 #: src/style_dialog.c:40
 msgid "Select Style"
 msgstr "Выберите класс"
 
-#: src/styles.c:112
+#: src/styles.c:114
 msgid "Root"
 msgstr "Root"
 
-#: src/styles.c:118 src/types.c:485 src/types.c:488
+#: src/styles.c:120 src/types.c:292 src/types.c:295
 msgid "Directory"
 msgstr "Каталог"
 
-#: src/styles.c:961
+#: src/styles.c:889
 msgid "New Style"
 msgstr "Новый класс"
 
-#: src/styles.c:961
+#: src/styles.c:889
 #, c-format
 msgid "New Style %u"
 msgstr "Новый класс %u"
 
-#: src/textview.c:152
+#: src/textview.c:190
 #, c-format
-msgid "Unable to convert text from native character set (%s) to UTF-8: %s"
+msgid ""
+"\n"
+"** Text conversion from charset '%s' failed, aborting."
 msgstr ""
 
-#: src/textview.c:252 src/textview.c:353
-msgid "File reading"
-msgstr "Чтение файла"
-
-#: src/textview.c:419
+#: src/textview.c:405
 #, c-format
 msgid "Line %d (%.0f%%)"
 msgstr "Строка %d (%.0f%%)"
 
-#: src/textview.c:472
+#: src/textview.c:455
 msgid "Enter Line Number or Percentage:"
 msgstr "Введите номер строки или процент:"
 
-#: src/textview.c:478
+#: src/textview.c:461
 msgid "Goto"
 msgstr "Перейти"
 
-#: src/textview.c:613
+#: src/textview.c:596
 msgid "Enter Text to Search For (RE)"
 msgstr "Введите текст для поиска (Выражение)"
 
-#: src/textview.c:623
+#: src/textview.c:607
 msgid "Don't Span Newlines?"
 msgstr "Не распределять новые линии?"
 
-#: src/textview.c:629
+#: src/textview.c:613
 msgid "Search"
 msgstr "Поиск"
 
-#: src/types.c:454
+#: src/types.c:287
+msgid "Unknown"
+msgstr "Неизвестный"
+
+#: src/types.c:572
 #, c-format
 msgid ""
 "Got SIGPIPE when writing to 'file' process (%s), it seems to have terminated "
 "prematurely."
 msgstr ""
 
-#: src/types.c:461
+#: src/types.c:578
 msgid "Unable to run spawn 'file' command: "
 msgstr ""
 
-#: src/types.c:480
-msgid "Unknown"
-msgstr "Неизвестный"
-
-#: src/window.c:82
+#: src/window.c:83
 msgid "Configure gentoo"
 msgstr "Настройка"
 
-#: src/window.c:89
+#: src/window.c:90
 msgid "Text Viewer"
 msgstr "Просмотр текста"
 
-#: src/window.c:200
+#: src/window.c:199
 msgid "Position"
 msgstr "Позиция"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Height"
 msgstr "Высота"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "X"
 msgstr "X"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Y"
 msgstr "Y"
 
-#: src/window.c:208
+#: src/window.c:207
 msgid "Set on Open?"
 msgstr "Установить при открытии?"
 
-#: src/window.c:214
+#: src/window.c:213
 msgid "Update on Close?"
 msgstr "Сохранить при закрытии?"
 
-#: src/window.c:245
+#: src/window.c:244
 msgid "Grab"
 msgstr "Захватить"
 
@@ -2637,6 +2658,218 @@
 msgid "XML module emitted locale-dependant real number"
 msgstr "XML модуль выдал локально-зависимый номер"
 
+#~ msgid "Use Dialog to Report Errors?"
+#~ msgstr "Использовать диалог для ошибок?"
+
+#~ msgid "Path Right Click"
+#~ msgstr "Правый щелчок на пути"
+
+#~ msgid "Raw Size, in Bytes"
+#~ msgstr "Сырой размер, в байтах"
+
+#~ msgid "Always Set"
+#~ msgstr "Всегда включено"
+
+#~ msgid "Modify 'Control' Key State"
+#~ msgstr "Изменить состояние кнопки 'Control'"
+
+#~ msgid "Active Pane Titles"
+#~ msgstr "Заголовок активной панели"
+
+#~ msgid "Focused Row, Unselected"
+#~ msgstr "Выбранная строка, не отмеченая"
+
+#~ msgid "Focused Row, Selected"
+#~ msgstr "Выбранная строка, отмеченная"
+
+#~ msgid "Beta Software"
+#~ msgstr "Бета версия"
+
+#~ msgid "Next Version?"
+#~ msgstr "Следующая версия?"
+
+#~ msgid ""
+#~ "This splitting mode has not been\n"
+#~ "implemented yet... Sorry."
+#~ msgstr ""
+#~ "Режим разбивки еще не \n"
+#~ "реализован... Извините."
+
+#~ msgid ""
+#~ "Case-sensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr "Сортировка с учетом регистра работает неверно с русскими буквами"
+
+#~ msgid ""
+#~ "Case-insensitive sorting will not work correctly with non-ASCII characters"
+#~ msgstr "Сортировка без учета регистра работает неверно с русскими буквами"
+
+#~ msgid "BYTES"
+#~ msgstr "Байт"
+
+#, fuzzy
+#~ msgid "%%%s bytes"
+#~ msgstr "%Lu байт"
+
+#, fuzzy
+#~ msgid "%%%s KB"
+#~ msgstr "%Lu КБ"
+
+#, fuzzy
+#~ msgid "%%%s MB"
+#~ msgstr "%Lu МБ"
+
+#, fuzzy
+#~ msgid "%%%s GB"
+#~ msgstr "%Lu ГБ"
+
+#~ msgid "%.2f KB"
+#~ msgstr "%.2f КБ"
+
+#~ msgid "%.2f MB"
+#~ msgstr "%.2f МБ"
+
+#~ msgid "%.2f GB"
+#~ msgstr "%.2f ГБ"
+
+#~ msgid "Numerical Mode?"
+#~ msgstr "Учитывать длину?"
+
+#~ msgid "Never"
+#~ msgstr "Никогда"
+
+#~ msgid "On Every Access"
+#~ msgstr "При каждом обращении"
+
+#~ msgid "Mounting"
+#~ msgstr "Подключение"
+
+#~ msgid "Mount When?"
+#~ msgstr "Когда подключать?"
+
+#~ msgid "Mount Options"
+#~ msgstr "Настройка подключения дисков"
+
+#~ msgid "Mount Command"
+#~ msgstr "Команда подключения"
+
+#~ msgid "Unmount Command"
+#~ msgstr "Команда отключения"
+
+#~ msgid "Only Mount on Toplevel Directories?"
+#~ msgstr "Подключать только в корневом каталоге?"
+
+#~ msgid "Use Command Error Dialog?"
+#~ msgstr "Использовать диалог для ошибок"
+
+#~ msgid "Unmount When gentoo Quits?"
+#~ msgstr "Отключать при выходе?"
+
+#~ msgid "FAM: Supported and active."
+#~ msgstr "FAM: Поддерживается и включено"
+
+#~ msgid "FAM: Supported, but not active."
+#~ msgstr "FAM: Поддерживается, но не включено."
+
+#~ msgid "FAM: Not supported."
+#~ msgstr "FAM: Не поддерживается."
+
+#~ msgid ""
+#~ "Can't copy directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "Не могу копировать \"%s\"\n"
+#~ "в \"%s\"\n"
+#~ "(копирование самого в себя)."
+
+#~ msgid "Wrap Around At Top And Bottom?"
+#~ msgstr "Перескакивать в другой конец списка?"
+
+#~ msgid ""
+#~ "%s (%s bytes,\n"
+#~ "%s blocks)"
+#~ msgstr ""
+#~ "%s (%s байт),\n"
+#~ "%s блоков)"
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the source contains the destination."
+#~ msgstr ""
+#~ "Не могу переместить каталог \"%s\"\n"
+#~ "в \"%s\"\n"
+#~ "(назначение - подпапка источника)."
+
+#~ msgid ""
+#~ "Can't move directory \"%s\"\n"
+#~ "to \"%s\":\n"
+#~ "the destination contains the source."
+#~ msgstr ""
+#~ "Не могу переместить \"%s\"\n"
+#~ "в \"%s\"\n"
+#~ "(источник - подпапка назначения)."
+
+#~ msgid "Regular expression error:\n"
+#~ msgstr "Ошибка выражения:\n"
+
+#~ msgid "Use mmap() to Speed Loading?"
+#~ msgstr "Использовать mmap() для ускорения загрузки?"
+
+#, fuzzy
+#~ msgid " (%%s/%%s, %%%s/%%%s blocks)"
+#~ msgstr " (%s/%s, %Lu/%Lu блоков)"
+
+# src/gentoo.c:445
+#~ msgid ""
+#~ "Do not use FAM to automatically detect changes in viewed directories."
+#~ msgstr ""
+#~ "Не использовать FAM для определения изменений в просмотриваемый каталогах."
+
+#~ msgid "Couldn't initialize mount data - automounting won't work"
+#~ msgstr ""
+#~ "Не могу найти описание подключений дисков - автоподключение не будет "
+#~ "работать."
+
+#~ msgid "FAM open failed, error %d--FAM will not be used"
+#~ msgstr "Не могу открыть FAM, ошибка %d - FAM не использую"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, "
+#~ "perhaps)"
+#~ msgstr ""
+#~ "Не могу добавить монитор FAM \"%s\", ошибка %s (может запустить с --no-"
+#~ "fam ?)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go "
+#~ "around, perhaps)"
+#~ msgstr ""
+#~ "Не могу добавить монитор FAM \"%s\", ошибка %s (может запустить с --no-"
+#~ "fam ?)"
+
+#~ msgid "Execution of \"%s %s\" failed:\n"
+#~ msgstr "Выполнение \"%s %s\" прервано:\n"
+
+#~ msgid "Mounting \"%s\" on \"%s\"..."
+#~ msgstr "Подключение \"%s\" в \"%s\"..."
+
+# c-format
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Old: %%%s bytes, changed on %%s,\n"
+#~ "New: %%%s bytes, changed on %%s."
+#~ msgstr ""
+#~ "\n"
+#~ "Старое: %llu байт, изменен %s.\n"
+#~ "Новое: %llu байт, изменен %s."
+
+#~ msgid "File reading"
+#~ msgstr "Чтение файла"
+
 #, fuzzy
 #~ msgid "Pick Command ..."
 #~ msgstr "Выбрать код"

gentoo-0.15.6.tar.bz2/po/sv.gmo -> gentoo-0.19.9.tar.gz/po/sv.gmo Changed

gentoo-0.15.6.tar.bz2/po/sv.po -> gentoo-0.19.9.tar.gz/po/sv.po Changed

@@ -1,28 +1,29 @@
 # Swedish translations for gentoo package.
 # Copyright (C) 2002-2009 Emil Brink.
 # This file is distributed under the same license as the gentoo package.
-# Emil Brink <emil@obsession.se>, 2002-2009.
+# Emil Brink <emil@obsession.se>, 2002-2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gentoo\n"
 "Report-Msgid-Bugs-To: Emil Brink\n"
-"POT-Creation-Date: 2009-07-11 19:05+0200\n"
+"POT-Creation-Date: 2011-01-26 21:54+0100\n"
 "PO-Revision-Date: 2002-06-15 17:47+0200\n"
 "Last-Translator: Emil Brink <emil@obsession.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/cfg_buttonlayout.c:65
 msgid "Left of Command Buttons"
-msgstr "Till vänster om standardknapparna"
+msgstr "Till vÃ¤nster om standardknapparna"
 
 #: src/cfg_buttonlayout.c:65
 msgid "Right of Command Buttons"
-msgstr "Till höger om standardknapparna"
+msgstr "Till hÃ¶ger om standardknapparna"
 
 #: src/cfg_buttonlayout.c:66
 msgid "No Padding"
@@ -57,30 +58,30 @@
 "option menu widget\n"
 "in the top left corner of the page."
 msgstr ""
-"Denna sida låter dig kontrollera hur knapparket Genvägar placeras relativt "
+"Denna sida lÃ¥ter dig kontrollera hur knapparket GenvÃ¤gar placeras relativt "
 "till arket Standard,\n"
-"som innehåller de vanliga kommandoknapparna. Det är en tillfällig lösning; "
+"som innehÃ¥ller de vanliga kommandoknapparna. Det Ã¤r en tillfÃ¤llig lÃ¶sning; "
 "en hel del mer flexibilitet\n"
-"för knappplaceringen är planerat, liksom möjligheten att själv skapa fler "
-"knappark än de två som nu\n"
-"finns inbyggda. Men detta har inte hänt, än.\n"
+"fÃ¶r knappplaceringen Ã¤r planerat, liksom mÃ¶jligheten att sjÃ¤lv skapa fler "
+"knappark Ã¤n de tvÃ¥ som nu\n"
+"finns inbyggda. Men detta har inte hÃ¤nt, Ã¤n.\n"
 "\n"
-"Under tiden bibehåller denna sida de möjligheter som fanns i gentoo när "
-"genvägarna var en speciell\n"
-"uppsättning knappar med sin egen konfigurationssida (den försvann i version "
-"0.11.25). Allt för din\n"
-"bekvämlighet.\n"
+"Under tiden bibehÃ¥ller denna sida de mÃ¶jligheter som fanns i gentoo nÃ¤r "
+"genvÃ¤garna var en speciell\n"
+"uppsÃ¤ttning knappar med sin egen konfigurationssida (den fÃ¶rsvann i version "
+"0.11.25). Allt fÃ¶r din\n"
+"bekvÃ¤mlighet.\n"
 "\n"
-"För att hitta arket Genvägar, byt tillbaka till definitionssidan, och använd "
-"menyn i sidans övre vänstra hörn."
+"FÃ¶r att hitta arket GenvÃ¤gar, byt tillbaka till definitionssidan, och anvÃ¤nd "
+"menyn i sidans Ã¶vre vÃ¤nstra hÃ¶rn."
 
 #: src/cfg_buttonlayout.c:88
 msgid "Shortcut Sheet Position"
-msgstr "Placera genvägarna"
+msgstr "Placera genvÃ¤garna"
 
 #: src/cfg_buttonlayout.c:102
 msgid "Separation Style"
-msgstr "Separationssätt"
+msgstr "SeparationssÃ¤tt"
 
 #: src/cfg_buttonlayout.c:116
 msgid "Layout"
@@ -88,142 +89,142 @@
 
 #: src/cfg_buttons.c:308
 msgid "Set Row Width"
-msgstr "Sätt radbredd"
+msgstr "SÃ¤tt radbredd"
 
-#: src/cfg_buttons.c:326 src/cfg_buttons.c:749
+#: src/cfg_buttons.c:326 src/cfg_buttons.c:748
 msgid "Default"
 msgstr "Standard"
 
 #: src/cfg_buttons.c:439 src/overwrite.c:49
 msgid "Please Confirm"
-msgstr "Bekräfta"
+msgstr "BekrÃ¤fta"
 
 #: src/cfg_buttons.c:439
 msgid "Really delete current button row?"
 msgstr "Ta bort nuvarande knapprad?"
 
-#: src/cfg_buttons.c:439 src/cfg_styles.c:671
+#: src/cfg_buttons.c:439 src/cfg_styles.c:680
 msgid "_Delete|_Cancel"
 msgstr "_Ta bort|Av_bryt"
 
 #: src/cfg_buttons.c:463
 msgid "Select Width for New Row"
-msgstr "Välj bredd för ny rad"
+msgstr "VÃ¤lj bredd fÃ¶r ny rad"
 
 #: src/cfg_buttons.c:466
 msgid "Change Width of Row"
-msgstr "Ändra radbredd"
+msgstr "Ãndra radbredd"
 
 #: src/cfg_buttons.c:609
 msgid "Edit Background Color"
-msgstr "Ändra bakgrundsfärg"
+msgstr "Ãndra bakgrundsfÃ¤rg"
 
 #: src/cfg_buttons.c:653
 msgid "Edit Foreground Color"
-msgstr "Ändra förgrundsfärg"
+msgstr "Ãndra fÃ¶rgrundsfÃ¤rg"
 
 #: src/cfg_buttons.c:678
 msgid "Label"
 msgstr "Etikett"
 
-#: src/cfg_buttons.c:685 src/cfg_controls.c:645 src/cfg_controls.c:696
-#: src/cfg_controls.c:718 src/cfg_controls.c:739
+#: src/cfg_buttons.c:686 src/cfg_controls.c:612 src/cfg_controls.c:663
+#: src/cfg_controls.c:685
 msgid "Command"
 msgstr "Kommando"
 
-#: src/cfg_buttons.c:696 src/cfg_controls.c:639
+#: src/cfg_buttons.c:697 src/cfg_controls.c:606
 msgid "Key"
 msgstr "Tangent"
 
-#: src/cfg_buttons.c:711 src/cfg_dirpane.c:1373
+#: src/cfg_buttons.c:712
 msgid "Colors"
-msgstr "Färger"
+msgstr "FÃ¤rger"
 
-#: src/cfg_buttons.c:715
+#: src/cfg_buttons.c:716
 msgid "Background..."
 msgstr "Bakgrund..."
 
-#: src/cfg_buttons.c:716 src/cfg_buttons.c:722
+#: src/cfg_buttons.c:717 src/cfg_buttons.c:723
 msgid "Reset to Default"
-msgstr "Återställ"
+msgstr "ÃterstÃ¤ll"
 
-#: src/cfg_buttons.c:721
+#: src/cfg_buttons.c:722
 msgid "Foreground..."
-msgstr "Förgrund..."
+msgstr "FÃ¶rgrund..."
 
-#: src/cfg_buttons.c:749
+#: src/cfg_buttons.c:748
 msgid "Shortcuts"
-msgstr "Genvägar"
+msgstr "GenvÃ¤gar"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Clear"
-msgstr "Töm"
+msgstr "TÃ¶m"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy Colors To"
-msgstr "Kopiera färger till"
+msgstr "Kopiera fÃ¤rger till"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Copy To"
 msgstr "Kopiera till"
 
-#: src/cfg_buttons.c:750
+#: src/cfg_buttons.c:749
 msgid "Swap With"
 msgstr "Byt med"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Add Row..."
-msgstr "Lägg till rad..."
+msgstr "LÃ¤gg till rad..."
 
-#: src/cfg_buttons.c:751 src/cfg_cmdseq.c:951
+#: src/cfg_buttons.c:750 src/cfg_cmdseq.c:966
 msgid "Delete Row"
 msgstr "Ta bort rad"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Down"
 msgstr "Ner"
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Row Width..."
 msgstr "Radbredd..."
 
-#: src/cfg_buttons.c:751
+#: src/cfg_buttons.c:750
 msgid "Up"
 msgstr "Upp"
 
-#: src/cfg_buttons.c:762
+#: src/cfg_buttons.c:761
 msgid "Sheet"
 msgstr "Ark"
 
-#: src/cfg_buttons.c:778
+#: src/cfg_buttons.c:775
 msgid "Primary"
-msgstr "Första"
+msgstr "FÃ¶rsta"
 
-#: src/cfg_buttons.c:780
+#: src/cfg_buttons.c:777
 msgid "Secondary"
 msgstr "Andra"
 
-#: src/cfg_buttons.c:785
+#: src/cfg_buttons.c:782
 msgid "Tooltip"
 msgstr "Tips"
 
-#: src/cfg_buttons.c:792 src/cfg_dirpane.c:1145
+#: src/cfg_buttons.c:790 src/cfg_dirpane.c:1107
 msgid "Flags"
 msgstr "Flaggor"
 
-#: src/cfg_buttons.c:794
+#: src/cfg_buttons.c:792
 msgid "Narrow?"
 msgstr "Smal?"
 
-#: src/cfg_buttons.c:798
+#: src/cfg_buttons.c:796
 msgid "Show Tooltip?"
 msgstr "Visa tips?"
 
-#: src/cfg_buttons.c:833
+#: src/cfg_buttons.c:831
 msgid "Buttons"
 msgstr "Knappar"
 
-#: src/cfg_buttons.c:834 src/cfg_cmdseq.c:1067
+#: src/cfg_buttons.c:832 src/cfg_cmdseq.c:1081
 msgid "Definitions"
 msgstr "Definitioner"
 
@@ -231,625 +232,646 @@
 msgid "Options"
 msgstr "Val"
 
-#: src/cfg_cmdseq.c:610
+#: src/cfg_cmdseq.c:611
 msgid "Select Builtin"
-msgstr "Välj inbyggt"
+msgstr "VÃ¤lj inbyggt"
 
-#: src/cfg_cmdseq.c:626
+#: src/cfg_cmdseq.c:627
 msgid "Opening brace"
-msgstr "Vänster måsvinge"
+msgstr "VÃ¤nster mÃ¥svinge"
 
-#: src/cfg_cmdseq.c:627
+#: src/cfg_cmdseq.c:628
 msgid "Closing brace"
-msgstr "Höger måsvinge"
+msgstr "HÃ¶ger mÃ¥svinge"
 
-#: src/cfg_cmdseq.c:628
+#: src/cfg_cmdseq.c:629
 msgid "First selected"
-msgstr "Första valda"
+msgstr "FÃ¶rsta valda"
 
-#: src/cfg_cmdseq.c:629
+#: src/cfg_cmdseq.c:630
 msgid "First selected, unselect"
-msgstr "Första valda, välj av"
+msgstr "FÃ¶rsta valda, vÃ¤lj av"
 
-#: src/cfg_cmdseq.c:630
+#: src/cfg_cmdseq.c:631
 msgid "First selected, with path"
-msgstr "Första valda, med sökväg"
+msgstr "FÃ¶rsta valda, med sÃ¶kvÃ¤g"
 
-#: src/cfg_cmdseq.c:631
+#: src/cfg_cmdseq.c:632
 msgid "First selected, with path, unselect"
-msgstr "Första valda, med sökväg, välj av"
+msgstr "FÃ¶rsta valda, med sÃ¶kvÃ¤g, vÃ¤lj av"
 
-#: src/cfg_cmdseq.c:632
+#: src/cfg_cmdseq.c:633
 msgid "First selected (destination pane)"
-msgstr "Första valda (destinationspanel)"
+msgstr "FÃ¶rsta valda (destinationspanel)"
 
-#: src/cfg_cmdseq.c:633
+#: src/cfg_cmdseq.c:634
 msgid "First selected, no quotes"
-msgstr "Första valda, utan citat"
+msgstr "FÃ¶rsta valda, utan citat"
 
-#: src/cfg_cmdseq.c:634
+#: src/cfg_cmdseq.c:635
 msgid "All selected"
 msgstr "Alla valda"
 
-#: src/cfg_cmdseq.c:635
+#: src/cfg_cmdseq.c:636
 msgid "All selected, unselect"
-msgstr "Alla valda, välj av"
+msgstr "Alla valda, vÃ¤lj av"
 
-#: src/cfg_cmdseq.c:636
+#: src/cfg_cmdseq.c:637
 msgid "All selected, with paths"
-msgstr "Alla valda, med sökvägar"
+msgstr "Alla valda, med sÃ¶kvÃ¤gar"
 
-#: src/cfg_cmdseq.c:637
+#: src/cfg_cmdseq.c:638
 msgid "All selected, with paths, unselect"
-msgstr "Alla valda, med sökvägar, välj av"
+msgstr "Alla valda, med sÃ¶kvÃ¤gar, vÃ¤lj av"
 
-#: src/cfg_cmdseq.c:638
+#: src/cfg_cmdseq.c:639
 msgid "All selected (destination pane)"
-msgstr "Alla valda (målpanel)"
+msgstr "Alla valda (mÃ¥lpanel)"
 
-#: src/cfg_cmdseq.c:639
+#: src/cfg_cmdseq.c:640
 msgid "All selected, no quotes"
 msgstr "Alla valda, utan citat"
 
-#: src/cfg_cmdseq.c:640
+#: src/cfg_cmdseq.c:641
 msgid "Path to source pane's directory"
-msgstr "Sökväg till källpanels katalog"
+msgstr "SÃ¶kvÃ¤g till kÃ¤llpanels katalog"
 
-#: src/cfg_cmdseq.c:641
+#: src/cfg_cmdseq.c:642
 msgid "Path to destination pane's directory"
-msgstr "Sökväg till målpanels katalog"
+msgstr "SÃ¶kvÃ¤g till mÃ¥lpanels katalog"
 
-#: src/cfg_cmdseq.c:642
+#: src/cfg_cmdseq.c:643
 msgid "Path to home directory"
-msgstr "Sökväg till hemkatalog"
+msgstr "SÃ¶kvÃ¤g till hemkatalog"
 
-#: src/cfg_cmdseq.c:643
+#: src/cfg_cmdseq.c:644
 msgid "Path of left pane"
-msgstr "Vänster panels sökväg"
+msgstr "VÃ¤nster panels sÃ¶kvÃ¤g"
 
-#: src/cfg_cmdseq.c:644
+#: src/cfg_cmdseq.c:645
 msgid "Path of right pane"
-msgstr "Höger panels sökväg"
+msgstr "HÃ¶ger panels sÃ¶kvÃ¤g"
 
-#: src/cfg_cmdseq.c:645
+#: src/cfg_cmdseq.c:646
+msgid "URI of first selected"
+msgstr "URI fÃ¶r fÃ¶rsta valda"
+
+#: src/cfg_cmdseq.c:647
+msgid "URI of first selected, unselect"
+msgstr "URI fÃ¶r fÃ¶rsta valda, vÃ¤lj av"
+
+#: src/cfg_cmdseq.c:648
+msgid "URI of first selected, no quotes"
+msgstr "URI fÃ¶r fÃ¶rsta valda, utan citat"
+
+#: src/cfg_cmdseq.c:649
+msgid "URIs of all selected"
+msgstr "URI:er fÃ¶r alla valda"
+
+#: src/cfg_cmdseq.c:650
+msgid "URIs of all selected, unselect"
+msgstr "URI:er fÃ¶r alla valda, vÃ¤lj av"
+
+#: src/cfg_cmdseq.c:651
+msgid "URIs of all selected, no quotes"
+msgstr "URI:er fÃ¶r alla valda, utan citat"
+
+#: src/cfg_cmdseq.c:652
+msgid "URIs of all selected, unselect, no quotes"
+msgstr "URI:er fÃ¶r alla valda, utan citat"
+
+#: src/cfg_cmdseq.c:653
+msgid "URI of first selected (destination pane)"
+msgstr "URI fÃ¶r fÃ¶rsta valda (destinationspanel)"
+
+#: src/cfg_cmdseq.c:654
 msgid "Input combo box"
 msgstr "Inmatning, valruta"
 
-#: src/cfg_cmdseq.c:646
+#: src/cfg_cmdseq.c:655
 msgid "Input using menu"
 msgstr "Inmatning, meny"
 
-#: src/cfg_cmdseq.c:647
+#: src/cfg_cmdseq.c:656
 msgid "Input string"
-msgstr "Inmatning, textsträng"
+msgstr "Inmatning, textstrÃ¤ng"
 
-#: src/cfg_cmdseq.c:648
+#: src/cfg_cmdseq.c:657
 msgid "Input check button (gives TRUE or FALSE)"
 msgstr "Inmatning, kryssruta (ger TRUE eller FALSE)"
 
-#: src/cfg_cmdseq.c:649
+#: src/cfg_cmdseq.c:658
 msgid "Add label to input window"
-msgstr "Lägg till etikett till inmatningsfönster"
+msgstr "LÃ¤gg till etikett till inmatningsfÃ¶nster"
 
-#: src/cfg_cmdseq.c:650
+#: src/cfg_cmdseq.c:659
 msgid "Add a separator bar to input window"
-msgstr "Lägg till separatorstreck till inmatningsfönster"
+msgstr "LÃ¤gg till separatorstreck till inmatningsfÃ¶nster"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "$NAME"
 msgstr "$NAMN"
 
-#: src/cfg_cmdseq.c:651
+#: src/cfg_cmdseq.c:660
 msgid "Value of $NAME (environment)"
-msgstr "Värdet av $NAMN (miljövariabel)"
+msgstr "VÃ¤rdet av $NAMN (miljÃ¶variabel)"
 
-#: src/cfg_cmdseq.c:652
+#: src/cfg_cmdseq.c:661
 msgid "gentoo's PID"
 msgstr "gentoos process-ID"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "Home directory for user NAME"
-msgstr "Hemkatalog för användaren NAMN"
+msgstr "Hemkatalog fÃ¶r anvÃ¤ndaren NAMN"
 
-#: src/cfg_cmdseq.c:653
+#: src/cfg_cmdseq.c:662
 msgid "~NAME"
 msgstr "~NAMN"
 
-#: src/cfg_cmdseq.c:677
+#: src/cfg_cmdseq.c:686 src/cmd_split.c:536
 msgid "Pick Code"
-msgstr "Välj kod"
+msgstr "VÃ¤lj kod"
 
-#: src/cfg_cmdseq.c:765
+#: src/cfg_cmdseq.c:778
 msgid "(No Options Available)"
-msgstr "(Inga val tillgängliga)"
+msgstr "(Inga val tillgÃ¤ngliga)"
 
-#: src/cfg_cmdseq.c:801
+#: src/cfg_cmdseq.c:814
 msgid "Run in Background?"
-msgstr "Kör i bakgrunden?"
+msgstr "KÃ¶r i bakgrunden?"
 
-#: src/cfg_cmdseq.c:805
+#: src/cfg_cmdseq.c:818
 msgid "Kill Previous Instance?"
-msgstr "Döda tidigare instans?"
+msgstr "DÃ¶da tidigare instans?"
 
-#: src/cfg_cmdseq.c:809
+#: src/cfg_cmdseq.c:822
 msgid "Survive Quit?"
-msgstr "Överlev avslut?"
+msgstr "Ãverlev avslut?"
 
-#: src/cfg_cmdseq.c:815
+#: src/cfg_cmdseq.c:828
 msgid "Capture Output?"
-msgstr "Fånga utmatning?"
+msgstr "FÃ¥nga utmatning?"
 
-#: src/cfg_cmdseq.c:900
+#: src/cfg_cmdseq.c:913
 msgid "Before Execution"
-msgstr "Före körning"
+msgstr "FÃ¶re kÃ¶rning"
 
-#: src/cfg_cmdseq.c:903
+#: src/cfg_cmdseq.c:916
 msgid "Require Source Selection?"
-msgstr "Kräv källval?"
+msgstr "KrÃ¤v kÃ¤llval?"
 
-#: src/cfg_cmdseq.c:907
+#: src/cfg_cmdseq.c:920
 msgid "Require Destination Selection?"
-msgstr "Kräv destinationsval?"
+msgstr "KrÃ¤v destinationsval?"
 
-#: src/cfg_cmdseq.c:912
+#: src/cfg_cmdseq.c:926
 msgid "CD Source?"
-msgstr "Byt till källkatalog?"
+msgstr "Byt till kÃ¤llkatalog?"
 
-#: src/cfg_cmdseq.c:915
+#: src/cfg_cmdseq.c:929
 msgid "CD Destination?"
-msgstr "Byt till målkatalog?"
+msgstr "Byt till mÃ¥lkatalog?"
 
-#: src/cfg_cmdseq.c:922
+#: src/cfg_cmdseq.c:937
 msgid "After Execution"
-msgstr "Efter körning"
+msgstr "Efter kÃ¶rning"
 
-#: src/cfg_cmdseq.c:924
+#: src/cfg_cmdseq.c:939
 msgid "Rescan Source?"
-msgstr "Läs om källkatalog?"
+msgstr "LÃ¤s om kÃ¤llkatalog?"
 
-#: src/cfg_cmdseq.c:928
+#: src/cfg_cmdseq.c:943
 msgid "Rescan Destination?"
-msgstr "Läs om målkatalog?"
+msgstr "LÃ¤s om mÃ¥lkatalog?"
 
-#: src/cfg_cmdseq.c:942
+#: src/cfg_cmdseq.c:957
 msgid "General"
-msgstr "Allmänna"
+msgstr "AllmÃ¤nna"
 
-#: src/cfg_cmdseq.c:945
+#: src/cfg_cmdseq.c:960
 msgid "Before&After"
-msgstr "Före&Efter"
+msgstr "FÃ¶re&Efter"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "Built-In"
 msgstr "Inbyggt"
 
-#: src/cfg_cmdseq.c:950
+#: src/cfg_cmdseq.c:965
 msgid "External"
 msgstr "Externt"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Add Row"
-msgstr "Lägg till rad"
+msgstr "LÃ¤gg till rad"
 
-#: src/cfg_cmdseq.c:951
+#: src/cfg_cmdseq.c:966
 msgid "Duplicate"
 msgstr "Duplicera"
 
-#: src/cfg_cmdseq.c:978 src/cfg_styles.c:588 src/cfg_styles.c:805
-#: src/cfg_types.c:679 src/cmd_symlink.c:209 src/dpformat.c:35
+#: src/cfg_cmdseq.c:993 src/cfg_styles.c:596 src/cfg_styles.c:823
+#: src/cfg_types.c:678 src/cmd_info.c:151 src/cmd_split.c:648
+#: src/cmd_symlink.c:213 src/dpformat.c:36
 msgid "Name"
 msgstr "Namn"
 
-#: src/cfg_cmdseq.c:988
+#: src/cfg_cmdseq.c:1004
 msgid "Definition"
 msgstr "Definition"
 
-#: src/cfg_cmdseq.c:1044
+#: src/cfg_cmdseq.c:1058
 msgid "Repeat Sequence Until No Source Selection?"
-msgstr "Repetera så länge källval finns?"
+msgstr "Repetera sÃ¥ lÃ¤nge kÃ¤llval finns?"
 
-#: src/cfg_cmdseq.c:1056 src/cfg_controls.c:655 src/cfg_controls.c:706
-#: src/cfg_styles.c:833 src/cfg_types.c:775
+#: src/cfg_cmdseq.c:1070 src/cfg_controls.c:622 src/cfg_controls.c:673
+#: src/cfg_styles.c:853 src/cfg_types.c:776
 msgid "Add"
-msgstr "Lägg till"
+msgstr "LÃ¤gg till"
 
-#: src/cfg_cmdseq.c:1059 src/cfg_controls.c:658 src/cfg_controls.c:709
-#: src/cfg_styles.c:836 src/cfg_types.c:788
+#: src/cfg_cmdseq.c:1073 src/cfg_controls.c:625 src/cfg_controls.c:676
+#: src/cfg_styles.c:856 src/cfg_types.c:789
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/cfg_cmdseq.c:1066
+#: src/cfg_cmdseq.c:1080
 msgid "Commands"
 msgstr "Kommandon"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1365 src/cfg_dirpane.c:1371
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1288 src/cfg_dirpane.c:1293
 msgid "Left"
-msgstr "Vänster"
+msgstr "VÃ¤nster"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Middle"
 msgstr "Mitten"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565 src/cfg_dirpane.c:612
-#: src/cfg_dirpane.c:1364 src/cfg_dirpane.c:1372
+#: src/cfg_controls.c:157 src/cfg_controls.c:532 src/cfg_dirpane.c:572
+#: src/cfg_dirpane.c:1287 src/cfg_dirpane.c:1294
 msgid "Right"
-msgstr "Höger"
+msgstr "HÃ¶ger"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Down"
 msgstr "Hjul ner"
 
-#: src/cfg_controls.c:161 src/cfg_controls.c:565
+#: src/cfg_controls.c:157 src/cfg_controls.c:532
 msgid "Wheel Up"
 msgstr "Hjul upp"
 
-#: src/cfg_controls.c:382
+#: src/cfg_controls.c:378
 msgid ""
 "The following modifier key(s) must\n"
 "be held down when the mouse button\n"
 "is clicked to trigger the command"
 msgstr ""
-"Dessa modifierartangenter måste hållas\n"
-"nedtryckta när musknappen klickas för\n"
-"att kommandot ska köra:"
+"Dessa modifierartangenter mÃ¥ste hÃ¥llas\n"
+"nedtryckta nÃ¤r musknappen klickas fÃ¶r\n"
+"att kommandot ska kÃ¶ra:"
 
-#: src/cfg_controls.c:395
+#: src/cfg_controls.c:391
 msgid "Edit Modifiers"
-msgstr "Ändra modifierare"
+msgstr "Ãndra modifierare"
 
-#: src/cfg_controls.c:613
+#: src/cfg_controls.c:580
 msgid "Controls"
 msgstr "Kontroller"
 
-#: src/cfg_controls.c:620
+#: src/cfg_controls.c:587
 msgid "Global Keyboard Shortcuts"
-msgstr "Globala tangentbordsgenvägar"
+msgstr "Globala tangentbordsgenvÃ¤gar"
 
-#: src/cfg_controls.c:665
+#: src/cfg_controls.c:632
 msgid "Dirpane Mouse Buttons"
 msgstr "Panelmusknappar"
 
-#: src/cfg_controls.c:690
+#: src/cfg_controls.c:657
 msgid "Button"
 msgstr "Knapp"
 
-#: src/cfg_controls.c:693
+#: src/cfg_controls.c:660
 msgid "Edit Modifiers..."
-msgstr "Ändra modifierare..."
+msgstr "Ãndra modifierare..."
 
-#: src/cfg_controls.c:716
+#: src/cfg_controls.c:683
 msgid "Click-M-Click Gesture"
 msgstr "Klick-F-Klick Gest"
 
-#: src/cfg_controls.c:726
+#: src/cfg_controls.c:693
 msgid "Time Limit"
-msgstr "Tidsgräns"
-
-#: src/cfg_controls.c:737
-msgid "Path Right Click"
-msgstr "Högerklick på sökvägen"
+msgstr "TidsgrÃ¤ns"
 
-#: src/cfg_controls.c:750
+#: src/cfg_controls.c:704
 msgid "Ignore Num Lock For All Bindings?"
-msgstr "Ignorera Num Lock för alla genvägar?"
+msgstr "Ignorera Num Lock fÃ¶r alla genvÃ¤gar?"
 
-#: src/cfg_controls.c:780
+#: src/cfg_controls.c:734
 msgid ""
 "Note: The mouse button control settings\n"
 "are ambiguous: the same button+modifier\n"
 "is used for more than one function. This\n"
 "might make their behaviour pretty weird..."
 msgstr ""
-"Observera: musknappsinställningarna är\n"
-"tvetydiga: samma knapp+modifierare är\n"
-"bunden till mer än ett kommando. Detta\n"
-"kan leda till oförutsägbart beteende."
+"Observera: musknappsinstÃ¤llningarna Ã¤r\n"
+"tvetydiga: samma knapp+modifierare Ã¤r\n"
+"bunden till mer Ã¤n ett kommando. Detta\n"
+"kan leda till ofÃ¶rutsÃ¤gbart beteende."
 
-#: src/cfg_controls.c:784
+#: src/cfg_controls.c:738
 msgid "Warning"
 msgstr "Varning"
 
-#: src/cfg_controls.c:784 src/children.c:95 src/cmd_info.c:246
+#: src/cfg_controls.c:738 src/children.c:89 src/cmd_info.c:320
 msgid "_OK"
 msgstr "_OK"
 
-#: src/cfg_dirpane.c:365
-msgid "Formatted Size, in bytes"
-msgstr "Formaterad storlek, i byte"
-
-#: src/cfg_dirpane.c:365
-msgid "Raw Size, in Bytes"
-msgstr "Enkel storlek, i byte"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in kilobytes"
-msgstr "Formaterad storlek, i kilobyte"
-
-#: src/cfg_dirpane.c:366
-msgid "Formatted Size, in megabytes"
-msgstr "Formaterad storlek, i megabyte"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, \"Smart\" Unit"
-msgstr "Formaterad storlek, \"smart\" enhet"
-
-#: src/cfg_dirpane.c:367
-msgid "Formatted Size, in gigabytes"
-msgstr "Formaterad storlek, i gigabyte"
-
-#: src/cfg_dirpane.c:383
+#: src/cfg_dirpane.c:333
 msgid "Append Type Character?"
-msgstr "Lägg till typbokstav?"
+msgstr "LÃ¤gg till typbokstav?"
 
-#: src/cfg_dirpane.c:386
-msgid "Append \"-> destination\" on Links?"
-msgstr "Lägg till \"-> mål\" för länkar?"
+#: src/cfg_dirpane.c:336
+msgid "Append \"â destination\" on Links?"
+msgstr "LÃ¤gg till \"â mÃ¥l\" fÃ¶r lÃ¤nkar?"
 
-#: src/cfg_dirpane.c:406
+#: src/cfg_dirpane.c:358
 msgid "Place Tick Every 3 Digits?"
-msgstr "Märke mellan var tredje siffra?"
+msgstr "MÃ¤rke mellan var tredje siffra?"
 
-#: src/cfg_dirpane.c:416
+#: src/cfg_dirpane.c:369
 msgid "Digits of Precision"
 msgstr "Precision (antal siffror)"
 
-#: src/cfg_dirpane.c:429
+#: src/cfg_dirpane.c:382
 msgid "Show Dir's File System Size?"
-msgstr "Visa storlek för kataloger?"
+msgstr "Visa storlek fÃ¶r kataloger?"
 
-#: src/cfg_dirpane.c:435 src/cfg_dirpane.c:439 src/cfg_dirpane.c:443
-#: src/cfg_dirpane.c:447 src/cfg_dirpane.c:451 src/cfg_dirpane.c:455
-#: src/cfg_dirpane.c:459 src/cfg_dirpane.c:463 src/cfg_dirpane.c:467
-#: src/cfg_dirpane.c:474
+#: src/cfg_dirpane.c:388 src/cfg_dirpane.c:392 src/cfg_dirpane.c:396
+#: src/cfg_dirpane.c:400 src/cfg_dirpane.c:404 src/cfg_dirpane.c:408
+#: src/cfg_dirpane.c:412 src/cfg_dirpane.c:416 src/cfg_dirpane.c:420
+#: src/cfg_dirpane.c:428
 msgid "Format"
 msgstr "Format"
 
-#: src/cfg_dirpane.c:497
+#: src/cfg_dirpane.c:454
 #, c-format
 msgid "%s Settings"
-msgstr "Inställningar för %s"
+msgstr "InstÃ¤llningar fÃ¶r %s"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1002 src/cfg_dirpane.c:1003
-#: src/cmd_select.c:414
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:970 src/cfg_dirpane.c:971
+#: src/cmd_select.c:381
 msgid "Content"
-msgstr "Innehåll"
+msgstr "InnehÃ¥ll"
 
-#: src/cfg_dirpane.c:611
+#: src/cfg_dirpane.c:571
 msgid "Justification"
 msgstr "Justering"
 
-#: src/cfg_dirpane.c:611 src/cfg_dirpane.c:1003
+#: src/cfg_dirpane.c:571 src/cfg_dirpane.c:971
 msgid "Title"
 msgstr "Titel"
 
-#: src/cfg_dirpane.c:611 src/window.c:201
+#: src/cfg_dirpane.c:571 src/window.c:200
 msgid "Width"
 msgstr "Bredd"
 
-#: src/cfg_dirpane.c:612
+#: src/cfg_dirpane.c:572
 msgid "Center"
 msgstr "Centrera"
 
-#: src/cfg_dirpane.c:621
+#: src/cfg_dirpane.c:581
 msgid "Basic Settings"
-msgstr "Grundinställningar"
+msgstr "GrundinstÃ¤llningar"
 
-#: src/cfg_dirpane.c:669
+#: src/cfg_dirpane.c:628
 msgid "Edit Column Content"
-msgstr "Ändra kolumninnehåll"
+msgstr "Ãndra kolumninnehÃ¥ll"
 
-#: src/cfg_dirpane.c:1002
+#: src/cfg_dirpane.c:970
 msgid "Default Title"
-msgstr "Förvald titel"
+msgstr "FÃ¶rvald titel"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories First"
-msgstr "Kataloger först"
+msgstr "Kataloger fÃ¶rst"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Last"
 msgstr "Kataloger sist"
 
-#: src/cfg_dirpane.c:1028
+#: src/cfg_dirpane.c:996
 msgid "Directories Mixed"
 msgstr "Kataloger blandade"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Left of List"
-msgstr "Vänster om listan"
+msgstr "VÃ¤nster om listan"
 
-#: src/cfg_dirpane.c:1029
+#: src/cfg_dirpane.c:997
 msgid "Right of List"
-msgstr "Höger om listan"
+msgstr "HÃ¶ger om listan"
 
-#: src/cfg_dirpane.c:1029 src/cfg_dirpane.c:1030
+#: src/cfg_dirpane.c:997
 msgid "System Default"
 msgstr "Systemstandard"
 
-#: src/cfg_dirpane.c:1030
-msgid "Always Set"
-msgstr "Alltid satt"
-
-#: src/cfg_dirpane.c:1030 src/cmd_chmod.c:260 src/menus.c:513
-msgid "Toggle"
-msgstr "Växla"
-
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy From %s"
-msgstr "Kopiera från %s"
+msgstr "Kopiera frÃ¥n %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Copy To %s"
 msgstr "Kopiera till %s"
 
-#: src/cfg_dirpane.c:1031
+#: src/cfg_dirpane.c:998
 #, c-format
 msgid "Swap With %s"
 msgstr "Byt med %s"
 
-#: src/cfg_dirpane.c:1048
+#: src/cfg_dirpane.c:1015
 msgid "Columns"
 msgstr "Kolumner"
 
-#: src/cfg_dirpane.c:1053
+#: src/cfg_dirpane.c:1020
 msgid "Available Content Types"
-msgstr "Tillgängliga innehållstyper"
+msgstr "TillgÃ¤ngliga innehÃ¥llstyper"
 
-#: src/cfg_dirpane.c:1070
+#: src/cfg_dirpane.c:1037
 msgid "Selected Content Types"
-msgstr "Valda innehållstyper"
+msgstr "Valda innehÃ¥llstyper"
 
-#: src/cfg_dirpane.c:1081 src/cfg_styles.c:723
+#: src/cfg_dirpane.c:1049 src/cfg_styles.c:741
 msgid "Edit..."
-msgstr "Ändra..."
+msgstr "Ãndra..."
 
-#: src/cfg_dirpane.c:1082 src/cmd_renamere.c:508
+#: src/cfg_dirpane.c:1050 src/cmd_renamere.c:481
 msgid "Remove"
 msgstr "Ta bort"
 
-#: src/cfg_dirpane.c:1096
+#: src/cfg_dirpane.c:1064
 msgid "Sorting"
 msgstr "Sortering"
 
-#: src/cfg_dirpane.c:1099
+#: src/cfg_dirpane.c:1067
 msgid "Sort On"
 msgstr "Sortera efter"
 
-#: src/cfg_dirpane.c:1106 src/cmd_split.c:233 src/dpformat.c:39
-#: src/dpformat.c:40
+#: src/cfg_dirpane.c:1071 src/cmd_split.c:590 src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode"
-msgstr "Läge"
+msgstr "LÃ¤ge"
 
-#: src/cfg_dirpane.c:1113
+#: src/cfg_dirpane.c:1077
 msgid "Inverse Sorting?"
-msgstr "Sortera baklänges?"
+msgstr "Sortera baklÃ¤nges?"
 
-#: src/cfg_dirpane.c:1116 src/cfg_paths.c:187 src/cfg_types.c:743
-#: src/cmd_renamere.c:459 src/cmd_renamere.c:486 src/cmd_select.c:520
-#: src/textview.c:620
+#: src/cfg_dirpane.c:1080 src/cfg_paths.c:228 src/cfg_types.c:744
+#: src/cmd_renamere.c:432 src/cmd_renamere.c:459 src/cmd_select.c:478
+#: src/textview.c:604
 msgid "Ignore Case?"
 msgstr "Skilj ej gemener/versaler?"
 
-#: src/cfg_dirpane.c:1119
-msgid "Numerical Mode?"
-msgstr "Numeriskt läge?"
-
-#: src/cfg_dirpane.c:1127
+#: src/cfg_dirpane.c:1088
 msgid "Default Directory"
 msgstr "Startkatalog"
 
-#: src/cfg_dirpane.c:1132
+#: src/cfg_dirpane.c:1094
 msgid "Grab Current"
 msgstr "Aktuell"
 
-#: src/cfg_dirpane.c:1135
+#: src/cfg_dirpane.c:1097
 msgid "From History"
-msgstr "Från historiken"
+msgstr "FrÃ¥n historiken"
 
-#: src/cfg_dirpane.c:1148
+#: src/cfg_dirpane.c:1110
 msgid "Path Above?"
-msgstr "Sökvägen ovanför?"
+msgstr "SÃ¶kvÃ¤gen ovanfÃ¶r?"
 
-#: src/cfg_dirpane.c:1152
+#: src/cfg_dirpane.c:1114
 msgid "Hide Allowed?"
-msgstr "Använd Dölj-regel?"
+msgstr "AnvÃ¤nd DÃ¶lj-regel?"
 
-#: src/cfg_dirpane.c:1156
+#: src/cfg_dirpane.c:1118
 msgid "Scrollbar Always?"
 msgstr "Alltid rullningslist?"
 
-#: src/cfg_dirpane.c:1160
+#: src/cfg_dirpane.c:1122
 msgid "Huge Parent Button?"
-msgstr "Stor förälderkatalogsknapp?"
+msgstr "Stor fÃ¶rÃ¤lderkatalogsknapp?"
 
-#: src/cfg_dirpane.c:1168
+#: src/cfg_dirpane.c:1127
+msgid "Set Custom Font?"
+msgstr "AnvÃ¤nd eget typsnitt?"
+
+#: src/cfg_dirpane.c:1140
 msgid "Scrollbar Position"
 msgstr "Rullningslistposition"
 
-#: src/cfg_dirpane.c:1180
-msgid "Modify 'Control' Key State"
-msgstr "Ändra 'Control'-tangentläge"
-
-#: src/cfg_dirpane.c:1225
-msgid "Active Pane Titles"
-msgstr "Aktiva paneltitlar"
-
-#: src/cfg_dirpane.c:1225
-msgid "Focused Row, Unselected"
-msgstr "Fokuserad rad, ej vald"
-
-#: src/cfg_dirpane.c:1226
-msgid "Focused Row, Selected"
-msgstr "Fokuserad rad, vald"
-
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Horizontal"
 msgstr "Horisontell"
 
-#: src/cfg_dirpane.c:1270 src/cfg_windows.c:85
+#: src/cfg_dirpane.c:1193 src/cfg_windows.c:85
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Don't Track"
-msgstr "Följ inte"
+msgstr "FÃ¶lj inte"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Ratio"
-msgstr "Förhållande"
+msgstr "FÃ¶rhÃ¥llande"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Left Pane"
-msgstr "Storlek, vänster panel"
+msgstr "Storlek, vÃ¤nster panel"
 
-#: src/cfg_dirpane.c:1271
+#: src/cfg_dirpane.c:1194
 msgid "Size, Right Pane"
-msgstr "Storlek, höger panel"
+msgstr "Storlek, hÃ¶ger panel"
 
-#: src/cfg_dirpane.c:1275
+#: src/cfg_dirpane.c:1198
 msgid "Pane Orientation"
 msgstr "Panelplacering"
 
-#: src/cfg_dirpane.c:1289
+#: src/cfg_dirpane.c:1212
 msgid "Split Tracking"
-msgstr "Följ delning"
+msgstr "FÃ¶lj delning"
 
-#: src/cfg_dirpane.c:1312
+#: src/cfg_dirpane.c:1235
 msgid "pixels"
 msgstr "bildpunkter"
 
-#: src/cfg_dirpane.c:1340
+#: src/cfg_dirpane.c:1263
 msgid "Remember Selected Rows?"
 msgstr "Lagra valda rader?"
 
-#: src/cfg_dirpane.c:1343
+#: src/cfg_dirpane.c:1266
 msgid "Save History Lists?"
 msgstr "Spara historielistor?"
 
-#: src/cfg_dirpane.c:1360 src/cfg_dirpane.c:1370
+#: src/cfg_dirpane.c:1283 src/cfg_dirpane.c:1292
 msgid "Dir Panes"
 msgstr "Katalogpaneler"
 
-#: src/cfg_dirpane.c:1374
+#: src/cfg_dirpane.c:1295
 msgid "Pane Split"
 msgstr "Paneldelning"
 
-#: src/cfg_dirpane.c:1375
+#: src/cfg_dirpane.c:1296
 msgid "History"
 msgstr "Historik"
 
-#: src/cfg_errors.c:45
+#: src/cfg_dirpane.c:1725
+msgid "'Blocks' Content Deprecated"
+msgstr "InnehÃ¥llstypen 'Block' stÃ¶ds inte lÃ¤ngre"
+
+#: src/cfg_dirpane.c:1726
+msgid ""
+"The 'Blocks' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
+"InnehÃ¥llstypen 'Blocks' fÃ¶r kolumner stÃ¶ds inte lÃ¤ngre,\n"
+"men din konfiguration anvÃ¤nder den fortfarande. Den kommer\n"
+"nu att tas bort automatiskt."
+
+#: src/cfg_dirpane.c:1732
+msgid "'Block Size' Content Deprecated"
+msgstr "InnehÃ¥llstypen 'Block Size' stÃ¶ds inte lÃ¤ngre."
+
+#: src/cfg_dirpane.c:1733
+msgid ""
+"The 'Block Size' column content type is no longer supported,\n"
+"but your configuration is still making use of it. It will be\n"
+"automatically removed."
+msgstr ""
+"InnehÃ¥llstypen 'Block Size' fÃ¶r kolumner stÃ¶ds inte lÃ¤ngre,\n"
+"men din konfiguration anvÃ¤nder den fortfarande. Den kommer\n"
+"nu att tas bort automatiskt."
+
+#: src/cfg_errors.c:48
 msgid "Errors"
 msgstr "Fel"
 
-#: src/cfg_errors.c:52
-msgid "Use Dialog to Report Errors?"
-msgstr "Använd dialog för att rapportera fel?"
+#: src/cfg_errors.c:55
+msgid "Error and Status Message Display"
+msgstr "Fel- och statusmeddelandevisning"
+
+#: src/cfg_errors.c:57
+msgid "Status Bar, Above Panes"
+msgstr "I statusraden, ovanfÃ¶r katalogpanelerna"
 
-#: src/cfg_errors.c:56
+#: src/cfg_errors.c:60
+msgid "Main Window's Title Bar"
+msgstr "I huvudfÃ¶nstrets titel"
+
+#: src/cfg_errors.c:63
+msgid "Separate Dialog"
+msgstr "I en separat dialog"
+
+#: src/cfg_errors.c:69
 msgid "Cause Console Beep on Error?"
 msgstr "Ring i terminalklockan vid fel?"
 
@@ -857,255 +879,236 @@
 msgid "Menus"
 msgstr "Menyer"
 
-#: src/cfg_mount.c:168
-msgid "Never"
-msgstr "Aldrig"
-
-#: src/cfg_mount.c:168
-msgid "On Every Access"
-msgstr "Vid varje åtkomst"
-
-#: src/cfg_mount.c:177
-msgid "Mounting"
-msgstr "Montering"
-
-#: src/cfg_mount.c:184
-msgid "Mount When?"
-msgstr "Montera när?"
-
-#: src/cfg_mount.c:196
-msgid "Mount Options"
-msgstr "Monteringsval"
-
-#: src/cfg_mount.c:199
-msgid "Mount Command"
-msgstr "Monteringskommando"
+#: src/cfg_nag.c:78
+#, c-format
+msgid ""
+"Click the button below to reset the %zu stored 'Don't show this dialog "
+"again' responses."
+msgstr ""
+"Klicka pÃ¥ knappen nedanfÃ¶r fÃ¶r att Ã¥terstÃ¤lla alla\n"
+"%zu sparade 'Visa inte den hÃ¤r dialogen igen'-svar."
 
-#: src/cfg_mount.c:204
-msgid "Unmount Command"
-msgstr "Avmonteringskommando"
+#: src/cfg_nag.c:100
+msgid "Nagging"
+msgstr "GnÃ¤ll"
 
-#: src/cfg_mount.c:211
-msgid "Only Mount on Toplevel Directories?"
-msgstr "Montera endast på toppnivåkataloger?"
+#: src/cfg_nag.c:110
+msgid "Reset All"
+msgstr "ÃterstÃ¤ll alla"
 
-#: src/cfg_mount.c:214
-msgid "Use Command Error Dialog?"
-msgstr "Använd dialog för kommandofel?"
+#: src/cfg_paths.c:78
+msgid "Edit path"
+msgstr "Redigera sÃ¶kvÃ¤g"
 
-#: src/cfg_mount.c:217
-msgid "Unmount When gentoo Quits?"
-msgstr "Avmontera när gentoo avslutas?"
+#: src/cfg_paths.c:152
+msgid "Icons"
+msgstr "Ikoner"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:153
 msgid "GTK+ RC"
 msgstr "GTK+ RC"
 
-#: src/cfg_paths.c:128
-msgid "Icons"
-msgstr "Ikoner"
-
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:154
 msgid "fstab"
 msgstr "fstab"
 
-#: src/cfg_paths.c:128
+#: src/cfg_paths.c:155
 msgid "mtab"
 msgstr "mtab"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Beginning With Dot (.)"
-msgstr "Namn som börjar med punkt (.)"
+msgstr "Namn som bÃ¶rjar med punkt (.)"
 
-#: src/cfg_paths.c:129
+#: src/cfg_paths.c:157
 msgid "Matching RE"
 msgstr "Namn som matchar reg. uttryck"
 
-#: src/cfg_paths.c:129 src/cmd_chmod.c:259 src/menus.c:512
+#: src/cfg_paths.c:157 src/cmd_chmod.c:252 src/menus.c:519
 msgid "None"
 msgstr "Inga"
 
-#: src/cfg_paths.c:135
+#: src/cfg_paths.c:163
 msgid "Paths & Hide"
-msgstr "Sökvägar & Dölj"
+msgstr "SÃ¶kvÃ¤gar & DÃ¶lj"
 
-#: src/cfg_paths.c:142
+#: src/cfg_paths.c:170
 msgid "Paths"
-msgstr "Sökvägar"
+msgstr "SÃ¶kvÃ¤gar"
 
-#: src/cfg_paths.c:169
+#: src/cfg_paths.c:209
 msgid "Hide Entries"
-msgstr "Dölj filer"
+msgstr "DÃ¶lj filer"
 
-#: src/cfg_styles.c:170 src/cfg_types.c:234 src/iconutil.c:29 src/menus.c:19
+#: src/cfg_styles.c:178 src/cfg_types.c:233 src/iconutil.c:31 src/menus.c:19
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: src/cfg_styles.c:191 src/cfg_styles.c:428 src/cfg_styles.c:767
+#: src/cfg_styles.c:199 src/cfg_styles.c:436 src/cfg_styles.c:785
 msgid "Delete Action"
-msgstr "Radera åtgärd"
+msgstr "Radera Ã¥tgÃ¤rd"
 
-#: src/cfg_styles.c:411 src/color_dialog.c:48
+#: src/cfg_styles.c:419 src/color_dialog.c:47
 msgid "Edit Color"
-msgstr "Ändra färg"
+msgstr "Ãndra fÃ¤rg"
 
-#: src/cfg_styles.c:428
+#: src/cfg_styles.c:436
 msgid "Revert to Inherited Command"
-msgstr "Återgå till ärvt kommando"
+msgstr "ÃtergÃ¥ till Ã¤rvt kommando"
 
-#: src/cfg_styles.c:529
+#: src/cfg_styles.c:537
 msgid "Select Command ..."
-msgstr "Välj kommando ..."
+msgstr "VÃ¤lj kommando ..."
 
-#: src/cfg_styles.c:592
+#: src/cfg_styles.c:601
 msgid "New Action Property"
-msgstr "Ny åtgärd"
+msgstr "Ny Ã¥tgÃ¤rd"
 
-#: src/cfg_styles.c:600
+#: src/cfg_styles.c:609
 msgid "something"
-msgstr "nånting"
+msgstr "nÃ¥nting"
 
-#: src/cfg_styles.c:670
+#: src/cfg_styles.c:679
 msgid ""
 "Deleting this style will also delete\n"
 "all its children. Are you sure?"
 msgstr ""
-"Om du tar bort den här stilen kommer\n"
-"alla stilar som har den som förälder\n"
-"att försvinna. Är du säker?"
+"Om du tar bort den hÃ¤r stilen kommer\n"
+"alla stilar som har den som fÃ¶rÃ¤lder\n"
+"att fÃ¶rsvinna. Ãr du sÃ¤ker?"
 
-#: src/cfg_styles.c:671
+#: src/cfg_styles.c:680
 msgid "Confirm Delete"
-msgstr "Bekräfta borttagande"
+msgstr "BekrÃ¤fta borttagande"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Background Color"
-msgstr "Bakgrundsfärg"
+msgstr "BakgrundsfÃ¤rg"
 
-#: src/cfg_styles.c:694
+#: src/cfg_styles.c:703
 msgid "Foreground Color"
-msgstr "Förgrundsfärg"
+msgstr "FÃ¶rgrundsfÃ¤rg"
 
-#: src/cfg_styles.c:694 src/dpformat.c:53
+#: src/cfg_styles.c:703 src/dpformat.c:55
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/cfg_styles.c:696
+#: src/cfg_styles.c:705
 msgid "(Row Style Preview Text)"
-msgstr "(Förhandsgranska radstil)"
+msgstr "(FÃ¶rhandsgranska radstil)"
 
-#: src/cfg_styles.c:702 src/cmd_renameseq.c:386
+#: src/cfg_styles.c:713 src/cmd_renameseq.c:358 src/cmd_split.c:656
 msgid "Preview"
 msgstr "Exempel"
 
-#: src/cfg_styles.c:719
+#: src/cfg_styles.c:737
 msgid "Override Parent's?"
-msgstr "Ersätt förälderns?"
+msgstr "ErsÃ¤tt fÃ¶rÃ¤lderns?"
 
-#: src/cfg_styles.c:723
+#: src/cfg_styles.c:741
 msgid "Pick..."
-msgstr "Välj..."
+msgstr "VÃ¤lj..."
 
-#: src/cfg_styles.c:764
+#: src/cfg_styles.c:782
 msgid "Add Action..."
-msgstr "Lägg till åtgärd..."
+msgstr "LÃ¤gg till Ã¥tgÃ¤rd..."
 
-#: src/cfg_styles.c:810 src/menus.c:525
+#: src/cfg_styles.c:829 src/menus.c:532
 msgid "Parent"
-msgstr "Förälder"
+msgstr "FÃ¶rÃ¤lder"
 
-#: src/cfg_styles.c:820
+#: src/cfg_styles.c:840
 msgid "Inherited Properties"
-msgstr "Ärvda egenskaper"
+msgstr "Ãrvda egenskaper"
 
-#: src/cfg_styles.c:824
+#: src/cfg_styles.c:844
 msgid "Visual"
 msgstr "Visuella"
 
-#: src/cfg_styles.c:826
+#: src/cfg_styles.c:846
 msgid "Actions"
-msgstr "Åtgärder"
+msgstr "ÃtgÃ¤rder"
 
-#: src/cfg_styles.c:843
+#: src/cfg_styles.c:863
 msgid "File Recognition"
-msgstr "Filigenkänning"
+msgstr "FiligenkÃ¤nning"
 
-#: src/cfg_styles.c:844
+#: src/cfg_styles.c:864
 msgid "Styles"
 msgstr "Stilar"
 
-#: src/cfg_types.c:193
+#: src/cfg_types.c:192
 #, c-format
 msgid "%s - Click to Change..."
-msgstr "%s - Klicka för att byta..."
+msgstr "%s - Klicka fÃ¶r att byta..."
 
-#: src/cfg_types.c:508
+#: src/cfg_types.c:507
 msgid "(New Type)"
 msgstr "(Ny typ)"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "B-Dev"
 msgstr "Blockenhet"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "C-Dev"
 msgstr "Teckenenhet"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Dir"
 msgstr "Katalog"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "FIFO"
-msgstr "FIFO-kö"
+msgstr "FIFO-kÃ¶"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "File"
 msgstr "Fil"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Link"
-msgstr "Länk"
+msgstr "LÃ¤nk"
 
-#: src/cfg_types.c:647
+#: src/cfg_types.c:646
 msgid "Socket"
 msgstr "Socket"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "Readable"
-msgstr "Läsbar"
+msgstr "LÃ¤sbar"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetGID"
 msgstr "SetGID"
 
-#: src/cfg_types.c:648
+#: src/cfg_types.c:647
 msgid "SetUID"
 msgstr "SetUID"
 
-#: src/cfg_types.c:648 src/cmd_chmod.c:209
+#: src/cfg_types.c:647 src/cmd_chmod.c:200
 msgid "Sticky"
 msgstr "Klibbig"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Executable"
 msgstr "Exekverbar"
 
-#: src/cfg_types.c:649
+#: src/cfg_types.c:648
 msgid "Writable"
 msgstr "Skrivbar"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match 'file' (RE)"
 msgstr "Matcha 'file' (RU)"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Match Name (RE)"
 msgstr "Matcha namn (RU)"
 
-#: src/cfg_types.c:650
+#: src/cfg_types.c:649
 msgid "Require Suffix"
-msgstr "Kräv ändelse"
+msgstr "KrÃ¤v Ã¤ndelse"
 
 #: src/cfg_types.c:687
 msgid "Identification"
@@ -1113,62 +1116,62 @@
 
 #: src/cfg_types.c:689
 msgid "Require Type"
-msgstr "Kräv typ"
+msgstr "KrÃ¤v typ"
 
 #: src/cfg_types.c:703
 msgid "Require Protection"
-msgstr "Kräv skyddsflaggor"
+msgstr "KrÃ¤v skyddsflaggor"
 
-#: src/cfg_types.c:738
+#: src/cfg_types.c:739
 msgid "Glob?"
 msgstr "Skal?"
 
-#: src/cfg_types.c:754
+#: src/cfg_types.c:755
 msgid "Type's Style"
 msgstr "Typens stil"
 
-#: src/cfg_types.c:756
+#: src/cfg_types.c:757
 msgid "Style"
 msgstr "Stil"
 
-#: src/cfg_types.c:796
+#: src/cfg_types.c:797
 msgid "Types"
 msgstr "Typer"
 
 #: src/cfg_windows.c:86
 msgid "Dialog Windows Center On Screen"
-msgstr "Dialoger öppnas mitt på skärmen"
+msgstr "Dialoger Ã¶ppnas mitt pÃ¥ skÃ¤rmen"
 
 #: src/cfg_windows.c:86
 msgid "Dialog Windows Follow Mouse"
-msgstr "Dialoger öppnas under muspekaren"
+msgstr "Dialoger Ã¶ppnas under muspekaren"
 
 #: src/cfg_windows.c:86
 msgid "Dialog Windows Positioned by Window Manager"
-msgstr "Dialoger placeras av fönsterhanteraren"
+msgstr "Dialoger placeras av fÃ¶nsterhanteraren"
 
 #: src/cfg_windows.c:94
 msgid "Windows"
-msgstr "Fönster"
+msgstr "FÃ¶nster"
 
 #: src/cfg_windows.c:102
 msgid "Window Borders"
-msgstr "Fönsterramar"
+msgstr "FÃ¶nsterramar"
 
 #: src/cfg_windows.c:118
 msgid "Dialog Positioning"
 msgstr "Dialogplacering"
 
-#: src/children.c:94
+#: src/children.c:88
 #, c-format
 msgid "Execution of \"%s\" Failed"
 msgstr "Exekvering av \"%s\" misslyckades"
 
-#: src/children.c:95 src/dialog.c:285
+#: src/children.c:89 src/dialog.c:290
 msgid "Error"
 msgstr "Fel"
 
-#: src/children.c:274
+#: src/children.c:227
 #, c-format
 msgid "Couldn't terminate child \"%s\" (pid=%d)--zombie alert"
 msgstr "Kunde inte avsluta barnprocessen \"%s\" (pid=%d)--zombievarning"
@@ -1181,7 +1184,7 @@
 #: src/cmd_about.c:68
 #, c-format
 msgid "Filename encoding: \"%s\"."
-msgstr "Teckenkodning för filnamn: \"%s\"."
+msgstr "Teckenkodning fÃ¶r filnamn: \"%s\"."
 
 #: src/cmd_about.c:85
 #, c-format
@@ -1189,208 +1192,190 @@
 msgstr "Version %s (GTK+ version %d.%d.%d)."
 
 #: src/cmd_about.c:97
-msgid "(c) 1998-2009 by Emil Brink, Obsession Development.\n"
-msgstr "(c) 1998-2009 av Emil Brink, Obsession Development.\n"
+msgid "(c) 1998-2011 by Emil Brink, Obsession Development.\n"
+msgstr "(c) 1998-2011 av Emil Brink, Obsession Development.\n"
 
 #: src/cmd_about.c:99
 msgid ""
 "This is free software, and there is ABSOLUTELY NO\n"
 "WARRANTY. Read the file COPYING for more details.\n"
 msgstr ""
-"Det här är fri mjukvara, och det finns INGA SOM\n"
-"HELST GARANTIER. Läs filen COPYING för detaljer.\n"
-
-#: src/cmd_about.c:106
-msgid "FAM: Supported and active."
-msgstr "FAM: Stöds och aktivt."
-
-#: src/cmd_about.c:108
-msgid "FAM: Supported, but not active."
-msgstr "FAM: Stöds, ej aktivt."
-
-#: src/cmd_about.c:110
-msgid "FAM: Not supported."
-msgstr "FAM: Stöds ej."
+"Det hÃ¤r Ã¤r fri mjukvara, och det finns INGA SOM\n"
+"HELST GARANTIER. LÃ¤s filen COPYING fÃ¶r detaljer.\n"
 
 #
-#: src/cmd_about.c:116
+#: src/cmd_about.c:105
 msgid "NLS: Supported, using built-in English strings."
-msgstr "NLS: Aktivt, svensk översättning av Emil Brink."
+msgstr "NLS: Aktivt, svensk Ã¶versÃ¤ttning av Emil Brink."
 
-#: src/cmd_about.c:129
+#: src/cmd_about.c:118
+#, c-format
 msgid ""
 "The author of gentoo can be reached via Internet\n"
-"e-mail at <emil@obsession.se>; feel free to let\n"
+"e-mail at <a href=\"mailto:%s\">%s</a>; feel free to let\n"
 "me know what you think of this software, give\n"
 "suggestions/bug reports, and so on.\n"
 "\n"
 "The latest release of gentoo can always be down-\n"
 "loaded from the official gentoo project homepage at\n"
-"<http://www.obsession.se/gentoo/>. New releases are\n"
+"<a href=\"%s\">%s</a>. New releases are\n"
 "typically announced on the Freshmeat service at\n"
-"<http://freshmeat.net/>."
+"<a href=\"http://freshmeat.net/\">freshmeat.net</a>."
 msgstr ""
-"Upphovsmannen till gentoo kan nås via Internet\n"
-"e-post till <emil@obsession.se>; dina åsikter om\n"
-"mjukvaran, förslag på förbättringar/felrapporter,\n"
-"och så vidare, är välkomna.\n"
+"Upphovsmannen till gentoo kan nÃ¥s pÃ¥ mejl till\n"
+"<a href=\"mailto:%s\">%s</a>; dina Ã¥sikter om programmet,\n"
+"fÃ¶rslag pÃ¥ fÃ¶rbÃ¤ttringar/felrapporter och sÃ¥ vidare,\n"
+"Ã¤r vÃ¤lkomna.\n"
 "\n"
 "Den senaste versionen av gentoo kan alltid laddas\n"
-"ner från den officiella hemsidan för projektet, på\n"
-"<http:/www.obsession.se/gentoo/>. Nya versioner\n"
-"annonseras alltid på Freshmeat-tjänsten, se\n"
-"<http://www.freshmeat.net/>."
+"ner frÃ¥n den officiella hemsidan fÃ¶r projektet, pÃ¥\n"
+"<a href=\"%s\">%s</a>. Nya versioner\n"
+"annonseras alltid pÃ¥ Freshmeat-tjÃ¤nsten, se\n"
+"<a href=\"http://www.freshmeat.net/\">http://freshmeat.net</a>."
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "About gentoo"
 msgstr "Om gentoo"
 
-#: src/cmd_about.c:142
+#: src/cmd_about.c:135
 msgid "_OK (Wait for More)"
-msgstr "_OK (Vänta för mer)"
+msgstr "_OK (VÃ¤nta fÃ¶r mer)"
 
 #: src/cmd_chmod.c:98
 #, c-format
 msgid "Set protection bits for \"%s\":"
-msgstr "Sätt skyddsflaggor för \"%s\":"
+msgstr "SÃ¤tt skyddsflaggor fÃ¶r \"%s\":"
 
-#: src/cmd_chmod.c:208 src/cmd_chown.c:184 src/cmd_info.c:202
+#: src/cmd_chmod.c:199 src/cmd_chown.c:176 src/cmd_info.c:274
 msgid "Group"
 msgstr "Grupp"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Others"
 msgstr "Andra"
 
-#: src/cmd_chmod.c:208 src/cmd_info.c:195
+#: src/cmd_chmod.c:199 src/cmd_info.c:267
 msgid "Owner"
-msgstr "Ägare"
+msgstr "Ãgare"
 
-#: src/cmd_chmod.c:208
+#: src/cmd_chmod.c:199
 msgid "Special"
 msgstr "Speciella"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Execute"
 msgstr "Exekvera"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Read"
-msgstr "Läs"
+msgstr "LÃ¤s"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set GID"
-msgstr "Sätt GID"
+msgstr "SÃ¤tt GID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Set UID"
-msgstr "Sätt UID"
+msgstr "SÃ¤tt UID"
 
-#: src/cmd_chmod.c:209
+#: src/cmd_chmod.c:200
 msgid "Write"
 msgstr "Skriv"
 
-#: src/cmd_chmod.c:231
+#: src/cmd_chmod.c:222
 msgid "Protection Bits"
 msgstr "Skyddsflaggor"
 
-#: src/cmd_chmod.c:242
+#: src/cmd_chmod.c:233
 msgid "Textual"
 msgstr "Som text"
 
-#: src/cmd_chmod.c:253
+#: src/cmd_chmod.c:246
 msgid "Octal"
 msgstr "Oktalt"
 
-#: src/cmd_chmod.c:258 src/menus.c:511
+#: src/cmd_chmod.c:251 src/menus.c:518
 msgid "All"
 msgstr "Alla"
 
-#: src/cmd_chmod.c:261
+#: src/cmd_chmod.c:253 src/menus.c:520
+msgid "Toggle"
+msgstr "VÃ¤xla"
+
+#: src/cmd_chmod.c:254
 msgid "Revert"
-msgstr "Återgå"
+msgstr "ÃtergÃ¥"
 
-#: src/cmd_chmod.c:273 src/cmd_chown.c:208 src/cmd_info.c:304
+#: src/cmd_chmod.c:266 src/cmd_chown.c:201 src/cmd_info.c:372
 msgid "Recurse Directories?"
-msgstr "Gå igenom kataloger rekursivt?"
+msgstr "GÃ¥ igenom kataloger rekursivt?"
 
-#: src/cmd_chmod.c:276
+#: src/cmd_chmod.c:269
 msgid "Don't Touch Directories?"
-msgstr "Ändra inte på kataloger?"
+msgstr "Ãndra inte pÃ¥ kataloger?"
 
-#: src/cmd_chmod.c:281
+#: src/cmd_chmod.c:274
 msgid "Change Mode"
-msgstr "Ändra skyddsflaggor"
+msgstr "Ãndra skyddsflaggor"
 
-#: src/cmd_chown.c:56
+#: src/cmd_chown.c:57
 #, c-format
 msgid "Set Ownership for '%s':"
-msgstr "Sätt ägare för \"%s\""
+msgstr "SÃ¤tt Ã¤gare fÃ¶r \"%s\""
 
-#: src/cmd_chown.c:184
+#: src/cmd_chown.c:176
 msgid "User"
-msgstr "Användare"
+msgstr "AnvÃ¤ndare"
 
 #
-#: src/cmd_chown.c:213
+#: src/cmd_chown.c:206
 msgid "Change Ownership"
-msgstr "Ändra ägare"
+msgstr "Ãndra Ã¤gare"
 
 #: src/cmd_configure.c:50
 msgid "Automatically Save Changed Configuration on Exit?"
-msgstr "Spara ändrad konfiguration automatiskt vid avslut?"
-
-#: src/cmd_copy.c:302
-#, c-format
-msgid ""
-"Can't copy directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"Kan inte kopiera katalogen \"%s\"\n"
-"till \"%s\":\n"
-"källkatalogen innehåller destinationen."
+msgstr "Spara Ã¤ndrad konfiguration automatiskt vid avslut?"
 
-#: src/cmd_copy.c:392 src/cmd_copyas.c:62
+#: src/cmd_copy.c:175 src/cmd_copyas.c:62
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Copy?"
-msgstr "\"%s\" finns redan - kopiera över ändå?"
+msgstr "\"%s\" finns redan - kopiera Ã¶ver Ã¤ndÃ¥?"
 
-#: src/cmd_copy.c:393
+#: src/cmd_copy.c:176
 msgid "Copying..."
 msgstr "Kopierar..."
 
-#: src/cmd_copy.c:440
+#: src/cmd_copy.c:217
 msgid "Preserve Dates During Copy?"
-msgstr "Behåll datum på kopior?"
+msgstr "BehÃ¥ll datum pÃ¥ kopior?"
 
-#: src/cmd_copy.c:441
+#: src/cmd_copy.c:218
 msgid "Ignore Failure to Copy Attributes (Date, Owner, Mode)?"
 msgstr ""
-"Ignorera misslyckad sättning av attribut (datum, ägare, skyddsflaggor)?"
+"Ignorera misslyckad sÃ¤ttning av attribut (datum, Ã¤gare, skyddsflaggor)?"
 
-#: src/cmd_copy.c:442
+#: src/cmd_copy.c:219
 msgid "Leave Failed Destination if Full Size?"
-msgstr "Lämna fullstor målfil vid fel?"
+msgstr "LÃ¤mna fullstor mÃ¥lfil vid fel?"
 
-#: src/cmd_copy.c:443 src/cmd_viewtext.c:207
+#: src/cmd_copy.c:220 src/cmd_viewtext.c:204
 msgid "Buffer Size"
 msgstr "Buffertstorlek"
 
-#: src/cmd_copyas.c:51
+#: src/cmd_copyas.c:49
 #, c-format
 msgid "Enter Name for Copy of \"%s\""
-msgstr "Ange namn för kopia av \"%s\""
+msgstr "Ange namn fÃ¶r kopia av \"%s\""
 
-#: src/cmd_copyas.c:53
+#: src/cmd_copyas.c:51
 #, c-format
 msgid "Enter Name for Clone of \"%s\""
-msgstr "Ange namn för klon av \"%s\""
+msgstr "Ange namn fÃ¶r klon av \"%s\""
 
 #: src/cmd_copyas.c:64
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Clone?"
-msgstr "\"%s\" finns redan - skriv över med klon?"
+msgstr "\"%s\" finns redan - skriv Ã¶ver med klon?"
 
 #: src/cmd_copyas.c:65
 msgid "Cloning..."
@@ -1403,38 +1388,38 @@
 #: src/cmd_copyas.c:79
 #, c-format
 msgid "Enter Name to Link \"%s\" As"
-msgstr "Ange namn för länk till \"%s\""
+msgstr "Ange namn fÃ¶r lÃ¤nk till \"%s\""
 
 #: src/cmd_copyas.c:81
 #, c-format
 msgid "Enter Name for Link Clone of \"%s\""
-msgstr "Ange namn för länkklon av \"%s\""
+msgstr "Ange namn fÃ¶r lÃ¤nkklon av \"%s\""
 
-#: src/cmd_copyas.c:89
+#: src/cmd_copyas.c:91
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Symlink?"
-msgstr "\"%s\" finns redan - länka över?"
+msgstr "\"%s\" finns redan - lÃ¤nka Ã¶ver?"
 
-#: src/cmd_copyas.c:204 src/cmd_copyas.c:210
+#: src/cmd_copyas.c:200 src/cmd_copyas.c:207
 msgid "Copy As"
 msgstr "Kopiera som"
 
 #
-#: src/cmd_copyas.c:212
+#: src/cmd_copyas.c:209
 msgid "Clone"
 msgstr "Klona"
 
 #
-#: src/cmd_copyas.c:214
+#: src/cmd_copyas.c:211
 msgid "Symbolic Link As"
-msgstr "Skapa symbolisk länk som"
+msgstr "Skapa symbolisk lÃ¤nk som"
 
 #
-#: src/cmd_copyas.c:216
+#: src/cmd_copyas.c:213
 msgid "Symbolic Link Clone"
-msgstr "Klona som symbolisk länk"
+msgstr "Klona som symbolisk lÃ¤nk"
 
-#: src/cmd_delete.c:55
+#: src/cmd_delete.c:56
 #, c-format
 msgid ""
 "%s\n"
@@ -1442,243 +1427,255 @@
 "Attempt to change protection and retry?"
 msgstr ""
 "%s\n"
-"kunde inte raderas på grund av skyddsflaggor.\n"
-"Prova ändring och försöka igen?"
+"kunde inte raderas pÃ¥ grund av skyddsflaggor.\n"
+"Prova Ã¤ndring och fÃ¶rsÃ¶ka igen?"
 
-#: src/cmd_delete.c:58
+#: src/cmd_delete.c:59
 msgid "Remember the answer (alters config)"
-msgstr "Kom ihåg svaret (ändrar konfigurationen)"
+msgstr "Kom ihÃ¥g svaret (Ã¤ndrar konfigurationen)"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Access Problem"
-msgstr "Åtkomstproblem"
+msgstr "Ãtkomstproblem"
 
-#: src/cmd_delete.c:60
+#: src/cmd_delete.c:61
 msgid "Change|Leave Alone"
-msgstr "Ändra|Rör inte"
+msgstr "Ãndra|RÃ¶r inte"
 
-#: src/cmd_delete.c:236
+#: src/cmd_delete.c:215
 #, c-format
 msgid "Really Delete \"%s\"?"
 msgstr "Verkligen ta bort \"%s\"?"
 
-#: src/cmd_delete.c:237
+#: src/cmd_delete.c:216
 msgid "Deleting..."
 msgstr "Raderar..."
 
-#: src/cmd_delete.c:292
+#: src/cmd_delete.c:279
 msgid "On Access Failure"
-msgstr "Vid åtkomstfel"
+msgstr "Vid Ã¥tkomstfel"
 
-#: src/cmd_delete.c:293
+#: src/cmd_delete.c:280
 msgid "Ask User|Automatically Try Changing, and Retry|Fail"
 msgstr ""
-"Fråga användaren|Försök automatiskt att ändra, och försök igen|Misslyckas"
+"FrÃ¥ga anvÃ¤ndaren|FÃ¶rsÃ¶k automatiskt att Ã¤ndra, och fÃ¶rsÃ¶k igen|Misslyckas"
+
+#: src/cmd_dpfocus.c:33
+msgid "DpFocus Command is Deprecated"
+msgstr "Kommandot DpFocus stÃ¶ds inte lÃ¤ngre"
 
-#: src/cmd_dpfocus.c:183
-msgid "Wrap Around At Top And Bottom?"
-msgstr "Gå runt vid topp och botten?"
+#: src/cmd_dpfocus.c:34
+msgid ""
+"The <tt>DpFocus</tt> command has been deprecated and is no longer supported. "
+"Please remove any keyboard or mouse bindings that use it and look into using "
+"the default GTK+ list view's cursor controls."
+msgstr ""
+"Kommandot <tt>DpFocus</tt> stÃ¶ds inte lÃ¤ngre. Ta bort alla referenser till "
+"kommandot (t.ex. frÃ¥n genvÃ¤gar och musbindningar), och anvÃ¤nd istÃ¤llet GTK+:"
+"s inbyggda markÃ¶rsystem."
 
-#: src/cmd_dpfocus.c:184
+#: src/cmd_dpfocus.c:64
 msgid "Treat Focused Row As Selection If No \"Real\" Selection Exists?"
 msgstr "Behandla fokuserad rad som vald om inget \"riktigt\" val finns?"
 
-#: src/cmd_dpfocus.c:186
+#: src/cmd_dpfocus.c:66
 msgid "Move Focus to Last Selected/Deselected Row?"
 msgstr "Flytta fokus till sista valda/avvalda raden?"
 
-#: src/cmd_dpfocusisrch.c:220
+#: src/cmd_dpfocusisrch.c:163
 msgid "ISearch"
-msgstr "Sök"
+msgstr "SÃ¶k"
 
-#: src/cmd_generic.c:136
+#: src/cmd_generic.c:143
 msgid "_OK|A_ll|_Skip|_Cancel"
 msgstr "_OK|A_lla|_Skippa|Skippa _alla|Av_bryt"
 
-#: src/cmd_generic.c:137
+#: src/cmd_generic.c:144
 msgid "_OK|_Skip|_Cancel"
 msgstr "_OK|_Skippa|Av_bryt"
 
-#: src/cmd_getsize.c:49
+#: src/cmd_getsize.c:51
 msgid "Getting sizes..."
-msgstr "Hämtar storlekar..."
+msgstr "HÃ¤mtar storlekar..."
 
-#: src/cmd_getsize.c:141
+#: src/cmd_getsize.c:134
 msgid "Unselect Rows When Done?"
-msgstr "Avvälj rader?"
+msgstr "AvvÃ¤lj rader?"
 
-# c-format
-#: src/cmd_info.c:71 src/cmd_info.c:163
+#: src/cmd_info.c:68 src/errors.c:84
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: src/cmd_info.c:72
 #, c-format
 msgid ""
-"%s (%s bytes,\n"
-"%s blocks)"
+"%u dirs, %u files,\n"
+"%u symlinks, %u special files"
 msgstr ""
-"%s (%s byte,\n"
-"%s block)"
+"%u kataloger, %u filer,\n"
+"%u lÃ¤nkar, %u speciella filer"
 
-#: src/cmd_info.c:75
-#, c-format
-msgid "%u dirs, %u files, %u symlinks"
-msgstr "%u kataloger, %u filer, %u länkar"
+#: src/cmd_info.c:153
+msgid "Value"
+msgstr "VÃ¤rde"
 
-#: src/cmd_info.c:134
+#: src/cmd_info.c:198
 msgid "Link To"
-msgstr "Länka till"
+msgstr "LÃ¤nka till"
 
-#: src/cmd_info.c:145 src/cmd_select.c:399 src/dpformat.c:52
+#: src/cmd_info.c:213 src/cmd_select.c:368 src/dpformat.c:54
 msgid "Type"
 msgstr "Typ"
 
-#: src/cmd_info.c:148
+#: src/cmd_info.c:216
 msgid "Location"
 msgstr "Plats"
 
-#: src/cmd_info.c:151 src/dpformat.c:36 src/window.c:200
+#: src/cmd_info.c:219 src/cmd_split.c:653 src/dpformat.c:37 src/window.c:199
 msgid "Size"
 msgstr "Storlek"
 
-#: src/cmd_info.c:172
+#: src/cmd_info.c:229
+#, c-format
+msgid "%s (%s bytes)"
+msgstr "%s (%s byte)"
+
+#: src/cmd_info.c:240
 msgid "Contains"
-msgstr "Innehåller"
+msgstr "InnehÃ¥ller"
 
-#: src/cmd_info.c:186
+#: src/cmd_info.c:257
 msgid "'File' Info"
-msgstr "'File' säger"
+msgstr "'File' sÃ¤ger"
 
-#: src/cmd_info.c:213 src/dpformat.c:49
+#: src/cmd_info.c:285 src/dpformat.c:50
 msgid "Accessed"
-msgstr "Använd"
+msgstr "AnvÃ¤nd"
 
-#: src/cmd_info.c:214 src/dpformat.c:50
+#: src/cmd_info.c:286 src/dpformat.c:51
 msgid "Modified"
 msgstr "Modifierad"
 
-#: src/cmd_info.c:215
+#: src/cmd_info.c:287 src/dpformat.c:53
 msgid "Changed"
-msgstr "Ändrad"
+msgstr "Ãndrad"
+
+#: src/cmd_info.c:288 src/dpformat.c:52
+msgid "Created"
+msgstr "Skapad"
+
+#: src/cmd_info.c:290
+msgid "Basic"
+msgstr "GrundlÃ¤ggande"
 
-#: src/cmd_info.c:263
+#: src/cmd_info.c:294
+msgid "Attributes"
+msgstr "Attribut"
+
+#: src/cmd_info.c:338
 msgid "Getting Information..."
-msgstr "Hämtar information..."
+msgstr "HÃ¤mtar information..."
 
-#: src/cmd_info.c:302
+#: src/cmd_info.c:370
 msgid "Show 'file' Output?"
 msgstr "Visa 'file' utmatning?"
 
-#: src/cmd_info.c:305
+#: src/cmd_info.c:373
 msgid "Access Date Format"
-msgstr "Datumformat för Använd"
+msgstr "Datumformat fÃ¶r AnvÃ¤nd"
 
-#: src/cmd_info.c:306
+#: src/cmd_info.c:374
 msgid "Modify Date Format"
-msgstr "Datumformat för Modiferad"
+msgstr "Datumformat fÃ¶r Modiferad"
 
-#: src/cmd_info.c:307
+#: src/cmd_info.c:375
 msgid "Change Date Format"
-msgstr "Datumformat för Ändrad"
+msgstr "Datumformat fÃ¶r Ãndrad"
 
-#: src/cmd_info.c:308
+#: src/cmd_info.c:376
 msgid "Size Tick Mark"
-msgstr "Märke i storlek"
+msgstr "MÃ¤rke i storlek"
 
-#: src/cmd_join.c:47
+#: src/cmd_join.c:46
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Join?"
-msgstr "\"%s\" finns redan - skriv över med hopslagen fil?"
+msgstr "\"%s\" finns redan - skriv Ã¶ver med hopslagen fil?"
 
-#: src/cmd_join.c:76
+#: src/cmd_join.c:73
 msgid "Joining..."
-msgstr "Slår ihop..."
+msgstr "SlÃ¥r ihop..."
 
-#: src/cmd_join.c:162
+#: src/cmd_join.c:167
 msgid "Click and Drag Files to Reorder, Then Click Join."
-msgstr "Klicka och dra för att ändra ordning, klicka sedan \"Slå ihop\"."
+msgstr "Klicka och dra fÃ¶r att Ã¤ndra ordning, klicka sedan \"SlÃ¥ ihop\"."
 
-#: src/cmd_join.c:170
+#: src/cmd_join.c:175
 #, c-format
 msgid "The total size is %s (%lu bytes)."
-msgstr "Total storlek är %s (%lu byte)."
+msgstr "Total storlek Ã¤r %s (%lu byte)."
 
-#: src/cmd_join.c:173
+#: src/cmd_join.c:178
 #, c-format
 msgid "The total size is %lu bytes."
-msgstr "Total storlek är %lu byte."
+msgstr "Total storlek Ã¤r %lu byte."
 
-#: src/cmd_join.c:215
+#: src/cmd_join.c:220
 msgid "Enter Destination File Name"
-msgstr "Ange målfilnamn"
+msgstr "Ange mÃ¥lfilnamn"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "Join"
-msgstr "Slå ihop"
+msgstr "SlÃ¥ ihop"
 
-#: src/cmd_join.c:232
+#: src/cmd_join.c:235
 msgid "_Join|_Cancel"
-msgstr "_Slå ihop|Av_bryt"
+msgstr "_SlÃ¥ ihop|Av_bryt"
 
-#: src/cmd_mkdir.c:75
+#: src/cmd_mkdir.c:65
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With MkDir?"
-msgstr "\"%s\" finns redan - skapa katalog ändå?"
+msgstr "\"%s\" finns redan - skapa katalog Ã¤ndÃ¥?"
 
-#: src/cmd_mkdir.c:125
+#: src/cmd_mkdir.c:119
 msgid "Enter Name of Directory to Create"
-msgstr "Ange namn för ny katalog"
+msgstr "Ange namn fÃ¶r ny katalog"
 
-#: src/cmd_mkdir.c:133
+#: src/cmd_mkdir.c:128
 msgid "Make Directory"
 msgstr "Skapa katalog"
 
-#: src/cmd_mkdir.c:156
+#: src/cmd_mkdir.c:151
 msgid "CD Into New Directory?"
 msgstr "Byt till skapad katalog?"
 
-#: src/cmd_mkdir.c:157
+#: src/cmd_mkdir.c:152
 msgid "Focus New Directory?"
 msgstr "Fokusera skapad katalog?"
 
-#: src/cmd_move.c:81
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the source contains the destination."
-msgstr ""
-"Kan inte flytta katalogen \"%s\"\n"
-"till \"%s\":\n"
-"källkatalogen innehåller destinationen."
-
-#: src/cmd_move.c:92
-#, c-format
-msgid ""
-"Can't move directory \"%s\"\n"
-"to \"%s\":\n"
-"the destination contains the source."
-msgstr ""
-"Kan inte flytta katalogen \"%s\"\n"
-"till \"%s\":\n"
-"destinationskatalogen innehåller källan."
-
-#: src/cmd_move.c:188 src/cmd_moveas.c:48
+#: src/cmd_move.c:128 src/cmd_moveas.c:51
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Move?"
-msgstr "\"%s\" finns redan - flytta fil dit ändå?"
+msgstr "\"%s\" finns redan - flytta fil dit Ã¤ndÃ¥?"
 
-#: src/cmd_move.c:189
+#: src/cmd_move.c:129
 msgid "Moving..."
 msgstr "Flyttar..."
 
-#: src/cmd_moveas.c:40
+#: src/cmd_moveas.c:41
 #, c-format
 msgid "Enter Name to Move \"%s\" As"
 msgstr "Ange namn att flytta \"%s\" som"
 
+#: src/cmd_moveas.c:66
+msgid "Invalid destination name for MoveAs"
+msgstr "OtillÃ¥tet destinationsnamn fÃ¶r MoveAs"
+
 #: src/cmd_moveas.c:74
 msgid "Moving As..."
 msgstr "Flyttar som..."
 
-#: src/cmd_moveas.c:105 src/cmd_moveas.c:110
+#: src/cmd_moveas.c:105 src/cmd_moveas.c:113
 msgid "Move As"
 msgstr "Flytta som"
 
@@ -1687,12 +1684,12 @@
 "You may have some unsaved configuration changes.\n"
 "Quitting without saving will lose them. Really quit?"
 msgstr ""
-"Det verkar finnas konfigurationsändringar, som kommer att\n"
-"förloras om gentoo avslutas utan att de sparats. Avsluta?"
+"Det verkar finnas konfigurationsÃ¤ndringar, som kommer att\n"
+"fÃ¶rloras om gentoo avslutas utan att de sparats. Avsluta?"
 
 #: src/cmd_quit.c:42 src/cmd_quit.c:54
 msgid "Confirm Quitting"
-msgstr "Bekräfta"
+msgstr "BekrÃ¤fta"
 
 #: src/cmd_quit.c:42
 msgid "_Quit|_Save, then Quit|_Cancel"
@@ -1702,50 +1699,50 @@
 msgid "Are you sure you want to quit?"
 msgstr "Vill du verkligen avsluta?"
 
-#: src/cmd_rename.c:44
+#: src/cmd_rename.c:57
 #, c-format
 msgid "Enter New Name For \"%s\""
-msgstr "Ange nytt namn för \"%s\""
+msgstr "Ange nytt namn fÃ¶r \"%s\""
 
-#: src/cmd_rename.c:52 src/cmd_renamere.c:147 src/cmd_renamere.c:243
-#: src/cmd_renamere.c:293 src/cmd_renamere.c:388 src/cmd_renameseq.c:161
+#: src/cmd_rename.c:67 src/cmd_renamere.c:142 src/cmd_renamere.c:225
+#: src/cmd_renamere.c:268 src/cmd_renamere.c:367 src/cmd_renameseq.c:152
 #, c-format
 msgid "\"%s\" Already Exists - Proceed With Rename?"
-msgstr "\"%s\" finns redan - skriv över med omdöpt fil?"
+msgstr "\"%s\" finns redan - skriv Ã¶ver med omdÃ¶pt fil?"
 
-#: src/cmd_rename.c:132
+#: src/cmd_rename.c:245
 msgid "Rename"
-msgstr "Döp om"
+msgstr "DÃ¶p om"
 
-#: src/cmd_renamere.c:260
-msgid "Regular expression error:\n"
-msgstr "Fel i reguljärt uttryck:\n"
+#: src/cmd_rename.c:261
+msgid "Rename Single File In-Place (Without Dialog)?"
+msgstr "DÃ¶p om enskilda filer pÃ¥ plats (utan dialog)?"
 
-#: src/cmd_renamere.c:446
+#: src/cmd_renamere.c:419
 msgid ""
 "Look for substring in all filenames, and replace\n"
 "it with another string."
 msgstr ""
-"Leta efter delsträng i alla filnamn, och\n"
-"ersätt den med en annan sträng."
+"Leta efter delstrÃ¤ng i alla filnamn, och\n"
+"ersÃ¤tt den med en annan strÃ¤ng."
 
-#: src/cmd_renamere.c:449
+#: src/cmd_renamere.c:422
 msgid "Replace"
-msgstr "Ersätt"
+msgstr "ErsÃ¤tt"
 
-#: src/cmd_renamere.c:453
+#: src/cmd_renamere.c:426
 msgid "With"
 msgstr "Med"
 
-#: src/cmd_renamere.c:461
+#: src/cmd_renamere.c:434
 msgid "Replace All?"
-msgstr "Ersätt alla?"
+msgstr "ErsÃ¤tt alla?"
 
-#: src/cmd_renamere.c:465
+#: src/cmd_renamere.c:438
 msgid "Simple"
 msgstr "Enkel"
 
-#: src/cmd_renamere.c:469
+#: src/cmd_renamere.c:442
 msgid ""
 "Execute the 'From' RE on each filename, storing\n"
 "parenthesised subexpression matches. Then replace\n"
@@ -1753,288 +1750,330 @@
 "(counting from 1) of a subexpression, with the text\n"
 "that matched, and use the result as a new filename."
 msgstr ""
-"Kör det reguljära uttrycket \"Från\" på varje filnamn, och\n"
-"lagra matchingar för deluttryck inom parenteser. Ersätt sedan\n"
-"varje förekomst av $n i \"Till\", där n (mellan 1 och 9) är numret\n"
-"på ett deluttryck, med texten som matchade, och använd resultatet\n"
+"KÃ¶r det reguljÃ¤ra uttrycket \"FrÃ¥n\" pÃ¥ varje filnamn, och\n"
+"lagra matchingar fÃ¶r deluttryck inom parenteser. ErsÃ¤tt sedan\n"
+"varje fÃ¶rekomst av $n i \"Till\", dÃ¤r n (mellan 1 och 9) Ã¤r numret\n"
+"pÃ¥ ett deluttryck, med texten som matchade, och anvÃ¤nd resultatet\n"
 "som nytt filnamn."
 
-#: src/cmd_renamere.c:477 src/cmd_renamere.c:500
+#: src/cmd_renamere.c:450 src/cmd_renamere.c:473
 msgid "From"
-msgstr "Från"
+msgstr "FrÃ¥n"
 
-#: src/cmd_renamere.c:481 src/cmd_renamere.c:504
+#: src/cmd_renamere.c:454 src/cmd_renamere.c:477
 msgid "To"
 msgstr "Till"
 
-#: src/cmd_renamere.c:489
+#: src/cmd_renamere.c:462
 msgid "Reg Exp"
-msgstr "Reguljärt uttryck"
+msgstr "ReguljÃ¤rt uttryck"
 
-#: src/cmd_renamere.c:494
+#: src/cmd_renamere.c:467
 msgid ""
 "Look for each character in the 'From' string, and replace\n"
 "any hits with the corresponding character in the 'To' string.\n"
 "Then, any characters in the 'Remove' string are removed from\n"
 "the filename, and the result used as the new name for each file."
 msgstr ""
-"Titta efter varje tecken i 'Från'-strängen, och ersätt\n"
-"alla funna tecken med motsvarande tecken ur 'Till'-strängen.\n"
-"Därefter plockas alla tecken som finns med i 'Ta bort'-strängen\n"
-"bort, och resultatet används som nytt filnamn för varje fil."
+"Titta efter varje tecken i 'FrÃ¥n'-strÃ¤ngen, och ersÃ¤tt\n"
+"alla funna tecken med motsvarande tecken ur 'Till'-strÃ¤ngen.\n"
+"DÃ¤refter plockas alla tecken som finns med i 'Ta bort'-strÃ¤ngen\n"
+"bort, och resultatet anvÃ¤nds som nytt filnamn fÃ¶r varje fil."
 
-#: src/cmd_renamere.c:513
+#: src/cmd_renamere.c:486
 msgid "Map"
 msgstr "Mappa"
 
-#: src/cmd_renamere.c:517
+#: src/cmd_renamere.c:490
 msgid ""
 "Changes the case (upper/lower) of the characters\n"
 "in the selected filename(s)."
 msgstr ""
-"Ändrar skiftläge (versaler/gemener) på alla bokstäver\n"
+"Ãndrar skiftlÃ¤ge (versaler/gemener) pÃ¥ alla bokstÃ¤ver\n"
 "i det valda filnamnet (eller filnamnen)."
 
-#: src/cmd_renamere.c:519
+#: src/cmd_renamere.c:492
 msgid "Lower Case?"
 msgstr "Gemener"
 
-#: src/cmd_renamere.c:521
+#: src/cmd_renamere.c:494
 msgid "Upper Case?"
 msgstr "Versaler"
 
-#: src/cmd_renamere.c:523
+#: src/cmd_renamere.c:496
 msgid "Upper Case Initial?"
 msgstr "Versal initial?"
 
-#: src/cmd_renamere.c:526
+#: src/cmd_renamere.c:499
 msgid "Case"
 msgstr "Gemener/versaler"
 
-#: src/cmd_renamere.c:528
+#: src/cmd_renamere.c:501
 msgid "RenameRE"
-msgstr "Döp om med reguljära uttryck"
+msgstr "DÃ¶p om med reguljÃ¤ra uttryck"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "10, Decimal"
 msgstr "10, decimalt"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (A-F)"
 msgstr "16, hexadecimalt (A-F)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "16, Hex (a-f)"
 msgstr "16, hexadecimalt (a-f)"
 
-#: src/cmd_renameseq.c:303
+#: src/cmd_renameseq.c:281
 msgid "8, Octal"
 msgstr "8, oktalt"
 
-#: src/cmd_renameseq.c:328
+#: src/cmd_renameseq.c:306
 msgid ""
 "This command renames all selected files\n"
 "into a numbered sequence. The controls\n"
 "below let you define how the names are\n"
 "formed."
 msgstr ""
-"Detta kommando döper om valda filer så att\n"
+"Detta kommando dÃ¶per om valda filer sÃ¥ att\n"
 "en numrerad sekvens skapas. Kontrollerna\n"
-"nedan låter dig styra hur namnen bildas."
+"nedan lÃ¥ter dig styra hur namnen bildas."
 
-#: src/cmd_renameseq.c:335
+#: src/cmd_renameseq.c:313
 msgid "Start At"
-msgstr "Starta på"
+msgstr "Starta pÃ¥"
 
-#: src/cmd_renameseq.c:343 src/cmd_split.c:247
+#: src/cmd_renameseq.c:323 src/cmd_split.c:609
 msgid "Base"
 msgstr "Bas"
 
-#: src/cmd_renameseq.c:359
+#: src/cmd_renameseq.c:333
 msgid "Precision"
 msgstr "Precision"
 
-#: src/cmd_renameseq.c:367
+#: src/cmd_renameseq.c:340
 msgid "Head"
 msgstr "Start"
 
-#: src/cmd_renameseq.c:374
+#: src/cmd_renameseq.c:347
 msgid "Tail"
 msgstr "Slut"
 
-#: src/cmd_renameseq.c:382
+#: src/cmd_renameseq.c:354
 msgid "Guess"
 msgstr "Gissa"
 
-#: src/cmd_renameseq.c:396
+#: src/cmd_renameseq.c:369
 msgid "Sequential Rename"
-msgstr "Sekvensiell omdöpning"
+msgstr "Sekvensiell omdÃ¶pning"
 
-#: src/cmd_select.c:396
+#: src/cmd_select.c:365
 msgid "All rows|Selected|Unselected|"
 msgstr "Alla rader|Valda|Ovalda|"
 
-#: src/cmd_select.c:397
+#: src/cmd_select.c:366
 msgid "All types|Directories only|Non-directories only|"
 msgstr "Alla typer|Endast kataloger|Endast icke-kataloger|"
 
-#: src/cmd_select.c:398
+#: src/cmd_select.c:367
 msgid "Select|Unselect|Toggle|"
-msgstr "Välj|Avvälj|Växla¦"
+msgstr "VÃ¤lj|AvvÃ¤lj|VÃ¤xlaÂ¦"
 
-#: src/cmd_select.c:399 src/menus.c:530
+#: src/cmd_select.c:368 src/menus.c:537
 msgid "Action"
-msgstr "Åtgärd"
+msgstr "ÃtgÃ¤rd"
 
-#: src/cmd_select.c:399
+#: src/cmd_select.c:368
 msgid "Set"
-msgstr "Mängd"
+msgstr "MÃ¤ngd"
 
-#: src/cmd_select.c:511
+#: src/cmd_select.c:469
 msgid "Treat RE as Glob Pattern?"
-msgstr "Behandla RU som skalmönster?"
+msgstr "Behandla RU som skalmÃ¶nster?"
 
-#: src/cmd_select.c:514
+#: src/cmd_select.c:472
 msgid "Invert RE Matching?"
 msgstr "Invertera RU-matchningen?"
 
-#: src/cmd_select.c:517
+#: src/cmd_select.c:475
 msgid "Require Match on Full Name?"
-msgstr "Kräv matching på hela namn?"
+msgstr "KrÃ¤v matching pÃ¥ hela namn?"
 
-#: src/cmd_select.c:531
+#: src/cmd_select.c:489
 msgid "Select Using RE"
-msgstr "Välj med reguljärt uttryck"
+msgstr "VÃ¤lj med reguljÃ¤rt uttryck"
 
-#: src/cmd_select.c:815
+#: src/cmd_select.c:727
 msgid ""
 "Enter shell command to run. The command\n"
 "will have the selected content appended.\n"
 "Action is performed on successful exit."
 msgstr ""
-"Ange skalkommando att köra. Kommandot\n"
-"får det valda innehållet tillagt på slutet,\n"
-"och vald åtgärd görs om exekvering lyckas."
+"Ange skalkommando att kÃ¶ra. Kommandot\n"
+"fÃ¥r det valda innehÃ¥llet tillagt pÃ¥ slutet,\n"
+"och vald Ã¥tgÃ¤rd gÃ¶rs om exekvering lyckas."
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "OK|Cancel"
 msgstr "_OK|Av_bryt"
 
-#: src/cmd_select.c:821
+#: src/cmd_select.c:734
 msgid "Select using shell command"
-msgstr "Välj med skalkommando"
+msgstr "VÃ¤lj med skalkommando"
 
-#: src/cmd_split.c:68
+#: src/cmd_split.c:269
 #, c-format
 msgid ""
 "Split \"%s\".\n"
 "File is %s (%s)."
 msgstr ""
 "Dela \"%s\".\n"
-"Filen är %s (%s)."
+"Filen Ã¤r %s (%s)."
 
-#: src/cmd_split.c:70
+#: src/cmd_split.c:271
 #, c-format
 msgid ""
 "Split \"%s\".\n"
 "File is %s."
 msgstr ""
 "Dela \"%s\".\n"
-"Filen är %s."
+"Filen Ã¤r %s."
 
-#: src/cmd_split.c:106
+#: src/cmd_split.c:348
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Split?"
-msgstr "\"%s\" finns redan - skriv över med del av fil?"
+msgstr "\"%s\" finns redan - skriv Ã¶ver med del av fil?"
+
+#: src/cmd_split.c:422
+msgid "Fixed Size Split"
+msgstr "Dela till konstant storlek"
 
-#: src/cmd_split.c:171
-msgid "Beta Software"
-msgstr "Ofärdig mjukvara"
+#: src/cmd_split.c:424
+msgid "Segment Size"
+msgstr "Delstorlek"
 
-#: src/cmd_split.c:171
-msgid "Next Version?"
-msgstr "Kanske i nästa version?"
+#: src/cmd_split.c:427
+msgid "1457000 bytes (3.5\" floppy)"
+msgstr "1457000 byte (3.5-tums diskett)"
 
-#: src/cmd_split.c:171
-msgid ""
-"This splitting mode has not been\n"
-"implemented yet... Sorry."
-msgstr ""
-"Detta delningsläge har inte\n"
-"implementerats än. Ledsen."
+#: src/cmd_split.c:428
+msgid "10485760 bytes (10 MB)"
+msgstr "10485760 byte (3.5-tums diskett)"
 
-#: src/cmd_split.c:187
-msgid "  1457000 bytes (3.5\" floppy)"
-msgstr " 1457000 byte (3.5-tums diskett)"
+#: src/cmd_split.c:429
+msgid "26214400 bytes (25 MB)"
+msgstr "26214400 byte (25 MB)"
 
-#: src/cmd_split.c:188
-msgid "100431360 bytes (Zip disk)"
-msgstr "100431360 byte (Zip-skiva)"
+#: src/cmd_split.c:430
+msgid "52428800 bytes (50 MB)"
+msgstr "52428800 byte (50 MB)"
 
-#: src/cmd_split.c:190
-msgid "Fixed Size Split"
+#: src/cmd_split.c:431
+msgid "78643200 bytes (75 MB)"
+msgstr "78643200 byte (75 MB)"
+
+#: src/cmd_split.c:432
+msgid "100431360 bytes (95 MB, Zip disk)"
+msgstr "100431360 byte (95 MB, Zip-skiva)"
+
+#: src/cmd_split.c:454
+msgid "Fixed Count Split"
 msgstr "Dela till konstant storlek"
 
-#: src/cmd_split.c:193
-msgid "Segment Size"
+#: src/cmd_split.c:457
+msgid "Segment Count"
 msgstr "Delstorlek"
 
-#: src/cmd_split.c:221
+#: src/cmd_split.c:503
+msgid "Current part number, unique for every created file"
+msgstr "Nuvarande delnummer, unikt fÃ¶r varje skapad fil"
+
+#: src/cmd_split.c:504
+msgid "The value from the Base box"
+msgstr "VÃ¤rdet frÃ¥n Bas-rutan"
+
+#: src/cmd_split.c:505
+msgid "The amount that index will change for each file"
+msgstr "Hur mycket indexet ska Ã¤ndras fÃ¶r varje fil"
+
+#: src/cmd_split.c:506
+msgid "The total number of files that will be created"
+msgstr "Det totala antalet filer som kommer att skapas"
+
+#: src/cmd_split.c:507
+msgid "The value of index for the last file to be created"
+msgstr "Indexets vÃ¤rde fÃ¶r sista filen som skapas"
+
+#: src/cmd_split.c:570
 msgid "Fixed size, variable number of parts"
 msgstr "Konstant storlek, variabelt antal delar"
 
-#: src/cmd_split.c:222
+#: src/cmd_split.c:571
 msgid "Fixed number of parts, variable sizes"
 msgstr "Konstant antal delar, variabel delstorlek"
 
-#: src/cmd_split.c:230 src/cmd_split.c:261
+#: src/cmd_split.c:580 src/cmd_split.c:663
 msgid "Split"
 msgstr "Dela"
 
-#: src/cmd_split.c:243
+#: src/cmd_split.c:599
 msgid "Name Format"
 msgstr "Namnformat"
 
-#: src/cmd_split.c:252
+#: src/cmd_split.c:615
 msgid "Step"
 msgstr "Steg"
 
-#: src/cmd_symlink.c:77 src/cmd_symlink.c:246
+#: src/cmd_split.c:624
+msgid "Zero-Fill Numbers?"
+msgstr "Nollfyll numren?"
+
+#: src/cmd_split.c:645
+msgid "Offset"
+msgstr "Offset"
+
+#: src/cmd_symlink.c:68 src/cmd_symlink.c:252
 #, c-format
 msgid "\"%s\" Already Exists - Continue With Link?"
-msgstr "\"%s\" finns redan - länka över?"
+msgstr "\"%s\" finns redan - lÃ¤nka Ã¶ver?"
+
+#: src/cmd_symlink.c:161 src/configure.c:239 src/icon_dialog.c:59
+#: src/progress.c:220
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/cmd_symlink.c:161 src/configure.c:233 src/dialog.c:290
+#: src/nag_dialog.c:36
+msgid "OK"
+msgstr "OK"
 
-#: src/cmd_symlink.c:184
+#: src/cmd_symlink.c:161
 msgid "Select Link Target"
-msgstr "Välj länkmål"
+msgstr "VÃ¤lj lÃ¤nkmÃ¥l"
 
-#: src/cmd_symlink.c:213
+#: src/cmd_symlink.c:218
 msgid "Contents"
-msgstr "Innehåll"
+msgstr "InnehÃ¥ll"
 
-#: src/cmd_symlink.c:225
+#: src/cmd_symlink.c:231
 msgid "Edit Symbolic Link"
-msgstr "Ändra symbolisk länk"
+msgstr "Ãndra symbolisk lÃ¤nk"
 
-#: src/cmd_symlink.c:231
+#: src/cmd_symlink.c:236
 msgid "Create Symbolic Link"
-msgstr "Skapa symbolisk länk"
+msgstr "Skapa symbolisk lÃ¤nk"
 
-#: src/cmd_viewtext.c:206
-msgid "Use mmap() to Speed Loading?"
-msgstr "Använd mmap() för att snabba upp inladdning?"
-
-#: src/cmd_viewtext.c:208
+#: src/cmd_viewtext.c:205
 msgid "Hex-Check First"
-msgstr "Binärtesta första"
+msgstr "BinÃ¤rtesta fÃ¶rsta"
 
-#: src/cmd_viewtext.c:209
+#: src/cmd_viewtext.c:206
 msgid "Exit on Left Arrow Key?"
-msgstr "Stäng när vänster piltangent trycks ner?"
+msgstr "StÃ¤ng nÃ¤r vÃ¤nster piltangent trycks ner?"
 
 #: src/cmdarg.c:201
 msgid "on"
-msgstr "på"
+msgstr "pÃ¥"
 
 #: src/cmdarg.c:201
 msgid "true"
@@ -2044,10 +2083,10 @@
 msgid "yes"
 msgstr "ja"
 
-#: src/cmdgrab.c:222
+#: src/cmdgrab.c:177
 #, c-format
 msgid "Output of %s (pid %d)"
-msgstr "Utmatning från %s (pid %d)"
+msgstr "Utmatning frÃ¥n %s (pid %d)"
 
 #: src/cmdseq.c:354 src/cmdseq.c:369
 #, c-format
@@ -2055,53 +2094,45 @@
 "Unable to execute unknown\n"
 "command \"%s\"."
 msgstr ""
-"Kan inte exekvera okänt\n"
+"Kan inte exekvera okÃ¤nt\n"
 "kommando \"%s\"."
 
-#: src/cmdseq_dialog.c:126
+#: src/cmdseq_dialog.c:134
 #, c-format
 msgid "Built-Ins (%u)"
 msgstr "Inbyggda (%u)"
 
-#: src/cmdseq_dialog.c:131
+#: src/cmdseq_dialog.c:139
 #, c-format
 msgid "User Defined (%u)"
-msgstr "Användardefinierade (%u)"
+msgstr "AnvÃ¤ndardefinierade (%u)"
 
-#: src/cmdseq_dialog.c:302
+#: src/cmdseq_dialog.c:313
 msgid ""
 "Select a command, or type start\n"
 "of name and press TAB."
 msgstr ""
-"Välj ett kommando, eller skriv\n"
-"början på namnet och tryck TAB."
+"VÃ¤lj ett kommando, eller skriv\n"
+"bÃ¶rjan pÃ¥ namnet och tryck TAB."
 
-#: src/cmdseq_dialog.c:319
+#: src/cmdseq_dialog.c:330
 msgid "Select Command"
-msgstr "Välj kommando"
+msgstr "VÃ¤lj kommando"
 
-#: src/configure.c:198
+#: src/configure.c:197
 msgid "Couldn't open configuration file for output"
-msgstr "Kunde inte öppna konfigurationsfilen för skrivning"
-
-#: src/configure.c:234 src/dialog.c:285
-msgid "OK"
-msgstr "OK"
+msgstr "Kunde inte Ã¶ppna konfigurationsfilen fÃ¶r skrivning"
 
-#: src/configure.c:240
+#: src/configure.c:236
 msgid "Save"
 msgstr "Spara"
 
-#: src/configure.c:244 src/icon_dialog.c:59 src/progress.c:219
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: src/configure.c:455
+#: src/configure.c:463
 #, c-format
 msgid "Config file version (%s) doesn't match program version (%s)"
 msgstr "Konfigurationsfilens version (%s) matchar inte programmets (%s)"
 
-#: src/configure.c:467
+#: src/configure.c:475
 #, c-format
 msgid ""
 "Couldn't find any configuration file; checked\n"
@@ -2109,584 +2140,516 @@
 "Using built-in minimal configuration."
 msgstr ""
 "Hittade ingen konfigurationsfil, testade\n"
-"både \"%s\" och \"%s\".\n"
-"Använder inbyggt minimal konfiguration."
+"bÃ¥de \"%s\" och \"%s\".\n"
+"AnvÃ¤nder inbyggt minimal konfiguration."
 
-#: src/dialog.c:123 src/dialog.c:253
+#: src/dialog.c:124 src/dialog.c:260
 msgid "_OK|_Cancel"
 msgstr "_OK|Av_bryt"
 
-#: src/dirpane.c:134
-msgid ""
-"Case-sensitive sorting will not work correctly with non-ASCII characters"
-msgstr ""
-"Sortering med hänsyn till gemener/versaler kommer ej fungera med icke-ASCII-"
-"tecken"
-
-#: src/dirpane.c:143
-msgid ""
-"Case-insensitive sorting will not work correctly with non-ASCII characters"
-msgstr ""
-"Sortering utan hänsyn till gemener/versaler kommer ej fungera med icke-ASCII-"
-"tecken"
-
-#: src/dirpane.c:1189
+#: src/dirpane.c:541
 #, c-format
 msgid "%u/%u dirs, %u/%u files"
 msgstr "%u/%u kataloger, %u/%u filer"
 
-#: src/dirpane.c:1197
+#: src/dirpane.c:546
 #, c-format
-msgid " (%%s/%%s, %%%s/%%%s blocks)"
-msgstr " (%%s/%%s, %%%s/%%%s block)"
+msgid " (%s/%s)"
+msgstr " (%s/%s)"
 
-#: src/dirpane.c:1210
+#: src/dirpane.c:557
 #, c-format
 msgid ", %s (%s) used"
-msgstr ", %s (%s) använt"
+msgstr ", %s (%s) anvÃ¤nt"
 
-#: src/dirpane.c:1212
+#: src/dirpane.c:559
 #, c-format
 msgid ", %s free"
 msgstr ", %s ledigt"
 
-#: src/dirpane.c:1560
-msgid "!!Invalid filename!!"
-msgstr "!!Illegalt filnamn!!"
-
-#: src/dirpane.c:2004 src/dirpane.c:2053
+#: src/dirpane.c:2084 src/dirpane.c:2131
 msgid "Move up to the parent directory"
-msgstr "Gå till katalogen ovanför denna"
+msgstr "GÃ¥ till katalogen ovanfÃ¶r denna"
 
-#: src/dirpane.c:2026
+#: src/dirpane.c:2106
 msgid "Enter path, then press Return to go there"
-msgstr "Ange katalog, och tryck Retur för att gå dit"
+msgstr "Ange katalog, och tryck Retur fÃ¶r att gÃ¥ dit"
 
-#: src/dirpane.c:2027
+#: src/dirpane.c:2107
 msgid "H"
 msgstr "D"
 
-#: src/dirpane.c:2031
+#: src/dirpane.c:2111
 msgid ""
 "Click to enable/disable Hide rule (When pressed in, the hide rule is active, "
 "and matching entries are hidden)"
 msgstr ""
-"Klicka för att sätta på/stänga av Dölj-regeln (när knappen är intryckt, är "
-"regeln aktiv, och matchande filer döljs)"
+"Klicka fÃ¶r att sÃ¤tta pÃ¥/stÃ¤nga av DÃ¶lj-regeln (nÃ¤r knappen Ã¤r intryckt, Ã¤r "
+"regeln aktiv, och matchande filer dÃ¶ljs)"
 
-#: src/dpformat.c:37
+#: src/dpformat.c:38
 msgid "Blocks"
 msgstr "Block"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "BSize"
 msgstr "Blockstorlek"
 
-#: src/dpformat.c:38
+#: src/dpformat.c:39
 msgid "Block Size"
 msgstr "Blockstorlek"
 
-#: src/dpformat.c:39
+#: src/dpformat.c:40
 msgid "Mode, numerical"
 msgstr "Skyddsflaggor, som tal"
 
-#: src/dpformat.c:40
+#: src/dpformat.c:41
 msgid "Mode, string"
 msgstr "Skyddsflaggor, som text"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Nlink"
-msgstr "Länkar"
+msgstr "LÃ¤nkar"
 
-#: src/dpformat.c:41
+#: src/dpformat.c:42
 msgid "Number of links"
-msgstr "Antal länkar"
+msgstr "Antal lÃ¤nkar"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Owner ID"
-msgstr "Ägar-ID"
+msgstr "Ãgar-ID"
 
-#: src/dpformat.c:42
+#: src/dpformat.c:43
 msgid "Uid"
-msgstr "ÄgarID"
+msgstr "ÃgarID"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Owner Name"
-msgstr "Ägarnamn"
+msgstr "Ãgarnamn"
 
-#: src/dpformat.c:43
+#: src/dpformat.c:44
 msgid "Uname"
-msgstr "Ägarnamn"
+msgstr "Ãgarnamn"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Gid"
 msgstr "Grupp-id"
 
-#: src/dpformat.c:44
+#: src/dpformat.c:45
 msgid "Group ID"
 msgstr "Grupp-ID"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Gname"
 msgstr "Grupp"
 
-#: src/dpformat.c:45
+#: src/dpformat.c:46
 msgid "Group Name"
 msgstr "Gruppnamn"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device"
 msgstr "Enhet"
 
-#: src/dpformat.c:46
+#: src/dpformat.c:47
 msgid "Device Number"
 msgstr "Enhetsnummer"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "DevMaj"
 msgstr "Enhet"
 
-#: src/dpformat.c:47
+#: src/dpformat.c:48
 msgid "Device Number, major"
 msgstr "Enhetsnummer, major"
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "DevMin"
 msgstr "Enhet"
 
-#: src/dpformat.c:48
+#: src/dpformat.c:49
 msgid "Device Number, minor"
 msgstr "Enhetsnummer, minor"
 
-#: src/dpformat.c:49
-msgid "Date of last Access"
-msgstr "Datum för senaste åtkomst"
-
 #: src/dpformat.c:50
-msgid "Date of last Modification"
-msgstr "Datum för senaste modifiering"
+msgid "Time of Last Access"
+msgstr "Datum fÃ¶r senaste Ã¥tkomst"
 
 #: src/dpformat.c:51
-msgid "Created"
-msgstr "Skapad"
-
-#: src/dpformat.c:51
-msgid "Date of Creation"
-msgstr "Datum för skapande"
+msgid "Time of Last Modification"
+msgstr "Datum fÃ¶r senaste modifiering"
 
 #: src/dpformat.c:52
+msgid "Time of Creation"
+msgstr "Datum fÃ¶r skapande"
+
+#: src/dpformat.c:53
+msgid "Time of Last Change"
+msgstr "Datum fÃ¶r senaste Ã¤ndring"
+
+#: src/dpformat.c:54
 msgid "Type Name"
 msgstr "Typnamn"
 
-#: src/dpformat.c:53
+#: src/dpformat.c:55
 msgid "I"
 msgstr "I"
 
-#: src/dpformat.c:334
-msgid "B"
-msgstr "byte"
+#: src/dpformat.c:56
+msgid "URI"
+msgstr "URI"
 
-#: src/dpformat.c:338 src/sizeutil.c:32
-msgid "KB"
-msgstr "KB"
+#: src/dpformat.c:56
+msgid "URI (without file prefix)"
+msgstr "URI (utan file-prefix)"
 
-#: src/dpformat.c:343 src/sizeutil.c:33
-msgid "MB"
-msgstr "MB"
-
-#: src/dpformat.c:348 src/sizeutil.c:31
-msgid "GB"
-msgstr "GB"
-
-#: src/errors.c:69
+#: src/errors.c:59
 #, c-format
 msgid "Couldn't %s \"%s\": %s (code %d)"
 msgstr "Kunde inte %s \"%s\": %s (kod %d)"
 
-#: src/errors.c:71
+#: src/errors.c:61
 #, c-format
 msgid "Couldn't %s \"%s\" (code %d)"
 msgstr "Kunde inte %s \"%s\" (kod %d)"
 
-#: src/errors.c:76
+#: src/errors.c:66
 #, c-format
 msgid "Couldn't %s \"%s\""
 msgstr "Kunde inte %s \"%s\""
 
-#: src/errors.c:78
+#: src/errors.c:68
 #, c-format
 msgid "Couldn't %s"
 msgstr "Kunde inte %s"
 
-#: src/gentoo.c:421
+#: src/errors.c:88
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: src/gentoo.c:427
 msgid "Report the version to standard output, and exit."
-msgstr "Ange versionsnumret på standardutmatning, och avsluta."
+msgstr "Ange versionsnumret pÃ¥ standardutmatning, och avsluta."
 
-#: src/gentoo.c:423
+#: src/gentoo.c:429
 msgid "Report internal locale details, and exit."
 msgstr "Ange interna lokaliseringsdetaljer, och avsluta."
 
-#: src/gentoo.c:425
+#: src/gentoo.c:431
 msgid "Allows gentoo to be run by the root user. Could be dangerous."
-msgstr "Tillåter att gentoo körs av rotanvändaren. Kan vara farligt."
+msgstr "TillÃ¥ter att gentoo kÃ¶rs av rotanvÃ¤ndaren. Kan vara farligt."
 
-#: src/gentoo.c:426
+#: src/gentoo.c:432
 msgid ""
 "Do not load the ~/.gentoorc configuration file; instead, use default values."
 msgstr ""
-"Ladda inte konfigurationsfilen ~/.gentoorc; använd istället standardvärden."
+"Ladda inte konfigurationsfilen ~/.gentoorc; anvÃ¤nd istÃ¤llet standardvÃ¤rden."
 
-#: src/gentoo.c:427
+#: src/gentoo.c:433
 msgid ""
 "Do not load the ~/.gentoogtkrc GTK+ configuration file; instead, use system "
 "defaults."
 msgstr ""
-"Ladda inte GTK+-konfigurationssfilen ~/.gentoogtkrc; använd istället "
-"systemets standardvärden."
+"Ladda inte GTK+-konfigurationssfilen ~/.gentoogtkrc; anvÃ¤nd istÃ¤llet "
+"systemets standardvÃ¤rden."
 
-#: src/gentoo.c:429
-msgid "Do not use FAM to automatically detect changes in viewed directories."
+#: src/gentoo.c:434
+msgid ""
+"Run COMMAND, a gentoo command. Done before user interaction allowed, but "
+"after configuration file has been read in. Can be used many times to run "
+"several commands in sequence."
 msgstr ""
-"Använd inte FAM för att automatiskt upptäcka när visade katalogers innehåll "
-"förändras."
+"KÃ¶r KOMMANDO, ett gentoo-kommando. GÃ¶rs innan anvÃ¤ndaren kan bÃ¶rja "
+"interagera, men efter konfigurationsfilen har lÃ¤sts in. Kan anvÃ¤ndas mÃ¥nga "
+"gÃ¥nger fÃ¶r att kÃ¶ra flera kommandon efter varandra."
 
-#: src/gentoo.c:431
+#: src/gentoo.c:435
+msgid "COMMAND"
+msgstr "KOMMANDO"
+
+#: src/gentoo.c:436 src/gentoo.c:437
+msgid "DIR"
+msgstr "KATALOG"
+
+#: src/gentoo.c:436
 msgid ""
-"Use ARG as path for the left directory pane. Overrides default (and history)."
+"Use DIR as path for the left directory pane. Overrides default (and history)."
 msgstr ""
-"Använd ARG som sökväg för vänster panel. Ersätter standardsökväg (och "
+"AnvÃ¤nd KATALOG som sÃ¶kvÃ¤g fÃ¶r vÃ¤nster panel. ErsÃ¤tter standardsÃ¶kvÃ¤g (och "
 "historia)."
 
-#: src/gentoo.c:432
+#: src/gentoo.c:437
 msgid ""
-"Use ARG as path for the right directory pane. Overrides default (and "
+"Use DIR as path for the right directory pane. Overrides default (and "
 "history)."
 msgstr ""
-"Använd ARG som sökväg för höger panel. Ersätter standardsökväg (och "
+"AnvÃ¤nd KATALOG som sÃ¶kvÃ¤g fÃ¶r hÃ¶ger panel. ErsÃ¤tter standardsÃ¶kvÃ¤g (och "
 "historia)."
 
-#: src/gentoo.c:433
-msgid ""
-"Run ARG, a gentoo command. Done before user interaction allowed, but after "
-"configuration file has been read in. Can be used many times to run several "
-"commands in sequence."
-msgstr ""
-"Kör ARG, ett gentoo-kommando. Görs innan användaren kan börja interagera, "
-"men efter konfigurationsfilen har lästs in. Kan användas många gånger för "
-"att köra flera kommandon efter varandra."
+#: src/gentoo.c:461
+msgid "- a graphical file manager using GTK+"
+msgstr "- en grafisk filehanterare med GTK+"
 
-#: src/gentoo.c:492
+#: src/gentoo.c:466
+#, c-format
+msgid "Failed to parse command line options: %s\n"
+msgstr "Misslyckades med att tolka kommandoradparametrarna: %s\n"
+
+#: src/gentoo.c:506
 #, c-format
 msgid "%s: To run as root, envoke with the '--root-ok' option\n"
-msgstr "%s: För att köra som rotanvändaren, ange växeln '--root-ok'\n"
+msgstr "%s: FÃ¶r att kÃ¶ra som rotanvÃ¤ndaren, ange vÃ¤xeln '--root-ok'\n"
 
-#: src/gentoo.c:524
+#: src/gentoo.c:538
 msgid "Couldn't initialize userinfo module - username resolving won't work"
 msgstr ""
-"Kunde inte initialisera användarinformationen - hemkataloguppslagning ej "
-"möjlig"
-
-#: src/gentoo.c:529
-msgid "Couldn't initialize mount data - automounting won't work"
-msgstr ""
-"Kunde inte initialisera monteringsdata - automatisk montering ej möjlig"
+"Kunde inte initialisera anvÃ¤ndarinformationen - hemkataloguppslagning ej "
+"mÃ¶jlig"
 
-#: src/gentoo.c:560
+#: src/gentoo.c:570
 #, c-format
 msgid "gentoo v%s by Emil Brink <emil@obsession.se>"
 msgstr "gentoo v%s av Emil Brink <emil@obsession.se>"
 
-#: src/gfam.c:216
-#, c-format
-msgid "FAM open failed, error %d--FAM will not be used"
-msgstr "FAM-öppning misslyckades, felkod %d--FAM kommer ej att användas"
-
-#: src/gfam.c:235
-#, c-format
-msgid ""
-"Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, perhaps)"
-msgstr ""
-"FAM-övervakning av misslyckades, fel %s (starta om med --no-fam för att "
-"eventuellt gå runt problemet)"
+#: src/gentoo.c:577
+msgid "Development Version Warning"
+msgstr "Varning, utvecklingsversion"
 
-#: src/gfam.c:241
-#, c-format
+#: src/gentoo.c:577
 msgid ""
-"Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go around, "
-"perhaps)"
+"This version of gentoo is considered somewhat new and untested. There have "
+"been major changes to almost all parts of the program since the previous "
+"version. Please be a bit careful, and make sure you report any problem to "
+"the author. Thanks."
 msgstr ""
-"FAM-övervakning av \"%s\" misslyckades, fel %s (starta om med --no-fam för "
-"att eventuellt gå runt problemet)"
+"Den hÃ¤r versionen av gentoo anses vara ganska ny och dÃ¤rmed otestad. Stora "
+"fÃ¶rÃ¤ndringar har gjorts i nÃ¤stan alla viktiga delar av programmet sedan den "
+"fÃ¶rra versionsserien. FÃ¶rsÃ¶k vara extra fÃ¶rsiktig, och rapportera eventuella "
+"problem till upphovsmannen. Tack."
 
-#: src/guiutil.c:118
+#: src/guiutil.c:124
 msgid "Progress"
 msgstr "Status"
 
 #: src/icon_dialog.c:52
 msgid "Pick Icon"
-msgstr "Välj ikon"
+msgstr "VÃ¤lj ikon"
 
 #: src/icon_dialog.c:59
 msgid "Loading Icon Graphics..."
 msgstr "Laddar ikongrafik"
 
-#: src/menus.c:278
+#: src/menus.c:284
 msgid "(No Selection)"
 msgstr "(Inga valda filer)"
 
-#: src/menus.c:514
+#: src/menus.c:521
 msgid "RegExp..."
-msgstr "Reguljärt uttryck"
+msgstr "ReguljÃ¤rt uttryck"
 
-#: src/menus.c:526
+#: src/menus.c:533
 msgid "Other"
 msgstr "Andra"
 
-#: src/menus.c:527
+#: src/menus.c:534
 msgid "Rescan"
 msgstr "Uppdatera"
 
-#: src/menus.c:528
+#: src/menus.c:535
 msgid "Select"
-msgstr "Välj"
+msgstr "VÃ¤lj"
 
-#: src/menus.c:532
+#: src/menus.c:539
 msgid "Run..."
-msgstr "Kör..."
+msgstr "KÃ¶r..."
 
-#: src/menus.c:534
+#: src/menus.c:541
 msgid "Configure..."
 msgstr "Konfigurera..."
 
-#: src/menus.c:610
+#: src/menus.c:618
 msgid "Select Menu"
-msgstr "Välj meny"
+msgstr "VÃ¤lj meny"
 
-#: src/mount.c:222
-#, c-format
-msgid "Execution of \"%s %s\" failed:\n"
-msgstr "Körning av \"%s %s\" misslyckades:\n"
-
-#: src/mount.c:318
-#, c-format
-msgid "Mounting \"%s\" on \"%s\"..."
-msgstr "Monterar \"%s\" på \"%s\"..."
+#: src/nag_dialog.c:37
+msgid "_Don't show this dialog again"
+msgstr "Visa _inte den hÃ¤r dialogen igen"
 
 #: src/overwrite.c:49
 msgid "_OK|A_ll|_Skip|Skip _All|_Cancel"
 msgstr "_OK|A_lla|_Skippa|Skippa _alla|Av_bryt"
 
-# c-format
-#: src/overwrite.c:73
-#, c-format
-msgid ""
-"\n"
-"Old: %%%s bytes, changed on %%s,\n"
-"New: %%%s bytes, changed on %%s."
-msgstr ""
-"\n"
-"Gammal: %%%s byte, ändrad %%s.\n"
-"Ny: %%%s byte, ändrad %%s."
-
-#: src/progress.c:195
+#: src/progress.c:196
 #, c-format
 msgid "Total (%s)"
 msgstr "Total (%s)"
 
-#: src/progress.c:315
+#: src/progress.c:305
 #, c-format
 msgid "Elapsed %02d:%02d  Speed %s/s  ETA %02u:%02u"
 msgstr "Tid %02d:%02d  Hastighet %s/s  Klar om %02u:%02u"
 
-#: src/sizeutil.c:30
-msgid "BYTES"
-msgstr "BYTE"
+#: src/sizeutil.c:31
+msgid "Unformatted Size"
+msgstr "Oformaterad storlek"
 
-#: src/sizeutil.c:69
-#, c-format
-msgid "%%%s"
-msgstr "%%%s"
+#: src/sizeutil.c:32
+msgid "Formatted Size, Without Unit"
+msgstr "Formaterad storlek, utan enhet"
 
-#: src/sizeutil.c:70
-#, c-format
-msgid "%%%s bytes"
-msgstr "%%%s byte"
+#: src/sizeutil.c:33
+msgid "Formatted Size, in Bytes"
+msgstr "Formaterad storlek, i byte"
 
-#: src/sizeutil.c:71
-#, c-format
-msgid "%%%s KB"
-msgstr "%%%s KB"
+#: src/sizeutil.c:33 src/sizeutil.c:159
+msgid "bytes"
+msgstr "byte"
 
-#: src/sizeutil.c:72
-#, c-format
-msgid "%%%s MB"
-msgstr "%%%s MB"
+#: src/sizeutil.c:34
+msgid "Formatted Size, in Kilobytes"
+msgstr "Formaterad storlek, i kilobyte"
 
-#: src/sizeutil.c:73
-#, c-format
-msgid "%%%s GB"
-msgstr "%%%s GB"
+#: src/sizeutil.c:34 src/sizeutil.c:163
+msgid "KB"
+msgstr "KB"
 
-#: src/sizeutil.c:164 src/sizeutil.c:211
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+#: src/sizeutil.c:35
+msgid "Formatted Size, in Megabytes"
+msgstr "Formaterad storlek, i megabyte"
 
-#: src/sizeutil.c:170 src/sizeutil.c:217
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+#: src/sizeutil.c:35 src/sizeutil.c:167
+msgid "MB"
+msgstr "MB"
 
-#: src/sizeutil.c:176 src/sizeutil.c:223
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+#: src/sizeutil.c:36
+msgid "Formatted Size, in Gigabytes"
+msgstr "Formaterad storlek, i gigabyte"
+
+#: src/sizeutil.c:36 src/sizeutil.c:171
+msgid "GB"
+msgstr "GB"
+
+#: src/sizeutil.c:37
+msgid "Formatted Size, in Terabytes"
+msgstr "Formaterad storlek, i terabyte"
+
+#: src/sizeutil.c:37 src/sizeutil.c:175
+msgid "TB"
+msgstr "TB"
+
+#: src/sizeutil.c:38
+msgid "Formatted Size, Automatic Unit"
+msgstr "Formaterad storlek, automatisk enhet"
 
 #: src/style_dialog.c:40
 msgid "Select Style"
-msgstr "Välj stil"
+msgstr "VÃ¤lj stil"
 
-#: src/styles.c:112
+#: src/styles.c:114
 msgid "Root"
 msgstr "Rot"
 
-#: src/styles.c:118 src/types.c:485 src/types.c:488
+#: src/styles.c:120 src/types.c:292 src/types.c:295
 msgid "Directory"
 msgstr "Katalog"
 
-#: src/styles.c:961
+#: src/styles.c:889
 msgid "New Style"
 msgstr "Ny stil"
 
-#: src/styles.c:961
+#: src/styles.c:889
 #, c-format
 msgid "New Style %u"
 msgstr "Ny stil %u"
 
-#: src/textview.c:152
+#: src/textview.c:190
 #, c-format
-msgid "Unable to convert text from native character set (%s) to UTF-8: %s"
-msgstr "Konvertering av text från teckenkodning %s till UTF-8 misslyckades: %s"
-
-#: src/textview.c:252 src/textview.c:353
-msgid "File reading"
-msgstr "Läsning"
+msgid ""
+"\n"
+"** Text conversion from charset '%s' failed, aborting."
+msgstr ""
+"\n"
+"** Textkonvertering frÃ¥n teckenuppsÃ¤ttningen '%s' misslyckades, avbryter."
 
-#: src/textview.c:419
+#: src/textview.c:405
 #, c-format
 msgid "Line %d (%.0f%%)"
 msgstr "Rad %d (%.0f%%)"
 
-#: src/textview.c:472
+#: src/textview.c:455
 msgid "Enter Line Number or Percentage:"
 msgstr "Ange radnummer eller procenttal"
 
-#: src/textview.c:478
+#: src/textview.c:461
 msgid "Goto"
-msgstr "Gå till"
+msgstr "GÃ¥ till"
 
-#: src/textview.c:613
+#: src/textview.c:596
 msgid "Enter Text to Search For (RE)"
-msgstr "Ange söktext (reguljärt uttryck)"
+msgstr "Ange sÃ¶ktext (reguljÃ¤rt uttryck)"
 
-#: src/textview.c:623
+#: src/textview.c:607
 msgid "Don't Span Newlines?"
 msgstr "Passera ej nyrad?"
 
-#: src/textview.c:629
+#: src/textview.c:613
 msgid "Search"
-msgstr "Sök"
+msgstr "SÃ¶k"
+
+#: src/types.c:287
+msgid "Unknown"
+msgstr "OkÃ¤nd"
 
-#: src/types.c:454
+#: src/types.c:572
 #, c-format
 msgid ""
 "Got SIGPIPE when writing to 'file' process (%s), it seems to have terminated "
 "prematurely."
 msgstr ""
-"Signalen SIGPIPE inträffade vid kommunikation med 'file'-processen (%s), det "
-"verkar som om 'file' oväntat har avslutats."
+"Signalen SIGPIPE intrÃ¤ffade vid kommunikation med 'file'-processen (%s), det "
+"verkar som om 'file' ovÃ¤ntat har avslutats."
 
-#: src/types.c:461
+#: src/types.c:578
 msgid "Unable to run spawn 'file' command: "
 msgstr "Kunde inte starta 'file'-kommandot: "
 
-#: src/types.c:480
-msgid "Unknown"
-msgstr "Okänd"
-
-#: src/window.c:82
+#: src/window.c:83
 msgid "Configure gentoo"
 msgstr "Konfigurera gentoo"
 
-#: src/window.c:89
+#: src/window.c:90
 msgid "Text Viewer"
 msgstr "Textvisare"
 
-#: src/window.c:200
+#: src/window.c:199
 msgid "Position"
 msgstr "Position"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Height"
-msgstr "Höjd"
+msgstr "HÃ¶jd"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "X"
 msgstr "X"
 
-#: src/window.c:201
+#: src/window.c:200
 msgid "Y"
 msgstr "Y"
 
-#: src/window.c:208
+#: src/window.c:207
 msgid "Set on Open?"
-msgstr "Sätt vid öppning?"
+msgstr "SÃ¤tt vid Ã¶ppning?"
 
-#: src/window.c:214
+#: src/window.c:213
 msgid "Update on Close?"
-msgstr "Uppdatera vid stängning?"
+msgstr "Uppdatera vid stÃ¤ngning?"
 
-#: src/window.c:245
+#: src/window.c:244
 msgid "Grab"
 msgstr "Plocka"
 
 #: src/xmlutil.c:225
 msgid "XML module emitted locale-dependant real number"
 msgstr "XML-modulen skrev ett locale-beroende reellt tal"
-
-#~ msgid "Pick Command ..."
-#~ msgstr "Välj kommando ..."
-
-#~ msgid "Clr"
-#~ msgstr "Töm"
-
-#~ msgid "%"
-#~ msgstr "%"
-
-#~ msgid ""
-#~ "Convert all characters in filename to either\n"
-#~ "all-lower or all-upper case."
-#~ msgstr ""
-#~ "Konvertera alla tecken i filnamnet till antingen bara gemener\n"
-#~ "(\"små bokstäver\") eller bara versaler (\"stora bokstäver\")."
-
-#~ msgid "Buffer Size for mmap()"
-#~ msgstr "Buffertstorlek för mmap()"
-
-#~ msgid "%s: Couldn't set text domain to \"%s\"\n"
-#~ msgstr "%s: Kunde inte sätta textdomänen till \"%s\"\n"
-
-#~ msgid "Top"
-#~ msgstr "Början"
-
-#~ msgid "Bottom"
-#~ msgstr "Slutet"
-
-#~ msgid "_Goto..."
-#~ msgstr "_Gå till..."
-
-#~ msgid "_Search..."
-#~ msgstr "_Sök..."
-
-#~ msgid "_Quit"
-#~ msgstr "St_äng"

gentoo-0.15.6.tar.bz2/src/Makefile.am -> gentoo-0.19.9.tar.gz/src/Makefile.am Changed

@@ -14,7 +14,7 @@
   cfg_errors.h\
   cfg_menus.h \
   cfg_module.h \
-  cfg_mount.h \
+  cfg_nag.h \
   cfg_paths.h \
   cfg_styles.h \
   cfg_types.h \
@@ -61,7 +61,7 @@
   cmdseq_dialog.h \
   color_dialog.h \
   configure.h \
-  convutil.h \
+  convstream.h \
   commands.h \
   controls.h \
   dialog.h \
@@ -79,13 +79,13 @@
   hash_dialog.h \
   icon_dialog.h \
   iconutil.h \
+  list_dialog.h \
   keyboard.h \
   menus.h \
   mntent_wrap.h \
   miscutil.h \
-  mount.h \
+  nag_dialog.h \
   odmultibutton.h \
-  options.h \
   overwrite.h \
   progress.h \
   queue.h \
@@ -110,7 +110,7 @@
   cfg_dirpane.c \
   cfg_errors.c\
   cfg_menus.c \
-  cfg_mount.c \
+  cfg_nag.c \
   cfg_paths.c \
   cfg_styles.c \
   cfg_types.c \
@@ -157,8 +157,8 @@
   cmdseq_dialog.c \
   color_dialog.c \
   configure.c \
-  convutil.c \
   controls.c \
+  convstream.c \
   dialog.c \
   dirhistory.c \
   dirpane.c \
@@ -174,12 +174,12 @@
   icon_dialog.c \
   iconutil.c \
   keyboard.c \
+  list_dialog.c \
   menus.c \
   miscutil.c \
   mntent_wrap.c \
-  mount.c \
+  nag_dialog.c \
   odmultibutton.c \
-  options.c \
   overwrite.c \
   progress.c \
   queue.c \
@@ -209,4 +209,4 @@
 
 bin_PROGRAMS=gentoo
 gentoo_SOURCES=$(headers) $(modules) $(graphics)
-gentoo_LDADD=@GTK_LIBS@ 
+gentoo_LDADD=@GTK_LIBS@ @MODULES_LIBS@

gentoo-0.15.6.tar.bz2/src/Makefile.in -> gentoo-0.19.9.tar.gz/src/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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.
@@ -20,8 +21,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -61,8 +63,8 @@
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am__objects_1 =
 am__objects_2 = buttons.$(OBJEXT) buttonlayout.$(OBJEXT) \
@@ -70,7 +72,7 @@
 	cfg_cmdcfg.$(OBJEXT) cfg_cmdseq.$(OBJEXT) \
 	cfg_controls.$(OBJEXT) cfg_dialogs.$(OBJEXT) \
 	cfg_dirpane.$(OBJEXT) cfg_errors.$(OBJEXT) cfg_menus.$(OBJEXT) \
-	cfg_mount.$(OBJEXT) cfg_paths.$(OBJEXT) cfg_styles.$(OBJEXT) \
+	cfg_nag.$(OBJEXT) cfg_paths.$(OBJEXT) cfg_styles.$(OBJEXT) \
 	cfg_types.$(OBJEXT) cfg_windows.$(OBJEXT) children.$(OBJEXT) \
 	cmd_about.$(OBJEXT) cmd_activate.$(OBJEXT) cmd_chmod.$(OBJEXT) \
 	cmd_chown.$(OBJEXT) cmd_configure.$(OBJEXT) cmd_copy.$(OBJEXT) \
@@ -87,24 +89,26 @@
 	cmd_viewtext.$(OBJEXT) cmdarg.$(OBJEXT) cmdgrab.$(OBJEXT) \
 	cmdparse.$(OBJEXT) cmdseq.$(OBJEXT) cmdseq_config.$(OBJEXT) \
 	cmdseq_dialog.$(OBJEXT) color_dialog.$(OBJEXT) \
-	configure.$(OBJEXT) convutil.$(OBJEXT) controls.$(OBJEXT) \
+	configure.$(OBJEXT) controls.$(OBJEXT) convstream.$(OBJEXT) \
 	dialog.$(OBJEXT) dirhistory.$(OBJEXT) dirpane.$(OBJEXT) \
 	dpformat.$(OBJEXT) errors.$(OBJEXT) events.$(OBJEXT) \
 	file.$(OBJEXT) fileutil.$(OBJEXT) gfam.$(OBJEXT) \
 	gentoo.$(OBJEXT) guiutil.$(OBJEXT) hash_dialog.$(OBJEXT) \
 	icon_dialog.$(OBJEXT) iconutil.$(OBJEXT) keyboard.$(OBJEXT) \
-	menus.$(OBJEXT) miscutil.$(OBJEXT) mntent_wrap.$(OBJEXT) \
-	mount.$(OBJEXT) odmultibutton.$(OBJEXT) options.$(OBJEXT) \
-	overwrite.$(OBJEXT) progress.$(OBJEXT) queue.$(OBJEXT) \
-	sizeutil.$(OBJEXT) strutil.$(OBJEXT) style_dialog.$(OBJEXT) \
-	styles.$(OBJEXT) textview.$(OBJEXT) types.$(OBJEXT) \
-	userinfo.$(OBJEXT) window.$(OBJEXT) xmlutil.$(OBJEXT)
+	list_dialog.$(OBJEXT) menus.$(OBJEXT) miscutil.$(OBJEXT) \
+	mntent_wrap.$(OBJEXT) nag_dialog.$(OBJEXT) \
+	odmultibutton.$(OBJEXT) overwrite.$(OBJEXT) progress.$(OBJEXT) \
+	queue.$(OBJEXT) sizeutil.$(OBJEXT) strutil.$(OBJEXT) \
+	style_dialog.$(OBJEXT) styles.$(OBJEXT) textview.$(OBJEXT) \
+	types.$(OBJEXT) userinfo.$(OBJEXT) window.$(OBJEXT) \
+	xmlutil.$(OBJEXT)
 am_gentoo_OBJECTS = $(am__objects_1) $(am__objects_2) $(am__objects_1)
 gentoo_OBJECTS = $(am_gentoo_OBJECTS)
 gentoo_DEPENDENCIES =
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -193,6 +197,8 @@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+MODULES_CFLAGS = @MODULES_CFLAGS@
+MODULES_LIBS = @MODULES_LIBS@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -202,9 +208,12 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 RANLIB = @RANLIB@
@@ -284,7 +293,7 @@
   cfg_errors.h\
   cfg_menus.h \
   cfg_module.h \
-  cfg_mount.h \
+  cfg_nag.h \
   cfg_paths.h \
   cfg_styles.h \
   cfg_types.h \
@@ -331,7 +340,7 @@
   cmdseq_dialog.h \
   color_dialog.h \
   configure.h \
-  convutil.h \
+  convstream.h \
   commands.h \
   controls.h \
   dialog.h \
@@ -349,13 +358,13 @@
   hash_dialog.h \
   icon_dialog.h \
   iconutil.h \
+  list_dialog.h \
   keyboard.h \
   menus.h \
   mntent_wrap.h \
   miscutil.h \
-  mount.h \
+  nag_dialog.h \
   odmultibutton.h \
-  options.h \
   overwrite.h \
   progress.h \
   queue.h \
@@ -380,7 +389,7 @@
   cfg_dirpane.c \
   cfg_errors.c\
   cfg_menus.c \
-  cfg_mount.c \
+  cfg_nag.c \
   cfg_paths.c \
   cfg_styles.c \
   cfg_types.c \
@@ -427,8 +436,8 @@
   cmdseq_dialog.c \
   color_dialog.c \
   configure.c \
-  convutil.c \
   controls.c \
+  convstream.c \
   dialog.c \
   dirhistory.c \
   dirpane.c \
@@ -444,12 +453,12 @@
   icon_dialog.c \
   iconutil.c \
   keyboard.c \
+  list_dialog.c \
   menus.c \
   miscutil.c \
   mntent_wrap.c \
-  mount.c \
+  nag_dialog.c \
   odmultibutton.c \
-  options.c \
   overwrite.c \
   progress.c \
   queue.c \
@@ -468,7 +477,7 @@
 # but also the logo for the About window.
 graphics = graphics
 gentoo_SOURCES = $(headers) $(modules) $(graphics)
-gentoo_LDADD = @GTK_LIBS@ 
+gentoo_LDADD = @GTK_LIBS@ @MODULES_LIBS@
 all: all-am
 
 .SUFFIXES:
@@ -482,9 +491,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -502,26 +511,41 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files"." = ""; dirs"." = 1 } \
+	  { d=$$3; if (dirsd != 1) { print "d", d; dirsd = 1 } \
+	    if ($$2 == $$4) filesd = filesd " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, filesd }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
@@ -546,7 +570,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_dirpane.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_errors.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_menus.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_mount.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_nag.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_paths.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_styles.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg_types.Po@am__quote@
@@ -594,7 +618,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color_dialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/configure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/controls.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convutil.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convstream.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirhistory.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirpane.Po@am__quote@
@@ -610,12 +634,12 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icon_dialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconutil.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyboard.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list_dialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menus.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/miscutil.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mntent_wrap.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nag_dialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/odmultibutton.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/options.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/overwrite.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progress.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/queue.Po@am__quote@
@@ -631,14 +655,14 @@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
@@ -655,7 +679,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -663,29 +687,34 @@
 	  done | \
 	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	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; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -706,13 +735,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -743,6 +776,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -763,6 +797,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -771,18 +807,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-binPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -819,6 +865,7 @@
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
 	uninstall-am uninstall-binPROGRAMS
 
+
 # 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:

gentoo-0.15.6.tar.bz2/src/buttonlayout.c -> gentoo-0.19.9.tar.gz/src/buttonlayout.c Changed

gentoo-0.15.6.tar.bz2/src/buttons.c -> gentoo-0.19.9.tar.gz/src/buttons.c Changed

@@ -370,7 +370,7 @@
 	if(btn != NULL)
 	{
 		if(label != NULL)
-			stu_strncpy(btn->labelface, label, sizeof btn->labelface);
+			g_strlcpy(btn->labelface, label, sizeof btn->labelface);
 		else
 			btn->labelface0 = '\0';
 	}
@@ -420,7 +420,7 @@
 	if(btn != NULL)
 	{
 		if(key != NULL)
-			stu_strncpy(btn->keyface, key, sizeof btn->keyface);
+			g_strlcpy(btn->keyface, key, sizeof btn->keyface);
 		else
 			btn->keyface0 = '\0';
 	}
@@ -499,7 +499,7 @@
 Button * btn_button_get(GtkWidget *wid)
 {
 	if(wid != NULL)
-		return gtk_object_get_data(GTK_OBJECT(wid), "button");
+		return g_object_get_data(G_OBJECT(wid), "button");
 	return NULL;
 }
 
@@ -566,7 +566,7 @@
 	if(btn != NULL)
 	{
 		if(tip != NULL)
-			stu_strncpy(btn->tooltip, tip, sizeof btn->tooltip);
+			g_strlcpy(btn->tooltip, tip, sizeof btn->tooltip);
 		else
 			btn->tooltip0 = '\0';
 	}
@@ -658,7 +658,7 @@
 	*b = temp;
 }
 
-/* 1998-0915 -	Write a copy of <src> into <dst>. */
+/* 1998-09-15 -	Write a copy of <src> into <dst>. */
 void btn_button_copy(Button *dst, Button *src)
 {
 	if((dst != NULL) && (src != NULL))
@@ -667,14 +667,14 @@
 
 		for(i = 0; i < BTN_FACES; i++)
 		{
-			stu_strncpy(dst->labeli, src->labeli, sizeof dst->labeli);
+			g_strlcpy(dst->labeli, src->labeli, sizeof dst->labeli);
 			btn_button_set_cmdseq(dst, i, btn_button_get_cmdseq(src, i));
-			stu_strncpy(dst->keyi, src->keyi, sizeof dst->keyi);
+			g_strlcpy(dst->keyi, src->keyi, sizeof dst->keyi);
 			dst->colori0 = src->colori0;
 			dst->colori1 = src->colori1;
 		}
-		stu_strncpy(dst->menu, src->menu, sizeof dst->menu);
-		stu_strncpy(dst->tooltip, src->tooltip, sizeof dst->tooltip);
+		g_strlcpy(dst->menu, src->menu, sizeof dst->menu);
+		g_strlcpy(dst->tooltip, src->tooltip, sizeof dst->tooltip);
 		dst->flags = src->flags;
 	}
 }
@@ -714,7 +714,7 @@
 	MainInfo	*min = user;
 	guint		face = od_multibutton_get_index(OD_MULTIBUTTON(wid));
 
-	btn = gtk_object_get_data(GTK_OBJECT(wid), "button");
+	btn = g_object_get_data(G_OBJECT(wid), "button");
 	if((min != NULL) && (btn != NULL) && (btn->cmdseqface != NULL))
 		csq_execute(min, btn->cmdseqface->str);
 }
@@ -725,7 +725,7 @@
 	Button		*btn;
 	gboolean	ret = FALSE;
 
-	if((widget != NULL) && ((btn = gtk_object_get_data(GTK_OBJECT(widget), "button")) != NULL))
+	if((widget != NULL) && ((btn = g_object_get_data(G_OBJECT(widget), "button")) != NULL))
 	{
 		const gchar	*lab;
 
@@ -749,7 +749,7 @@
 **		signal to <func>, passing it <user> on invocation.
 ** 1999-05-01 -	Rewritten; now builds an ODEmilButton instead, with multi-face support. Way cool.
 */
-static GtkWidget * button_build(MainInfo *min, Button *btn, gboolean partial, GtkSignalFunc func, gpointer user)
+static GtkWidget * button_build(MainInfo *min, Button *btn, gboolean partial, GCallback func, gpointer user)
 {
 	GtkWidget	*but;
 
@@ -758,10 +758,13 @@
 		gboolean	set = FALSE;
 		BtnFace		i;
 
+#if GTK_CHECK_VERSION(2, 2, 0)
+		gtk_widget_set_can_focus(but, FALSE);
+#else
 		GTK_WIDGET_UNSET_FLAGS(but, GTK_CAN_FOCUS);
-
-		gtk_object_set_data(GTK_OBJECT(but), "min", min);
-		gtk_object_set_data(GTK_OBJECT(but), "button", btn);
+#endif
+		g_object_set_data(G_OBJECT(but), "min", min);
+		g_object_set_data(G_OBJECT(but), "button", btn);
 
 		for(i = 0; i < BTN_FACES; i++)
 			set |= button_set_face(but, i);
@@ -776,34 +779,23 @@
 **		If the specified button doesn't use tooltips, don't do anything but
 **		return FALSE.
 */
-static gboolean button_tooltip(MainInfo *min, GtkTooltips *tt, Button *def, GtkWidget *btn)
+static gboolean button_tooltip(MainInfo *min, Button *def, GtkWidget *btn)
 {
 	if(btn_button_get_flags_boolean(def, BTF_SHOW_TOOLTIP) && (def->tooltip0 != '\0'))
 	{
-		gtk_tooltips_set_tip(tt, btn, def->tooltip, NULL);
+		gtk_widget_set_tooltip_text(btn, def->tooltip);
 		return TRUE;
 	}
 	return FALSE;
 }
 
-/* 1999-01-13 -	Destroy the ToolTips for this row, since the row is about to be destroyed. */
-static gint evt_brow_destroy(GtkWidget *wid, gpointer user)
-{
-	gtk_object_destroy(GTK_OBJECT(user));
-
-	return TRUE;
-}
-
 /* 1998-09-15 -	Build GUI representation of given row. */
-static GtkWidget * buttonrow_build(MainInfo *min, ButtonRow *brw, gboolean partial, GtkSignalFunc func, gpointer user)
+static GtkWidget * buttonrow_build(MainInfo *min, ButtonRow *brw, gboolean partial, GCallback func, gpointer user)
 {
 	GtkWidget	*hbox, *hbox2 = NULL, *btn;
-	GtkTooltips	*tt = NULL;
-	guint		i, keep_tt = 0U;
+	guint		i;
 
 	hbox = gtk_hbox_new(FALSE, 0);
-	if(!partial)
-		tt = gtk_tooltips_new();
 
 	for(i = 0; i < brw->width;)
 	{
@@ -815,8 +807,8 @@
 				if((btn = button_build(min, brw->button + i, partial, func, user)) != NULL)
 				{
 					if(!partial)
-						keep_tt |= button_tooltip(min, tt, brw->button + i, btn);
-					gtk_object_set_data(GTK_OBJECT(btn), "row", brw);
+						button_tooltip(min, brw->button + i, btn);
+					g_object_set_data(G_OBJECT(btn), "row", brw);
 					gtk_box_pack_start(GTK_BOX(hbox2), btn, FALSE, FALSE, 0);
 				}
 			}
@@ -830,19 +822,14 @@
 				if((btn = button_build(min, brw->button + i, partial, func, user)) != NULL)
 				{
 					if(!partial)
-						keep_tt |= button_tooltip(min, tt, brw->button + i, btn);
-					gtk_object_set_data(GTK_OBJECT(btn), "row", brw);
+						button_tooltip(min, brw->button + i, btn);
+					g_object_set_data(G_OBJECT(btn), "row", brw);
 					gtk_box_pack_start(GTK_BOX(hbox2), btn, TRUE, TRUE, 0);
 				}
 			}
 			gtk_box_pack_start(GTK_BOX(hbox), hbox2, TRUE, TRUE, 0);
 		}
 	}
-	if(keep_tt)
-		g_signal_connect(G_OBJECT(hbox), "destroy", G_CALLBACK(evt_brow_destroy), tt);
-	else if(tt != NULL)
-		gtk_object_destroy(GTK_OBJECT(tt));
-
 	return hbox;
 }
 
@@ -979,7 +966,7 @@
 
 	bsh = g_malloc(sizeof *bsh);
 	if(label != NULL)
-		stu_strncpy(bsh->label, label, sizeof bsh->label);
+		g_strlcpy(bsh->label, label, sizeof bsh->label);
 	bsh->height = 0;
 	bsh->visible = 0;
 	bsh->top_row = 0;
@@ -997,7 +984,7 @@
 	ButtonRow	*brw;
 
 	bsh = g_malloc(sizeof *bsh);
-	stu_strncpy(bsh->label, BTN_DEFAULT_SHEET, sizeof bsh->label);
+	g_strlcpy(bsh->label, BTN_DEFAULT_SHEET, sizeof bsh->label);
 	bsh->rows = NULL;
 	if((brw = btn_buttonrow_new_default(min)) != NULL)
 		btn_buttonsheet_append_row(bsh, brw);
@@ -1019,7 +1006,7 @@
 	guint		i;
 
 	bsh = g_malloc(sizeof *bsh);
-	stu_strncpy(bsh->label, "Shortcuts", sizeof bsh->label);
+	g_strlcpy(bsh->label, "Shortcuts", sizeof bsh->label);
 	bsh->rows = NULL;
 	for(i = 0; i < sizeof lab / sizeof *lab; i++)
 	{
@@ -1141,7 +1128,7 @@
 **		ben gtk_widget_show()n.
 ** 1999-05-12 -	Now wraps the vbox holding the sheet's rows in a ODScrolledBox widget. Nice.
 */
-static GtkWidget * buttonsheet_build(MainInfo *min, ButtonSheet *bsh, gboolean partial, GtkSignalFunc func, gpointer user)
+static GtkWidget * buttonsheet_build(MainInfo *min, ButtonSheet *bsh, gboolean partial, GCallback func, gpointer user)
 {
 	GtkWidget	*scbox, *vbox, *row;
 	GList		*iter;
@@ -1171,7 +1158,7 @@
 ** 1998-12-23 -	Added the <partial> argument so it's there when GTK+ 1.2.0 is released
 **		(if I live to see it). It's going to rule.
 */
-GtkWidget * btn_buttonsheet_build(MainInfo *min, ButtonInfo *bti, const gchar *label, gboolean partial, GtkSignalFunc func, gpointer user)
+GtkWidget * btn_buttonsheet_build(MainInfo *min, ButtonInfo *bti, const gchar *label, gboolean partial, GCallback func, gpointer user)
 {
 	GtkWidget	*sheet = NULL;
 	GList		*iter;
@@ -1179,7 +1166,7 @@
 	if(label == NULL)
 		label = BTN_DEFAULT_SHEET;
 	if(func == NULL)
-		func = GTK_SIGNAL_FUNC(evt_button_clicked);
+		func = G_CALLBACK(evt_button_clicked);
 	if(user == NULL)
 		user = min;
 	for(iter = bti->sheets; iter != NULL; iter = g_list_next(iter))
@@ -1197,7 +1184,7 @@
 **		button, everything is cool and we actually add the keyboard shortcut. If the
 **		widget is a hbox, we need to recurse.
 ** 1999-05-04 -	Adapted for new multi-face buttons. Now lets the keyboard module directly
-**		envoke the relevant command sequence, rather than going through an activation
+**		invoke the relevant command sequence, rather than going through an activation
 **		event. Saves the trouble of extending the kbd module to support multi-argument
 **		signals (which would be required for the activation event of ODEmilButton).
 */
@@ -1206,7 +1193,7 @@
 	Button		*btn;
 	MainInfo	*min = user;
 
-	if(OD_IS_MULTIBUTTON(wid) && ((btn = gtk_object_get_data(GTK_OBJECT(wid), "button")) != NULL))
+	if(OD_IS_MULTIBUTTON(wid) && ((btn = g_object_get_data(G_OBJECT(wid), "button")) != NULL))
 	{
 		const gchar	*key, *cmd;
 		guint		i;

gentoo-0.15.6.tar.bz2/src/buttons.h -> gentoo-0.19.9.tar.gz/src/buttons.h Changed

gentoo-0.15.6.tar.bz2/src/cfg_buttonlayout.c -> gentoo-0.19.9.tar.gz/src/cfg_buttonlayout.c Changed

@@ -43,7 +43,7 @@
 	{
 		P_ButtonLayout	*page = user;
 
-		btl_buttonlayout_set_right(page->edit, gtk_object_get_data(GTK_OBJECT(wid), "right") != NULL);
+		btl_buttonlayout_set_right(page->edit, g_object_get_data(G_OBJECT(wid), "right") != NULL);
 		page->modified = TRUE;
 	}
 }
@@ -54,7 +54,7 @@
 	{
 		P_ButtonLayout	*page = user;
 
-		btl_buttonlayout_set_separation(page->edit, GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(wid), "sep")));
+		btl_buttonlayout_set_separation(page->edit, GPOINTER_TO_INT(g_object_get_data(G_OBJECT(wid), "sep")));
 		page->modified = TRUE;
 	}
 }
@@ -91,10 +91,10 @@
 	{
 		page->posi = gtk_radio_button_new_with_label(group, _(plabi));
 		if(i == 1)
-			gtk_object_set_data(GTK_OBJECT(page->posi), "right", GINT_TO_POINTER(TRUE));
+			g_object_set_data(G_OBJECT(page->posi), "right", GINT_TO_POINTER(TRUE));
 		g_signal_connect(G_OBJECT(page->posi), "toggled", G_CALLBACK(evt_pos_toggle), page);
 		gtk_box_pack_start(GTK_BOX(vbox), page->posi, FALSE, FALSE, 0);
-		group = gtk_radio_button_group(GTK_RADIO_BUTTON(page->posi));
+		group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(page->posi));
 	}
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 	gtk_box_pack_start(GTK_BOX(page->vbox), frame, FALSE, FALSE, 0);
@@ -104,10 +104,10 @@
 	for(i = 0, group = NULL; i < sizeof slab / sizeof *slab; i++)
 	{
 		page->sepi = gtk_radio_button_new_with_label(group, _(slabi));
-		gtk_object_set_data(GTK_OBJECT(page->sepi), "sep", GINT_TO_POINTER(sepi));
+		g_object_set_data(G_OBJECT(page->sepi), "sep", GINT_TO_POINTER(sepi));
 		g_signal_connect(G_OBJECT(page->sepi), "toggled", G_CALLBACK(evt_sep_toggle), page);
 		gtk_box_pack_start(GTK_BOX(vbox), page->sepi, FALSE, FALSE, 0);
-		group = gtk_radio_button_group(GTK_RADIO_BUTTON(page->sepi));
+		group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(page->sepi));
 	}
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 	gtk_box_pack_start(GTK_BOX(page->vbox), frame, FALSE, FALSE, 0);

gentoo-0.15.6.tar.bz2/src/cfg_buttons.c -> gentoo-0.19.9.tar.gz/src/cfg_buttons.c Changed

@@ -98,7 +98,7 @@
 static void set_blocked_entry(GtkWidget *entry, const gchar *str, guint sig)
 {
 	if(sig > 0)
-		gtk_signal_handler_block(GTK_OBJECT(entry), sig);
+		g_signal_handler_block(G_OBJECT(entry), sig);
 
 	if(str != NULL)
 		gtk_entry_set_text(GTK_ENTRY(entry), str);
@@ -106,7 +106,7 @@
 		gtk_entry_set_text(GTK_ENTRY(entry), "");
 
 	if(sig > 0)
-		gtk_signal_handler_unblock(GTK_OBJECT(entry), sig);
+		g_signal_handler_unblock(G_OBJECT(entry), sig);
 }
 
 /* 1998-09-15 -	Reset all widgets to their most idle states. */
@@ -122,9 +122,9 @@
 		gtk_entry_set_text(GTK_ENTRY(page->defi.key), "");
 	}
 	gtk_entry_set_text(GTK_ENTRY(page->dtooltip), "");
-	gtk_signal_handler_block(GTK_OBJECT(page->dnarrow), page->dnarsig);
+	g_signal_handler_block(G_OBJECT(page->dnarrow), page->dnarsig);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->dnarrow), FALSE);
-	gtk_signal_handler_unblock(GTK_OBJECT(page->dnarrow), page->dnarsig);
+	g_signal_handler_unblock(G_OBJECT(page->dnarrow), page->dnarsig);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->dshowtip), FALSE);
 	gtk_widget_set_sensitive(page->dvbox, FALSE);
 	for(i = 0; i < sizeof page->bcmd / sizeof page->bcmd0; i++)
@@ -154,9 +154,9 @@
 			gtk_entry_set_text(GTK_ENTRY(page->dtooltip), str);
 		else
 			gtk_entry_set_text(GTK_ENTRY(page->dtooltip), "");
-		gtk_signal_handler_block(GTK_OBJECT(page->dnarrow), page->dnarsig);
+		g_signal_handler_block(G_OBJECT(page->dnarrow), page->dnarsig);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->dnarrow), btn_button_get_flags_boolean(but, BTF_NARROW));
-		gtk_signal_handler_unblock(GTK_OBJECT(page->dnarrow), page->dnarsig);
+		g_signal_handler_unblock(G_OBJECT(page->dnarrow), page->dnarsig);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->dshowtip), btn_button_get_flags_boolean(but, BTF_SHOW_TOOLTIP));
 	}
 	gtk_widget_set_sensitive(page->dvbox, TRUE);
@@ -175,7 +175,7 @@
 		gtk_widget_destroy(page->shvbox);
 	page->shvbox = NULL;
 
-	if((page->shvbox = btn_buttonsheet_build(page->min, &page->buttons, page->cur_sheet, TRUE, GTK_SIGNAL_FUNC(evt_button_clicked), page)) != NULL)
+	if((page->shvbox = btn_buttonsheet_build(page->min, &page->buttons, page->cur_sheet, TRUE, G_CALLBACK(evt_button_clicked), page)) != NULL)
 	{
 		gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(page->scwin), page->shvbox);
 		gtk_widget_show_all(page->shvbox);
@@ -258,7 +258,7 @@
 {
 	P_Buttons	*page = user;
 
-	switch(GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(wid))))
+	switch(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(wid), "index")))
 	{
 		case 0:
 			page->mode = BM_COPY;
@@ -329,7 +329,7 @@
 	if(page->sheet != NULL)
 	{
 		if(page->button != NULL)
-			row = gtk_object_get_data(GTK_OBJECT(page->button), "row");
+			row = g_object_get_data(G_OBJECT(page->button), "row");
 		btn_buttonsheet_insert_row(page->sheet, row, width);
 		set_mode_normal(page);
 		populate_scwin(page);
@@ -344,7 +344,7 @@
 	P_Buttons	*page = user;
 	ButtonRow	*row;
 
-	if((row = gtk_object_get_data(GTK_OBJECT(page->button), "row")) != NULL)
+	if((row = g_object_get_data(G_OBJECT(page->button), "row")) != NULL)
 	{
 		if(width != btn_buttonrow_get_width(row))	/* Don't call set_width() in vain. */
 		{
@@ -368,7 +368,7 @@
 	if(delta != -1 && delta != 1)
 		return;
 
-	if((row = gtk_object_get_data(GTK_OBJECT(page->button), "row")) != NULL)
+	if((row = g_object_get_data(G_OBJECT(page->button), "row")) != NULL)
 	{
 		page->modified = TRUE;
 		btn_buttonsheet_move_row(page->sheet, row, delta);
@@ -438,7 +438,7 @@
 {
 	if(dlg_dialog_sync_new_simple_wait(_("Really delete current button row?"), _("Please Confirm"), _("_Delete|_Cancel")) == DLG_POSITIVE)
 	{
-		btn_buttonsheet_delete_row(page->sheet, (ButtonRow *) gtk_object_get_data(GTK_OBJECT(page->button), "row"));
+		btn_buttonsheet_delete_row(page->sheet, (ButtonRow *) g_object_get_data(G_OBJECT(page->button), "row"));
 		set_mode_normal(page);
 		populate_scwin(page);
 		page->modified = TRUE;
@@ -454,10 +454,10 @@
 
 	if(page->button != NULL)
 	{
-		brw = gtk_object_get_data(GTK_OBJECT(page->button), "row");
+		brw = g_object_get_data(G_OBJECT(page->button), "row");
 		width = btn_buttonrow_get_width(brw);
 	}
-	switch(GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(wid))))
+	switch(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(wid), "index")))
 	{
 		case 0:			/* Add? */
 			width_dialog(_("Select Width for New Row"), width, add_row, page);
@@ -489,7 +489,7 @@
 
 	if((page != NULL) && (page->button != NULL))
 	{
-		face = GPOINTER_TO_UINT(gtk_object_get_data(GTK_OBJECT(wid), "face"));
+		face = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(wid), "face"));
 		if((text = gtk_entry_get_text(GTK_ENTRY(wid))) != NULL)
 		{
 			btn_button_set_label_widget(page->button, face, text);
@@ -509,7 +509,7 @@
 		const gchar	*text;
 		BtnFace		face;
 
-		face = (BtnFace) GPOINTER_TO_UINT(gtk_object_get_data(GTK_OBJECT(wid), "face"));
+		face = (BtnFace) GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(wid), "face"));
 		if((text = gtk_entry_get_text(GTK_ENTRY(wid))) != NULL)
 		{
 			btn_button_set_cmdseq(btn, face, text);
@@ -531,7 +531,7 @@
 		BtnFace		face;
 		const gchar	*csq;
 
-		face = (BtnFace) GPOINTER_TO_UINT(gtk_object_get_data(GTK_OBJECT(wid), "face"));
+		face = (BtnFace) GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(wid), "face"));
 		if((csq = csq_dialog_sync_new_wait(page->min, ccs_get_current())) != NULL)
 			gtk_entry_set_text(GTK_ENTRY(page->defface.cmdseq), csq);	/* Rely on "changed" signal. */
 	}
@@ -550,7 +550,7 @@
 		{
 			BtnFace	face;
 
-			face = (BtnFace) GPOINTER_TO_UINT(gtk_object_get_data(GTK_OBJECT(wid), "face"));
+			face = (BtnFace) GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(wid), "face"));
 			gtk_entry_set_text(GTK_ENTRY(wid), key);
 			btn_button_set_key(btn, face, gtk_entry_get_text(GTK_ENTRY(wid)));
 			page->modified = TRUE;
@@ -569,7 +569,7 @@
 	{
 		BtnFace	face;
 
-		face = (BtnFace) GPOINTER_TO_UINT(gtk_object_get_data(GTK_OBJECT(wid), "face"));
+		face = (BtnFace) GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(wid), "face"));
 		gtk_entry_set_text(GTK_ENTRY(page->defface.key), "");
 		btn_button_set_key(btn, face, NULL);
 		page->modified = TRUE;
@@ -677,34 +677,35 @@
 
 	label = gtk_label_new(_("Label"));
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1,  0,0,0,0);
-	def->label = gtk_entry_new_with_max_length(BTN_LABEL_SIZE - 1);
-	gtk_object_set_data(GTK_OBJECT(def->label), "face", GUINT_TO_POINTER(face));
+	def->label = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(def->label), BTN_LABEL_SIZE - 1);
+	g_object_set_data(G_OBJECT(def->label), "face", GUINT_TO_POINTER(face));
 	def->label_sig = g_signal_connect(G_OBJECT(def->label), "changed", G_CALLBACK(evt_label_changed), page);
 	gtk_table_attach(GTK_TABLE(table), def->label, 1, 3, 0, 1,  GTK_EXPAND|GTK_FILL,0,0,0);
 
 	label = gtk_label_new(_("Command"));
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2,  0,0,0,0);
 	def->cmdseq = gtk_entry_new();
-	gtk_object_set_data(GTK_OBJECT(def->cmdseq), "face", GUINT_TO_POINTER(face));
+	g_object_set_data(G_OBJECT(def->cmdseq), "face", GUINT_TO_POINTER(face));
 	def->cmdseq_sig = g_signal_connect(G_OBJECT(def->cmdseq), "changed", G_CALLBACK(evt_cmdseq_changed), page);
 	gtk_table_attach(GTK_TABLE(table), def->cmdseq, 1, 2, 1, 2,  GTK_EXPAND|GTK_FILL,0,0,0);
-	btn = gui_details_button_new(min->gui->window->window);
-	gtk_object_set_data(GTK_OBJECT(btn), "face", GUINT_TO_POINTER(face));
+	btn = gui_details_button_new();
+	g_object_set_data(G_OBJECT(btn), "face", GUINT_TO_POINTER(face));
 	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(evt_cmdseq_pick_clicked), page);
 	gtk_table_attach(GTK_TABLE(table), btn, 2, 3, 1, 2,  GTK_FILL,0,0,0);
 
 	label = gtk_label_new(_("Key"));
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3,  0,0,0,0);
 	def->key = gtk_entry_new();
-	gtk_entry_set_editable(GTK_ENTRY(def->key), FALSE);
-	gtk_object_set_data(GTK_OBJECT(def->key), "face", GUINT_TO_POINTER(face));
+	gtk_editable_set_editable(GTK_EDITABLE(def->key), FALSE);
+	g_object_set_data(G_OBJECT(def->key), "face", GUINT_TO_POINTER(face));
 	g_signal_connect(G_OBJECT(def->key), "key_press_event", G_CALLBACK(evt_key_press), page);
 	gtk_table_attach(GTK_TABLE(table), def->key, 1, 2, 2, 3,  GTK_EXPAND|GTK_FILL,0,0,0);
 
 	btn = gtk_button_new();
 	img = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU);
 	gtk_button_set_image(GTK_BUTTON(btn), img);
-	gtk_object_set_data(GTK_OBJECT(btn), "face", GUINT_TO_POINTER(face));
+	g_object_set_data(G_OBJECT(btn), "face", GUINT_TO_POINTER(face));
 	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(evt_key_clear_clicked), page);
 	gtk_table_attach(GTK_TABLE(table), btn, 2, 3, 2, 3,  GTK_FILL,0,0,0);
 
@@ -729,12 +730,10 @@
 	gtk_container_add(GTK_CONTAINER(def->frame), table);
 }
 
-static void evt_sheet_activate(GtkWidget *wid, gpointer user)
+static void evt_sheet_activate(GtkWidget *wid, guint index, gpointer user)
 {
 	P_Buttons	*page = user;
-	guint		index;
 
-	index = GPOINTER_TO_UINT(gtk_object_get_user_data(GTK_OBJECT(wid)));
 	if(index == 0U)
 		page->cur_sheet = NULL;
 	else
@@ -749,7 +748,7 @@
 	const gchar	*mlab = { N_("Default"), N_("Shortcuts"), NULL },
 			*blab = { N_("Copy To"), N_("Copy Colors To"), N_("Swap With"), N_("Clear") },
 			*rlab = { N_("Add Row..."), N_("Row Width..."), N_("Up"), N_("Down"), N_("Delete Row") };
-	GtkWidget	*hbox, *menu, *optm, *sep, *label, *frame;
+	GtkWidget	*hbox, *optm, *sep, *label, *frame;
 	guint		i;
 	gint		expand;
 
@@ -761,9 +760,7 @@
 	hbox = gtk_hbox_new(FALSE, 0);
 	label = gtk_label_new(_("Sheet"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	optm = gtk_option_menu_new();
-	menu = gui_build_menu(mlab, GTK_SIGNAL_FUNC(evt_sheet_activate), page);
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optm), menu);
+	optm = gui_build_combo_box(mlab, G_CALLBACK(evt_sheet_activate), page);
 	gtk_box_pack_start(GTK_BOX(hbox), optm, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(page->vbox), hbox, FALSE, FALSE, 0);
 
@@ -784,7 +781,8 @@
 	hbox = gtk_hbox_new(FALSE, 0);
 	label = gtk_label_new(_("Tooltip"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	page->dtooltip = gtk_entry_new_with_max_length(BTN_TOOLTIP_SIZE - 1);
+	page->dtooltip = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(page->dtooltip), BTN_TOOLTIP_SIZE - 1);
 	g_signal_connect(G_OBJECT(page->dtooltip), "changed", G_CALLBACK(evt_dtooltip_changed), page);
 	gtk_box_pack_start(GTK_BOX(hbox), page->dtooltip, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(page->dvbox), hbox, FALSE, FALSE, 0);
@@ -807,7 +805,7 @@
 	for(i = 0; i < sizeof page->bcmd / sizeof page->bcmd0; i++)
 	{
 		page->bcmdi = gtk_button_new_with_label(_(blabi));
-		gtk_object_set_user_data(GTK_OBJECT(page->bcmdi), GINT_TO_POINTER(i));
+		g_object_set_data(G_OBJECT(page->bcmdi), "index", GINT_TO_POINTER(i));
 		g_signal_connect(G_OBJECT(page->bcmdi), "clicked", G_CALLBACK(evt_bcmd_clicked), page);
 		gtk_box_pack_start(GTK_BOX(hbox), page->bcmdi, TRUE, TRUE, 0);
 	}
@@ -823,7 +821,7 @@
 			page->rcmdi = gui_arrow_button_new(i == 2 ? GTK_ARROW_UP : GTK_ARROW_DOWN);
 		else
 			page->rcmdi = gtk_button_new_with_label(_(rlabi));
-		gtk_object_set_user_data(GTK_OBJECT(page->rcmdi), GINT_TO_POINTER(i));
+		g_object_set_data(G_OBJECT(page->rcmdi), "index", GINT_TO_POINTER(i));
 		g_signal_connect(G_OBJECT(page->rcmdi), "clicked", G_CALLBACK(evt_rcmd_clicked), page);
 		expand = (i == 0) || (i == sizeof page->rcmd / sizeof page->rcmd0 - 1);
 		gtk_box_pack_start(GTK_BOX(hbox), page->rcmdi, expand, TRUE, expand ? 5 : 1);
@@ -832,6 +830,9 @@
 
 	cfg_tree_level_begin(_("Buttons"));
 	cfg_tree_level_append(_("Definitions"), page->vbox);
+
+	gtk_combo_box_set_active(GTK_COMBO_BOX(optm), 0);	/* Do this last, so all handlers can run. */
+
 	return NULL;
 }

gentoo-0.15.6.tar.bz2/src/cfg_cmdseq.c -> gentoo-0.19.9.tar.gz/src/cfg_cmdseq.c Changed

@@ -66,7 +66,6 @@
 	GtkWidget	*dview;		/* Tree view for the definition. */
 	GtkWidget	*dhbox;		/* Hbox for type, definition, and pick button. */
 	GtkWidget	*dtype;		/* Type option menu, select built-in/external. */
-	GtkWidget	*dtmenu;	/* The actual menu for type selection. */
 	GtkWidget	*ddef;		/* Row definition. */
 	GtkWidget	*dpick;		/* Pick button, for definition help. */
 
@@ -106,6 +105,7 @@
 
 static void	set_row_widgets(P_CmdSeq *page);
 static void	reset_row_widgets(P_CmdSeq *page);
+static void	evt_type_selected(GtkWidget *wid, guint index, gpointer user);
 
 /* ----------------------------------------------------------------------------------------- */
 
@@ -226,9 +226,9 @@
 	gtk_list_store_clear(page->dstore);
 	g_signal_handler_unblock(G_OBJECT(page->dstore), page->sig_delete);
 
-	gtk_option_menu_set_history(GTK_OPTION_MENU(page->dtype), 0);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(page->dtype), 0);
 	gtk_entry_set_text(GTK_ENTRY(page->ddef), "");
-	gtk_notebook_set_page(GTK_NOTEBOOK(page->dextra), 0);
+	gtk_notebook_set_current_page(GTK_NOTEBOOK(page->dextra), 0);
 	reset_row_widgets(page);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->drepeat), FALSE);
 	gtk_widget_set_sensitive(page->dframe, FALSE);
@@ -323,12 +323,12 @@
 /* 1998-09-27 -	Set general flag widgets in <pxeg> to match <flags>. */
 static void set_cx_g_flags(PXE_General *pxeg, guint32 flags)
 {
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pxeg->runbg), flags & CGF_RUNINBG);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pxeg->killprev), flags & CGF_KILLPREV);
-	gtk_widget_set_sensitive(pxeg->killprev, flags & CGF_RUNINBG);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pxeg->graboutput), flags & CGF_GRABOUTPUT);
-	gtk_widget_set_sensitive(pxeg->survive, flags & CGF_RUNINBG);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pxeg->survive), flags & CGF_SURVIVE);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pxeg->runbg), (flags & CGF_RUNINBG) != 0);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pxeg->killprev), (flags & CGF_KILLPREV) != 0);
+	gtk_widget_set_sensitive(pxeg->killprev, (flags & CGF_RUNINBG) != 0);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pxeg->graboutput), (flags & CGF_GRABOUTPUT) != 0);
+	gtk_widget_set_sensitive(pxeg->survive, (flags & CGF_RUNINBG) != 0);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pxeg->survive), (flags & CGF_SURVIVE) != 0);
 }
 
 /* 1999-03-09 -	Set visual state of before/after checkbuttons, according to <flags>. Sets for
@@ -340,8 +340,8 @@
 	{
 		guint	st_src = FALSE, st_dst = FALSE;		/* Guess a few states. */
 
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pxbaf->reqsel_src), flags & CBAF_REQSEL_SOURCE);
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pxbaf->reqsel_dst), flags & CBAF_REQSEL_DEST);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pxbaf->reqsel_src), (flags & CBAF_REQSEL_SOURCE) != 0);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pxbaf->reqsel_dst), (flags & CBAF_REQSEL_DEST) != 0);
 		if(flags & CBAF_CD_SOURCE)
 			st_src = TRUE;
 		else if(flags & CBAF_CD_DEST)
@@ -351,8 +351,8 @@
 	}
 	else			/* Set "after" flags, i.e. rescan source IOR dest. */
 	{
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pxbaf->rssrc), flags & CBAF_RESCAN_SOURCE);
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pxbaf->rsdst), flags & CBAF_RESCAN_DEST);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pxbaf->rssrc), (flags & CBAF_RESCAN_SOURCE) != 0);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pxbaf->rsdst), (flags & CBAF_RESCAN_DEST) != 0);
 	}
 }
 
@@ -360,11 +360,12 @@
 static void set_cx_external_widgets(P_CmdSeq *page)
 {
 	CmdRow	*row;
+	CX_Ext	*ext;
 
 	if((row = cmdrow_get_selected(page, NULL)) == NULL)
 		return;
 
-	CX_Ext	*ext = &row->extra.external;
+	ext = &row->extra.external;
 
 	set_cx_g_flags(&page->px_external.gflags, ext->gflags);
 
@@ -375,17 +376,19 @@
 /* 1998-09-27 -	Set up widgets for row, assuming there is a row selected. */
 static void set_row_widgets(P_CmdSeq *page)
 {
-	guint	i;
-
 	CmdRow	*row;
+	guint	i;
 
 	if((row = cmdrow_get_selected(page, NULL)) == NULL)
 		return;
 	for(i = 1; i < sizeof page->dbtn / sizeof page->dbtn0; i++)
 		gtk_widget_set_sensitive(page->dbtni, TRUE);
-	gtk_option_menu_set_history(GTK_OPTION_MENU(page->dtype), row->type);
+	gui_combo_box_set_blocked(page->dtype, TRUE);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(page->dtype), row->type);
+	gui_combo_box_set_blocked(page->dtype, FALSE);
+
 	gtk_entry_set_text(GTK_ENTRY(page->ddef), row->def->str);
-	gtk_notebook_set_page(GTK_NOTEBOOK(page->dextra), row->type);
+	gtk_notebook_set_current_page(GTK_NOTEBOOK(page->dextra), row->type);
 	gtk_widget_set_sensitive(page->dhbox,  TRUE);
 	gtk_widget_set_sensitive(page->dextra, TRUE);
 	gtk_widget_set_sensitive(page->dframe, TRUE);
@@ -561,20 +564,18 @@
 /* ----------------------------------------------------------------------------------------- */
 
 /* 1998-09-26 -	User choose a new type for the current row. */
-static void evt_type_selected(GtkWidget *wid, gpointer user)
+static void evt_type_selected(GtkWidget *wid, guint index, gpointer user)
 {
 	P_CmdSeq	*page = user;
 	CmdRow		*row;
 	GtkTreeIter	iter;
-	CRType		type;
 
 	if((row = cmdrow_get_selected(page, &iter)) == NULL)
 		return;
 
-	type = (CRType) gtk_object_get_user_data(GTK_OBJECT(wid));
-	csq_cmdrow_set_type(row, type);
+	csq_cmdrow_set_type(row, (CRType) index);
 	gtk_list_store_set(page->dstore, &iter, DEF_COLUMN_TYPE, csq_cmdrow_type_to_string(row->type), -1);
-	gtk_notebook_set_page(GTK_NOTEBOOK(page->dextra), type);
+	gtk_notebook_set_current_page(GTK_NOTEBOOK(page->dextra), (CRType) index);
 	page->modified = TRUE;
 }
 
@@ -642,6 +643,14 @@
 					"Ph",	N_("Path to home directory"),
 					"Pl",	N_("Path of left pane"),
 					"Pr",	N_("Path of right pane"),
+					"u",	N_("URI of first selected"),
+					"uu",	N_("URI of first selected, unselect"),
+					"uQ",	N_("URI of first selected, no quotes"),
+					"U",	N_("URIs of all selected"),
+					"Uu",	N_("URIs of all selected, unselect"),
+					"UQ",	N_("URIs of all selected, no quotes"),
+					"UuQ",	N_("URIs of all selected, unselect, no quotes"),
+					"ud",	N_("URI of first selected (destination pane)"),
 					"Ic:\"label\"=\"choice1\",...",	N_("Input combo box"),
 					"Im:\"label\"=\"text1:choice1\",...",	N_("Input using menu"),
 					"Is:\"label\"=\"default\"",	N_("Input string"),
@@ -684,11 +693,15 @@
 			gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, &code, -1);
 			if(code != NULL)
 			{
+				gint	pos;
+				gsize	len;
+
 				if(*code == '\\')
-					g_snprintf(buf, sizeof buf, "%s", code);
+					len = g_snprintf(buf, sizeof buf, "%s", code);
 				else
-					g_snprintf(buf, sizeof buf, " {%s}", code);
-				gtk_entry_append_text(GTK_ENTRY(page->ddef), buf);
+					len = g_snprintf(buf, sizeof buf, " {%s}", code);
+				pos = gtk_entry_get_text_length(GTK_ENTRY(page->ddef));
+				gtk_editable_insert_text(GTK_EDITABLE(page->ddef), buf, len, &pos);
 				g_free(code);
 			}
 		}
@@ -736,7 +749,7 @@
 	gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(page->view), path, NULL, TRUE, 0.5f, 0.0f);
 	gtk_tree_path_free(path);
 
-	gtk_entry_select_region(GTK_ENTRY(page->name), 0, -1);
+	gtk_editable_select_region(GTK_EDITABLE(page->name), 0, -1);
 	gtk_widget_grab_focus(page->name);
 }
 
@@ -770,7 +783,7 @@
 static void evt_gf_clicked(GtkWidget *wid, gpointer user)
 {
 	P_CmdSeq	*page = user;
-	guint32		flags = GPOINTER_TO_UINT(gtk_object_get_user_data(GTK_OBJECT(wid)));
+	guint32		flags = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(wid), "user"));
 	CmdSeq		*cs;
 	CmdRow		*row;
 
@@ -799,21 +812,21 @@
 
 	hbox = gtk_hbox_new(FALSE, 0);
 	pxg->runbg = gtk_check_button_new_with_label(_("Run in Background?"));
-	gtk_object_set_user_data(GTK_OBJECT(pxg->runbg), GINT_TO_POINTER(CGF_RUNINBG));
+	g_object_set_data(G_OBJECT(pxg->runbg), "user", GINT_TO_POINTER(CGF_RUNINBG));
 	g_signal_connect(G_OBJECT(pxg->runbg), "clicked", G_CALLBACK(evt_gf_clicked), page);
 	gtk_box_pack_start(GTK_BOX(hbox), pxg->runbg, FALSE, FALSE, 0);
 	pxg->killprev = gtk_check_button_new_with_label(_("Kill Previous Instance?"));
-	gtk_object_set_user_data(GTK_OBJECT(pxg->killprev), GINT_TO_POINTER(CGF_KILLPREV));
+	g_object_set_data(G_OBJECT(pxg->killprev), "user", GINT_TO_POINTER(CGF_KILLPREV));
 	g_signal_connect(G_OBJECT(pxg->killprev), "clicked", G_CALLBACK(evt_gf_clicked), page);
 	gtk_box_pack_start(GTK_BOX(hbox), pxg->killprev, FALSE, FALSE, 0);
 	pxg->survive = gtk_check_button_new_with_label(_("Survive Quit?"));
-	gtk_object_set_user_data(GTK_OBJECT(pxg->survive), GINT_TO_POINTER(CGF_SURVIVE));
+	g_object_set_data(G_OBJECT(pxg->survive), "user", GINT_TO_POINTER(CGF_SURVIVE));
 	g_signal_connect(G_OBJECT(pxg->survive), "clicked", G_CALLBACK(evt_gf_clicked), page);
 	gtk_box_pack_start(GTK_BOX(hbox), pxg->survive, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(pxg->vbox), hbox, FALSE, FALSE, 0);
 
 	pxg->graboutput = gtk_check_button_new_with_label(_("Capture Output?"));
-	gtk_object_set_user_data(GTK_OBJECT(pxg->graboutput), GINT_TO_POINTER(CGF_GRABOUTPUT));
+	g_object_set_data(G_OBJECT(pxg->graboutput), "user", GINT_TO_POINTER(CGF_GRABOUTPUT));
 	g_signal_connect(G_OBJECT(pxg->graboutput), "clicked", G_CALLBACK(evt_gf_clicked), page);
 	gtk_box_pack_start(GTK_BOX(pxg->vbox), pxg->graboutput, FALSE, FALSE, 0);
 }
@@ -828,7 +841,7 @@
 	if(!get_selections(page, NULL, &row))
 		return;
 
-	mask = GPOINTER_TO_UINT(gtk_object_get_user_data(GTK_OBJECT(wid)));
+	mask = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(wid), "user"));
 	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wid)))
 		row->extra.external.baflags0 |= mask;
 	else
@@ -852,7 +865,7 @@
 		return;
 
 	/* Figure out if we're in source or dest (same handler). */
-	if(gtk_object_get_data(GTK_OBJECT(wid), "destination"))
+	if(g_object_get_data(G_OBJECT(wid), "destination"))
 	{
 		other = page->px_external.baf.cdsrc;
 		mask  = CBAF_CD_DEST;
@@ -876,7 +889,7 @@
 {
 	P_CmdSeq	*page = user;
 	CmdRow		*row;
-	guint32		mask = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(wid)));
+	guint32		mask = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(wid), "user"));
 
 	if(!get_selections(page, NULL, &row))
 		return;
@@ -893,7 +906,7 @@
 */
 static void build_px_baf(P_CmdSeq *page, PXE_BAF *pxbaf)
 {
-	GtkWidget	*vbox;
+	GtkWidget	*vbox, *hbox;
 
 	pxbaf->hbox = gtk_hbox_new(FALSE, 0);
 
@@ -901,32 +914,34 @@
 	vbox = gtk_vbox_new(FALSE, 0);
 
 	pxbaf->reqsel_src = gtk_check_button_new_with_label(_("Require Source Selection?"));
-	gtk_object_set_user_data(GTK_OBJECT(pxbaf->reqsel_src), GINT_TO_POINTER(CBAF_REQSEL_SOURCE));
+	g_object_set_data(G_OBJECT(pxbaf->reqsel_src), "user", GINT_TO_POINTER(CBAF_REQSEL_SOURCE));
 	g_signal_connect(G_OBJECT(pxbaf->reqsel_src), "clicked", G_CALLBACK(evt_baf_reqsel_clicked), page);
 	gtk_box_pack_start(GTK_BOX(vbox), pxbaf->reqsel_src, TRUE, TRUE, 0);
 	pxbaf->reqsel_dst = gtk_check_button_new_with_label(_("Require Destination Selection?"));
-	gtk_object_set_user_data(GTK_OBJECT(pxbaf->reqsel_dst), GINT_TO_POINTER(CBAF_REQSEL_DEST));
+	g_object_set_data(G_OBJECT(pxbaf->reqsel_dst), "user", GINT_TO_POINTER(CBAF_REQSEL_DEST));
 	g_signal_connect(G_OBJECT(pxbaf->reqsel_dst), "clicked", G_CALLBACK(evt_baf_reqsel_clicked), page);
 	gtk_box_pack_start(GTK_BOX(vbox), pxbaf->reqsel_dst, TRUE, TRUE, 0);
 
+	hbox = gtk_hbox_new(TRUE, 0);
 	pxbaf->cdsrc = gtk_check_button_new_with_label(_("CD Source?"));
 	g_signal_connect(G_OBJECT(pxbaf->cdsrc), "clicked", G_CALLBACK(evt_baf_cd_clicked), page);
-	gtk_box_pack_start(GTK_BOX(vbox), pxbaf->cdsrc, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), pxbaf->cdsrc, TRUE, TRUE, 0);
 	pxbaf->cddst = gtk_check_button_new_with_label(_("CD Destination?"));
-	gtk_object_set_data(GTK_OBJECT(pxbaf->cddst), "destination", GINT_TO_POINTER(1));	/* Just a silly flag. */
+	g_object_set_data(G_OBJECT(pxbaf->cddst), "destination", GINT_TO_POINTER(1));	/* Just a silly flag. */
 	g_signal_connect(G_OBJECT(pxbaf->cddst), "clicked", G_CALLBACK(evt_baf_cd_clicked), page);
-	gtk_box_pack_start(GTK_BOX(vbox), pxbaf->cddst, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), pxbaf->cddst, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
 	gtk_container_add(GTK_CONTAINER(pxbaf->bframe), vbox);
 	gtk_box_pack_start(GTK_BOX(pxbaf->hbox), pxbaf->bframe, TRUE, TRUE, 0);
 
 	pxbaf->aframe = gtk_frame_new(_("After Execution"));
 	vbox = gtk_vbox_new(FALSE, 0);
 	pxbaf->rssrc = gtk_check_button_new_with_label(_("Rescan Source?"));
-	gtk_object_set_user_data(GTK_OBJECT(pxbaf->rssrc), GINT_TO_POINTER(CBAF_RESCAN_SOURCE));
+	g_object_set_data(G_OBJECT(pxbaf->rssrc), "user", GINT_TO_POINTER(CBAF_RESCAN_SOURCE));
 	g_signal_connect(G_OBJECT(pxbaf->rssrc), "clicked", G_CALLBACK(evt_baf_rescan_clicked), page);
 	gtk_box_pack_start(GTK_BOX(vbox), pxbaf->rssrc, TRUE, TRUE, 0);
 	pxbaf->rsdst = gtk_check_button_new_with_label(_("Rescan Destination?"));
-	gtk_object_set_user_data(GTK_OBJECT(pxbaf->rsdst), GINT_TO_POINTER(CBAF_RESCAN_DEST));
+	g_object_set_data(G_OBJECT(pxbaf->rsdst), "user", GINT_TO_POINTER(CBAF_RESCAN_DEST));
 	g_signal_connect(G_OBJECT(pxbaf->rsdst), "clicked", G_CALLBACK(evt_baf_rescan_clicked), page);
 	gtk_box_pack_start(GTK_BOX(vbox), pxbaf->rsdst, TRUE, TRUE, 0);
 	gtk_container_add(GTK_CONTAINER(pxbaf->aframe), vbox);
@@ -977,7 +992,8 @@
 	page->nhbox = gtk_hbox_new(FALSE, 0);
 	label = gtk_label_new(_("Name"));
 	gtk_box_pack_start(GTK_BOX(page->nhbox), label, FALSE, FALSE, 0);
-	page->name = gtk_entry_new_with_max_length(CSQ_NAME_SIZE - 1);
+	page->name = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(page->name), CSQ_NAME_SIZE - 1);
 	g_signal_connect(G_OBJECT(page->name), "changed", G_CALLBACK(evt_name_changed), page);
 	gtk_box_pack_start(GTK_BOX(page->nhbox), page->name, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), page->nhbox, FALSE, FALSE, 0);
@@ -1016,14 +1032,12 @@
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5);
 
 	page->dhbox = gtk_hbox_new(FALSE, 0);
-	page->dtmenu = gui_build_menu(tlab, GTK_SIGNAL_FUNC(evt_type_selected), page);
-	page->dtype = gtk_option_menu_new();
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(page->dtype), page->dtmenu);
+	page->dtype = gui_build_combo_box(tlab, G_CALLBACK(evt_type_selected), page);
 	gtk_box_pack_start(GTK_BOX(page->dhbox), page->dtype, FALSE, FALSE, 0);
 	page->ddef = gtk_entry_new();
 	g_signal_connect(G_OBJECT(page->ddef), "changed", G_CALLBACK(evt_def_changed), page);
 	gtk_box_pack_start(GTK_BOX(page->dhbox), page->ddef, TRUE, TRUE, 0);
-	page->dpick = gui_details_button_new(min->gui->window->window);
+	page->dpick = gui_details_button_new();
 	g_signal_connect(G_OBJECT(page->dpick), "clicked", G_CALLBACK(evt_pick_clicked), page);
 	gtk_box_pack_start(GTK_BOX(page->dhbox), page->dpick, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), page->dhbox, FALSE, FALSE, 0);

gentoo-0.15.6.tar.bz2/src/cfg_controls.c -> gentoo-0.19.9.tar.gz/src/cfg_controls.c Changed

@@ -62,8 +62,6 @@
 	GtkWidget	*cmccmd;		/* Entry widget for Click-M-Click command. */
 	GtkWidget	*cmcdelay;		/* HScale widget for cmc delay. */
 
-	GtkWidget	*pathcmd;		/* Entry widget for path-rmb command. */
-
 	GtkWidget	*nonumlock;		/* Ignore numlock check button. */
 
 	MainInfo	*min;			/* This is handy sometimes. */
@@ -124,8 +122,6 @@
 	cmd = ctrl_clickmclick_get_cmdseq(page->ctrlinfo);
 	gtk_entry_set_text(GTK_ENTRY(page->cmccmd), cmd ? cmd : "");
 	gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(page->cmcdelay)), ctrl_clickmclick_get_delay(page->ctrlinfo));
-	cmd = ctrl_general_get_cmdseq(page->ctrlinfo, CTRL_GENERAL_PATH_RMB);
-	gtk_entry_set_text(GTK_ENTRY(page->pathcmd), cmd ? cmd : "");
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->nonumlock), ctrl_numlock_ignore_get(page->ctrlinfo));
 }
 
@@ -222,7 +218,7 @@
 		ctrl_key_set_keyname(page->ctrlinfo, key, keyname);
 		gtk_list_store_set(GTK_LIST_STORE(model), &iter, 0, keyname, -1);
 		gtk_entry_set_text(GTK_ENTRY(page->kdkey), keyname);
-		gtk_signal_emit_stop_by_name(GTK_OBJECT(wid), "key_press_event");
+		g_signal_stop_emission_by_name(G_OBJECT(wid), "key_press_event");
 		page->modified = TRUE;
 	}
 	return TRUE;
@@ -516,35 +512,6 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 2004-04-25 -	Track editing of path-rmb command. */
-static void evt_pathcmd_changed(GtkWidget *wid, gpointer user)
-{
-	P_Controls	*page =  user;
-
-	if(page != NULL)
-	{
-		const gchar *text = gtk_entry_get_text(GTK_ENTRY(wid));
-
-		ctrl_general_set_cmdseq(page->ctrlinfo, CTRL_GENERAL_PATH_RMB, text);
-		page->modified = TRUE;
-	}
-}
-
-/* 2004-04-25 -	Help user pick a path-rmb command. */
-static void evt_pathcmd_pick_clicked(GtkWidget *wid, gpointer user)
-{
-	P_Controls	*page = user;
-
-	if(page != NULL)
-	{
-		const gchar *cmd = csq_dialog_sync_new_wait(page->min, ccs_get_current());
-		if(cmd != NULL)
-			gtk_entry_set_text(GTK_ENTRY(page->pathcmd), cmd);
-	}
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
 /* 2000-02-18 -	User hit the "Ignore Num Lock?" toggle. Update editing state. */
 static void evt_nonumlock_clicked(GtkWidget *wid, gpointer user)
 {
@@ -640,14 +607,14 @@
 	gtk_table_attach(GTK_TABLE(page->kdtable), label, 0, 1, 0, 1,  0,0,0,0);
 	page->kdkey = gtk_entry_new();
 	g_signal_connect(G_OBJECT(page->kdkey), "key_press_event", G_CALLBACK(evt_kkey_press), page);
-	gtk_entry_set_editable(GTK_ENTRY(page->kdkey), FALSE);
+	gtk_editable_set_editable(GTK_EDITABLE(page->kdkey), FALSE);
 	gtk_table_attach(GTK_TABLE(page->kdtable), page->kdkey, 1, 3, 0, 1,  GTK_EXPAND|GTK_FILL,0,0,0);
 	label = gtk_label_new(_("Command"));
 	gtk_table_attach(GTK_TABLE(page->kdtable), label, 0, 1, 1, 2,  0,0,0,0);
 	page->kdcmd = gtk_entry_new();
 	g_signal_connect(G_OBJECT(page->kdcmd), "changed", G_CALLBACK(evt_kcmd_changed), page);
 	gtk_table_attach(GTK_TABLE(page->kdtable), page->kdcmd, 1, 2, 1, 2,  GTK_EXPAND|GTK_FILL,0,0,0);
-	page->kdcmdpick = gui_details_button_new(min->gui->window->window);
+	page->kdcmdpick = gui_details_button_new();
 	g_signal_connect(G_OBJECT(page->kdcmdpick), "clicked", G_CALLBACK(evt_kcmdpick_clicked), page);
 	gtk_table_attach(GTK_TABLE(page->kdtable), page->kdcmdpick, 2, 3, 1, 2,  0,0,0,0);
 	gtk_box_pack_start(GTK_BOX(vbox), page->kdtable, FALSE, FALSE, 0);
@@ -698,7 +665,7 @@
 	page->mdcmd = gtk_entry_new();
 	g_signal_connect(G_OBJECT(page->mdcmd), "changed", G_CALLBACK(evt_mcmd_changed), page);
 	gtk_table_attach(GTK_TABLE(page->mdtable), page->mdcmd, 1, 3, 1, 2,  GTK_EXPAND|GTK_FILL,0,0,0);
-	page->mdcmdpick = gui_details_button_new(min->gui->window->window);
+	page->mdcmdpick = gui_details_button_new();
 	g_signal_connect(G_OBJECT(page->mdcmdpick), "clicked", G_CALLBACK(evt_mcmdpick_clicked), page);
 	gtk_table_attach(GTK_TABLE(page->mdtable), page->mdcmdpick, 3, 4, 1, 2,  0,0,0,0);
 	gtk_box_pack_start(GTK_BOX(vbox), page->mdtable, FALSE, FALSE, 0);
@@ -720,7 +687,7 @@
 	page->cmccmd = gtk_entry_new();
 	g_signal_connect(G_OBJECT(page->cmccmd), "changed", G_CALLBACK(evt_clickmclick_changed), page);
 	gtk_box_pack_start(GTK_BOX(hbox), page->cmccmd, TRUE, TRUE, 0);
-	wid = gui_details_button_new(page->min->gui->window->window);
+	wid = gui_details_button_new();
 	g_signal_connect(G_OBJECT(wid), "clicked", G_CALLBACK(evt_clickmclick_pick_clicked), page);
 	gtk_box_pack_start(GTK_BOX(hbox), wid, FALSE, FALSE, 0);
 	label = gtk_label_new(_("Time Limit"));
@@ -734,19 +701,6 @@
 	gtk_container_add(GTK_CONTAINER(frame), hbox);
 	gtk_box_pack_start(GTK_BOX(page->vbox), frame, FALSE, FALSE, 0);
 
-	frame = gtk_frame_new(_("Path Right Click"));
-	hbox = gtk_hbox_new(FALSE, 0);
-	label = gtk_label_new(_("Command"));
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	page->pathcmd = gtk_entry_new();
-	g_signal_connect(G_OBJECT(page->pathcmd), "changed", G_CALLBACK(evt_pathcmd_changed), page);
-	gtk_box_pack_start(GTK_BOX(hbox), page->pathcmd, TRUE, TRUE, 0);
-	wid = gui_details_button_new(page->min->gui->window->window);
-	g_signal_connect(G_OBJECT(wid), "clicked", G_CALLBACK(evt_pathcmd_pick_clicked), page);
-	gtk_box_pack_start(GTK_BOX(hbox), wid, FALSE, FALSE, 0);
-	gtk_container_add(GTK_CONTAINER(frame), hbox);
-	gtk_box_pack_start(GTK_BOX(page->vbox), frame, FALSE, FALSE, 0);
-
 	page->nonumlock = gtk_check_button_new_with_label(_("Ignore Num Lock For All Bindings?"));
 	g_signal_connect(G_OBJECT(page->nonumlock), "clicked", G_CALLBACK(evt_nonumlock_clicked), page);
 	gtk_box_pack_start(GTK_BOX(page->vbox), page->nonumlock, FALSE, FALSE, 0);

gentoo-0.15.6.tar.bz2/src/cfg_dirpane.c -> gentoo-0.19.9.tar.gz/src/cfg_dirpane.c Changed

@@ -22,10 +22,12 @@
 
 #include <stdlib.h>
 
+#include "configure.h"
 #include "dirpane.h"
 #include "guiutil.h"
 #include "xmlutil.h"
 #include "cmdseq.h"
+#include "nag_dialog.h"
 #include "strutil.h"
 #include "dpformat.h"
 #include "color_dialog.h"
@@ -56,7 +58,6 @@
 	GtkWidget	*smmenu;	/* Sorting mode (directory mixing) option menu. */
 	GtkWidget	*sinvert;	/* Check button for inverse sorting. */
 	GtkWidget	*snocase;	/* Check button for case ignorance. */
-	GtkWidget	*snumerical;	/* Check button for numerically aware sorting. */
 
 	GtkWidget	*dentry;	/* An entry for the default directory. */
 
@@ -64,12 +65,13 @@
 	GtkWidget	*fhide;		/* Check button to allow hiding. */
 	GtkWidget	*fscroll;	/* Check button for scrollbar always. */
 	GtkWidget	*fhparent;	/* Check button for huge parent button. */
+	GtkWidget	*ffont;		/* Check button for font overriding. */
+	GtkWidget	*fontbutton;	/* Font button for picking font. */
 
 	GSList		*splist;
 	GtkWidget	*spos3;	/* Radio buttons for scrollbar position. */
 
 	GSList		*mclist;
-	GtkWidget	*mctrl4;	/* Radio buttons for 'control' key mode. Only three are */
 					/* visible ("clear" is kinda pointless, but there for completeness). */
 	P_DirPane	*page;
 	DPFormat	edit;
@@ -88,14 +90,6 @@
 
 typedef struct {
 	GtkWidget	*vbox;
-
-	GtkWidget	*widgetDPCOL_NUM;
-
-	DPColors	edit;
-} PColors;
-
-typedef struct {
-	GtkWidget	*vbox;
 	GtkWidget	*orientation2;
 	GtkWidget	*mode4;
 	GtkWidget	*value;		/* Pointer to current value-holding widget. */
@@ -116,7 +110,7 @@
 
 typedef struct {
 	GtkWidget	*options;
-	DPSizeType	type;
+	SzUnit		unit;
 	GtkWidget	*ticks;
 	GtkWidget	*tick;
 	GtkWidget	*digits;
@@ -158,7 +152,6 @@
 	GtkWidget	*notebook;	/* A notebook holding left, right and color pages. */
 
 	PDef		pane2;
-	PColors		colors;
 	PPaning		paning;
 	PHistory	history;
 
@@ -170,13 +163,8 @@
 static const gchar	*config_name = { "DirPaneLeft", "DirPaneRight" },
 			*mode_name = { "dirs_first", "dirs_last", "dirs_mixed" },
 			*sbarpos_name = { "system", "left", "right" },
-			*color_name = { "pane_selected", "focus_unselected", "focus_selected" },
 			*pane_orient_name = { "horizontal", "vertical", NULL },
 			*pane_splitmode_name = { "free", "ratio", "absleft", "absright" };
-static const struct { DPSizeType type;
-			gchar *name; } sizetype_name = {
-		{ DPSIZE_NATIVE, "native" }, { DPSIZE_BYTES, "bytes" }, { DPSIZE_KILOBYTES, "kilobytes" },
-		{ DPSIZE_MEGABYTES, "megabytes" }, { DPSIZE_GIGABYTES, "gigabytes"}, { DPSIZE_SMART, "smart" }};
 
 /* ----------------------------------------------------------------------------------------- */
 
@@ -184,32 +172,6 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-static const gchar * size_type_to_name(DPSizeType st)
-{
-	gsize	i;
-
-	for(i = 0; i < sizeof sizetype_name / sizeof *sizetype_name; i++)
-	{
-		if(sizetype_namei.type == st)
-			return sizetype_namei.name;
-	}
-	return NULL;
-}
-
-static DPSizeType size_type_from_name(const gchar *name)
-{
-	gsize	i;
-
-	for(i = 0; i < sizeof sizetype_name / sizeof *sizetype_name; i++)
-	{
-		if(strcmp(sizetype_namei.name, name) == 0)
-			return sizetype_namei.type;
-	}
-	return DPSIZE_NATIVE;
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
 /* 1999-05-15 -	Set the state of the various widgets of <def> according to its 'edit' field. */
 static void set_pane_widgets(PDef *def)
 {
@@ -229,11 +191,10 @@
 	for(i = 0; i < sizeof def->sbutton / sizeof def->sbutton0; i++)
 		gtk_widget_set_sensitive(def->sbuttoni, FALSE);
 
-	gtk_option_menu_set_history(GTK_OPTION_MENU(def->scmenu), def->edit.sort.content);
-	gtk_option_menu_set_history(GTK_OPTION_MENU(def->smmenu), (guint) def->edit.sort.mode);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(def->sinvert),     def->edit.sort.invert);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(def->snocase),     def->edit.sort.nocase);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(def->snumerical),  def->edit.sort.numerical);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(def->scmenu), def->edit.sort.content);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(def->smmenu), (guint) def->edit.sort.mode);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(def->sinvert), def->edit.sort.invert);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(def->snocase), def->edit.sort.nocase);
 
 	gtk_entry_set_text(GTK_ENTRY(def->dentry), def->edit.def_path);
 
@@ -241,22 +202,15 @@
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(def->fhide),    def->edit.hide_allowed);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(def->fscroll),  def->edit.scrollbar_always);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(def->fhparent), def->edit.huge_parent);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(def->ffont),    def->edit.set_font);
+	if(def->edit.font_name0 != '\0')
+		gtk_font_button_set_font_name(GTK_FONT_BUTTON(def->fontbutton), def->edit.font_name);
 
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(def->spos(guint)  def->edit.sbar_pos), TRUE);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(def->mctrl(guint) def->edit.ctrl_mode), TRUE);
 
 	def->srow = -1;
 }
 
-/* 1999-05-16 -	Set state of color editing widgets to reflect current data. */
-static void set_color_widgets(PColors *col)
-{
-	guint	i;
-
-	for(i = 0; i < sizeof col->widget / sizeof col->widget0; i++)
-		gtk_color_button_set_color(GTK_COLOR_BUTTON(col->widgeti), &col->edit.colori);
-}
-
 static void set_paning_widgets(PPaning *p)
 {
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(p->orientationp->edit.orientation), TRUE);
@@ -332,7 +286,8 @@
 
 	table = gtk_table_new(1, 2, FALSE);
 	label = gtk_label_new(ltext);
-	*wid = gtk_entry_new_with_max_length(DP_DATEFMT_SIZE - 1);
+	*wid = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(*wid), DP_DATEFMT_SIZE - 1);
 	gtk_entry_set_text(GTK_ENTRY(*wid), dtext);
 	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
 	gtk_table_attach_defaults(GTK_TABLE(table), *wid,  1, 2, 0, 1);
@@ -345,10 +300,10 @@
 
 	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wid)))
 	{
-		DPSizeType	type = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(wid), "type"));
+		const SzUnit	unit = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(wid), "type"));
 
-		gtk_widget_set_sensitive(edit->extra.size.options, type != DPSIZE_NATIVE);
-		edit->extra.size.type = type;
+		gtk_widget_set_sensitive(edit->extra.size.options, unit != SZE_NONE);
+		edit->extra.size.unit = unit;
 	}
 }
 
@@ -362,15 +317,10 @@
 /* 1998-06-23 -	Add widgetry to dialog being defined, if any is needed. */
 static GtkWidget * add_content_widgets(P_Edit *edit)
 {
-	const gchar	*slab = { N_("Raw Size, in Bytes"), N_("Formatted Size, in bytes"),
-				    N_("Formatted Size, in kilobytes"), N_("Formatted Size, in megabytes"),
-				    N_("Formatted Size, in gigabytes"), N_("Formatted Size, \"Smart\" Unit") };
-	const DPSizeType stype = { DPSIZE_NATIVE, DPSIZE_BYTES, DPSIZE_KILOBYTES,
-				     DPSIZE_MEGABYTES, DPSIZE_GIGABYTES, DPSIZE_SMART };
 	gchar		*tmp = "", tickstr2 = "?";
 	DpCFmt		*fmt = &edit->def->edit.formatedit->def->srow;
 	GtkObject	*adj;
-	GtkWidget	*vbox, *frame, *table, *label, *rb, *trbsizeof stype / sizeof *stype, *sep;
+	GtkWidget	*vbox, *frame, *table, *label, *rb, *trbSZE_NUM_UNITS, *sep;
 	ExtraType	type = ET_NONE;
 	GSList		*group;
 	guint		i, ti = 0;
@@ -383,29 +333,32 @@
 			edit->extra.name.show_type = gtk_check_button_new_with_label(_("Append Type Character?"));
 			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(edit->extra.name.show_type), fmt->extra.name.show_type);
 			gtk_box_pack_start(GTK_BOX(vbox), edit->extra.name.show_type, TRUE, TRUE, 0);
-			edit->extra.name.show_linkname = gtk_check_button_new_with_label(_("Append \"-> destination\" on Links?"));
+			edit->extra.name.show_linkname = gtk_check_button_new_with_label(_("Append \"\xe2\x86\x92 destination\" on Links?"));
 			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(edit->extra.name.show_linkname), fmt->extra.name.show_linkname);
 			gtk_box_pack_start(GTK_BOX(vbox), edit->extra.name.show_linkname, TRUE, TRUE, 0);
 			type = ET_NAME;
 			break;
 		case DPC_SIZE:
-			table = gtk_table_new(5, 2, FALSE);
-			for(i = 0, group = NULL; i < sizeof stype / sizeof *stype; i++)
+			table = gtk_table_new(SZE_NUM_UNITS, 2, FALSE);
+			for(i = 0, group = NULL; i < SZE_NUM_UNITS; i++)
 			{
-				trbi = rb = gtk_radio_button_new_with_label(group, _(slabi));
-				gtk_object_set_data(GTK_OBJECT(rb), "type", GINT_TO_POINTER(stypei));
+				const SzUnit	unit = (SzUnit) i;
+
+				trbi = rb = gtk_radio_button_new_with_label(group, _(sze_get_unit_label(unit)));
+				g_object_set_data(G_OBJECT(rb), "type", GINT_TO_POINTER(unit));
 				g_signal_connect(G_OBJECT(rb), "toggled", G_CALLBACK(evt_size_type_toggled), edit);
 				gtk_table_attach(GTK_TABLE(table), rb, 0, 2, i, i + 1,  GTK_EXPAND|GTK_FILL,0,0,0);
-				if(stypei == fmt->extra.size.type)
+				if(fmt->extra.size.unit == unit)
 					ti = i;
-				group = gtk_radio_button_group(GTK_RADIO_BUTTON(rb));
+				group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(rb));
 			}
 			gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0);
 
 			edit->extra.size.options = gtk_table_new(2, 2, FALSE);
 			edit->extra.size.ticks = gtk_check_button_new_with_label(_("Place Tick Every 3 Digits?"));
 			gtk_table_attach(GTK_TABLE(edit->extra.size.options), edit->extra.size.ticks, 0, 1, 0, 1,  0,0,0,0);
-			edit->extra.size.tick = gtk_entry_new_with_max_length(1);
+			edit->extra.size.tick = gtk_entry_new();
+			gtk_entry_set_max_length(GTK_ENTRY(edit->extra.size.tick), 1);
 			gtk_entry_set_width_chars(GTK_ENTRY(edit->extra.size.tick), 1);
 			tickstr0 = fmt->extra.size.tick;
 			gtk_entry_set_text(GTK_ENTRY(edit->extra.size.tick), tickstr);
@@ -469,16 +422,20 @@
 			break;
 		case DPC_ATIME:
 		case DPC_MTIME:
-		case DPC_CTIME:
+		case DPC_CHTIME:
+		case DPC_CRTIME:
 			table = gtk_table_new(1, 2, FALSE);
 			label = gtk_label_new(_("Format"));
-			edit->extra.date.format = gtk_entry_new_with_max_length(DP_DATEFMT_SIZE - 1);
+			edit->extra.date.format = gtk_entry_new();
+			gtk_entry_set_max_length(GTK_ENTRY(edit->extra.date.format), DP_DATEFMT_SIZE - 1);
 			if(edit->content == DPC_ATIME)
 				tmp = fmt->extra.a_time.format;
 			else if(edit->content == DPC_MTIME)
 				tmp = fmt->extra.m_time.format;
-			else if(edit->content == DPC_CTIME)
-				tmp = fmt->extra.c_time.format;
+			else if(edit->content == DPC_CHTIME)
+				tmp = fmt->extra.ch_time.format;
+			else if(edit->content == DPC_CRTIME)
+				tmp = fmt->extra.cr_time.format;
 			gtk_entry_set_text(GTK_ENTRY(edit->extra.date.format), tmp);
 			gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
 			gtk_table_attach_defaults(GTK_TABLE(table), edit->extra.date.format, 1, 2, 0, 1);
@@ -508,11 +465,11 @@
 /* 1998-06-24 -	This gets called when the user selects a new justification for the
 **		column being edited. We better remember exactly which mode that is.
 */
-static gint evt_edit_justification(GtkWidget *wid, gpointer user)
+static gint evt_edit_justification(GtkWidget *wid, guint index, gpointer user)
 {
 	P_Edit	*edit = user;
 
-	edit->curr_just = GPOINTER_TO_UINT(gtk_object_get_user_data(GTK_OBJECT(wid)));
+	edit->curr_just = index;
 
 	return TRUE;
 }
@@ -541,7 +498,7 @@
 			fmt->extra.name.show_linkname = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(edit->extra.name.show_linkname));
 			break;
 		case DPC_SIZE:
-			fmt->extra.size.type   = edit->extra.size.type;
+			fmt->extra.size.unit = edit->extra.size.unit;
 			fmt->extra.size.digits = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(edit->extra.size.digits));
 			g_snprintf(fmt->extra.size.dformat, sizeof fmt->extra.size.dformat, "%%#.%uf", fmt->extra.size.digits);
 			fmt->extra.size.ticks = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(edit->extra.size.ticks));
@@ -583,8 +540,11 @@
 		case DPC_MTIME:
 			strcpy(fmt->extra.m_time.format, gtk_entry_get_text(GTK_ENTRY(edit->extra.date.format)));
 			break;
-		case DPC_CTIME:
-			strcpy(fmt->extra.c_time.format, gtk_entry_get_text(GTK_ENTRY(edit->extra.date.format)));
+		case DPC_CRTIME:
+			strcpy(fmt->extra.cr_time.format, gtk_entry_get_text(GTK_ENTRY(edit->extra.date.format)));
+			break;
+		case DPC_CHTIME:
+			strcpy(fmt->extra.ch_time.format, gtk_entry_get_text(GTK_ENTRY(edit->extra.date.format)));
 			break;
 		case DPC_TYPE:
 			break;
@@ -631,13 +591,12 @@
 	label = gtk_label_new(dpf_get_content_name(edit.content));
 	gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 0, 1);
 
-	edit.title = gtk_entry_new_with_max_length(DP_TITLE_SIZE - 1);
+	edit.title = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(edit.title), DP_TITLE_SIZE - 1);
 	gtk_entry_set_text(GTK_ENTRY(edit.title), fmt->title);
 	gtk_table_attach_defaults(GTK_TABLE(table), edit.title, 1, 2, 1, 2);
 
-	edit.just = gtk_option_menu_new();
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(edit.just),
-				 gui_build_menu(jtext, GTK_SIGNAL_FUNC(evt_edit_justification), &edit));
+	edit.just = gui_build_combo_box(jtext, G_CALLBACK(evt_edit_justification), &edit);
 	switch(fmt->just)
 	{
 		case GTK_JUSTIFY_LEFT:
@@ -651,7 +610,7 @@
 			edit.curr_just = 2;
 			break;
 	}
-	gtk_option_menu_set_history(GTK_OPTION_MENU(edit.just), edit.curr_just);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(edit.just), edit.curr_just);
 	gtk_table_attach_defaults(GTK_TABLE(table), edit.just, 1, 2, 2, 3);
 
 	edit.wadj  = gtk_adjustment_new(fmt->width, 10.0, 800.0, 1.0f, 50.0, 0.0);
@@ -674,6 +633,13 @@
 	return TRUE;
 }
 
+/* 2010-10-02 -	The list of selected content types had a row double-clicked. */
+static void evt_sview_row_activated(GtkWidget *wid, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user)
+{
+	/* Just pretend like there was a click on the Edit button, instead. */
+	evt_sview_edit_clicked(wid, user);
+}
+
 /* ----------------------------------------------------------------------------------------- */
 
 /* 2009-04-24 -	Selected content selection changed, update the editing buttons. This is a bit irky. */
@@ -820,15 +786,15 @@
 {
 	PDef	*def = user;
 
-	def->edit.sort.content = (DPContent) GPOINTER_TO_UINT(gtk_object_get_user_data(GTK_OBJECT(wid)));
+	def->edit.sort.content = (DPContent) gtk_combo_box_get_active(GTK_COMBO_BOX(wid));
 }
 
 /* 1999-05-15 -	Set new sorting mode, from option menu selection. */
-static void evt_sort_set_mode(GtkWidget *wid, gpointer user)
+static void evt_sort_set_mode(GtkWidget *wid, guint index, gpointer user)
 {
 	PDef	*def = user;
 
-	def->edit.sort.mode = (SortMode) GPOINTER_TO_UINT(gtk_object_get_user_data(GTK_OBJECT(wid)));
+	def->edit.sort.mode = (SortMode) index;
 }
 
 /* 1999-05-15 -	User hit "Inverse Sort?" toggle button, so update. */
@@ -847,14 +813,6 @@
 	def->edit.sort.nocase = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wid));
 }
 
-/* 1999-08-29 -	Change state of numerical sorting mode flag. */
-static void evt_sort_numerical_clicked(GtkWidget *wid, gpointer user)
-{
-	PDef	*def = user;
-
-	def->edit.sort.numerical = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wid));
-}
-
 /* ----------------------------------------------------------------------------------------- */
 
 /* 1999-05-15 -	User is editing the default path, so update in editing copy. */
@@ -862,7 +820,7 @@
 {
 	PDef	*def = user;
 
-	stu_strncpy(def->edit.def_path, gtk_entry_get_text(GTK_ENTRY(wid)), sizeof def->edit.def_path);
+	g_strlcpy(def->edit.def_path, gtk_entry_get_text(GTK_ENTRY(wid)), sizeof def->edit.def_path);
 }
 
 /* 1999-05-15 -	User just hit the "Grab Current" button for the default path. Do it. */
@@ -918,24 +876,32 @@
 	def->edit.huge_parent = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wid));
 }
 
-/* ----------------------------------------------------------------------------------------- */
+/* 2010-10-24 -	The "set font" flag was toggled. */
+static void evt_flag_setfont_clicked(GtkWidget *wid, gpointer user)
+{
+	PDef	*def = user;
 
-/* 1999-05-15 -	User clicked on one of the "scrollbar position" widgets. Update. */
-static void evt_scrollbarpos_clicked(GtkWidget *wid, gpointer user)
+	def->edit.set_font = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wid));
+	gtk_widget_set_sensitive(def->fontbutton, def->edit.set_font);
+}
+
+/* 2010-10-24 -	The font button had its font changed, so let's remember that. */
+static void evt_font_set(GtkWidget *wid, gpointer user)
 {
 	PDef	*def = user;
 
-	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wid)))
-		def->edit.sbar_pos = (SBarPos) GPOINTER_TO_UINT(gtk_object_get_user_data(GTK_OBJECT(wid)));
+	g_snprintf(def->edit.font_name, sizeof def->edit.font_name, "%s", gtk_font_button_get_font_name(GTK_FONT_BUTTON(def->fontbutton)));
 }
 
-/* 1999-05-15 -	User clicked a control mode radio button. Update. */
-static void evt_controlmode_clicked(GtkWidget *wid, gpointer user)
+/* ----------------------------------------------------------------------------------------- */
+
+/* 1999-05-15 -	User clicked on one of the "scrollbar position" widgets. Update. */
+static void evt_scrollbarpos_clicked(GtkWidget *wid, gpointer user)
 {
 	PDef	*def = user;
 
 	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wid)))
-		def->edit.ctrl_mode = (CtrlMode) GPOINTER_TO_UINT(gtk_object_get_user_data(GTK_OBJECT(wid)));
+		def->edit.sbar_pos = (SBarPos) GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(wid), "user"));
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -985,6 +951,8 @@
 
 		for(i = 0; i < DPC_NUM_TYPES; i++)
 		{
+			if(i == DPC_BLOCKS || i == DPC_BLOCKSIZE)
+				continue;
 			gtk_list_store_append(store, &iter);
 			gtk_list_store_set(store, &iter,
 						CONTENT_COLUMN_TITLE, dpf_get_content_title((DPContent) i),
@@ -1024,19 +992,18 @@
 static void init_pane_page(P_DirPane *page, guint index, const gchar *other)
 {
 	PDef		*def;
-	GtkWidget	*label, *scwin, *vbox, *frame, *hbox, *table, *button, *sep, *menu;
+	GtkWidget	*label, *scwin, *vbox, *frame, *hbox, *table, *button, *sep, *fhbox;
 	const gchar	*smitem = { N_("Directories First"), N_("Directories Last"), N_("Directories Mixed"), NULL },
 				*spos = { N_("System Default"), N_("Left of List"), N_("Right of List") },
-				*mctrl = { N_("System Default"), N_("Always Set"), "(Always Clear)", N_("Toggle") },
 				*tfmt = { N_("Copy To %s"), N_("Copy From %s"), N_("Swap With %s") };
 	gchar		buf64;
 	guint		i;
-	GCallback	scfunc = { G_CALLBACK(evt_sview_edit_clicked),
+	const GCallback	scfunc = { G_CALLBACK(evt_sview_edit_clicked),
 					G_CALLBACK(evt_sview_remove_clicked),
 					G_CALLBACK(evt_sview_up_clicked),
 					G_CALLBACK(evt_sview_down_clicked) };
-	GtkSignalFunc	tool = { GTK_SIGNAL_FUNC(evt_copyto_clicked), GTK_SIGNAL_FUNC(evt_copyfrom_clicked),
-			    GTK_SIGNAL_FUNC(evt_swap_clicked) };
+	const GCallback	tool = { G_CALLBACK(evt_copyto_clicked), G_CALLBACK(evt_copyfrom_clicked),
+					G_CALLBACK(evt_swap_clicked) };
 
 	def = &page->paneindex;
 	def->page  = page;
@@ -1073,6 +1040,7 @@
 	def->sview = init_content_list_view(def->sstore, FALSE);
 	gtk_tree_selection_set_mode(GTK_TREE_SELECTION(gtk_tree_view_get_selection(GTK_TREE_VIEW(def->sview))), GTK_SELECTION_SINGLE);
 	g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(def->sview))), "changed", G_CALLBACK(evt_sview_selection_changed), def);
+	g_signal_connect(G_OBJECT(def->sview), "row_activated", G_CALLBACK(evt_sview_row_activated), def);
 	scwin = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_container_add(GTK_CONTAINER(scwin), def->sview);
@@ -1098,15 +1066,11 @@
 	hbox = gtk_hbox_new(FALSE, 0);
 	label = gtk_label_new(_("Sort On"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	def->scmenu = gtk_option_menu_new();
-	menu = dpf_get_content_menu(G_CALLBACK(evt_sort_set_content), def);
-	gtk_widget_show_all(menu);
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(def->scmenu), menu);
+	def->scmenu = dpf_get_content_combo_box(G_CALLBACK(evt_sort_set_content), def);
 	gtk_box_pack_start(GTK_BOX(hbox), def->scmenu, TRUE, TRUE, 0);
 	label = gtk_label_new(_("Mode"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
-	def->smmenu = gtk_option_menu_new();
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(def->smmenu), gui_build_menu(smitem, GTK_SIGNAL_FUNC(evt_sort_set_mode), def));
+	def->smmenu = gui_build_combo_box(smitem, G_CALLBACK(evt_sort_set_mode), def);
 	gtk_box_pack_start(GTK_BOX(hbox), def->smmenu, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	hbox = gtk_hbox_new(FALSE, 0);
@@ -1116,9 +1080,6 @@
 	def->snocase = gtk_check_button_new_with_label(_("Ignore Case?"));
 	g_signal_connect(G_OBJECT(def->snocase), "clicked", G_CALLBACK(evt_sort_nocase_clicked), def);
 	gtk_box_pack_start(GTK_BOX(hbox), def->snocase, TRUE, FALSE, 0);
-	def->snumerical = gtk_check_button_new_with_label(_("Numerical Mode?"));
-	g_signal_connect(G_OBJECT(def->snumerical), "clicked", G_CALLBACK(evt_sort_numerical_clicked), def);
-	gtk_box_pack_start(GTK_BOX(hbox), def->snumerical, TRUE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 	gtk_box_pack_start(GTK_BOX(def->vbox), frame, FALSE, FALSE, 0);
@@ -1126,7 +1087,8 @@
 	/* Default directory. */
 	frame = gtk_frame_new(_("Default Directory"));
 	hbox = gtk_hbox_new(FALSE, 0);
-	def->dentry = gtk_entry_new_with_max_length(PATH_MAX - 1);
+	def->dentry = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(def->dentry), PATH_MAX - 1);
 	g_signal_connect(G_OBJECT(def->dentry), "changed", G_CALLBACK(evt_default_path_changed), def);
 	gtk_box_pack_start(GTK_BOX(hbox), def->dentry, TRUE, TRUE, 0);
 	button = gtk_button_new_with_label(_("Grab Current"));
@@ -1143,7 +1105,7 @@
 
 	/* Flags. */
 	frame = gtk_frame_new(_("Flags"));
-	table = gtk_table_new(3, 2, FALSE);
+	table = gtk_table_new(3, 2, TRUE);
 
 	def->fabove = gtk_check_button_new_with_label(_("Path Above?"));
 	g_signal_connect(G_OBJECT(def->fabove), "clicked", G_CALLBACK(evt_flag_above_clicked), def);
@@ -1155,11 +1117,21 @@
 
 	def->fscroll = gtk_check_button_new_with_label(_("Scrollbar Always?"));
 	g_signal_connect(G_OBJECT(def->fscroll), "clicked", G_CALLBACK(evt_flag_scrollbar_clicked), def);
-	gtk_table_attach_defaults(GTK_TABLE(table), def->fscroll, 0, 1, 2, 3);
+	gtk_table_attach_defaults(GTK_TABLE(table), def->fscroll, 1, 2, 0, 1);
 
 	def->fhparent = gtk_check_button_new_with_label(_("Huge Parent Button?"));
 	g_signal_connect(G_OBJECT(def->fhparent), "clicked", G_CALLBACK(evt_flag_hugeparent_clicked), def);
-	gtk_table_attach_defaults(GTK_TABLE(table), def->fhparent, 1, 2, 0, 1);
+	gtk_table_attach_defaults(GTK_TABLE(table), def->fhparent, 1, 2, 1, 2);
+
+	fhbox = gtk_hbox_new(FALSE, 0);
+	def->ffont = gtk_check_button_new_with_label(_("Set Custom Font?"));
+	g_signal_connect(G_OBJECT(def->ffont), "clicked", G_CALLBACK(evt_flag_setfont_clicked), def);
+	gtk_box_pack_start(GTK_BOX(fhbox), def->ffont, FALSE, FALSE, 0);
+	def->fontbutton = gtk_font_button_new();
+	g_signal_connect(G_OBJECT(def->fontbutton), "font_set", G_CALLBACK(evt_font_set), def);
+	gtk_widget_set_sensitive(def->fontbutton, FALSE);
+	gtk_box_pack_start(GTK_BOX(fhbox), def->fontbutton, TRUE, TRUE, 0);
+	gtk_table_attach_defaults(GTK_TABLE(table), fhbox, 0, 2, 2, 3);
 
 	gtk_container_add(GTK_CONTAINER(frame), table);
 	gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, 0);
@@ -1176,19 +1148,6 @@
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 	gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, 0);
 
-	/* Control state. */
-	frame = gtk_frame_new(_("Modify 'Control' Key State"));
-	vbox  = gtk_vbox_new(FALSE, 0);
-	def->mclist = gui_radio_group_new(sizeof def->mctrl / sizeof def->mctrl0, mctrl, def->mctrl);
-	for(i = 0; i < sizeof def->mctrl / sizeof def->mctrl0; i++)
-	{
-		if(mctrli0 == '(')	/* Don't pack the hidden button. A rather ugly hack. */
-			continue;
-		g_signal_connect(G_OBJECT(def->mctrli), "clicked", G_CALLBACK(evt_controlmode_clicked), def);
-		gtk_box_pack_start(GTK_BOX(vbox), def->mctrli, FALSE, FALSE, 0);
-	}
-	gtk_container_add(GTK_CONTAINER(frame), vbox);
-	gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(def->vbox), hbox, FALSE, FALSE, 0);
 
 	/* Pane "tools" (i.e., copy/swap) buttons (formerly on top). */
@@ -1206,47 +1165,11 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 2008-11-28 -	User changed a color. Copy it from button. */
-static void evt_color_set(GtkWidget *wid, gpointer user)
-{
-	PColors		*col = user;
-	gint		index = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(wid), "index"));
-
-	gtk_color_button_get_color(GTK_COLOR_BUTTON(wid), &col->edit.colorindex);
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1999-05-16 -	Initialize widgets for dirpane color editing. */
-static void init_color_page(P_DirPane *page)
-{
-	PColors		*col = &page->colors;
-	GtkWidget	*table, *label;
-	const gchar	*ltxt = { N_("Active Pane Titles"), N_("Focused Row, Unselected"),
-				    N_("Focused Row, Selected") };
-	guint		i;
-
-	col->vbox = gtk_vbox_new(FALSE, 0);
-
-	table = gtk_table_new(3, 2, FALSE);
-	for(i = 0; i < sizeof ltxt / sizeof ltxt0; i++)
-	{
-		label = gtk_label_new(_(ltxti));
-		gtk_table_attach(GTK_TABLE(table), label, 0, 1, i, i + 1,  0,0,0,0);
-		col->widgeti = gtk_color_button_new();
-		gtk_object_set_user_data(GTK_OBJECT(col->widgeti), GUINT_TO_POINTER((DpCol) i));
-		g_object_set_data(G_OBJECT(col->widgeti), "index", GINT_TO_POINTER(i));
-		g_signal_connect(G_OBJECT(col->widgeti), "color_set", G_CALLBACK(evt_color_set), col);
-		gtk_table_attach(GTK_TABLE(table), col->widgeti, 1, 2, i, i + 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
-	}
-	gtk_box_pack_start(GTK_BOX(col->vbox), table, TRUE, TRUE, 0);
-}
-
 static void evt_pane_orientation_toggled(GtkWidget *wid, gpointer user)
 {
 	P_DirPane	*page = user;
 
-	page->paning.edit.orientation = (gtk_object_get_data(GTK_OBJECT(wid), "horiz") != NULL) ? DPORIENT_HORIZ : DPORIENT_VERT;
+	page->paning.edit.orientation = (g_object_get_data(G_OBJECT(wid), "horiz") != NULL) ? DPORIENT_HORIZ : DPORIENT_VERT;
 }
 
 static void evt_pane_mode_toggled(GtkWidget *wid, gpointer user)
@@ -1254,12 +1177,12 @@
 	P_DirPane	*page = user;
 	GtkWidget	*row;
 
-	if((row = gtk_object_get_data(GTK_OBJECT(wid), "row")) != NULL)
+	if((row = g_object_get_data(G_OBJECT(wid), "row")) != NULL)
 		gtk_widget_set_sensitive(row, GTK_TOGGLE_BUTTON(wid)->active);	/* Sometimes, GTK+ is just plain nice. */
 	if(GTK_TOGGLE_BUTTON(wid)->active)
 	{
-		page->paning.edit.mode = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(wid), "index"));
-		page->paning.value = gtk_object_get_data(GTK_OBJECT(wid), "value");
+		page->paning.edit.mode = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(wid), "index"));
+		page->paning.value = g_object_get_data(G_OBJECT(wid), "value");
 	}
 }
 
@@ -1277,10 +1200,10 @@
 	for(i = 0; i < 2; i++)
 	{
 		p->orientationi = gtk_radio_button_new_with_label(i == 1 ?
-				    gtk_radio_button_group(GTK_RADIO_BUTTON(p->orientation0)) :
+				    gtk_radio_button_get_group(GTK_RADIO_BUTTON(p->orientation0)) :
 				    NULL, _(orientnamei));
 		if(i == 0)
-			gtk_object_set_data(GTK_OBJECT(p->orientationi), "horiz", GINT_TO_POINTER(1));
+			g_object_set_data(G_OBJECT(p->orientationi), "horiz", GINT_TO_POINTER(1));
 		g_signal_connect(G_OBJECT(p->orientationi), "toggled", G_CALLBACK(evt_pane_orientation_toggled), page);
 		gtk_box_pack_start(GTK_BOX(vbox), p->orientationi, FALSE, FALSE, 0);
 	}
@@ -1312,13 +1235,13 @@
 			label = gtk_label_new(_("pixels"));
 			gtk_box_pack_start(GTK_BOX(row), label, FALSE, FALSE, 5);
 		}
-		gtk_object_set_data(GTK_OBJECT(rb), "index", GINT_TO_POINTER(i));
+		g_object_set_data(G_OBJECT(rb), "index", GINT_TO_POINTER(i));
 		g_signal_connect(G_OBJECT(rb), "toggled", G_CALLBACK(evt_pane_mode_toggled), page);
 		gtk_table_attach(GTK_TABLE(table), rb, 0, 1, i, i+1, GTK_FILL,0,0,0);
 		if(row != NULL)
 		{
-			gtk_object_set_data(GTK_OBJECT(rb), "row", row);
-			gtk_object_set_data(GTK_OBJECT(rb), "value", value);
+			g_object_set_data(G_OBJECT(rb), "row", row);
+			g_object_set_data(G_OBJECT(rb), "value", value);
 			gtk_widget_set_sensitive(row, FALSE);
 			gtk_table_attach(GTK_TABLE(table), row, 1, 2, i, i+1, GTK_EXPAND|GTK_FILL,0,0,0);
 		}
@@ -1363,14 +1286,12 @@
 
 	init_pane_page(page, 0, _("Right"));
 	init_pane_page(page, 1, _("Left"));
-	init_color_page(page);
 	init_paning_page(page);
 	init_history_page(page);
 
 	cfg_tree_level_begin(_("Dir Panes"));
 	cfg_tree_level_append(_("Left"), page->pane0.vbox);
 	cfg_tree_level_append(_("Right"), page->pane1.vbox);
-	cfg_tree_level_append(_("Colors"), page->colors.vbox);
 	cfg_tree_level_append(_("Pane Split"), page->paning.vbox);
 	cfg_tree_level_append(_("History"), page->history.vbox);
 	cfg_tree_level_end();
@@ -1388,13 +1309,11 @@
 
 	for(i = 0; i < sizeof the_page.pane / sizeof the_page.pane0; i++)
 		the_page.panei.edit = min->cfg.dp_formati;
-	the_page.colors.edit = min->cfg.dp_colors;
 	the_page.paning.edit = min->cfg.dp_paning;
 	the_page.history.edit = min->cfg.dp_history;
 
 	set_pane_widgets(&the_page.pane0);
 	set_pane_widgets(&the_page.pane1);
-	set_color_widgets(&the_page.colors);
 	set_paning_widgets(&the_page.paning);
 	set_history_widgets(&the_page.history);
 }
@@ -1416,11 +1335,6 @@
 			cfg_set_flags(CFLG_REBUILD_MIDDLE | CFLG_RESCAN_LEFT | CFLG_RESCAN_RIGHT);
 		}
 	}
-	if(memcmp(&the_page.colors.edit, &min->cfg.dp_colors, sizeof the_page.colors.edit) != 0)
-	{
-		min->cfg.dp_colors = the_page.colors.edit;
-		cfg_set_flags(CFLG_REBUILD_MIDDLE | CFLG_RESCAN_LEFT | CFLG_RESCAN_RIGHT);
-	}
 
 	switch(the_page.paning.edit.mode)
 	{
@@ -1457,7 +1371,7 @@
 			xml_put_boolean(out, "show_linkname", extra->name.show_linkname);
 			break;
 		case DPC_SIZE:
-			xml_put_text(out, "type", size_type_to_name(extra->size.type));
+			xml_put_text(out, "unit", sze_get_unit_config_name(extra->size.unit));
 			xml_put_boolean(out, "ticks", extra->size.ticks);
 			tstr0 = extra->size.tick;
 			xml_put_text(out, "tick", tstr);
@@ -1481,8 +1395,11 @@
 		case DPC_MTIME:
 			xml_put_text(out, "dateformat", extra->m_time.format);
 			break;
-		case DPC_CTIME:
-			xml_put_text(out, "dateformat", extra->c_time.format);
+		case DPC_CRTIME:
+			xml_put_text(out, "dateformat", extra->cr_time.format);
+			break;
+		case DPC_CHTIME:
+			xml_put_text(out, "dateformat", extra->ch_time.format);
 			break;
 		case DPC_TYPE:
 			break;
@@ -1512,7 +1429,6 @@
 	xml_put_text(out, "mode", mode_namesort->mode);
 	xml_put_boolean(out, "invert", sort->invert);
 	xml_put_boolean(out, "nocase", sort->nocase);
-	xml_put_boolean(out, "numerical", sort->numerical);
 	xml_put_node_close(out, "DPSort");
 }
 
@@ -1530,22 +1446,12 @@
 	xml_put_boolean(out, "hide_allowed", fmt->hide_allowed);
 	xml_put_boolean(out, "scrollbar_always", fmt->scrollbar_always);
 	xml_put_boolean(out, "huge_parent", fmt->huge_parent);
+	xml_put_boolean(out, "set_font", fmt->set_font);
+	xml_put_text(out, "font_name", fmt->font_name);
 	xml_put_text(out, "sbar_pos", sbarpos_namefmt->sbar_pos);
-	xml_put_integer(out, "ctrl_mode", fmt->ctrl_mode);
 	xml_put_node_close(out, node_name);
 }
 
-/* 1999-05-16 -	Save the current colors out. */
-static void save_colors(FILE *out, DPColors *cols)
-{
-	guint	i;
-
-	xml_put_node_open(out, "DirPaneColors");
-	for(i = 0; i < DPCOL_NUM; i++)
-		xml_put_color(out, color_namei, &cols->colori);
-	xml_put_node_close(out, "DirPaneColors");
-}
-
 static void save_paning(FILE *out, DPPaning *p)
 {
 	xml_put_node_open(out, "DirPanePaning");
@@ -1574,7 +1480,6 @@
 	xml_put_integer(out, "count", num);
 	for(i = 0; i < num; i++)
 		save_pane(out, &min->cfg.dp_formati, config_namei);
-	save_colors(out, &min->cfg.dp_colors);
 	save_paning(out, &min->cfg.dp_paning);
 	save_history(out, &min->cfg.dp_history);
 	xml_put_node_close(out, NODE);
@@ -1608,10 +1513,10 @@
 			{
 				const gchar	*str;
 
-				if(xml_get_text(node, "type", &str))
-					extra->size.type = size_type_from_name(str);
+				if(xml_get_text(node, "unit", &str) || xml_get_text(node, "type", &str))
+					extra->size.unit = sze_parse_unit_config_name(str);
 				else
-					extra->size.type = DPSIZE_BYTES;
+					extra->size.unit = SZE_BYTES;
 				if(xml_get_boolean(node, "ticks", &tmp))
 					extra->size.ticks = tmp;
 				if(xml_get_text(node, "tick", &str))
@@ -1640,7 +1545,8 @@
 			break;
 		case DPC_ATIME:
 		case DPC_MTIME:
-		case DPC_CTIME:
+		case DPC_CRTIME:
+		case DPC_CHTIME:
 			xml_get_text_copy(node, "dateformat", extra->a_time.format, sizeof extra->a_time.format);
 			break;
 		case DPC_TYPE:
@@ -1685,8 +1591,6 @@
 		sort->invert = tmp;
 	if(xml_get_boolean(node, "nocase", &tmp))
 		sort->nocase = tmp;
-	if(xml_get_boolean(node, "numerical", &tmp))
-		sort->numerical = tmp;
 }
 
 /* 1998-07-26 -	Load a column configuration. Since this is called as a callback from the
@@ -1740,7 +1644,7 @@
 static void load_pane(const XmlNode *node, DPFormat *fmt)
 {
 	const XmlNode	*data;
-	const gchar	*sbarpos;
+	const gchar	*fontname, *sbarpos;
 	gint		tmp;
 
 	if(xml_get_integer(node, "columns", (gint *) &fmt->num_columns))
@@ -1758,6 +1662,10 @@
 			fmt->scrollbar_always = tmp;
 		if(xml_get_boolean(node, "huge_parent", &tmp))
 			fmt->huge_parent = tmp;
+		if(xml_get_boolean(node, "set_font", &tmp))
+			fmt->set_font = tmp;
+		if(xml_get_text(node, "font_name", &fontname))
+			g_snprintf(fmt->font_name, sizeof fmt->font_name, "%s", fontname);
 		if(xml_get_text(node, "sbar_pos", &sbarpos))
 		{
 			gboolean	found = FALSE;
@@ -1775,19 +1683,9 @@
 			if(!found)
 				g_warning("**DPCFG: Unknown scrollbar position '%s'", sbarpos);
 		}
-		if(xml_get_integer(node, "ctrl_mode", &tmp))
-			fmt->ctrl_mode = (CtrlMode) tmp;
 	}
 }
 
-static void load_colors(const XmlNode *node, DPColors *colors)
-{
-	guint	i;
-
-	for(i = 0; i < DPCOL_NUM; i++)
-		xml_get_color(node, color_namei, &colors->colori);
-}
-
 static void load_paning(const XmlNode *node, DPPaning *paning)
 {
 	const gchar	*str;
@@ -1811,6 +1709,48 @@
 		history->save = tmp;
 }
 
+/* 2010-02-07 -	Check if the deprecated "blocks" and "blocksize" content type was used. If it was, remove it and nag. */
+static void remove_deprecated_content(MainInfo *min, int index)
+{
+	int		i, tail;
+	gboolean	keep;
+	DPFormat	*fmt = &min->cfg.dp_formatindex;
+
+	for(i = 0; i < fmt->num_columns; /* No increase here! */)
+	{
+		keep = FALSE;
+
+		if (fmt->formati.content == DPC_BLOCKS)
+		{
+			ndl_dialog_sync_new_wait(min, "blocks-deprecated", _("'Blocks' Content Deprecated"),
+					_("The 'Blocks' column content type is no longer supported,\n"
+					  "but your configuration is still making use of it. It will be\n"
+					  "automatically removed."));
+		}
+		else if(fmt->formati.content == DPC_BLOCKSIZE)
+		{
+			ndl_dialog_sync_new_wait(min, "blocksize-deprecated", _("'Block Size' Content Deprecated"),
+					_("The 'Block Size' column content type is no longer supported,\n"
+					  "but your configuration is still making use of it. It will be\n"
+					  "automatically removed."));
+		}
+		else
+			keep = TRUE;
+
+		/* Check what the resolution was, do we keep the column or not? */
+		if(!keep)
+		{
+			/* Just move the trailing elements down, and reduce count. */
+			tail = min->cfg.dp_formatindex.num_columns - i - 1;
+			memmove(&fmt->formati, &fmt->formati + 1, tail * sizeof fmt->formati);
+			fmt->num_columns--;
+			cfg_modified_set(min);
+		}
+		else
+			i++;
+	}
+}
+
 /* 1998-07-26 -	Load (e.g. parse) the DirPane data found in the XML tree <node>. */
 static void cdp_load(MainInfo *min, const XmlNode *node)
 {
@@ -1822,13 +1762,14 @@
 		for(i = 0; i < num; i++)
 		{
 			if((pane = xml_tree_search(node, config_namei)) != NULL)
+			{
 				load_pane(pane, &min->cfg.dp_formati);
+				remove_deprecated_content(min, i);
+			}
 			else
 				g_warning("**DPCFG: Couldn't find '%s' in config file!\n", config_namei);
 		}
 	}
-	if((sub = xml_tree_search(node, "DirPaneColors")) != NULL)
-		load_colors(sub, &min->cfg.dp_colors);
 	if((sub = xml_tree_search(node, "DirPanePaning")) != NULL)
 		load_paning(sub, &min->cfg.dp_paning);
 	if((sub = xml_tree_search(node, "DirPaneHistory")) != NULL)

gentoo-0.15.6.tar.bz2/src/cfg_errors.c -> gentoo-0.19.9.tar.gz/src/cfg_errors.c Changed

@@ -5,6 +5,7 @@
 #include "gentoo.h"
 
 #include "cfg_module.h"
+#include "configure.h"
 
 #include "cfg_errors.h"
 
@@ -14,7 +15,8 @@
 
 typedef struct {
 	GtkWidget	*vbox;
-	GtkWidget	*dialog, *beep;
+	GtkWidget	*standard, *main_title, *dialog;
+	GtkWidget	*beep;
 
 	MainInfo	*min;
 	ErrInfo		edit;
@@ -38,6 +40,7 @@
 static GtkWidget * cer_init(MainInfo *min, gchar **name)
 {
 	P_Errors	*page = &the_page;
+	GtkWidget	*vbox, *frame;
 
 	if(name == NULL)
 		return NULL;
@@ -49,9 +52,19 @@
 
 	page->vbox = gtk_vbox_new(FALSE, 0);
 
-	page->dialog = gtk_check_button_new_with_label(_("Use Dialog to Report Errors?"));
+	frame = gtk_frame_new(_("Error and Status Message Display"));
+	vbox = gtk_vbox_new(FALSE, 0);
+	page->standard = gtk_radio_button_new_with_label(NULL, _("Status Bar, Above Panes"));
+	g_signal_connect(G_OBJECT(page->standard), "toggled", G_CALLBACK(evt_dialog_toggled), page);
+	gtk_box_pack_start(GTK_BOX(vbox), page->standard, FALSE, FALSE, 0);
+	page->main_title = gtk_radio_button_new_with_label(gtk_radio_button_get_group(GTK_RADIO_BUTTON(page->standard)), _("Main Window's Title Bar"));
+	g_signal_connect(G_OBJECT(page->main_title), "toggled", G_CALLBACK(evt_dialog_toggled), page);
+	gtk_box_pack_start(GTK_BOX(vbox), page->main_title, FALSE, FALSE, 0);
+	page->dialog = gtk_radio_button_new_with_label(gtk_radio_button_get_group(GTK_RADIO_BUTTON(page->standard)), _("Separate Dialog"));
 	g_signal_connect(G_OBJECT(page->dialog), "toggled", G_CALLBACK(evt_dialog_toggled), page);
-	gtk_box_pack_start(GTK_BOX(page->vbox), page->dialog, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), page->dialog, FALSE, FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(frame), vbox);
+	gtk_box_pack_start(GTK_BOX(page->vbox), frame, FALSE, FALSE, 0);
 
 	page->beep = gtk_check_button_new_with_label(_("Cause Console Beep on Error?"));
 	g_signal_connect(G_OBJECT(page->beep), "toggled", G_CALLBACK(evt_beep_toggled), page);
@@ -68,7 +81,12 @@
 	P_Errors	*page = &the_page;
 
 	page->edit = min->cfg.errors;
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->dialog), page->edit.dialog);
+	if(page->edit.display == ERR_DISPLAY_STATUSBAR)
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->standard), TRUE);
+	else if(page->edit.display == ERR_DISPLAY_TITLEBAR)
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->main_title), TRUE);
+	else
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->dialog), TRUE);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->beep),   page->edit.beep);
 	page->modified = FALSE;
 }
@@ -82,8 +100,15 @@
 	if(!page->modified)
 		return;
 	/* We have very little widget state, so just grab it right here. */
-	page->edit.dialog = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->dialog));
-	page->edit.beep   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->beep));
+	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->standard)))
+		page->edit.display = ERR_DISPLAY_STATUSBAR;
+	else if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->main_title)))
+		page->edit.display = ERR_DISPLAY_TITLEBAR;
+	else
+		page->edit.display = ERR_DISPLAY_DIALOG;
+	page->edit.beep = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->beep));
+	if(min->cfg.errors.display != page->edit.display)
+		cfg_set_flags(CFLG_REBUILD_TOP);
 	min->cfg.errors = page->edit;
 	page->modified = FALSE;
 }
@@ -93,7 +118,7 @@
 static gint cer_save(MainInfo *min, FILE *out)
 {
 	xml_put_node_open(out, NODE);
-	xml_put_boolean(out, "dialog", min->cfg.errors.dialog);
+	xml_put_integer(out, "display", min->cfg.errors.display);
 	xml_put_boolean(out, "beep",   min->cfg.errors.beep);
 	xml_put_node_close(out, NODE);
 
@@ -107,9 +132,17 @@
 	if((root = xml_tree_search(node, NODE)) != NULL)
 	{
 		gboolean	tmp;
-
-		if(xml_get_boolean(root, "dialog", &tmp))
-			min->cfg.errors.dialog = tmp;
+		gint		itmp;
+
+		if(xml_get_integer(root, "display", &itmp))
+			min->cfg.errors.display = itmp;
+		else if(xml_get_boolean(root, "dialog", &tmp))	/* Legacy "dialog" boolean support. */
+		{
+			if(tmp)
+				min->cfg.errors.display = ERR_DISPLAY_DIALOG;
+			else
+				min->cfg.errors.display = ERR_DISPLAY_STATUSBAR;
+		}
 		if(xml_get_boolean(root, "beep", &tmp))
 			min->cfg.errors.beep = tmp;
 	}

gentoo-0.19.9.tar.gz/src/cfg_nag.c Added

@@ -0,0 +1,184 @@
+/*
+** 2009-12-28 -	Implementation of the nagging configuration. This mainly gives the user an option to forget
+**		which dialogs have been suppressed, and hooks into the save/load of configure data.
+*/
+
+#include "gentoo.h"
+
+#include "configure.h"
+#include "xmlutil.h"
+
+#include "cfg_nag.h"
+
+#define	NODE	"Nagging"
+
+/* ----------------------------------------------------------------------------------------- */
+
+typedef struct {
+	GtkWidget	*vbox;
+	GtkWidget	*label;
+	GtkWidget	*reset;
+	gboolean	do_reset;
+
+	MainInfo	*min;
+	gboolean	modified;
+} P_Nag;
+
+static P_Nag	the_page;
+
+/* ----------------------------------------------------------------------------------------- */
+
+void cng_initialize(NagInfo *ni)
+{
+	ni->ignored = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+}
+
+gsize cng_num_ignored(const NagInfo *ni)
+{
+	return ni != NULL ? g_hash_table_size(ni->ignored) : 0u;
+}
+
+gboolean cng_is_ignored(const NagInfo *ni, const gchar *tag)
+{
+	if(ni == NULL || tag == NULL)
+		return FALSE;
+	if(g_hash_table_lookup_extended(ni->ignored, tag, NULL, NULL))
+		return TRUE;
+	return FALSE;
+}
+
+/* 2009-12-29 -	Adds the given tag to the set of ignored tags. The tag is copied. */
+void cng_ignore(NagInfo *ni, const gchar *tag)
+{
+	gpointer	key;
+
+	if(ni == NULL || tag == NULL)
+		return;
+	/* Protect against multiple insertions, since that would leak memory. */
+	if(g_hash_table_lookup_extended(ni->ignored, (gpointer) tag, NULL, NULL))
+		return;
+	if((key = g_strdup(tag)) != NULL)
+	{
+		g_hash_table_insert(ni->ignored, key, NULL);
+	}
+}
+
+void cng_reset(NagInfo *ni)
+{
+	if(ni != NULL)
+		g_hash_table_remove_all(ni->ignored);
+}
+
+/* ----------------------------------------------------------------------------------------- */
+
+static void set_label(GtkWidget *label, gsize num)
+{
+	gchar	buf256;
+
+	g_snprintf(buf, sizeof buf, _("Click the button below to reset the %zu stored 'Don't show this dialog again' responses."), num);
+	gtk_label_set_markup(GTK_LABEL(label), buf);
+}
+
+static void evt_reset_clicked(GtkWidget *wid, gpointer user)
+{
+	P_Nag	*page = user;
+
+	page->do_reset = TRUE;
+	page->modified = TRUE;
+	set_label(page->label, 0);
+	gtk_widget_set_sensitive(page->reset, FALSE);
+}
+
+static GtkWidget * cng_init(MainInfo *min, gchar **name)
+{
+	P_Nag	*page = &the_page;
+	gsize	num;
+
+	if(name == NULL)
+		return NULL;
+
+	*name = _("Nagging");
+
+	page->min = min;
+	page->modified = FALSE;
+
+	page->vbox = gtk_vbox_new(FALSE, 0);
+	page->label = gtk_label_new(NULL);
+	num = cng_num_ignored(&min->cfg.nag);
+	set_label(page->label, num);
+	gtk_box_pack_start(GTK_BOX(page->vbox), page->label, FALSE, FALSE, 5);
+	page->reset = gtk_button_new_with_label(_("Reset All"));
+	gtk_widget_set_sensitive(page->reset, num > 0);
+	g_signal_connect(G_OBJECT(page->reset), "clicked", G_CALLBACK(evt_reset_clicked), page);
+	gtk_box_pack_start(GTK_BOX(page->vbox), page->reset, FALSE, FALSE, 0);
+
+	gtk_widget_show_all(page->vbox);
+
+	return page->vbox;
+}
+
+/* ----------------------------------------------------------------------------------------- */
+
+static void cng_update(MainInfo *min)
+{
+	P_Nag	*page = &the_page;
+
+	page->do_reset = FALSE;
+	page->modified = FALSE;
+}
+
+/* ----------------------------------------------------------------------------------------- */
+
+static void cng_accept(MainInfo *min)
+{
+	P_Nag	*page = &the_page;
+
+	if(!page->modified)
+		return;
+	if(page->do_reset)
+		cng_reset(&min->cfg.nag);
+	page->modified = FALSE;
+}
+
+/* ----------------------------------------------------------------------------------------- */
+
+static gint cng_save(MainInfo *min, FILE *out)
+{
+	GHashTableIter	iter;
+	gpointer	key;
+
+	xml_put_node_open(out, NODE);
+	g_hash_table_iter_init(&iter, min->cfg.nag.ignored);
+	while(g_hash_table_iter_next(&iter, &key, NULL))
+	{
+		xml_put_text(out, "ignore", key);
+	}
+	xml_put_node_close(out, NODE);
+
+	return TRUE;
+}
+
+static void visit_ignore(const XmlNode *child, gpointer user)
+{
+	const gchar	*text;
+
+	if(xml_get_text(child, "ignore", &text))
+		cng_ignore(&((MainInfo *) user)->cfg.nag, text);
+}
+
+static void cng_load(MainInfo *min, const XmlNode *node)
+{
+	const XmlNode	*root;
+
+	if((root = xml_tree_search(node, NODE)) != NULL)
+		xml_node_visit_children(root, visit_ignore, min);
+}
+
+/* ----------------------------------------------------------------------------------------- */
+
+const CfgModule * cng_describe(MainInfo *min)
+{
+	static const CfgModule	desc = { NODE, cng_init, cng_update, cng_accept, cng_save, cng_load, NULL };
+
+	return &desc;
+}

gentoo-0.19.9.tar.gz/src/cfg_nag.h Added

gentoo-0.15.6.tar.bz2/src/cfg_paths.c -> gentoo-0.19.9.tar.gz/src/cfg_paths.c Changed

@@ -13,6 +13,7 @@
 
 #include "configure.h"
 #include "cfg_module.h"
+#include "list_dialog.h"
 
 #include "cfg_paths.h"
 
@@ -61,6 +62,25 @@
 	return TRUE;
 }
 
+/* 2010-07-28 -	The "pick" button next to a path was clicked; pop up a list dialog. */
+static void evt_path_pick_clicked(GtkWidget *wid, gpointer user)
+{
+	P_Paths		*page = user;
+	const gint	index = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(wid), "index"));
+	GtkWidget	*entry = page->pathindex.path;
+	const gchar	*text;
+
+	if((text = gtk_entry_get_text(GTK_ENTRY(entry))) != NULL)
+	{
+		gchar	tmp1024;
+
+		g_snprintf(tmp, sizeof tmp, "%s", text);
+		ldl_dialog_sync_new_wait(tmp, sizeof tmp, ':', _("Edit path"));
+		if(strcmp(tmp, text) != 0)
+			gtk_entry_set_text(GTK_ENTRY(entry), tmp);
+	}
+}
+
 /* 1998-10-30 -	User just changed the hiding mode. */
 static gint evt_hmode_clicked(GtkWidget *wid, gpointer user)
 {
@@ -68,7 +88,7 @@
 
 	if(GTK_TOGGLE_BUTTON(wid)->active)
 	{
-		page->hideinfo.mode = (HMode) gtk_object_get_data(GTK_OBJECT(wid), "mode");
+		page->hideinfo.mode = (HMode) g_object_get_data(G_OBJECT(wid), "mode");
 		gtk_widget_set_sensitive(page->hide.hre, page->hideinfo.mode == HIDE_REGEXP);
 		gtk_widget_set_sensitive(page->hide.hicase, page->hideinfo.mode == HIDE_REGEXP);
 
@@ -83,7 +103,7 @@
 {
 	P_Paths	*page = user;
 
-	stu_strncpy(page->hideinfo.hide_re_src, gtk_entry_get_text(GTK_ENTRY(wid)), sizeof page->hideinfo.hide_re_src);
+	g_strlcpy(page->hideinfo.hide_re_src, gtk_entry_get_text(GTK_ENTRY(wid)), sizeof page->hideinfo.hide_re_src);
 	page->modified = TRUE;
 	return TRUE;
 }
@@ -125,8 +145,16 @@
 {
 	P_Paths		*page = &the_page;
 	GtkWidget	*algn, *label, *vbox;
-	const gchar	*labtxt = { N_("Icons"), N_("GTK+ RC"), N_("fstab"), N_("mtab") },
-			*hlab = { N_("None"), N_("Beginning With Dot (.)"), N_("Matching RE") };
+	const struct {
+		const gchar	*label;
+		gboolean	with_button;
+	} pinfo = {
+		{ N_("Icons"),		TRUE },
+		{ N_("GTK+ RC"),	TRUE },
+		{ N_("fstab"),		FALSE },
+		{ N_("mtab"),		FALSE }
+	};
+	const gchar	*hlab = { N_("None"), N_("Beginning With Dot (.)"), N_("Matching RE") };
 	guint		i;
 
 	if(name == NULL)
@@ -142,17 +170,29 @@
 	page->pframe = gtk_frame_new(_("Paths"));
 	page->ptable = gtk_table_new(1, 2, FALSE);
 
-	if(sizeof labtxt / sizeof labtxt0 == PTID_NUM_PATHS)
+	if(sizeof pinfo / sizeof *pinfo == PTID_NUM_PATHS)
 	{
 		for(i = 0; i < PTID_NUM_PATHS; i++)
 		{
+			gint	endx;
+
 			algn  = gtk_alignment_new(0.9f, 0.0f, 0.0f, 0.f);
-			label = gtk_label_new(_(labtxti));
+			label = gtk_label_new(_(pinfoi.label));
 			gtk_container_add(GTK_CONTAINER(algn), label);
 			gtk_table_attach(GTK_TABLE(page->ptable), algn, 0, 1, i, i+1, GTK_FILL,0,0,0);
 			page->pathi.path = gtk_entry_new();
 			g_signal_connect(G_OBJECT(page->pathi.path), "changed", G_CALLBACK(evt_path_changed), page);
-			gtk_table_attach_defaults(GTK_TABLE(page->ptable), page->pathi.path, 1, 2, i, i+1);
+			endx = pinfoi.with_button ? 2 : 3;
+			gtk_table_attach_defaults(GTK_TABLE(page->ptable), page->pathi.path, 1, endx, i, i+1);
+			if(pinfoi.with_button)
+			{
+				GtkWidget	*pick;
+
+				pick = gui_details_button_new();
+				g_object_set_data(G_OBJECT(pick), "index", GINT_TO_POINTER(i));
+				g_signal_connect(G_OBJECT(pick), "clicked", G_CALLBACK(evt_path_pick_clicked), page);
+				gtk_table_attach(GTK_TABLE(page->ptable), pick, 2, 3, i, i+1, GTK_FILL,0,0,0);
+			}
 #if defined __OpenBSD__ || defined __FreeBSD__ || defined __NetBSD__
 			/* Mountlist and mounted fs files are non-configurable on BSD systems. */
 			if(i == 2 || i == 3)
@@ -171,7 +211,7 @@
 	vbox = gtk_vbox_new(FALSE, 0);
 	for(i = 0; i < sizeof page->hide.hmode / sizeof page->hide.hmode0; i++)
 	{
-		gtk_object_set_data(GTK_OBJECT(page->hide.hmodei), "mode", GINT_TO_POINTER(i));
+		g_object_set_data(G_OBJECT(page->hide.hmodei), "mode", GINT_TO_POINTER(i));
 		g_signal_connect(G_OBJECT(page->hide.hmodei), "clicked", G_CALLBACK(evt_hmode_clicked), page);
 		if(i < 2)
 			gtk_box_pack_start(GTK_BOX(vbox), page->hide.hmodei, FALSE, FALSE, 0);
@@ -181,7 +221,8 @@
 
 			hbox = gtk_hbox_new(FALSE, 0);
 			gtk_box_pack_start(GTK_BOX(hbox), page->hide.hmodei, FALSE, FALSE, 0);
-			page->hide.hre = gtk_entry_new_with_max_length(sizeof min->cfg.path.hideinfo.hide_re_src - 1);
+			page->hide.hre = gtk_entry_new();
+			gtk_entry_set_max_length(GTK_ENTRY(page->hide.hre), sizeof min->cfg.path.hideinfo.hide_re_src - 1);
 			g_signal_connect(G_OBJECT(page->hide.hre), "changed", G_CALLBACK(evt_hre_changed), page);
 			gtk_box_pack_start(GTK_BOX(hbox), page->hide.hre, TRUE, TRUE, 0);
 			page->hide.hicase = gtk_check_button_new_with_label(_("Ignore Case?"));
@@ -357,8 +398,10 @@
 			break;
 		default:
 			g_warning("cpt_get_path(): Unknown path %d requested", id);
-	}	if(ent != NULL)
+	}
+	if(ent != NULL)
 		return gtk_entry_get_text(ent);
 
 	return NULL;
 }
+

gentoo-0.15.6.tar.bz2/src/cfg_styles.c -> gentoo-0.19.9.tar.gz/src/cfg_styles.c Changed

@@ -23,6 +23,7 @@
 #include "types.h"
 #include "dirpane.h"
 #include "dialog.h"
+#include "dpformat.h"
 #include "iconutil.h"
 #include "strutil.h"
 #include "fileutil.h"
@@ -46,11 +47,21 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
+/* For GtkTreeModel access. */
+enum {
+	COLUMN_ICON,
+	COLUMN_NAME
+};
+
 typedef struct {			/* Visual properties notebook page. */
-	GtkWidget	*vbox;
-	GtkWidget	*preview;	/* CList showing preview of style (old-school!). */
-	GtkWidget	*override3;	/* Override check buttons for back- & foreground colors, plus icon. */
-	GtkWidget	*edit3;	/* The "edit" (or "pick") command buttons. */
+	GtkWidget		*vbox;
+	GtkWidget		*preview;	/* CList showing preview of style (old-school!). */
+	GtkTreeViewColumn	*pre_icon;	/* Icon preview. */
+	GtkCellRenderer		*pre_icon_r;
+	GtkTreeViewColumn	*pre_name;	/* Name (text) preview. */
+	GtkCellRenderer		*pre_name_r;
+	GtkWidget		*override3;	/* Override check buttons for back- & foreground colors, plus icon. */
+	GtkWidget		*edit3;	/* The "edit" (or "pick") command buttons. */
 } PVisual;
 
 typedef struct {			/* Action properties notebook page. */
@@ -103,26 +114,23 @@
 /* 1999-05-24 -	Set the preview widget(s). */
 static void set_widgets_preview(P_Styles *page, Style *stl)
 {
-	const gchar	*iname;
-	const GdkColor	*col;
+	GtkListStore	*store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(page->dpvisual.preview)));
+	GtkTreeIter	iter;
 
-	if((iname = stl_style_property_get_icon(stl, SPN_ICON_UNSEL)) != NULL)
+	if(gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
 	{
-		GdkPixmap	*ipix;
-		GdkBitmap	*imsk;
+		const gchar	*iname;
 
-		if((ipix = ico_icon_get(page->min, iname, &imsk)) != NULL)
-			gtk_clist_set_pixmap(GTK_CLIST(page->dpvisual.preview), 0, 0, ipix, imsk);
-	}
-	if((col = stl_style_property_get_color(stl, SPN_COL_UNSEL_BG)) != NULL)
-		gtk_clist_set_background(GTK_CLIST(page->dpvisual.preview), 0, (GdkColor *) col);
-	else
-	{
-		col = &gtk_widget_get_style(GTK_WIDGET(page->min->gui->pane0.list))->baseGTK_STATE_NORMAL;
-		gtk_clist_set_background(GTK_CLIST(page->dpvisual.preview), 0, (GdkColor *) col);
+		if((iname = stl_style_property_get_icon(stl, SPN_ICON_UNSEL)) != NULL)
+		{
+			GdkPixbuf	*pbuf;
+
+			if((pbuf = ico_icon_get_pixbuf(page->min, iname)) != NULL)
+				gtk_list_store_set(store, &iter, COLUMN_ICON, pbuf, -1);
+		}
 	}
-	if((col = stl_style_property_get_color(stl, SPN_COL_UNSEL_FG)) != NULL)
-		gtk_clist_set_foreground(GTK_CLIST(page->dpvisual.preview), 0, (GdkColor *) col);
+	dpf_cell_set_style_colors(page->dpvisual.pre_icon_r, stl, FALSE);
+	dpf_cell_set_style_colors(page->dpvisual.pre_name_r, stl, TRUE);
 }
 
 /* 1999-05-24 -	Set action list. */
@@ -277,7 +285,7 @@
 {
 	if(page->si != NULL)
 	{
-		page->store = stl_styleinfo_build_partial2(page->si, NULL);
+		page->store = stl_styleinfo_build_partial(page->si, NULL);
 		/* Block expand/collapse signals. */
 		g_signal_handler_block(page->tree, page->sig_collapse);
 		g_signal_handler_block(page->tree, page->sig_expand);
@@ -342,7 +350,7 @@
 	if((style = style_get_selected(page, NULL)) == NULL)
 		return;
 
-	pname = gtk_object_get_user_data(GTK_OBJECT(wid));
+	pname = g_object_get_data(G_OBJECT(wid), "user");
 	or = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wid));
 	if(or)
 	{
@@ -354,7 +362,7 @@
 
 			/* FIXME: This assumes only background can be non-overridden in root. */
 			if((def = stl_style_property_get_color(style, pname)) == NULL)
-				def = &(gtk_widget_get_style(GTK_WIDGET(page->min->gui->pane0.list))->baseGTK_STATE_NORMAL);
+				def = &(gtk_widget_get_style(GTK_WIDGET(page->min->gui->pane0.view))->baseGTK_STATE_NORMAL);
 			stl_style_property_set_color(style, pname, def);
 		}
 	}
@@ -386,7 +394,7 @@
 	if((style = style_get_selected(page, NULL)) == NULL)
 		return;
 
-	page->curr_prop = gtk_object_get_user_data(GTK_OBJECT(wid));
+	page->curr_prop = g_object_get_data(G_OBJECT(wid), "user");
 
 	if(strcmp(page->curr_prop, SPN_ICON_UNSEL) == 0)
 	{
@@ -452,7 +460,7 @@
 		ovr = set_aprop_delete_button(page, style);
 		/* Set the name column's editable mode, depending on override. */
 		col = gtk_tree_view_get_column(GTK_TREE_VIEW(page->dpaction.view), 0);
-		cellrenderers = gtk_tree_view_column_get_cell_renderers(col);
+		cellrenderers = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(col));
 		if(cellrenderers != NULL)
 		{
 			g_object_set(G_OBJECT(cellrenderers->data), "editable", ovr, NULL);
@@ -587,7 +595,8 @@
 	hbox = gtk_hbox_new(FALSE, 0);
 	label = gtk_label_new(_("Name"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	entry = gtk_entry_new_with_max_length(STL_PROPERTY_NAME_SIZE - 1);
+	entry = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(entry), STL_PROPERTY_NAME_SIZE - 1);
 	gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
 	dlg = dlg_dialog_sync_new(hbox, _("New Action Property"), NULL);
 	gtk_widget_grab_focus(entry);
@@ -648,7 +657,7 @@
 		if(stl_styleinfo_tree_find_style(page->si, page->store, stl, &iter))
 		{
 			gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(page->tree)), &iter);
-			gtk_entry_select_region(GTK_ENTRY(page->dname), 0, -1);
+			gtk_editable_select_region(GTK_EDITABLE(page->dname), 0, -1);
 			gtk_widget_grab_focus(page->dname);
 		}
 	}
@@ -690,23 +699,32 @@
 /* 1999-05-22 -	Build the visual property editing widgets. */
 static void build_pvisual(P_Styles *page)
 {
-	PVisual		*pv = &page->dpvisual;
-	const gchar	*vplab = { N_("Background Color"), N_("Foreground Color"), N_("Icon") },
-			*vpname = { SPN_COL_UNSEL_BG, SPN_COL_UNSEL_FG, SPN_ICON_UNSEL };
-	gchar		*ctxt = { "", N_("(Row Style Preview Text)") };
-	GtkWidget	*hbox, *frame, *vbox, *label;
-	guint		i;
+	PVisual			*pv = &page->dpvisual;
+	const gchar		*vplab = { N_("Background Color"), N_("Foreground Color"), N_("Icon") },
+				*vpname = { SPN_COL_UNSEL_BG, SPN_COL_UNSEL_FG, SPN_ICON_UNSEL };
+	gchar			ptxt = N_("(Row Style Preview Text)");
+	GtkListStore		*store;
+	GtkTreeIter		iter;
+	GtkWidget		*hbox, *frame, *vbox, *label;
+	guint			i;
 
 	pv->vbox = gtk_vbox_new(FALSE, 0);
 	hbox = gtk_hbox_new(FALSE, 0);
 	label = gtk_label_new(_("Preview"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	pv->preview = gtk_clist_new(2);
+	store = gtk_list_store_new(2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
+	gtk_list_store_append(store, &iter);
+	gtk_list_store_set(store, &iter, COLUMN_NAME, _(ptxt), -1);
+	pv->preview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+	pv->pre_icon_r = gtk_cell_renderer_pixbuf_new();
+	pv->pre_icon = gtk_tree_view_column_new_with_attributes("(title)", pv->pre_icon_r, "pixbuf", COLUMN_ICON, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(pv->preview), pv->pre_icon);
+	pv->pre_name_r = gtk_cell_renderer_text_new();
+	pv->pre_name = gtk_tree_view_column_new_with_attributes("(title)", pv->pre_name_r, "text", COLUMN_NAME, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(pv->preview), pv->pre_name);
+	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(pv->preview), FALSE);
 	gtk_widget_set_name(pv->preview, "cstPreview");
-	gtk_clist_set_column_width(GTK_CLIST(pv->preview), 0, 16);
-	ctxt1 = _(ctxt1);
-	gtk_clist_append(GTK_CLIST(pv->preview), ctxt);
-	gtk_clist_set_selectable(GTK_CLIST(pv->preview), 0, FALSE);
+	gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(pv->preview)), GTK_SELECTION_SINGLE);	/* Or none, like before? */
 	gtk_box_pack_start(GTK_BOX(hbox), pv->preview, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(pv->vbox), hbox, FALSE, FALSE, 2);
 
@@ -717,11 +735,11 @@
 		vbox = gtk_vbox_new(FALSE, 0);
 		gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
 		pv->overridei = gtk_check_button_new_with_label(_("Override Parent's?"));
-		gtk_object_set_user_data(GTK_OBJECT(pv->overridei), (gpointer) vpnamei);
+		g_object_set_data(G_OBJECT(pv->overridei), "user", (gpointer) vpnamei);
 		g_signal_connect(G_OBJECT(pv->overridei), "toggled", G_CALLBACK(evt_vprop_override_toggled), page);
 		gtk_box_pack_start(GTK_BOX(vbox), pv->overridei, FALSE, FALSE, 0);
 		pv->editi = gtk_button_new_with_label(i < 2 ? _("Edit...") : _("Pick..."));
-		gtk_object_set_user_data(GTK_OBJECT(pv->editi), (gpointer) vpnamei);
+		g_object_set_data(G_OBJECT(pv->editi), "user", (gpointer) vpnamei);
 		g_signal_connect(G_OBJECT(pv->editi), "clicked", G_CALLBACK(evt_vprop_edit_clicked), page);
 		gtk_box_pack_start(GTK_BOX(vbox), pv->editi, FALSE, FALSE, 0);
 		gtk_container_add(GTK_CONTAINER(frame), vbox);
@@ -804,15 +822,17 @@
 	table = gtk_table_new(2, 3, FALSE);
 	label = gtk_label_new(_("Name"));
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1,  0,0,0,0);
-	page->dname = gtk_entry_new_with_max_length(STL_STYLE_NAME_SIZE - 1);
+	page->dname = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(page->dname), STL_STYLE_NAME_SIZE - 1);
 	gui_handler_group_connect(page->handlers, G_OBJECT(page->dname), "changed", G_CALLBACK(evt_style_name_changed), page);
 	gtk_table_attach(GTK_TABLE(table), page->dname, 1, 3, 0, 1,  GTK_EXPAND|GTK_FILL,0,0,0);
 	label = gtk_label_new(_("Parent"));
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2,  0,0,0,0);
-	page->dparent = gtk_entry_new_with_max_length(STL_STYLE_NAME_SIZE - 1);
-	gtk_entry_set_editable(GTK_ENTRY(page->dparent), FALSE);
+	page->dparent = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(page->dparent), STL_STYLE_NAME_SIZE - 1);
+	gtk_editable_set_editable(GTK_EDITABLE(page->dparent), FALSE);
 	gtk_table_attach(GTK_TABLE(table), page->dparent, 1, 2, 1, 2,  GTK_EXPAND|GTK_FILL,0,0,0);
-	page->dreparent = gui_details_button_new(min->gui->window->window);
+	page->dreparent = gui_details_button_new();
 	g_signal_connect(G_OBJECT(page->dreparent), "clicked", G_CALLBACK(evt_style_parent_clicked), page);
 	gtk_table_attach(GTK_TABLE(table), page->dreparent, 2, 3, 1, 2,  0,0,0,0);
 	gtk_box_pack_start(GTK_BOX(page->dvbox), table, FALSE, FALSE, 0);

gentoo-0.15.6.tar.bz2/src/cfg_types.c -> gentoo-0.19.9.tar.gz/src/cfg_types.c Changed

@@ -141,7 +141,7 @@
 
 	for(i = 0; i < 7; i++)
 	{
-		if(page->itmodeGPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(page->itypei))) == tpe->mode)
+		if(page->itmodeGPOINTER_TO_INT(g_object_get_data(G_OBJECT(page->itypei), "user")) == tpe->mode)
 		{
 			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->itypei), TRUE);
 			break;
@@ -170,24 +170,23 @@
 
 	if(tpe->style != NULL)
 	{
-		GdkPixmap	*ipix;
-		GdkBitmap	*imsk = NULL;
+		GdkPixbuf	*pbuf;
 		gchar		buf128;
 		const gchar	*iname;
 
 		if((iname = stl_style_property_get_icon(tpe->style, SPN_ICON_UNSEL)) != NULL)
 		{
-			if((ipix = ico_icon_get(page->min, iname, &imsk)) != NULL)
+			if((pbuf = ico_icon_get_pixbuf(page->min, iname)) != NULL)
 			{
 				if(page->sicon == NULL)
 				{
-					page->sicon = gtk_pixmap_new(ipix, imsk);
+					page->sicon = gtk_image_new_from_pixbuf(pbuf);
 					gtk_box_pack_start(GTK_BOX(page->sbhbox), page->sicon, FALSE, FALSE, 10);
 					gtk_box_reorder_child(GTK_BOX(page->sbhbox), page->sicon, 0);
 					gtk_widget_show(page->sicon);
 				}
 				else
-					gtk_pixmap_set(GTK_PIXMAP(page->sicon), ipix, imsk);
+					gtk_image_set_from_pixbuf(GTK_IMAGE(page->sicon), pbuf);
 			}
 		}
 		g_snprintf(buf, sizeof buf, _("%s - Click to Change..."), stl_style_get_name(tpe->style));
@@ -321,7 +320,7 @@
 static gint evt_mode_clicked(GtkWidget *wid, gpointer user)
 {
 	P_Types	*page = user;
-	gint	index = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(wid)));
+	gint	index = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(wid), "user"));
 
 	if(page->curr_type == NULL)
 		return TRUE;
@@ -364,7 +363,7 @@
 		return TRUE;
 
 	page->modified = TRUE;
-	flag = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(wid)));
+	flag = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(wid), "user"));
 	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wid)))
 		page->curr_type->perm |= flag;
 	else
@@ -377,7 +376,7 @@
 static gint evt_id_check_clicked(GtkWidget *wid, gpointer user)
 {
 	P_Types	*page = user;
-	gint	index = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(wid)));
+	gint	index = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(wid), "user"));
 	gint	iflags = { FTFL_REQSUFFIX, FTFL_NAMEMATCH, FTFL_FILEMATCH };
 	gint	state;
 
@@ -408,7 +407,7 @@
 {
 	P_Types		*page = user;
 	const gchar	*text;
-	gint		index = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(wid)));
+	gint		index = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(wid), "user"));
 
 	if(page->curr_type == NULL)
 		return TRUE;
@@ -421,13 +420,13 @@
 	switch(index)
 	{
 		case 0:
-			stu_strncpy(page->curr_type->suffix, text, sizeof page->curr_type->suffix);
+			g_strlcpy(page->curr_type->suffix, text, sizeof page->curr_type->suffix);
 			break;
 		case 1:
-			stu_strncpy(page->curr_type->name_re_src, text, sizeof page->curr_type->name_re_src);
+			g_strlcpy(page->curr_type->name_re_src, text, sizeof page->curr_type->name_re_src);
 			break;
 		case 2:
-			stu_strncpy(page->curr_type->file_re_src, text, sizeof page->curr_type->file_re_src);
+			g_strlcpy(page->curr_type->file_re_src, text, sizeof page->curr_type->file_re_src);
 			break;
 	}
 	return TRUE;
@@ -437,7 +436,7 @@
 static gint evt_id_glob_changed(GtkWidget *wid, gpointer user)
 {
 	P_Types	*page = user;
-	gint	index = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(wid)));
+	gint	index = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(wid), "user"));
 	gint	flag = { 0, FTFL_NAMEGLOB, FTFL_FILEGLOB };
 
 	if(page->curr_type == NULL)
@@ -456,7 +455,7 @@
 static gint evt_id_nocase_changed(GtkWidget *wid, gpointer user)
 {
 	P_Types	*page = user;
-	gint	index = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(wid)));
+	gint	index = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(wid), "user"));
 	gint	flag = { 0, FTFL_NAMENOCASE, FTFL_FILENOCASE };
 
 	if(page->curr_type == NULL)
@@ -502,7 +501,7 @@
 static gint evt_add_clicked(GtkWidget *wid, gpointer user)
 {
 	P_Types	*page = user;
-	CfgInfo	*cfg  = gtk_object_get_user_data(GTK_OBJECT(wid));
+	CfgInfo	*cfg  = g_object_get_data(G_OBJECT(wid), "user");
 	FType	*tpe, *otpe;
 
 	if((tpe = typ_type_new(cfg, _("(New Type)"), S_IFREG, 0, NULL, NULL, NULL)) != NULL)
@@ -678,7 +677,8 @@
 	page->ntable = gtk_table_new(2, 2, FALSE);
 	label = gtk_label_new(_("Name"));
 	gtk_table_attach(GTK_TABLE(page->ntable), label, 0, 1, 0, 1,  GTK_FILL,0,5,0);
-	page->name = gtk_entry_new_with_max_length(STL_STYLE_NAME_SIZE - 1);
+	page->name = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(page->name), STL_STYLE_NAME_SIZE - 1);
 	gui_handler_group_connect(page->handlers, G_OBJECT(page->name), "changed", G_CALLBACK(evt_name_changed), page);
 	gtk_table_attach_defaults(GTK_TABLE(page->ntable), page->name, 1, 2, 0, 1);
 
@@ -695,7 +695,7 @@
 	for(i = 0; i < 7; i++)
 	{
 		gui_handler_group_connect(page->handlers, G_OBJECT(page->itypei), "clicked", G_CALLBACK(evt_mode_clicked), page);
-		gtk_object_set_user_data(GTK_OBJECT(page->itypei), GINT_TO_POINTER(i));
+		g_object_set_data(G_OBJECT(page->itypei), "user", GINT_TO_POINTER(i));
 		gtk_box_pack_start(GTK_BOX(page->ithbox), page->itypei, TRUE, TRUE, 0);
 	}
 	gtk_table_attach(GTK_TABLE(page->itable), page->ithbox, 1, 3, 0, 1, GTK_EXPAND|GTK_FILL,0,0,0);
@@ -707,7 +707,7 @@
 	for(i = 0; i < 6; i++)
 	{
 		page->ipermi = gtk_toggle_button_new_with_label(_(iplabi));
-		gtk_object_set_user_data(GTK_OBJECT(page->ipermi), GINT_TO_POINTER(ifpermi));
+		g_object_set_data(G_OBJECT(page->ipermi), "user", GINT_TO_POINTER(ifpermi));
 		gui_handler_group_connect(page->handlers, G_OBJECT(page->ipermi), "clicked", G_CALLBACK(evt_id_perm_clicked), page);
 		gtk_box_pack_start(GTK_BOX(page->iphbox), page->ipermi, TRUE, TRUE, 0);
 	}
@@ -721,12 +721,13 @@
 		y = (i == 2) ? i + 3 : i + 2;
 
 		page->identi.check = gtk_check_button_new_with_label(_(idlabi));
-		gtk_object_set_user_data(GTK_OBJECT(page->identi.check), GINT_TO_POINTER(i));
+		g_object_set_data(G_OBJECT(page->identi.check), "user", GINT_TO_POINTER(i));
 		gui_handler_group_connect(page->handlers, G_OBJECT(page->identi.check), "clicked", G_CALLBACK(evt_id_check_clicked), page);
 		gtk_table_attach(GTK_TABLE(page->itable), page->identi.check, 0, 1, y, y+1,  GTK_FILL,0,0,0);
 
-		page->identi.entry = gtk_entry_new_with_max_length(idmaxi - 1);
-		gtk_object_set_user_data(GTK_OBJECT(page->identi.entry), GINT_TO_POINTER(i));
+		page->identi.entry = gtk_entry_new();
+		gtk_entry_set_max_length(GTK_ENTRY(page->identi.entry), idmaxi - 1);
+		g_object_set_data(G_OBJECT(page->identi.entry), "user", GINT_TO_POINTER(i));
 		gui_handler_group_connect(page->handlers, G_OBJECT(page->identi.entry), "changed", G_CALLBACK(evt_id_entry_changed), page);
 		gtk_table_attach(GTK_TABLE(page->itable), page->identi.entry, 1, (i == 0) ? 3 : 2, y, y+1,  GTK_EXPAND | GTK_FILL,0,0,0);
 
@@ -736,12 +737,12 @@
 
 			hbox = gtk_hbox_new(FALSE, 0);
 			page->identi.glob = gtk_check_button_new_with_label(_("Glob?"));
-			gtk_object_set_user_data(GTK_OBJECT(page->identi.glob), GINT_TO_POINTER(i));
+			g_object_set_data(G_OBJECT(page->identi.glob), "user", GINT_TO_POINTER(i));
 			gui_handler_group_connect(page->handlers, G_OBJECT(page->identi.glob), "clicked", G_CALLBACK(evt_id_glob_changed), page);
 			gtk_box_pack_start(GTK_BOX(hbox), page->identi.glob, FALSE, FALSE, 0);
 
 			page->identi.nocase = gtk_check_button_new_with_label(_("Ignore Case?"));
-			gtk_object_set_user_data(GTK_OBJECT(page->identi.nocase), GINT_TO_POINTER(i));
+			g_object_set_data(G_OBJECT(page->identi.nocase), "user", GINT_TO_POINTER(i));
 			gui_handler_group_connect(page->handlers, G_OBJECT(page->identi.nocase), "clicked", G_CALLBACK(evt_id_nocase_changed), page);
 			gtk_box_pack_start(GTK_BOX(hbox), page->identi.nocase, FALSE, FALSE, 0);
 
@@ -773,7 +774,7 @@
 
 	page->bhbox = gtk_hbox_new(FALSE, 0);
 	page->add = gtk_button_new_with_label(_("Add"));
-	gtk_object_set_user_data(GTK_OBJECT(page->add), &min->cfg);
+	g_object_set_data(G_OBJECT(page->add), "user", &min->cfg);
 	g_signal_connect(G_OBJECT(page->add), "clicked", G_CALLBACK(evt_add_clicked), page);
 	gtk_box_pack_start(GTK_BOX(page->bhbox), page->add, TRUE, TRUE, 5);

gentoo-0.15.6.tar.bz2/src/cfg_windows.c -> gentoo-0.19.9.tar.gz/src/cfg_windows.c Changed

@@ -69,7 +69,7 @@
 		P_Windows	*page = user;
 		gint		pos;
 
-		pos = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(wid), "pos"));
+		pos = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(wid), "pos"));
 		if(pos != page->dialog_pos)
 		{
 			page->dialog_pos = pos;
@@ -120,11 +120,11 @@
 	for(i = 0; i < sizeof dlab / sizeof *dlab; i++)
 	{
 		page->dposi = gtk_radio_button_new_with_label(group, _(dlabi));
-		gtk_object_set_data(GTK_OBJECT(page->dposi), "pos", GINT_TO_POINTER(dposi));
+		g_object_set_data(G_OBJECT(page->dposi), "pos", GINT_TO_POINTER(dposi));
 		g_signal_connect(G_OBJECT(page->dposi), "toggled", G_CALLBACK(evt_dialog_position_toggled), page);
 		if(dposi == min->cfg.dialogs.pos)
 			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->dposi), TRUE);
-		group = gtk_radio_button_group(GTK_RADIO_BUTTON(page->dposi));
+		group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(page->dposi));
 		gtk_box_pack_start(GTK_BOX(vbox), page->dposi, FALSE, FALSE, 0);
 	}
 	gtk_container_add(GTK_CONTAINER(frame), vbox);

gentoo-0.15.6.tar.bz2/src/children.c -> gentoo-0.19.9.tar.gz/src/children.c Changed

@@ -29,7 +29,8 @@
 /* ----------------------------------------------------------------------------------------- */
 
 typedef struct {			/* Information about a single child process. */
-	pid_t	pid;				/* The pid of the process. */
+	GPid	pid;
+	guint	watch;				/* Glib source associated with this child. */
 	gchar	progMAXNAMLEN;		/* Name of program running as this child (argv0). */
 	guint32	gflags;				/* The general flags for the command. */
 	guint32	aflags;				/* After-flags to associate with this child. */
@@ -38,7 +39,7 @@
 typedef struct {			/* Holds data about child processes we have spawned. */
 	MainInfo	*min;			/* Very handy to have around. Keep first! */
 	GSList		*child_list;		/* List of running processes. */
-	pid_t		lock_pid;		/* Pid of a command that we want to wait for. */
+	GPid		lock_pid;		/* Pid of a command that we want to wait for. */
 	CmdSeq		*running;		/* If non-null, we're currently running this sequence. */
 	guint		index;			/* When 'running' is set, this is the next position to run. */
 } ChildInfo;
@@ -47,7 +48,7 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-static void handler_install(void);
+static gboolean	chd_unregister(const gchar *name);
 
 /* ----------------------------------------------------------------------------------------- */
 
@@ -69,73 +70,29 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1998-09-10 -	This handler is entered as we receive a SIGCHLD signal, telling us that a
-**		child process just died. We now need to wait() for that pid, in order not
-**		to create horrible zombies all over the place. This is done by waiting for
-**		all known children (with the WNOHANG flag).
-*/
-static void sigchld_handler(gint sig)
+/* 2010-03-08 -	A child process has tragically died, and needs to be reaped. */
+static void cb_watch_child(GPid pid, gint status, gpointer user)
 {
-	GSList		*iter, *next;
-	Child		*ch;
 	ChildInfo	*chi = &the_chi;
-	gint		status;
+	Child		*ch = user;
 
-	for(iter = chi->child_list; iter != NULL; iter = next)
+	/* Unlink from rest of GTK+, as soon as possible, to be safe. */
+	chi->child_list = g_slist_remove(chi->child_list, ch);
+	g_source_remove(ch->watch);
+
+	/* Now handle exit status. */
+	if(WIFEXITED(status) && WEXITSTATUS(status) == CHD_EXIT_FAILURE)
 	{
-		next = g_slist_next(iter);
-		ch   = iter->data;
-		if(waitpid(ch->pid, &status, WNOHANG) == ch->pid)
-		{
-			if(WIFEXITED(status) && WEXITSTATUS(status) == CHD_EXIT_FAILURE)
-			{
-				gchar	buf1024;
+		gchar	buf1024;
 
-				g_snprintf(buf, sizeof buf, _("Execution of \"%s\" Failed"), ch->prog);
-				dlg_dialog_sync_new_simple_wait(buf, _("Error"), _("_OK"));
-			}
-			if(chi->lock_pid == ch->pid)		/* Running in foreground? */
-				que_enqueue(chi->min, QEVT_CONTINUE_CMD);
-			que_enqueue(chi->min, QEVT_END_CMD, ch->aflags);
-			chi->child_list = g_slist_remove(chi->child_list, ch);
-			g_free(ch);
-		}
+		g_snprintf(buf, sizeof buf, _("Execution of \"%s\" Failed"), ch->prog);
+		dlg_dialog_sync_new_simple_wait(buf, _("Error"), _("_OK"));
 	}
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1998-12-15 -	(Re)install a signal handler for the SIGCHLD signal. */
-static void handler_install(void)
-{
-	struct sigaction	sa;
-
-	sa.sa_handler	= sigchld_handler;
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags	= SA_NOCLDSTOP;
-
-/* If the platform defines the SA_RESTART flag, it is probably a good idea
-** to use it. It should not be necessary on Linux, but let's play it safe.
-*/
-#if defined SA_RESTART
-	sa.sa_flags	|= SA_RESTART;
-#endif
-
-	sigaction(SIGCHLD, &sa, NULL);
-}
+	if(chi->lock_pid == ch->pid)		/* Running in foreground? */
+		que_enqueue(chi->min, QEVT_CONTINUE_CMD);
+	que_enqueue(chi->min, QEVT_END_CMD, ch->aflags);
 
-/* 1998-12-15 -	Remove any SIGCHLD signal handler, making the response the default of
-**		the OS.
-*/
-static void handler_remove(void)
-{
-	struct sigaction	sa;
-
-	sa.sa_handler	= SIG_DFL;
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags	= 0;
-
-	sigaction(SIGCHLD, &sa, NULL);
+	g_free(ch);
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -145,16 +102,13 @@
 ** 1998-09-10 -	Now takes an additional parameter, <lock>. If set, the GUI is locked.
 ** 1998-09-18 -	This routine is now exported for use by other code (the new "file" module).
 */
-void chd_register(const gchar *prog, pid_t pid, guint32 gflags, guint32 aflags)
+void chd_register(const gchar *prog, GPid pid, guint32 gflags, guint32 aflags)
 {
-	Child		*ch;
 	ChildInfo	*chi = &the_chi;
-
-	if(chi->child_list == NULL)	/* No children registered yet? */
-		handler_install();	/* Then this is the first (!) and the handler needs to be installed. */
+	Child		*ch;
 
 	ch = g_malloc(sizeof *ch);
-	stu_strncpy(ch->prog, prog, sizeof ch->prog);
+	g_strlcpy(ch->prog, prog, sizeof ch->prog);
 	ch->pid	   = pid;
 	ch->gflags = gflags;
 	ch->aflags = aflags;
@@ -164,6 +118,7 @@
 		chi->lock_pid = pid;
 		gtk_widget_set_sensitive(the_chi.min->gui->window, FALSE);
 	}
+	ch->watch = g_child_watch_add(ch->pid, cb_watch_child, ch);
 }
 
 /* 1999-04-08 -	Unregister the child named <name>. This is not meant for public consumption,
@@ -184,6 +139,7 @@
 		{
 			chi->child_list = g_slist_remove_link(chi->child_list, iter);
 			g_slist_free_1(iter);
+			g_source_remove(ch->watch);
 			g_free(ch);
 			return TRUE;
 		}
@@ -238,12 +194,10 @@
 			pid = ch->pid;		/* Buffer in case sighandler g_free()s it. */
 			if(kill(pid, SIGTERM) == 0)
 			{
-				gint	ret;
+				int	ret;
 
 				if((ret = waitpid(pid, NULL, 0)) == pid)
 					rcount++;
-				else if(errno != ECHILD)
-					perror("CHILDREN: waitpid() failed");
 			}
 			else
 				perror("CHILDREN: kill() failed");
@@ -262,14 +216,13 @@
 	GSList	*iter, *next;
 	Child	*ch;
 
-	/* When this is being done, we don't want no signal handler. */
-	handler_remove();
 	for(iter = the_chi.child_list; iter != NULL; iter = next)
 	{
 		next = g_slist_next(iter);
 		ch   = iter->data;
 		if(ch->gflags & CGF_SURVIVE)
 			continue;
+		g_source_remove(ch->watch);
 		if(kill(ch->pid, SIGTERM) != 0)
 			g_warning(_("Couldn't terminate child \"%s\" (pid=%d)--zombie alert"), ch->prog, (gint) ch->pid);
 		else

gentoo-0.15.6.tar.bz2/src/children.h -> gentoo-0.19.9.tar.gz/src/children.h Changed

gentoo-0.15.6.tar.bz2/src/cmd_about.c -> gentoo-0.19.9.tar.gz/src/cmd_about.c Changed

@@ -31,7 +31,7 @@
 {
 	struct body	*body = user;
 
-	gtk_notebook_set_page(GTK_NOTEBOOK(body->notebook), body->index ^= 1);
+	gtk_notebook_set_current_page(GTK_NOTEBOOK(body->notebook), body->index ^= 1);
 	return TRUE;
 }
 
@@ -40,7 +40,7 @@
 {
 	struct body	*body = user;
 
-	gtk_timeout_remove(GPOINTER_TO_UINT(body->handle));
+	g_source_remove(GPOINTER_TO_UINT(body->handle));
 	g_free(body);
 }
 
@@ -73,7 +73,7 @@
 
 gint cmd_about(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	gchar		buf64;
+	gchar		buf64, page2768;
 	GtkWidget	*w;
 	GdkPixmap	*pmap;
 	GdkBitmap	*mask;
@@ -89,28 +89,17 @@
 	body->page0 = gtk_vbox_new(FALSE, 0);
 	if((pmap = gdk_pixmap_create_from_xpm_d(GTK_WIDGET(min->gui->window)->window, &mask, NULL, icon_gentoo_xpm)) != NULL)
 	{
-		w = gtk_pixmap_new(pmap, mask);
+		w = gtk_image_new_from_pixmap(pmap, mask);
 		gtk_box_pack_start(GTK_BOX(body->page0), w, FALSE, FALSE, 5);
 	}
 	w = gtk_label_new(buf);
 	gtk_box_pack_start(GTK_BOX(body->page0), w, FALSE, FALSE, 0);
-	w = gtk_label_new(_("(c) 1998-2009 by Emil Brink, Obsession Development.\n"));
+	w = gtk_label_new(_("(c) 1998-2011 by Emil Brink, Obsession Development.\n"));
 	gtk_box_pack_start(GTK_BOX(body->page0), w, FALSE, FALSE, 0);
 	w = gtk_label_new(_("This is free software, and there is ABSOLUTELY NO\n"
 			"WARRANTY. Read the file COPYING for more details.\n"));
 	gtk_box_pack_start(GTK_BOX(body->page0), w, FALSE, FALSE, 0);
 
-	/* Display something about the FAM support. */
-#if defined HAVE_FAM
-	if(fam_is_active())
-		w = gtk_label_new(_("FAM: Supported and active."));
-	else
-		w = gtk_label_new(_("FAM: Supported, but not active."));
-#else
-	w = gtk_label_new(_("FAM: Not supported."));
-#endif
-	gtk_box_pack_start(GTK_BOX(body->page0), w, FALSE, FALSE, 0);
-
 	/* Inform user which interface strings are being used. */
 #if defined ENABLE_NLS
 	w = gtk_label_new(_("NLS: Supported, using built-in English strings."));
@@ -126,19 +115,23 @@
 		gtk_box_pack_start(GTK_BOX(body->page0), w, FALSE, FALSE, 0);
 
 	gtk_notebook_append_page(GTK_NOTEBOOK(body->notebook), body->page0, NULL);
-	body->page1 = gtk_label_new(	_("The author of gentoo can be reached via Internet\n"
-					"e-mail at <emil@obsession.se>; feel free to let\n"
+	g_snprintf(page2, sizeof page2, _("The author of gentoo can be reached via Internet\n"
+					"e-mail at <a href=\"mailto:%s\">%s</a>; feel free to let\n"
 					"me know what you think of this software, give\n"
 					"suggestions/bug reports, and so on.\n\n"
 
 					"The latest release of gentoo can always be down-\n"
 					"loaded from the official gentoo project homepage at\n"
-					"<http://www.obsession.se/gentoo/>. New releases are\n"
+					"<a href=\"%s\">%s</a>. New releases are\n"
 					"typically announced on the Freshmeat service at\n"
-					"<http://freshmeat.net/>."));
+					"<a href=\"http://freshmeat.net/\">freshmeat.net</a>."),
+					PACKAGE_BUGREPORT, PACKAGE_BUGREPORT,
+					PACKAGE_URL, PACKAGE_URL);
+	body->page1 = gtk_label_new(NULL);
+	gtk_label_set_markup(GTK_LABEL(body->page1), page2);
 	gtk_notebook_append_page(GTK_NOTEBOOK(body->notebook), body->page1, NULL);
 
-	body->handle = gtk_timeout_add(10000, timeout_trigger, body);
+	body->handle = g_timeout_add(10000, timeout_trigger, body);
 	dlg_dialog_async_new(body->notebook, _("About gentoo"), _("_OK (Wait for More)"), timeout_remove, body);
 
 	return 1;

gentoo-0.15.6.tar.bz2/src/cmd_chmod.c -> gentoo-0.19.9.tar.gz/src/cmd_chmod.c Changed

@@ -2,12 +2,12 @@
 ** 1998-05-29 -	A command to change the access flags of a file or directory.
 **		Made significantly simpler by the new cmd_generic module.
 ** 1999-03-06 -	Adapted for new selection/generic handling.
+** 2010-03-02 -	GIO porting more or less complete.
 */
 
 #include "gentoo.h"
 #include "errors.h"
 #include "dirpane.h"
-#include "fileutil.h"
 #include "strutil.h"
 #include "window.h"
 
@@ -89,94 +89,85 @@
 	set_texts(chm, mode);
 }
 
-static void chm_body(MainInfo *min, DirPane *src, DirRow *row, gpointer user)
+static void chm_body(MainInfo *min, DirPane *src, DirRow2 *row, gpointer gen, gpointer user)
 {
 	ChmInfo		*chm = user;
 	gchar		temp2 * FILENAME_MAX + 128;
-	mode_t		mode = DP_ROW_LSTAT(row).st_mode;
+	mode_t		mode = dp_row_get_mode(dp_get_tree_model(src), row);
 
-	g_snprintf(temp, sizeof temp, _("Set protection bits for \"%s\":"), DP_ROW_NAMED(row));
+	g_snprintf(temp, sizeof temp, _("Set protection bits for \"%s\":"), dp_row_get_name_display(dp_get_tree_model(src), row));
 	gtk_label_set_text(GTK_LABEL(chm->label), temp);
 	set_checks(chm, chm->last_mode = (mode & 07777));
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
-static gboolean chmod_file(MainInfo *min, const gchar *name, mode_t mode)
+static gboolean chmod_gfile(MainInfo *min, DirPane *src, const GFile *file, mode_t mode, gboolean recurse, gboolean nodirs, GError **err)
 {
-	errno = 0;
-	if(chmod(name, mode) != 0)
-	{
-		err_set(min, errno, CMD_ID, name);
-		return 0;
-	}
-	return 1;
-}
+	GFileInfo	*fi;
+	gboolean	ok = FALSE;
 
-static gboolean chmod_dir(MainInfo *min, const gchar *name, mode_t mode, gboolean recurse, gboolean nodirs)
-{
-	errno = 0;
-	if(nodirs || chmod(name, mode) == 0)
+	if((fi = g_file_query_info((GFile *) file, G_FILE_ATTRIBUTE_STANDARD_TYPE "," G_FILE_ATTRIBUTE_UNIX_MODE, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, err)) != NULL)
 	{
-		if(recurse)
+		const gboolean	isdir = (g_file_info_get_file_type(fi) == G_FILE_TYPE_DIRECTORY);
+
+		/* Don't try to change the file's type. */
+		g_file_info_remove_attribute(fi, G_FILE_ATTRIBUTE_STANDARD_TYPE);
+
+		/* If non-directory or we're attacking dirs, set the mode first. */
+		if(!isdir || !nodirs)
 		{
-			gchar	old_dirPATH_MAX;
-			DIR	*dir;
+			g_file_info_set_attribute_uint32(fi, G_FILE_ATTRIBUTE_UNIX_MODE, mode);
+			ok = g_file_set_attributes_from_info((GFile *) file, fi, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, err);
+		}
+		else
+			ok = TRUE;
+		/* Drop the info, we're done. */
+		g_object_unref(fi);
 
-			if(!fut_cd(name, old_dir, sizeof old_dir))
-				return FALSE;
+		/* If successful so far, consider recursing. */
+		if(ok && isdir && recurse)
+		{
+			GFileEnumerator	*fe;
 
-			if((dir = opendir(".")) != NULL)
+			if((fe = g_file_enumerate_children((GFile *) file, "standard::name,unix::mode", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, err)) != NULL)
 			{
-				struct dirent	*de;
-				struct stat	stat;
-				gboolean	ok = TRUE;
+				GFileInfo	*cfi;
+				GFile		*child;
 
-				while(errno == 0 && ((de = readdir(dir)) != NULL) && ok)
+				while(ok && (cfi = g_file_enumerator_next_file(fe, NULL, err)) != NULL)
 				{
-					if(!min->cfg.dir_filter(de->d_name))
-						continue;
-					if(lstat(de->d_name, &stat) == 0)
+					if((child = g_file_get_child((GFile *) file, g_file_info_get_name(cfi))) != NULL)
 					{
-						gchar	bufPATH_MAX;
-
-						g_snprintf(buf, sizeof buf, "%s%c%s", name, G_DIR_SEPARATOR, de->d_name);
-						if(S_ISDIR(stat.st_mode))
-							ok = chmod_dir(min, de->d_name, mode, recurse, nodirs);
-						else
-							ok = chmod_file(min, de->d_name, mode);
+						ok = chmod_gfile(min, src, child, mode, recurse, nodirs, err);
+						g_object_unref(child);
 					}
+					else
+						ok = FALSE;
+					g_object_unref(cfi);
 				}
-				closedir(dir);
+				g_object_unref(fe);
 			}
-			fut_cd(old_dir, NULL, 0U);
+			else
+				ok = FALSE;
 		}
 	}
-	else
-		err_set(min, errno, CMD_ID, name);
-	return errno == 0;
+	return ok;
 }
 
-static gint chm_action(MainInfo *min, DirPane *src, DirPane *dst, DirRow *row, gpointer user)
+static gint chm_action(MainInfo *min, DirPane *src, DirPane *dst, DirRow2 *row, GError **err, gpointer user)
 {
-	ChmInfo	*chm = user;
-	mode_t	mode;
-	gint	ok;
-
-	if(!fut_cd(src->dir.path, NULL, 0))
-		return 0;
-
-	mode = get_checks(chm);
+	ChmInfo		*chm = user;
+	const mode_t	mode = get_checks(chm);
+	GFile		*dfile;
+	gboolean	ok;
 
 	chm->last_recurse = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(chm->recurse));
 	chm->last_nodirs  = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(chm->nodirs));
-
-	if(S_ISDIR(DP_ROW_LSTAT(row).st_mode))
-		ok = chmod_dir(min, DP_ROW_NAME(row), mode, chm->last_recurse, chm->last_nodirs);
-	else
-		ok = chmod_file(min, DP_ROW_NAME(row), mode);
+	dfile = dp_get_file_from_row(src, row);
+	ok = chmod_gfile(min, src, dfile, mode, chm->last_recurse, chm->last_nodirs, err);
 	if(ok)
-		dp_unselect(src, DP_ROW_INDEX(src, row));
+		dp_unselect(src, row);
 
 	return ok;
 }
@@ -241,12 +232,14 @@
 	hbox = gtk_hbox_new(FALSE, 0);
 	w = gtk_label_new(_("Textual"));
 	gtk_box_pack_start(GTK_BOX(hbox), w, FALSE, FALSE, 0);
-	ci.entry_text = gtk_entry_new_with_max_length(10);
+	ci.entry_text = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(ci.entry_text), 10);
 	gtk_entry_set_width_chars(GTK_ENTRY(ci.entry_text), 10);
 	gtk_editable_set_editable(GTK_EDITABLE(ci.entry_text), FALSE);
 	gtk_box_pack_start(GTK_BOX(hbox), ci.entry_text, FALSE, FALSE, 0);
 
-	ci.entry_octal = gtk_entry_new_with_max_length(4);
+	ci.entry_octal = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(ci.entry_octal),  4);
 	gtk_entry_set_width_chars(GTK_ENTRY(ci.entry_octal), 4);
 	gtk_editable_set_editable(GTK_EDITABLE(ci.entry_octal), FALSE);
 	gtk_box_pack_end(GTK_BOX(hbox), ci.entry_octal, FALSE, FALSE, 0);

gentoo-0.15.6.tar.bz2/src/cmd_chown.c -> gentoo-0.19.9.tar.gz/src/cmd_chown.c Changed

@@ -11,6 +11,7 @@
 **		lists. Also allows user to type in either number or name of the
 **		desired user and/or group directly. All in all, a lot smoother.
 ** 2001-04-24 -	Added recursion option.
+** 2010-03-02 -	Rewritten using GIO.
 */
 
 #include "gentoo.h"
@@ -48,14 +49,14 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-static void cho_body(MainInfo *min, DirPane *src, DirRow *row, gpointer user)
+static void cho_body(MainInfo *min, DirPane *src, DirRow2 *row, gpointer gen, gpointer user)
 {
 	gchar	label2 * MAXNAMLEN + 64;
 	ChoInfo	*cho = user;
 
-	g_snprintf(label, sizeof label, _("Set Ownership for '%s':"), DP_ROW_NAMED(row));
+	g_snprintf(label, sizeof label, _("Set Ownership for '%s':"), dp_row_get_name_display(dp_get_tree_model(src), row));
 	gtk_label_set_text(GTK_LABEL(cho->label), label);
-	gtk_widget_grab_focus(GTK_COMBO(cho->row0.combo)->entry);
+	gtk_widget_grab_focus(cho->row0.combo);
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -79,100 +80,91 @@
 
 static gboolean get_own(ChoInfo *cho, uid_t *owner, gid_t *group)
 {
-	const gchar	*text;
+	gchar		*text;
 	long		tmp;
+	gboolean	ok = FALSE;
 
-	if((text = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(cho->row0.combo)->entry))) == NULL)
+	if((text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(cho->row0.combo))) == NULL)
 		return FALSE;
 	if(parse_or_lookup(text, usr_lookup_uid, &tmp))
-		*owner = tmp;
-	else
-		return FALSE;
-	if((text = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(cho->row1.combo)->entry))) == NULL)
-		return FALSE;
-	if(parse_or_lookup(text, usr_lookup_gid, &tmp))
 	{
-		*group = tmp;
-		return TRUE;
+		*owner = tmp;
+		g_free(text);
+		if((text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(cho->row1.combo))) != NULL)
+		{
+			if(parse_or_lookup(text, usr_lookup_gid, &tmp))
+			{
+				*group = tmp;
+				ok = TRUE;
+			}
+		}
 	}
-	return FALSE;
-}
-
-static gboolean chown_file(MainInfo *min, const gchar *name, uid_t owner, gid_t group)
-{
-	gboolean	ok;
-
-	ok = chown(name, owner, group) == 0;
-	if(!ok)
-		err_set(min, errno, CMD_ID, name);
+	g_free(text);
 	return ok;
 }
 
-static gboolean chown_dir(MainInfo *min, const gchar *name, uid_t owner, gid_t group, gboolean recurse)
+static gboolean chown_gfile(MainInfo *min, GFile *file, uid_t owner, gid_t group, gboolean recurse, GError **err)
 {
-	gboolean	ok;
+	gboolean	ok = FALSE;
+	GFileInfo	*info;
+	GFileType	type;
 
-	ok = chown(name, owner, group) == 0;
-	if(ok && recurse)
+	if(file != NULL && (info = g_file_query_info(file, G_FILE_ATTRIBUTE_STANDARD_TYPE "," G_FILE_ATTRIBUTE_UNIX_UID "," G_FILE_ATTRIBUTE_UNIX_GID,
+						     G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, err)) != NULL)
 	{
-		gchar	old_dirPATH_MAX;
-		DIR	*dir;
-
-		if(!fut_cd(name, old_dir, sizeof old_dir))
-			return FALSE;
-
-		if((dir = opendir(".")) != NULL)
+		type = g_file_info_get_file_type(info);
+		/* Don't try to change the file's type; now that we've buffered it we can remove it. */
+		g_file_info_remove_attribute(info, G_FILE_ATTRIBUTE_STANDARD_TYPE);
+		g_file_info_set_attribute_uint32(info, G_FILE_ATTRIBUTE_UNIX_UID, owner);
+		g_file_info_set_attribute_uint32(info, G_FILE_ATTRIBUTE_UNIX_GID, group);
+		ok = g_file_set_attributes_from_info(file, info, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, err);
+		g_object_unref(info);	/* Drop this early, no point in holding recursively. */
+		if(ok)
 		{
-			struct dirent	*de;
-			struct stat	stat;
-
-			ok = TRUE;
-			while(!errno && ((de = readdir(dir)) != NULL) && ok)
+			if(type == G_FILE_TYPE_DIRECTORY && recurse)
 			{
-				if(!min->cfg.dir_filter(de->d_name))
-					continue;
-				if(lstat(de->d_name, &stat) == 0)
+				GFileEnumerator	*fen;
+
+				ok = FALSE;
+				if((fen = g_file_enumerate_children(file, G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, err)) != NULL)
 				{
-					gchar	bufPATH_MAX;
+					GFileInfo	*chi;
+
+					ok = TRUE;
+					while(ok && (chi = g_file_enumerator_next_file(fen, NULL, err)) != NULL)
+					{
+						GFile	*child = g_file_get_child(file, g_file_info_get_name(chi));
 
-					g_snprintf(buf, sizeof buf, "%s%c%s", name, G_DIR_SEPARATOR, de->d_name);
-					if(S_ISDIR(stat.st_mode))
-						ok = chown_dir(min, de->d_name, owner, group, recurse);
-					else
-						ok = chown_file(min, de->d_name, owner, group);
+						ok = chown_gfile(min, child, owner, group, recurse, err);
+						g_object_unref(child);
+					}
+					g_object_unref(fen);
 				}
-				else
-					ok = FALSE;
 			}
-			closedir(dir);
 		}
-		else
-			ok = FALSE;
-		fut_cd(old_dir, NULL, 0U);
 	}
-	if(!ok)
-		err_set(min, errno, CMD_ID, name);
 	return ok;
 }
 
-static gint cho_action(MainInfo *min, DirPane *src, DirPane *dst, DirRow *row, gpointer user)
+static gint cho_action(MainInfo *min, DirPane *src, DirPane *dst, DirRow2 *row, GError **err, gpointer user)
 {
 	ChoInfo		*cho = user;
 	uid_t		owner = 0;
 	gid_t		group = 0;
-	gboolean	ok;
+	GFile		*file;
+	gboolean	ok = FALSE;
 
-	if(!fut_cd(src->dir.path, NULL, 0))
-		return 0;
-	get_own(cho, &owner, &group);
+	if(!get_own(cho, &owner, &group))
+		return FALSE;
 	cho->last_recurse = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cho->recurse));
-
-	if(S_ISDIR(DP_ROW_LSTAT(row).st_mode))
-		ok = chown_dir(min,  DP_ROW_NAME(row), owner, group, cho->last_recurse);
-	else
-		ok = chown_file(min, DP_ROW_NAME(row), owner, group);
+	if((file = dp_get_file_from_row(src, row)) != NULL)
+	{
+		ok = chown_gfile(min, file, owner, group, cho->last_recurse, err);
+		g_object_unref(file);
+	}
 	if(ok)
-		dp_unselect(src, DP_ROW_INDEX(src, row));
+		dp_unselect(src, row);
+
 	return ok;
 }
 
@@ -184,7 +176,7 @@
 	gchar		*labtext = { N_("User"), N_("Group") };
 	gint		i, index;
 	GtkWidget	*algn, *label;
-	GList		*list;
+	GList		*list, *iter;
 	static ChoInfo	cho;
 
 	cho.vbox  = gtk_vbox_new(FALSE, 0);
@@ -198,10 +190,11 @@
 		label = gtk_label_new(_(labtexti));
 		gtk_container_add(GTK_CONTAINER(algn), label);
 		gtk_table_attach(GTK_TABLE(cho.rowtable), algn, 0, 1, i, i+1,  GTK_FILL,0,0,0);
-		cho.rowi.combo = gtk_combo_new();
+		cho.rowi.combo = gtk_combo_box_entry_new_text();
 		list = usr_string_list_create(cati, cati == UIC_USER ? geteuid() : getgid(), &index);
-		gtk_combo_set_popdown_strings(GTK_COMBO(cho.rowi.combo), list);
-		gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(cho.rowi.combo)->entry), g_list_nth_data(list, index));
+		for(iter = list; iter != NULL; iter = g_list_next(iter))
+			gtk_combo_box_append_text(GTK_COMBO_BOX(cho.rowi.combo), iter->data);
+		gtk_combo_box_set_active(GTK_COMBO_BOX(cho.rowi.combo), index);
 		usr_string_list_destroy(list);
 		gtk_table_attach_defaults(GTK_TABLE(cho.rowtable), cho.rowi.combo, 1, 2, i, i+1);
 	}
@@ -210,5 +203,5 @@
 	gtk_box_pack_start(GTK_BOX(cho.vbox), cho.recurse, FALSE, FALSE, 0);
 	gtk_widget_show_all(cho.vbox);
 
-	return cmd_generic(min, _("Change Ownership"), CGF_NODST, cho_body, cho_action, NULL, &cho);
+	return cmd_generic(min, _("Change Ownership"), CGF_SRC | CGF_NODST, cho_body, cho_action, NULL, &cho);
 }

gentoo-0.15.6.tar.bz2/src/cmd_copy.c -> gentoo-0.19.9.tar.gz/src/cmd_copy.c Changed

@@ -54,321 +54,107 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 2001-04-29 -	Copy access and modification dates from <from> to (freshly created) <to>.
-**		If <from_stat> is NULL, a local stat() call is made.
-*/
-static void copy_dates(const gchar *from, const struct stat *from_stat, const gchar *to)
+static void cb_progress(goffset pos, goffset total, gpointer user)
 {
-	struct stat	sbuf;
-	struct utimbuf	tim;
-
-	if(!copy_options.copy_dates)
-		return;
-	if(from_stat == NULL)
-	{
-		if(lstat(from, &sbuf) != 0)
-			return;
-		from_stat = &sbuf;
-	}
-	tim.actime  = from_stat->st_atime;
-	tim.modtime = from_stat->st_mtime;
-	utime(to, &tim);	/* Implicit error handling through errno assumed. */
+	pgs_progress_item_update(user, pos);
 }
 
-/* 2002-03-09 -	Copy mode from <from> to <to>. */
-static void copy_mode(const gchar *from, const struct stat *from_stat, const gchar *to)
+static gboolean copy_gfile_regular(MainInfo *min, DirPane *src, DirPane *dst, GFile *from, GFile *to, GError **err)
 {
-	struct stat	sbuf;
-
-	if(from_stat == NULL)
-	{
-		if(lstat(from, &sbuf) != 0)
-			return;
-		from_stat = &sbuf;
-	}
-	chmod(to, from_stat->st_mode);
+	/* Yeah, time for some seriously heavy lifting. Luckily, not by me. :) */
+	return g_file_copy(from, to, G_FILE_COPY_NONE, pgs_progress_get_cancellable(), cb_progress, min, err);
 }
 
-static void copy_owner(const char *from, const struct stat *from_stat, const char *to)
+static gboolean copy_gfile_symlink(MainInfo *min, DirPane *src, DirPane *dst, GFile *from, GFile *to, GError **err)
 {
-	struct stat	sbuf;
-
-	if(from_stat == NULL)
-	{
-		if(lstat(from, &sbuf) != 0)
-			return;
-		from_stat = &sbuf;
-	}
-	chown(to, from_stat->st_uid, from_stat->st_gid);
+	/* This is just a copy, so it might be merged with copy_gfile_regular(), above. */
+	return g_file_copy(from, to, G_FILE_COPY_NOFOLLOW_SYMLINKS, pgs_progress_get_cancellable(), cb_progress, min, err);
 }
 
-/* 2003-10-21 -	Copy attributes: dates, mode/protection flags and owner. Optionally hides error. */
-static gboolean copy_attributes(const char *from, const struct stat *from_stat, const char *to)
+static gboolean copy_gfile_directory(MainInfo *min, DirPane *src, DirPane *dst, GFile *from, GFile *to, GError **err)
 {
-	gint		old_errno = errno;
-	gboolean	ret;
-
-	if(from_stat == NULL)
-	{
-		static struct stat	sbuf;
-
-		if(lstat(from, &sbuf) == 0)
-			from_stat = &sbuf;
-		else
-			return FALSE;
-	}
-
-	errno = 0;
-	copy_dates(from, from_stat, to);
-	copy_mode(from,  from_stat, to);
-	copy_owner(from, from_stat, to);
-	if(copy_options.ignore_attrib_err)
-		errno = old_errno;
-	ret = errno == 0;
-	return ret;
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 2003-11-24 -	Placeholder. Implement! */
-gboolean copy_socket(MainInfo *min, const gchar *from, const gchar *full_to, const struct stat *sstat)
-{
-	return FALSE;
-}
-
-/* 2003-11-25 -	Copy a symbolic link. Does not alter the contents of the link, which might mean
-**		that links break.
-*/
-gboolean copy_link(MainInfo *min, const gchar *from, const gchar *full_to, const struct stat *sstat)
-{
-	gchar	bufPATH_MAX;
-	gint	len;
-
-	if((len = readlink(from, buf, sizeof buf - 1)) > 0)
-	{
-		buflen = '\0';
-		symlink(buf, full_to);
-		/* Don't try copying any attributes for symlink, it won't fly! */
-	}
-	if(errno)
-		err_set(min, errno, CMD_ID, from);
-	return (errno == 0) ? TRUE : FALSE;
-}
-
-/* 2003-11-24 -	Copy a FIFO. */
-gboolean copy_fifo(MainInfo *min, const gchar *from, const gchar *full_to, const struct stat *sstat)
-{
-	pgs_progress_item_begin(min, full_to, 0);
-	if(mkfifo(full_to, sstat->st_mode) == 0)
-		copy_attributes(from, sstat, full_to);
-	pgs_progress_item_end(min);
-	return errno == 0;
-}
-
-/* 1998-05-31 -	Copy a device special file. Pretty simple, since there are no contents
-**		to worry about. Note that non-root users rarely have enough power for this.
-** 1998-09-12 -	Modified; the <full_to> parameter now gives the complete destination name.
-*/
-gboolean copy_device(MainInfo *min, const gchar *from, const gchar *full_to, const struct stat *sstat)
-{
-	struct stat	stat;
+	GFileEnumerator	*fe;
+	GFileInfo	*fi;
+	gboolean	ok = TRUE;
+
+	/* First create the destination directory. It must be possible without overwriting
+	 * anything, gentoo's copy semantics do not allow merge on copy.
+	*/
+	if(!g_file_make_directory(to, NULL, err))
+		return FALSE;
 
-	if(sstat == NULL)
+	/* Now iterate over the children of the source, and copy each file contained therein. */
+	if((fe = g_file_enumerate_children(from, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, err)) == NULL)
+		return FALSE;
+	while(ok && (fi = g_file_enumerator_next_file(fe, NULL, err)) != NULL)
 	{
-		if(lstat(from, &stat) == 0)
-			sstat = &stat;
-		else
-		{
-			err_set(min, errno, CMD_ID, from);
-			return FALSE;
-		}
-	}
-	pgs_progress_item_begin(min, full_to, stat.st_size);
-	if(mknod(full_to, sstat->st_mode, sstat->st_rdev) == 0)
-		copy_attributes(from, sstat, full_to);
-	pgs_progress_item_update(min, sstat->st_size);
-	pgs_progress_item_end(min);
-	if(errno)
-		err_set(min, errno, CMD_ID, from);
-	return (errno == 0) ? TRUE : FALSE;
-}
-
-/* 2003-11-24 -	Copy regular file. */
-gboolean copy_regular(MainInfo *min, const gchar *from, const gchar *full_to, const struct stat *sstat)
-{
-	gint	fd_in, fd_out;
-	off_t	put = 0;
+		GFile	*sfile, *dfile;
 
-	pgs_progress_item_begin(min, full_to, sstat->st_size);
-	if((fd_in = open(from, O_RDONLY)) >= 0)
-	{
-		if((fd_out = open(full_to, O_CREAT | O_WRONLY | O_TRUNC, sstat->st_mode | S_IWUSR)) >= 0)
-		{
-			put = fut_copy(fd_in, fd_out, copy_options.buf_size);
-			close(fd_out);
-		}
-		close(fd_in);
-		if((errno == 0) && (put == sstat->st_size))
-			copy_attributes(from, sstat, full_to);
-	}
-	pgs_progress_item_end(min);
-	if(errno)
-	{
-		if((put == sstat->st_size) && (put > 0) && (copy_options.leave_fullsize))	/* Leave fullsized copy? */
+		ok = FALSE;
+		if((sfile = g_file_get_child(from, g_file_info_get_name(fi))) != NULL)
 		{
-			errno = 0;
-			return TRUE;
+			if((dfile = g_file_get_child(to, g_file_info_get_name(fi))) != NULL)
+			{
+				ok = copy_gfile(min, src, dst, sfile, dfile, err);
+				g_object_unref(dfile);
+			}
+			g_object_unref(sfile);
 		}
-		err_set(min, errno, CMD_ID, full_to);
-		if(fut_exists(full_to))				/* Preserves errno. */
-			unlink(full_to);			/* Attempt to remove failed destination file. */
+		g_object_unref(fi);
 	}
-	return (sstat->st_size == 0 || put == sstat->st_size) && (errno == 0);
-}
+	g_object_unref(fe);
 
-/* 2003-11-24 -	Copy a "file". Since we speak Unix here, a file can actually be quite a lot,
-**		the core defining criteria is mainly that a file is not a directory. It can be
-**		a regular file, a device special file, a symlink, a fifo, or maybe even a socket.
-*/
-gboolean copy_file(MainInfo *min, const gchar *from, const gchar *full_to, const struct stat *sstat)
-{
-	struct stat	stat;
-	OvwRes		owres;
-
-	/* We really need to stat() the source in order to copy it. */
-	if(sstat == NULL)
-	{
-		if(lstat(from, &stat) == 0)
-			sstat = &stat;
-		else
-		{
-			err_set(min, errno, CMD_ID, from);
-			return FALSE;
-		}
-	}
-	/* Check for overwrite, and clear the way if necessary. */
-	owres = ovw_overwrite_file(min, full_to, from);
-	if(owres == OVW_SKIP)
-		return TRUE;
-	else if(owres == OVW_CANCEL)
-		return FALSE;
-	else if(owres == OVW_PROCEED_FILE)
-		del_delete_file(min, full_to);
-	else if(owres == OVW_PROCEED_DIR)
-		del_delete_dir(min, full_to, FALSE);
-	/* Look at the mode stat field, and call the correct copying function. */
-	err_clear(min);
-	if(S_ISREG(sstat->st_mode))
-		return copy_regular(min, from, full_to, sstat);
-	else if(S_ISBLK(sstat->st_mode) || S_ISCHR(sstat->st_mode))
-		return copy_device(min, from, full_to, sstat);
-	else if(S_ISLNK(sstat->st_mode))
-		return copy_link(min, from, full_to, sstat);
-	else if(S_ISFIFO(sstat->st_mode))
-		return copy_fifo(min, from, full_to, sstat);
-	else if(S_ISSOCK(sstat->st_mode))
-		return copy_socket(min, from, full_to, sstat);
-	return FALSE;
+	return ok;
 }
 
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1998-05-21 -	Copy a directory recursively, by first creating the appropriate
-**		destination directory, and then copying all the source's contents
-**		there. When directories are found in the source, this function is
-**		called again to copy them.
-** 1998-06-07 -	Added more error checking (now aborts on first failure, returning 0).
-**		Does not remove partially failed directories.
-** 1998-09-12 -	Modified; the <dest_name> is now the COMPLETE destination; it is
-**		created directly, without appending anything. Also changed the order of
-**		the fut_cd() and mkdir() calls, for better handling of unreable dirs.
-** 2002-07-13 -	Will now completely delete an existing directory before copying.
-** 2003-10-06 -	No longer deletes existing directory, only non-dir on name collision.
-** 2003-10-12 -	Added simplistic check against source-contains-dest copying.
-*/
-gboolean copy_dir(MainInfo *min, const gchar *from, const gchar *dest_name)
+/* 2009-09-09 -	Copies a file, using GIO. Neither file is freed. The file could be a directory. */
+gboolean copy_gfile(MainInfo *min, DirPane *src, DirPane *dst, GFile *from, GFile *to, GError **err)
 {
-	gboolean	aborted = FALSE;
-	gchar		old_dirPATH_MAX;
-	DIR		*dir;
-	struct dirent	*de;
-	struct stat	sstat;
-	OvwRes		owres;
+	GFileInfo	*fi;
+	gboolean	ok;
 
-	if(fut_is_parent_of(from, dest_name))
-	{
-		gchar	ebuf2 * PATH_MAX + 128;
-
-		g_snprintf(ebuf, sizeof ebuf, _("Can't copy directory \"%s\"\nto \"%s\":\nthe source contains the destination."), from, dest_name);
-		dlg_dialog_async_new_error(ebuf);
+	if(min == NULL || from == NULL || to == NULL)
 		return FALSE;
-	}
 
-	if(lstat(from, &sstat) != 0)
-	{
-		err_set(min, errno, CMD_ID, from);
-		return FALSE;
-	}
-	owres = ovw_overwrite_file(min, dest_name, from);
-	switch(owres)
+	switch(ovw_overwrite_unary_file(dst, to))
 	{
 	case OVW_SKIP:
 		return TRUE;
 	case OVW_CANCEL:
 		return FALSE;
+	case OVW_PROCEED:
+		break;
 	case OVW_PROCEED_FILE:
-		if(!del_delete_file(min, dest_name))
-		{
-			err_set(min, errno, CMD_ID, dest_name);
+	case OVW_PROCEED_DIR:
+		if(!del_delete_gfile(min, to, FALSE, err))
 			return FALSE;
-		}
+	}
+	if((fi = g_file_query_info(from, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, err)) == NULL)
+		return FALSE;
+	switch(g_file_info_get_file_type(fi))
+	{
+	case G_FILE_TYPE_REGULAR:
+		pgs_progress_item_begin(min, g_file_info_get_display_name(fi), g_file_info_get_size(fi));
+		ok = copy_gfile_regular(min, src, dst, from, to, err);
+		pgs_progress_item_end(min);
 		break;
-	case OVW_PROCEED:
-	case OVW_PROCEED_DIR:
+	case G_FILE_TYPE_DIRECTORY:
+		pgs_progress_item_begin(min, g_file_info_get_display_name(fi), g_file_info_get_size(fi));
+		ok = copy_gfile_directory(min, src, dst, from, to, err);
+		pgs_progress_item_end(min);
+		break;
+	case G_FILE_TYPE_SYMBOLIC_LINK:
+		pgs_progress_item_begin(min, g_file_info_get_display_name(fi), g_file_info_get_size(fi));
+		ok = copy_gfile_symlink(min, src, dst, from, to, err);
+		pgs_progress_item_end(min);
 		break;
+	default:
+		g_error("Not copying '%s', type is %d which is unsupported", g_file_info_get_name(fi), g_file_info_get_file_type(fi));
+		ok = FALSE;
 	}
+	g_object_unref(fi);
 
-	err_clear(min);
-	pgs_progress_item_begin(min, dest_name, sstat.st_size);
-	if(fut_cd(from, old_dir, sizeof old_dir))
-	{
-		if(owres == OVW_PROCEED_DIR || (mkdir(dest_name, sstat.st_mode | S_IWUSR) == 0))
-		{
-			if((dir = opendir(".")) != NULL)
-			{
-				while(!aborted && !errno && (de = readdir(dir)) != NULL)
-				{
-					struct stat	stat;
-
-					if(!min->cfg.dir_filter(de->d_name))
-						continue;
-					if(lstat(de->d_name, &stat) == 0)
-					{
-						gchar	dest2PATH_MAX;
-
-						g_snprintf(dest2, sizeof dest2, "%s%c%s", dest_name, G_DIR_SEPARATOR, de->d_name);
-						if(S_ISDIR(stat.st_mode))
-						{
-							if(!copy_dir(min, de->d_name, dest2))
-								aborted = TRUE;
-						}
-						else
-						{
-							if(!copy_file(min, de->d_name, dest2, &stat))
-								aborted = TRUE;
-						}
-					}
-				}
-				closedir(dir);
-			}
-		}
-		fut_cd(old_dir, NULL, 0);
-		copy_attributes(from, &sstat, dest_name);
-	}
-	pgs_progress_item_end(min);
-	if(errno)
-		err_set(min, errno, CMD_ID, from);
-	return (errno == 0 && !aborted) ? TRUE : FALSE;
+	return ok;
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -376,50 +162,41 @@
 /* 2003-11-24 -	Copy selected files and/or directories to destination pane's directory. */
 gint cmd_copy(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	gchar	old_pathPATH_MAX, destPATH_MAX;
-	guint	num = 0;
-	GSList	*slist, *iter;
-
-	err_clear(min);
+	GSList		*slist, *iter;
+	guint		num = 0;
+	gboolean	ok = TRUE;
+	GError		*err = NULL;
 
 	if((src == NULL) || (dst == NULL))
 		return 1;
-	if(!fut_cd(src->dir.path, old_path, sizeof old_path))
-		return 0;
 	if((slist = dp_get_selection(src)) == NULL)
 		return 1;
 
 	ovw_overwrite_begin(min, _("\"%s\" Already Exists - Proceed With Copy?"), 0UL);
 	pgs_progress_begin(min, _("Copying..."), PFLG_COUNT_RECURSIVE | PFLG_ITEM_VISIBLE | PFLG_BYTE_VISIBLE);
-	for(iter = slist; !errno && (iter != NULL); iter = g_slist_next(iter))
+	for(iter = slist; ok && (iter != NULL); iter = g_slist_next(iter))
 	{
-		g_snprintf(dest, sizeof dest, "%s/%s", dst->dir.path, DP_SEL_NAME(iter));
-		if(S_ISDIR(DP_SEL_LSTAT(iter).st_mode))
+		GFile	*sf, *df;
+
+		sf = dp_get_file_from_row(src, iter->data);
+		df = dp_get_file_from_name(dst, dp_row_get_name(dp_get_tree_model(src), iter->data));
+		if((ok = copy_gfile(min, src, dst, sf, df, &err)))
 		{
-			if(!copy_dir(min, DP_SEL_NAME(iter), dest))
-				break;
+			dp_unselect(src, iter->data);
+			num++;
 		}
 		else
-		{
-			if(!copy_file(min, DP_SEL_NAME(iter), dest, &DP_SEL_LSTAT(iter)))
-				break;
-		}
-		if(errno == 0)
-			dp_unselect(src, DP_SEL_INDEX(src, iter));
-		num++;
+			err_set_gerror(min, &err, CMD_ID, sf);
+		g_object_unref(df);
+		g_object_unref(sf);
 	}
-	if(num)
+	if(num > 0)
 		dp_rescan_post_cmd(dst);
 	pgs_progress_end(min);
 	ovw_overwrite_end(min);
-	fut_cd(old_path, NULL, 0);
-
-	if(errno && iter != NULL)
-		err_set(min, errno, CMD_ID, dp_full_name(src, DP_SEL_INDEX(src, iter)));
 	dp_free_selection(slist);
-	err_show(min);
 
-	return errno == 0;
+	return ok;
 }
 
 /* ----------------------------------------------------------------------------------------- */

gentoo-0.15.6.tar.bz2/src/cmd_copy.h -> gentoo-0.19.9.tar.gz/src/cmd_copy.h Changed

gentoo-0.15.6.tar.bz2/src/cmd_copyas.c -> gentoo-0.19.9.tar.gz/src/cmd_copyas.c Changed

@@ -9,8 +9,6 @@
 */
 
 #include "gentoo.h"
-#include "convutil.h"
-#include "fileutil.h"
 #include "dirpane.h"
 #include "errors.h"
 #include "overwrite.h"
@@ -40,22 +38,24 @@
 /* ----------------------------------------------------------------------------------------- */
 
 /* 1998-09-12 -	Update body of copy as GUI. */
-static void cpa_copy_body(MainInfo *min, DirPane *src, DirRow *row, gpointer user)
+static void cpa_copy_body(MainInfo *min, DirPane *src, DirRow2 *row, gpointer gen, gpointer user)
 {
 	gchar		bufFILENAME_MAX + 32;
 	const gchar	*text;
 	CpaInfo		*cpa = user;
 
-	text = DP_ROW_NAMED(row);
+	text = dp_row_get_name_display(dp_get_tree_model(src), row);
 	if(cpa->action == CPA_COPYAS)
 		g_snprintf(buf, sizeof buf, _("Enter Name for Copy of \"%s\""), text);
 	else
 		g_snprintf(buf, sizeof buf, _("Enter Name for Clone of \"%s\""), text);
 	gtk_label_set_text(GTK_LABEL(cpa->label), buf);
 	gtk_entry_set_text(GTK_ENTRY(cpa->entry), text);
-	gtk_entry_select_region(GTK_ENTRY(cpa->entry), 0, -1);
+	gtk_editable_select_region(GTK_EDITABLE(cpa->entry), 0, -1);
 	gtk_widget_grab_focus(cpa->entry);
 
+	cmd_generic_track_entry(gen, cpa->entry);
+
 	if(cpa->ovw_open == FALSE)
 	{
 		if(cpa->action == CPA_COPYAS)
@@ -68,22 +68,24 @@
 }
 
 /* 1999-05-30 -	Update body for symlink operation. */
-static void cpa_link_body(MainInfo *min, DirPane *src, DirRow *row, gpointer user)
+static void cpa_link_body(MainInfo *min, DirPane *src, DirRow2 *row, gpointer gen, gpointer user)
 {
 	gchar		bufFILENAME_MAX + 32;
 	const gchar	*text;
 	CpaInfo		*cpa = user;
 
-	text = DP_ROW_NAMED(row);
+	text = dp_row_get_name_display(dp_get_tree_model(src), row);
 	if(cpa->action == CPA_SYMLINKAS)
 		g_snprintf(buf, sizeof buf, _("Enter Name to Link \"%s\" As"), text);
 	else if(cpa->action == CPA_SYMLINKCLONE)
 		g_snprintf(buf, sizeof buf, _("Enter Name for Link Clone of \"%s\""), text);
 	gtk_label_set_text(GTK_LABEL(cpa->label), buf);
 	gtk_entry_set_text(GTK_ENTRY(cpa->entry), text);
-	gtk_entry_select_region(GTK_ENTRY(cpa->entry), 0, -1);
+	gtk_editable_select_region(GTK_EDITABLE(cpa->entry), 0, -1);
 	gtk_widget_grab_focus(cpa->entry);
 
+	cmd_generic_track_entry(gen, cpa->entry);
+
 	if(cpa->ovw_open == FALSE)
 	{
 		ovw_overwrite_begin(min, _("\"%s\" Already Exists - Proceed With Symlink?"), OVWF_NO_RECURSE_TEST);
@@ -92,90 +94,84 @@
 	}
 }
 
-static const gchar * op_name(CpaAction action)
+/* 2009-09-14 -	Creates a symbolic link at <dfile>, whose contents is the basename of <sfile>. */
+static gboolean symlink_gfile(MainInfo *min, DirPane *src, DirPane *dst, const GFile *gfile, const GFile *dfile, GError **error)
 {
-	switch(action)
+	gchar		*bn;
+	gboolean	ret = FALSE;
+
+	if(gfile == NULL || dfile == NULL)
+		return FALSE;
+	if((bn = g_file_get_basename((GFile *) gfile)) != NULL)
 	{
-		case CPA_COPYAS:	return "CopyAs";
-		case CPA_CLONE:		return "Clone";
-		case CPA_SYMLINKAS:	return "SymLinkAs";
-		case CPA_SYMLINKCLONE:	return "SymLinkClone";
+		ret = g_file_make_symbolic_link((GFile *) dfile, bn, NULL, error);
+		g_free(bn);
 	}
-	return NULL;
+	return ret;
 }
 
 /* 1998-09-12 -	Perform action for copy as/clone command. */
-static gint cpa_action(MainInfo *min, DirPane *src, DirPane *dst, DirRow *row, gpointer user)
+static gint cpa_action(MainInfo *min, DirPane *src, DirPane *dst, DirRow2 *row, GError **error, gpointer user)
 {
-	const gchar		*text;
-	gchar			destPATH_MAX, *file;
-	CpaInfo			*cpa = user;
-	OvwRes			ores;
+	const gchar	*text;
+	CpaInfo		*cpa = user;
+	OvwRes		ores;
+	GFile		*sfile = NULL, *dfile = NULL;
+	gint		ret;
 
-	if(!fut_cd(src->dir.path, NULL, 0))
+	text = gtk_entry_get_text(GTK_ENTRY(cpa->entry));
+	if(text == NULL || *text == '\0')
 		return 0;
 
-	text = gtk_entry_get_text(GTK_ENTRY(cpa->entry));
-	if(text && *text)
+	/* Enforce difference between clone and copy: clone name is without path. */
+	switch(cpa->action)
 	{
-		Conv		conv;
-
-		file = conv_begin(&conv, text);
-
-		/* Enforce difference between clone and copy: clone name is without path. */
-		switch(cpa->action)
-		{
-			case CPA_COPYAS:
-			case CPA_SYMLINKAS:
-				if(strchr(text, G_DIR_SEPARATOR) == NULL)
-					g_snprintf(dest, sizeof dest, "%s%s%s", dst->dir.path, G_DIR_SEPARATOR_S, file);
-				else
-					stu_strncpy(dest, file, sizeof dest);
-				break;
-			case CPA_CLONE:
-			case CPA_SYMLINKCLONE:
-				if(strchr(text, G_DIR_SEPARATOR) != NULL)
-				{
-					conv_end(&conv);
-					return 0;
-				}
-				g_snprintf(dest, sizeof dest, "%s%s%s", src->dir.path, G_DIR_SEPARATOR_S, file);
-				break;
-		}
-		conv_end(&conv);
-		ores = ovw_overwrite_file(min, dest, dp_full_name(src, DP_ROW_INDEX(src, row)));
-		if(ores == OVW_SKIP)
-			return 1;
-		else if(ores == OVW_CANCEL)
-		{
-			if(errno)
-				err_set(min, errno, op_name(cpa->action), dp_full_name(src, DP_ROW_INDEX(src, row)));
-			return 0;
-		}
-		else if(ores == OVW_PROCEED_FILE)
-		{
-			if(!del_delete_file(min, dest))
-				return 0;
-		}
-		else if(ores == OVW_PROCEED_DIR)
-		{
-			if(!del_delete_dir(min, dest, FALSE))
+		case CPA_COPYAS:
+		case CPA_SYMLINKAS:
+			if(g_utf8_strchr(text, -1, G_DIR_SEPARATOR) == NULL)
+				dfile = dp_get_file_from_name(dst, text);
+			else
+				dfile = g_file_parse_name(text);
+			break;
+		case CPA_CLONE:
+		case CPA_SYMLINKCLONE:
+			if(g_utf8_strchr(text, -1, G_DIR_SEPARATOR) != NULL)
 				return 0;
-		}
+			dfile = dp_get_file_from_name(src, text);
+			break;
+	}
+	if(dfile == NULL)
+		return 0;
 
-		if((cpa->action == CPA_COPYAS) || (cpa->action == CPA_CLONE))	/* Copy? */
+	ores = ovw_overwrite_unary_file(dst, dfile);
+	if(ores == OVW_SKIP)
+		ret = 1;
+	else if(ores == OVW_CANCEL)
+		ret = 0;
+	else
+	{
+		ret = 1;
+		if(ores == OVW_PROCEED_FILE || ores == OVW_PROCEED_DIR)
+			ret = del_delete_gfile(min, dfile, FALSE, error);
+		if(ret)
 		{
-			if(S_ISDIR(DP_ROW_LSTAT(row).st_mode))
-				copy_dir(min, DP_ROW_NAME(row), dest);
+			if((sfile = dp_get_file_from_row(src, row)) != NULL)
+			{
+				if((cpa->action == CPA_COPYAS) || (cpa->action == CPA_CLONE))	/* Copy? */
+					ret = copy_gfile(min, src, dst, sfile, dfile, error);
+				else
+					ret = symlink_gfile(min, src, dst, sfile, dfile, error);
+				g_object_unref(sfile);
+			}
 			else
-				copy_file(min, DP_ROW_NAME(row), dest, &DP_ROW_LSTAT(row));
+				ret = 0;
 		}
-		else								/* Link. */
-			symlink(dp_full_name(src, DP_ROW_INDEX(src, row)), dest);
 	}
-	if(errno == 0)
-		dp_unselect(src, DP_ROW_INDEX(src, row));
-	return errno == 0;
+	g_object_unref(dfile);
+	if(ret)
+		dp_unselect(src, row);
+
+	return ret;
 }
 
 static void cpa_free(gpointer user)
@@ -202,18 +198,19 @@
 
 	cpa.vbox = gtk_vbox_new(FALSE, 0);
 	cpa.label = gtk_label_new(_("Copy As"));
-	cpa.entry = gtk_entry_new_with_max_length(FILENAME_MAX - 1);
+	cpa.entry = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(cpa.entry), FILENAME_MAX - 1);
 	gtk_box_pack_start(GTK_BOX(cpa.vbox), cpa.label, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(cpa.vbox), cpa.entry, FALSE, FALSE, 0);
 
 	if(cpa.action == CPA_COPYAS)
 		return cmd_generic(min, _("Copy As"), CGF_NOALL, cpa_copy_body, cpa_action, cpa_free, &cpa);
 	else if(cpa.action == CPA_CLONE)
-		return cmd_generic(min, _("Clone"), CGF_NOALL | CGF_NODST | CGF_SRC, cpa_copy_body, cpa_action, cpa_free, &cpa);
+		return cmd_generic(min, _("Clone"), CGF_NOALL | CGF_NODST, cpa_copy_body, cpa_action, cpa_free, &cpa);
 	else if(cpa.action == CPA_SYMLINKAS)
 		return cmd_generic(min, _("Symbolic Link As"), CGF_NOALL, cpa_link_body, cpa_action, cpa_free, &cpa);
 	else if(cpa.action == CPA_SYMLINKCLONE)
-		return cmd_generic(min, _("Symbolic Link Clone"), CGF_NOALL | CGF_NODST | CGF_SRC, cpa_link_body, cpa_action, cpa_free, &cpa);
+		return cmd_generic(min, _("Symbolic Link Clone"), CGF_NOALL | CGF_NODST, cpa_link_body, cpa_action, cpa_free, &cpa);
 	return 0;
 }

gentoo-0.15.6.tar.bz2/src/cmd_delete.c -> gentoo-0.19.9.tar.gz/src/cmd_delete.c Changed

@@ -34,14 +34,15 @@
 
 typedef struct {			/* Options used by the "Delete" command. */
 	gboolean	modified;
-	gint	set_mode;
+	gint		set_mode;
 } OptDelete;
 
 static OptDelete	delete_options;
-static CmdCfg	*delete_cmc = NULL;
+static CmdCfg		*delete_cmc = NULL;
 
 /* ----------------------------------------------------------------------------------------- */
 
+#if 0
 static gboolean get_set_mode(MainInfo *min, const gchar *filename)
 {
 	if(delete_options.set_mode == MODE_ASK)
@@ -114,103 +115,85 @@
 	}
 	return FALSE;
 }
+#endif
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1999-05-29 -	Delete a plain file. This is capable of removing anything that is
-**		not a directory. For that, use del_delete_dir().
-*/
-gboolean del_delete_file(MainInfo *min, const gchar *path)
+static gboolean delete_gfile_dir(MainInfo *min, GFile *dir, gboolean progress, GError **err)
 {
-	gint	ret;
-
-	ret = unlink(path);
+	gboolean	ret = TRUE;
+	GFileEnumerator	*fe;
 
-	if(ret != 0)
+	if((fe = g_file_enumerate_children(dir, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, err)) != NULL)
 	{
-		if(set_mode(min, path, FALSE))
-		{
-			if(unlink(path) == 0)
-				return TRUE;
-		}
-		err_set(min, errno, CMD_ID, path);
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 2003-10-23 -	Broken out of del_delete_dir() to facilitate retry. */
-static gboolean do_delete_dir(MainInfo *min, const gchar *path, gboolean progress)
-{
-	gchar		old_dirPATH_MAX;
-	DIR		*dir;
-	struct dirent	*de;
-	struct stat	stat;
+		GFileInfo	*fi;
 
-	if(rmdir(path) == 0)					/* If it's empty, this saves time. */
-		return 1;
-	else if((errno == ENOTEMPTY) || (errno == EEXIST) ||	/* Wasn't empty. Enter and traverse. */
-		(errno == EACCES))				/* Samba seems to somehow report non-empty with EACCES. Weird. */ /*bront bront, does this live?*/
-	{
-		err_clear(min);					/* Error was expected, so ignore it. */
-		if(fut_cd(path, old_dir, sizeof old_dir))
+		while(ret && (fi = g_file_enumerator_next_file(fe, NULL, err)) != NULL)
 		{
-			if((dir = opendir(".")) != NULL)
+			GFile	*child;
+
+			child = g_file_get_child(dir, g_file_info_get_name(fi));
+			if(child != NULL)
 			{
-				while((de = readdir(dir)) != NULL)
+				switch(g_file_info_get_file_type(fi))
 				{
-					if(progress)
-					{
-						pgs_progress_item_begin(min, de->d_name, 0);
-						if(pgs_progress_item_update(min, 0) == PGS_CANCEL)
-						{
-							errno = EINTR;
-							break;
-						}
-						pgs_progress_item_end(min);
-					}
-					if(!min->cfg.dir_filter(de->d_name))
-						continue;
-					if(lstat(de->d_name, &stat) == 0)
-					{
-						if(S_ISDIR(stat.st_mode))
-						{
-							if(!del_delete_dir(min, de->d_name, progress))
-								break;
-						}
-						else
-						{
-							if(!del_delete_file(min, de->d_name))
-								break;
-						}
-					}
-					else
-						break;
+				case G_FILE_TYPE_REGULAR:
+				case G_FILE_TYPE_SYMBOLIC_LINK:
+				case G_FILE_TYPE_SPECIAL:
+				case G_FILE_TYPE_SHORTCUT:
+					ret = g_file_delete(child, NULL, err);
+					break;
+				case G_FILE_TYPE_DIRECTORY:
+					ret = delete_gfile_dir(min, child, progress, err);
+					break;
+				default:
+					ret = FALSE;
 				}
-				closedir(dir);
+				g_object_unref(child);
 			}
-			fut_cd(old_dir, NULL, 0);
-			if(errno == 0)		/* Don't try to rmdir() again if anything failed above. */
-				rmdir(path);
+			else
+				g_warning("Couldn't get child file");
+			g_object_unref(fi);
 		}
+		g_object_unref(fe);
 	}
-	if(errno)
-		err_set(min, errno, CMD_ID, path);
-	return (errno == 0) ? TRUE : FALSE;
+	if(ret)
+		ret = g_file_delete(dir, NULL, err);
+	return ret;
 }
 
-/* 1999-05-29 -	Delete a directory. */
-gboolean del_delete_dir(MainInfo *min, const gchar *path, gboolean progress)
+/* 2009-09-07 -	Delete a GFile. Takes no prisoners; if the indicated file is a directory,
+**		recursively deletes all there is.
+**
+**		The caller owns whatever ends up in <error>.
+*/
+gboolean del_delete_gfile(MainInfo *min, const GFile *file, gboolean progress, GError **error)
 {
-	if(!do_delete_dir(min, path, progress))
-	{
-		if(set_mode(min, path, TRUE))
-			return do_delete_dir(min, path, progress);
+	GFileInfo	*fi;
+	gboolean	ret = FALSE;
+
+	if(min == NULL || file == NULL)
 		return FALSE;
+
+	if((fi = g_file_query_info((GFile *) file, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, error)) != NULL)
+	{
+		switch(g_file_info_get_file_type(fi))
+		{
+		case G_FILE_TYPE_REGULAR:
+		case G_FILE_TYPE_SYMBOLIC_LINK:
+		case G_FILE_TYPE_SPECIAL:
+		case G_FILE_TYPE_SHORTCUT:
+			ret = g_file_delete((GFile *) file, NULL, error);
+			break;
+		case G_FILE_TYPE_DIRECTORY:
+			ret = delete_gfile_dir(min, (GFile *) file, progress, error);
+			break;
+		default:
+			ret = FALSE;
+		}
+		g_object_unref(fi);
 	}
-	return TRUE;
+	return ret;
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -220,15 +203,11 @@
 */
 gint cmd_delete(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	gchar		old_pathPATH_MAX;
-	const gchar	*dest;
-	gboolean	ok;
+	gboolean	ok = TRUE;
 	guint		num = 0;
-	OvwRes		ores;
 	GSList		*slist,	 *iter;
+	GError		*err = NULL;
 
-	if(!fut_cd(src->dir.path, old_path, sizeof old_path))
-		return 0;
 	if((slist = dp_get_selection(src)) == NULL)
 		return 1;
 
@@ -236,32 +215,43 @@
 	ovw_overwrite_begin(min, _("Really Delete \"%s\"?"), 0UL);
 	pgs_progress_begin(min, _("Deleting..."), PFLG_BUSY_MODE);
 	fam_rescan_block();
-	for(iter = slist; !errno && (iter != NULL); iter = g_slist_next(iter))
+	for(iter = slist; ok && (iter != NULL); iter = g_slist_next(iter))
 	{
-		dest = dp_full_name(src, DP_SEL_INDEX(src, iter));
-		pgs_progress_item_begin(min, dest, 0);
-		if(pgs_progress_item_update(min, 0) == PGS_CANCEL)
-		{
-			errno = EINTR;
-			break;
-		}
-		pgs_progress_item_end(min);
-		ores = ovw_overwrite_file(min, dest, NULL);
-		if(ores == OVW_SKIP)
-			continue;
-		else if(ores == OVW_CANCEL)
-			break;
-		if(S_ISDIR(DP_SEL_LSTAT(iter).st_mode))
-			ok = del_delete_dir(min, dest, TRUE);
-		else
-			ok = del_delete_file(min, dest);
-		if(ok)
+		DirRow2	*row = iter->data;
+		GFile	*file;
+
+		if((file = dp_get_file_from_row(src, iter->data)) != NULL)
 		{
-			dp_unselect(src, DP_SEL_INDEX(src, iter));
-			num++;
+			gchar	*pn = g_file_get_parse_name(file);
+
+			pgs_progress_item_begin(min, pn, 0);
+			g_free(pn);
+			if(pgs_progress_item_update(min, 0) == PGS_PROCEED)
+			{
+				pgs_progress_item_end(min);
+				switch(ovw_overwrite_unary_file(src, file))
+				{
+				case OVW_SKIP:
+					break;
+				case OVW_CANCEL:
+					ok = FALSE;
+					break;
+				case OVW_PROCEED:	/* Fall-throughs. */
+				case OVW_PROCEED_DIR:
+				case OVW_PROCEED_FILE:
+					ok = del_delete_gfile(min, file, TRUE, &err);
+					if(ok)
+					{
+						dp_unselect(src, row);
+						num++;
+					}
+					else
+						err_set_gerror(min, &err, CMD_ID, file);
+					break;
+				}
+			}
+			g_object_unref(file);
 		}
-		else
-			break;
 	}
 	fam_rescan_unblock();
 	pgs_progress_end(min);
@@ -270,10 +260,7 @@
 		dp_rescan_post_cmd(src);
 	dp_free_selection(slist);
 
-	fut_cd(old_path, NULL, 0);
-	err_show(min);
-
-	return errno == 0;
+	return ok;
 }
 
 /* ----------------------------------------------------------------------------------------- */

gentoo-0.15.6.tar.bz2/src/cmd_delete.h -> gentoo-0.19.9.tar.gz/src/cmd_delete.h Changed

gentoo-0.15.6.tar.bz2/src/cmd_direnter.c -> gentoo-0.19.9.tar.gz/src/cmd_direnter.c Changed

@@ -19,8 +19,8 @@
 #include "fileutil.h"
 #include "gfam.h"
 #include "guiutil.h"
-#include "mount.h"
 #include "strutil.h"
+#include "userinfo.h"
 
 #include "cmd_parent.h"
 #include "cmd_direnter.h"
@@ -31,25 +31,37 @@
 
 /* 1999-05-07 -	Get the name of the first selected row of <dp>. If that is not a directory,
 **		report error to user and return NULL.
+** 2010-03-04 -	Now returns the URI of the first selected directory, which is a bit more GIO.
 */
-static const gchar * get_selected_dir(DirPane *dp)
+static gboolean get_selected_dir(DirPane *dp, gchar *buf, gsize buf_max)
 {
-	const gchar	*dir = NULL;
 	GSList		*slist;
+	gboolean	ok = FALSE;
 
+	/* FIXME: This is kind of wasteful. Maybe invent some dp_get_selection_first() function? */
 	if((slist = dp_get_selection(dp)) != NULL)
 	{
-		if(S_ISDIR(DP_SEL_STAT(slist).st_mode))
+		if(dp_row_get_file_type(dp_get_tree_model(dp), slist->data, TRUE) == G_FILE_TYPE_DIRECTORY)
 		{
-			errno = 0;
-			dir = dp_full_name(dp, DP_SEL_INDEX(dp, slist));
-			dp_unselect(dp, DP_SEL_INDEX(dp, slist));
+			GFile	*file;
+
+			if((file = dp_get_file_from_row(dp, slist->data)) != NULL)
+			{
+				gchar	*uri = g_file_get_uri(file);
+
+				if(uri != NULL)
+				{
+					ok = (g_strlcpy(buf, uri, buf_max) < buf_max);
+					if(ok)
+						dp_unselect(dp, slist->data);
+					g_free(uri);
+				}
+				g_object_unref(file);
+			}
 		}
-		else
-			errno = ENOTDIR;
 		dp_free_selection(slist);
 	}
-	return dir;
+	return ok;
 }
 
 /* 1999-05-07 -	Rewrote this, now supports a "dir" command argument.
@@ -58,58 +70,47 @@
 gint cmd_direnter(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
 	const gchar	*dir;
+	gchar		uriURI_MAX = "";
+	guint		index;
+	gboolean	ok = FALSE;
 
 	if((dir = car_bareword_get(ca, 0)) == NULL)
 		dir = car_keyword_get_value(ca, "dir", NULL);
-	if(dir == NULL)
-		dir = get_selected_dir(src);
-
 	if(dir != NULL)
 	{
-		gchar	bufPATH_MAX = "";
-		guint	index;
-
 		if(sscanf(dir, "@history%u", &index) == 1)	/* Access history buffer? */
 		{
 			dir = dph_dirhistory_get_entry(src->hist, index);
 			if(dir == NULL)
-				dir = "";
+				dir = usr_get_home();
 		}
+		if(dir != NULL)
+			ok = g_strlcpy(uri, dir, sizeof uri) < sizeof uri;
+	}
+	if(!ok)
+		ok = get_selected_dir(src, uri, sizeof uri);
+	if(!ok)
+	{
+		g_warning("** cmd_direnter() exhausted known ways to get a directory--aborting");
+		return 0;
+	}
 
-		if((dir0 == G_DIR_SEPARATOR) || (dir0 == '~'))	/* Absolute? */
-			stu_strncpy(buf, dir, sizeof buf);
-		else
-		{
-			if(src->dir.path0 == '\0')
-				stu_strncpy(buf, dir, sizeof buf);
-			else if((src->dir.path0 == G_DIR_SEPARATOR) && (src->dir.path1 == '\0'))
-				g_snprintf(buf, sizeof buf, "%c%s", G_DIR_SEPARATOR, dir);
-			else
-				g_snprintf(buf, sizeof buf, "%s%c%s", src->dir.path, G_DIR_SEPARATOR, dir);
-		}
-		err_clear(min);
-		fut_interpolate(buf);
-		dph_state_save(src);
-		dp_freeze(src);
-		if(dp_enter_dir(src, buf))
-		{
-			dp_redisplay(src);
-			/* Annoying hacky code to get GTK+ to resize the pane before we restore
-			** the history state; if not resized, vpos setting will likely fail.
-			*/
-			gtk_widget_queue_resize(GTK_WIDGET(src->list));
-			gui_events_flush();
-			dph_state_restore(src);
-			dp_focus_enter_dir(src);
-			dp_show_stats(src);
-			fam_monitor(src);
-		}
-		dp_thaw(src);
-		if(errno != 0)
-		{
-			err_set(min, errno, CMD_ID, buf);
-			err_show(min);
-		}
+	fut_interpolate(uri);
+	dph_state_save(src);
+	if(dp_enter_dir(src, uri))
+	{
+		/* Annoying hacky code to get GTK+ to resize the pane before we restore
+		** the history state; if not resized, vpos setting will likely fail.
+		*/
+		gtk_widget_queue_resize(GTK_WIDGET(src->view));
+		gui_events_flush();
+		dph_state_restore(src);
+		dp_focus_enter_dir(src);
+		dp_show_stats(src);
+		fam_monitor(src);
+		return 1;
 	}
-	return (dir != NULL) && (errno == 0);
+	g_warning("** Pane #%d failed to enter '%s'", src->index, uri);
+
+	return 0;
 }

gentoo-0.15.6.tar.bz2/src/cmd_dirrescan.c -> gentoo-0.19.9.tar.gz/src/cmd_dirrescan.c Changed

gentoo-0.15.6.tar.bz2/src/cmd_dpfocus.c -> gentoo-0.19.9.tar.gz/src/cmd_dpfocus.c Changed

@@ -9,13 +9,13 @@
 #include "dirpane.h"
 #include "cmdarg.h"
 #include "cmdseq_config.h"
+#include "nag_dialog.h"
 #include "cmd_dpfocus.h"
 
 /* ----------------------------------------------------------------------------------------- */
 
 typedef struct {
 	gboolean	modified;
-	gboolean	edge_wrap;		/* Wrap focus at upper/lower edge? */
 	gboolean	fake_select;		/* Treat focus as selection if no "real" selection exists? */
 	gboolean	focus_select;		/* Move focus to last selected/deselected row? */
 } OptDpFocus;
@@ -25,133 +25,15 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-#define	CMD_NONE	(0)
-#define	CMD_SAME	(1)
-#define	CMD_PREV	(2)
-#define	CMD_NEXT	(3)
-#define	CMD_PAGEPREV	(4)
-#define	CMD_PAGENEXT	(5)
-#define	CMD_FIRST	(6)
-#define	CMD_LAST	(7)
-#define	CMD_ACTIVATE	(8)
-
-/* ----------------------------------------------------------------------------------------- */
-
-#define	CELL_SPACING	1
-
-/* Move focus bar one pageful. Based on stuff seen in gtkclist.c. Note horrid assumption
-** that CELL_SPACING in said file is 1.
-*/
-static void move_page(DirPane *src, gint direction)
-{
-	gint	dest, ph, max;
-
-	ph   = (GTK_CLIST(src->list)->clist_window_height / (GTK_CLIST(src->list)->row_height + CELL_SPACING)) - 1;
-	max  = GTK_CLIST(src->list)->rows - 1;
-	dest = src->focus_row + direction * ph;
-	if(dest < 0)
-	{
-		if((dest == -ph) && dpfocus_options.edge_wrap)
-			dest = max;
-		else
-			dest = 0;
-	}
-	else if(dest > max)
-	{
-		if((dest == max + ph) && dpfocus_options.edge_wrap)
-			dest = 0;
-		else
-			dest = GTK_CLIST(src->list)->rows - 1;
-	}
-	/* Since dp_focus() scrolls, freeze. We want our own scrolling for this. */
-	dp_freeze(src);
-	dp_focus(src, dest);
-	gtk_clist_moveto(src->list, dest, -1, 0.5 + direction * 0.5, 0.0);
-	dp_thaw(src);
-}
 
 /* 1999-05-10 -	Do some focusing. */
 gint cmd_dpfocus(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	gboolean	sel = car_keyword_get_boolean(ca, "select", FALSE),
-			center = car_keyword_get_boolean(ca, "center", FALSE);
-	guint		cmd = car_bareword_get_enum(ca, 0, CMD_SAME, "none", "same", "prev", "next",
-							"pageprev", "pagenext", "first", "last", "activate", NULL);
-
-	if((sel == TRUE) && (cmd >= CMD_SAME && cmd <= CMD_LAST))
-		dp_toggle(src, src->focus_row);
-
-	switch(cmd)
-	{
-		case CMD_NONE:
-			dp_unfocus(src);
-			src->old_focus_row = -1;		/* None really means none. */
-			break;
-		case CMD_SAME:
-			break;
-		case CMD_PREV:
-			if(src->focus_row == -1)
-				dp_focus(src, src->dir.num_rows - 1);
-			else
-			{
-				gint	dest = src->focus_row - 1;
-
-				if(dest < 0)
-				{
-					if(dpfocus_options.edge_wrap)
-						dest = src->dir.num_rows - 1;
-					else
-						dest = 0;
-				}
-				if(dest != src->focus_row)
-					dp_focus(src, dest);
-			}
-			break;
-		case CMD_NEXT:
-			if(src->focus_row == -1)
-				dp_focus(src, 0);
-			else
-			{
-				gint	dest = src->focus_row + 1;
-
-				if(dest >= src->dir.num_rows)
-				{
-					if(dpfocus_options.edge_wrap)
-						dest = 0;
-					else
-						dest = src->dir.num_rows - 1;
-				}
-				if(dest != src->focus_row)
-					dp_focus(src, dest);
-			}
-			break;
-		case CMD_PAGEPREV:
-			if(src->focus_row == -1)
-				dp_focus(src, src->dir.num_rows - 1);
-			else
-				move_page(src, -1);
-			break;
-		case CMD_PAGENEXT:
-			if(src->focus_row == -1)
-				dp_focus(src, 0);
-			else
-				move_page(src, 1);
-			break;
-		case CMD_FIRST:
-			dp_focus(src, 0);
-			break;
-		case CMD_LAST:
-			dp_focus(src, src->dir.num_rows - 1);
-			break;
-		case CMD_ACTIVATE:
-			dp_dbclk_row(src, src->focus_row);
-			break;
-	}
-
-	if((center == TRUE) && (src->focus_row != -1))
-		gtk_clist_moveto(src->list, src->focus_row, -1, 0.5, 0.0);
-
-/*	gtk_widget_grab_focus(GTK_WIDGET(min->gui->top));*/
+	/* We no longer support this command, so nag to the user about its demise. */
+	ndl_dialog_sync_new_wait(min, "dpfocus-deprecated", _("DpFocus Command is Deprecated"),
+			_("The <tt>DpFocus</tt> command has been deprecated and is no longer "
+			  "supported. Please remove any keyboard or mouse bindings that use it "
+			  "and look into using the default GTK+ list view's cursor controls."));
 
 	return 1;
 }
@@ -175,12 +57,10 @@
 	if(dpfocus_cmc == NULL)
 	{
 		dpfocus_options.modified  = FALSE;
-		dpfocus_options.edge_wrap = FALSE;
 		dpfocus_options.fake_select = FALSE;
 
 		dpfocus_cmc = cmc_config_new("DpFocus", &dpfocus_options);
 		cmc_field_add_boolean(dpfocus_cmc, "modified", NULL, offsetof(OptDpFocus, modified));
-		cmc_field_add_boolean(dpfocus_cmc, "edge_wrap", _("Wrap Around At Top And Bottom?"), offsetof(OptDpFocus, edge_wrap));
 		cmc_field_add_boolean(dpfocus_cmc, "fake_select", _("Treat Focused Row As Selection "
 						"If No \"Real\" Selection Exists?"), offsetof(OptDpFocus, fake_select));
 		cmc_field_add_boolean(dpfocus_cmc, "focus_select", _("Move Focus to Last Selected/Deselected "

gentoo-0.15.6.tar.bz2/src/cmd_dpfocusisrch.c -> gentoo-0.19.9.tar.gz/src/cmd_dpfocusisrch.c Changed

@@ -31,53 +31,12 @@
 	guint		offset;
 	gboolean	select;
 	ISearchWidgetry	*wid;
-	gint		old_focus;
 
-	gulong		sig_activate, sig_changed, sig_focus_out, sig_key_press;
+	gulong		sig_activate, sig_focus_out, sig_key_press;
 } the_isearch_info = { NULL };
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 2003-11-06 -	A case-insensitive version of the standard strstr() function. */
-static gchar * nocase_strstr(const gchar *haystack, const gchar *needle)
-{
-	gint	nlen = -1;
-
-	for(; *haystack; haystack++)
-	{
-		if(tolower(*haystack) == tolower(*needle))
-		{
-			if(nlen < 0)
-				nlen = strlen(needle);
-			if(g_strncasecmp(haystack, needle, nlen) == 0)	/* I find "nocase" clearer than "case", myself. */
-				return (gchar *) haystack;
-		}
-	}
-	return NULL;
-}
-
-/* 2003-11-06 -	Perform an incremental search, from row <start> and looking for <string>. */
-static gboolean do_isearch(guint start, const gchar *string)
-{
-	guint	i;
-
-	for(i = start; i < the_isearch_info.pane->dir.num_rows; i++)
-	{
-		const gchar *name = the_isearch_info.pane->dir.rowi.dr_names.display, *hit;
-		if((hit = the_isearch_info.search(name, string)) != NULL)
-		{
-			if(!the_isearch_info.offset_use || ((guint) (hit - name) == the_isearch_info.offset))
-			{
-				dp_focus(the_isearch_info.pane, i);
-				if(the_isearch_info.select)
-					dp_select(the_isearch_info.pane, i);
-				return TRUE;
-			}
-		}
-	}
-	return FALSE;
-}
-
 /* 2003-11-08 -	Close down incremental search. Hides widgetry. */
 static void isearch_close(void)
 {
@@ -89,7 +48,6 @@
 	if(pane != NULL)
 	{
 		g_signal_handler_disconnect(G_OBJECT(entry), the_isearch_info.sig_activate);
-		g_signal_handler_disconnect(G_OBJECT(entry), the_isearch_info.sig_changed);
 		g_signal_handler_disconnect(G_OBJECT(entry), the_isearch_info.sig_key_press);
 		g_signal_handler_disconnect(G_OBJECT(entry), the_isearch_info.sig_focus_out);
 
@@ -105,46 +63,12 @@
 {
 	if(evt->keyval == GDK_Escape || (evt->keyval == GDK_g && (evt->state & GDK_CONTROL_MASK) != 0))
 	{
-		dp_focus(the_isearch_info.pane, the_isearch_info.old_focus);
 		isearch_close();
 		return TRUE;
 	}
-	else if(evt->keyval == GDK_Up || evt->keyval == GDK_Down ||
-	   evt->keyval == GDK_Page_Up || evt->keyval == GDK_Page_Down ||
-	   evt->keyval == GDK_Tab)
-	{
-		if(evt->keyval == GDK_Up || evt->keyval == GDK_Down)
-			csq_execute_format(the_isearch_info.min, "DpFocus %s", evt->keyval == GDK_Up ? "prev" : "next");
-		else if(evt->keyval == GDK_Page_Up || evt->keyval == GDK_Page_Down)
-			csq_execute_format(the_isearch_info.min, "DpFocus %s", evt->keyval == GDK_Page_Up ? "pageprev" : "pagenext");
-		else if(evt->keyval == GDK_Tab && the_isearch_info.pane->focus_row >= 0)
-		{
-			const gchar	*string = gtk_entry_get_text(GTK_ENTRY(the_isearch_info.wid->entry));
-
-			/* Use TAB as (hardcoded) repeat-search key, since we don't know isearch binding (if any). */
-			if(string && *string)
-			{
-				if(!do_isearch(the_isearch_info.pane->focus_row + 1, string))
-					do_isearch(0, string);
-			}
-		}
-		return TRUE;
-	}
 	return FALSE;
 }
 
-static gint evt_isearch_changed(GtkWidget *wid, gpointer user)
-{
-	const gchar	*string = gtk_entry_get_text(GTK_ENTRY(wid));
-
-	dp_unfocus(the_isearch_info.pane);
-	if(string == NULL || *string == '\0')
-		return TRUE;
-	do_isearch(0, string);
-
-	return TRUE;
-}
-
 static gint evt_isearch_activate(GtkWidget *wid, gpointer user)
 {
 	isearch_close();
@@ -157,6 +81,30 @@
 	return FALSE;
 }
 
+/* 2010-03-19 -	Callback for the TreeView's search. Gets a column number passed in, but ignores that and always uses name.
+**		The return logic here is wack, which is why we're seemingly returning the inverse of what makes sense.
+**		We're hardcoded to always check for the display name, regardless of the 'column' GTK+ hands us.
+*/
+static gboolean cb_search_compare(GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer user)
+{
+	const gchar	*dname = dp_row_get_name_display(model, (DirRow2*) iter);
+
+	if(dname != NULL)
+	{
+		if(the_isearch_info.offset_use)
+		{
+			const gsize	len = g_utf8_strlen(dname, -1);
+			if(the_isearch_info.offset < len)
+				dname = g_utf8_offset_to_pointer(dname, the_isearch_info.offset);
+			else
+				return TRUE;
+			return !(strstr(dname, key) == dname);
+		}
+		return !(strstr(dname, key) != NULL);
+	}
+	return TRUE;
+}
+
 /* 2003-11-04 -	Incremental search. Initial implementation, with a rather non-satisfying UI. */
 gint cmd_dpfocusisrch(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
@@ -173,17 +121,14 @@
 	entry = the_isearch_info.wid->entry;
 	gtk_widget_grab_focus(entry);
 
+	gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(src->view), cb_search_compare, src, NULL);
+	gtk_tree_view_set_search_column(GTK_TREE_VIEW(src->view), 0);
+	gtk_tree_view_set_search_entry(GTK_TREE_VIEW(src->view), GTK_ENTRY(entry));
+
 	the_isearch_info.sig_activate  = g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(evt_isearch_activate), NULL);
-	the_isearch_info.sig_changed   = g_signal_connect(G_OBJECT(entry), "changed", G_CALLBACK(evt_isearch_changed), NULL);
 	the_isearch_info.sig_key_press = g_signal_connect(G_OBJECT(entry), "key_press_event", G_CALLBACK(evt_isearch_keypress), NULL);
 	the_isearch_info.sig_focus_out = g_signal_connect(G_OBJECT(entry), "focus_out_event", G_CALLBACK(evt_isearch_focus_out), NULL);
 
-	the_isearch_info.old_focus = src->focus_row;
-
-	if(car_keyword_get_boolean(ca, "nocase", FALSE))
-		the_isearch_info.search = nocase_strstr;
-	else
-		the_isearch_info.search = strstr;
 	the_isearch_info.offset_use = FALSE;
 	the_isearch_info.offset     = 0;
 	if((start = car_keyword_get_value(ca, "start", "0")) != NULL)
@@ -202,8 +147,6 @@
 
 	if((text = car_keyword_get_value(ca, "text", NULL)) != NULL)
 		gtk_entry_set_text(GTK_ENTRY(entry), text);
-	else if(src->focus_row >= 0)
-		gtk_entry_set_text(GTK_ENTRY(entry), src->dir.rowsrc->focus_row.dr_names.display);
 
 	return TRUE;
 }

gentoo-0.15.6.tar.bz2/src/cmd_dpmisc.c -> gentoo-0.19.9.tar.gz/src/cmd_dpmisc.c Changed

@@ -6,7 +6,6 @@
 
 #include "gentoo.h"
 
-#include <regex.h>
 #include <stdlib.h>
 
 #include "cmdseq.h"
@@ -71,6 +70,22 @@
 	return 1;
 }
 
+/* 2010-10-05 -	Maximize the source pane, or the one indexed if an argument is given. */
+gint cmd_dpmaximize(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
+{
+	gint	index = car_keyword_get_integer(ca, "index", -1);
+
+	if(index < 0)
+		index = src->index;
+	if(index < 0 || index >= sizeof min->gui->pane / sizeof *min->gui->pane)
+		return 0;
+
+	min->cfg.dp_paning.value = (index == 0) ? 1.0 : 0.0f;
+	dp_split_refresh(min);
+
+	return 1;
+}
+
 /* 1999-09-14 -	This command (or something similar) implemented after suggestion by
 **		Jarle Thorsen <jthorsen@iname.com>. It allows you to scroll a pane's
 **		contents so that the first row beginning with a specified letter becomes
@@ -79,39 +94,48 @@
 gint cmd_dpgotorow(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
 	const gchar	*value;
+	gint		rowno;
 	guint		focus;
-	gint		row = -1;
+	GtkTreePath	*path = NULL;
 
 	focus = car_keyword_get_boolean(ca, "focus", FALSE);
 
 	if((value = car_keyword_get_value(ca, "re", NULL)) != NULL)
 	{
-		regex_t	re;
+		GRegex	*re;
 		guint	nocase;
 
 		nocase = car_keyword_get_boolean(ca, "nocase", FALSE);
-		if(regcomp(&re, value, REG_EXTENDED | (nocase ? REG_ICASE : 0)) == 0)
+		if((re = g_regex_new(value, G_REGEX_EXTENDED | (nocase ? G_REGEX_CASELESS : 0), G_REGEX_MATCH_NOTEMPTY, NULL)) != NULL)
 		{
-			guint	i;
+			GtkTreeIter	iter;
+			GtkTreeModel	*m;
 
-			for(i = 0; i < src->dir.num_rows && row < 0; i++)
+			m = dp_get_tree_model(src);
+
+			if(gtk_tree_model_get_iter_first(m, &iter))
 			{
-				if(regexec(&re, DP_ROW_NAME(&src->dir.rowi), 0, NULL, 0) == 0)
-					row = i;
+				do
+				{
+					if(g_regex_match(re, dp_row_get_name_display(m, &iter), G_REGEX_MATCH_NOTEMPTY, NULL))
+					{
+						path = gtk_tree_model_get_path(m, &iter);
+						break;
+					}
+				} while(gtk_tree_model_iter_next(m, &iter));
 			}
-			regfree(&re);
+			g_regex_unref(re);
 		}
 	}
-	else if((value = car_keyword_get_value(ca, "row", NULL)) != NULL)
-		row = strtol(value, NULL, 0);
+	else if((rowno = car_keyword_get_integer(ca, "row", -1)) > 0)
+		path = gtk_tree_path_new_from_indices(rowno, -1);
 
-	if(row != -1)
+	if(path != NULL)
 	{
-		gtk_clist_moveto(GTK_CLIST(src->list), row, -1, 0.0, 0.0);
-		if(focus)
-			dp_focus(src, row);
+		gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(src->view), path, NULL, FALSE, 0.f, 0.f);
+		gtk_tree_path_free(path);
 	}
-	return 1;
+	return path != NULL;
 }
 
 /* 1999-11-21 -	Move GTK+ input focus to the path text entry box. Very handy. */

gentoo-0.15.6.tar.bz2/src/cmd_dpmisc.h -> gentoo-0.19.9.tar.gz/src/cmd_dpmisc.h Changed

gentoo-0.15.6.tar.bz2/src/cmd_file.c -> gentoo-0.19.9.tar.gz/src/cmd_file.c Changed

@@ -39,8 +39,10 @@
 		*/
 		if(g_slist_next(slist) == NULL)
 		{
-			if((cmd = stl_style_property_get_action(DP_SEL_TYPE(slist)->style, action)) != NULL)
+			if((cmd = stl_style_property_get_action(dp_row_get_ftype(dp_get_tree_model(src), slist->data)->style, action)) != NULL)
+			{
 				csq_execute(min, cmd);
+			}
 		}
 		else
 		{
@@ -48,9 +50,7 @@
 
 			for(iter = slist; iter != NULL; iter = g_slist_next(iter))
 			{
-				if(!dp_is_selected(src, DP_SEL_ROW(iter)))
-					break;
-				if((cmd = stl_style_property_get_action(DP_SEL_TYPE(iter)->style, action)) != NULL)
+				if((cmd = stl_style_property_get_action(dp_row_get_ftype(dp_get_tree_model(src), iter->data)->style, action)) != NULL)
 					csq_execute(min, cmd);
 			}
 		}
@@ -64,8 +64,7 @@
 /* 1999-05-20 -	New entrypoint for general file action access. Very cool. */
 gint cmd_fileaction(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	const gchar	*action;
+	const gchar	*action = car_keyword_get_value(ca, "action", "Default");
 
-	action = car_keyword_get_value(ca, "action", "Default");
 	return file_command(min, src, action);
 }

gentoo-0.15.6.tar.bz2/src/cmd_generic.c -> gentoo-0.19.9.tar.gz/src/cmd_generic.c Changed

@@ -30,14 +30,15 @@
 	DirPane		*src, *dst;
 	GSList		*s_slist;		/* Source pane selection. */
 	const GSList	*s_iter;		/* Source selection iterator. */
-	gchar		old_pathPATH_MAX;
 
 	GenBodyFunc	bf;
 	GenActionFunc	af;
 	GenFreeFunc	ff;
+	GError		*error;			/* For action function to report any error in. */
 	gpointer	user;			/* User's data, passed on in callbacks. */
 	gboolean	open;
 	gboolean	need_update;		/* Set if user's action function has been called. */
+	gboolean	ok;			/* Tracks success/fail of last action. */
 
 	Dialog		*dlg;
 };
@@ -61,19 +62,30 @@
 		dlg_dialog_sync_destroy(gen->dlg);
 		gen->dlg  = NULL;
 		gen->open = FALSE;
-		fut_cd(gen->old_path, NULL, 0);
 		if(gen->need_update)
 		{
 			if(gen->flags & CGF_SRC)
-				dp_rescan_post_cmd(gen->src);
+				dp_rescan(gen->src);
 			if(!(gen->flags & CGF_NODST))
-				dp_rescan_post_cmd(gen->dst);
+				dp_rescan(gen->dst);
 			gen->need_update = FALSE;
 		}
-		err_show(gen->min);
 	}
 }
 
+/* 2009-09-19 -	Filter out current row, based on its file type. Returns TRUE if row is to be included. */
+static gboolean type_filter(const struct gen_info *gen)
+{
+	/* We need both target file type and actual non-following type. */
+	const GFileType	tft = dp_row_get_file_type(dp_get_tree_model(gen->src), gen->s_iter->data, TRUE);
+	const GFileType	ft = dp_row_get_file_type(dp_get_tree_model(gen->src), gen->s_iter->data, FALSE);
+	if((gen->flags & CGF_NODIRS) && (tft == G_FILE_TYPE_DIRECTORY))
+		return FALSE;
+	else if((gen->flags & CGF_LINKSONLY) && (ft != G_FILE_TYPE_SYMBOLIC_LINK))
+		return FALSE;
+	return TRUE;
+}
+
 /* 1998-05-29 -	Find the first selected entry, initialize body using it, and return 1.
 **		If no selected entry was found, 0 is returned.
 */
@@ -81,12 +93,11 @@
 {
 	for(gen->s_iter = gen->s_slist; gen->s_iter != NULL; gen->s_iter = g_slist_next(gen->s_iter))
 	{
-		if((gen->flags & CGF_NODIRS) && S_ISDIR(DP_SEL_LSTAT(gen->s_iter).st_mode))
-			continue;
-		if((gen->flags & CGF_LINKSONLY) && !(S_ISLNK(DP_SEL_LSTAT(gen->s_iter).st_mode)))
-			continue;
-		gen->bf(gen->min, gen->src, DP_SEL_ROW(gen->s_iter), gen->user);
-		return 1;
+		if(type_filter(gen))
+		{
+			gen->bf(gen->min, gen->src, gen->s_iter->data, gen, gen->user);
+			return 1;
+		}
 	}
 	return 0;
 }
@@ -99,11 +110,9 @@
 {
 	for(gen->s_iter = g_slist_next(gen->s_iter); gen->s_iter != NULL; gen->s_iter = g_slist_next(gen->s_iter))
 	{
-		if((gen->flags & CGF_NODIRS) && S_ISDIR(DP_SEL_LSTAT(gen->s_iter).st_mode))
-			continue;
-		if((gen->flags & CGF_LINKSONLY) && !(S_ISLNK(DP_SEL_LSTAT(gen->s_iter).st_mode)))
+		if(!type_filter(gen))
 			continue;
-		gen->bf(gen->min, gen->src, DP_SEL_ROW(gen->s_iter), gen->user);
+		gen->bf(gen->min, gen->src, gen->s_iter->data, gen, gen->user);
 		return;
 	}
 	end_command(gen);
@@ -116,12 +125,10 @@
 {
 	for(; gen->s_iter != NULL; gen->s_iter = g_slist_next(gen->s_iter))
 	{
-		if((gen->flags & CGF_NODIRS) && S_ISDIR(DP_SEL_LSTAT(gen->s_iter).st_mode))
-			continue;
-		if((gen->flags & CGF_LINKSONLY) && !(S_ISLNK(DP_SEL_LSTAT(gen->s_iter).st_mode)))
+		if(!type_filter(gen))
 			continue;
 		gen->need_update = TRUE;
-		if(!gen->af(gen->min, gen->src, gen->dst, DP_SEL_ROW(gen->s_iter), gen->user))
+		if(!gen->af(gen->min, gen->src, gen->dst, gen->s_iter->data, &gen->error, gen->user))
 			break;
 	}
 	end_command(gen);
@@ -136,15 +143,12 @@
 	const gchar		*btn1 = N_("_OK|A_ll|_Skip|_Cancel"),
 				*btn2 = N_("_OK|_Skip|_Cancel"), *btn;
 	static struct gen_info	gen;
-	gboolean		ret = FALSE;
 
 	gen.flags = flags;
 	gen.min	  = min;
 	gen.src	  = min->gui->cur_pane;
 	gen.dst	  = dp_mirror(min, gen.src);
 
-	if(!fut_cd(gen.src->dir.path, gen.old_path, sizeof gen.old_path))
-		return 0;
 	if((gen.s_iter = gen.s_slist = dp_get_selection(gen.src)) == NULL)	/* No selection? */
 		return 0;
 
@@ -153,8 +157,10 @@
 	gen.ff = ff;
 
 	gen.open = TRUE;
+	gen.error = NULL;
 	gen.user = user;
 	gen.need_update = FALSE;
+	gen.ok = FALSE;
 
 	btn = _((flags & CGF_NOALL) ? btn2 : btn1);
 	gen.dlg = dlg_dialog_sync_new(*(GtkWidget **) user, title, btn);
@@ -169,15 +175,18 @@
 		if(flags & CGF_NOALL)		/* Adjust button IDs if no "All" present. */
 			bid_all = -1, bid_skip--, bid_cancel--;
 
-		ret = TRUE;
-		while(gen.open)
+		gen.ok = TRUE;
+		while(gen.open && gen.ok)
 		{
 			reply = dlg_dialog_sync_wait(gen.dlg);
 			if(reply == bid_ok)
 			{
 				gen.need_update = TRUE;
-				if(!gen.af(gen.min, gen.src, gen.dst, DP_SEL_ROW(gen.s_iter), gen.user))
+				if(!(gen.ok = gen.af(gen.min, gen.src, gen.dst, gen.s_iter->data, &gen.error, gen.user)))
+				{
+					err_set_gerror(min, &gen.error, title, dp_get_file_from_row(gen.src, gen.s_iter->data));
 					end_command(&gen);
+				}
 				else
 					next_or_end(&gen);
 			}
@@ -191,5 +200,14 @@
 	}
 	if(gen.dlg != NULL)
 		dlg_dialog_sync_destroy(gen.dlg);
-	return ret;
+
+	return gen.ok;
+}
+
+/* 2010-06-13 -	Track the state of an entry widget, allowing the command to execute only for non-empty strings. */
+void cmd_generic_track_entry(gpointer gen, GtkWidget *entry)
+{
+	struct gen_info *real_gen = gen;
+
+	dlg_dialog_track_entry(real_gen->dlg, entry);
 }

gentoo-0.15.6.tar.bz2/src/cmd_generic.h -> gentoo-0.19.9.tar.gz/src/cmd_generic.h Changed

@@ -11,15 +11,17 @@
 	CGF_NODIRS = 1<<2,	/* Never call the body or action function on a directory. */
 	CGF_NORETURN = 1<<3,	/* Don't bind Return to OK button. */
 	CGF_NOESC = 1<<4,	/* Don't bind Escape to Cancel-button. */
-	CGF_SRC = 1<<5,		/* DO rescan the SOURCE after completition (great for Clone). */
+	CGF_SRC = 1<<5,		/* DO rescan the SOURCE after completion (great for Clone). */
 	CGF_LINKSONLY = 1 << 6	/* Exclude all entries that are not symbolic links. Kind of specialized. */
 	};
 
-typedef void	(*GenBodyFunc)(MainInfo *min, DirPane *src, DirRow *row, gpointer user);
-typedef gint	(*GenActionFunc)(MainInfo *min, DirPane *src, DirPane *dst, DirRow *row, gpointer user);
+typedef void	(*GenBodyFunc)(MainInfo *min, DirPane *src, DirRow2 *row, gpointer generic, gpointer user);
+typedef gint	(*GenActionFunc)(MainInfo *min, DirPane *src, DirPane *dst, DirRow2 *row, GError **error, gpointer user);
 typedef void	(*GenFreeFunc)(gpointer user);
 
 extern gint	cmd_generic(MainInfo *min, const gchar *title, guint32 flags, GenBodyFunc bf, GenActionFunc af,
 				GenFreeFunc ff, gpointer user);
 
+extern void	cmd_generic_track_entry(gpointer gen, GtkWidget *entry);
+
 #endif		/* CMD_GENERIC_H */

gentoo-0.15.6.tar.bz2/src/cmd_getsize.c -> gentoo-0.19.9.tar.gz/src/cmd_getsize.c Changed

@@ -39,47 +39,43 @@
 */
 gint cmd_getsize(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	GSList	*slist, *iter;
-	guint	num = 0;
-	FUCount	fuc;
+	GtkTreeModel	*m = dp_get_tree_model(src);
+	GSList		*slist, *iter;
+	guint		num = 0;
+	FUCount		fuc;
+	gboolean	ok = TRUE;
+	GError		*err = NULL;
 
-	err_clear(min);
 	if((slist = dp_get_selection(src)) == NULL)
 		return 1;
 	pgs_progress_begin(min, _("Getting sizes..."), PFLG_BUSY_MODE);
-	for(iter = slist; iter != NULL; iter = g_slist_next(iter))
+	for(iter = slist; ok && (iter != NULL); iter = g_slist_next(iter))
 	{
-		if(S_ISDIR(DP_SEL_LSTAT(iter).st_mode))
+		if(dp_row_get_file_type(m, iter->data, TRUE) == G_FILE_TYPE_DIRECTORY)
 		{
-			if(fut_dir_size_progress(min, dp_full_name(src, DP_SEL_INDEX(src, iter)), NULL, &fuc))
+			GFile	*here = dp_get_file_from_row(src, iter->data);
+
+			if((ok = fut_size_gfile(min, here, NULL, &fuc, &err)))
 			{
-				DP_SEL_LSTAT(iter).st_size   = fuc.num_bytes;
-				DP_SEL_LSTAT(iter).st_blocks = fuc.num_blocks;
-				DP_SEL_FLAGS_SET(iter, DPRF_HAS_SIZE);
+				dp_row_set_size(m, iter->data, fuc.num_bytes);
+				dp_row_set_flag(m, iter->data, DPRF_HAS_SIZE);
 				num++;
+				if(getsize_options.unselect)
+					dp_unselect(src, iter->data);
 			}
 			else
-				break;
+				err_set_gerror(min, &err, CMD_ID, here);
 		}
-		if(getsize_options.unselect)
-			dp_unselect(src, DP_SEL_INDEX(src, iter));
 	}
 	pgs_progress_end(min);
+	dp_free_selection(slist);
 
 	if(num)
 	{
 		dp_update_stats(src);
-		dp_redisplay_preserve(src);
+		dp_show_stats(src);
 	}
-	if(errno)
-		err_set(min, errno, CMD_ID, iter ? DP_SEL_NAME(iter) : NULL);
-	else
-		err_clear(min);
-	err_show(min);
-
-	dp_free_selection(slist);
-
-	return 1;
+	return ok;
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -89,41 +85,38 @@
 */
 gint cmd_clearsize(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	GSList	*slist, *iter;
-	guint	num = 0U;
+	GtkTreeModel	*m = dp_get_tree_model(src);
+	GSList		*slist, *iter;
+	guint		num = 0;
+	GError		*err = NULL;
+	gboolean	ok = TRUE;
 
 	if((slist = dp_get_selection(src)) == NULL)
 		return 1;
 
-	for(iter = slist; iter != NULL; iter = g_slist_next(iter))
+	for(iter = slist; ok && (iter != NULL); iter = g_slist_next(iter))
 	{
-		if(S_ISDIR(DP_SEL_LSTAT(iter).st_mode) && DP_SEL_FLAGS_CHK(iter, DPRF_HAS_SIZE))
+		if(dp_row_get_file_type(m, iter->data, TRUE) == G_FILE_TYPE_DIRECTORY && dp_row_get_flags(m, iter->data, DPRF_HAS_SIZE))
 		{
-			const gchar	*name = dp_full_name(src, DP_SEL_INDEX(src, iter));
-
-			if(lstat(name, &DP_SEL_LSTAT(iter)))
-				break;
-			DP_SEL_FLAGS_CLR(iter, DPRF_HAS_SIZE);
+			/* Now, we need to re-scan the file's info, and replace it in the model. Interesting, but
+			** clearly a nitty job that needs to be done inside the dirpane module, not inline here.
+			*/
+			ok = dp_rescan_row(src, iter->data, &err);
+			if(!ok)
+				err_set_gerror(min, &err, CMD_ID2, dp_get_file_from_row(src, iter->data));
 			num++;
 		}
 		if(getsize_options.unselect)
-			dp_unselect(src, DP_SEL_INDEX(src, iter));
+			dp_unselect(src, iter->data);
 	}
+	dp_free_selection(slist);
 
 	if(num)
 	{
 		dp_update_stats(src);
-		dp_redisplay_preserve(src);
+		dp_show_stats(src);
 	}
-	if(errno)
-		err_set(min, errno, CMD_ID2, iter ? DP_SEL_NAME(iter) : NULL);
-	else
-		err_clear(min);
-	err_show(min);
-
-	dp_free_selection(slist);
-
-	return 1;
+	return ok;
 }
 
 /* ----------------------------------------------------------------------------------------- */

gentoo-0.15.6.tar.bz2/src/cmd_info.c -> gentoo-0.19.9.tar.gz/src/cmd_info.c Changed

@@ -47,8 +47,8 @@
 
 /* Special little struct used to hold information during background directory sizing. */
 typedef struct {
-	GtkWidget	*size, *contents;			/* Label widgets, updated. */
-	gpointer	handle;						/* Handle from fut_dir_size_start(). */
+	GtkWidget	*size, *contents;	/* Label widgets, updated. */
+	gpointer	handle;			/* Handle from fut_dir_size_start(). */
 } DirSizeInfo;
 
 /* ----------------------------------------------------------------------------------------- */
@@ -56,24 +56,21 @@
 static void dir_size_update(const FUCount *count, gpointer user)
 {
 	DirSizeInfo	*dsi = user;
-	gchar	buf64, sbuf64, stbuf64, btbuf64, *st, *bt;
+	gchar		buf64, sbuf64, stbuf64;
 
 	if(!count)
 		return;
 
 	/* Replace contents of previously built size-label. */
-	sze_put_size64(sbuf, sizeof sbuf, count->num_bytes, SZE_AUTO);
+	sze_put_offset(sbuf, sizeof sbuf, count->num_bytes, SZE_AUTO, 3, ',');
+	sze_put_offset(stbuf, sizeof stbuf, count->num_bytes, SZE_BYTES, 3, '.');
 			
-	stbufsizeof stbuf - 1 = '\0';
-	st = stu_tickify(stbuf + sizeof stbuf - 1, count->num_bytes,  info_options.tick0);
-	btbufsizeof btbuf - 1 = '\0';
-	bt = stu_tickify(btbuf + sizeof btbuf - 1, count->num_blocks, info_options.tick0);
-	g_snprintf(buf, sizeof buf, _("%s (%s bytes,\n%s blocks)"), sbuf, st, bt);
+	g_snprintf(buf, sizeof buf, _("%s (%s)"), sbuf, stbuf);
 	gtk_label_set_text(GTK_LABEL(dsi->size), buf);
 
 	/* And tell a little something about the contents. */
-	g_snprintf(buf, sizeof buf, _("%u dirs, %u files, %u symlinks"),
-			count->num_dirs, count->num_files, count->num_links);
+	g_snprintf(buf, sizeof buf, _("%u dirs, %u files,\n%u symlinks, %u special files"),
+			count->num_dirs, count->num_files, count->num_links, count->num_specials);
 	gtk_label_set_text(GTK_LABEL(dsi->contents), buf);
 }
 
@@ -90,52 +87,123 @@
 	return lab;
 }
 
-static void build_date(const gchar *label, gint y, const time_t *date, const gchar *fmt, GtkWidget *tab)
+static gint build_date(const gchar *label, gint y, guint64 date, const gchar *fmt, GtkWidget *tab)
 {
 	gchar		buf64;
+	time_t		tvalue;
 	struct tm	*tm;
 
-	label_pack(tab, label, 0, y, FALSE);
-	if((tm = localtime(date)) != NULL)
+	tvalue = (time_t) date;
+	if(tvalue != 0 && (tm = localtime(&tvalue)) != NULL)
 	{
+		label_pack(tab, label, 0, y, FALSE);
 		if(strftime(buf, sizeof buf, fmt, tm) >= 0)
-			label_pack(tab, buf, 1, y, TRUE);
+			label_pack(tab, buf, 1, y++, TRUE);
 	}
+	return y;
 }
 
-static GtkWidget * build_info(MainInfo *min, const DirPane *dp, const DirRow *row, DirSizeInfo **dsi)
+/* 2010-03-02 -	Build a second page (!) of the Information window, showing a large set of GIO attributes. */
+static GtkWidget * build_gio_info(const DirPane *dp, const DirRow2 *row)
 {
-	gchar		buf128, sbuf32, *ptr;
-	guint		y;
-	const gchar	*iname;
-	GtkWidget	*tab, *szlab, *sep, *entry;
+	GtkListStore		*lm = NULL;
+	GtkWidget		*view, *scwin;
+	GtkCellRenderer		*cr;
+	GtkTreeViewColumn	*vc;
+	GFile			*file;
+	GFileInfo		*info;
+	const gchar		*namespaces = { "standard", "access", "mountable", "unix", "time", "owner", "filesystem", NULL };
+	gchar			**atts;
+	guint			i, j;
+
+	if((file = dp_get_file_from_row(dp, row)) == NULL)
+		return NULL;
+	info = g_file_query_info(file, "*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, NULL);
+	g_object_unref(file);
+	if(info == NULL)
+		return NULL;
+
+	lm = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
+	for(i = 0; namespacesi != NULL; i++)
+	{
+		atts = g_file_info_list_attributes(info, namespacesi);
+		if(atts != NULL)
+		{
+			GtkTreeIter	iter;
+
+			for(j = 0; attsj != NULL; j++)
+			{
+				gchar	*value;
+
+				if((value = g_file_info_get_attribute_as_string(info, attsj)) != NULL)
+				{
+					gtk_list_store_append(lm, &iter);
+					gtk_list_store_set(lm, &iter, 0, attsj, 1, value, -1);
+					g_free(value);
+				}
+			}
+			g_free(atts);
+		}
+	}
+
+	view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(lm));
+	cr = gtk_cell_renderer_text_new();
+	vc = gtk_tree_view_column_new_with_attributes(_("Name"), cr, "text", 0, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(view), vc);
+	vc = gtk_tree_view_column_new_with_attributes(_("Value"), cr, "text", 1, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(view), vc);
+
+	scwin = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_container_add(GTK_CONTAINER(scwin), view);
+
+	return scwin;
+}
+
+static GtkWidget * build_info(MainInfo *min, const DirPane *dp, const DirRow2 *row, DirSizeInfo **dsi)
+{
+	const GtkTreeModel	*m = dp_get_tree_model(dp);
+	gchar			buf128, sbuf32, *ptr;
+	guint			y;
+	const gchar		*iname;
+	GtkWidget		*nbook, *tab, *szlab, *sep, *entry, *gp;
+
+	nbook = gtk_notebook_new();
 
 	tab = gtk_table_new(17, 2, FALSE);
 
 	y = 0;
-	if(DP_ROW_TYPE(row)->style != NULL)
+	if(dp_row_get_ftype(m, row)->style != NULL)
 	{
-		if((iname = stl_style_property_get_icon(DP_ROW_TYPE(row)->style, SPN_ICON_UNSEL)) != NULL)
+		if((iname = stl_style_property_get_icon(dp_row_get_ftype(m, row)->style, SPN_ICON_UNSEL)) != NULL)
 		{
-			GtkWidget	*ico;
-			GdkPixmap	*ipix;
-			GdkBitmap	*imsk;
+			GdkPixbuf	*pbuf;
+
+			if((pbuf = ico_icon_get_pixbuf(min, iname)) != NULL)
+			{
+				GtkWidget	*img;
 
-			ipix = ico_icon_get(min, iname, &imsk);
-			ico = gtk_pixmap_new(ipix, imsk);
-			gtk_table_attach(GTK_TABLE(tab), ico, 0, 1, y, y + 1, 0,0,5,5);
+				img = gtk_image_new_from_pixbuf(pbuf);
+				gtk_table_attach(GTK_TABLE(tab), img, 0, 1, y, y + 1, 0,0,5,5);
+			}
 		}
 	}
-	label_pack(tab, DP_ROW_NAMED(row), 1, y++, TRUE);
+	label_pack(tab, dp_row_get_name_display(m, row), 1, y++, TRUE);
 
 	/* For symbolic links, display name of the target, at least. */
-	if(S_ISLNK(DP_ROW_LSTAT(row).st_mode))
+	if(dp_row_get_file_type(m, row, FALSE) == G_FILE_TYPE_SYMBOLIC_LINK)
 	{
+		GtkWidget	*hbox, *icon;
+
 		label_pack(tab, _("Link To"), 0, y, FALSE);
+		hbox = gtk_hbox_new(FALSE, 0);
 		entry = gtk_entry_new();
 		gtk_widget_set_sensitive(entry, FALSE);	/* Used to be just non-editable, but ... this looks better. */
-		gtk_entry_set_text(GTK_ENTRY(entry), DP_ROW_LINKNAMED(row));
-		gtk_table_attach(GTK_TABLE(tab), entry, 1, 2, y, y + 1,  GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,5,0);
+		gtk_entry_set_text(GTK_ENTRY(entry), dp_row_get_link_target(m, row));
+		gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+		icon = gtk_image_new_from_stock(dp_row_get_flags(m, row, DPRF_LINK_EXISTS) ? GTK_STOCK_YES : GTK_STOCK_NO, GTK_ICON_SIZE_BUTTON);
+		gtk_box_pack_start(GTK_BOX(hbox), icon, FALSE, FALSE, 0);
+		gtk_table_attach(GTK_TABLE(tab), hbox, 1, 2, y, y + 1,  GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,5,0);
 		y++;
 	}
 	sep = gtk_hseparator_new();
@@ -143,49 +211,53 @@
 	y++;
 
 	label_pack(tab, _("Type"), 0, y, FALSE);
-	label_pack(tab, DP_ROW_TYPE(row)->name, 1, y++, TRUE);
+	label_pack(tab, dp_row_get_ftype(m, row)->name, 1, y++, TRUE);
 
 	label_pack(tab, _("Location"), 0, y, FALSE);
 	label_pack(tab, dp->dir.path, 1, y++, TRUE);
 
 	label_pack(tab, _("Size"), 0, y, FALSE);
-	sze_put_size(sbuf, sizeof sbuf, DP_ROW_LSTAT(row).st_size, SZE_AUTO);
-	if(DP_ROW_LSTAT(row).st_size < 1024)
-		stu_strncpy(buf, sbuf, sizeof buf);
+	sze_put_offset(sbuf, sizeof sbuf, dp_row_get_size(m, row), SZE_AUTO, 3, ',');
+	if(dp_row_get_size(m, row) < 1024)
+		g_strlcpy(buf, sbuf, sizeof buf);
 	else
 	{
-		gchar	stbuf64, *st, btbuf64, *bt;
+		gchar	stbuf64, *st;
 
 		stbufsizeof stbuf - 1 = '\0';
-		st = stu_tickify(stbuf + sizeof stbuf - 1, DP_ROW_LSTAT(row).st_size, info_options.tick0);
-		btbufsizeof btbuf - 1 = '\0';
-		bt = stu_tickify(btbuf + sizeof btbuf - 1, DP_ROW_LSTAT(row).st_blocks, info_options.tick0);
-		g_snprintf(buf, sizeof buf, _("%s (%s bytes,\n%s blocks)"), sbuf, st, bt);
+		st = stu_tickify(stbuf + sizeof stbuf - 1, dp_row_get_size(m, row), info_options.tick0);
+		g_snprintf(buf, sizeof buf, _("%s (%s bytes)"), sbuf, st);
 	}
 	szlab = label_pack(tab, buf, 1, y++, TRUE);
 	/* Building info for a directory, and recursing enabled? */
-	if(S_ISDIR(DP_ROW_LSTAT(row).st_mode) && info_options.recurse_dirs)
+	if(dp_row_get_file_type(m, row, TRUE) == G_FILE_TYPE_DIRECTORY && info_options.recurse_dirs)
 	{
+		GFile	*dir = dp_get_file_from_row(dp, row);
+
 		/* Start asynchronous directory sizing. Nice. */
 		*dsi = g_malloc(sizeof *dsi);
 		(*dsi)->size     = szlab;
 		label_pack(tab, _("Contains"), 0, y, FALSE);
 		(*dsi)->contents = label_pack(tab, "(content info)", 1, y++, TRUE);
-		(*dsi)->handle   = fut_dir_size_start(dp_full_name(dp, DP_ROW_INDEX(dp, row)), dir_size_update, *dsi);
+		(*dsi)->handle   = fut_dir_size_gfile_start(dir, dir_size_update, *dsi);
 	}
 
 	/* Is the "Show 'file' Output?" option enabled? Requires "file -n -f -" to work. */
 #if defined HAVE_GOOD_FILE
+/* FIXME: This just isn't a good idea, for potentially remote or archived files ...*/
 	if(info_options.use_file)
 	{
-		gchar	bufPATH_MAX;
+		gchar	*path;
 
-		sep = gtk_hseparator_new();
-		gtk_table_attach(GTK_TABLE(tab), sep, 0, 2, y, y + 1, GTK_EXPAND | GTK_FILL,0,0,5);
-		y++;
-		label_pack(tab, _("'File' Info"), 0, y, FALSE);
-		g_snprintf(buf, sizeof buf, "%s%s%s", dp->dir.path, G_DIR_SEPARATOR_S, DP_ROW_NAME(row));
-		label_pack(tab, fle_file(min, buf), 1, y++, TRUE);
+		if((path = g_file_get_path(dp_get_file_from_row(dp, row))) != NULL)
+		{
+			sep = gtk_hseparator_new();
+			gtk_table_attach(GTK_TABLE(tab), sep, 0, 2, y, y + 1, GTK_EXPAND | GTK_FILL,0,0,5);
+			y++;
+			label_pack(tab, _("'File' Info"), 0, y, FALSE);
+			label_pack(tab, fle_file(min, path), 1, y++, TRUE);
+			g_free(path);
+		}
 	}
 #endif
 	sep = gtk_hseparator_new();
@@ -193,33 +265,35 @@
 	y++;
 
 	label_pack(tab, _("Owner"), 0, y, FALSE);
-	if((ptr = (gchar *) usr_lookup_uname(DP_ROW_LSTAT(row).st_uid)) != NULL)
-		g_snprintf(buf, sizeof buf, "%s (%d)", ptr, (gint) DP_ROW_LSTAT(row).st_uid);
+	if((ptr = (gchar *) usr_lookup_uname(dp_row_get_uid(m, row))) != NULL)
+		g_snprintf(buf, sizeof buf, "%s (%d)", ptr, (gint) dp_row_get_uid(m, row));
 	else
-		g_snprintf(buf, sizeof buf, "%d", (gint) DP_ROW_LSTAT(row).st_uid);
+		g_snprintf(buf, sizeof buf, "%d", (gint) dp_row_get_uid(m, row));
 	label_pack(tab, buf, 1, y++, TRUE);
 
 	label_pack(tab, _("Group"), 0, y, FALSE);
-	if((ptr = (gchar *) usr_lookup_gname(DP_ROW_LSTAT(row).st_gid)) != NULL)
-		g_snprintf(buf, sizeof buf, "%s (%d)", ptr, (gint) DP_ROW_LSTAT(row).st_gid);
+	if((ptr = (gchar *) usr_lookup_gname(dp_row_get_gid(m, row))) != NULL)
+		g_snprintf(buf, sizeof buf, "%s (%d)", ptr, (gint) dp_row_get_gid(m, row));
 	else
-		g_snprintf(buf, sizeof buf, "%d", (gint) DP_ROW_LSTAT(row).st_gid);
+		g_snprintf(buf, sizeof buf, "%d", (gint) dp_row_get_gid(m, row));
 	label_pack(tab, buf, 1, y++, TRUE);
 
 	sep = gtk_hseparator_new();
 	gtk_table_attach(GTK_TABLE(tab), sep, 0, 2, y, y + 1, GTK_EXPAND | GTK_FILL,0,0,5);
 	y++;
 
-	build_date(_("Accessed"), y++, &DP_ROW_LSTAT(row).st_atime, info_options.df_access, tab);
-	build_date(_("Modified"), y++, &DP_ROW_LSTAT(row).st_ctime, info_options.df_modify, tab);
-	build_date(_("Changed"),  y++, &DP_ROW_LSTAT(row).st_mtime, info_options.df_change, tab);
+	y = build_date(_("Accessed"), y, dp_row_get_time_accessed(m, row), info_options.df_access, tab);
+	y = build_date(_("Modified"), y, dp_row_get_time_modified(m, row), info_options.df_modify, tab);
+	y = build_date(_("Changed"),  y, dp_row_get_time_changed(m, row), info_options.df_change, tab);
+	y = build_date(_("Created"),  y, dp_row_get_time_created(m, row), info_options.df_change, tab);
+
+	gtk_notebook_append_page(GTK_NOTEBOOK(nbook), tab, gtk_label_new(_("Basic")));
 
-	if(errno)
+	if((gp = build_gio_info(dp, row)) != NULL)
 	{
-		gtk_widget_destroy(tab);
-		return NULL;
+		gtk_notebook_append_page(GTK_NOTEBOOK(nbook), gp, gtk_label_new(_("Attributes")));
 	}
-	return tab;
+	return nbook;
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -229,13 +303,13 @@
 {
 	DirSizeInfo	*dsi = user;
 
-	if(dsi)
-		fut_dir_size_stop(dsi->handle);
+	if(dsi != NULL)
+		fut_dir_size_gfile_stop(dsi->handle);
 	g_free(dsi);
 }
 
 /* 1999-03-06 -	Create window showing all about <row>, which sits in <dp>. */
-static gint information(MainInfo *min, const DirPane *dp, const DirRow *row)
+static gint information(MainInfo *min, const DirPane *dp, const DirRow2 *row)
 {
 	DirSizeInfo	*dsi = NULL;
 	GtkWidget	*fr;
@@ -243,7 +317,7 @@
 	if((fr = build_info(min, dp, row, &dsi)) != NULL)
 	{
 		gtk_widget_show_all(fr);
-		dlg_dialog_async_new(fr, DP_ROW_NAMED(row), _("_OK"), info_close, dsi);
+		dlg_dialog_async_new(fr, dp_row_get_name_display(dp_get_tree_model(dp), row), _("_OK"), info_close, dsi);
 	}
 	return fr != NULL;
 }
@@ -255,29 +329,23 @@
 */
 gint cmd_information(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	GSList	*slist, *iter;
+	GSList		*slist, *iter;
+	gboolean	ok = TRUE;
 
 	if((slist = dp_get_selection(src)) == NULL)
 		return 1;
 
 	pgs_progress_begin(min, _("Getting Information..."), PFLG_BUSY_MODE);
-	for(iter = slist; iter != NULL; iter = g_slist_next(iter))
+	for(iter = slist; ok && (iter != NULL); iter = g_slist_next(iter))
 	{
-		if(!information(min, src, DP_SEL_ROW(iter)))
-			break;
-		dp_unselect(src, DP_SEL_INDEX(src, iter));
+		if((ok = information(min, src, iter->data)))
+			dp_unselect(src, iter->data);
 	}
 	pgs_progress_end(min);
 
-	if(errno)
-		err_set(min, errno, CMD_ID, iter ? DP_SEL_NAMED(iter) : NULL);
-	else
-		err_clear(min);
-	err_show(min);
-
 	dp_free_selection(slist);
 
-	return 1;
+	return ok;
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -291,10 +359,10 @@
 		info_options.modified	  = FALSE;
 		info_options.use_file	  = FALSE;
 		info_options.recurse_dirs = TRUE;
-		stu_strncpy(info_options.df_access, "%Y-%m-%d %H:%M.%S", sizeof info_options.df_access);
-		stu_strncpy(info_options.df_modify, "%Y-%m-%d %H:%M.%S", sizeof info_options.df_modify);
-		stu_strncpy(info_options.df_change, "%Y-%m-%d %H:%M.%S", sizeof info_options.df_change);
-		stu_strncpy(info_options.tick, ",", sizeof info_options.tick);
+		g_strlcpy(info_options.df_access, "%Y-%m-%d %H:%M.%S", sizeof info_options.df_access);
+		g_strlcpy(info_options.df_modify, "%Y-%m-%d %H:%M.%S", sizeof info_options.df_modify);
+		g_strlcpy(info_options.df_change, "%Y-%m-%d %H:%M.%S", sizeof info_options.df_change);
+		g_strlcpy(info_options.tick, ",", sizeof info_options.tick);
 
 		info_cmc = cmc_config_new("Information", &info_options);
 		cmc_field_add_boolean(info_cmc, "modified", NULL, offsetof(OptInfo, modified));

gentoo-0.15.6.tar.bz2/src/cmd_join.c -> gentoo-0.19.9.tar.gz/src/cmd_join.c Changed

@@ -10,7 +10,6 @@
 #include <fcntl.h>
 
 #include "cmd_delete.h"
-#include "convutil.h"
 #include "dialog.h"
 #include "dirpane.h"
 #include "errors.h"
@@ -28,25 +27,24 @@
 /* 2000-02-12 -	Do the actual joining of the selected files. Returns TRUE on success. */
 static gboolean do_join(MainInfo *min, DirPane *src, DirPane *dst, GtkListStore *store, GtkEntry *entry, gsize total_size)
 {
-	gchar		bufPATH_MAX, *file;
-	const gchar	*str;
-	gsize		done_size = 0U;
-	OvwRes		owres;
-	gboolean	doit = TRUE;
-	Conv		conv;
-
-	/* Protect against empty destination name. */
-	if((str = gtk_entry_get_text(entry)) == NULL || *str == '\0')
+	const gchar		*str = gtk_entry_get_text(entry);
+	GFile			*out;
+	OvwRes			owres;
+	gboolean		doit = TRUE;
+	GError			*err = NULL;
+	GFileOutputStream	*outs;
+	gsize			done_size = 0;
+
+	/* Protect against slashes in destination name. No rename-trickery! */
+	if(g_utf8_strchr(str, -1, G_DIR_SEPARATOR) != NULL)
 	{
 		err_set(min, EINVAL, CMD_ID, NULL);
 		return FALSE;
 	}
 
-	file = conv_begin(&conv, str);
-
+	out = dp_get_file_from_name_display(dst, str);
 	ovw_overwrite_begin(min, _("\"%s\" Already Exists - Continue With Join?"), 0U);
-	g_snprintf(buf, sizeof buf, "%s/%s", dst->dir.path, file);
-	owres = ovw_overwrite_file(min, buf, NULL);
+	owres = ovw_overwrite_unary_file(dst, out);
 	switch(owres)
 	{
 	case OVW_SKIP:
@@ -56,68 +54,73 @@
 	case OVW_PROCEED:
 		break;
 	case OVW_PROCEED_FILE:
-		doit = del_delete_file(min, buf);
-		break;
 	case OVW_PROCEED_DIR:
-		doit = del_delete_dir(min, buf, FALSE);
+		doit = del_delete_gfile(min, out, FALSE, &err);
 		break;
 	}
-	if(doit)
+	if(!doit)
+	{
+		err_set_gerror(min, &err, CMD_ID, out);
+		g_object_unref(out);
+		return FALSE;
+	}
+
+	if((outs = g_file_create(out, G_FILE_CREATE_NONE, NULL, &err)) != NULL)
 	{
-		gint	fout;
+		GtkTreeIter		iter;
+		gsize			put;
 
-		if((fout = open(buf, O_CREAT | O_WRONLY | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) >= 0)
+		pgs_progress_begin(min, _("Joining..."), PFLG_BYTE_VISIBLE);
+		gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter);
+		while(gtk_list_store_iter_is_valid(store, &iter))
 		{
-			GtkTreeIter	iter;
-			gint		fin;
-			DirRow		*dr;
-			gsize		put;
-
-			pgs_progress_begin(min, _("Joining..."), PFLG_BYTE_VISIBLE);
-			gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter);
-			while(gtk_list_store_iter_is_valid(store, &iter))
+			GFile	*in;
+			DirRow2	*dr;
+
+			gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 2, &dr, -1);
+			if((in = dp_get_file_from_row(src, dr)) != NULL)
 			{
-				gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 2, &dr, -1);
-				if((fin = open(dp_full_name(src, DP_ROW_INDEX(src, dr)), O_RDONLY)) >= 0)
+				GFileInputStream	*ins;
+
+				if((ins = g_file_read(in, NULL, &err)) != NULL)
 				{
-					pgs_progress_item_begin(min, DP_ROW_NAME(dr), DP_ROW_STAT(dr).st_size);
-					put = fut_copy(fin, fout, 256 << 10);
-					pgs_progress_item_end(min);
-					if(close(fin) != 0)
-					{
-						err_set(min, errno, CMD_ID, DP_ROW_NAME(dr));
-						break;
-					}
-					if(put != DP_ROW_STAT(dr).st_size)
-					{
-						err_set(min, 000, CMD_ID, DP_ROW_NAME(dr));
+					pgs_progress_item_begin(min, dp_row_get_name_display(dp_get_tree_model(src), dr), dp_row_get_size(dp_get_tree_model(src), dr));
+					put = g_output_stream_splice(G_OUTPUT_STREAM(outs), G_INPUT_STREAM(ins), G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE, NULL, &err);
+					if(put < 0 || !g_input_stream_close(G_INPUT_STREAM(ins), NULL, &err))
 						break;
-					}
+					pgs_progress_item_end(min);
+					dp_unselect(src, dr);
 					done_size += put;
-					dp_unselect(src, DP_ROW_INDEX(src, dr));
-				}
-				else
-				{
-					err_set(min, errno, CMD_ID, DP_ROW_NAME(dr));
-					break;
 				}
-				if(!gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter))
-					break;
+				g_object_unref(in);
 			}
-			pgs_progress_end(min);
-			close(fout);
-			if(done_size == total_size)
-				dp_rescan_post_cmd(dst);
 			else
-				unlink(buf);
+				break;
+			if(!gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter))
+				break;
 		}
-		else
-			err_set(min, errno, CMD_ID, buf);
+		pgs_progress_end(min);
+		if(done_size == total_size)
+			dp_rescan_post_cmd(dst);
 	}
+	if(done_size != total_size)
+		err_set_gerror(min, &err, CMD_ID, out);
+
+	g_object_unref(out);
 	ovw_overwrite_end(min);
-	conv_end(&conv);
 
-	return doit ? done_size == total_size : TRUE;
+	return done_size == total_size;
+}
+
+static void evt_dest_changed(GtkEditable *w, gpointer user)
+{
+	Dialog		*dlg = user;
+	const gchar	*str = gtk_entry_get_text(GTK_ENTRY(w));
+	gsize		len;
+
+	/* Protect against empty destination name, nicely. */
+	len = strlen(str);
+	dlg_dialog_set_positive_enabled(dlg, len > 0);
 }
 
 gint cmd_join(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
@@ -129,15 +132,18 @@
 
 	if((sel = dp_get_selection(src)) != NULL)
 	{
-		GSList	*iter;
-		gsize	tot = 0, num = 0;
+		GtkTreeModel	*m = dp_get_tree_model(src);
+		GSList		*iter;
+		gsize		tot = 0, num = 0;
 
-		/* Compute size of all regular files in the selection. */
+		/* Compute size of all regular files in the selection; ignore 0-sized files. */
 		for(iter = sel; iter != NULL; iter = g_slist_next(iter))
 		{
-			if(S_ISREG(DP_ROW_STAT((DirRow *) iter->data).st_mode))
+			guint64	size = dp_row_get_size(m, iter->data);
+			/* Follow symlinks, since we want to allow the joining of a bunch of link targets. */
+			if(size > 0 && dp_row_get_file_type(m, iter->data, TRUE) == G_FILE_TYPE_REGULAR)
 			{
-				tot += DP_ROW_STAT((DirRow *) iter->data).st_size;
+				tot += size;
 				num++;
 			}
 		}
@@ -148,15 +154,14 @@
 		if(num > 1)
 		{
 			Dialog			*dlg;
-			GtkWidget		*scwin, *vbox, *label, *entry;
+			GtkWidget		*scwin, *vbox, *label, *entry, *view;
 			GtkListStore		*store;
-			GtkWidget		*view;
 			GtkCellRenderer		*cr, *sr;
 			GtkTreeViewColumn	*vc;
 			GtkTreeSelection	*treesel;
 			gchar			bufFILENAME_MAX + 64;
-			const gchar		*first = NULL;
-			gint			len;
+			const gchar		*first = NULL, *tail;
+			gunichar		ch;
 
 			vbox  = gtk_vbox_new(FALSE, 0);
 			label = gtk_label_new(_("Click and Drag Files to Reorder, Then Click Join."));
@@ -166,7 +171,7 @@
 			{
 				gchar	sbuf16;
 
-				sze_put_size(sbuf, sizeof sbuf, tot, SZE_AUTO);
+				sze_put_offset(sbuf, sizeof sbuf, tot, SZE_AUTO, 3, ',');
 				g_snprintf(buf, sizeof buf, _("The total size is %s (%lu bytes)."), sbuf, (unsigned long) tot);
 			}
 			else
@@ -181,17 +186,17 @@
 			store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_POINTER);
 			for(iter = sel; iter != NULL; iter = g_slist_next(iter))
 			{
-				if(S_ISREG(DP_ROW_STAT((DirRow *) iter->data).st_mode))
+				if(dp_row_get_file_type(m, iter->data, TRUE) == G_FILE_TYPE_REGULAR && dp_row_get_size(m, iter->data) > 0)
 				{
 					GtkTreeIter	ti;
 
 					gtk_list_store_append(store, &ti);
-					gtk_list_store_set(store, &ti, 0, DP_ROW_NAME((DirRow *) iter->data),
-								       1, DP_ROW_STAT((DirRow *) iter->data).st_size,
+					gtk_list_store_set(store, &ti, 0, dp_row_get_name_display(m, iter->data),
+								       1, dp_row_get_size(m, iter->data),
 								       2, iter->data,
 								       -1);
 					if(first == NULL)
-						first = DP_ROW_NAME((DirRow *) iter->data);
+						first = dp_row_get_name_display(m, iter->data);
 				}
 			}
 
@@ -214,22 +219,21 @@
 
 			label = gtk_label_new(_("Enter Destination File Name"));
 			gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 5);
-			entry = gtk_entry_new_with_max_length(FILENAME_MAX - 1);
-			/* Heuristic: remove trailing hexadecimal number and period, and position cursor before last remaining period. */
-			if((len = g_snprintf(buf, sizeof buf, "%s", first)) > 0)
+			entry = gtk_entry_new();
+			gtk_entry_set_max_length(GTK_ENTRY(entry), FILENAME_MAX - 1);
+			/* Get a pointer to the terminating '\0' character. */
+			tail = g_utf8_offset_to_pointer(first, g_utf8_strlen(first, -1));
+			do
 			{
-				const gchar	*dot;
-				int	i;
-
-				for(i = len - 1; i > 0 && (isxdigit(bufi) || bufi == '.'); i--)
-					bufi = '\0';
-				gtk_entry_set_text(GTK_ENTRY(entry), buf);
-				if((dot = strrchr(buf, '.')) != NULL)
-					gtk_entry_set_position(GTK_ENTRY(entry), dot - buf);
-			}
+				tail = g_utf8_find_prev_char(first, tail);	/* Step backward. */
+				ch = g_utf8_get_char(tail);
+			} while(g_unichar_isxdigit(ch) || ch == '.');
+			gtk_entry_buffer_set_text(gtk_entry_get_buffer(GTK_ENTRY(entry)), first, g_utf8_pointer_to_offset(first, tail) + 1);
+			gtk_editable_set_position(GTK_EDITABLE(entry), -1);
 			gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
 
 			dlg = dlg_dialog_sync_new(vbox, _("Join"), _("_Join|_Cancel"));
+			g_signal_connect(G_OBJECT(entry), "changed", G_CALLBACK(evt_dest_changed), dlg);
 			gtk_widget_show_all(vbox);
 			gtk_widget_grab_focus(entry);
 			if(dlg_dialog_sync_wait(dlg) == DLG_POSITIVE)
@@ -238,6 +242,5 @@
 		}
 		dp_free_selection(sel);
 	}
-	err_show(min);
 	return ret;
 }

gentoo-0.15.6.tar.bz2/src/cmd_menupopup.c -> gentoo-0.19.9.tar.gz/src/cmd_menupopup.c Changed

gentoo-0.15.6.tar.bz2/src/cmd_mkdir.c -> gentoo-0.19.9.tar.gz/src/cmd_mkdir.c Changed

@@ -14,7 +14,6 @@
 #include "cmdseq.h"
 #include "cmdseq_config.h"
 #include "configure.h"
-#include "convutil.h"
 #include "dialog.h"
 #include "dirpane.h"
 #include "errors.h"
@@ -45,70 +44,64 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1998-08-27 -	This gets called when user closes down the mkdir dialog. Create the
-**		dir (and, optionally, enter or focus it).
-*/
-static void make_dir(MkdInfo *mdi)
+static gboolean make_dir(const MkdInfo *mdi)
 {
-	MainInfo	*min = mdi->src->main;
-	gchar		bufPATH_MAX, *name;
-	const gchar	*text = gtk_entry_get_text(GTK_ENTRY(mdi->entry));
-	gboolean	doit = FALSE;
-	struct stat	stbuf;
-	Conv		conv;
-
-	if(*text == '\0')				/* Avoid attempting to create "". */
-		return;
-	if(*mdi->src->dir.path == '\0')			/* Don't blow up in strlen() below. */
-		return;
-	name = conv_begin(&conv, text);
-	if(strchr(name, G_DIR_SEPARATOR) != NULL)	/* Also avoid clever paths. */
-	{
-		conv_end(&conv);
-		return;
-	}
-
-	/* Build destination directory name, taking care to get a single slash between parts. */
-	g_snprintf(buf, sizeof buf, "%s%s%s", mdi->src->dir.path,
-			mdi->src->dir.pathstrlen(mdi->src->dir.path) - 1 == G_DIR_SEPARATOR ? "" : G_DIR_SEPARATOR_S,
-			name);
-	ovw_overwrite_begin(min, _("\"%s\" Already Exists - Proceed With MkDir?"), 0UL);
-	switch(ovw_overwrite_file(min, buf, NULL))
-	{
-	case OVW_SKIP:
-	case OVW_CANCEL:
-		break;
-	case OVW_PROCEED:
-		doit = TRUE;
-		break;
-	case OVW_PROCEED_FILE:
-		doit = del_delete_file(min, buf);
-		break;
-	case OVW_PROCEED_DIR:
-		doit = FALSE;
-	}
-	ovw_overwrite_end(min);
-	err_clear(min);
-	if(doit)
-		mkdir(buf, 0755);
-	if(lstat(buf, &stbuf) == 0 && S_ISDIR(stbuf.st_mode))
+	const gchar	*text;
+	GFile		*dest;
+	gboolean	ok = FALSE;
+	GError		*err = NULL;
+
+	if(mdi == NULL)
+		return FALSE;
+	text = gtk_entry_get_text(GTK_ENTRY(mdi->entry));
+	if(*text == '\0')
+		return FALSE;
+	if(mdi->src->dir.root == NULL)
+		return FALSE;
+
+	err_clear(mdi->src->main);
+	if((dest = g_file_get_child_for_display_name(mdi->src->dir.root, text, &err)) != NULL)
 	{
-		if(mkdir_options.cd_new)
-			csq_execute_format(min, "DirEnter 'dir=%s'", stu_escape(buf));
-		else
+		ovw_overwrite_begin(mdi->src->main, _("\"%s\" Already Exists - Proceed With MkDir?"), 0UL);
+		switch(ovw_overwrite_unary_file(mdi->src, dest))
 		{
-			dp_rescan(mdi->src);
-			csq_execute_format(min, "DpGotoRow focus=%s nocase=no 're=%s'", mkdir_options.focus_new ? "yes" : "no", name);
+		case OVW_SKIP:
+		case OVW_CANCEL:
+			ok = FALSE;
+			break;
+		case OVW_PROCEED:
+			ok = TRUE;
+			break;
+		case OVW_PROCEED_FILE:
+			ok = del_delete_gfile(mdi->src->main, dest, FALSE, &err);
+			break;
+		case OVW_PROCEED_DIR:
+			ok = FALSE;
+			break;
 		}
+		ovw_overwrite_end(mdi->src->main);
+		if(ok)
+		{
+			ok = g_file_make_directory(dest, NULL, &err);
+			if(ok)
+			{
+				gchar	*pn = g_file_get_parse_name(dest);
+
+				if(mkdir_options.cd_new)
+					ok = csq_execute_format(mdi->src->main, "DirEnter 'dir=%s'", pn);
+				else if(mkdir_options.focus_new)
+					ok = csq_execute_format(mdi->src->main, "DpGotoRow focus=%s nocase=no 're=%s'", mkdir_options.focus_new ? "yes" : "no", pn);
+				if(!mkdir_options.cd_new)
+					dp_rescan_post_cmd(mdi->src);
+				g_free(pn);
+			}
+		}
+		g_object_unref(dest);
 	}
-	else
-	{
-		err_set(min, errno, CMD_ID, buf);
-		err_show(min);
-	}
-	conv_end(&conv);
-	if(mkdir_options.modified)
-		cfg_modified_set(min);
+	if(err != NULL)
+		err_set_gerror(mdi->src->main, &err, text, NULL);
+
+	return ok;
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -119,12 +112,14 @@
 	Dialog		*dlg;
 	MkdInfo		mi;
 	GtkWidget	*wid;
+	gboolean	ok;
 
 	mi.src = src;
 	mi.vbox = gtk_vbox_new(FALSE, 0);
 	wid = gtk_label_new(_("Enter Name of Directory to Create"));
 	gtk_box_pack_start(GTK_BOX(mi.vbox), wid, FALSE, FALSE, 0);
-	mi.entry = gtk_entry_new_with_max_length(MAXNAMLEN - 1);
+	mi.entry = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(mi.entry), MAXNAMLEN - 1);
 	gtk_box_pack_start(GTK_BOX(mi.vbox), mi.entry, FALSE, FALSE, 0);
 	wid = cmc_field_build(mkdir_cmc, "cd_new", &mkdir_options);
 	gtk_box_pack_start(GTK_BOX(mi.vbox), wid, FALSE, FALSE, 0);
@@ -133,10 +128,10 @@
 	dlg = dlg_dialog_sync_new(mi.vbox, _("Make Directory"), NULL);
 	gtk_widget_grab_focus(mi.entry);
 	if(dlg_dialog_sync_wait(dlg) == DLG_POSITIVE)
-		make_dir(&mi);
+		ok = make_dir(&mi);
 	dlg_dialog_sync_destroy(dlg);
 
-	return 1;
+	return ok;
 }
 
 /* ----------------------------------------------------------------------------------------- */

gentoo-0.15.6.tar.bz2/src/cmd_move.c -> gentoo-0.19.9.tar.gz/src/cmd_move.c Changed

@@ -11,7 +11,6 @@
 
 #include "cmd_copy.h"
 #include "cmd_delete.h"
-#include "convutil.h"
 #include "dialog.h"
 #include "dirpane.h"
 #include "errors.h"
@@ -25,78 +24,55 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 2003-11-24 -	Move a "file", i.e. anything that is not a directory. */
-gint move_file(MainInfo *min, const gchar *from, const gchar *to, const struct stat *sstat)
+static void cb_progress(goffset pos, goffset total, gpointer user)
 {
-	/* Check overwrite status. */
-	switch(ovw_overwrite_file(min, to, from))
-	{
-	case OVW_SKIP:
-		return TRUE;
-	case OVW_CANCEL:
-		return FALSE;
-	case OVW_PROCEED:
-		break;
-	case OVW_PROCEED_FILE:
-		del_delete_file(min, to);
-		break;
-	case OVW_PROCEED_DIR:
-		del_delete_dir(min, to, FALSE);
-		break;
-	}
-	if(errno != 0)
-		return FALSE;
-	/* Try a quick (for same-device moves) rename(), otherwise copy. */
-	if(rename(from, to) == 0)
-		return TRUE;
-	else if(copy_file(min, from, to, sstat))	/* If no rename, copy and unlink. */
-	{
-		unlink(from);
-		return errno == 0;
-	}
-	return FALSE;
+	pgs_progress_item_update(user, pos);
 }
 
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1998-06-07 -	Move a directory full of stuff. Does not simply call copy_dir from the cmd_copy module,
-**		since that would require also calling del_delete_dir() (from cmd_delete). I feel that
-**		is just too inefficient, having to traverse twice.
-** 1998-09-12 -	Modified: now <to> is the complete destination name, since this is the new deal.
-*/
-gboolean move_dir(MainInfo *min, const gchar *from, const gchar *to)
+static gboolean move_gfile_directory(MainInfo *min, DirPane *src, DirPane *dst, const GFile *from, const GFile *to, gboolean progress, GError **err)
 {
-	struct stat	stat;
-	gchar		old_dirPATH_MAX;
-	gchar		destPATH_MAX;
-	Conv		conv;
-
-	/* Do safety checking before removing existing destination directory. Bad if nested. */
-	if(fut_is_parent_of(from, to))
-	{
-		gchar	ebuf2 * PATH_MAX + 128, *fromd, *tod;
+	GFileEnumerator	*fe;
+	GFileInfo	*fi;
+	gboolean	ok = TRUE;
+
+	/* First create the destination directory. It must be possible without overwriting
+	** anything, gentoo's copy semantics do not allow merge on move.
+	*/
+	if(!g_file_make_directory((GFile *) to, NULL, err))
+		return FALSE;
 
-		fromd = conv_begin_reverse(&conv, from);
-		tod = conv_add_reverse(&conv, to);
-		g_snprintf(ebuf, sizeof ebuf, _("Can't move directory \"%s\"\nto \"%s\":\nthe source contains the destination."), fromd, tod);
-		dlg_dialog_async_new_error(ebuf);
-		conv_end(&conv);
+	/* Now iterate over the children of the source, and move each file contained therein. */
+	if((fe = g_file_enumerate_children((GFile *) from, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, err)) == NULL)
 		return FALSE;
-	}
-	if(fut_is_parent_of(to, from))
+	while(ok && (fi = g_file_enumerator_next_file(fe, NULL, err)) != NULL)
 	{
-		gchar	ebuf2 * PATH_MAX + 128, *fromd, *tod;
+		GFile	*sfile, *dfile;
 
-		fromd = conv_begin_reverse(&conv, from);
-		tod = conv_add_reverse(&conv, to);
-		g_snprintf(ebuf, sizeof ebuf, _("Can't move directory \"%s\"\nto \"%s\":\nthe destination contains the source."), fromd, tod);
-		dlg_dialog_async_new_error(ebuf);
-		conv_end(&conv);
-		return FALSE;
+		ok = FALSE;
+		if((sfile = g_file_get_child((GFile *) from, g_file_info_get_name(fi))) != NULL)
+		{
+			if((dfile = g_file_get_child((GFile *) to, g_file_info_get_name(fi))) != NULL)
+			{
+				ok = move_gfile(min, src, dst, sfile, dfile, progress, err);
+				g_object_unref(dfile);
+			}
+			g_object_unref(sfile);
+		}
+		g_object_unref(fi);
 	}
+	g_object_unref(fe);
+
+	return ok;
+}
 
-	/* Investigate toplevel overwrite status. */
-	switch(ovw_overwrite_file(min, to, from))
+gboolean move_gfile(MainInfo *min, DirPane *src, DirPane *dst, const GFile *sfile, const GFile *dfile, gboolean progress, GError **err)
+{
+	gboolean	ok;
+	GFileInfo	*fi;
+
+	if(src == NULL || dst == NULL || sfile == NULL || dfile == NULL)
+		return FALSE;
+	switch(ovw_overwrite_unary_file(dst, dfile))
 	{
 	case OVW_SKIP:
 		return TRUE;
@@ -105,67 +81,31 @@
 	case OVW_PROCEED:
 		break;
 	case OVW_PROCEED_FILE:
-		del_delete_file(min, to);
-		break;
 	case OVW_PROCEED_DIR:
-		del_delete_dir(min, to, FALSE);
-		break;
+		if(!del_delete_gfile(min, (GFile *) dfile, FALSE, err))
+			return FALSE;
 	}
-	
-	/* Try a quick rename. */
-	if(rename(from, to) == 0)
-		return TRUE;
-	else if(errno != EXDEV)
-	{
-		err_set(min, errno, CMD_ID, from);
+	/* Grab the FileInfo, gives handy access to both name and size. */
+	if((fi = g_file_query_info((GFile *) sfile, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, err)) == NULL)
 		return FALSE;
-	}
-
-	/* Get stat, enter and move all items, recursively. */
-	if(lstat(from, &stat) != 0)
+	pgs_progress_item_begin(min, g_file_info_get_display_name(fi), g_file_info_get_size(fi));
+	g_object_unref(fi);
+
+	ok = g_file_move((GFile *) sfile, (GFile *) dfile, G_FILE_COPY_NOFOLLOW_SYMLINKS, NULL, cb_progress, min, err);
+	pgs_progress_item_end(min);
+	/* If it failed, check if it was because it "would recurse". If so, then we need to
+	** implement a fall-back, since GIO doesn't do that for us. Luckily, this whole
+	** program is supposed to be a _file manager_, so it's right up our alley.
+	*/
+	if(!ok && err != NULL && *err != NULL && (*err)->code == G_IO_ERROR_WOULD_RECURSE)
 	{
-		err_set(min, errno, CMD_ID, from);
-		return 0;
+		/* Drop the GError, since we've handled it and it was semi-expected. */
+		g_error_free(*err);
+		*err = NULL;
+		ok = move_gfile_directory(min, src, dst, sfile, dfile, progress, err);
 	}
-	if(fut_cd(from, old_dir, sizeof old_dir))
-	{
-		if(mkdir(to, stat.st_mode | S_IWUSR) == 0)
-		{
-			DIR	*dir;
 
-			if((dir = opendir(".")) != NULL)
-			{
-				struct dirent	*de;
-
-				errno = 0;
-				while(!errno && (de = readdir(dir)) != NULL)
-				{
-					if(!min->cfg.dir_filter(de->d_name))
-						continue;
-					if(lstat(de->d_name, &stat) == 0)
-					{
-						g_snprintf(dest, sizeof dest, "%s/%s", to, de->d_name);
-						if(S_ISDIR(stat.st_mode))
-						{
-							if(!move_dir(min, de->d_name, dest))
-								break;
-						}
-						else
-						{
-							if(!move_file(min, de->d_name, dest, &stat))
-								break;
-						}
-					}
-				}
-				closedir(dir);
-			}
-		}
-		if(!errno && fut_cd(old_dir, NULL, 0))
-			rmdir(from);
-	}
-	if(errno)
-		err_set(min, errno, CMD_ID, from);
-	return errno == 0;
+	return ok;
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -173,43 +113,39 @@
 /* 2003-11-24 -	Move selected files and/or directories to destination pane's directory. */
 gint cmd_move(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	gchar	old_pathPATH_MAX, destPATH_MAX;
-	GSList	*slist, *iter;
+	GSList		*slist, *iter;
+	GError		*error = NULL;
+	GFile		*sfile, *dfile;
+	gboolean	ok = TRUE;
+	guint		count = 0;
 
-	if((src == NULL) || (dst == NULL))
-		return 1;
-	if(!fut_cd(src->dir.path, old_path, sizeof old_path))
+	if((min == NULL) || (src == NULL) || (dst == NULL))
 		return 0;
-
 	if((slist = dp_get_selection(src)) == NULL)
 		return 1;
 
 	err_clear(min);
 	ovw_overwrite_begin(min, _("\"%s\" Already Exists - Continue With Move?"), 0UL);
 	pgs_progress_begin(min, _("Moving..."), PFLG_COUNT_RECURSIVE | PFLG_ITEM_VISIBLE | PFLG_BYTE_VISIBLE);
-	for(iter = slist; !errno && (iter != NULL); iter = g_slist_next(iter))
+	for(iter = slist; ok && (iter != NULL); iter = g_slist_next(iter))
 	{
-		g_snprintf(dest, sizeof dest, "%s%c%s", dst->dir.path, G_DIR_SEPARATOR, DP_SEL_NAME(iter));
-		if(S_ISDIR(DP_SEL_LSTAT(iter).st_mode))
-		{
-			if(!move_dir(min, DP_SEL_NAME(iter), dest))
-				break;
-		}
-		else
-		{
-			if(!move_file(min, DP_SEL_NAME(iter), dest, &DP_SEL_LSTAT(iter)))
-				break;
-		}
+		sfile = dp_get_file_from_row(src, iter->data);
+		dfile = dp_get_file_from_name(dst, dp_row_get_name(dp_get_tree_model(src), iter->data));
+		ok = move_gfile(min, src, dst, sfile, dfile, TRUE, &error);
+		if(!ok)
+			err_set_gerror(min, &error, CMD_ID, sfile);
+		count += (ok != FALSE);
+		g_object_unref(dfile);
+		g_object_unref(sfile);
+	}
+	if(count > 0)
+	{
+		dp_rescan_post_cmd(src);
+		dp_rescan_post_cmd(dst);
 	}
-	dp_rescan_post_cmd(src);
-	dp_rescan_post_cmd(dst);
-	if(errno && iter != NULL)
-		err_set(min, errno, CMD_ID, dp_full_name(src, DP_SEL_INDEX(src, iter)));
 	pgs_progress_end(min);
 	ovw_overwrite_end(min);
-	fut_cd(old_path, NULL, 0);
 	dp_free_selection(slist);
-	err_show(min);
 
-	return errno == 0;
+	return ok;
 }

gentoo-0.15.6.tar.bz2/src/cmd_move.h -> gentoo-0.19.9.tar.gz/src/cmd_move.h Changed

gentoo-0.15.6.tar.bz2/src/cmd_moveas.c -> gentoo-0.19.9.tar.gz/src/cmd_moveas.c Changed

@@ -1,10 +1,10 @@
 /*
 ** 1998-09-12 -	A Move As command. Very useful.
 ** 1999-03-06 -	Adapted for the new selection/generic/dirrow representations.
+** 2010-02-28 -	Ported to GIO and GTK+ 2.0.
 */
 
 #include "gentoo.h"
-#include "convutil.h"
 #include "errors.h"
 #include "fileutil.h"
 #include "overwrite.h"
@@ -27,22 +27,25 @@
 	GtkWidget	*entry;
 	MainInfo	*min;
 	gint		ovw_open;
+	GQuark		quark;
 } MvaInfo;
 
 /* ----------------------------------------------------------------------------------------- */
 
 /* 1998-09-12 -	Update body of move as GUI. */
-static void mva_body(MainInfo *min, DirPane *src, DirRow *row, gpointer user)
+static void mva_body(MainInfo *min, DirPane *src, DirRow2 *row, gpointer gen, gpointer user)
 {
-	gchar	bufFILENAME_MAX + 32;
+	gchar	buf256;
 	MvaInfo	*mva = user;
 
-	g_snprintf(buf, sizeof buf, _("Enter Name to Move \"%s\" As"), DP_ROW_NAMED(row));
+	g_snprintf(buf, sizeof buf, _("Enter Name to Move \"%s\" As"), dp_row_get_name_display(dp_get_tree_model(src), row));
 	gtk_label_set_text(GTK_LABEL(mva->label), buf);
-	gtk_entry_set_text(GTK_ENTRY(mva->entry), DP_ROW_NAMED(row));
-	gtk_entry_select_region(GTK_ENTRY(mva->entry), 0, -1);
+	gtk_entry_set_text(GTK_ENTRY(mva->entry), dp_row_get_name_display(dp_get_tree_model(src), row));
+	gtk_editable_select_region(GTK_EDITABLE(mva->entry), 0, -1);
 	gtk_widget_grab_focus(mva->entry);
 
+	cmd_generic_track_entry(gen, mva->entry);
+
 	if(mva->ovw_open == FALSE)
 	{
 		ovw_overwrite_begin(mva->min, _("\"%s\" Already Exists - Continue With Move?"), 0U);
@@ -50,39 +53,36 @@
 	}
 }
 
-static gint mva_action(MainInfo *min, DirPane *src, DirPane *dst, DirRow *row, gpointer user)
+static gint mva_action(MainInfo *min, DirPane *src, DirPane *dst, DirRow2 *row, GError **error, gpointer user)
 {
-	gchar		destPATH_MAX;
 	const gchar	*text;
 	MvaInfo		*mva = user;
+	GFile		*file_src, *file_dst;
 	gboolean	ret = FALSE;
 
-	if(!fut_cd(src->dir.path, NULL, 0))
+	text = gtk_entry_get_text(GTK_ENTRY(mva->entry));
+	if(text == NULL || *text == '\0' || g_utf8_strchr(text, -1, G_DIR_SEPARATOR) != NULL)
+	{
+		*error = g_error_new(mva->quark, EINVAL, _("Invalid destination name for MoveAs"));
 		return 0;
+	}
 
-	text = gtk_entry_get_text(GTK_ENTRY(mva->entry));
-	if(text && *text)
+	if((file_src = dp_get_file_from_row(src, row)) != NULL)
 	{
-		Conv	conv;
-		gchar	*file;
-
-		file = conv_begin(&conv, text);
-		if(strchr(text, G_DIR_SEPARATOR) == NULL)
-			g_snprintf(dest, sizeof dest, "%s/%s", dst->dir.path, file);
-		else
-			stu_strncpy(dest, file, sizeof dest);
-		pgs_progress_begin(min, _("Moving As..."), PFLG_COUNT_RECURSIVE | PFLG_ITEM_VISIBLE | PFLG_BYTE_VISIBLE);
-		if(S_ISDIR(DP_ROW_LSTAT(row).st_mode))
-			ret = move_dir(min, DP_ROW_NAME(row), dest);
-		else
-			ret = move_file(min, DP_ROW_NAME(row), dest, &DP_ROW_STAT(row));
-		pgs_progress_end(min);
-		conv_end(&conv);
+		if((file_dst = dp_get_file_from_name_display(dst, text)) != NULL)
+		{
+			pgs_progress_begin(min, _("Moving As..."), PFLG_COUNT_RECURSIVE | PFLG_ITEM_VISIBLE | PFLG_BYTE_VISIBLE);
+			ret = move_gfile(min, src, dst, file_src, file_dst, TRUE, error);
+			pgs_progress_end(min);
+			g_object_unref(file_dst);
+		}
+		g_object_unref(file_src);
 	}
+
 	if(ret)
-		dp_unselect(src, DP_ROW_INDEX(src, row));
+		dp_unselect(src, row);
 
-	return ret && errno == 0;
+	return ret;
 }
 
 static void mva_free(gpointer user)
@@ -103,9 +103,12 @@
 
 	mva.vbox = gtk_vbox_new(FALSE, 0);
 	mva.label = gtk_label_new(_("Move As"));
-	mva.entry = gtk_entry_new_with_max_length(FILENAME_MAX - 1);
+	mva.entry = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(mva.entry), FILENAME_MAX - 1);
 	gtk_box_pack_start(GTK_BOX(mva.vbox), mva.label, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(mva.vbox), mva.entry, FALSE, FALSE, 0);
 
-	return cmd_generic(min, _("Move As"), CGF_NOALL | CGF_SRC, mva_body, mva_action, mva_free, &mva);
+	mva.quark = g_quark_from_string(CMD_ID);
+
+	return cmd_generic(min, _("Move As"), CGF_NOALL, mva_body, mva_action, mva_free, &mva);
 }

gentoo-0.15.6.tar.bz2/src/cmd_parent.c -> gentoo-0.19.9.tar.gz/src/cmd_parent.c Changed

@@ -17,38 +17,26 @@
 
 /* 1999-07-03 -	Go up one level in the source pane. Rewritten to add a little more armor
 **		plating. Still far from bullet-proof, though...
+** 2010-06-05 -	Rewritten to be lot more GIO, no more string-level parent computation.
 */
 gint cmd_parent(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	gchar	*ptr;
-	GString	*comp;
+	GFile	*parent;
 	gint	ret = 0;
 
-	ptr = src->dir.path + strlen(src->dir.path) - 1;
+	if(src->dir.root == NULL)
+		return 0;
 
-	if(*ptr == G_DIR_SEPARATOR)
-		ptr--;
-
-	comp = g_string_new("");
-	while(ptr >= src->dir.path)
+	parent = g_file_get_parent(src->dir.root);
+	if(parent != NULL)
 	{
-		if(*ptr != G_DIR_SEPARATOR)
-			g_string_prepend_c(comp, *ptr--);
-		else
+		gchar	*uri;
+
+		if((uri = g_file_get_uri(parent)) != NULL)
 		{
-			if(strcmp(comp->str, ".") == 0)	/* Skip any "." components, so parent("/home/./././.") is "/". */
-			{
-				ptr--;
-				continue;
-			}
-			g_string_assign(comp, src->dir.path);
-			g_string_truncate(comp, ptr - src->dir.path);
-			if(*comp->str == '\0')
-				g_string_assign(comp, "/");
-			ret = csq_execute_format(min, "DirEnter 'dir=%s'", stu_escape(comp->str));
-			break;
+			ret = csq_execute_format(min, "DirEnter 'dir=%s'", stu_escape(uri));
+			g_free(uri);
 		}
 	}
-	g_string_free(comp, TRUE);
 	return ret;
 }

gentoo-0.15.6.tar.bz2/src/cmd_rename.c -> gentoo-0.19.9.tar.gz/src/cmd_rename.c Changed

@@ -12,7 +12,7 @@
 
 #include "gentoo.h"
 #include "cmd_delete.h"
-#include "convutil.h"
+#include "cmdseq_config.h"
 #include "errors.h"
 #include "dirpane.h"
 #include "overwrite.h"
@@ -30,23 +30,38 @@
 	GtkWidget	*entry;
 	MainInfo	*min;
 	gboolean	ovw_open;
+
+	/* These are only used when in-place rename is in progress. */
+	DirPane		*inplace_pane;
+	GError		*inplace_error;
+	gboolean	inplace_success;
 } RenInfo;
 
+typedef struct {			/* Options used by the "Rename" command. */
+	gboolean	modified;
+	gboolean	single_in_place;
+} OptRename;
+
+static OptRename	rename_options;
+static CmdCfg		*rename_cmc = NULL;
+
 /* ----------------------------------------------------------------------------------------- */
 
-static void ren_body(MainInfo *min, DirPane *src, DirRow *row, gpointer user)
+static void ren_body(MainInfo *min, DirPane *src, DirRow2 *row, gpointer gen, gpointer user)
 {
 	gchar		tempPATH_MAX + 256;
 	const gchar	*name;
 	RenInfo		*ren = user;
 
-	name = DP_ROW_NAMED(row);
+	name = dp_row_get_name_display(dp_get_tree_model(src), row);
 	g_snprintf(temp, sizeof temp, _("Enter New Name For \"%s\""), name);
 	gtk_label_set_text(GTK_LABEL(ren->label), temp);
 	gtk_entry_set_text(GTK_ENTRY(ren->entry), name);
-	gtk_entry_select_region(GTK_ENTRY(ren->entry), 0, strlen(name));
+	gtk_editable_select_region(GTK_EDITABLE(ren->entry), 0, strlen(name));
 	gtk_widget_grab_focus(ren->entry);
 
+	cmd_generic_track_entry(gen, ren->entry);
+
 	if(!ren->ovw_open)
 	{
 		ovw_overwrite_begin(ren->min, _("\"%s\" Already Exists - Proceed With Rename?"), 0U);
@@ -54,30 +69,45 @@
 	}
 }
 
-static gint ren_action(MainInfo *min, DirPane *src, DirPane *dst, DirRow *row, gpointer user)
+static gboolean do_rename(DirPane *src, const DirRow2 *row, const gchar *new_name, GError **error)
+{
+	GFile	*file;
+
+	if((file = dp_get_file_from_row(src, row)) != NULL)
+	{
+		GFile	*nf;
+
+		nf = g_file_set_display_name(file, new_name, NULL, error);
+		if(nf != NULL)
+			g_object_unref(nf);
+		g_object_unref(file);
+
+		return nf != NULL;
+	}
+	return FALSE;
+}
+
+static gint ren_action(MainInfo *min, DirPane *src, DirPane *dst, DirRow2 *row, GError **error, gpointer user)
 {
 	RenInfo		*ren = user;
 	const gchar	*old_name, *new_name;
-	Conv		conv;
+	GFile		*df;
+	gboolean	ok;
 
-	old_name = DP_ROW_NAME(row);
-	new_name = conv_begin(&conv, gtk_entry_get_text(GTK_ENTRY(ren->entry)));
+	old_name = dp_row_get_name(dp_get_tree_model(src), row);
+	new_name = gtk_entry_get_text(GTK_ENTRY(ren->entry));
 
-	/* Disallow attempts to use rename to move files. */
-	if(strchr(new_name, G_DIR_SEPARATOR))
+	/* Ignore renames to self. */
+	if(strcmp(old_name, new_name) == 0)
 	{
-		err_set(min, EINVAL, CMD_ID, old_name);		/* Not quite perfect error message, but simple. */
-		conv_end(&conv);
-		return 0;
-	}
-	if(strcmp(old_name, new_name) == 0)			/* Ignore renames to self. */
-	{
-		dp_unselect(src, DP_ROW_INDEX(src, row));
-		conv_end(&conv);
+		dp_unselect(src, row);
 		return 1;
 	}
+
+	err_clear(min);
+
 	/* Check for overwrite, and attempt to clear the way. */
-	switch(ovw_overwrite_file(ren->min, new_name, NULL))
+	switch(ovw_overwrite_unary_name(src, new_name))
 	{
 	case OVW_SKIP:
 		return 1;
@@ -86,28 +116,19 @@
 	case OVW_PROCEED:
 		break;
 	case OVW_PROCEED_FILE:
-		if(!del_delete_file(min, new_name))
-		{
-			conv_end(&conv);
-			return 0;
-		}
-		break;
 	case OVW_PROCEED_DIR:
-		if(!del_delete_dir(min, new_name, FALSE))
-		{
-			conv_end(&conv);
+		df = dp_get_file_from_name(src, new_name);
+		if(df == NULL)
+			return 0;
+		ok = del_delete_gfile(min, df, FALSE, error);
+		g_object_unref(df);
+		if(!ok)
 			return 0;
-		}
 		break;
 	}
 
-	err_clear(min);
-	if(rename(old_name, new_name) != 0)
-		err_set(min, errno, CMD_ID, old_name);
-	else
-		dp_unselect(src, DP_ROW_INDEX(src, row));
-	conv_end(&conv);
-	return errno == 0;
+	/* All is well, open the file and do the rename. */
+	return do_rename(src, row, new_name, error);
 }
 
 static void ren_free(gpointer user)
@@ -118,16 +139,126 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
+/* 2011-01-03 -	When editing ends, try to do the rename. */
+static void evt_cell_edited(GtkCellRendererText *renderer, gchar *path, gchar *new_text, gpointer user)
+{
+	RenInfo		*ri = user;
+	GtkTreeIter	row;
+
+	if(new_text != NULL && *new_text != '\0')
+	{
+		if(gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(ri->inplace_pane->dir.store), &row, path))
+		{
+			ri->inplace_success = do_rename(ri->inplace_pane, &row, new_text, &ri->inplace_error);
+			if(!ri->inplace_success)
+			{
+				/* No generic framework, we need to do this ourselves. */
+				err_set_gerror(ri->min, &ri->inplace_error, NULL, NULL);	/* Doesn't include file information, but whatever. */
+			}
+		}
+	}
+	gtk_main_quit();
+}
+
+/* 2011-01-03 -	Pick up editing cancellation, and exit the recursive GTK+ main loop. */
+static void evt_cell_editing_canceled(GtkCellRenderer *cr, gpointer user)
+{
+	gtk_main_quit();
+}
+
 gint cmd_rename(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
 	static RenInfo	ri;
 
-	ri.ovw_open = FALSE;
-	ri.vbox	    = gtk_vbox_new(FALSE, 0);
-	ri.label    = gtk_label_new("");
-	ri.entry    = gtk_entry_new_with_max_length(MAXNAMLEN - 1);
-	gtk_box_pack_start(GTK_BOX(ri.vbox), ri.label, FALSE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(ri.vbox), ri.entry, FALSE, FALSE, 0);
+	if(rename_options.single_in_place && dp_has_single_selection(src))	/* In-place? */
+	{
+		gsize			i;
+		GtkTreeViewColumn	*col = NULL;
+		GSList			*sel;
+		GtkTreePath		*path;
+		GList			*cells;
+		GtkCellRenderer		*cr;
+
+		ri.inplace_pane = src;
+		ri.inplace_error = NULL;
+		ri.inplace_success = FALSE;
+
+		/* Find the (first) column that displays the name, if any. If there are several, you lose. */
+		for(i = 0; i < min->cfg.dp_formatsrc->index.num_columns; i++)
+		{
+			if(min->cfg.dp_formatsrc->index.formati.content == DPC_NAME)
+			{
+				col = gtk_tree_view_get_column(GTK_TREE_VIEW(src->view), i);
+				break;
+			}
+		}
+		if(col == NULL)
+			return 0;
+
+		/* Get the cell renderer, so we can connect a signal handler. */
+		cells = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(col));
+		if(cells == NULL)
+			return 0;
+		cr = cells->data;
+		g_list_free(cells);
+
+		/* Make name's renderer editable, this *must* be done last-minute or it breaks double-clicking. */
+		g_object_set(G_OBJECT(cr), "mode", GTK_CELL_RENDERER_MODE_EDITABLE, "editable", TRUE, "editable-set", TRUE, NULL);
+
+		/* Make sure the signal handler is connected, but only once. */
+		g_signal_handlers_disconnect_by_func(G_OBJECT(cr), G_CALLBACK(evt_cell_edited), &ri);
+		g_signal_connect(G_OBJECT(cr), "edited", G_CALLBACK(evt_cell_edited), &ri);
+		g_signal_handlers_disconnect_by_func(G_OBJECT(cr), G_CALLBACK(evt_cell_editing_canceled), &ri);
+		g_signal_connect(G_OBJECT(cr), "editing-canceled", G_CALLBACK(evt_cell_editing_canceled), &ri);
+
+		/* Get the path, and activate cell editing. */
+		sel = dp_get_selection(src);
+		if((path = gtk_tree_model_get_path(GTK_TREE_MODEL(src->dir.store), sel->data)) != NULL)
+		{
+			gtk_tree_view_set_cursor_on_cell(GTK_TREE_VIEW(src->view), path, col, NULL, TRUE);
+			gtk_tree_path_free(path);
+
+			/* Detach the keyboard acceleration context to prevent clashes. */
+			kbd_context_detach(min->gui->kbd_ctx, GTK_WINDOW(min->gui->window));
+			/* Recurse, so we keep Rename fully synchronous. */
+			gtk_main();
+
+			/* Editing is done, remove the editability. */
+			g_object_set(G_OBJECT(cr), "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE, "editable", FALSE, "editable-set", FALSE, NULL);
+
+			/* Re-attach keyboard modifiers. */
+			kbd_context_attach(min->gui->kbd_ctx, GTK_WINDOW(min->gui->window));
+		}
+		dp_free_selection(sel);
+		return ri.inplace_success;
+	}
+	else	/* Do the classical generic-based dialog rename. */
+	{
+		ri.ovw_open = FALSE;
+		ri.vbox	    = gtk_vbox_new(FALSE, 0);
+		ri.label    = gtk_label_new("");
+		ri.entry    = gtk_entry_new();
+		gtk_entry_set_max_length(GTK_ENTRY(ri.entry), MAXNAMLEN - 1);
+		gtk_box_pack_start(GTK_BOX(ri.vbox), ri.label, FALSE, FALSE, 0);
+		gtk_box_pack_start(GTK_BOX(ri.vbox), ri.entry, FALSE, FALSE, 0);
+
+		return cmd_generic(min, _("Rename"), CGF_NOALL | CGF_NODST, ren_body, ren_action, ren_free, &ri);
+	}
+}
+
+/* ----------------------------------------------------------------------------------------- */
 
-	return cmd_generic(min, _("Rename"), CGF_NOALL | CGF_SRC | CGF_NODST, ren_body, ren_action, ren_free, &ri);
+void cfg_rename(MainInfo *min)
+{
+	if(rename_cmc == NULL)
+	{
+		/* Set the default values for module's options. */
+		rename_options.modified = FALSE;
+		rename_options.single_in_place = FALSE;
+
+		rename_cmc = cmc_config_new("Rename", &rename_options);
+		cmc_field_add_boolean(rename_cmc, "modified", NULL, offsetof(OptRename, modified));
+		cmc_field_add_boolean(rename_cmc, "inplace", _("Rename Single File In-Place (Without Dialog)?"), offsetof(OptRename, single_in_place));
+		cmc_config_register(rename_cmc);
+	}
 }

gentoo-0.15.6.tar.bz2/src/cmd_rename.h -> gentoo-0.19.9.tar.gz/src/cmd_rename.h Changed

gentoo-0.15.6.tar.bz2/src/cmd_renamere.c -> gentoo-0.19.9.tar.gz/src/cmd_renamere.c Changed

@@ -16,14 +16,11 @@
 #include "gentoo.h"
 
 #include <ctype.h>
-#include <regex.h>
 
 #include "cmd_delete.h"
-#include "convutil.h"
 #include "dialog.h"
 #include "dirpane.h"
 #include "errors.h"
-#include "fileutil.h"
 #include "overwrite.h"
 #include "strutil.h"
 
@@ -75,106 +72,84 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-static gint do_rename(MainInfo *min, DirPane *dp, GSList **iter, GString *nn, gint *err)
+static gboolean do_rename(MainInfo *min, DirPane *dp, const DirRow2 *row, const gchar *newname, GError **error)
 {
-	if(strcmp(DP_SEL_NAME(*iter), nn->str) != 0)
+	OvwRes		ores;
+	GFile		*file;
+	gboolean	ok, doit = TRUE;
+
+	if(strcmp(dp_row_get_name_display(dp_get_tree_model(dp), row), newname) == 0)
 	{
-		OvwRes	ores;
+		dp_unselect(dp, row);
+		return TRUE;
+	}
 
-		ores = ovw_overwrite_file(min, nn->str, NULL);
-		if(ores == OVW_SKIP)
-			return 0;
-		else if(ores == OVW_CANCEL)
-		{
-			*iter = NULL;
-			return -1;
-		}
-		else if(ores == OVW_PROCEED_FILE)
-		{
-			if(!del_delete_file(min, nn->str))
-			{
-				*iter = NULL;
-				return -1;
-			}
-		}
-		else if(ores == OVW_PROCEED_DIR)
-		{
-			if(!del_delete_dir(min, nn->str, FALSE))
-			{
-				*iter = NULL;
-				return -1;
-			}
-		}
-		if(rename(DP_SEL_NAME(*iter), nn->str) != 0)
+	/* Get imaginary destination file. */
+	if((file = dp_get_file_from_name(dp, newname)) == NULL)
+		return FALSE;
+	ores = ovw_overwrite_unary_file(dp, file);
+	if(ores == OVW_SKIP)
+		ok = !(doit = FALSE);	/* H4xX0r. */
+	else if(ores == OVW_CANCEL)
+		ok = doit = FALSE;
+	else if(ores == OVW_PROCEED_FILE || ores == OVW_PROCEED_DIR)
+		ok = del_delete_gfile(min, file, FALSE, error);
+	else
+		ok = TRUE;
+
+	if(ok && doit)
+	{
+		GFile	*dfile;
+
+		if((dfile = dp_get_file_from_row(dp, row)) != NULL)
 		{
-			*err = errno;
-			dp_rescan_post_cmd(dp);
-			err_set(min, *err, CMD_ID, DP_SEL_NAME(*iter));
+			GFile	*nfile;
+
+			if((nfile = g_file_set_display_name(dfile, newname, NULL, error)) != NULL)
+				g_object_unref(nfile);
+			g_object_unref(dfile);
+			ok = nfile != NULL;
 		}
 		else
-			dp_unselect(dp, DP_SEL_INDEX(dp, *iter));
+			ok = FALSE;
 	}
-	return errno;
+	if(!ok && error != NULL && *error != NULL)
+		err_set_gerror(min, error, CMD_ID, file);
+	g_object_unref(file);
+
+	if(ok)
+		dp_unselect(dp, row);
+
+	return ok;
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
-static gint rename_simple(RenREInfo *ri)
+static gboolean rename_simple(RenREInfo *ri, GError **err)
 {
-	const gchar	*fromd, *tod, *from, *to, *ptr, *base;
-	gint		err = 0;
-	gsize		flen;
+	const gchar	*fromd, *tod;
 	GString		*nn;
 	GSList		*iter;
-	gboolean	nocase, global;
-	Conv		conv;
+	gboolean	nocase, global, ok = TRUE;
 
 	if((fromd = gtk_entry_get_text(GTK_ENTRY(ri->r_from))) == NULL)
-		return -1;
-
+		return 0;
 	tod = gtk_entry_get_text(GTK_ENTRY(ri->r_to));
 
 	nocase = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ri->r_cnocase));
 	global = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ri->r_cglobal));
 
-	from = conv_begin(&conv, fromd);
-	to = conv_add(&conv, tod);
-
-	flen = strlen(from);
-
-	to = gtk_entry_get_text(GTK_ENTRY(ri->r_to));
-
 	ovw_overwrite_begin(ri->min, _("\"%s\" Already Exists - Proceed With Rename?"), 0U);
 	nn = g_string_new("");
-	for(iter = ri->selection; !err && iter != NULL; iter = g_slist_next(iter))
+	for(iter = ri->selection; ok && (iter != NULL); iter = g_slist_next(iter))
 	{
-		g_string_truncate(nn, 0);
-
-		base = DP_SEL_NAME(iter);
-		while((ptr = nocase ? stu_strcasechr(base, *from) : strchr(base, *from)) != NULL)
-		{
-			for(; base < ptr; base++)
-				g_string_append_c(nn, *base);
-			if((nocase ? g_strncasecmp(ptr, from, flen) : strncmp(ptr, from, flen)) == 0)
-			{
-				g_string_append(nn, to);
-				base += flen;
-				if(!global)
-					break;
-			}
-			else
-				g_string_append_c(nn, *base++);
-		}
-		g_string_append(nn, base);
-		if(strchr(nn->str, G_DIR_SEPARATOR) != NULL)
-			continue;
-		do_rename(ri->min, ri->src, &iter, nn, &err);
+		if(stu_replace_simple(nn, dp_row_get_name_display(dp_get_tree_model(ri->src), iter->data), fromd, tod, global, nocase) > 0)
+			ok = do_rename(ri->min, ri->src, iter->data, nn->str, err);
 	}
 	g_string_free(nn, TRUE);
 	ovw_overwrite_end(ri->min);
-	conv_end(&conv);
 
-	return err;
+	return ok;
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -184,25 +159,36 @@
 **		by <match>. To get a single dollar in the output, write $$ in <def>.
 **		Returns TRUE if the entire <def> was successfully interpolated, FALSE on error.
 */
-static gboolean interpolate(GString *str, const gchar *def, const gchar *src, const regmatch_t *match)
+static gboolean interpolate(GString *str, const gchar *def, const GMatchInfo *match)
 {
 	const gchar	*ptr;
 
 	g_string_truncate(str, 0);
-	for(ptr = def; *ptr;)
+	for(ptr = def; *ptr; ptr = g_utf8_next_char(ptr))
 	{
-		if(*ptr == '$')
+		gunichar	here;
+
+		here = g_utf8_get_char(ptr);
+		if(here == '$')
 		{
-			ptr++;
-			if(isdigit((guchar) *ptr))
+			ptr = g_utf8_next_char(ptr);
+			here = g_utf8_get_char(ptr);
+			if(g_unichar_isdigit(here))
 			{
-				gint	slot, i;
+				gint	slot;
 
-				slot = *ptr++ - '0';
-				if((i = matchslot.rm_so) != -1)
+				slot = g_unichar_digit_value(here);
+				if(slot >= 0 && slot <= 9)
 				{
-					for(; i < matchslot.rm_eo; i++)
-						g_string_append_c(str, srci);
+					gchar	*ms = g_match_info_fetch(match, slot);
+
+					if(ms != NULL)
+					{
+						g_string_append(str, ms);
+						g_free(ms);
+					}
+					else
+						return FALSE;
 				}
 				else
 					return FALSE;
@@ -213,95 +199,82 @@
 				return FALSE;
 		}
 		else
-			g_string_append_c(str, *ptr++);
+			g_string_append_unichar(str, here);
 	}
 	return TRUE;
 }
 
-static gint rename_regexp(RenREInfo *ri)
+static gboolean rename_regexp(RenREInfo *ri, GError **err)
 {
-	const gchar	*fromdefd, *tod, *fromdef, *to;
-	gint		reerr, reflags, err = 0;
-	regex_t		fromre;
-	Conv		conv;
+	const gchar	*fromdefd, *tod;
+	guint		reflags;
+	GRegex		*fromre = NULL;
+	gboolean	ok = TRUE;
 
 	if((fromdefd = gtk_entry_get_text(GTK_ENTRY(ri->re_from))) == NULL)
-		return -1;
+		return FALSE;
 	if((tod = gtk_entry_get_text(GTK_ENTRY(ri->re_to))) == NULL)
-		return -1;
-
-	fromdef = conv_begin(&conv, fromdefd);
-	to = conv_add(&conv, tod);
+		return FALSE;
 
-	reflags = REG_EXTENDED | gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ri->re_cnocase));
-	if((reerr = regcomp(&fromre, fromdef, reflags)) == 0)
+	reflags = G_REGEX_EXTENDED | (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ri->re_cnocase)) ? G_REGEX_CASELESS : 0);
+	if((fromre = g_regex_new(fromdefd, reflags, G_REGEX_MATCH_NOTEMPTY, err)) != NULL)
 	{
 		GSList		*iter;
 		GString		*nn;
-		regmatch_t	match10;
 
 		ovw_overwrite_begin(ri->min, _("\"%s\" Already Exists - Proceed With Rename?"), 0U);
 		nn = g_string_new("");
-		for(iter = ri->selection; iter != NULL; iter = g_slist_next(iter))
+		for(iter = ri->selection; ok && (iter != NULL); iter = g_slist_next(iter))
 		{
-			if(regexec(&fromre, DP_SEL_NAME(iter), sizeof match / sizeof match0, match, 0) == 0)
+			GMatchInfo	*mi = NULL;
+
+			if(g_regex_match(fromre, dp_row_get_name_display(dp_get_tree_model(ri->src), iter->data), G_REGEX_MATCH_NOTEMPTY, &mi))
 			{
-				if(interpolate(nn, to, DP_SEL_NAME(iter), match) && strchr(nn->str, G_DIR_SEPARATOR) == NULL)
-					do_rename(ri->min, ri->src, &iter, nn, &err);
+				if(interpolate(nn, tod, mi) && g_utf8_strchr(nn->str, G_DIR_SEPARATOR, -1) == NULL)
+					ok = do_rename(ri->min, ri->src, iter->data, nn->str, err);
+				g_match_info_free(mi);
 			}
 		}
 		g_string_free(nn, TRUE);
 		ovw_overwrite_end(ri->min);
 	}
-	else
-	{
-		gchar	buf128;
-
-		strcpy(buf, _("Regular expression error:\n"));
-		regerror(reerr, &fromre, buf + strlen(buf), sizeof buf - strlen(buf) - 1);
-		dlg_dialog_async_new_error(buf);
-	}
-	conv_end(&conv);
-
-	return err;
+	return ok;
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
-static int rename_map(RenREInfo *ri)
+static gboolean rename_map(RenREInfo *ri, GError **err)
 {
-	const char	*fromdef, *todef, *remdef, *map;
+	const gchar	*fromdef, *todef, *remdef;
 	GSList		*iter;
 	GString		*nn, *nr;
-	gint		err = 0;
 	gsize		fl, tl, rl, i, nl;
-	Conv		conv;
+	gboolean	ok = TRUE;
 
 	if((fromdef = gtk_entry_get_text(GTK_ENTRY(ri->map_from))) == NULL)
-		return -1;
+		return FALSE;
 	if((todef = gtk_entry_get_text(GTK_ENTRY(ri->map_to))) == NULL)
-		return -1;
-	if(strchr(todef, G_DIR_SEPARATOR) != NULL)	/* As always, prevent rogue moves. */
-		return -1;
+		return FALSE;
+	if(g_utf8_strchr(todef, -1, G_DIR_SEPARATOR) != NULL)	/* As always, prevent rogue moves. */
+		return FALSE;
 	if((remdef = gtk_entry_get_text(GTK_ENTRY(ri->map_remove))) == NULL)
-		return -1;
+		return FALSE;
 
+	/* Totally important: some lengths are in chars (for iteration), some in bytes for g_utf8_strchr(). */
 	fl = strlen(fromdef);
-	tl = strlen(todef);
+	tl = g_utf8_strlen(todef, -1);
 	rl = strlen(remdef);
 
 	ovw_overwrite_begin(ri->min, _("\"%s\" Already Exists - Proceed With Rename?"), 0U);
 	nn = g_string_new("");
 	nr = g_string_new("");
-	conv_init(&conv);
-	conv_add(&conv, "");	/* Pre-load the Conv, so we can use set() below. */
 	for(iter = ri->selection; iter != NULL; iter = g_slist_next(iter))
 	{
-		const char	*ptr;
+		const gchar	*ptr, *map;
 
 		/* Step 1: clear the dynamic string. */
 		g_string_truncate(nn, 0);
-		ptr = DP_SEL_NAMED(iter);
+		ptr = dp_row_get_name_display(dp_get_tree_model(ri->src), iter->data);
 		nl = g_utf8_strlen(ptr, -1);
 		/* Step 2: go through and do the mapping. */
 		for(i = 0; i < nl; i++, ptr = g_utf8_next_char(ptr))
@@ -310,7 +283,7 @@
 
 			if((map = g_utf8_strchr(fromdef, fl, ch)) != NULL)
 			{
-				glong	index = g_utf8_pointer_to_offset(fromdef, map);
+				glong		index = g_utf8_pointer_to_offset(fromdef, map);
 				const gchar	*tptr = g_utf8_offset_to_pointer(todef, index);
 
 				ch = g_utf8_get_char(tptr);	/* Map. */
@@ -328,23 +301,20 @@
 			if(g_utf8_strchr(remdef, rl, ch) == NULL)
 				g_string_append_unichar(nr, ch);
 		}
-		/* Step 4: re-use the 'nn' string with filesystem version of final string. */
-		g_string_truncate(nn, 0);
-		g_string_assign(nn, conv_set(&conv, 0, nr->str));
-		do_rename(ri->min, ri->src, &iter, nn, &err);
+		/* Step 4: do the rename, using the now-built "display name". */
+		ok = do_rename(ri->min, ri->src, iter->data, nr->str, err);
 	}
-	conv_end(&conv);
 	g_string_free(nr, TRUE);
 	g_string_free(nn, TRUE);
 	ovw_overwrite_end(ri->min);
 
-	return err;
+	return ok;
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
 /* 2008-07-19 -	Converts the given string to have an upper-case initial character, while the
- *		the remainder are lower-case. This is a very western idea of a useful case
+ *		remainder is lower-case. This is a very western idea of a useful case
  *		conversion, but ... I'll include it anyway.
 */
 static gchar * utf8_str_initial(const gchar *str, gssize len)
@@ -377,16 +347,13 @@
  *		using UTF-8 ... So we use the display versions of the names, downcase in UTF-8,
  *		and then convert back.
 */
-static int rename_case(RenREInfo *ri)
+static gboolean rename_case(RenREInfo *ri, GError **err)
 {
 	GString		*nn;
 	GSList		*iter;
-	gint		err = 0;
-	Conv		conv;
 	gchar *		(*func)(const gchar *, gssize), *cc;
+	gboolean	ok = TRUE;
 
-	ovw_overwrite_begin(ri->min, _("\"%s\" Already Exists - Proceed With Rename?"), 0U);
-	nn = g_string_new("");
 	/* Select the case-conversion function, once. */
 	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ri->case_lower)))
 		func = g_utf8_strdown;
@@ -395,29 +362,34 @@
 	else if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ri->case_initial)))
 		func = utf8_str_initial;
 	else
-		func = NULL;
-	for(iter = ri->selection; iter != NULL; iter = g_slist_next(iter))
+		return FALSE;
+
+	ovw_overwrite_begin(ri->min, _("\"%s\" Already Exists - Proceed With Rename?"), 0U);
+	nn = g_string_new("");
+	for(iter = ri->selection; ok && (iter != NULL); iter = g_slist_next(iter))
 	{
+		const gchar	*dn = dp_row_get_name_display(dp_get_tree_model(ri->src), iter->data);
+
 		/* Step 1: set the dynamic string to the input filename. */
-		g_string_assign(nn, DP_SEL_NAMED(iter));
+		g_string_assign(nn, dn);
 		/* Step 2: perform case conversion. */
 		cc = func(nn->str, nn->len);
-		g_string_assign(nn, conv_begin(&conv, cc));
-		g_free(cc);
 		/* Step 3: if resulting name is different, rename on disk. */
-		if(strcmp(DP_SEL_NAME(iter), nn->str) != 0)
-			do_rename(ri->min, ri->src, &iter, nn, &err);
-		conv_end(&conv);
+		if(strcmp(dn, cc) != 0)
+		{
+			ok = do_rename(ri->min, ri->src, iter->data, cc, err);
+		}
+		g_free(cc);
 	}
 	g_string_free(nn, TRUE);
 	ovw_overwrite_end(ri->min);
 
-	return err;
+	return ok;
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
-static void evt_nbook_switchpage(GtkWidget *wid, GtkNotebookPage *page, gint page_num, gpointer user)
+static void evt_nbook_switchpage(GtkWidget *wid, gpointer page, gint page_num, gpointer user)
 {
 	RenREInfo	*ri = user;
 
@@ -429,6 +401,7 @@
 {
 	GtkWidget		*label, *table;
 	static RenREInfo	ri = { NULL };
+	gboolean		ok = TRUE;
 
 	ri.min	= min;
 	ri.src	= src;
@@ -518,9 +491,9 @@
 		gtk_box_pack_start(GTK_BOX(ri.case_vbox), label, FALSE, FALSE, 0);
 		ri.case_lower = gtk_radio_button_new_with_label(NULL, _("Lower Case?"));
 		gtk_box_pack_start(GTK_BOX(ri.case_vbox), ri.case_lower, FALSE, FALSE, 0);
-		ri.case_upper = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(ri.case_lower)), _("Upper Case?"));
+		ri.case_upper = gtk_radio_button_new_with_label(gtk_radio_button_get_group(GTK_RADIO_BUTTON(ri.case_lower)), _("Upper Case?"));
 		gtk_box_pack_start(GTK_BOX(ri.case_vbox), ri.case_upper, FALSE, FALSE, 0);
-		ri.case_initial = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(ri.case_lower)), _("Upper Case Initial?"));
+		ri.case_initial = gtk_radio_button_new_with_label(gtk_radio_button_get_group(GTK_RADIO_BUTTON(ri.case_lower)), _("Upper Case Initial?"));
 		gtk_box_pack_start(GTK_BOX(ri.case_vbox), ri.case_initial, FALSE, FALSE, 0);
 		gtk_widget_show_all(ri.map_vbox);
 		gtk_notebook_append_page(GTK_NOTEBOOK(ri.nbook), ri.case_vbox, gtk_label_new(_("Case")));
@@ -529,36 +502,26 @@
 
 		ri.page = 0;
 	}
-	gtk_notebook_set_page(GTK_NOTEBOOK(ri.nbook), ri.page);
+	gtk_notebook_set_current_page(GTK_NOTEBOOK(ri.nbook), ri.page);
 	gtk_widget_grab_focus(ri.page ? ri.re_from : ri.r_from);
 
 	if(dlg_dialog_sync_wait(ri.dlg) == DLG_POSITIVE)
 	{
-		gchar	oldPATH_MAX;
-		gint	err = 0;
-
-		err_clear(ri.min);
-		if(fut_cd(src->dir.path, old, sizeof old))
-		{
-			if(ri.page == 0)
-				err = rename_simple(&ri);
-			else if(ri.page == 1)
-				err = rename_regexp(&ri);
-			else if(ri.page == 2)
-				err = rename_map(&ri);
-			else
-				err = rename_case(&ri);
-			fut_cd(old, NULL, 0U);
-		}
+		GError		*err = NULL;
+
+		if(ri.page == 0)
+			ok = rename_simple(&ri, &err);
+		else if(ri.page == 1)
+			ok = rename_regexp(&ri, &err);
+		else if(ri.page == 2)
+			ok = rename_map(&ri, &err);
 		else
-			err_set(ri.min, errno, "CD", src->dir.path);
-		if(!err && !errno)
+			ok = rename_case(&ri, &err);
+		if(ok)
 			dp_rescan_post_cmd(ri.src);
-		else
-			err_show(ri.min);
 	}
 	dp_free_selection(ri.selection);
 	ri.selection = NULL;
 
-	return 1;
+	return ok;
 }

gentoo-0.15.6.tar.bz2/src/cmd_renameseq.c -> gentoo-0.19.9.tar.gz/src/cmd_renameseq.c Changed

@@ -15,12 +15,12 @@
 #include <ctype.h>
 
 #include "cmd_delete.h"
-#include "convutil.h"
 #include "dialog.h"
 #include "dirpane.h"
 #include "errors.h"
 #include "fileutil.h"
 #include "overwrite.h"
+#include "strutil.h"
 
 #include "cmd_renameseq.h"
 
@@ -31,7 +31,7 @@
 typedef struct {
 	MainInfo	*min;
 
-	guint32		start;		/* Index to start at. */
+	guint		start;		/* Index to start at. */
 	RSBase		base;		/* The base we're using. */
 	guint		precision;	/* Precision, i.e. number of digits. */
 	GString		*head;		/* First part of name, before number. */
@@ -54,40 +54,10 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 2001-09-30 -	Search for a "base" string that when combined with a numeral is unique
-**		for all <num> files we are about to rename.
-**		These temp files are in the same directory, which makes me think we can
-**		"rely" (um) on rename() to be fairly quick, and also that no extra disk
-**		space is required. Probably not bullet proof, but then again, what is?
-*/
-static const gchar * find_tmp_prefix(guint num)
-{
-	static gchar	bufPATH_MAX, prefixPATH_MAX;
-	gboolean	found;
-	guint		round = 0U, i;
-
-	do
-	{
-		g_snprintf(prefix, sizeof prefix, "gt!%d#%x", round ^ (guint) getpid(), (guint) time(NULL) % 1007);
-		for(i = 0, found = FALSE; i < num && !found; i++)
-		{
-			g_snprintf(buf, sizeof buf, "%s%u", prefix, i);
-			if(access(buf, F_OK) == 0)
-				found = TRUE;
-		}
-		round++;
-	} while(found && round < 100U);	/* Arbitrary numerical constant. */
-
-	if(found)
-		return NULL;
-
-	return prefix;
-}
-
 static const gchar * compute_name(RenSeqInfo *rsi, guint index)
 {
-	const gchar	*fptr = NULL;
 	static gchar	bufPATH_MAX;
+	const gchar	*fptr = NULL;
 
 	switch(rsi->base)
 	{
@@ -101,117 +71,127 @@
 	return buf;
 }
 
-/* 2001-10-03 -	Restore the <index>'th temp name to its original form. Handy when
-**		backing out of a failing operation.
+static void temp_file_undo(GSList *titer, GSList *siter, GtkTreeModel *model)
+{
+	g_file_set_display_name(titer->data, dp_row_get_name_display(model, siter->data), NULL, NULL);
+}
+
+/* 2009-10-04 -	Given a list of selected input files, and a list of temporary renamed files, undo the renames.
+**		The length of tlist might be shorter than that of slist, so let it decide.
 */
-static gboolean restore_from_temp(const gchar *prefix, const GSList *sel, guint index)
+static void temp_files_undo(GSList *tlist, GSList *slist, GtkTreeModel *model)
+{
+	GSList		*titer, *siter;
+
+	for(titer = tlist, siter = slist; titer != NULL; titer = g_slist_next(titer), siter = g_slist_next(siter))
+	{
+		if(titer->data != NULL)
+			temp_file_undo(titer, siter, model);
+	}
+}
+
+/* 2009-10-04 -	Free a list of temporary files. */
+static void temp_files_free(GSList *tlist)
 {
-	gchar	tmpnamePATH_MAX;
+	GSList	*titer;
 
-	g_snprintf(tmpname, sizeof tmpname, "%s%u", prefix, index);
-	return rename(tmpname, DP_SEL_NAME(g_slist_nth((GSList *) sel, index))) == 0;
+	for(titer = tlist; titer != NULL; titer = g_slist_next(titer))
+	{
+		if(titer->data != NULL)
+			g_object_unref(titer->data);
+	}
+	g_slist_free(tlist);
 }
 
-static gint do_renameseq(RenSeqInfo *rsi, DirPane *src)
+static gboolean do_renameseq(RenSeqInfo *rsi, DirPane *src, GError **err)
 {
-	GSList		*slist, *iter;
-	const gchar	*tmppfx;
-	gchar		olddirPATH_MAX;
-	guint		num;
+	GSList		*slist, *iter, *tlist = NULL;
+	GString		*tmppfx;
+	gboolean	ok = TRUE;
+	guint		num, index;
+	GtkTreeModel	*m = dp_get_tree_model(src);
 
 	/* A Rename in gentoo is never a move. Gotta keep'em separated. */
 	if(strchr(rsi->head->str, G_DIR_SEPARATOR) != NULL ||
 	   strchr(rsi->tail->str, G_DIR_SEPARATOR) != NULL)
-		return 0;
-
-	errno = 0;
-	if(!fut_cd(src->dir.path, olddir, sizeof olddir))
 		return FALSE;
-	errno = 0;
+
 	slist = dp_get_selection(src);
-	num   = g_slist_length((GSList *) slist);
-	if((tmppfx = find_tmp_prefix(num)) != NULL)
+	num   = g_slist_length(slist);
+	tmppfx = g_string_sized_new(64);
+	g_string_append_printf(tmppfx, ".gt!%u:%x", (guint) getpid(), (guint) time(NULL) % 1007);
+	/* Give all files temporary names, so we can handle overlaps in sequencing. */
+	for(iter = slist, index = 0; ok && (iter != NULL); iter = g_slist_next(iter), index++)
 	{
-		gchar	tmpnamePATH_MAX;
-		guint	i;
-
-		/* First, rename all target files to something temporary. */
-		for(iter = slist, i = 0; iter != NULL; iter = g_slist_next(iter), i++)
-		{
-			g_snprintf(tmpname, sizeof tmpname, "%s%u", tmppfx, i);
-			if(rename(DP_SEL_NAME(iter), tmpname) != 0)
-				break;
-			dp_unselect(src, DP_SEL_INDEX(src, iter));
-		}
+		GFile	*f, *nf;
 
-		if(i != num)	/* Couldn't temp-rename all files. Whine, and back out. */
+		if((f = dp_get_file_from_row(src, iter->data)) != NULL)
 		{
-			guint	j;
+			gchar	dnamePATH_MAX;
 
-			for(j = 0; j < i; j++)
-				restore_from_temp(tmppfx, slist, j);
-			errno = EINVAL;		/* Not exactly accurate, but... */
+			g_snprintf(dname, sizeof dname, "%s,%u", tmppfx->str, index);
+			nf = g_file_set_display_name(f, dname, NULL, err);
+			if(nf != NULL)
+			{
+				tlist = g_slist_append(tlist, nf);
+				dp_unselect(src, iter->data);
+			}
+			else
+				ok = FALSE;
 		}
 		else
+			ok = FALSE;
+	}
+	/* If temporary-naming went fine, continue with final renames. */
+	if(ok)
+	{
+		GSList	*titer, *siter;
+		GFile	*nf;
+
+		/* Note: can't iterate over selection, the pane's GFile pointers are stale after the temporary rename. */
+		ovw_overwrite_begin(rsi->min, _("\"%s\" Already Exists - Proceed With Rename?"), OVWF_NO_RECURSE_TEST);
+		for(titer = tlist, siter = slist, index = 0; ok && (titer != NULL); titer = g_slist_next(titer), siter = g_slist_next(siter), index++)
 		{
-			const gchar	*name;
-			OvwRes		res;
+			const gchar	*nn = compute_name(rsi, index);
+			OvwRes		ores;
+			GFile		*dest;
 
-			/* Start actual renaming, to final names. */
-			ovw_overwrite_begin(rsi->min, _("\"%s\" Already Exists - Proceed With Rename?"), OVWF_NO_RECURSE_TEST);
-			for(i = 0; i < num; i++)
+			dest = dp_get_file_from_name(src, nn);
+			ores = ovw_overwrite_unary_file(src, dest);
+			if(ores == OVW_SKIP)
 			{
-				g_snprintf(tmpname, sizeof tmpname, "%s%u", tmppfx, i);
-				name = compute_name(rsi, i);
-				res = ovw_overwrite_file(rsi->min, name, tmpname);
-				if(res == OVW_SKIP)
-				{
-					restore_from_temp(tmppfx, slist, i);
-					continue;
-				}
-				else if(res == OVW_CANCEL)
-					break;
-				else if(res == OVW_PROCEED_FILE)
-				{
-					if(!del_delete_file(rsi->min, name))
-						break;
-				}
-				else if(res == OVW_PROCEED_DIR)
-				{
-					if(!del_delete_dir(rsi->min, name, FALSE))
-						break;
-				}
-				if(rename(tmpname, name) != 0)
-					break;
+				/* On skip, a single temporary name must be undo:ed. */
+				temp_file_undo(titer, siter, m);
+				/* Then this file must be removed from the temporary list. We do this by just blanking it out. */
+				g_object_unref(titer->data);
+				titer->data = NULL;
+				/* Drop the destination file, so we can continue the loop. */
+				g_object_unref(dest);
+				continue;
 			}
-			ovw_overwrite_end(rsi->min);
-			/* If we broke out early from the loop, restore. */
-			for(; i < num; i++)
+			else if(ores == OVW_CANCEL)
+				ok = FALSE;
+			else if(ores == OVW_PROCEED_DIR || ores == OVW_PROCEED_FILE)
+				ok = del_delete_gfile(rsi->min, dest, FALSE, err);
+
+			if(ok)
 			{
-				if(!(restore_from_temp(tmppfx, slist, i)))
-					break;
+				nf = g_file_set_display_name(titer->data, compute_name(rsi, index), NULL, err);
+				if(nf != NULL)
+					g_object_unref(nf);
+				else
+					ok = FALSE;
 			}
+			g_object_unref(dest);
 		}
+		ovw_overwrite_end(rsi->min);
 	}
+	else
+		temp_files_undo(tlist, slist, m);
+	temp_files_free(tlist);
 	dp_free_selection(slist);
-	fut_cd(olddir, NULL, 0U);
 
-	if(errno != 0)
-		err_set(rsi->min, errno, "RenameSeq", NULL);
-
-	return errno == 0;
-}
-
-static const gchar * base_format(RSBase base)
-{
-	switch(base)
-	{
-		case BASE_8:	return "%o";
-		case BASE_10:	return "%d";
-		case BASE_16L:	return "%x";
-		case BASE_16U:	return "%X";
-	}
-	return NULL;
+	return ok;
 }
 
 static void init_start(const RenSeqInfo *rsi, GtkWidget *entry)
@@ -224,35 +204,23 @@
 */
 static void rsi_update(RenSeqDialog *dlg)
 {
-	GtkWidget	*item;
-	Conv		conv;
-
 	/* First, extract current base so we know how to parse the start index. */
-	item = gtk_menu_get_active(GTK_MENU(gtk_option_menu_get_menu(GTK_OPTION_MENU(dlg->base))));
-	dlg->rsi->base = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(item), "index"));
-	gtk_widget_set_sensitive(dlg->guess, dlg->rsi->base < BASE_16L);
+	dlg->rsi->base = gtk_combo_box_get_active(GTK_COMBO_BOX(dlg->base));
+	gtk_widget_set_sensitive(dlg->guess, dlg->rsi->base == BASE_10);
 
-	if(sscanf(gtk_entry_get_text(GTK_ENTRY(dlg->start)), base_format(dlg->rsi->base), &dlg->rsi->start) != 1)
+	if(sscanf(gtk_entry_get_text(GTK_ENTRY(dlg->start)), "%u", &dlg->rsi->start) != 1)
 		dlg->rsi->start = 1;
 
 	dlg->rsi->precision = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(dlg->precision));
 
-	/* The head and tail need to be converted to filesystem format. */
-	conv_init(&conv);
-	g_string_assign(dlg->rsi->head, conv_begin(&conv, gtk_entry_get_text(GTK_ENTRY(dlg->head))));
-	g_string_assign(dlg->rsi->tail, conv_add(&conv, gtk_entry_get_text(GTK_ENTRY(dlg->tail))));
-	conv_end(&conv);	/* We have copied the filesystem versions, so safe to end the conversion. */
+	g_string_assign(dlg->rsi->head, gtk_entry_get_text(GTK_ENTRY(dlg->head)));
+	g_string_assign(dlg->rsi->tail, gtk_entry_get_text(GTK_ENTRY(dlg->tail)));
 }
 
 static void preview_update(RenSeqDialog *dlg)
 {
-	Conv		conv;
-
-	/* The filename is built in filename encoding, so must be converted back to display. */
-	conv_init(&conv);
 	rsi_update(dlg);
-	gtk_entry_set_text(GTK_ENTRY(dlg->preview), conv_begin_reverse(&conv, compute_name(dlg->rsi, 0U)));
-	conv_end(&conv);
+	gtk_entry_set_text(GTK_ENTRY(dlg->preview), compute_name(dlg->rsi, 0U));
 }
 
 /* 2001-10-02 -	Joint widget-changed handler. Just call preview_update(). */
@@ -261,39 +229,49 @@
 	preview_update(user);
 }
 
-/* 2001-10-02 -	Inspect first name in selection, and attempt to set parameters
+static gboolean find_digit(gunichar here, gpointer user)
+{
+	return g_unichar_isdigit(here);
+}
+
+/* 2010-03-07 -	Inspect first name in selection, and attempt to set parameters
 **		accordingly. Glitzy, sure, but I do like sugar in my software. :)
-** BUG BUG BUG	Silently assumes base is decimal. Finding embedded hex numbers
-**		is simply too tricky. Probably works in octal, though.
+**		Now works in UTF-8 (display names), and only in decimal mode.
 */
 static void evt_guess_clicked(GtkWidget *wid, gpointer user)
 {
 	RenSeqDialog	*dlg = user;
 	GString		*head;
-	const gchar	*ptr;
-	guint		prec = 0;
-	Conv		conv;
+	const gchar	*dptr;
+	gunichar	here;
 
-	/* String processing here is from dlg->name, which is in the filesystem encoding. */
-	conv_init(&conv);
+	/* String processing here is on dlg->name, which is a GIO "display name". */
+	/* Extract characters up to the first digit. */
 	head = g_string_new("");
-	for(ptr = dlg->name; *ptr && !isdigit((guchar) *ptr); ptr++)
-		g_string_append_c(head, *ptr);
-	if(isdigit((guchar) *ptr))	/* Did we find a digit? */
+	if((dptr = stu_utf8_find(dlg->name, find_digit, NULL)) != NULL && dptr > dlg->name)
 	{
-		for(; *ptr && isdigit((guchar) *ptr); prec++, ptr++)
-			;
-		gtk_entry_set_text(GTK_ENTRY(dlg->tail), conv_begin_reverse(&conv, ptr));
+		guint	value = 0, prec = 0;
+
+		g_string_append_len(head, dlg->name, dptr - dlg->name);
+		/* Count the number of digits, while extracting actual (decimal) number. */
+		while(*dptr && g_unichar_isdigit(here = g_utf8_get_char(dptr)))
+		{
+			value *= 10;
+			value += here - '0';
+			prec++;
+			dptr = g_utf8_next_char(dptr);
+		}
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(dlg->start), value);
+		gtk_entry_set_text(GTK_ENTRY(dlg->head), head->str);
+		gtk_entry_set_text(GTK_ENTRY(dlg->tail), dptr);
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(dlg->precision), prec);
 	}
-	else if((ptr = strchr(dlg->name, '.')) != NULL)
+	else if((dptr = g_utf8_strchr(dlg->name, -1, '.')) != NULL)
 	{
-		g_string_truncate(head, ptr - dlg->name);
-		gtk_entry_set_text(GTK_ENTRY(dlg->tail), conv_begin_reverse(&conv, ptr));
+		g_string_append_len(head, dlg->name, dptr - dlg->name);
+		gtk_entry_set_text(GTK_ENTRY(dlg->head), head->str);
+		gtk_entry_set_text(GTK_ENTRY(dlg->tail), dptr);
 	}
-	gtk_entry_set_text(GTK_ENTRY(dlg->head), conv_add_reverse(&conv, head->str));
-	g_string_free(head, TRUE);
-	gtk_spin_button_set_value(GTK_SPIN_BUTTON(dlg->precision), prec);
-	conv_end(&conv);
 }
 
 /* 2001-10-03 -	Well, here's the actual command entrypoint, like usual. */
@@ -302,15 +280,15 @@
 	static RenSeqInfo	rsi = { NULL };
 	const gchar		*bname = { N_("8, Octal"), N_("10, Decimal"), N_("16, Hex (a-f)"), N_("16, Hex (A-F)") };
 	GtkObject		*adj;
-	GtkWidget		*vbox, *table, *label, *bmenu, *bmitem;
+	GtkWidget		*vbox, *table, *label;
 	RenSeqDialog		dlg;
 	gint			i, ret;
 	GSList			*sel;
-	Conv			conv;
+	gboolean		ok = FALSE;
 
 	if((sel = dp_get_selection(src)) == NULL)
 		return 0;
-	dlg.name = DP_SEL_NAME(sel);
+	dlg.name = dp_row_get_name_display(dp_get_tree_model(src), sel->data);
 	dp_free_selection(sel);
 
 	if(rsi.min == NULL)
@@ -338,22 +316,18 @@
 	dlg.start = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1.0, 0);
 	init_start(&rsi, dlg.start);
 	g_signal_connect(G_OBJECT(dlg.start), "changed", G_CALLBACK(evt_something_changed), &dlg);
-	gtk_table_attach(GTK_TABLE(table), dlg.start, 1, 4, 0, 1,  GTK_EXPAND|GTK_FILL,0,0,0);
+	gtk_table_attach(GTK_TABLE(table), dlg.start, 1, 3, 0, 1,  GTK_EXPAND|GTK_FILL,0,0,0);
+	label = gtk_label_new("(Base 10)");
+	gtk_table_attach(GTK_TABLE(table), label, 3, 4, 0, 1,  0,0,0,0);
 
 	label = gtk_label_new(_("Base"));
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2,  0,0,0,0);
-	bmenu = gtk_menu_new();
+	dlg.base = gtk_combo_box_new_text();
 	for(i = 0; i < sizeof bname / sizeof bname0; i++)
 	{
-		bmitem = gtk_menu_item_new_with_label(_(bnamei));
-		gtk_object_set_data(GTK_OBJECT(bmitem), "index", GINT_TO_POINTER(i));
-		g_signal_connect(G_OBJECT(bmitem), "activate", G_CALLBACK(evt_something_changed), &dlg);
-		gtk_menu_append(GTK_MENU(bmenu), bmitem);
-		gtk_widget_show(bmitem);
+		gtk_combo_box_append_text(GTK_COMBO_BOX(dlg.base), _(bnamei));
 	}
-	dlg.base = gtk_option_menu_new();
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(dlg.base), bmenu);
-	gtk_option_menu_set_history(GTK_OPTION_MENU(dlg.base), rsi.base);
+	g_signal_connect(G_OBJECT(dlg.base), "changed", G_CALLBACK(evt_something_changed), &dlg);
 	gtk_table_attach(GTK_TABLE(table), dlg.base, 1, 2, 1, 2,  GTK_EXPAND|GTK_FILL,0,0,0);
 
 	label = gtk_label_new(_("Precision"));
@@ -363,21 +337,19 @@
 	g_signal_connect(G_OBJECT(adj), "value_changed", G_CALLBACK(evt_something_changed), &dlg);
 	gtk_table_attach(GTK_TABLE(table), dlg.precision, 3, 4, 1, 2,  GTK_EXPAND|GTK_FILL,0,0,0);
 
-	conv_init(&conv);
 	label = gtk_label_new(_("Head"));
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3,  0,0,0,0);
 	dlg.head = gtk_entry_new();
-	gtk_entry_set_text(GTK_ENTRY(dlg.head), conv_begin_reverse(&conv, rsi.head->str));
+	gtk_entry_set_text(GTK_ENTRY(dlg.head), rsi.head->str);
 	g_signal_connect(G_OBJECT(dlg.head), "changed", G_CALLBACK(evt_something_changed), &dlg);
 	gtk_table_attach(GTK_TABLE(table), dlg.head, 1, 3, 2, 3,  GTK_EXPAND|GTK_FILL,0,0,0);
 
 	label = gtk_label_new(_("Tail"));
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4,  0,0,0,0);
 	dlg.tail = gtk_entry_new();
-	gtk_entry_set_text(GTK_ENTRY(dlg.tail), conv_add_reverse(&conv, rsi.tail->str));
+	gtk_entry_set_text(GTK_ENTRY(dlg.tail), rsi.tail->str);
 	g_signal_connect(G_OBJECT(dlg.tail), "changed", G_CALLBACK(evt_something_changed), &dlg);
 	gtk_table_attach(GTK_TABLE(table), dlg.tail, 1, 3, 3, 4,  GTK_EXPAND|GTK_FILL,0,0,0);
-	conv_end(&conv);
 
 	dlg.guess = gtk_button_new_with_label(_("Guess"));
 	g_signal_connect(G_OBJECT(dlg.guess), "clicked", G_CALLBACK(evt_guess_clicked), &dlg);
@@ -391,6 +363,7 @@
 
 	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
 
+	gtk_combo_box_set_active(GTK_COMBO_BOX(dlg.base), rsi.base);
 	preview_update(&dlg);
 
 	dlg.dlg = dlg_dialog_sync_new(vbox, _("Sequential Rename"), NULL);
@@ -398,14 +371,16 @@
 
 	if(ret == DLG_POSITIVE)
 	{
+		GError	*err = NULL;
+
 		rsi_update(&dlg);
 		err_clear(min);
-		ret = do_renameseq(&rsi, src);
+		ok = do_renameseq(&rsi, src, &err);
 		dp_rescan_post_cmd(src);
-		if(!ret)
-			err_show(min);
+		if(!ok)
+			err_set_gerror(min, &err, "RenameSeq", NULL);
 	}
 	dlg_dialog_sync_destroy(dlg.dlg);
 
-	return ret == 0;
+	return ok;
 }

gentoo-0.15.6.tar.bz2/src/cmd_run.c -> gentoo-0.19.9.tar.gz/src/cmd_run.c Changed

@@ -16,14 +16,37 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
+static char	last_command512 = "";
+
+/* ----------------------------------------------------------------------------------------- */
+
 /* 1998-09-27 -	Pop up a dialog letting user select (or type) a command name,
 **		and then run it.
 */
 gint cmd_run(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
 	const gchar	*cmd;
+	gint		ok = 0;
 
 	if((cmd = csq_dialog_sync_new_wait(min, NULL)) != NULL)
-		csq_execute(min, cmd);
-	return 1;
+	{
+		/* Don't store Rerun itself, life becomes so circular and repetitive then. */
+		if(strncmp(cmd, "Rerun", 5) != 0)
+		{
+			/* Attempt to remember, but if command overflows, drop it but still let it run. */
+			if(g_snprintf(last_command, sizeof last_command, "%s", cmd) > sizeof last_command)
+				last_command0 = '\0';
+		}
+
+		ok = csq_execute(min, cmd);
+	}
+	return ok;
+}
+
+/* 2010-01-01 -	Rerun the last run command. Handy during testing, at least. */
+gint cmd_rerun(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
+{
+	if(last_command0 != '\0')
+		return csq_execute(min, last_command);
+	return cmd_run(min, src, dst, ca);
 }

gentoo-0.15.6.tar.bz2/src/cmd_run.h -> gentoo-0.19.9.tar.gz/src/cmd_run.h Changed

gentoo-0.15.6.tar.bz2/src/cmd_select.c -> gentoo-0.19.9.tar.gz/src/cmd_select.c Changed

@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <regex.h>
 
 #include <gdk/gdkkeysyms.h>
 
@@ -44,22 +43,29 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-#define	SM_SET			(0)
-#define	SM_SET_ALL		(0)
-#define	SM_SET_SELECTED		(1)
-#define	SM_SET_UNSELECTED	(2)
 
-#define	SM_TYPE			(1)
-#define	SM_TYPE_ALL		(0)
-#define	SM_TYPE_DIRS		(1)
-#define	SM_TYPE_FILES		(2)
-
-#define	SM_ACTION		(2)
-#define	SM_ACTION_SELECT	(0)
-#define	SM_ACTION_UNSELECT	(1)
-#define	SM_ACTION_TOGGLE	(2)
+/* Selection parameters.
+ * FIXME: Converted over from #defines, could do with some more loving.
+*/
+enum {
+	SM_SET = 0,
+	SM_TYPE = 1,
+	SM_ACTION = 2,
+
+	SM_SET_ALL = 0,
+	SM_SET_SELECTED = 1,
+	SM_SET_UNSELECTED = 2,
+
+	SM_TYPE_ALL = 0,
+	SM_TYPE_DIRS = 1,
+	SM_TYPE_FILES = 2,
+
+	SM_ACTION_SELECT = 0,
+	SM_ACTION_UNSELECT = 1,
+	SM_ACTION_TOGGLE = 2
+};
 
-typedef void (*SelAction)(DirPane *, gint);
+typedef void (*SelAction)(DirPane *, const DirRow2 *);
 
 /* Base selection parameters. Filled-in either by GUI, or by direct command arguments. */
 typedef struct {
@@ -93,43 +99,53 @@
 	NULL
 };
 				
-
 /* ----------------------------------------------------------------------------------------- */
 
 /* Select a specific row, or, if the row=ROW keyword is not specified, the one that was last clicked. */
 gint cmd_selectrow(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	GdkEventButton	*evt;
-	const gchar	*num;
-	gint		row = -1;
+	gint		ri;
+	gchar		buf16;
+	GtkTreeIter	iter;
 
-	if((num = car_keyword_get_value(ca, "row", NULL)) != NULL)
+	ri = car_keyword_get_integer(ca, "row", -1);
+	if(ri < 0)
 	{
-		gchar	*endptr;
+		GdkEventButton	*evt;
+		gint		ok = 0;
 
-		row = strtol(num, &endptr, 0);
-		if(!*num || *endptr)
-			row = -1;
-	}
-	else if((evt = (GdkEventButton *) evt_event_get(GDK_BUTTON_PRESS)) != NULL)
-	{
-		gint	col;
+		if((evt = (GdkEventButton *) evt_event_get(GDK_BUTTON_PRESS)) != NULL)
+		{
+			GtkTreePath	*path;
 
-		if(!gtk_clist_get_selection_info(GTK_CLIST(src->list), evt->x, evt->y, &row, &col) || (row > src->dir.num_rows))
-			row = -1;
+			if(gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(src->view), evt->x, evt->y, &path, NULL, NULL, NULL))
+			{
+				GtkTreeIter	iter;
+
+				if(gtk_tree_model_get_iter(dp_get_tree_model(src), &iter, path))
+				{
+					dp_select(src, &iter);
+					ok = 1;
+				}
+				gtk_tree_path_free(path);
+			}
+		}
+		return ok;
 	}
 
-	if(row != -1)
+	g_snprintf(buf, sizeof buf, "%d", ri);
+	if(gtk_tree_model_get_iter_from_string(dp_get_tree_model(src), &iter, buf))
 	{
-		guint	action;
-		void	(*afunc)(DirPane *dp, gint row);
+		guint		action;
+		void		(*afunc)(DirPane *dp, const DirRow2 *row);
 
 		action = car_keyword_get_enum(ca, "action", 0, "select", "unselect", "toggle", NULL);
 		afunc = (action == 0) ? dp_select : (action == 1) ? dp_unselect : dp_toggle;
-		afunc(src, row);
+		afunc(src, (DirRow2 *) &iter);
 		gui_events_flush();
+		return 1;
 	}
-	return 1;
+	return 0;
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -157,55 +173,26 @@
 /* 1998-06-04 -	Invert the selection set, making all currently selected files become
 **		unselected, and all unselected become selected.
 ** 2002-08-25 -	Complete rewrite, now uses bit vector for speed. 40-100X faster.
+** 2009-10-01 -	Complete rewrite, ported to GTK+ 2.0, one-third the size.
 */
 gint cmd_selecttoggle(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	guint	*bm, word, row, mask;
-	gsize	alloc;
-	GSList	*slist;
-
-	/* Compute size of, and allocate selection bit vector. */
-	alloc = (src->dir.num_rows + CHAR_BIT * sizeof *bm - 1) / (CHAR_BIT * sizeof *bm);
-	bm = g_malloc(alloc * sizeof *bm);
-	memset(bm, 0, alloc * sizeof *bm);	/* Assume no selection. */
-
-	gtk_clist_freeze(src->list);
+	GtkTreeIter	iter;
 
-	/* Was there a selection? If so, set bits for selected rows. */
-	if((slist = dp_get_selection(src)) != NULL)
+	if(gtk_tree_model_get_iter_first(dp_get_tree_model(src), &iter))
 	{
-		const GSList	*iter;
-
-		for(iter = slist; iter != NULL; iter = g_slist_next(iter))
-		{
-			register guint	n;
-
-			n = DP_ROW_INDEX(src, DP_SEL_ROW(iter));
-			bmn / (CHAR_BIT * sizeof *bm) |= 1 << (n % (CHAR_BIT * sizeof *bm));
-		}
-		dp_free_selection(slist);
-	}
-	/* Now invert the selection bitmap. */
-	for(word = 0; word < alloc; word++)
-		bmword = ~bmword;
-	/* Clear selection, and apply the (inverted) bitmap. */
-	dp_unselect_all(src);
-	for(word = row = 0; row < src->dir.num_rows; word++)
-	{
-		if(!bmword)		/* Test a bunch (typically 32) rows in parallel. */
-		{
-			row += CHAR_BIT * sizeof *bm;
-			continue;
-		}
-		for(mask = 1; mask; mask <<= 1, row++)
+		GtkTreeSelection	*ts = gtk_tree_view_get_selection(GTK_TREE_VIEW(src->view));
+		g_signal_handler_block(G_OBJECT(ts), src->sig_sel_changed);
+		do
 		{
-			if(bmword & mask)
-				dp_select(src, row);
-		}
+			if(gtk_tree_selection_iter_is_selected(ts, &iter))
+				gtk_tree_selection_unselect_iter(ts, &iter);
+			else
+				gtk_tree_selection_select_iter(ts, &iter);
+		} while(gtk_tree_model_iter_next(dp_get_tree_model(src), &iter));
+		g_signal_handler_unblock(G_OBJECT(ts), src->sig_sel_changed);
+		g_signal_emit_by_name(G_OBJECT(ts), "changed", src);
 	}
-	gtk_clist_thaw(src->list);
-	g_free(bm);
-
 	return 1;
 }
 
@@ -214,24 +201,24 @@
 /* 1999-05-06 -	Inspect which set (selected or unselected) the given row is, and determine
 **		if it complies with the wanted one as specified in <sp>.
 */
-static gboolean filter_set(DirPane *dp, guint row, SelParam *sp)
+static gboolean filter_set(DirPane *dp, const DirRow2 *row, const SelParam *sp)
 {
 	gboolean	sel;
 
 	if(sp->set == SM_SET_ALL)
 		return TRUE;
-	sel = dp_is_selected(dp, &dp->dir.rowrow);
+	sel = dp_is_selected(dp, row);
 	return (sp->set == SM_SET_SELECTED) ? sel : !sel;
 }
 
 /* 1999-05-06 -	Inspect type (dir or non-dir) given row has, and match against <sp>. */
-static gboolean filter_type(DirPane *dp, guint row, SelParam *sp)
+static gboolean filter_type(DirPane *dp, const DirRow2 *row, const SelParam *sp)
 {
 	gboolean	dir;
 
 	if(sp->type == SM_TYPE_ALL)
 		return TRUE;
-	dir = S_ISDIR(DP_ROW_LSTAT(&dp->dir.rowrow).st_mode);
+	dir = dp_row_get_file_type(dp_get_tree_model(dp), row, TRUE) == G_FILE_TYPE_DIRECTORY;
 
 	return (sp->type == SM_TYPE_DIRS) ? dir : !dir;
 }
@@ -259,12 +246,12 @@
 {
 	switch(action)
 	{
-		case SM_ACTION_SELECT:
-			return dp_select;
-		case SM_ACTION_UNSELECT:
-			return dp_unselect;
-		case SM_ACTION_TOGGLE:
-			return dp_toggle;
+	case SM_ACTION_SELECT:
+		return dp_select;
+	case SM_ACTION_UNSELECT:
+		return dp_unselect;
+	case SM_ACTION_TOGGLE:
+		return dp_toggle;
 	}
 	return NULL;
 }
@@ -275,15 +262,15 @@
 static void do_selectre(MainInfo *min, DirPane *dp, SelParamRE *sp)
 {
 	GString		*tmp;
-	regex_t		re;
-	void		(*sel_action)(DirPane *dp, gint row) = NULL;
+	GRegex		*re;
+	void		(*sel_action)(DirPane *dp, const DirRow2 *row) = NULL;
 
 	if(sp->re == NULL)
 		return;
 	sel_action = select_action_func(sp->basic.action);
 	if((tmp = g_string_new(sp->re->str)) != NULL)
 	{
-		gint	reret;
+		GError	*error = NULL;
 
 		if(sp->glob)
 			stu_gstring_glob_to_re(tmp);
@@ -292,33 +279,37 @@
 			g_string_prepend_c(tmp, '^');
 			g_string_append_c(tmp,  '$');
 		}
-		if((reret = regcomp(&re, tmp->str, REG_EXTENDED | (sp->nocase ? REG_ICASE : 0))) == 0)
+		if((re = g_regex_new(tmp->str, G_REGEX_EXTENDED | (sp->nocase ? G_REGEX_CASELESS : 0), G_REGEX_MATCH_NOTEMPTY, &error)) != NULL)
 		{
-			gchar	*text;
-			gint	matchok;
-			guint	i, column;
-
-			dp_freeze(dp);
-			matchok = sp->invert ? REG_NOMATCH : 0;
-			column  = compute_column(dp, sp->basic.content);
-			for(i = 0; i < dp->dir.num_rows; i++)
+			gboolean	matchok;
+			GtkTreeIter	iter;
+			gchar		text1024;
+			GtkTreeModel	*m = dp_get_tree_model(dp);
+
+			matchok = !sp->invert;
+			if(gtk_tree_model_get_iter_first(m, &iter))
 			{
-				if(filter_set(dp, i, &sp->basic) && filter_type(dp, i, &sp->basic))
+				do
 				{
-					gtk_clist_get_text(GTK_CLIST(dp->list), i, column, &text);
-					if(regexec(&re, text, 0, NULL, 0) == matchok)
-						sel_action(dp, i);
-				}
+					if(filter_set(dp, &iter, &sp->basic) && filter_type(dp, &iter, &sp->basic))
+					{
+						if(dpf_get_content(min, dp, &iter, sp->basic.content, text, sizeof text))
+						{
+							if(g_regex_match(re, text, G_REGEX_MATCH_NOTEMPTY, NULL) == matchok)
+								sel_action(dp, &iter);
+						}
+					}
+				} while(gtk_tree_model_iter_next(m, &iter));
 			}
-			dp_thaw(dp);
-			regfree(&re);
+			g_regex_unref(re);
 		}
 		else
 		{
-			gchar	ebuf1024;
-
-			regerror(reret, &re, ebuf, sizeof ebuf);
-			dlg_dialog_async_new_error(ebuf);
+			if(error != NULL)
+			{
+				dlg_dialog_async_new_error(error->message);
+				g_error_free(error);
+			}
 		}
 		g_string_free(tmp, TRUE);
 	}
@@ -326,47 +317,25 @@
 
 /* 1999-05-06 -	Build a mode selection menu, using items from <def>. Items are separated by vertical
 **		bars. Each item will have it's user data set to the index of the item in question.
+** 2010-05-15 -	Now builds a combo box, rather than a menu.
 */
-static GtkWidget * build_mode_menu(const gchar *def)
+static GtkWidget * build_mode_combo_box(const gchar *def)
 {
-	GtkWidget	*menu = NULL, *item;
+	GtkWidget	*cbox = NULL;
 	gchar		*temp, *iname, *iend;
 	guint		minor;
 
 	if((temp = g_strdup(def)) != NULL)
 	{
-		menu = gtk_menu_new();
+		cbox = gtk_combo_box_new_text();
 		for(iname = temp, minor = 0; (*iname != '\0') && (iend = strchr(iname, '|')) != NULL; iname = iend + 1, minor++)
 		{
 			*iend = '\0';
-			item = gtk_menu_item_new_with_label(iname);
-			gtk_menu_append(GTK_MENU(menu), item);
-			gtk_object_set_user_data(GTK_OBJECT(item), GUINT_TO_POINTER(minor));
+			gtk_combo_box_append_text(GTK_COMBO_BOX(cbox), iname);
 		}
 		g_free(temp);
 	}
-	return menu;
-}
-
-/* 1999-11-14 -	Build a menu with one choice per active content type in the given pane. */
-static GtkWidget * build_content_menu(DirPane *dp)
-{
-	MainInfo	*min = dp->main;
-	DPFormat	*dpf;
-	GtkWidget	*menu, *item;
-	guint		i;
-
-	dpf = &min->cfg.dp_formatdp->index;
-	menu = gtk_menu_new();
-	for(i = 0; i < dpf->num_columns; i++)
-	{
-		if(dpf->formati.content == DPC_ICON)
-			continue;
-		item = gtk_menu_item_new_with_label(dpf_get_content_name(dpf->formati.content));
-		gtk_object_set_user_data(GTK_OBJECT(item), GUINT_TO_POINTER(dpf->formati.content));
-		gtk_menu_append(GTK_MENU(menu), item);
-	}
-	return menu;
+	return cbox;
 }
 
 /* 2005-06-04 -	Compute which index in a content menu (as created by build_content_menu(), above)
@@ -397,7 +366,7 @@
 				  N_("All types|Directories only|Non-directories only|"),
 				  N_("Select|Unselect|Toggle|") },
 			*mlabel = { N_("Set"), N_("Type"), N_("Action") };
-	GtkWidget	*table, *label, *menu;
+	GtkWidget	*table, *label;
 	guint		i;
 
 	table = gtk_table_new(3, 3, FALSE);
@@ -405,18 +374,14 @@
 	{
 		label = gtk_label_new(_(mlabeli));
 		gtk_table_attach(GTK_TABLE(table), label, 0, 1, i, i + 1, 0,0,0,0);
-		menu = build_mode_menu(_(mdefi));
-		opt_menui = gtk_option_menu_new();
-		gtk_option_menu_set_menu(GTK_OPTION_MENU(opt_menui), menu);
-		gtk_option_menu_set_history(GTK_OPTION_MENU(opt_menui), *historyi);
+		opt_menui = build_mode_combo_box(_(mdefi));
+		gtk_combo_box_set_active(GTK_COMBO_BOX(opt_menui), *historyi);
 		gtk_table_attach(GTK_TABLE(table), opt_menui, 1, 2, i, i+1, GTK_EXPAND|GTK_FILL,0,0,0);
 	}
 	label = gtk_label_new(_("Content"));
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, i, i + 1, 0,0,0,0);
-	menu = build_content_menu(dp);
-	opt_menu3 = gtk_option_menu_new();
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(opt_menu3), menu);
-	gtk_option_menu_set_history(GTK_OPTION_MENU(opt_menu3), content_menu_find(dp, *history3));
+	opt_menu3 = dpf_get_content_combo_box(NULL, NULL);	/* We read out choice later, no callback needed. */
+	gtk_combo_box_set_active(GTK_COMBO_BOX(opt_menu3), content_menu_find(dp, *history3));
 	gtk_table_attach(GTK_TABLE(table), opt_menu3, 1, 2, i, i + 1, GTK_EXPAND|GTK_FILL,0,0,0);
 
 	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
@@ -451,17 +416,10 @@
 
 static void selparam_read_menus(guint **ptr, GtkWidget *opt_menu)
 {
-	GtkWidget	*menu, *mi;
-	guint		i;
+	guint	i;
 
 	for(i = 0; i < 4; i++)
-	{
-		if((menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(opt_menui))) != NULL)
-		{
-			if((mi = gtk_menu_get_active(GTK_MENU(menu))) != NULL)
-				*ptri = GPOINTER_TO_UINT(gtk_object_get_user_data(GTK_OBJECT(mi)));
-		}
-	}
+		*ptri = gtk_combo_box_get_active(GTK_COMBO_BOX(opt_menui));
 }
 
 /* 1998-06-04 -	Pop up a dialog window asking the user for a regular expression, and
@@ -525,7 +483,7 @@
 		if(sp.re != NULL)
 		{
 			gtk_entry_set_text(GTK_ENTRY(re), sp.re->str);
-			gtk_entry_select_region(GTK_ENTRY(re), 0, -1);
+			gtk_editable_select_region(GTK_EDITABLE(re), 0, -1);
 		}
 		gtk_box_pack_start(GTK_BOX(vbox), re, FALSE, FALSE, 0);
 		dlg = dlg_dialog_sync_new(vbox, _("Select Using RE"), NULL);
@@ -533,20 +491,11 @@
 		res = dlg_dialog_sync_wait(dlg);
 		if(res == DLG_POSITIVE)		/* If user accepted, collect widget state into 'sp'. */
 		{
-			GtkWidget	*menu, *mi;
-			guint		i;
+			guint	i;
 
 			for(i = 0; i < 3; i++)
-			{
-				if((menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(opt_menui))) != NULL)
-				{
-					if((mi = gtk_menu_get_active(GTK_MENU(menu))) != NULL)
-						*mptri = GPOINTER_TO_UINT(gtk_object_get_user_data(GTK_OBJECT(mi)));
-				}
-			}
-			menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(opt_menu3));
-			mi   = gtk_menu_get_active(GTK_MENU(menu));
-			sp.basic.content = (DPContent) GPOINTER_TO_UINT(gtk_object_get_user_data(GTK_OBJECT(mi)));
+				*mptri = gtk_combo_box_get_active(GTK_COMBO_BOX(opt_menui));
+			sp.basic.content = gtk_combo_box_get_active(GTK_COMBO_BOX(opt_menu3));
 			sp.glob	  = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glob));
 			sp.invert = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(invert));
 			sp.full   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(full));
@@ -575,20 +524,25 @@
 */
 gint cmd_selectext(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	GSList	*slist, *iter;
-	guint	i;
+	GSList		*slist, *iter;
+	GtkTreeIter	riter;
+	GtkTreeModel	*model;
 
 	slist = dp_get_selection(src);
-
+	model = dp_get_tree_model(src);
 	for(iter = slist; iter != NULL; iter = g_slist_next(iter))
 	{
-		for(i = 0; i < src->dir.num_rows; i++)
-		{
-			if(DP_SEL_INDEX(src, iter) == i)
-				continue;
+		const DirRow2	*sel = iter->data;
 
-			if(stl_styleinfo_style_siblings(min->cfg.style, DP_SEL_TYPE(iter)->style, DP_ROW_TYPE(&src->dir.rowi)->style))
-				dp_select(src, i);
+		if(gtk_tree_model_get_iter_first(model, &riter))
+		{
+			do
+			{
+				if(memcmp(sel, &riter, sizeof *sel) == 0)
+					continue;
+				if(stl_styleinfo_style_siblings(min->cfg.style, dp_row_get_ftype(model, sel)->style, dp_row_get_ftype(model, &riter)->style))
+					dp_select(src, &riter);
+			} while(gtk_tree_model_iter_next(model, &riter));
 		}
 	}
 	dp_free_selection(slist);
@@ -604,40 +558,54 @@
 */
 gint cmd_selectsuffix(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	GdkEventButton	*evt;
-	gint		row = -1;
 	const gchar	*suff = NULL;
+	GtkTreeModel	*m = dp_get_tree_model(src);
 
 	if((suff = car_bareword_get(ca, 0)) != NULL)
 		;
 	if(suff == NULL)
 	{
+		GdkEventButton	*evt;
+		GtkTreeIter	si;
+		gboolean	siok = FALSE;
+
 		if((evt = (GdkEventButton *) evt_event_get(GDK_BUTTON_PRESS)) != NULL)
 		{
-			gint	col;
+			GtkTreePath	*path = NULL;
 
-			if(!gtk_clist_get_selection_info(GTK_CLIST(src->list), evt->x, evt->y, &row, &col) || (row > src->dir.num_rows))
-				row = -1;
+			if(gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(src->view), evt->x, evt->y, &path, NULL, NULL, NULL) && path != NULL)
+			{
+				siok = gtk_tree_model_get_iter(m, &si, path);
+				gtk_tree_path_free(path);
+			}
 		}
 		else
-			row = src->focus_row;
-		if(row != -1)
-			suff = stu_strcasechr(DP_ROW_NAME(&src->dir.rowrow), '.');
+			g_warning("Suffix selection from focused row is not implemented");
+		if(siok)
+		{
+			const gchar	*dn = dp_row_get_name_display(dp_get_tree_model(src), (DirRow2 *) &si);
+			suff = g_utf8_strrchr(dn, -1, '.');
+		}
 	}
 
-	/* Did we find a row? If we did, extract its suffix, and select all matching rows. */
+	/* Did we find a suffix? If we did, extract its suffix, and select all matching rows. */
 	if(suff != NULL)
 	{
-		guint		action, i;
-		void		(*afunc)(DirPane *dp, gint row);
+		GtkTreeIter	iter;
 
-		action = car_keyword_get_enum(ca, "action", 0, "select", "unselect", "toggle", NULL);
-		afunc = (action == 0) ? dp_select : (action == 1) ? dp_unselect : dp_toggle;
-
-		for(i = 0; i < src->dir.num_rows; i++)
+		if(gtk_tree_model_get_iter_first(m, &iter))
 		{
-			if(stu_has_suffix(DP_ROW_NAME(&src->dir.rowi), suff))
-				afunc(src, i);
+			guint	action;
+			void	(*afunc)(DirPane *dp, const DirRow2 *row);
+
+			action = car_keyword_get_enum(ca, "action", 0, "select", "unselect", "toggle", NULL);
+			afunc = (action == 0) ? dp_select : (action == 1) ? dp_unselect : dp_toggle;
+			do
+			{
+				if(stu_has_suffix(dp_row_get_name_display(m, &iter), suff))
+					afunc(src, &iter);
+
+			} while(gtk_tree_model_iter_next(m, &iter));
 		}
 	}
 	return 1;
@@ -650,41 +618,51 @@
 */
 gint cmd_selecttype(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	GdkEventButton	*evt;
 	const gchar	*tname;
-	gint		row = -1;
 	GList		*types = NULL;
+	GtkTreeModel	*m = dp_get_tree_model(src);
+	GtkTreeIter	iter;
 
 	if((tname = car_bareword_get(ca, 0U)) != NULL)
 		types = typ_type_lookup_glob(min->cfg.type, tname);
 	else
 	{
+		GdkEventButton	*evt;
+		GtkTreeIter	ei;
+		gboolean	eiok = FALSE;
+
 		if((evt = (GdkEventButton *) evt_event_get(GDK_BUTTON_PRESS)) != NULL)
 		{
-			gint	col;
+			GtkTreePath	*path = NULL;
 
-			if(!gtk_clist_get_selection_info(GTK_CLIST(src->list), evt->x, evt->y, &row, &col) || (row > src->dir.num_rows))
-				row = -1;
+			if(gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(src->view), evt->x, evt->y, &path, NULL, NULL, NULL) && path != NULL)
+			{
+				eiok = gtk_tree_model_get_iter(m, &ei, path);
+				gtk_tree_path_free(path);
+			}
 		}
 		else
-			row = src->focus_row;
-		if(row != -1)
-			types = g_list_append(NULL, (gpointer) DP_ROW_TYPE(&src->dir.rowrow));
+			g_warning("Type selection from focused row is not implemented");
+
+		if(eiok != -1)
+			types = g_list_append(NULL, dp_row_get_ftype(dp_get_tree_model(src), (DirRow2* ) &ei));
 	}
 
 	if(types != NULL)
 	{
+		if(gtk_tree_model_get_iter_first(m, &iter))
+		{
+			guint	action;
+			void	(*afunc)(DirPane *dp, const DirRow2 *row);
 
-		guint	action, i;
-		void	(*afunc)(DirPane *dp, gint row);
+			action = car_keyword_get_enum(ca, "action", 0, "select", "unselect", "toggle", NULL);
+			afunc  = (action == 0) ? dp_select : (action == 1) ? dp_unselect : dp_toggle;
 
-		action = car_keyword_get_enum(ca, "action", 0, "select", "unselect", "toggle", NULL);
-		afunc  = (action == 0) ? dp_select : (action == 1) ? dp_unselect : dp_toggle;
-
-		for(i = 0; i < src->dir.num_rows; i++)
-		{
-			if(g_list_find(types, (gpointer) DP_ROW_TYPE(&src->dir.rowi)) != NULL)
-				afunc(src, i);
+			do
+			{
+				if(g_list_find(types, dp_row_get_ftype(m, &iter)))
+					afunc(src, &iter);
+			} while(gtk_tree_model_iter_next(m, &iter));
 		}
 		g_list_free(types);
 	}
@@ -693,93 +671,28 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-#if 0
-struct cmp_rules {
-	gboolean	nocase;
-
-	gint		(*scmp)(const gchar *s1, const gchar *s2);
-};
-
-/* 2001-09-23 -	Compare <row> against all rows in <dst>, according to rules specified in <dr>.
-** 		Returns TRUE if there is a match, i.e. if a file named <row> exists in <dst>
-**		already.
-*/
-static gboolean cmp_exec(const DirRow *row, const DirPane *dst, const struct cmp_rules *dr)
-{
-	const gchar	*name;
-	gboolean	ret;
-	gint		i;
-	guint32		match;
-
-	name = DP_ROW_NAME(row);
-	for(i = 0; i < dst->dir.num_rows; i++)
-	{
-		if(dr->scmp(name, DP_ROW_NAME(&dst->dir.rowi)) != 0)
-			continue;
-		/* At this point, we have a name match. Furher requirements? */
-		return TRUE;
-	}
-	return FALSE;
-}
-
-gint cmd_selectcmp(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
-{
-	static struct cmp_rules	rules = { FALSE };
-	gint			i;
-
-	/* Select string comparison function to use. */
-	rules.scmp  = rules.nocase ? g_strcasecmp : strcmp;
-
-	for(i = 0; i < src->dir.num_rows; i++)
-	{
-		if(cmp_exec(&src->dir.rowi, dst, &rules))
-			dp_select(src, i);
-	}
-	return 1;
-}
-#endif
-/* ----------------------------------------------------------------------------------------- */
-
-typedef enum { SHELL_BOOLEAN } ShellMode;
+typedef enum {
+	SHELL_BOOLEAN = 0	/* Interpret shell exit status as boolean, 0 is success. */
+} ShellMode;
 
 typedef struct {
 	ShellMode	mode;
 } ShellRule;
 
-static int shell_select(char **argv, const char *dir, const ShellRule *rule)
+/* 2009-10-04 -	Rewritten, now uses glib primitive to run a full commandline, doesn't require splitting. */
+static gboolean shell_select(const gchar *commandline, const ShellRule *rule)
 {
-	pid_t	child;
-
-	if(argv == NULL || argv0 == NULL || rule == NULL)
-		return 0;
+	gint	status;
 
-	if((child = fork()) >= 0)
+	if(g_spawn_command_line_sync(commandline, NULL, NULL, &status, NULL))
 	{
-		if(child == 0)	/* In child? */
+		switch(rule->mode)
 		{
-			fut_cd(dir, NULL, 0u);
-			execvp(argv0, argv);
-			usleep(50000);
-			_exit(-1);
-		}
-		else if(child > 0)		/* In parent. */
-		{
-			int	stat = 0;
-
-			waitpid(child, &stat, 0);
-			if(WIFEXITED(stat))
-			{
-				stat = WEXITSTATUS(stat);
-				if(rule->mode == SHELL_BOOLEAN)
-					return stat == 0;
-				else
-					fprintf(stderr, __FILE__ ": Not handling shell select mode %d\n", rule->mode);
-			}
-			else
-				fprintf(stderr, __FILE__ ": Child command %s crashed, not interpreting return status\n", argv0);
+		case SHELL_BOOLEAN:
+			return WEXITSTATUS(status) == 0;
 		}
 	}
-	return 0;
+	return FALSE;
 }
 
 /* 2006-04-24 -	Select based on return value of shell command. */
@@ -788,8 +701,7 @@
 	SelParamShell	sp;
 	const gchar	*str;
 	GString		*cmd;
-	guint		i, column;
-	gchar		**argv;
+	guint		column;
 	gint		reply = DLG_POSITIVE;
 
 	/* Start from previous set of parameters. */
@@ -814,12 +726,13 @@
 		selparam_init_menus(src, vbox, opt_menu, mptr);
 		label = gtk_label_new(_("Enter shell command to run. The command\nwill have the selected content appended.\nAction is performed on successful exit."));
 		gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-		entry = gtk_entry_new_with_max_length(1024);
+		entry = gtk_entry_new();
+		gtk_entry_set_max_length(GTK_ENTRY(entry), 1024);
 		if(sp.cmd != NULL)
 			gtk_entry_set_text(GTK_ENTRY(entry), sp.cmd->str);
 		gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
 		dlg = dlg_dialog_sync_new(vbox, _("Select using shell command"), _("OK|Cancel"));
-		gtk_entry_select_region(GTK_ENTRY(entry), 0, 1 << 30);
+		gtk_editable_select_region(GTK_EDITABLE(entry), 0, 1 << 30);
 		gtk_widget_grab_focus(entry);
 		reply = dlg_dialog_sync_wait(dlg);
 		if(reply == DLG_POSITIVE)
@@ -836,35 +749,32 @@
 	if(reply == DLG_POSITIVE)
 	{
 		SelAction	sel_action;
-		gchar		*text;
+		GtkTreeModel	*m = dp_get_tree_model(src);
+		GtkTreeIter	iter;
+		gchar		text1024;
+		const ShellRule	rule = { SHELL_BOOLEAN };
 
-		column = compute_column(src, sp.basic.content);
-		cmd = g_string_sized_new(4096);		/* Static for simplicity. */
-		sel_action = select_action_func(sp.basic.action);
-		for(i = 0; i < src->dir.num_rows; i++)
+		if(gtk_tree_model_get_iter_first(m, &iter))
 		{
-			if(!filter_set(src, i, &sp.basic) || !filter_type(src, i, &sp.basic))
-				continue;
-			g_string_assign(cmd, sp.cmd->str);
-			g_string_append_c(cmd, ' ');
-			text = NULL;
-			gtk_clist_get_text(GTK_CLIST(src->list), i, column, &text);
-			if(text == NULL)
-				continue;
-			g_string_append(cmd, text);
-			if(cmd->str0 == '\0' || cmd->str0 == ' ')
-				continue;
-			argv = cpr_parse(min, cmd->str);
-			if(argv != NULL && argv0 != NULL)
+			column = compute_column(src, sp.basic.content);
+			cmd = g_string_sized_new(4096);		/* Static for simplicity. */
+			sel_action = select_action_func(sp.basic.action);
+			do
 			{
-				const ShellRule	rule = { SHELL_BOOLEAN };
-
-				if(shell_select(argv, src->dir.path, &rule))
-					sel_action(src, i);
-				g_free(argv);
-			}
+				if(!filter_set(src, &iter, &sp.basic) || !filter_type(src, &iter, &sp.basic))
+					continue;
+				g_string_assign(cmd, sp.cmd->str);
+				g_string_append_c(cmd, ' ');
+				if(!dpf_get_content(min, src, &iter, sp.basic.content, text, sizeof text))
+					continue;
+				g_string_append(cmd, text);
+				if(cmd->str0 == '\0' || cmd->str0 == ' ')
+					continue;
+				if(shell_select(cmd->str, &rule))
+					sel_action(src, &iter);
+			} while(gtk_tree_model_iter_next(m, &iter));
+			g_string_free(cmd, TRUE);
 		}
-		g_string_free(cmd, TRUE);
 		old_sp_shell = sp;		/* Remember parameters for next time. */
 	}
 	return 0;
@@ -881,7 +791,7 @@
 
 	if((slist = dp_get_selection(src)) != NULL)
 	{
-		dp_unselect(src, DP_SEL_INDEX(src, slist));
+		dp_unselect(src, slist->data);
 		dp_free_selection(slist);
 	}
 	return 1;

gentoo-0.15.6.tar.bz2/src/cmd_split.c -> gentoo-0.19.9.tar.gz/src/cmd_split.c Changed

@@ -11,7 +11,6 @@
 #include <fcntl.h>
 
 #include "cmd_delete.h"
-#include "convutil.h"
 #include "dialog.h"
 #include "dirpane.h"
 #include "errors.h"
@@ -19,6 +18,7 @@
 #include "guiutil.h"
 #include "overwrite.h"
 #include "sizeutil.h"
+#include "strutil.h"
 
 #include "cmd_generic.h"
 #include "cmd_split.h"
@@ -26,13 +26,32 @@
 #define	CMD_ID	"split"
 
 #define	NFORMAT_LIMIT	(MAXNAMLEN + 16)
-
-#define	THRESH_KB	(1.0)
-#define	THRESH_MB	(0.5)
-#define	THRESH_GB	(0.5)
+#define	SPLIT_CHUNK	(1 << 18)
 
 /* ----------------------------------------------------------------------------------------- */
 
+#define	VALUE_SIZE	16
+
+typedef struct
+{
+	/* Basic parameters, extracted from UI. */
+	guint64		file_size;
+	guint64		part_size;
+	guint64		base;
+	guint64		step;
+	guint64		last;
+	guint64		num;
+
+	/* Parameters made visible through a dictionary, for interpolation. */
+	GHashTable	*parameters;
+	gchar		v_format16;
+	gchar		v_indexVALUE_SIZE;
+	gchar		v_baseVALUE_SIZE;
+	gchar		v_stepVALUE_SIZE;
+	gchar		v_lastVALUE_SIZE;
+	gchar		v_numVALUE_SIZE;
+} NameGenerator;
+
 typedef struct {
 	GtkWidget	*vbox;		/* This really is required. */
 	GtkWidget	*label;		/* Tells the user what's up. */
@@ -40,53 +59,251 @@
 	GtkWidget	*mvbox;		/* Sub-vbox for the mode-specific widgets. */
 	GtkWidget	*nhbox;		/* Hbox for the naming issue. */
 	GtkWidget	*nformat;	/* Entry widget for name formatter. */
+	GtkWidget	*nfill;		/* Check box for zero-fill of number in format. */
+	GtkObject	*npadj;		/* Adjustment for precision. */
+	GtkWidget	*nprec;		/* Scale widget for number precision. */
 	GtkObject	*nbadj;		/* Adjustment for index base. */
 	GtkWidget	*nbase;		/* Spin widget for index base. */
 	GtkObject	*nsadj;		/* Adjustment for index step. */
 	GtkWidget	*nstep;		/* Spin widget for index step. */
 
-	GtkWidget	*ssframe;	/* Frame for "split to fixed size". */
+	GtkWidget	*nbook;		/* Notebook with mode-settings. */
+
 	GtkWidget	*sssize;	/* Combo holding the wanted size. */
 	GtkWidget	*snframe;	/* Frame for "split to fixed number". */
 
+	GtkWidget	*fccount;	/* Spinner for the count, 2+. */
+
+	GtkListStore	*preview_store;	/* Preview list model. */
+	GtkWidget	*preview;	/* GtkTreeView for the preview. */
+
 	MainInfo	*min;
 	guint		curr_mode;	/* 0 for fixed size, 1 for fixed amount. */
 	const gchar	*name;		/* Source file being split. */
+	goffset		file_size;	/* Size of the current file. */
+
+	NameGenerator	*namegen;
 } SplitInfo;
 
 /* ----------------------------------------------------------------------------------------- */
 
+static const gchar * get_name_format(const SplitInfo *spi)
+{
+	return gtk_entry_get_text(GTK_ENTRY(spi->nformat));
+}
+
+static guint get_name_base(const SplitInfo *spi)
+{
+	return gtk_adjustment_get_value(GTK_ADJUSTMENT(spi->nbadj));
+}
+
+static guint get_name_step(const SplitInfo *spi)
+{
+	return gtk_adjustment_get_value(GTK_ADJUSTMENT(spi->nsadj));
+}
+
+/* ----------------------------------------------------------------------------------------- */
+
+#define	PREVIEW_MAX	30	/* Must be at least 2, and must be even. */
+
+typedef enum {
+	DISPLAY_NORMAL,
+	DISPLAY_ELLIPSIS,
+	DISPLAY_NOTHING
+} PreviewDisplay;
+
+/* 2010-12-03 -	Returns one of the PreviewDisplay values depending on how the part_index:th row should be shown. */
+static PreviewDisplay get_preview_display(guint64 index, guint64 num)
+{
+	if(num <= PREVIEW_MAX)
+		return DISPLAY_NORMAL;
+	if(index < PREVIEW_MAX / 2)
+		return DISPLAY_NORMAL;
+	if(index == PREVIEW_MAX / 2 + 1)
+		return DISPLAY_ELLIPSIS;
+	if(index >= num - PREVIEW_MAX / 2)
+		return DISPLAY_NORMAL;
+	return DISPLAY_NOTHING;
+}
+
+static void	namegenerator_configure(NameGenerator *sng, const SplitInfo *spi);
+
+/* 2010-12-03 -	Create a "name generator", which is basically the parameters needed to (on-demand) generate name 'i' from a split sequence. */
+static NameGenerator * namegenerator_new(const SplitInfo *spi)
+{
+	NameGenerator	*sng = g_malloc(sizeof *sng);
+
+	namegenerator_configure(sng, spi);
+
+	return sng;
+}
+
+/* 2010-12-11 -	Configure the name generator, based on state in spi's widgets. */
+static void namegenerator_configure(NameGenerator *sng, const SplitInfo *spi)
+{
+	sng->file_size = spi->file_size;
+
+	/* Inspect combo state, and compute a suitable part size. */
+	if(gtk_combo_box_get_active(GTK_COMBO_BOX(spi->mode)) == 0)
+		sng->part_size = sze_get_offset(gtk_combo_box_get_active_text(GTK_COMBO_BOX(spi->sssize)));
+	else
+	{
+		const gchar	*num = gtk_entry_get_text(GTK_ENTRY(spi->fccount));
+		const guint64	num_parts = g_ascii_strtoull(num, NULL, 0);
+
+		/* This actually works. Imagine proof, here. */
+		sng->part_size = (goffset) ((sng->file_size + num_parts - 1) / num_parts);
+	}
+
+	sng->base = get_name_base(spi);
+	sng->step = get_name_step(spi);
+	sng->num = (sng->file_size + sng->part_size - 1) / sng->part_size;
+	sng->last = sng->base + (sng->num - 1) * sng->step;
+
+	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(spi->nfill)))
+		g_snprintf(sng->v_format, sizeof sng->v_format, "%%0%u" G_GUINT64_FORMAT, (guint) gtk_adjustment_get_value(GTK_ADJUSTMENT(spi->npadj)));
+	else
+		strcpy(sng->v_format, "%" G_GUINT64_FORMAT);
+
+	sng->parameters = g_hash_table_new(g_str_hash, g_str_equal);
+	sng->v_index0 = '\0';
+	g_hash_table_insert(sng->parameters, "index", sng->v_index);
+	g_snprintf(sng->v_base, sizeof sng->v_base, sng->v_format, sng->base);
+	g_hash_table_insert(sng->parameters, "base", sng->v_base);
+	g_snprintf(sng->v_step, sizeof sng->v_step, sng->v_format, sng->step);
+	g_hash_table_insert(sng->parameters, "step", sng->v_step);
+	g_snprintf(sng->v_num, sizeof sng->v_num, sng->v_format, sng->num);
+	g_hash_table_insert(sng->parameters, "num", sng->v_num);
+	g_snprintf(sng->v_last, sizeof sng->v_last, sng->v_format, sng->last);
+	g_hash_table_insert(sng->parameters, "last", sng->v_last);
+}
+
+static gboolean namegenerator_generate(NameGenerator *sng, gchar *buf, gsize buf_size, const gchar *format, guint64 index)
+{
+	g_snprintf(sng->v_index, sizeof sng->v_index, sng->v_format, sng->base + index * sng->step);
+
+	return stu_interpolate_dictionary(buf, buf_size, format, sng->parameters);
+}
+
+static void namegenerator_destroy(NameGenerator *sng)
+{
+	g_hash_table_destroy(sng->parameters);
+	g_free(sng);
+}
+
+static void update_preview_ss(const gchar *format, gboolean zero_fill, gint precision, guint64 base, guint64 step, SplitInfo *spi)
+{
+	goffset		size = spi->file_size, chunk;
+	guint64		pos = 0, part_index;
+	gchar		part2 * MAXNAMLEN;
+	GtkTreeIter	iter;
+
+	gtk_list_store_clear(spi->preview_store);
+	namegenerator_configure(spi->namegen, spi);
+
+	for(part_index = 0; size > 0; size -= chunk, pos += chunk, part_index++)
+	{
+		PreviewDisplay	dpl;
+
+		if(size > spi->namegen->part_size)
+			chunk = spi->namegen->part_size;
+		else
+			chunk = size;
+		dpl = get_preview_display(part_index, spi->namegen->num);
+		if(dpl == DISPLAY_NORMAL)
+		{
+			gtk_list_store_append(spi->preview_store, &iter);
+			sze_put_offset(part, sizeof part, pos, SZE_BYTES_NO_UNIT, 0, ',');
+			gtk_list_store_set(spi->preview_store, &iter, 0, part, -1);
+			namegenerator_generate(spi->namegen, part, sizeof part, format, part_index);
+			gtk_list_store_set(spi->preview_store, &iter, 1, part, -1);
+			sze_put_offset(part, sizeof part, chunk, SZE_BYTES_NO_UNIT, 0, ',');
+			gtk_list_store_set(spi->preview_store, &iter, 2, part, -1);
+		}
+		else if(dpl == DISPLAY_ELLIPSIS)
+		{
+			gtk_list_store_append(spi->preview_store, &iter);
+			gtk_list_store_set(spi->preview_store, &iter, 1, "...", -1);
+		}
+	}
+}
+
+static void update_preview_fc(const gchar *format, gboolean zero_fill, gint precision, guint64 base, guint64 step, SplitInfo *spi)
+{
+	update_preview_ss(format, zero_fill, precision, base, step, spi);
+}
+
+static void update_preview(SplitInfo *spi)
+{
+	const gchar	*format = get_name_format(spi);
+	const guint	base = get_name_base(spi);
+	const guint	step = get_name_step(spi);
+	const gboolean	zero_fill = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(spi->nfill));
+	const gint	precision = gtk_adjustment_get_value(GTK_ADJUSTMENT(spi->npadj));
+
+	if(spi->curr_mode == 0)
+		update_preview_ss(format, zero_fill, precision, base, step, spi);
+	else
+		update_preview_fc(format, zero_fill, precision, base, step, spi);
+}
+
+/* ----------------------------------------------------------------------------------------- */
+
 /* 1998-09-01 -	Pretty much rewrote this function, now that the sizeutil module exists. */
-static void spt_body(MainInfo *min, DirPane *src, DirRow *row, gpointer user)
+static void spt_body(MainInfo *min, DirPane *src, DirRow2 *row, gpointer gen, gpointer user)
 {
 	gchar		buf2 * MAXNAMLEN, siz132, siz232;
 	SplitInfo	*spi = user;
+	GtkTreeModel	*m = dp_get_tree_model(src);
+	gint		pos;
+
+	spi->name = dp_row_get_name(m, row);
+	spi->file_size = dp_row_get_size(m, row);
+
+	if(spi->namegen == NULL)
+		spi->namegen = namegenerator_new(spi);
 
-	sze_put_size(siz1, sizeof siz1, DP_ROW_LSTAT(row).st_size, SZE_BYTES);
-	sze_put_size(siz2, sizeof siz2, DP_ROW_LSTAT(row).st_size, SZE_AUTO);
+	sze_put_offset(siz1, sizeof siz1, dp_row_get_size(m, row), SZE_BYTES, 3, ',');
+	sze_put_offset(siz2, sizeof siz2, dp_row_get_size(m, row), SZE_AUTO, 3, ',');
 	if(strcmp(siz1, siz2) != 0)
-		g_snprintf(buf, sizeof buf, _("Split \"%s\".\nFile is %s (%s)."), DP_ROW_NAMED(row), siz1, siz2);
+		g_snprintf(buf, sizeof buf, _("Split \"%s\".\nFile is %s (%s)."), dp_row_get_name_display(m, row), siz1, siz2);
 	else
-		g_snprintf(buf, sizeof buf, _("Split \"%s\".\nFile is %s."), DP_ROW_NAMED(row), siz1);
+		g_snprintf(buf, sizeof buf, _("Split \"%s\".\nFile is %s."), dp_row_get_name_display(m, row), siz1);
 	gtk_label_set_text(GTK_LABEL(spi->label), buf);
-	gtk_entry_set_text(GTK_ENTRY(spi->nformat), DP_ROW_NAMED(row));
-	gtk_entry_append_text(GTK_ENTRY(spi->nformat), ".%03d");
-	spi->name = DP_ROW_NAME(row);
+	gtk_entry_set_text(GTK_ENTRY(spi->nformat), dp_row_get_name_display(m, row));
+	pos = gtk_entry_get_text_length(GTK_ENTRY(spi->nformat));
+	gtk_editable_insert_text(GTK_EDITABLE(spi->nformat), ".{index}", 8, &pos);
+
+	cmd_generic_track_entry(gen, spi->nformat);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(spi->mode), spi->curr_mode);
+
+	update_preview(spi);
 }
 
-/* 1998-09-01 -	Construct destination file name for piece number <piece> in a split. */
-static void build_name(SplitInfo *spi, DirPane *dst, gchar *buf, gint piece)
+/* 2009-10-07 -	Do a partial "splice", i.e. a copying of data from an input stream into an output stream.
+**		Here, 'chunk' is the number of bytes to copy, and 'buf' & 'buf_size' describe the buffer
+**		used to hold the data.
+*/
+static gboolean streams_splice_partial(GOutputStream *out, GInputStream *in, gsize chunk, gpointer buf, gsize buf_size, GError **err)
 {
-	gchar	fmtsizeof G_DIR_SEPARATOR_S + NFORMAT_LIMIT + 8, *file;
-	gint	base = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spi->nbase)),
-		step = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spi->nstep)),
-		num  = base + step * piece;
-	Conv	conv;
-
-	file = conv_begin(&conv, gtk_entry_get_text(GTK_ENTRY(spi->nformat)));
-	g_snprintf(fmt, sizeof fmt, "%%s%s%s", G_DIR_SEPARATOR_S, file);
-	g_snprintf(buf, PATH_MAX, fmt, dst->dir.path, num);
-	conv_end(&conv);
+	gsize	to_go = chunk, bite;
+	gssize	did;
+
+	while(to_go > 0)
+	{
+		bite = to_go > buf_size ? buf_size : to_go;
+		did = g_input_stream_read(in, buf, bite, NULL, err);
+		if(did == bite)
+		{
+			did = g_output_stream_write(out, buf, bite, NULL, err);
+			if(did != bite)
+				break;
+		}
+		else
+			break;
+		to_go -= bite;
+	}
+	return to_go == 0;
 }
 
 /* 1998-09-01 -	Split file on row <row> of <src>, producing a bunch of segment files in <dst>.
@@ -95,168 +312,353 @@
 **		fixed the protection bits for the output; now same as the source file.
 ** 1999-11-13 -	Adapted to use new fut_copy_partial() function, fixed bug with closing output
 **		file on failed write.
+** 2010-07-22 -	Now supports both split modes, in an attack of epic closure.
+** 2010-12-11 -	Now uses the NameGenerator API to generate actual names, to sync with preview.
 */
-static gint size_split(SplitInfo *spi, DirPane *src, DirPane *dst, DirRow *row)
+static gint do_split(SplitInfo *spi, DirPane *src, DirPane *dst, DirRow2 *row, GError **error)
 {
-	gchar	innamePATH_MAX, outnamePATH_MAX;
-	gsize	seg_size, to_go = 0, chunk;
-	gint	ifd, ofd, piece = 0;
-	OvwRes	ores;
+	const gchar		*format = gtk_entry_get_text(GTK_ENTRY(spi->nformat));
+	gchar			outnamePATH_MAX;
+	gsize			to_go = 0, chunk;
+	gint			piece = 0;
+	GFile			*fin, *fout;
+	GFileInputStream	*sin;
+	gpointer		tmp;
+	gboolean		ok = TRUE;
+
+	/* Make sure the name generator is updated and valid-seeming. */
+	namegenerator_configure(spi->namegen, spi);
+	if(spi->namegen->part_size == 0)
+		return 0;
+
+	if((fin = dp_get_file_from_row(src, row)) == NULL)
+		return 0;
+	if((sin = g_file_read(fin, NULL, error)) == NULL)
+	{
+		g_object_unref(fin);
+		return 0;
+	}
+	if((tmp = g_malloc(SPLIT_CHUNK)) == NULL)
+	{
+		g_object_unref(fin);
+		g_object_unref(sin);
+		return 0;
+	}
 
 	ovw_overwrite_begin(spi->min, _("\"%s\" Already Exists - Continue With Split?"), 0UL);
 
-	if((seg_size = sze_get_size(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(spi->sssize)->entry)))) > 0)
+	to_go = dp_row_get_size(dp_get_tree_model(src), row);
+	for(piece = 0; ok && to_go > 0; to_go -= chunk, piece++)
 	{
-		g_snprintf(inname, sizeof inname, "%s%s%s", src->dir.path, G_DIR_SEPARATOR_S, DP_ROW_NAME(row));
-		if((ifd = open(inname, O_RDONLY)) > 0)
+		if(to_go > spi->namegen->part_size)
+			chunk = spi->namegen->part_size;
+		else
+			chunk = to_go;
+		namegenerator_generate(spi->namegen, outname, sizeof outname, format, piece);
+		if((fout = g_file_get_child_for_display_name(dst->dir.root, outname, error)) != NULL)
 		{
-			to_go = DP_ROW_LSTAT(row).st_size;
-			while(to_go > 0)
+			GFileOutputStream	*sout;
+			OvwRes			ores;
+
+			ores  = ovw_overwrite_unary_file(dst, fout);
+			if(ores == OVW_CANCEL)
+				ok = FALSE;
+			else if(ores == OVW_SKIP)
+				ok = g_seekable_seek(G_SEEKABLE(sin), chunk, G_SEEK_CUR, NULL, error);
+			else if(ores == OVW_PROCEED_FILE || ores == OVW_PROCEED_DIR)
+				ok = del_delete_gfile(spi->min, fout, FALSE, error);
+			if(ok && (sout = g_file_create(fout, G_FILE_CREATE_NONE, NULL, error)) != NULL)
 			{
-				gboolean	doit = FALSE;
-
-				build_name(spi, dst, outname, piece++);
-				ores  = ovw_overwrite_file(spi->min, outname, dp_full_name(src, DP_ROW_INDEX(src, row)));
-				chunk = (to_go > seg_size) ? seg_size : to_go;
-				if(ores == OVW_CANCEL)
-					break;
-				else if(ores == OVW_SKIP)
-				{
-					if(lseek(ifd, chunk, SEEK_CUR) != (off_t) -1)
-						to_go -= chunk;
-					else
-						break;
-				}
-				else if(ores == OVW_PROCEED)
-					doit = TRUE;
-				else if(ores == OVW_PROCEED_FILE)
-					doit = del_delete_file(spi->min, outname);
-				else if(ores == OVW_PROCEED_DIR)
-					doit = del_delete_dir(spi->min, outname, FALSE);
-				if(doit)
-				{
-					if((ofd = open(outname, O_WRONLY | O_CREAT | O_TRUNC, DP_ROW_LSTAT(row).st_mode | S_IWUSR)) >= 0)
-					{
-						gsize	put;
-
-						put = fut_copy_partial(ifd, ofd, 1 << 18, chunk);
-						close(ofd);
-						if(put == 0)
-							break;
-						to_go -= put;
-					}
-					else
-						break;
-				}
+				ok = streams_splice_partial(G_OUTPUT_STREAM(sout), G_INPUT_STREAM(sin), chunk, tmp, SPLIT_CHUNK, error);
+				g_object_unref(sout);
 			}
-			close(ifd);
+			else
+				ok = FALSE;
+			g_object_unref(fout);
 		}
+		else
+			ok = FALSE;
 	}
-	ovw_overwrite_end(spi->min);
 
-	if(errno)
-		err_set(spi->min, errno, CMD_ID, spi->name);
+	ovw_overwrite_end(spi->min);
+	g_free(tmp);
+	g_object_unref(sin);
+	g_object_unref(fin);
 
-	return to_go == 0;
+	return ok;
 }
 
-static gint spt_action(MainInfo *min, DirPane *src, DirPane *dst, DirRow *row, gpointer user)
+static gint spt_action(MainInfo *min, DirPane *src, DirPane *dst, DirRow2 *row, GError **error, gpointer user)
 {
 	SplitInfo	*spi = user;
 	gint		ret = 0;
 
-	if(spi->curr_mode == 0)		/* Fixed-size split? */
-		ret = size_split(spi, src, dst, row);
-	else				/* Fixed amount split. */
-		dlg_dialog_async_new_simple(_("This splitting mode has not been\nimplemented yet... Sorry."), _("Beta Software"), _("Next Version?"), NULL, NULL);
-
-	if(ret)
-		dp_unselect(src, DP_ROW_INDEX(src, row));
+	if((ret = do_split(spi, src, dst, row, error)))
+		dp_unselect(src, row);
 
 	return ret;
 }
 
+static void spt_free(gpointer user)
+{
+	SplitInfo	*spi = user;
+
+	namegenerator_destroy(spi->namegen);
+	spi->namegen = NULL;
+}
+
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1998-07-09 -	Build widgetry needed to support splitting to fixed part size. */
-static void build_ss(SplitInfo *spi)
+static void evt_ss_combo_changed(GtkWidget *combo, gpointer user)
 {
-	GtkWidget	*hbox, *vbox, *label;
-	GList		*list = NULL;
+	update_preview(user);
+}
 
-	list = g_list_append(list, _("  1457000 bytes (3.5\" floppy)"));
-	list = g_list_append(list, _("100431360 bytes (Zip disk)"));
+/* 1998-07-09 -	Build widgetry needed to support splitting to fixed part size. */
+static GtkWidget * build_ss(SplitInfo *spi)
+{
+	GtkWidget	*frame, *hbox, *label;
 
-	spi->ssframe = gtk_frame_new(_("Fixed Size Split"));
-	vbox  = gtk_vbox_new(FALSE, 0);
+	frame = gtk_frame_new(_("Fixed Size Split"));
 	hbox  = gtk_hbox_new(FALSE, 0);
 	label = gtk_label_new(_("Segment Size"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	spi->sssize = gtk_combo_new();
-	gtk_combo_set_popdown_strings(GTK_COMBO(spi->sssize), list);
+	spi->sssize = gtk_combo_box_entry_new_text();
+	gtk_combo_box_append_text(GTK_COMBO_BOX(spi->sssize), _("1457000 bytes (3.5\" floppy)"));
+	gtk_combo_box_append_text(GTK_COMBO_BOX(spi->sssize), _("10485760 bytes (10 MB)"));
+	gtk_combo_box_append_text(GTK_COMBO_BOX(spi->sssize), _("26214400 bytes (25 MB)"));
+	gtk_combo_box_append_text(GTK_COMBO_BOX(spi->sssize), _("52428800 bytes (50 MB)"));
+	gtk_combo_box_append_text(GTK_COMBO_BOX(spi->sssize), _("78643200 bytes (75 MB)"));
+	gtk_combo_box_append_text(GTK_COMBO_BOX(spi->sssize), _("100431360 bytes (95 MB, Zip disk)"));
+	gtk_combo_box_set_active(GTK_COMBO_BOX(spi->sssize), 0);
+	g_signal_connect(G_OBJECT(spi->sssize), "changed", G_CALLBACK(evt_ss_combo_changed), spi);
 	gtk_box_pack_start(GTK_BOX(hbox), spi->sssize, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
 
-	gtk_container_add(GTK_CONTAINER(spi->ssframe), vbox);
-	gtk_box_pack_start(GTK_BOX(spi->vbox), spi->ssframe, TRUE, TRUE, 0);
+	gtk_container_add(GTK_CONTAINER(frame), hbox);
+
+	return frame;
+}
+
+static void evt_fc_spin_changed(GtkWidget *spin, gpointer user)
+{
+	update_preview(user);
+}
+
+/* 2010-07-22 -	Quite a while later, I actually got around to implementing the other split
+**		mode: fixed count (=number of parts).
+*/
+static GtkWidget * build_fc(SplitInfo *spi)
+{
+	GtkWidget	*frame, *hbox, *label;
+
+	frame = gtk_frame_new(_("Fixed Count Split"));
+
+	hbox = gtk_hbox_new(FALSE, 0);
+	label = gtk_label_new(_("Segment Count"));
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+	spi->fccount = gtk_spin_button_new_with_range(2, 1000, 1);	/* Incredibly arbitrary, yes. */
+	g_signal_connect(G_OBJECT(spi->fccount), "value_changed", G_CALLBACK(evt_fc_spin_changed), spi);
+	gtk_box_pack_start(GTK_BOX(hbox), spi->fccount, TRUE, TRUE, 0);
+
+	gtk_container_add(GTK_CONTAINER(frame), hbox);
+
+	return frame;
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
 /* 1998-09-01 -	Callback for mode option menu. */
-static gint evt_mode_select(GtkWidget *wid, gpointer user)
+static void evt_mode_select(GtkWidget *wid, guint index, gpointer user)
 {
 	SplitInfo	*spi = user;
 
-	spi->curr_mode = GPOINTER_TO_UINT(gtk_object_get_user_data(GTK_OBJECT(wid)));
-
-	return TRUE;
+	spi->curr_mode = index;
+	gtk_notebook_set_current_page(GTK_NOTEBOOK(spi->nbook), spi->curr_mode);
+	update_preview(spi);
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
+static void evt_nformat_insert(GtkEntryBuffer *buffer, guint position, gchar *chars, guint nchars, gpointer user)
+{
+	update_preview(user);
+}
+
+static void evt_nformat_delete(GtkEntryBuffer *buffer, guint position, guint nchars, gpointer user)
+{
+	update_preview(user);
+}
+
+static void evt_nformat_details_clicked(GtkWidget *button, gpointer user)
+{
+	/* FIXME: This data should, of course, be part of the dictionary-based interpolation
+	 * system, this is very un-DRY design. Something for a future refactoring, there's
+	 * also an obvious need (eh) to make the Split command and the regular Command config
+	 * use the same subsystem for managing their interpolation needs.
+	 */
+	static const struct {
+		const gchar	*symbol;
+		const gchar	*desc;
+	} sym_doc = {
+	{ "index", N_("Current part number, unique for every created file") },
+	{ "base", N_("The value from the Base box") },
+	{ "step", N_("The amount that index will change for each file") },
+	{ "num", N_("The total number of files that will be created") },
+	{ "last", N_("The value of index for the last file to be created") }
+	};
+	Dialog			*dlg;
+	GtkListStore		*store;
+	GtkTreeIter		iter;
+	GtkCellRenderer		*cr;
+	GtkTreeViewColumn	*vc;
+	GtkWidget		*scwin, *view;
+	gsize			i;
+
+	store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
+	for(i = 0; i < sizeof sym_doc / sizeof *sym_doc; i++)
+	{
+		gtk_list_store_append(store, &iter);
+		gtk_list_store_set(store, &iter, 0, sym_doci.symbol, 1, _(sym_doci.desc), -1);
+	}
+	scwin = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scwin), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+	view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+	gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(view)), GTK_SELECTION_BROWSE);
+	cr = gtk_cell_renderer_text_new();
+	vc = gtk_tree_view_column_new_with_attributes("(code)", cr, "text", 0, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(view), vc);
+	vc = gtk_tree_view_column_new_with_attributes("(description)", cr, "text", 1, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(view), vc);
+	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), FALSE);
+	gtk_widget_set_size_request(view, 380, 160);
+	gtk_container_add(GTK_CONTAINER(scwin), view);
+
+	dlg = dlg_dialog_sync_new(scwin, _("Pick Code"), NULL);
+	if(dlg_dialog_sync_wait(dlg) == DLG_POSITIVE)
+	{
+		SplitInfo	*spi = user;
+
+		if(gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(view)), NULL, &iter))
+		{
+			gchar	*code = NULL, buf1024;
+			gint	pos;
+
+			gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, &code, -1);
+			/* FIXME: We could be more intelligent here, and not add the braces if the cursor is after an opening brace. */
+			g_snprintf(buf, sizeof buf, "{%s}", code);
+			gtk_editable_insert_text(GTK_EDITABLE(spi->nformat), buf, -1, &pos);
+		}
+	}
+}
+
+static void evt_check_changed(GtkWidget *button, gpointer user)
+{
+	SplitInfo	*spi = user;
+
+	gtk_widget_set_sensitive(spi->nprec, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
+	update_preview(user);
+}
+
+static void evt_spin_changed(GtkWidget *button, gpointer user)
+{
+	update_preview(user);
+}
+
 gint cmd_split(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	static SplitInfo	spi;
+	static SplitInfo	spi = { 0 };
 	const gchar		*mode = { N_("Fixed size, variable number of parts"),
 					    N_("Fixed number of parts, variable sizes"),
 					    NULL };
-	GtkWidget	*hbox, *label;
-	GtkWidget	*hsep;
+	GtkWidget		*hbox, *label;
+	GtkWidget		*hsep, *exp, *scwin, *fdet;
+	GtkCellRenderer		*cr;
+	GtkTreeViewColumn	*vc;
 
-	spi.min	      = min;
-	spi.curr_mode = 0;
+	spi.min = min;
 	spi.vbox = gtk_vbox_new(FALSE, 0);
 	spi.label = gtk_label_new(_("Split"));
 
+	/* Build this early, since the signal handler references it. */
+	spi.nbook = gtk_notebook_new();
+	gtk_notebook_set_show_tabs(GTK_NOTEBOOK(spi.nbook), FALSE);
+	gtk_notebook_set_show_border(GTK_NOTEBOOK(spi.nbook), FALSE);
+	gtk_notebook_append_page(GTK_NOTEBOOK(spi.nbook), build_ss(&spi), NULL);
+	gtk_notebook_append_page(GTK_NOTEBOOK(spi.nbook), build_fc(&spi), NULL);
+
 	hbox = gtk_hbox_new(FALSE, 0);
 	label = gtk_label_new(_("Mode"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	spi.mode = gtk_option_menu_new();
 	gtk_box_pack_start(GTK_BOX(spi.vbox), spi.label, FALSE, FALSE, 0);
 	hsep = gtk_hseparator_new();
 	gtk_box_pack_start(GTK_BOX(spi.vbox), hsep, FALSE, FALSE, 4);
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(spi.mode), gui_build_menu(mode, GTK_SIGNAL_FUNC(evt_mode_select), &spi));
+	spi.mode = gui_build_combo_box(mode, G_CALLBACK(evt_mode_select), &spi);
 	gtk_box_pack_start(GTK_BOX(hbox), spi.mode, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(spi.vbox), hbox, FALSE, FALSE, 0);
 	spi.nhbox = gtk_hbox_new(FALSE, 0);
 	label = gtk_label_new(_("Name Format"));
 	gtk_box_pack_start(GTK_BOX(spi.nhbox), label, FALSE, FALSE, 2);
-	spi.nformat = gtk_entry_new_with_max_length(NFORMAT_LIMIT);
+	spi.nformat = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(spi.nformat), NFORMAT_LIMIT);
+	g_signal_connect(G_OBJECT(gtk_entry_get_buffer(GTK_ENTRY(spi.nformat))), "inserted_text", G_CALLBACK(evt_nformat_insert), &spi);
+	g_signal_connect(G_OBJECT(gtk_entry_get_buffer(GTK_ENTRY(spi.nformat))), "deleted_text", G_CALLBACK(evt_nformat_delete), &spi);
 	gtk_box_pack_start(GTK_BOX(spi.nhbox), spi.nformat, TRUE, TRUE, 0);
+	fdet = gui_details_button_new();
+	g_signal_connect(G_OBJECT(fdet), "clicked", G_CALLBACK(evt_nformat_details_clicked), &spi);
+	gtk_box_pack_start(GTK_BOX(spi.nhbox), fdet, FALSE, FALSE, 0);
 	label = gtk_label_new(_("Base"));
 	gtk_box_pack_start(GTK_BOX(spi.nhbox), label, FALSE, FALSE, 0);
-	spi.nbadj   = gtk_adjustment_new(0, 0, 31, 1, 16, 0.);
-	spi.nbase   = gtk_spin_button_new(GTK_ADJUSTMENT(spi.nbadj), 0, 0);
+	spi.nbadj = gtk_adjustment_new(0, 0, 999, 1, 16, 0.);
+	spi.nbase = gtk_spin_button_new(GTK_ADJUSTMENT(spi.nbadj), 0, 0);
+	g_signal_connect(G_OBJECT(spi.nbase), "value_changed", G_CALLBACK(evt_spin_changed), &spi);
 	gtk_box_pack_start(GTK_BOX(spi.nhbox), spi.nbase, FALSE, FALSE, 0);
 	label = gtk_label_new(_("Step"));
 	gtk_box_pack_start(GTK_BOX(spi.nhbox), label, FALSE, FALSE, 0);
-	spi.nsadj = gtk_adjustment_new(1, 1, 31, 1, 16, 0.);
+	spi.nsadj = gtk_adjustment_new(1, 1, 63, 1, 16, 0.);
 	spi.nstep = gtk_spin_button_new(GTK_ADJUSTMENT(spi.nsadj), 0, 0);
+	g_signal_connect(G_OBJECT(spi.nstep), "value_changed", G_CALLBACK(evt_spin_changed), &spi);
 	gtk_box_pack_start(GTK_BOX(spi.nhbox), spi.nstep, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(spi.vbox), spi.nhbox, FALSE, FALSE, 2);
 
-	build_ss(&spi);
+	hbox = gtk_hbox_new(FALSE, 0);
+	spi.nfill = gtk_check_button_new_with_label(_("Zero-Fill Numbers?"));
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(spi.nfill), TRUE);
+	g_signal_connect(G_OBJECT(spi.nfill), "toggled", G_CALLBACK(evt_check_changed), &spi);
+	gtk_box_pack_start(GTK_BOX(hbox), spi.nfill, TRUE, TRUE, 0);
+	label = gtk_label_new("Precision");
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+	spi.npadj = gtk_adjustment_new(3, 2, 9, 1, 3, 0.);
+	spi.nprec = gtk_hscale_new(GTK_ADJUSTMENT(spi.npadj));
+	gtk_scale_set_digits(GTK_SCALE(spi.nprec), 0);
+	gtk_scale_set_value_pos(GTK_SCALE(spi.nprec), GTK_POS_RIGHT);
+	g_signal_connect(G_OBJECT(spi.nprec), "value_changed", G_CALLBACK(evt_spin_changed), &spi);
+	gtk_box_pack_start(GTK_BOX(hbox), spi.nprec, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(spi.vbox), hbox, FALSE, FALSE, 0);
 
-	return cmd_generic(min, _("Split"), CGF_NOALL | CGF_NODIRS, spt_body, spt_action, NULL, &spi);
+	gtk_box_pack_start(GTK_BOX(spi.vbox), spi.nbook, FALSE, FALSE, 0);
+
+	spi.preview_store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+	spi.preview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(spi.preview_store));
+	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(spi.preview), TRUE);
+	cr = gtk_cell_renderer_text_new();
+	g_object_set(G_OBJECT(cr), "xalign", 1.0f, NULL);
+	vc = gtk_tree_view_column_new_with_attributes(_("Offset"), cr, "text", 0, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(spi.preview), vc);
+	cr = gtk_cell_renderer_text_new();
+	vc = gtk_tree_view_column_new_with_attributes(_("Name"), cr, "text", 1, NULL);
+	gtk_tree_view_column_set_sizing(vc, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(spi.preview), vc);
+	cr = gtk_cell_renderer_text_new();
+	g_object_set(G_OBJECT(cr), "xalign", 1.0f, NULL);
+	vc = gtk_tree_view_column_new_with_attributes(_("Size"), cr, "text", 2, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(spi.preview), vc);
+
+	exp = gtk_expander_new(_("Preview"));
+	scwin = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_container_add(GTK_CONTAINER(scwin), spi.preview);
+	gtk_container_add(GTK_CONTAINER(exp), scwin);
+	gtk_box_pack_start(GTK_BOX(spi.vbox), exp, TRUE, TRUE, 5);
+
+	return cmd_generic(min, _("Split"), CGF_NOALL | CGF_NODIRS, spt_body, spt_action, spt_free, &spi);
 }

gentoo-0.15.6.tar.bz2/src/cmd_swap.c -> gentoo-0.19.9.tar.gz/src/cmd_swap.c Changed

@@ -21,18 +21,15 @@
 **		path is displayed in a combo, and not a plain GtkEntry. Far less efficient
 **		now, though. Too bad.
 ** 2008-09-22 -	Changes for new path entry widget in GTK+ 2.0.
+** 2010-03-27 -	Totally stopped trying to be efficient, since it's hard to swap GtkTreeModels.
 */
 gint cmd_swap(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	DirContents	tmp;
+	gchar	tmpsizeof src->dir.path;
 
-	tmp = src->dir;
-	src->dir = dst->dir;
-	dst->dir = tmp;
-	dp_redisplay_preserve(src);
-	dph_state_restore(src);
-	dp_redisplay_preserve(dst);
-	dph_state_restore(dst);
+	g_strlcpy(tmp, src->dir.path, sizeof tmp);
+	dp_enter_dir(src, dst->dir.path);
+	dp_enter_dir(dst, tmp);
 
 	return 1;
 }
@@ -58,11 +55,9 @@
 /* 1998-08-27 -	Go to the same directory as the other (i.e. destination) pane. */
 gint cmd_fromother(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	dp_freeze(src);
 	dp_unselect_all(src);
 	csq_execute_format(min, "DirEnter 'dir=%s'", stu_escape(dst->dir.path));
 	get_selection(src, dst);
-	dp_thaw(src);
 
 	return 1;
 }
@@ -70,13 +65,11 @@
 /* 1998-09-20 -	Added this to complement the old DirOther command, which was also renamed. */
 gint cmd_toother(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	dp_freeze(dst);
 	dp_unselect_all(dst);
 	csq_execute(min, "ActivateOther");
 	csq_execute_format(min, "DirEnter 'dir=%s'", stu_escape(src->dir.path));
 	csq_execute(min, "ActivateOther");
 	get_selection(dst, src);
-	dp_thaw(dst);
 
 	return 1;
 }

gentoo-0.15.6.tar.bz2/src/cmd_symlink.c -> gentoo-0.19.9.tar.gz/src/cmd_symlink.c Changed

@@ -26,7 +26,6 @@
 	GtkWidget	*vbox;
 	GtkWidget	*name;		/* Entry for the name of the link (not editable unless creating new link). */
 	GtkWidget	*contents;	/* Entry for the contents of the link (with pick button for coolness). */
-	GtkWidget	*fsel;		/* File selector optionally used to set contents. */
 
 	MainInfo	*min;
 	DirPane		*src;
@@ -34,37 +33,29 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1999-05-30 -	Create a link called <name>, pointing at <contents>. If anything already
-**		exists under the name <name>, that anything will be silently deleted.
-*/
-static gboolean set_link(MainInfo *min, const gchar *name, const gchar *contents)
+/* 2009-09-19 -	Creates a symlink at <dfile>, pointing at <sfile>. */
+static gboolean set_link(MainInfo *min, const GFile *dfile, const GFile *sfile, GError **error)
 {
-	struct stat	stbuf;
+	gchar		*pn;
+	gboolean	ok = FALSE;
 
-	if(lstat(name, &stbuf) == 0)
+	if((pn = g_file_get_parse_name((GFile *) sfile)) != NULL)
 	{
-		gboolean	ok;
-
-		if(S_ISDIR(stbuf.st_mode))
-			ok = del_delete_dir(min, name, FALSE);
-		else
-			ok = del_delete_file(min, name);
-		if(!ok)
-		{
-			err_show(min);
-			return FALSE;
-		}
+		ok = g_file_make_symbolic_link((GFile *) dfile, pn, NULL, error);
+		g_free(pn);
 	}
-	return (symlink(contents, name) == 0) ? TRUE : FALSE;
+	return ok;
 }
 
 /* 1999-05-29 -	Create (absolute) symbolic links for all selected entries in <src> at <dst>. */
 gint cmd_symlink(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
 {
-	gchar	destPATH_MAX;
-	GSList	*slist, *iter;
-	OvwRes	res;
-	guint	num = 0;
+	GSList		*slist, *iter;
+	OvwRes		res;
+	guint		num = 0;
+	GFile		*dfile = NULL;
+	gboolean	ok = TRUE;
+	GError		*error = NULL;
 
 	err_clear(min);
 
@@ -75,76 +66,79 @@
 		return 1;
 
 	ovw_overwrite_begin(min, _("\"%s\" Already Exists - Continue With Link?"), OVWF_NO_RECURSE_TEST);
-	for(iter = slist; iter != NULL; iter = g_slist_next(iter))
+	for(iter = slist; ok && (iter != NULL); iter = g_slist_next(iter))
 	{
-		g_snprintf(dest, sizeof dest, "%s/%s", dst->dir.path, DP_SEL_NAME(iter));
-		res = ovw_overwrite_file(min, dest, dp_full_name(src, DP_SEL_INDEX(src, iter)));
+		if(dfile != NULL)
+			g_object_unref(dfile);
+		dfile = dp_get_file_from_name(dst, dp_row_get_name(dp_get_tree_model(src), iter->data));
+		res = ovw_overwrite_unary_file(dst, dfile);
 		if(res == OVW_SKIP)
 			continue;
 		else if(res == OVW_CANCEL)
 			break;
-		else if(res == OVW_PROCEED_FILE)
-		{
-			if(!del_delete_file(min, dest))
-				break;
-		}
-		else if(res == OVW_PROCEED_DIR)
+		else if(res == OVW_PROCEED_FILE || res == OVW_PROCEED_DIR)
 		{
-			if(!del_delete_dir(min, dest, FALSE))
+			if(!(ok = del_delete_gfile(min, dfile, FALSE, &error)))
 				break;
 		}
-
-		if(set_link(min, dest, dp_full_name(src, DP_SEL_INDEX(src, iter))))
+		ok = set_link(min, dfile, dp_get_file_from_row(src, iter->data), &error);
+		if(ok)
 		{
-			dp_unselect(src, DP_SEL_INDEX(src, iter));
+			dp_unselect(src, iter->data);
 			num++;
 		}
 		else
-		{
-			err_set(min, errno, "SymLink", DP_SEL_NAME(iter));
-			err_show(min);
-			break;
-		}
+			err_set_gerror(min, &error, "SymLink", dfile);
 	}
+	if(dfile != NULL)
+		g_object_unref(dfile);
 	ovw_overwrite_end(min);
 	dp_free_selection(slist);
 
 	if(num)
 		dp_rescan_post_cmd(dst);
-
-	return errno == 0;
+	return ok;
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
 /* 1999-05-30 -	Update generic command dialog for a new link. */
-static void link_body(MainInfo *min, DirPane *src, DirRow *row, gpointer user)
+static void link_body(MainInfo *min, DirPane *src, DirRow2 *row, gpointer gen, gpointer user)
 {
-	SleInfo	*sle = user;
+	SleInfo		*sle = user;
+	const gchar	*link;
 
-	gtk_entry_set_text(GTK_ENTRY(sle->name), DP_ROW_NAMED(row));
-	gtk_entry_set_text(GTK_ENTRY(sle->contents), DP_ROW_LINKNAMED(row));
-	gtk_entry_select_region(GTK_ENTRY(sle->contents), 0, -1);
+	gtk_entry_set_text(GTK_ENTRY(sle->name), dp_row_get_name_display(dp_get_tree_model(src), row));
+	link = dp_row_get_link_target(dp_get_tree_model(src), row);
+	gtk_entry_set_text(GTK_ENTRY(sle->contents), link);
+	gtk_editable_select_region(GTK_EDITABLE(sle->contents), 0, -1);
 	gtk_widget_grab_focus(sle->contents);
+
+	cmd_generic_track_entry(gen, sle->contents);
 }
 
-/* 1999-05-30 -	Change a link. */
-static gint link_action(MainInfo *min, DirPane *src, DirPane *dst, DirRow *row, gpointer user)
+/* 2009-09-19 -	Change a link. This is a GIO rewrite; it seems impossible to actually *change* an existing
+**		symbolic link in-place; GIO gives me a "file exists" error when I try. So let's just delete
+**		the existing link, and create a new one. Clumsy, but the semantics are right.
+*/
+static gint link_action(MainInfo *min, DirPane *src, DirPane *dst, DirRow2 *row, GError **error, gpointer user)
 {
-	gchar		bufPATH_MAX;
 	SleInfo		*sle = user;
-	const gchar	*name, *contents;
-
-	name = gtk_entry_get_text(GTK_ENTRY(sle->name));
-	g_snprintf(buf, sizeof buf, "%s/%s", src->dir.path, name);
-	contents = gtk_entry_get_text(GTK_ENTRY(sle->contents));
+	GFile		*sfile;
+	gboolean	ret;
 
-	if(set_link(min, buf, contents))
+	sfile = dp_get_file_from_row(src, row);
+	if((ret = del_delete_gfile(min, sfile, FALSE, error)) != 0)
 	{
-		dp_unselect(src, DP_ROW_INDEX(src, row));
-		return TRUE;
+		const gchar	*contents = gtk_entry_get_text(GTK_ENTRY(sle->contents));
+
+		ret = g_file_make_symbolic_link(sfile, contents, NULL, error);
 	}
-	return FALSE;
+	if(!ret)
+		err_set_gerror(min, error, "SymLink", sfile);
+	g_object_unref(sfile);
+
+	return ret;
 }
 
 /* 1999-05-30 -	Free the link GUI when the generic module is done with it. */
@@ -156,41 +150,49 @@
 	sle->vbox = NULL;
 }
 
-/* 1999-05-30 -	User clicked "OK" in file selector. Grab selection, and close it. */
-static void evt_fsel_ok_clicked(GtkWidget *btn, gpointer user)
-{
-	SleInfo	*sle = user;
-
-	gtk_entry_set_text(GTK_ENTRY(sle->contents), gtk_file_selection_get_filename(GTK_FILE_SELECTION(sle->fsel)));
-	gtk_grab_remove(sle->fsel);
-	gtk_widget_destroy(sle->fsel);
-}
-
-static void evt_fsel_cancel_clicked(GtkWidget *wid, gpointer user)
-{
-	SleInfo	*sle = user;
-
-	gtk_grab_remove(sle->fsel);
-	gtk_widget_destroy(sle->fsel);
-}
-
 /* 1999-05-30 -	User clicked the "details" button for setting link target from file selector. Pop it up. */
 static void evt_pick_clicked(GtkWidget *wid, gpointer user)
 {
 	const gchar	*text;
-	gchar		bufPATH_MAX;
 	SleInfo		*sle = user;
+	GtkWidget	*fsel;
+	gint		resp;
 
-	sle->fsel = gtk_file_selection_new(_("Select Link Target"));
-	if(((text = gtk_entry_get_text(GTK_ENTRY(sle->contents))) != NULL) && (*text != '\0'))
-		stu_strncpy(buf, text, sizeof buf);
-	else
-		g_snprintf(buf, sizeof buf, "%s/", sle->src->dir.path);
-	gtk_file_selection_set_filename(GTK_FILE_SELECTION(sle->fsel), buf);
-	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(sle->fsel)->ok_button), "clicked", G_CALLBACK(evt_fsel_ok_clicked), sle);
-	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(sle->fsel)->cancel_button), "clicked", G_CALLBACK(evt_fsel_cancel_clicked), sle);
-	gtk_widget_show(sle->fsel);
-	gtk_grab_add(sle->fsel);
+	fsel = gtk_file_chooser_dialog_new(_("Select Link Target"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE, _("OK"), GTK_RESPONSE_OK, _("Cancel"), GTK_RESPONSE_CANCEL, NULL);
+	text = gtk_entry_get_text(GTK_ENTRY(sle->contents));
+	if(text != NULL && *text != '\0')
+	{
+		/* Absolute-looking? */
+		if(strchr(text, G_DIR_SEPARATOR) != NULL)
+			gtk_file_chooser_set_uri(GTK_FILE_CHOOSER(fsel), text);
+		else
+		{
+			GFile	*child = g_file_get_child_for_display_name(sle->src->dir.root, text, NULL);
+
+			/* Try to find the actual target file in the same directory as the link, and move the chooser there. */
+			if(child != NULL)
+			{
+				gchar	*uri = g_file_get_uri(child);
+
+				gtk_file_chooser_set_uri(GTK_FILE_CHOOSER(fsel), uri);
+				g_free(uri);
+				g_object_unref(child);
+			}
+		}
+	}
+	resp = gtk_dialog_run(GTK_DIALOG(fsel));
+	gtk_widget_hide(fsel);
+	if(resp == GTK_RESPONSE_OK)
+	{
+		gchar	*sel = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fsel));
+
+		if(sel != NULL)
+		{
+			gtk_entry_set_text(GTK_ENTRY(sle->contents), sel);
+			g_free(sel);
+		}
+	}
+	gtk_widget_destroy(fsel);
 }
 
 /* 1999-05-30 -	Edit all selected symbolic links one at a time, or, if there is no selection,
@@ -200,6 +202,8 @@
 {
 	static SleInfo	sle;
 	GtkWidget	*label, *table, *pick;
+	Dialog		*dlg;
+	gboolean	ok = FALSE;
 
 	sle.min = min;
 	sle.src = src;
@@ -208,57 +212,61 @@
 	table = gtk_table_new(2, 3, FALSE);
 	label = gtk_label_new(_("Name"));
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1,  0,0,0,0);
-	sle.name = gtk_entry_new_with_max_length(FILENAME_MAX - 1);
+	sle.name = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(sle.name), FILENAME_MAX - 1);
 	gtk_table_attach(GTK_TABLE(table), sle.name, 1, 3, 0, 1,  GTK_EXPAND|GTK_FILL,0,0,0);
 	label = gtk_label_new(_("Contents"));
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2,  0,0,0,0);
-	sle.contents = gtk_entry_new_with_max_length(PATH_MAX - 1);
+	sle.contents = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(sle.contents), PATH_MAX - 1);
 	gtk_table_attach(GTK_TABLE(table), sle.contents, 1, 2, 1, 2,  GTK_EXPAND|GTK_FILL,0,0,0);
-	pick = gui_details_button_new(min->gui->window->window);
+	pick = gui_details_button_new();
 	g_signal_connect(G_OBJECT(pick), "clicked", G_CALLBACK(evt_pick_clicked), &sle);
 	gtk_table_attach(GTK_TABLE(table), pick, 2, 3, 1, 2,  0,0,0,0);
 	gtk_box_pack_start(GTK_BOX(sle.vbox), table, TRUE, TRUE, 0);
 
 	if(dp_has_selection(src))
 	{
-		gtk_entry_set_editable(GTK_ENTRY(sle.name), FALSE);
-		return cmd_generic(min, _("Edit Symbolic Link"), CGF_NOALL | CGF_SRC | CGF_LINKSONLY, link_body, link_action, link_free, &sle);
+		gtk_editable_set_editable(GTK_EDITABLE(sle.name), FALSE);
+		return cmd_generic(min, _("Edit Symbolic Link"), CGF_NOALL | CGF_LINKSONLY, link_body, link_action, link_free, &sle);
 	}
 	else
 	{
-		Dialog	*dlg;
-
+		/* No selection to edit, so create new symlink in the source pane. */
 		dlg = dlg_dialog_sync_new(sle.vbox, _("Create Symbolic Link"), NULL);
 		gtk_widget_grab_focus(sle.name);
 		if(dlg_dialog_sync_wait(dlg) == DLG_POSITIVE)
 		{
 			const gchar	*name, *contents;
-			gchar		bufPATH_MAX;
+			GFile		*sfile;
 			OvwRes		ores;
-			gint		doit = FALSE;
+			GError		*error = NULL;
 
+			/* If name contains slashes, treat it as a full URI, otherwise it's local. */
 			name = gtk_entry_get_text(GTK_ENTRY(sle.name));
-			if(strchr(name, G_DIR_SEPARATOR) != NULL)
-				stu_strncpy(buf, name, sizeof buf);
+			if(g_utf8_strchr(name, -1, G_DIR_SEPARATOR) != NULL)
+				sfile = g_vfs_parse_name(min->vfs.vfs, name);
 			else
-				g_snprintf(buf, sizeof buf, "%s/%s", src->dir.path, name);
+				sfile = dp_get_file_from_name(src, name);
 			contents = gtk_entry_get_text(GTK_ENTRY(sle.contents));
 			ovw_overwrite_begin(min, _("\"%s\" Already Exists - Continue With Link?"), 0UL);
-			ores = ovw_overwrite_file(min, buf, NULL);
+			ores = ovw_overwrite_unary_file(src, sfile);
 			if(ores == OVW_PROCEED)
-				doit = TRUE;
-			else if(ores == OVW_PROCEED_FILE)
-				doit = del_delete_file(min, buf);
-			else if(ores == OVW_PROCEED_DIR)
-				doit = del_delete_dir(min, buf, FALSE);
-			if(doit)
+				ok = TRUE;
+			else if(ores == OVW_PROCEED_FILE || ores == OVW_PROCEED_DIR)
+				ok = del_delete_gfile(min, sfile, FALSE, &error);
+			else
+				ok = FALSE;
+			if(ok)
 			{
-				if(set_link(min, buf, contents))
+				if((ok = g_file_make_symbolic_link(sfile, contents, NULL, &error)) != FALSE)
 					dp_rescan_post_cmd(src);
 			}
+			else
+				err_set_gerror(min, &error, "SymLink", sfile);
 			ovw_overwrite_end(min);
 		}
 		dlg_dialog_sync_destroy(dlg);
 	}
-	return 1;
+	return ok;
 }

gentoo-0.15.6.tar.bz2/src/cmd_viewtext.c -> gentoo-0.19.9.tar.gz/src/cmd_viewtext.c Changed

@@ -17,6 +17,7 @@
 #include <unistd.h>
 
 #include "cmdseq_config.h"
+#include "convstream.h"
 #include "dirpane.h"
 #include "errors.h"
 #include "fileutil.h"
@@ -27,8 +28,7 @@
 
 typedef struct {			/* Options for the "ViewText" command. */
 	gboolean	modified;
-	gboolean	use_mmap;			/* Use mmap() for files of non-zero length? */
-	gsize		buf_size;			/* Buffer size, when not using mmap(). */
+	gsize		buf_size;			/* Buffer size. */
 	gsize		check_size;			/* The ViewTextOrHex command inspects this many bytes. */
 	gboolean	exit_on_left;			/* Exit text reader on Left Arrow keypress? */
 } OptViewText;
@@ -38,38 +38,17 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1999-03-06 -	A general viewer-trampoline. Will view all currently selected files using
-**		the given viewing function.
-*/
-static gint view_selection(MainInfo *min, DirPane *dp, gint (*viewer)(MainInfo *min, const gchar *full_name))
-{
-	GSList	*slist, *iter;
-
-	if((slist = dp_get_selection(dp)) == NULL)
-		return 1;
-	for(iter = slist; iter != NULL; iter = g_slist_next(iter))
-	{
-		viewer(min, dp_full_name(dp, DP_SEL_INDEX(dp, iter)));
-		dp_unselect(dp, DP_SEL_INDEX(dp, iter));
-	}
-	dp_free_selection(slist);
-
-	return 1;
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
 /* 1998-05-19 -	Just open a window containing some text viewing widgetry.
 ** 1998-09-10 -	The creation of txi_open() above allowed this one to shrink from 50 to 5 lines, sort of.
 */
-static gint view_file_text(MainInfo *min, const gchar *full_name)
+static gint view_file_text(MainInfo *min, GFile *file, const gchar *encoding, GError **err)
 {
 	GtkWidget	*txv;
 
 	if((txv = txv_open(min, NULL)) != NULL)
 	{
 		txv_show(txv);
-		txv_text_load(txv, full_name, viewtext_options.use_mmap, viewtext_options.buf_size);
+		txv_text_load(txv, file, viewtext_options.buf_size, encoding, err);
 		txv_enable(txv);
 	}
 	return txv != NULL;
@@ -78,14 +57,14 @@
 /* ----------------------------------------------------------------------------------------- */
 
 /* 1998-12-18 -	View file in hex mode. */
-static gint view_file_hex(MainInfo *min, const gchar *full_name)
+static gint view_file_hex(MainInfo *min, GFile *file, const gchar *encoding, GError **err)
 {
 	GtkWidget	*txv;
 
 	if((txv = txv_open(min, NULL)) != NULL)
 	{
 		txv_show(txv);
-		txv_text_load_hex(txv, full_name);
+		txv_text_load_hex(txv, file, err);
 		txv_enable(txv);
 	}
 	return txv != NULL;
@@ -95,95 +74,115 @@
 
 /* 1999-02-03 -	Inspect the first bytes (check_size) for printability. If all are OK, return 1.
 **		Otherwise return 0. If an error occurs, -1 is returned.
-** 1999-02-19 -	No longer uses mmap(), tragically. I didn't feel like adding the necessary
-**		fall-back code (in case mmap() isn't supported on the file system).
-** 1999-05-29 -	Changed order of open() and size-check; now produces errno code if file not found.
+** 2010-02-28 -	Ported to GIO, some comments that no longer apply were removed.
+** 2010-07-20 -	Now tries to charset-convert the input, if that fails it's not text. Nice.
 */
-static gint file_is_text(MainInfo *min, const gchar *full_name)
+static gint file_is_text(MainInfo *min, GFile *file, const gchar *encoding, GError **err)
 {
-	gchar	*buf;
-	gint	fd, txt = -1;
-	gsize	size, i;
+	GFileInputStream	*is;
+	gboolean		txt = FALSE;
+
+	if(encoding == NULL)
+		encoding = convstream_get_default_encoding();
 
-	if((fd = open(full_name, O_RDONLY)) >= 0)
+	if((is = g_file_read(file, NULL, err)) != NULL)
 	{
-		if(fut_fsize(fd, &size))
+		gchar	*buf;
+		gssize	got;
+
+		buf = g_malloc(viewtext_options.check_size);
+		if((got = g_input_stream_read(G_INPUT_STREAM(is), buf, viewtext_options.check_size, NULL, err)) > 0)
 		{
-			gsize	got;
-
-			if(size == 0 || size > viewtext_options.check_size)
-				size = viewtext_options.check_size;
-			buf = g_malloc(size);
-			if((got = read(fd, buf, size)) > 0)
-			{
-				txt = 1;
-				for(i = 0; txt && (i < got); i++)
-				{
-					if((guchar) bufi < 7)
-						txt = 0;
-				}
-			}
-			g_free(buf);
+			gchar	*out = g_convert(buf, got, convstream_get_target_encoding(), encoding, NULL, NULL, NULL);
+
+			txt = (out != NULL);
+			g_free(out);
 		}
-		close(fd);
+		g_free(buf);
+		g_object_unref(is);
 	}
-	return txt;
+	return *err != NULL ? -1 : txt;
 }
 
 /* 1999-02-03 -	This function views a file named <full_name> as either ASCII text or hex data.
 **		Note that it does this by actually inspecting the first few bytes of the file,
 **		rather than using gentoo's type system. This makes it work for all files, even
 **		those of type "Unknown".
+** 2010-02-28 -	Ported to GIO.
 */
-static gint view_file_text_or_hex(MainInfo *min, const gchar *full_name)
+static gint view_file_text_or_hex(MainInfo *min, GFile *file, const gchar *encoding, GError **err)
 {
 	gint	res;
 
-	if((res = file_is_text(min, full_name)) >= 0)
+	if((res = file_is_text(min, file, encoding, err)) >= 0)
 	{
 		if(res == 0)
-			view_file_hex(min, full_name);
+			view_file_hex(min, file, NULL, err);
 		else
-			view_file_text(min, full_name);
-	}
-	else if(errno)
-	{
-		err_set(min, errno, "ViewText", full_name);
-		err_show(min);
+			view_file_text(min, file, encoding, err);
 	}
 	return res >= 0;
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1999-03-06 -	View selected files in plain text mode.
-** 1999-05-29 -	Now uses the command argument system to control plain/hex/auto modes, thus
-**		replacing the old ViewTextHex and ViewTextOrHex commands. Neater.
+/* 1999-03-06 -	A general viewer-trampoline. Will view all currently selected files using
+**		the given viewing function.
+** 2010-02-28 -	Ported to GIO and GTK+ 2.0.
 */
-gint cmd_viewtext(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
+static gint view_selection(MainInfo *min, DirPane *dp, gint (*viewer)(MainInfo *min, GFile *file, const gchar *encoding, GError **err), const gchar *encoding)
 {
-	const gchar	*sk;
-	guint		mode, skip = 0;
+	gboolean	ok = TRUE;
+	GSList		*slist, *iter;
+	GError		*err = NULL;
 
-	if((sk = car_keyword_get_value(ca, "skip", NULL)) != NULL)
+	if((slist = dp_get_selection(dp)) == NULL)
+		return 1;
+	for(iter = slist; ok && iter != NULL; iter = g_slist_next(iter))
 	{
-		gchar	*endptr;
+		GFile	*file;
 
-		skip = strtol(sk, &endptr, 0);
-		if(!*sk || *endptr)
-			skip = 0;
+		if((file = dp_get_file_from_row(dp, iter->data)) != NULL)
+		{
+			ok = viewer(min, file, encoding, &err);
+			if(ok)
+				dp_unselect(dp, iter->data);
+			else
+				err_set_gerror(min, &err, "ViewText", file);
+			g_object_unref(file);
+		}
 	}
-	mode = car_keyword_get_enum(ca, "mode", 1, "auto", "text", "hex");
+	dp_free_selection(slist);
+
+	return ok;
+}
+
+/* 1999-03-06 -	View selected files in plain text mode.
+** 1999-05-29 -	Now uses the command argument system to control plain/hex/auto modes, thus
+**		replacing the old ViewTextHex and ViewTextOrHex commands. Neater.
+*/
+gint cmd_viewtext(MainInfo *min, DirPane *src, DirPane *dst, const CmdArg *ca)
+{
+	const gchar	*encoding;
+	gint		mode;
+
+	encoding = car_keyword_get_value(ca, "encoding", "");
+	/* Map an empty encoding to NULL, which gives us the system's default. */
+	if(encoding != NULL && *encoding == '\0')
+		encoding = NULL;
+	mode = car_keyword_get_enum(ca, "mode", 1, "auto", "text", "hex", NULL);
 	switch(mode)
 	{
 		case 0:
-			return view_selection(min, src, view_file_text_or_hex);
+			return view_selection(min, src, view_file_text_or_hex, encoding);
 		case 1:
-			return view_selection(min, src, view_file_text);
+			return view_selection(min, src, view_file_text, encoding);
 		case 2:
-			return view_selection(min, src, view_file_hex);
+			return view_selection(min, src, view_file_hex, NULL);
+		default:
+			;
 	}
-	fprintf(stderr, "ViewText: Unknown viewing mode '%s'\n", car_keyword_get_value(ca, "mode", NULL));
+
 	return 0;
 }
 
@@ -196,14 +195,12 @@
 	{
 		/* Initialize options to legacy default values. */
 		viewtext_options.modified    = FALSE;
-		viewtext_options.use_mmap    = TRUE;
 		viewtext_options.buf_size    = (1 << 18);
 		viewtext_options.check_size  = (1 << 9);
 		viewtext_options.exit_on_left = TRUE;
 
 		viewtext_cmc = cmc_config_new("ViewText", &viewtext_options);
 		cmc_field_add_boolean(viewtext_cmc, "modified", NULL, offsetof(OptViewText, modified));
-		cmc_field_add_boolean(viewtext_cmc, "use_mmap", _("Use mmap() to Speed Loading?"), offsetof(OptViewText, use_mmap));
 		cmc_field_add_size(viewtext_cmc, "buf_size", _("Buffer Size"), offsetof(OptViewText, buf_size), 1024, (1 << 20), 1024);
 		cmc_field_add_size(viewtext_cmc, "check_size", _("Hex-Check First"), offsetof(OptViewText, check_size), 32, (1 << 16), 32);
 		cmc_field_add_boolean(viewtext_cmc, "exit_left", _("Exit on Left Arrow Key?"), offsetof(OptViewText, exit_on_left));

gentoo-0.15.6.tar.bz2/src/cmdgrab.c -> gentoo-0.19.9.tar.gz/src/cmdgrab.c Changed

@@ -8,7 +8,8 @@
 ** 1999-03-08 -	Did some changes due to seemingly different semantics in GTK+ 1.2.0. This
 **		requires handling of GDK_INPUT_EXCEPTION input condition (um, perhaps it
 **		did in 1.0.6 too, but it worked even if I didn't care).
-** 2008-05-16 -	Took a leap into the future, and ported to GIOChannels. 
+** 2008-05-16 -	Took a leap into the future, and ported to GIOChannels.
+** 2010-03-11 -	Sliced away lots of code, parent uses glib to get pipes set up, we just grab.
 */
 
 #include "gentoo.h"
@@ -30,68 +31,17 @@
 
 typedef struct {
 	MainInfo	*min;
-	pid_t		child;
-	GIOChannel	*stdout, *stderr;	/* Channels for stdout and stderr from child. */
+	GPid		child;
+	GIOChannel	*c_stdout, *c_stderr;	/* Channels for stdout and stderr from child. */
 	gint		fd_out, fd_err;		/* File descriptors for output & error channels. */
 	gint		tag_out, tag_err;	/* GTK+ input tags for those channels. */
-	gint		evt_del;		/* Delete event handler. */
+	gulong		evt_del;		/* Delete event handler. */
 	GdkColor	stderr_color;		/* Color used for stderr. */
 	GtkWidget	*txv;			/* Text viewing window. */
 } GrabInfo;
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1998-09-26 -	Given a command row, create two pipes (one for stdout and one for stderr)
-**		in the given fd-arrays. Returns 1 if everything is OK, 0 if something failed.
-*/
-gboolean cgr_grab_init(MainInfo *min, const CmdRow *row, gint fd_out2, gint fd_err2)
-{
-	if(row->type == CRTP_EXTERNAL)
-	{
-		if(row->extra.external.gflags & CGF_GRABOUTPUT)
-		{
-			if(pipe(fd_out) == 0)
-			{
-				if(pipe(fd_err) == 0)
-					return TRUE;
-				close(fd_out0);
-				close(fd_out1);
-			}
-			return FALSE;
-		}
-	}
-	return TRUE;		/* If we do nothing, we succeed. */
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1998-09-26 -	Connect the current process' stdout and stderr file descriptors to the correct
-**		ends of the two pipes <fd_out> and <fd_err>.
-**		This is run just after a fork (and before exec, of course).
-*/
-gboolean cgr_set_child_pipes(MainInfo *min, const CmdRow *row, gint fd_out2, gint fd_err2)
-{
-	if(row->type == CRTP_EXTERNAL && row->extra.external.gflags & CGF_GRABOUTPUT)
-	{
-		guint	bits = 0U;
-
-		if(close(STDOUT_FILENO) == 0)
-		{
-			if(dup(fd_outSTDOUT_FILENO) == STDOUT_FILENO)
-				bits |= (close(fd_outSTDIN_FILENO) == 0);
-		}
-		if(close(STDERR_FILENO) == 0)
-		{
-			if(dup(fd_errSTDOUT_FILENO) == STDERR_FILENO)
-				bits |= (close(fd_errSTDIN_FILENO) == 0) << 1;
-		}
-		return bits == 3U;
-	}
-	return TRUE;
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
 /* 1998-09-26 -	This gets called when the user tries to delete (i.e., close) the output
 **		window. We now need to disconnect the input grabbers, kill the child,
 **		free the grabinfo, and close the window. We don't do need to do much of
@@ -102,8 +52,9 @@
 {
 	GrabInfo	*gri = user;
 
+	txv_close(gri->txv);
 	kill(gri->child, SIGTERM);
-	gri->txv = NULL;
+	gri->txv = NULL;		/* This signals the I/O handler that the viewer is closed. */
 
 	return FALSE;
 }
@@ -115,7 +66,7 @@
 
 	if(event->keyval == GDK_Escape)
 	{
-		if((gri = gtk_object_get_data(GTK_OBJECT(wid), "gri")) != NULL)
+		if((gri = g_object_get_data(G_OBJECT(wid), "gri")) != NULL)
 		{
 			kill(gri->child, SIGTERM);
 			gri->txv = NULL;
@@ -149,7 +100,7 @@
 			if(gri->txv != NULL)
 			{
 				txv_show(gri->txv);
-				if(channel == gri->stdout)
+				if(channel == gri->c_stdout)
 					txv_text_append(gri->txv, line, linelen);
 				else
 					txv_text_append_with_color(gri->txv, line, linelen, &gri->stderr_color);
@@ -160,32 +111,36 @@
 	}
 	if((cond & G_IO_ERR) || (cond & G_IO_HUP))
 	{
-		if(channel == gri->stdout)
+		if(channel == gri->c_stdout)
 		{
 			g_source_remove(gri->tag_out);
-			g_io_channel_shutdown(gri->stdout, FALSE, NULL);
-			g_io_channel_unref(gri->stdout);
-			gri->stdout = NULL;
+			g_io_channel_shutdown(gri->c_stdout, FALSE, NULL);
+			g_io_channel_unref(gri->c_stdout);
+			gri->c_stdout = NULL;
 			close(gri->fd_out);
 			gri->fd_out = 0;
 		}
-		else if(channel == gri->stderr)
+		else if(channel == gri->c_stderr)
 		{
 			g_source_remove(gri->tag_err);
-			g_io_channel_shutdown(gri->stderr, FALSE, NULL);
-			g_io_channel_unref(gri->stderr);
-			gri->stderr = NULL;
+			g_io_channel_shutdown(gri->c_stderr, FALSE, NULL);
+			g_io_channel_unref(gri->c_stderr);
+			gri->c_stderr = NULL;
 			close(gri->fd_err);
 			gri->fd_err = 0;
 		}
-		if(gri->stdout == NULL && gri->stderr == NULL)
+		if(gri->c_stdout == NULL && gri->c_stderr == NULL)
 		{
 			if(gri->txv != NULL)			/* Window still open? */
 			{
-				gtk_signal_disconnect(GTK_OBJECT(gri->txv), gri->evt_del);
+				txv_connect_delete(gri->txv, NULL, NULL);
 				txv_connect_keypress(gri->txv, NULL, NULL);
 				txv_enable(gri->txv);
-				if(!GTK_WIDGET_REALIZED(gri->txv))
+#if GTK_CHECK_VERSION(2, 20, 0)
+				if(!gtk_widget_get_realized(gri->txv))
+#else
+				if(GTK_WIDGET_REALIZED(gri->txv))
+#endif
 					gtk_widget_destroy(gri->txv);
 			}
 			g_free(gri);
@@ -197,7 +152,7 @@
 /* 1998-09-26 -	Set up two GTK+ input listeners, one on <fd_out> and one on <fd_err>. Is
 **		cool (?) enough to share a single output window between these two channels.
 */
-static gboolean grab_output(MainInfo *min, const gchar *prog, pid_t child, gint fd_out, gint fd_err)
+gboolean cgr_grab_output(MainInfo *min, const gchar *prog, GPid child, gint fd_out, gint fd_err)
 {
 	gchar		bufMAXNAMLEN + 32;
 	GrabInfo	*gri;
@@ -210,22 +165,22 @@
 	gri->stderr_color.red = 0xfefeu;
 	gri->stderr_color.green = 0x1e1eu;
 	gri->stderr_color.blue = 0x1e1eu;
-	if((gri->stdout = g_io_channel_unix_new(fd_out)) != NULL)
+	if((gri->c_stdout = g_io_channel_unix_new(fd_out)) != NULL)
 	{
 		/*g_io_channel_set_buffered(gri->stdout, FALSE);*/
-		g_io_channel_set_buffer_size(gri->stdout, GRAB_CHUNK);
+		g_io_channel_set_buffer_size(gri->c_stdout, GRAB_CHUNK);
 		gri->fd_err = fd_err;
-		if((gri->stderr = g_io_channel_unix_new(fd_err)) != NULL)
+		if((gri->c_stderr = g_io_channel_unix_new(fd_err)) != NULL)
 		{
 			if((gri->txv = txv_open(min, NULL)) != NULL)
 			{
 				g_snprintf(buf, sizeof buf, _("Output of %s (pid %d)"), prog, (gint) child);
 				txv_set_label(gri->txv, buf);
-				gtk_object_set_data(GTK_OBJECT(gri->txv), "gri", gri);
-				gri->evt_del = g_signal_connect(G_OBJECT(gri->txv), "delete_event", G_CALLBACK(evt_grab_deleted), gri);
-				txv_connect_keypress(gri->txv, GTK_SIGNAL_FUNC(evt_grab_keypress), gri);
-				gri->tag_out = g_io_add_watch(gri->stdout, G_IO_IN | G_IO_PRI | G_IO_HUP, grab_callback, gri);
-				gri->tag_err = g_io_add_watch(gri->stderr, G_IO_IN | G_IO_PRI | G_IO_HUP, grab_callback, gri);
+				g_object_set_data(G_OBJECT(gri->txv), "gri", gri);
+				txv_connect_delete(gri->txv, G_CALLBACK(evt_grab_deleted), gri);
+				txv_connect_keypress(gri->txv, G_CALLBACK(evt_grab_keypress), gri);
+				gri->tag_out = g_io_add_watch(gri->c_stdout, G_IO_IN | G_IO_PRI | G_IO_HUP, grab_callback, gri);
+				gri->tag_err = g_io_add_watch(gri->c_stderr, G_IO_IN | G_IO_PRI | G_IO_HUP, grab_callback, gri);
 
 				return TRUE;
 			}
@@ -235,20 +190,3 @@
 
 	return FALSE;
 }
-
-/* 1998-09-26 -	Set up the pipes as is necessary in the parent end. */
-gboolean cgr_set_parent_pipes(MainInfo *min, const CmdRow *row, const gchar *prog, gint child, gint fd_out2, gint fd_err2)
-{
-	if(row->type == CRTP_EXTERNAL && row->extra.external.gflags & CGF_GRABOUTPUT)
-	{
-		gboolean	ok = FALSE;
-
-		if(close(fd_outSTDOUT_FILENO) == 0)
-		{
-			if(close(fd_errSTDOUT_FILENO) == 0)
-				ok = grab_output(min, prog, child, fd_outSTDIN_FILENO, fd_errSTDIN_FILENO);
-		}
-		return ok;
-	}
-	return TRUE;
-}

gentoo-0.15.6.tar.bz2/src/cmdgrab.h -> gentoo-0.19.9.tar.gz/src/cmdgrab.h Changed

gentoo-0.15.6.tar.bz2/src/cmdparse.c -> gentoo-0.19.9.tar.gz/src/cmdparse.c Changed

@@ -93,11 +93,10 @@
 {
 	DirPane		*dp = min->gui->cur_pane;
 	const gchar	*name;
-	gboolean	unsel = (strchr(code + 1, 'u') != NULL),
+	const gboolean	unsel = (strchr(code + 1, 'u') != NULL),
 			path  = (strchr(code + 1, 'p') != NULL),
 			dest  = (strchr(code + 1, 'd') != NULL),
 			quote = (strchr(code + 1, 'Q') == NULL);	/* Upper case for default-on. */
-	guint		cnt = 0U;
 	GSList		*slist, *iter;
 
 	if(dest)		/* User requested the destination pane? */
@@ -107,17 +106,16 @@
 
 	for(iter = slist; iter != NULL; iter = g_slist_next(iter))
 	{
-		name = quote ? dp_name_quoted(dp, DP_SEL_INDEX(dp, iter), path) : DP_SEL_NAME(iter);
+		name = quote ? dp_name_quoted(dp, iter->data, path) : dp_row_get_name(dp_get_tree_model(dp), iter->data);
+
+		if(iter != slist)
+			g_string_append_c(cstr, ' ');
 		g_string_append(cstr, name);
-		g_string_append_c(cstr, ' ');
-		cnt++;
 		if(unsel)
-			dp_unselect(dp, DP_SEL_INDEX(dp, iter));
+			dp_unselect(dp, iter->data);
 		if(code0 == 'f')		/* Only first? */
 			break;
 	}
-	if(cnt > 0)
-		g_string_truncate(cstr, cstr->len - 1);		/* Lose last space. */
 	dp_free_selection(slist);
 }
 
@@ -147,7 +145,57 @@
 			fprintf(stderr, "**CMDPARSE: Illegal path code '%s'\n", code + 1);
 	}
 	if(path != NULL)
+	{
+		if(strncmp(path, "file://", 7) == 0)
+			path += 7;
 		g_string_append(cstr, path);
+	}
+}
+
+/* 2010-03-14 -	Parse a {u} code to look up an URI. */
+static void parse_code_uri(MainInfo *min, GString *cstr, const gchar *code)
+{
+	DirPane		*dp = min->gui->cur_pane;
+	const gboolean	single = code0 == 'u',
+			unsel = (strchr(code + 1, 'u') != NULL),
+			dest  = (strchr(code + 1, 'd') != NULL),
+			quote = (strchr(code + 1, 'Q') == NULL);	/* Upper case for default-on. */
+	GSList		*slist, *iter;
+
+	if(dest)		/* User requested the destination pane? */
+		dp = dp_mirror(min, dp);
+	if((slist = dp_get_selection(dp)) == NULL)
+		return;
+
+	for(iter = slist; iter != NULL; iter = g_slist_next(iter))
+	{
+		GFile	*child;
+
+		child = dp_get_file_from_row(dp, iter->data);
+		if(child != NULL)
+		{
+			gchar	*uri;
+
+			if((uri = g_file_get_uri(child)) != NULL)
+			{
+				if(iter != slist)
+					g_string_append_c(cstr, ' ');
+				if(quote)
+					g_string_append_c(cstr, '"');
+				g_string_append(cstr, uri);
+				if(quote)
+					g_string_append_c(cstr, '"');
+				if(unsel)
+					dp_unselect(dp, iter->data);
+				if(code0 == 'f')		/* Only first? */
+					break;
+				g_free(uri);
+			}
+			if(single)
+				break;
+		}
+	}
+	dp_free_selection(slist);
 }
 
 /* 1998-09-25 -	Parse an environment variable lookup-code, {$...}.
@@ -261,7 +309,7 @@
 			parse_code(dlg->min, dstr, tmp->str, dlg, FALSE);
 			g_string_free(tmp, TRUE);
 			gtk_entry_set_text(GTK_ENTRY(ent), dstr->str);
-			gtk_entry_select_region(GTK_ENTRY(ent), 0, -1);
+			gtk_editable_select_region(GTK_EDITABLE(ent), 0, -1);
 			g_string_free(dstr, TRUE);
 		}
 	}
@@ -275,10 +323,9 @@
 */
 static gint evt_menu_activated(GtkWidget *wid, gpointer user)
 {
-	CmdInp	*inp;
+	CmdInp	*inp = user;
 
-	if((inp = gtk_object_get_user_data(GTK_OBJECT(wid))) != NULL)
-		inp->inp.menu.current = GPOINTER_TO_INT(user);
+	inp->inp.menu.current = gtk_combo_box_get_active(GTK_COMBO_BOX(wid));
 
 	return TRUE;
 }
@@ -288,14 +335,12 @@
 */
 static gint build_input_menu(CmdDlg *dlg, const gchar *def, CmdInp *inp)
 {
-	GtkWidget	*obtn, *menu, *item;
+	GtkWidget	*combo;
 	const gchar	*itext, *colon;
-	gint		index = 0;
 
 	if(*def != '=')
 		return 0;
-	obtn = gtk_option_menu_new();
-	menu = gtk_menu_new();
+	combo = gtk_combo_box_new_text();
 	inp->type = CITP_MENU;
 	inp->inp.menu.items = NULL;
 	inp->inp.menu.current = 0;
@@ -305,20 +350,18 @@
 		{
 			gchar	tmp2048;
 
-			stu_strncpy(tmp, itext, sizeof tmp);
+			g_strlcpy(tmp, itext, sizeof tmp);
 			tmpcolon - itext = '\0';
-			item = gtk_menu_item_new_with_label(tmp);
+			gtk_combo_box_append_text(GTK_COMBO_BOX(combo), tmp);
 		}
 		else
-			item = gtk_menu_item_new_with_label(itext);
+			gtk_combo_box_append_text(GTK_COMBO_BOX(combo), itext);
 
-		gtk_object_set_user_data(GTK_OBJECT(item), inp);
 		inp->inp.menu.items = g_list_append(inp->inp.menu.items, (gpointer) itext);
-		g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(evt_menu_activated), GINT_TO_POINTER(index++));
-		gtk_menu_append(GTK_MENU(menu), item);
 	}
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(obtn), menu);
-	pack_input_widget(dlg, obtn, 1, 0);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
+	g_signal_connect(G_OBJECT(combo), "changed", G_CALLBACK(evt_menu_activated), inp);
+	pack_input_widget(dlg, combo, 1, 0);
 	return 1;
 }
 
@@ -329,29 +372,17 @@
 {
 	GtkWidget	*combo;
 	const gchar	*itext;
-	GList		*item = NULL, *iter;
 
 	if(*def != '=')
 		return 0;
 
-	combo = gtk_combo_new();
-	/* Configure the combo to work the way I like it to. */
-	gtk_combo_set_value_in_list(GTK_COMBO(combo), FALSE, TRUE);
-	gtk_combo_set_use_arrows_always(GTK_COMBO(combo), TRUE);
+	combo = gtk_combo_box_new_text();
 	while((def = stu_scan_string(def, &itext)) != NULL)
-		item = g_list_append(item, (gpointer) itext);
-	if(item != NULL)
-	{
-		inp->type = CITP_COMBO;
-		gtk_combo_set_popdown_strings(GTK_COMBO(combo), item);
-		for(iter = item; iter != NULL; iter = g_list_next(iter))
-			g_free(iter->data);
-		g_list_free(item);
-		pack_input_widget(dlg, inp->inp.combo.combo = combo, 1, 0);
-		return 1;
-	}
-	gtk_widget_destroy(combo);
-	return 0;
+		gtk_combo_box_append_text(GTK_COMBO_BOX(combo), itext);
+	inp->type = CITP_COMBO;
+	pack_input_widget(dlg, inp->inp.combo.combo = combo, 1, 0);
+
+	return 1;
 }
 
 /* 1999-02-27 -	Build a label for the input window. This replaces the old single label, which was
@@ -482,41 +513,53 @@
 	}
 }
 
-/* 1998-09-25 -	Get a pointer to a string representation of row <row> in dialog <dlg>. */
-static const gchar * eval_input(CmdDlg *dlg, gint row)
+/* 1998-09-25 -	Get a pointer to a string representation of row <row> in dialog <dlg>.
+** 2010-05-16 -	Don't return text pointers; append to the given GString, return FALSE on failure.
+*/
+static gboolean eval_and_append_input(CmdDlg *dlg, gint row, GString *out)
 {
 	GList	*data;
+	gchar	*tmp;
 
 	if(row >= 0 && row < dlg->row)
 	{
 		switch(dlg->inputrow.type)
 		{
 			case CITP_STRING:
-				return gtk_entry_get_text(GTK_ENTRY(dlg->inputrow.inp.string.entry));
+				g_string_append(out, gtk_entry_get_text(GTK_ENTRY(dlg->inputrow.inp.string.entry)));
+				return TRUE;
 			case CITP_MENU:
 				if((data = g_list_nth(dlg->inputrow.inp.menu.items, dlg->inputrow.inp.menu.current)) != NULL)
 				{
 					gchar	*colon;
 
 					if((colon = strchr(data->data, ':')) != NULL)
-						return colon + 1;
-					return data->data;
+						g_string_append(out, colon + 1);
+					else
+						g_string_append(out, data->data);
+					return TRUE;
 				}
-				return NULL;
+				return FALSE;
 			case CITP_COMBO:
-				return gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(dlg->inputrow.inp.combo.combo)->entry));
-			case CITP_LABEL:
-				break;		/* Just to keep the compiler happy. Labels don't generate INPxx's. */
+				tmp = gtk_combo_box_get_active_text(GTK_COMBO_BOX(dlg->inputrow.inp.combo.combo));
+				g_string_append(out, tmp);
+				g_free(tmp);
+				return TRUE;
 			case CITP_CHECKBOX:
-				return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dlg->inputrow.inp.checkbox.check)) ?
-					dlg->inputrow.inp.checkbox.active : dlg->inputrow.inp.checkbox.inactive;
+				if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dlg->inputrow.inp.checkbox.check)))
+					g_string_append(out, dlg->inputrow.inp.checkbox.active);
+				else
+					g_string_append(out, dlg->inputrow.inp.checkbox.inactive);
+				return TRUE;
+			case CITP_LABEL:
+				return TRUE;		/* Just to keep the compiler happy. Labels don't generate INPxx's. */
 		}
 	}
-	return NULL;
+	return FALSE;
 }
 
 /* 1999-02-24 -	Interpolate any INP-fields into <cstr>, by grabbing data from <dlg>.
-**		For simplicity, done in two steps with an intermediate scratch string.
+ **		For simplicity, done in two steps with an intermediate scratch string.
 */
 static void interpolate_input(GString *cstr, CmdDlg *dlg)
 {
@@ -529,7 +572,7 @@
 	{
 		if(sscanf(ptr, INP_PATTERN, &row) == 1)
 		{
-			g_string_append(scratch, eval_input(dlg, row));
+			eval_and_append_input(dlg, row, scratch);
 			ptr += INP_PAT_LEN;
 		}
 		else
@@ -635,6 +678,8 @@
 					parse_code_file(min, cstr, code);
 				else if(code0 == 'P')
 					parse_code_path(min, cstr, code);
+				else if(code0 == 'u' || code0 == 'U')
+					parse_code_uri(min, cstr, code);
 				else if(code0 == '$')
 					parse_code_env(min, cstr, code);
 				else if(code0 == '#')

gentoo-0.15.6.tar.bz2/src/cmdseq.c -> gentoo-0.19.9.tar.gz/src/cmdseq.c Changed

@@ -181,7 +181,7 @@
 
 	if((cs = g_malloc(sizeof *cs)) != NULL)
 	{
-		stu_strncpy(cs->name, name, sizeof cs->name);
+		g_strlcpy(cs->name, name, sizeof cs->name);
 		cs->flags = flags;
 		cs->rows  = NULL;
 	}
@@ -197,7 +197,7 @@
 
 	if((dst = g_malloc(sizeof *dst)) != NULL)
 	{
-		stu_strncpy(dst->name, src->name, sizeof dst->name);
+		g_strlcpy(dst->name, src->name, sizeof dst->name);
 		dst->flags = src->flags;
 		dst->rows = NULL;
 		for(iter = src->rows; iter != NULL; iter = g_list_next(iter))
@@ -225,7 +225,7 @@
 		g_hash_table_remove(hash, cs->name);
 		csq_cmdseq_filter_name(cs->name, name);
 		if(cs->name0 == '\0' || g_hash_table_lookup(hash, cs->name) != NULL)
-			stu_strncpy(cs->name, csq_cmdseq_unique_name(hash), sizeof cs->name);
+			g_strlcpy(cs->name, csq_cmdseq_unique_name(hash), sizeof cs->name);
 		csq_cmdseq_hash(&hash, cs);
 	}
 }
@@ -390,11 +390,6 @@
 			return FALSE;
 	}
 
-	if(flags & CBAF_CD_SOURCE)
-		fut_cd(src->dir.path, NULL, 0);
-	else if(flags & CBAF_CD_DEST)
-		fut_cd(dst->dir.path, NULL, 0);
-
 	if(flags & CBAF_RESCAN_SOURCE)
 		dp_rescan_post_cmd(src);
 	if(flags & CBAF_RESCAN_DEST)
@@ -426,58 +421,68 @@
 */
 static gint fork_and_execute(MainInfo *min, CmdRow *row, gchar **argv)
 {
-	pid_t	child;
-	gint	estat, fd_out2, fd_err2;
-	CX_Ext	*ext = &row->extra.external;
-
-	if(!fut_locate_executable(g_getenv("PATH"), argv0))
-	{
-		err_set(min, errno, "Execute", argv0);
-		return 0;
-	}
+	GPid		child;
+	gchar		*working_directory = NULL;
+	gboolean	capture, ok;
+	gint		fd_out, fd_err, *fd_out_ptr = NULL, *fd_err_ptr = NULL;
+	CX_Ext		*ext = &row->extra.external;
+	GError		*err = NULL;
 
 	if(ext->gflags & CGF_KILLPREV)
 		chd_kill_child(argv0);
 
-	if(!cgr_grab_init(min, row, fd_out, fd_err))
-		return 0;
-
 	if(!csq_handle_ba_flags(min, ext->baflags0))
 		return 0;
 
-	if((child = fork()) >= 0)
+	/* Figure out where to CD, if requested and sensible. */
+	if(ext->baflags0 & CBAF_CD_SOURCE)
 	{
-		if(child == 0)		/* In child process? */
-		{
-			if(cgr_set_child_pipes(min, row, fd_out, fd_err))
-			{
-				estat = execvp(argv0, argv);
-			}
-			usleep(50000);				/* Someone, sue me. */
-			_exit(CHD_EXIT_FAILURE);
-		}
-		else			/* In parent. */
-		{
-			chd_register(argv0, child, ext->gflags, ext->baflags1);
-			cgr_set_parent_pipes(min, row, argv0, child, fd_out, fd_err);
-			kill(getpid(), SIGCHLD);		/* Resolves race condition? */
-		}
+		if(g_file_is_native(min->gui->cur_pane->dir.root))
+			working_directory = g_file_get_path(min->gui->cur_pane->dir.root);
+	}
+	else if(ext->baflags0 & CBAF_CD_DEST)
+	{
+		GFile	*droot = min->gui->pane1 - min->gui->cur_pane->index.dir.root;
+		if(g_file_is_native(droot))
+			working_directory = g_file_get_path(droot);
 	}
-	err_show(min);
-	return errno == 0;
+
+	capture = (row->type == CRTP_EXTERNAL && row->extra.external.gflags & CGF_GRABOUTPUT);
+	if(capture)
+	{
+		fd_out_ptr = &fd_out;
+		fd_err_ptr = &fd_err;
+	}
+	if((ok = g_spawn_async_with_pipes(working_directory, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, &child, NULL, fd_out_ptr, fd_err_ptr, &err)))
+	{
+		chd_register(argv0, child, ext->gflags, ext->baflags1);
+		if(capture)
+			cgr_grab_output(min, argv0, child, fd_out, fd_err);
+	}
+	if(working_directory != NULL)
+		g_free(working_directory);
+	if(!ok)
+	{
+		if(err)
+			err_set_gerror(min, &err, argv0, NULL);
+		else
+			err_set(min, -1, argv0, NULL);
+	}
+	return ok;
 }
 
 /* 1998-09-25 -	Execute an external command. */
 static gint execute_external(MainInfo *min, CmdRow *row)
 {
 	gchar	**argv;
+	gint	ok = 0;
 
 	if((argv = cpr_parse(min, row->def->str)) != NULL)
 	{
-		fork_and_execute(min, row, argv);
+		ok = fork_and_execute(min, row, argv);
 		cpr_free(argv);
 	}
-	return 1;
+	return ok;
 }
 
 /* 1998-09-25 -	Execute a single row, returning success or failure. */
@@ -553,13 +558,19 @@
 gint csq_execute(MainInfo *min, const gchar *name)
 {
 	CmdSeq	*cs;
+	gint	ok;
 
 	if((name == NULL) || (*name == '\0'))
 		return 0;
 
 	if((min->cfg.commands.cmdseq != NULL) && ((cs = (CmdSeq *) g_hash_table_lookup(min->cfg.commands.cmdseq, name)) != NULL))
-		return cmdseq_execute(min, cs);
-	return execute_builtin(min, name);
+		ok = cmdseq_execute(min, cs);
+	else
+		ok = execute_builtin(min, name);
+	if(!ok)
+		err_show(min);
+
+	return ok;
 }
 
 /* 1999-06-06 -	Build a command from a printf()-style format string and suitable arguments, then
@@ -731,6 +742,7 @@
 	csq_add_builtin(min, "DpFocusPath",	cmd_dpfocuspath,	NULL);
 	csq_add_builtin(min, "DpFocusISrch",	cmd_dpfocusisrch,	cfg_dpfocusisrch);
 	csq_add_builtin(min, "DpGotoRow",	cmd_dpgotorow,		NULL);
+	csq_add_builtin(min, "DpMaximize",	cmd_dpmaximize,		NULL);
 
 	csq_add_builtin(min, "ActivateOther",	cmd_activateother,	NULL);
 	csq_add_builtin(min, "ActivateLeft",	cmd_activateleft,	NULL);
@@ -744,7 +756,7 @@
 	csq_add_builtin(min, "Move",		cmd_move,		NULL);
 	csq_add_builtin(min, "MoveAs",		cmd_moveas,		NULL);
 	csq_add_builtin(min, "Delete",		cmd_delete,		cfg_delete);
-	csq_add_builtin(min, "Rename",		cmd_rename,		NULL);
+	csq_add_builtin(min, "Rename",		cmd_rename,		cfg_rename);
 	csq_add_builtin(min, "RenameRE",	cmd_renamere,		NULL);
 	csq_add_builtin(min, "RenameSeq",	cmd_renameseq,		NULL);
 	csq_add_builtin(min, "ChMod",		cmd_chmod,		NULL);
@@ -781,6 +793,7 @@
 
 	csq_add_builtin(min, "About",		cmd_about,		NULL);
 	csq_add_builtin(min, "Run",		cmd_run,		NULL);
+	csq_add_builtin(min, "Rerun",		cmd_rerun,		NULL);
 	csq_add_builtin(min, "Configure",	cmd_configure,		cfg_configurecmd);
 	csq_add_builtin(min, "ConfigureSave",	cmd_configuresave,	NULL);
 	csq_add_builtin(min, "Quit", 		cmd_quit,		NULL);

gentoo-0.15.6.tar.bz2/src/cmdseq_config.c -> gentoo-0.19.9.tar.gz/src/cmdseq_config.c Changed

@@ -13,6 +13,7 @@
 #include "color_dialog.h"
 #include "dialog.h"
 #include "guiutil.h"
+#include "list_dialog.h"
 #include "odmultibutton.h"
 #include "sizeutil.h"
 #include "strutil.h"
@@ -30,7 +31,7 @@
 	GList		*fields;
 };
 
-typedef enum { CFT_INTEGER = 0, CFT_BOOLEAN, CFT_ENUM, CFT_SIZE, CFT_STRING, CFT_COLOR } CFType;
+typedef enum { CFT_INTEGER = 0, CFT_BOOLEAN, CFT_ENUM, CFT_SIZE, CFT_STRING, CFT_COLOR, CFT_PATH } CFType;
 
 typedef struct {
 	gint	min, max;
@@ -44,6 +45,7 @@
 
 typedef struct {
 	gsize	size;
+	gunichar	separator;		/* Used for CFT_PATH. */
 } CFStr;
 
 typedef struct {
@@ -88,7 +90,7 @@
 	CmdCfg	*cmc;
 
 	cmc = g_malloc(sizeof *cmc);
-	stu_strncpy(cmc->name, cmdname, sizeof cmc->name);
+	g_strlcpy(cmc->name, cmdname, sizeof cmc->name);
 	cmc->base   = base_instance;
 	cmc->fields = NULL;
 
@@ -135,6 +137,7 @@
 					xml_put_uinteger(out, fld->name, *(guint *) ((gchar *) cmc->base + fld->offset));
 					break;
 				case CFT_STRING:
+				case CFT_PATH:
 					xml_put_text(out, fld->name, (gchar *) cmc->base + fld->offset);
 					break;
 				case CFT_COLOR:
@@ -180,6 +183,7 @@
 					}
 					break;
 				case CFT_STRING:
+				case CFT_PATH:
 					xml_get_text_copy(node, fld->name, (gchar *) cmc->base + fld->offset, fld->field.string.size);
 					break;
 				case CFT_COLOR:
@@ -264,7 +268,7 @@
 
 	fld->type = type;
 	if(name != NULL)
-		stu_strncpy(fld->name, name, sizeof fld->name);
+		g_strlcpy(fld->name, name, sizeof fld->name);
 	if(desc != NULL)
 		fld->desc = strdup(desc);
 	else
@@ -371,6 +375,20 @@
 	}
 }
 
+void cmc_field_add_path(CmdCfg *cmc, const gchar *name, const gchar *desc, gsize offset, gsize size, gunichar separator)
+{
+	if(cmc != NULL)
+	{
+		CField	*fld = field_new(CFT_PATH, name, desc, offset);
+
+		/* Sneaky: use the 'string' member for CFT_PATH, too. */
+		fld->field.string.size = size;
+		fld->field.string.separator = separator;
+
+		field_add(cmc, fld);
+	}
+}
+
 void cmc_field_add_color(CmdCfg *cmc, const gchar *name, const gchar *desc, gsize offset)
 {
 	if(cmc != NULL)
@@ -396,24 +414,24 @@
 /* ----------------------------------------------------------------------------------------- */
 
 /* 1999-04-05 -	Attach some data handy to have in event handlers. */
-static void set_object_data(GtkObject *obj, CField *fld, gpointer instance)
+static void set_object_data(GObject *obj, CField *fld, gpointer instance)
 {
 	if(obj != NULL)
 	{
-		gtk_object_set_data(obj, "field", fld);
-		gtk_object_set_data(obj, "instance", instance);
+		g_object_set_data(obj, "field", fld);
+		g_object_set_data(obj, "instance", instance);
 	}
 }
 
 /* 1999-04-05 -	Retrieve the data set by set_object_data() above. */
-static void get_object_data(GtkObject *obj, CField **fld, gpointer *instance)
+static void get_object_data(GObject *obj, CField **fld, gpointer *instance)
 {
 	if(obj != NULL)
 	{
 		if(fld != NULL)
-			*fld = gtk_object_get_data(obj, "field");
+			*fld = g_object_get_data(obj, "field");
 		if(instance != NULL)
-			*instance = gtk_object_get_data(obj, "instance");
+			*instance = g_object_get_data(obj, "instance");
 	}
 }
 
@@ -449,7 +467,7 @@
 	CField		*fld = NULL;
 	gpointer	instance = NULL;
 
-	get_object_data(GTK_OBJECT(wid), &fld, &instance);
+	get_object_data(G_OBJECT(wid), &fld, &instance);
 
 	if((cmc != NULL) && (fld != NULL) && (instance != NULL))
 	{
@@ -467,10 +485,10 @@
 		CField		*fld = NULL;
 		gpointer	instance = NULL;
 
-		get_object_data(GTK_OBJECT(wid), &fld, &instance);
+		get_object_data(G_OBJECT(wid), &fld, &instance);
 		if(cmc && fld && instance)
 		{
-			*(gint *) ((gchar *) instance + fld->offset) = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(wid), "value"));
+			*(gint *) ((gchar *) instance + fld->offset) = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(wid), "value"));
 			set_modified(cmc, instance, TRUE);
 		}
 	}
@@ -484,20 +502,20 @@
 	CField		*fld;
 	gpointer	instance;
 
-	get_object_data(GTK_OBJECT(wid), &fld, &instance);
+	get_object_data(G_OBJECT(wid), &fld, &instance);
 
 	if((cmc != NULL) && (fld != NULL) && (instance != NULL))
 	{
 		const gchar	*text;
 
 		if((text = gtk_entry_get_text(GTK_ENTRY(wid))) != NULL)
-			stu_strncpy((gchar *) instance + fld->offset, text, fld->field.string.size);
+			g_strlcpy((gchar *) instance + fld->offset, text, fld->field.string.size);
 		set_modified(cmc, instance, TRUE);
 	}
 	return TRUE;
 }
 
-static gint evt_size_changed(GtkObject *obj, gpointer user)
+static gint evt_size_changed(GObject *obj, gpointer user)
 {
 	CmdCfg		*cmc = user;
 	CField		*fld;
@@ -509,13 +527,13 @@
 	{
 		gchar		buf32;
 		gsize		value = GTK_ADJUSTMENT(obj)->value;
-		GtkWidget	*label = gtk_object_get_data(obj, "label");
+		GtkWidget	*label = g_object_get_data(obj, "label");
 
 		value *= fld->field.size.step;
 		if(fld->field.size.step >= 512)
-			sze_put_size(buf, sizeof buf, value, SZE_KB);
+			sze_put_offset(buf, sizeof buf, value, SZE_KB, 0, ',');
 		else
-			sze_put_size(buf, sizeof buf, value, SZE_BYTES);
+			sze_put_offset(buf, sizeof buf, value, SZE_BYTES, 0, ',');
 		gtk_label_set_text(GTK_LABEL(label), buf);
 
 		*(gsize *) ((gchar *) instance + fld->offset) = value;
@@ -528,11 +546,25 @@
 /* 2008-11-28 -	User changed the color. Write new back from widget. */
 static void evt_color_set(GtkWidget *wid, gpointer wuser, guint index, gpointer suser)
 {
+	CmdCfg		*cmc = suser;
 	CField		*fld;
 	gpointer	instance;
 
-	get_object_data(GTK_OBJECT(wid), &fld, &instance);
+	get_object_data(G_OBJECT(wid), &fld, &instance);
 	gtk_color_button_get_color(GTK_COLOR_BUTTON(wid), (GdkColor *) ((gchar *) instance + fld->offset));
+	set_modified(cmc, instance, TRUE);
+}
+
+static void evt_path_pick_clicked(GtkWidget *wid, gpointer user)
+{
+	CField		*fld;
+	gpointer	instance;
+	GtkEntry	*entry;
+
+	get_object_data(G_OBJECT(wid), &fld, &instance);
+	ldl_dialog_sync_new_wait((gchar *) instance + fld->offset, fld->field.string.size, fld->field.string.separator, fld->desc);
+	entry = GTK_ENTRY(g_object_get_data(G_OBJECT(wid), "entry"));
+	gtk_entry_set_text(entry, (gchar *) instance + fld->offset);
 }
 
 /* 2002-08-01 -	Build a neatly right-aligned label, and stuff it into <table>. */
@@ -568,7 +600,7 @@
 			case CFT_INTEGER:
 				label_build(fld->desc, table, 0, row);
 				wid = gtk_spin_button_new(NULL, 1, 0);
-				set_object_data(GTK_OBJECT(wid), fld, instance);
+				set_object_data(G_OBJECT(wid), fld, instance);
 				adj = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(wid));
 				gtk_adjustment_clamp_page(adj, fld->field.integer.min, fld->field.integer.max);
 				gtk_adjustment_set_value(adj, *(gint *) ((gchar *) instance + fld->offset));
@@ -576,7 +608,7 @@
 				break;
 			case CFT_BOOLEAN:
 				wid = gtk_check_button_new_with_label(fld->desc);
-				set_object_data(GTK_OBJECT(wid), fld, instance);
+				set_object_data(G_OBJECT(wid), fld, instance);
 				gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wid), *(gboolean *) ((gchar *) instance + fld->offset));
 				g_signal_connect(G_OBJECT(wid), "clicked", G_CALLBACK(evt_boolean_clicked), cmc);
 				gtk_table_attach(GTK_TABLE(table), wid, 0, 2, row, row + 1,  GTK_EXPAND|GTK_FILL,0,5,0);
@@ -592,8 +624,8 @@
 					group = gui_radio_group_new(fld->field.fenum.num, (const gchar **) fld->field.fenum.label, radio);
 					for(i = 0; i < fld->field.fenum.num; i++)
 					{
-						set_object_data(GTK_OBJECT(radioi), fld, instance);
-						gtk_object_set_data(GTK_OBJECT(radioi), "value", GINT_TO_POINTER(i));
+						set_object_data(G_OBJECT(radioi), fld, instance);
+						g_object_set_data(G_OBJECT(radioi), "value", GINT_TO_POINTER(i));
 						g_signal_connect(G_OBJECT(radioi), "toggled", G_CALLBACK(evt_enum_changed), cmc);
 						gtk_box_pack_start(GTK_BOX(vbox), radioi, FALSE, FALSE, 0);
 						if(i == current)
@@ -611,22 +643,23 @@
 							 fld->field.size.max / fld->field.size.step,
 							 1, 1, 0);
 
-				set_object_data(obj, fld, instance);
+				set_object_data(G_OBJECT(obj), fld, instance);
 				wid = gtk_hscale_new(GTK_ADJUSTMENT(obj));
 				gtk_range_set_update_policy(GTK_RANGE(wid), GTK_UPDATE_DELAYED);
 				gtk_scale_set_draw_value(GTK_SCALE(wid), FALSE);
 				gtk_box_pack_start(GTK_BOX(hbox), wid, TRUE, TRUE, 0);
 				label = gtk_label_new("");
 				gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
-				gtk_object_set_data(obj, "label", label);
+				g_object_set_data(G_OBJECT(obj), "label", label);
 				g_signal_connect(G_OBJECT(obj), "value_changed", G_CALLBACK(evt_size_changed), cmc);
 				gtk_adjustment_value_changed(GTK_ADJUSTMENT(obj));
 				gtk_table_attach(GTK_TABLE(table), hbox, 1, 2, row, row + 1,  GTK_EXPAND|GTK_FILL,0,5,0);
 				break;
 			case CFT_STRING:
 				label_build(fld->desc, table, 0, row);
-				wid = gtk_entry_new_with_max_length(fld->field.string.size - 1);
-				set_object_data(GTK_OBJECT(wid), fld, instance);
+				wid = gtk_entry_new();
+				gtk_entry_set_max_length(GTK_ENTRY(wid), fld->field.string.size - 1);
+				set_object_data(G_OBJECT(wid), fld, instance);
 				gtk_entry_set_text(GTK_ENTRY(wid), (gchar *) instance + fld->offset);
 				g_signal_connect(G_OBJECT(wid), "changed", G_CALLBACK(evt_string_changed), cmc);
 				gtk_table_attach(GTK_TABLE(table), wid, 1, 2, row, row + 1,  GTK_EXPAND|GTK_FILL,0,5,0);
@@ -634,10 +667,30 @@
 			case CFT_COLOR:
 				label_build(fld->desc, table, 0, row);
 				wid = gtk_color_button_new_with_color((const GdkColor *) ((gchar *) instance + fld->offset));
-				set_object_data(GTK_OBJECT(wid), fld, instance);
+				set_object_data(G_OBJECT(wid), fld, instance);
 				g_signal_connect(G_OBJECT(wid), "color_set", G_CALLBACK(evt_color_set), cmc);
 				gtk_table_attach(GTK_TABLE(table), wid, 1, 2, row, row + 1, GTK_EXPAND|GTK_FILL,0,5,0);
 				break;
+			case CFT_PATH:
+				{
+					GtkWidget	*pick;
+
+					label_build(fld->desc, table, 0, row);
+					hbox = gtk_hbox_new(FALSE, 0);
+					wid = gtk_entry_new();
+					gtk_entry_set_max_length(GTK_ENTRY(wid), fld->field.string.size - 1);
+					set_object_data(G_OBJECT(wid), fld, instance);
+					gtk_entry_set_text(GTK_ENTRY(wid), (gchar *) instance + fld->offset);
+					g_signal_connect(G_OBJECT(wid), "changed", G_CALLBACK(evt_string_changed), cmc);
+					gtk_box_pack_start(GTK_BOX(hbox), wid, TRUE, TRUE, 0);
+					pick = gui_details_button_new();
+					set_object_data(G_OBJECT(pick), fld, instance);
+					g_object_set_data(G_OBJECT(pick), "entry", wid);
+					g_signal_connect(G_OBJECT(pick), "clicked", G_CALLBACK(evt_path_pick_clicked), cmc);
+					gtk_box_pack_start(GTK_BOX(hbox), pick, FALSE, FALSE, 0);
+					gtk_table_attach(GTK_TABLE(table), hbox, 1, 2, row, row + 1, GTK_EXPAND|GTK_FILL,0,5,0);
+				}
+				break;
 		}
 		return table;
 	}
@@ -707,6 +760,7 @@
 					fsize += sizeof (gsize);
 					break;
 				case CFT_STRING:
+				case CFT_PATH:
 					fsize += fld->field.string.size;
 					break;
 				case CFT_COLOR:
@@ -770,7 +824,8 @@
 					*(gsize *) ((gchar *) dst + fld->offset) = *(gsize *) ((gchar *) src + fld->offset);
 					break;
 				case CFT_STRING:
-					stu_strncpy((gchar *) dst + fld->offset, (gchar *) src + fld->offset, fld->field.string.size);
+				case CFT_PATH:
+					g_strlcpy((gchar *) dst + fld->offset, (gchar *) src + fld->offset, fld->field.string.size);
 					break;
 				case CFT_COLOR:
 					*(GdkColor *) ((gchar *) dst + fld->offset) = *(GdkColor *) ((gchar *) src + fld->offset);

gentoo-0.15.6.tar.bz2/src/cmdseq_config.h -> gentoo-0.19.9.tar.gz/src/cmdseq_config.h Changed

gentoo-0.15.6.tar.bz2/src/cmdseq_dialog.c -> gentoo-0.19.9.tar.gz/src/cmdseq_dialog.c Changed

@@ -79,10 +79,10 @@
 	gtk_tree_model_get(GTK_TREE_MODEL(cdlg->store), &iter, 0, &text, -1);
 	if(text != NULL)
 	{
-		gtk_signal_handler_block(GTK_OBJECT(cdlg->entry), cdlg->evt_changed);
+		g_signal_handler_block(G_OBJECT(cdlg->entry), cdlg->evt_changed);
 		gtk_entry_set_text(GTK_ENTRY(cdlg->entry), text);
 		gtk_widget_grab_focus(cdlg->entry);
-		gtk_signal_handler_unblock(GTK_OBJECT(cdlg->entry), cdlg->evt_changed);
+		g_signal_handler_unblock(G_OBJECT(cdlg->entry), cdlg->evt_changed);
 		g_string_assign(cdlg->cmd, text);
 		g_free(text);
 	}
@@ -97,6 +97,14 @@
 	cdlg->expandedind0 = gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), path);
 }
 
+/* 2009-10-22 -	Accept double-clicked row, for speed. */
+static void evt_row_activated(GtkWidget *wid, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user)
+{
+	CDlg	*cdlg = user;
+
+	dlg_dialog_sync_close(cdlg->dlg, DLG_POSITIVE);
+}
+
 /* 2004-11-21 -	Append a subtree from a list of strings. */
 static void append_subtree_list(const GList *list, GtkTreeStore *store, GtkTreeIter *parent, gpointer user)
 {
@@ -160,6 +168,9 @@
 	/* And track command selections, too. */
 	g_signal_connect(G_OBJECT(view), "cursor_changed", G_CALLBACK(evt_cursor_changed), cdlg);
 
+	/* Support accept on double-click, for speedier feel. */
+	g_signal_connect(G_OBJECT(view), "row_activated", G_CALLBACK(evt_row_activated), cdlg);
+
 	/* Create GtkEntryCompletion and link to tree. */
 /*	compl = gtk_entry_completion_new();
 	gtk_entry_completion_set_match_func(compl, cb_match_func, cdlg, NULL);
@@ -212,10 +223,10 @@
 {
 	if((cdlg != NULL) && (text != NULL))
 	{
-		gtk_signal_handler_block(GTK_OBJECT(cdlg->entry), cdlg->evt_changed);
+		g_signal_handler_block(G_OBJECT(cdlg->entry), cdlg->evt_changed);
 		gtk_entry_set_text(GTK_ENTRY(cdlg->entry), text);
 		gtk_editable_set_position(GTK_EDITABLE(cdlg->entry), strlen(text));
-		gtk_signal_handler_unblock(GTK_OBJECT(cdlg->entry), cdlg->evt_changed);
+		g_signal_handler_unblock(G_OBJECT(cdlg->entry), cdlg->evt_changed);
 		g_string_assign(cdlg->cmd, text);
 	}
 }
@@ -267,7 +278,7 @@
 						cdlg->citer = cdlg->clist;
 				}
 			}
-			gtk_signal_emit_stop_by_name(GTK_OBJECT(wid), "key_press_event");
+			g_signal_stop_emission_by_name(G_OBJECT(wid), "key_press_event");
 			return TRUE;
 		}
 	}
@@ -298,7 +309,7 @@
 	cdlg->completion = NULL;
 	cdlg->clist = cdlg->citer = NULL;
 
-	cdlg->vbox   = gtk_vbox_new(FALSE, 0);
+	cdlg->vbox = gtk_vbox_new(FALSE, 0);
 	label = gtk_label_new(_("Select a command, or type start\nof name and press TAB."));
 	gtk_box_pack_start(GTK_BOX(cdlg->vbox), label, FALSE, FALSE, 0);
 	scwin  = gtk_scrolled_window_new(NULL, NULL);
@@ -314,7 +325,7 @@
 		gtk_box_pack_start(GTK_BOX(cdlg->vbox), cdlg->entry, FALSE, FALSE, 0);
 
 		gtk_entry_set_text(GTK_ENTRY(cdlg->entry), cdlg->cmd->str);
-		gtk_entry_select_region(GTK_ENTRY(cdlg->entry), 0, -1);
+		gtk_editable_select_region(GTK_EDITABLE(cdlg->entry), 0, -1);
 
 		cdlg->dlg = dlg_dialog_sync_new(cdlg->vbox, _("Select Command"), NULL);
 		gtk_widget_grab_focus(cdlg->entry);

gentoo-0.15.6.tar.bz2/src/color_dialog.c -> gentoo-0.19.9.tar.gz/src/color_dialog.c Changed

gentoo-0.15.6.tar.bz2/src/configure.c -> gentoo-0.19.9.tar.gz/src/configure.c Changed

@@ -32,7 +32,6 @@
 #include "dirpane.h"
 #include "fileutil.h"
 #include "iconutil.h"
-#include "mount.h"
 #include "window.h"
 #include "xmlutil.h"
 
@@ -49,7 +48,7 @@
 #include "cfg_dirpane.h"
 #include "cfg_errors.h"
 #include "cfg_menus.h"
-#include "cfg_mount.h"
+#include "cfg_nag.h"
 #include "cfg_paths.h"
 #include "cfg_styles.h"
 #include "cfg_types.h"
@@ -82,11 +81,11 @@
 static const CMDescribeFunc describe_page = {	cdp_describe,
 						ccs_describe, ccc_describe,
 						cst_describe, ctp_describe,
-/*						cmu_describe,*/
 						cbt_describe, cbl_describe,
-						cpt_describe, cmn_describe,
+						cpt_describe,
 						cwn_describe, cdl_describe,
-						cct_describe, cer_describe
+						cct_describe, cer_describe,
+						cng_describe,
 					};
 
 #define	CFG_PAGES	(sizeof describe_page / sizeof describe_page0)
@@ -111,6 +110,8 @@
 	if(the_cfggui.flags & CFLG_RESET_KEYBOARD)
 		kbd_context_clear(cgu->min->gui->kbd_ctx);
 
+	if(the_cfggui.flags & CFLG_REBUILD_TOP)
+		rebuild_top(cgu->min);
 	if(the_cfggui.flags & CFLG_REBUILD_MIDDLE)
 		rebuild_middle(cgu->min);
 	if(the_cfggui.flags & CFLG_REBUILD_BOTTOM)
@@ -133,8 +134,6 @@
 	else if(the_cfggui.flags & CFLG_REDISP_RIGHT)
 		dp_redisplay_preserve(&cgu->min->gui->pane1);
 
-	if(the_cfggui.flags & CFLG_RESET_MOUNT)
-		mnt_init(cgu->min);
 	if(the_cfggui.flags & CFLG_RESET_KEYBOARD)
 		ctrl_keys_install(cgu->min->cfg.ctrlinfo, cgu->min->gui->kbd_ctx);
 
@@ -234,17 +233,23 @@
 	cgu->ok = gtk_button_new_with_label(_("OK"));
 	g_signal_connect(G_OBJECT(cgu->ok), "clicked", G_CALLBACK(evt_ok_clicked), cgu);
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(cgu->dlg)->action_area), cgu->ok, TRUE, TRUE, 0);
-	GTK_WIDGET_SET_FLAGS(cgu->ok, GTK_CAN_DEFAULT);
-	gtk_widget_grab_default(cgu->ok);
-
 	cgu->save = gtk_button_new_with_label(_("Save"));
 	g_signal_connect(G_OBJECT(cgu->save), "clicked", G_CALLBACK(evt_save_clicked), cgu);
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(cgu->dlg)->action_area), cgu->save, TRUE, TRUE, 0);
-	GTK_WIDGET_SET_FLAGS(cgu->save, GTK_CAN_DEFAULT);
 	cgu->cancel = gtk_button_new_with_label(_("Cancel"));
 	g_signal_connect(G_OBJECT(cgu->cancel), "clicked", G_CALLBACK(evt_cancel_clicked), cgu);
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(cgu->dlg)->action_area), cgu->cancel, TRUE, TRUE, 0);
+
+#if GTK_CHECK_VERSION(2, 2, 0)
+	gtk_widget_set_can_default(cgu->ok, TRUE);
+	gtk_widget_set_can_default(cgu->save, TRUE);
+	gtk_widget_set_can_default(cgu->cancel, TRUE);
+#else
+	GTK_WIDGET_SET_FLAGS(cgu->ok, GTK_CAN_DEFAULT);
+	GTK_WIDGET_SET_FLAGS(cgu->save, GTK_CAN_DEFAULT);
 	GTK_WIDGET_SET_FLAGS(cgu->cancel, GTK_CAN_DEFAULT);
+#endif
+	gtk_widget_grab_default(cgu->ok);
 }
 
 /* 1998-06-16 -	This gets called as the user clicks the close button of the config GUI.
@@ -301,7 +306,7 @@
 				cfg_pagei->update(min);
 		}
 		win_window_show(cgu->dlg);
-		gtk_notebook_set_page(GTK_NOTEBOOK(cgu->nbook), the_cfggui.page);
+		gtk_notebook_set_current_page(GTK_NOTEBOOK(cgu->nbook), the_cfggui.page);
 		gtk_widget_show_all(cgu->dlg);
 		gtk_grab_add(cgu->dlg);
 		return 1;
@@ -348,9 +353,12 @@
 	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), FALSE);
 	g_signal_connect(G_OBJECT(view), "cursor_changed", G_CALLBACK(evt_view_cursor_changed), cgu);
 	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scwin), view);
-	gtk_box_pack_start(GTK_BOX(hbox), scwin, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), scwin, FALSE, FALSE, 0);
 
-	gtk_box_pack_start(GTK_BOX(hbox), cgu->nbook, TRUE, TRUE, 0);
+	scwin = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scwin), cgu->nbook);
+	gtk_box_pack_start(GTK_BOX(hbox), scwin, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(cgu->dlg)->vbox), hbox, TRUE, TRUE, 0);
 	build_buttons(cgu);

gentoo-0.15.6.tar.bz2/src/configure.h -> gentoo-0.19.9.tar.gz/src/configure.h Changed

@@ -6,19 +6,24 @@
 #define	CONFIGURE_H
 
 /* These are flags useful in calls to cfg_set_flags(). */
-#define	CFLG_RESCAN_LEFT	(1<<0)
-#define	CFLG_RESCAN_RIGHT	(1<<1)
-#define	CFLG_RESCAN_BOTH	(CFLG_RESCAN_LEFT | CFLG_RESCAN_RIGHT)
-#define	CFLG_REDISP_LEFT	(1<<2)
-#define	CFLG_REDISP_RIGHT	(1<<3)
-#define	CFLG_FLUSH_ICONS	(1<<4)
-#define	CFLG_REBUILD_MIDDLE	(1<<5)
-#define	CFLG_REBUILD_BOTTOM	(1<<6)
-#define	CFLG_RESET_MOUNT	(1<<7)
-#define	CFLG_RESET_KEYBOARD	(1<<8)
+enum {
+	CFLG_RESCAN_LEFT	= (1 << 0),
+	CFLG_RESCAN_RIGHT	= (1 << 1),
+	CFLG_RESCAN_BOTH	= (CFLG_RESCAN_LEFT | CFLG_RESCAN_RIGHT),
+	CFLG_REDISP_LEFT	= (1 << 2),
+	CFLG_REDISP_RIGHT	= (1 << 3),
+	CFLG_FLUSH_ICONS	= (1 << 4),
+	CFLG_REBUILD_TOP	= (1 << 5),
+	CFLG_REBUILD_MIDDLE	= (1 << 6),
+	CFLG_REBUILD_BOTTOM	= (1 << 7),
+	CFLG_RESET_MOUNT	= (1 << 8),
+	CFLG_RESET_KEYBOARD	= (1 << 9),
+};
 
 /* These are flags returned by cfg_load_config(). */
-#define	CLDF_NONE_FOUND		(1<<0)		/* There was no config available. */
+enum {
+	CLDF_NONE_FOUND		= (1<<0)		/* There was no config available. */
+};
 
 extern gint	cfg_configure(MainInfo *min);

gentoo-0.15.6.tar.bz2/src/controls.c -> gentoo-0.19.9.tar.gz/src/controls.c Changed

gentoo-0.15.6.tar.bz2/src/controls.h -> gentoo-0.19.9.tar.gz/src/controls.h Changed

gentoo-0.19.9.tar.gz/src/convstream.c Added

@@ -0,0 +1,150 @@
+/*
+** 2010-07-09 -	A wrapper on top of glib's iconv wrapper (!) to make it easier to deal with reading
+**		streams of text, in an initially unknown encoding. 
+*/
+
+#include "gentoo.h"
+
+#include "convstream.h"
+
+/* ----------------------------------------------------------------------------------------- */
+
+struct ConvStream
+{
+	gchar		*buffer;	/* Base pointer, constant. */
+	gsize		size;		/* Allocated size, from constructor. */
+	gsize		used;		/* Currently occupied bytes, at beginning. */
+
+	gchar		*out;
+	gsize		outsize;
+
+	gchar		*encoding;	/* Debugging hang-around. */
+	gboolean	pass_through;	/* If the input encoding is UTF-8, do less work. */
+	GIConv		iconv;
+	
+	ConvSink	sink;
+	gpointer	user;
+
+	gboolean	failed;
+};
+
+/* ----------------------------------------------------------------------------------------- */
+
+const gchar * convstream_get_default_encoding(void)
+{
+	const gchar	*enc;
+
+	g_get_charset(&enc);
+
+	return enc;
+}
+
+const gchar * convstream_get_target_encoding(void)
+{
+	return "UTF-8";
+}
+
+/* ----------------------------------------------------------------------------------------- */
+
+ConvStream * convstream_new(const gchar *encoding, gsize buffer, ConvSink sink, gpointer user)
+{
+	ConvStream	*cs;
+	gsize		len;
+
+	if(sink == NULL)
+		return NULL;
+
+	/* If nobody gave us an encoding, use the system's default. */
+	if(encoding == NULL)
+		encoding = convstream_get_default_encoding();
+
+	len = strlen(encoding);
+
+	cs = g_malloc(sizeof *cs + (2 * buffer) + (len + 1));
+
+	cs->buffer = (gchar *) (cs + 1);
+	cs->size = buffer;
+	cs->used = 0;
+	cs->out = (gchar *) (cs->buffer + cs->size);
+	cs->outsize = cs->size;
+
+	cs->encoding = (cs->out + cs->outsize);
+	strcpy(cs->encoding, encoding);
+	cs->pass_through = strcmp(cs->encoding, convstream_get_target_encoding()) == 0;
+
+	if(!cs->pass_through)
+	{
+		cs->iconv = g_iconv_open(convstream_get_target_encoding(), cs->encoding);
+		if(cs->iconv == (GIConv) -1)
+		{
+			fprintf(stderr, "**Failed to create GIConv for encoding '%s', can't convert text\n", cs->encoding);
+			g_free(cs);
+			return NULL;
+		}
+	}
+	else
+		cs->iconv = (GIConv) -1;
+
+	cs->sink = sink;
+	cs->user = user;
+	cs->failed = FALSE;
+
+	return cs;
+}
+
+void convstream_source(ConvStream *cs, const gchar *text, gsize length)
+{
+	if(cs == NULL || text == NULL || length == 0)
+		return;
+
+	while(!cs->failed && (length > 0 || cs->used != 0))
+	{
+		gsize	max = cs->size - cs->used;
+		gsize	chunk = length > max ? max : length, count;
+		gchar	*in, *out;
+
+		/* Copy the chunk into the buffer, concatening it with any existing content. */
+		memcpy(cs->buffer + cs->used, text, chunk);
+		text += chunk;
+		cs->used += chunk;
+		length -= chunk;
+
+		/* In pass-through mode (input is already UTF-8), validate to handle chunking. */
+		if(cs->pass_through)
+		{
+			g_utf8_validate(cs->buffer, cs->used, (const gchar **) &in);
+			count = in - cs->buffer;
+			if(count == 0)
+			{
+				cs->sink(cs->encoding, 0, cs->user);
+				cs->failed = TRUE;
+				break;
+			}
+			cs->sink(cs->buffer, count, cs->user);
+			cs->used -= count;
+		}
+		else
+		{
+			/* Try to convert the resulting bunch of bytes. */
+			in = cs->buffer;
+			out = cs->out;
+			count = cs->outsize;
+			g_iconv(cs->iconv, &in, &cs->used, &out, &count);
+			/* If we got some output bytes, sink them. */
+			if(count < cs->outsize)
+				cs->sink(cs->out, cs->outsize - count, cs->user);
+		}
+		/* Copy any remaining input bytes back down to the start of the buffer. */
+		if(cs->used != 0)
+			memmove(cs->buffer, in, cs->used);
+	}
+}
+
+void convstream_destroy(ConvStream *cs)
+{
+	if(cs == NULL)
+		return;
+	if(cs->iconv != (GIConv) - 1)
+		g_iconv_close(cs->iconv);
+	g_free(cs);
+}

gentoo-0.19.9.tar.gz/src/convstream.h Added

gentoo-0.15.6.tar.bz2/src/dialog.c -> gentoo-0.19.9.tar.gz/src/dialog.c Changed

@@ -17,6 +17,7 @@
 #include <gdk/gdkkeysyms.h>
 
 #include "dialog.h"
+#include "window.h"
 
 struct Dialog {
 	GtkWidget	*dlg;		/* The GtkDialog widget used to display the dialog. */
@@ -123,7 +124,7 @@
 		buttons = _("_OK|_Cancel");
 
 	dlg = g_malloc(sizeof *dlg);
-	dlg->dlg = gtk_dialog_new();
+	dlg->dlg = win_dialog_open(the_state.main_window);
 	gtk_window_set_position(GTK_WINDOW(dlg->dlg), the_state.window_pos);
 	g_signal_connect(GTK_OBJECT(dlg->dlg), "key_press_event", G_CALLBACK(evt_sync_key_pressed), dlg);
 	g_signal_connect(GTK_OBJECT(dlg->dlg), "response", G_CALLBACK(evt_sync_response), dlg);
@@ -167,6 +168,16 @@
 	return ret;
 }
 
+/* 2009-12-29 -	Adds a widget to the dialog's action area. */
+void dlg_dialog_sync_action_add(Dialog *dlg, GtkWidget *wid)
+{
+	if(dlg != NULL && wid != NULL)
+	{
+		gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dlg->dlg)->action_area), wid, TRUE, TRUE, 0);
+		gtk_widget_show_all(wid);
+	}
+}
+
 /* 2002-08-20 -	Make the dialog stay open until destroyed. Used only by the generic command module,
 **		but on the other hand that module is kind of important.
 */
@@ -183,12 +194,9 @@
 {
 	if(dlg != NULL)
 	{
-		int	old_errno = errno;
-
 		gtk_widget_realize(dlg->dlg);
 		gtk_window_set_transient_for(GTK_WINDOW(dlg->dlg), the_state.main_window);
 		gtk_dialog_run(GTK_DIALOG(dlg->dlg));
-		errno = old_errno;
 		return dlg->button;
 	}
 	return -1;
@@ -247,7 +255,6 @@
 Dialog * dlg_dialog_async_new(GtkWidget *body, const gchar *title, const gchar *buttons, DlgAsyncFunc func, gpointer user)
 {
 	Dialog		*dlg;
-	gint		old_errno;
 
 	if(buttons == NULL)
 		buttons = _("_OK|_Cancel");
@@ -255,7 +262,7 @@
 	dlg = g_malloc(sizeof *dlg);
 	dlg->func = func;
 	dlg->user = user;
-	dlg->dlg = gtk_dialog_new();
+	dlg->dlg = win_dialog_open(the_state.main_window);
 	gtk_window_set_position(&GTK_DIALOG(dlg->dlg)->window, the_state.window_pos);
 	g_signal_connect(G_OBJECT(dlg->dlg), "key_press_event", G_CALLBACK(evt_async_key_pressed), dlg);
 	g_signal_connect(G_OBJECT(dlg->dlg), "response", G_CALLBACK(evt_async_response), dlg);
@@ -265,10 +272,8 @@
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg->dlg)->vbox), body, TRUE, TRUE, 0);
 	dlg->last_button = add_buttons(dlg->dlg, buttons);
 	gtk_widget_realize(dlg->dlg);
-	old_errno = errno;
 	gtk_window_set_transient_for(GTK_WINDOW(dlg->dlg), the_state.main_window);
 	gtk_widget_show_all(dlg->dlg);
-	errno = old_errno;
 
 	return dlg;
 }
@@ -296,3 +301,30 @@
 {
 	async_close(dlg, -2);
 }
+
+/* ----------------------------------------------------------------------------------------- */
+
+static void evt_entry_changed(GtkWidget *entry, gpointer user)
+{
+	const gchar	*text = gtk_entry_get_text(GTK_ENTRY(entry));
+
+	dlg_dialog_set_positive_enabled(user, *text != '\0');
+}
+
+/* 2010-06-13 -	Make the dialog track the state of a GtkEntry, and only enable the "OK" button if entry is non-empty. */
+void dlg_dialog_track_entry(Dialog *dlg, GtkWidget *entry)
+{
+	if(dlg == NULL)
+		return;
+	g_signal_connect(G_OBJECT(entry), "changed", G_CALLBACK(evt_entry_changed), dlg);
+	/* Make sure it's synchronized initially, too. */
+	evt_entry_changed(entry, dlg);
+}
+
+/* 2010-09-05 -	Happy birthday, me! Enable/disable the "positive" (=OK) button on the fly. */
+void dlg_dialog_set_positive_enabled(Dialog *dlg, gboolean enabled)
+{
+	if(dlg == NULL)
+		return;
+	gtk_dialog_set_response_sensitive(GTK_DIALOG(dlg->dlg), DLG_POSITIVE, enabled);
+}

gentoo-0.15.6.tar.bz2/src/dialog.h -> gentoo-0.19.9.tar.gz/src/dialog.h Changed

gentoo-0.15.6.tar.bz2/src/dirhistory.c -> gentoo-0.19.9.tar.gz/src/dirhistory.c Changed

@@ -20,6 +20,7 @@
 **		and then creating a new (differently named) one. The filesystem can re-use the inode.
 ** 2008-01-26 -	Adapted to keep a separate UTF-8 copy of the path names, for GTK+ 2. Ugly, needs to
 **		be way better. Later? Heh.
+** 2010-02-09 -	Again, adapted to work with GIO. Assume less, use thicker gloves. Smooth.
 */
 
 #include "gentoo.h"
@@ -29,7 +30,6 @@
 #include <unistd.h>
 
 #include "cmdseq.h"
-#include "convutil.h"
 #include "dirpane.h"
 #include "errors.h"
 #include "fileutil.h"
@@ -44,40 +44,31 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-typedef struct {			/* A history key. A (device,inode) pair. */
-	dev_t	dev;
-	ino_t	inode;
-	guint	hash;
-} HKey;
-
 /* This is used to store the selected files in a pane, and nothing else. */
 struct DHSel {
-	GHashTable	*hash;		/* It's a hash of HKeys, as above. For fast 'apply' operations. */
+	GHashTable	*hash;		/* It's a hash of display file names, for fast apply(). */
+	GStringChunk	*chunk;		/* All keys in the hash are stored here. */
 };
 
 /* Info about a single remembered directory. The 'hist' field of dirpanes stores a list of these. */
 typedef struct {
-	gchar	dpath2*PATH_MAX;	/* The path to this directory, in UTF-8. Must be first! FIXME: Kind of a gross assumption. */
-	gchar	pathPATH_MAX;		/* The path to this directory. */
-	gchar	realpathPATH_MAX;	/* Canonical path, used as key since <dev,inode> isn't enough. */
-	DHSel	*sel;			/* The selection last time we were here. */
+	gchar	*parse_name;		/* The (VFs-friendly) "parse name" of the remembered directory. */
 	gfloat	vpos;			/* Vertical position. */
-	gint	focus_row;		/* Row that had the keyboard-controlled focus, or -1. */
+	DHSel	sel;			/* Selection, inlined but empty by default. */
 } DHEntry;
 
 struct DirHistory {
 	GList	*history;		/* Visited directories. Recent are close to head. */
 };
 
-/* Here's a glib GMemChunk we use to allocate HKeys, in the hope of getting better efficiency
-** than g_malloc() would give us. Note that there is just one such GMemChunk, from which we
-** allocate HKeys for _all_ directories (DHEntries).
-*/
-static GMemChunk	*the_chunk = NULL;
-
 /* ----------------------------------------------------------------------------------------- */
 
-static DHSel *	dirsel_set(DHSel *sel, const DirPane *dp);
+/* This is just a ballpark, for the average name of a GIO "parse name". Not critical. */
+static const gsize	NAME_LENGTH_AVERAGE = 64;
+
+static void	dirsel_new_in_place(DHSel *sel);
+static void	dirsel_set(DHSel *sel, const DirPane *dp);
+static void	dirsel_clear(DHSel *sel);
 
 /* ----------------------------------------------------------------------------------------- */
 
@@ -97,205 +88,135 @@
 {
 	if(dh != NULL)
 	{
-		const DHEntry   *dhe = (const DHEntry *) g_list_nth_data(dh->history, index);
+		const DHEntry   *dhe = g_list_nth_data(dh->history, index);
  		if(dhe != NULL)
-			return dhe->path;
+			return dhe->parse_name;
 	}
 	return NULL;
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1998-12-23 -	Set a history key according to information in <st>. */
-static void hkey_set(HKey *hk, const struct stat *st)
-{
-	if(hk != NULL && st != NULL)
-	{
-		hk->dev   = st->st_dev;
-		hk->inode = st->st_ino;
-	}
-}
-
-/* 1998-12-23 -	Create a new history key, initialized with information from <st>. */
-static HKey * hkey_new(struct stat *st)
-{
-	HKey	*hk = NULL;
-
-	if(the_chunk == NULL)
-		the_chunk = g_mem_chunk_new("HKey", sizeof *hk, 1024, G_ALLOC_AND_FREE);
-	if(the_chunk != NULL)
-	{
-		if((hk = g_mem_chunk_alloc(the_chunk)) != NULL)
-			hkey_set(hk, st);
-	}
-	return hk;
-}
-
-/* 1998-12-23 -	Compare two history keys for equality. */
-static gint hkey_equal(gconstpointer a, gconstpointer b)
-{
-	const HKey	*ha = a, *hb = b;
-
-	return (ha->dev == hb->dev) && (ha->inode == hb->inode);
-}
-
-/* 1998-12-23 -	Compute hash value from a history key. Nothing fancy. */
-static guint hkey_hash(gconstpointer a)
-{
-	const HKey	*ha = a;
-
-	return (guint) ha->dev ^ (guint) ha->inode;
-}
-
-/* 1998-12-23 -	A g_hash_table_foreach() callback that frees a hash key. Note that both <key>
-**		and <value> point at the same HKey structure here.
-*/
-static void hkey_free(gpointer key, gpointer value, gpointer user)
-{
-	g_mem_chunk_free(the_chunk, key);
-}
-
-/* 1999-06-06 -	A routine just like the one above, but for g_hash_table_foreach_remove(). */
-static gboolean hkey_free2(gpointer key, gpointer value, gpointer user)
-{
-	g_mem_chunk_free(the_chunk, key);
-
-	return TRUE;		/* Remove me, please. */
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
 /* 1999-03-05 -	Create a new empty DHEntry structure. */
 static DHEntry * dhentry_new(void)
 {
 	DHEntry	*data;
 
 	data = g_malloc(sizeof *data);
-	data->dpath0 = '\0';
-	data->path0 = '\0';
-	data->realpath0 = '\0';
-	data->sel = NULL;
-	data->vpos = 0.0f;
-	data->focus_row = -1;
+	data->parse_name = NULL;
+	data->vpos = 0.f;
+	/* Lazily assume there will be no actual selection to store. */
+	data->sel.hash = NULL;
+	data->sel.chunk = NULL;
 
 	return data;
 }
 
-static void dhentry_path_set(DHEntry *dhe, const gchar *path)
+static void dhentry_root_set(DHEntry *dhe, GFile *root)
 {
-	Conv	conv;
-	gchar	*dpl;
-
-	g_snprintf(dhe->path, sizeof dhe->path, "%s", path);
-	conv_init(&conv);
-	dpl = conv_add_reverse(&conv, path);
-	g_snprintf(dhe->dpath, sizeof dhe->dpath, "%s", dpl);
-	conv_end(&conv);
-}
-
-static void dhentry_realpath_set(DHEntry *dhe, const gchar *realpath)
-{
-	g_snprintf(dhe->realpath, sizeof dhe->realpath, "%s", realpath);
+	if(dhe == NULL || root == NULL)
+		return;
+	if(dhe->parse_name != NULL)
+		g_free(dhe->parse_name);
+	dhe->parse_name = g_file_get_parse_name(root);
 }
 
 /* 1999-06-09 -	Update <dhe> to mimic state of <dp>. */
 static void dhentry_update(DHEntry *dhe, const DirPane *dp)
 {
 	if(dp->main->cfg.dp_history.select)
-		dhe->sel = dirsel_set(dhe->sel, dp);
-	else
 	{
-		dph_dirsel_destroy(dhe->sel);
-		dhe->sel = NULL;
+		if(dhe->sel.hash == NULL)
+			dirsel_new_in_place(&dhe->sel);
+		dirsel_set(&dhe->sel, dp);
 	}
-	dhe->vpos = dph_vpos_get(dp);
-	if(dp->focus_row != -1)
-		dhe->focus_row = dp->focus_row;
 	else
-		dhe->focus_row = -1;
+		dirsel_clear(&dhe->sel);
+	dhe->vpos = dph_vpos_get(dp);
 }
 
 /* 1999-06-09 -	Apply state conserved in <dhe> to the rows of <dp>. */
 static void dhentry_apply(const DHEntry *dhe, DirPane *dp)
 {
-	dph_dirsel_apply(dp, dhe->sel);
+	dph_dirsel_apply(dp, &dhe->sel);
 	dph_vpos_set(dp, dhe->vpos);
-	if(dhe->focus_row != -1)	/* Was focus active? */
-		dp_focus(dp, dhe->focus_row);
 }
 
 /* 1999-06-06 -	Destroy a directory history entry. */
 static void dhentry_destroy(DHEntry *dh)
 {
-	if(dh->sel != NULL)
-		g_hash_table_foreach_remove(dh->sel->hash, hkey_free2, NULL);
-	g_free(dh->sel);
+	if(dh->sel.hash != NULL)
+	{
+		g_hash_table_destroy(dh->sel.hash);
+		g_string_chunk_free(dh->sel.chunk);
+	}
 	g_free(dh);
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
 /* 1999-03-05 -	Create a new empty selection. */
-static DHSel * dirsel_new(void)
+static void dirsel_new_in_place(DHSel *sel)
 {
-	DHSel	*sel;
-
-	sel = g_malloc(sizeof *sel);
-	sel->hash = g_hash_table_new(hkey_hash, hkey_equal);
-
-	return sel;
-}
+	if(sel == NULL)
+		return;
 
-static gint dummy_func(gpointer a, gpointer b, gpointer c)
-{
-	return TRUE;
+	sel->hash = g_hash_table_new(g_str_hash, g_str_equal);
+	sel->chunk = g_string_chunk_new(NAME_LENGTH_AVERAGE);
 }
 
 static void dirsel_clear(DHSel *sel)
 {
 	if((sel == NULL) || (sel->hash == NULL))
 		return;
-
-	g_hash_table_foreach_remove(sel->hash, dummy_func, NULL);
+	g_hash_table_remove_all(sel->hash);
+	g_string_chunk_clear(sel->chunk);
 }
 
-/* 1999-03-05 -	Given an <sel> structure, replace selection with that of <dp>. Returns the
-**		new selection (or NULL if <dp> had no selected items). If <sel> is NULL on
-**		entry, a new selection will be created and returned.
+/* 1999-03-05 -	Given an <sel> structure, replace selection with that of <dp>.
+** 2010-02-09 -	Significant edits for GIO-adapted data structures.
 */
-static DHSel * dirsel_set(DHSel *sel, const DirPane *dp)
+static void dirsel_set(DHSel *sel, const DirPane *dp)
 {
 	GSList	*slist;
 
+	/* Always clear; if there is no selection clearing is what we want. */
+	dirsel_clear(sel);
 	if((slist = dp_get_selection_full(dp)) != NULL)
 	{
-		HKey		*key;
 		const GSList	*iter;
+		GtkTreeModel	*model = dp_get_tree_model(dp);
+		gsize		count = 0, length = 0;
 
-		if(sel == NULL)
-			sel = dirsel_new();
-		else
-			dirsel_clear(sel);
-		
 		for(iter = slist; iter != NULL; iter = g_slist_next(iter))
 		{
-			key = hkey_new(&DP_SEL_LSTAT(iter));
+			const gchar	*name = dp_row_get_name_display(model, iter->data);
+			gchar		*key;
+
+			key = g_string_chunk_insert(sel->chunk, name);
 			g_hash_table_insert(sel->hash, key, key);	/* *Value* is returned on lookup!! */
+			length += strlen(key);
+			count++;
 		}
 		dp_free_selection(slist);
-		return sel;
 	}
-	return NULL;
 }
 
 /* 1999-03-05 -	This returns an opaque representation of all selected rows of <dp>. The
 **		selection is not related to the order in which these rows are displayed
 **		in the pane, so it's handy to use before e.g. resorting the pane.
-**		Note that NULL is a valid representation if there is no selection.
+** 2010-02-09 -	Changed around a bit to match the new definition of DHSel. No longer OK
+**		to return NULL to represent "no selection".
 */
 DHSel * dph_dirsel_new(DirPane *dp)
 {
-	return dirsel_set(NULL, dp);
+	DHSel	*sel;
+
+	sel = g_malloc(sizeof *sel);
+	dirsel_new_in_place(sel);
+	dirsel_set(sel, dp);
+
+	return sel;
 }
 
 /* 1999-03-05 -	Apply given given <sel> selection to <dp>, making those rows selected
@@ -305,17 +226,23 @@
 */
 void dph_dirsel_apply(DirPane *dp, const DHSel *sel)
 {
-	HKey	key;
-	guint	i;
+	GtkTreeModel	*model;
+	DirRow2		iter;
 
 	if((sel == NULL) || (sel->hash == NULL))
 		return;
 
-	for(i = 0; i < dp->dir.num_rows; i++)
+	model = dp_get_tree_model(dp);
+	if(gtk_tree_model_get_iter_first(model, &iter))
 	{
-		hkey_set(&key, &DP_ROW_LSTAT(&dp->dir.rowi));
-		if(g_hash_table_lookup(sel->hash, &key))
-			dp_select(dp, i);
+		do
+		{
+			const gchar	*name;
+
+			name = dp_row_get_name(model, &iter);
+			if(g_hash_table_lookup(sel->hash, name) != NULL)
+				dp_select(dp, &iter);
+		} while(gtk_tree_model_iter_next(model, &iter));
 	}
 }
 
@@ -329,8 +256,8 @@
 
 	if(sel->hash != NULL)
 	{
-		g_hash_table_foreach(sel->hash, hkey_free, NULL);
 		g_hash_table_destroy(sel->hash);
+		g_string_chunk_free(sel->chunk);
 	}
 	g_free(sel);
 }
@@ -368,19 +295,22 @@
 */
 void dph_state_save(DirPane *dp)
 {
-	gchar	rpPATH_MAX;
+	gchar	*name;
 
-	if(dp->dir.num_rows == 0)		/* No directory shown? Then give up. */
+	if(dp->dir.root == NULL)
 		return;
-	if(realpath(dp->dir.path, rp) == NULL)
+
+	name = g_file_get_parse_name(dp->dir.root);
+	if(name == NULL)
 		return;
-	if((dp->hist->history == NULL) || strcmp(rp, ((DHEntry *) dp->hist->history->data)->realpath))
+
+	if((dp->hist->history == NULL) || strcmp(name, ((DHEntry *) dp->hist->history->data)->parse_name))
 	{
 		dp->hist->history = g_list_prepend(dp->hist->history, dhentry_new());
-		dhentry_path_set(dp->hist->history->data, dp->dir.path);
-		dhentry_realpath_set(dp->hist->history->data, rp);
+		dhentry_root_set(dp->hist->history->data, dp->dir.root);
 	}
 	dhentry_update(dp->hist->history->data, dp);
+	g_free(name);
 }
 
 /* 2002-06-13 -	Other half of the third-generation history interface. This restores any saved
@@ -389,18 +319,20 @@
 void dph_state_restore(DirPane *dp)
 {
 	GList	*iter;
-	gchar	rpPATH_MAX;
+	gchar	*name;
 	DHEntry	*entry;
 
 	/* Search for key matching current dir in history. */
-	if(realpath(dp->dir.path, rp) == NULL)
+	if((name = g_file_get_parse_name(dp->dir.root)) == NULL)
 		return;
 	for(iter = dp->hist->history, entry = NULL; iter != NULL; iter = g_list_next(iter))
 	{
 		entry = iter->data;
-		if(strcmp(rp, entry->realpath) == 0)
+		if(strcmp(name, entry->parse_name) == 0)
 			break;
 	}
+	g_free(name);
+
 	if(iter != NULL)
 	{
 		dhentry_apply(entry, dp);
@@ -414,8 +346,7 @@
 	else
 	{
 		dp->hist->history = g_list_prepend(dp->hist->history, dhentry_new());
-		dhentry_path_set(dp->hist->history->data, dp->dir.path);
-		dhentry_realpath_set(dp->hist->history->data, rp);
+		dhentry_root_set(dp->hist->history->data, dp->dir.root);
 		dhentry_apply(dp->hist->history->data, dp);
 		/* Prune history list, if it has grown too long. */
 		if(g_list_length(dp->hist->history) > HISTORY_SIZE)
@@ -432,12 +363,24 @@
 			}
 		}
 	}
-	/* Update path history widgets. Relies on <dpath> member being first in DHEntry. */
+	/* Update path history widgets. Relies on <parse_name> member being first in DHEntry. */
 	dp_history_set(dp, dp->hist->history);
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
+/* 2010-02-09 -	Gets the parse name from an indirect pointer, such as those handed (in a
+**		list) to dp_history_set(), above.
+*/
+const gchar * dph_entry_get_parse_name(const void *entry)
+{
+	const DHEntry *	e = entry;
+
+	if(e == NULL)
+		return NULL;
+	return e->parse_name;
+}
+
 /* 2002-02-15 -	Return first path from history for <dp>. */
 const gchar * dph_history_get_first(const DirPane *dp)
 {
@@ -479,9 +422,11 @@
 		xml_put_node_open(out, "History");
 		for(iter = dpi.hist->history; iter != NULL; iter = g_list_next(iter))
 		{
-			if(*(gchar *) iter->data == '\0')
+			const DHEntry	*entry = iter->data;
+
+			if(entry->parse_name0 == '\0')
 				continue;
-			xml_put_text(out, "dir", iter->data);
+			xml_put_text(out, "root", entry->parse_name);
 		}
 		xml_put_node_close(out, "History");
 		xml_put_node_close(out, "Pane");
@@ -500,24 +445,13 @@
 	const gchar	*text;
 	DHEntry		*ent;
 
-	if(!xml_get_text(node, "dir", &text))
+	if(!xml_get_text(node, "root", &text))
 		return;
 	if(text && *text == '\0')
 		return;
 	ent = dhentry_new();
-	stu_strncpy(ent->path, text, sizeof ent->path);
-	if(realpath(ent->path, ent->realpath) != NULL)
-	{
-		Conv		conv;
-		const gchar	*display;
-
-		display = conv_begin_reverse(&conv, ent->path);
-		g_strlcpy(ent->dpath, display, sizeof ent->dpath);
-		dp->hist->history = g_list_append(dp->hist->history, ent);
-		conv_end(&conv);
-	}
-	else
-		dhentry_destroy(ent);
+	ent->parse_name = g_strdup(text);
+	dp->hist->history = g_list_append(dp->hist->history, ent);
 }
 
 static void load_pane(const XmlNode *node, gpointer user)

gentoo-0.15.6.tar.bz2/src/dirhistory.h -> gentoo-0.19.9.tar.gz/src/dirhistory.h Changed

gentoo-0.15.6.tar.bz2/src/dirpane.c -> gentoo-0.19.9.tar.gz/src/dirpane.c Changed

@@ -25,7 +25,6 @@
 #include "cmdseq.h"
 #include "configure.h"
 #include "controls.h"
-#include "convutil.h"
 #include "dirhistory.h"
 #include "dpformat.h"
 #include "errors.h"
@@ -33,7 +32,6 @@
 #include "fileutil.h"
 #include "gfam.h"
 #include "guiutil.h"
-#include "mount.h"
 #include "sizeutil.h"
 #include "strutil.h"
 #include "styles.h"
@@ -48,10 +46,7 @@
 
 typedef gint	(*StrCmpFunc)(const gchar *a, const gchar *b);
 
-static StrCmpFunc	the_strcmp_case = NULL, the_strcmp_nocase = NULL;
-
 static DPSort	the_sort;			/* Used to get state across to qsort() callback. */
-static gint	(*the_strcmp)(const gchar *a, const gchar *b);
 
 static GtkStyle	*pane_selected = NULL,		/* The style used on selected pane's column buttons. */
 		*focus_style   = NULL;		/* For focusing. */
@@ -66,9 +61,8 @@
 
 static GSList	*pathwidgetry_builders = NULL;
 
-/* ----------------------------------------------------------------------------------------- */
-
-#include "graphics/icon_dirparent.xpm"		/* Graphics for the parent button. */
+enum { COL_FILE = 0, COL_INFO, COL_FTYPE, COL_FILENAME_COLLATE_KEY, COL_LINK_TARGET_INFO, COL_FLAGS,
+	COL_NUMBER_OF_COLUMNS };
 
 /* ----------------------------------------------------------------------------------------- */
 
@@ -76,72 +70,33 @@
 static void	clear_selection_stats(SelInfo *si);
 static void	update_selection_stats(DirPane *dp);
 
-static gint	numeric_strcmp(const gchar *a, const gchar *b);
-static gint	numeric_strcasecmp(const gchar *a, const gchar *b);
-
-static void	evt_dirpane_select_row(GtkWidget *wid, gint row, gint col, GdkEventButton *ev, gpointer user);
-static void	evt_dirpane_unselect_row(GtkWidget *wid, gint row, gint col, GdkEventButton *ev, gpointer user);
-
 static void	dp_activate_queued(DirPane *dp);
 
 /* ----------------------------------------------------------------------------------------- */
 
-#if defined ENABLE_NLS
-static gint cmp_wrapper(gconstpointer a, gconstpointer b)
-{
-	return strcoll(*(const gchar **) a, *(const gchar **) b);
-}
-#endif
-
-/* 2002-06-17 -	Find out which string comparison function to use, and when. This information
-**		is then used by the logic that drives the pane sorting. Complicated, since
-**		people seem to implement strcoll() in wildly different ways. *Sigh*.
-*/
-void dp_initialize(DirPane *dp)
+/* 2010-11-21 -	Rewritten. Just initialize some of the string data fields of all panes. */
+void dp_initialize(DirPane *dp, size_t num)
 {
-#if defined ENABLE_NLS
-	const gchar	*locale, *test = { "c", "a", "B" };
-#endif
+	size_t	i;
 
 	/* Clear the path settings. */
-	dp0.dir.path0 = '\0';
-	dp0.dir.pathd = NULL;
-	dp1.dir.path0 = '\0';
-	dp1.dir.pathd = NULL;
-
-	/* Assume no localization support at all. Ooh, the easy life. */
-	the_strcmp_case   = strcmp;
-	the_strcmp_nocase = g_strcasecmp;
-
-#if defined ENABLE_NLS
-	/* If we're internationalized, we need to determine if strcoll() behaves or not. */
-
-	/* Query the collation setting, blatantly assuming that's what controls strcoll(). */
-	if((locale = setlocale(LC_COLLATE, NULL)) == NULL)
-		return;
-
-	/* Let's be a bit brute-forceish, here. Sort a sample array, then inspect. */
-	qsort(test, sizeof test / sizeof *test, sizeof *test, cmp_wrapper);
-
-	/* Is the order "a", "B", "c"? Then that means strcoll() ignores case, which
-	** in turn means that case-sensitive comparisons will not work correctly.
-	*/
-	if(test00 == 'a' && test10 == 'B')
-	{
-		/* This means strcoll() isn't case-sensitive. Inform user. */
-		the_strcmp_case   = strcmp;		/* Won't work as expected. */
-		the_strcmp_nocase = strcoll;
-		g_warning(_("Case-sensitive sorting will not work correctly with non-ASCII characters"));
-	}
-	else if(strcmp(locale, "C") != 0 && strcmp(locale, "POSIX") != 0)
+	for(i = 0; i < num; i++)
 	{
-		/* If we're here, strcoll() cares about case. Which is weird, too,
-		** since we can't invent a case-insensitive variant on our own.
-		*/
-		the_strcmp_case   = strcoll;
-		the_strcmp_nocase = g_strcasecmp;	/* Won't work as expected. */
-		g_warning(_("Case-insensitive sorting will not work correctly with non-ASCII characters"));
+		dpi.dir.path0 = '\0';
+		dpi.dir.pathd = NULL;
+		dpi.dir.root = NULL;
 	}
+}
+
+/* ----------------------------------------------------------------------------------------- */
+
+/* 2010-06-02 -	Encapsulate this tiny porting/compatibility issue to spare us from #ifdef:s all over. */
+gboolean dp_realized(const MainInfo *min)
+{
+#if GTK_CHECK_VERSION(2, 20, 0)
+	return gtk_widget_get_realized(min->gui->panes);
+#else
+	return GTK_WIDGET_REALIZED(min->gui->panes);
 #endif
 }
 
@@ -160,15 +115,11 @@
 ** 1999-01-20 -	Now tries to avoid starting the name with two slashes for root entries.
 ** 2002-02-25 -	Generalized to never produce double slashes, removed special case for root.
 */
-const gchar * dp_full_name(const DirPane *dp, gint row)
+const gchar * dp_full_name(const DirPane *dp, const DirRow2 *row)
 {
 	static gchar	bufPATH_MAX;
-	const gchar	*sep = "";
-	gint		len;
 
-	if((len = strlen(dp->dir.path)) > 0 && dp->dir.pathlen - 1 != G_DIR_SEPARATOR)
-		sep = G_DIR_SEPARATOR_S;
-	g_snprintf(buf, sizeof buf, "%s%s%s", dp->dir.path, sep, DP_ROW_NAME(&dp->dir.rowrow));
+	g_snprintf(buf, sizeof buf, "%s/%s", g_file_get_path(dp->dir.root), dp_row_get_name(dp_get_tree_model(dp), row));
 	return buf;
 }
 
@@ -176,13 +127,13 @@
 **		escaped by backslashes. Very handy when evaluating {f}-codes...
 **		If <path> is TRUE, the path is included as well. Doesn't nest.
 */
-const gchar * dp_name_quoted(const DirPane *dp, gint row, gboolean path)
+const gchar * dp_name_quoted(const DirPane *dp, const DirRow2 *row, gboolean path)
 {
 	static gchar	buf2 * PATH_MAX;
 	const gchar	*fn, *ptr;
 	gchar		*put = buf;
 
-	fn = path ? dp_full_name(dp, row) : DP_ROW_NAME(&dp->dir.rowrow);
+	fn = path ? dp_full_name(dp, row) : dp_row_get_name(dp_get_tree_model(dp), row);
 	*put++ = '"';
 	for(ptr = fn; *ptr; ptr++)
 	{
@@ -215,9 +166,8 @@
 static void completion_update(DirPane *dp, const gchar *prefix)
 {
 	GtkListStore	*cm;
-	GDir		*dir;
-	Conv		conv;
-	gchar		*fs;
+	GFile		*dir;
+	GFileEnumerator	*fen;
 
 	if(strcmp(dp->complete.prefix, prefix) == 0)
 		return;
@@ -226,36 +176,29 @@
 		return;
 	/* We're about to check on-disk, so clear the cache in the GtkEntryCompletion. */
 	gtk_list_store_clear(cm);
-	/* Convert UTF-8 prefix string to filesystem encoding, and open directory. */
-	conv_init(&conv);
-	fs = conv_begin_reverse(&conv, prefix);
-	if((dir = g_dir_open(fs, 0u, NULL)) != NULL)
+	dir = g_file_parse_name(prefix);
+	if((fen = g_file_enumerate_children(dir, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, NULL)) != NULL)
 	{
-		const gchar	*name;
+		GFileInfo	*child;
+		GtkTreeIter	iter;
 
-		while((name = g_dir_read_name(dir)) != NULL)
+		while((child = g_file_enumerator_next_file(fen, NULL, NULL)) != NULL)
 		{
-			gchar		fname4 * PATH_MAX;
-			GtkTreeIter	iter;
-
-			/* Note: pre INCLUDES trailing slash. Always. */
-			g_snprintf(fname, sizeof fname, "%s%s", prefix, name);
-			if(g_file_test(fname, G_FILE_TEST_IS_DIR))
+			if(g_file_info_get_file_type(child) == G_FILE_TYPE_DIRECTORY)
 			{
-				/* Got a directory, now upconvert its name to UTF-8 and store. */
-				Conv	conv;
-				gchar	*dpl;
+				gchar	buf4 * PATH_MAX;
 
-				dpl = conv_begin_reverse(&conv, fname);
+				/* Assumes prefix ends with slash. Slighly Unix-centric. */
+				g_snprintf(buf, sizeof buf, "%s%s", prefix, g_file_info_get_name(child));
 				gtk_list_store_append(cm, &iter);
-				gtk_list_store_set(cm, &iter, 0, dpl, -1);
-				conv_end(&conv);
+				gtk_list_store_set(cm, &iter, 0, buf, -1);
 			}
+			g_object_unref(G_OBJECT(child));
 		}
 		g_strlcpy(dp->complete.prefix, prefix, sizeof dp->complete.prefix);
-		g_dir_close(dir);
+		g_object_unref(fen);
 	}
-	conv_end(&conv);
+	g_object_unref(G_OBJECT(dir));
 }
 
 static gboolean completion_match_function(GtkEntryCompletion *completion, const gchar *key, GtkTreeIter *iter, gpointer user)
@@ -300,15 +243,9 @@
 static void evt_path_new(GtkWidget *wid, gpointer user)
 {
 	DirPane	*dp = user;
-	Conv	conv;
-	gchar	*dir;
 
 	dp_activate(dp);
-	/* Convert user's text into filesystem encoding. */
-	conv_init(&conv);
-	dir = conv_begin(&conv, gtk_combo_box_get_active_text(GTK_COMBO_BOX(dp->path)));
-	csq_execute_format(dp->main, "DirEnter 'dir=%s'", stu_escape(dir));
-	conv_end(&conv);
+	csq_execute_format(dp->main, "DirEnter 'dir=%s'", stu_escape(gtk_combo_box_get_active_text(GTK_COMBO_BOX(dp->path))));
 	dp_path_unfocus(dp);
 }
 
@@ -334,16 +271,10 @@
 			size_t	plen = ptr - now + 1;
 			if(plen < sizeof buf)
 			{
-				Conv	conv;
-				gchar	*disk;
-
 				memcpy(buf, now, plen);
 				bufplen = '\0';
-				/* Now, we have a UTF-8 prefix in buf. Convert to filesystem encoding. */
-				conv_init(&conv);
-				if((disk = conv_begin(&conv, buf)) != NULL)
-					completion_update(user, buf);
-				conv_end(&conv);
+				/* Now, we have a UTF-8 prefix in buf, which is perfect. */
+				completion_update(user, buf);
 			}
 		}
 	}
@@ -362,24 +293,6 @@
 	return FALSE;
 }
 
-/* 2004-04-18 -	Mouse click in path entry widget. */
-static gboolean evt_path_button_press(GtkWidget *wid, GdkEventButton *evt, gpointer user)
-{
-	if(evt->type == GDK_BUTTON_PRESS && evt->button == 3)
-	{
-		DirPane		*dp = user;
-		const gchar	*cmd;
-
-		/* If a non-empty command binding is found, run it and consume event. */
-		if((cmd = ctrl_general_get_cmdseq(dp->main->cfg.ctrlinfo, CTRL_GENERAL_PATH_RMB)) != NULL && *cmd != '\0')
-		{
-			csq_execute(dp->main, cmd);
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
 /* 1998-05-27 -	I had forgotten about the possibility for users to click in the path entry widget, and
 **		by doing so circumventing my clever (hairy) flag system. This remedies that.
 ** 1998-05-29 -	Changed polarity of operation. Was broken. Sloppy me.
@@ -402,7 +315,7 @@
 
 	kbd_context_attach(dp->main->gui->kbd_ctx, GTK_WINDOW(dp->main->gui->window));
 
-	gtk_signal_disconnect_by_func(GTK_OBJECT(wid), GTK_SIGNAL_FUNC(evt_path_key_press), dp);
+	g_signal_handlers_disconnect_by_func(G_OBJECT(wid), G_CALLBACK(evt_path_key_press), dp);
 
 	return FALSE;
 }
@@ -419,41 +332,14 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1998-09-10 -	Nestable freeze. Very useful; ALWAYS use these rather than direct
-**		freezing/thawing on the dp's clist!
-** 1999-03-04 -	GTK+ 1.2.0 does the right thing, making this function even simpler.
-*/
-void dp_freeze(DirPane *dp)
-{
-	gtk_clist_freeze(GTK_CLIST(dp->list));
-}
-
-/* 1998-09-10 -	Nestable thaw. Always use it!
-** 1998-09-19 -	Umm... This function was just proved to be affecting (clearing) errno.
-**		That fscks up the error handling all over the place, so I added some
-**		local save/restore of it. I can't claim to understand any of it, though.
-** 1999-03-04 -	Did GTK+ 1.2.0 simplifications.
-*/
-void dp_thaw(DirPane *dp)
-{
-	gint	old_errno = errno;
-
-	gtk_clist_thaw(GTK_CLIST(dp->list));
-	errno = old_errno;
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
 /* 1999-03-06 -	The given <dp> has been double-clicked. Time to execute some fun action,
 **		namely the Default for the style of the clicked row.
 */
 static void doubleclick(DirPane *dp)
 {
-/*	err_clear(dp->main);*/
 	csq_execute(dp->main, "FileAction");
 	if(chd_get_running(NULL) == NULL)	/* If command sequence finished, reset. Else keep around. */
 		dp->dbclk_row = -1;
-/*	err_show(dp->main);*/
 }
 
 /* 1999-05-13 -	Simulate a double click on <row> in <dp>. Handy for use by the focusing
@@ -469,11 +355,9 @@
 }
 
 /* 1999-03-04 -	Rewritten. Now very much simpler. :) */
-void dp_select(DirPane *dp, gint row)
+void dp_select(DirPane *dp, const DirRow2 *row)
 {
-	if(g_list_find(GTK_CLIST(dp->list)->selection, GINT_TO_POINTER(row)) != NULL)
-		return;
-	gtk_clist_select_row(GTK_CLIST(dp->list), row, -1);
+	gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(dp->view)), (GtkTreeIter *) row);
 }
 
 /* 1999-03-04 -	Select all rows. Handy for the SelectAll command. Since selection management
@@ -483,120 +367,32 @@
 */
 void dp_select_all(DirPane *dp)
 {
-	guint	i;
-
-	dp_freeze(dp);
-	gtk_signal_handler_block_by_func(GTK_OBJECT(dp->list), GTK_SIGNAL_FUNC(evt_dirpane_unselect_row), dp);
-	/* Can't use gtk_clist_select_all(); it messes up the vertical position. Weird. */
-        for(i = 0; i < dp->dir.num_rows; i++)
-                gtk_clist_select_row(GTK_CLIST(dp->list), i, -1);
-	gtk_signal_handler_unblock_by_func(GTK_OBJECT(dp->list), GTK_SIGNAL_FUNC(evt_dirpane_unselect_row), dp);
-	dp_thaw(dp);
-	update_selection_stats(dp);
-	dp_show_stats(dp);
+	gtk_tree_selection_select_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(dp->view)));
 }
 
 /* 1999-03-04 -	Rewritten in a lot simpler way. */
-void dp_unselect(DirPane *dp, gint row)
+void dp_unselect(DirPane *dp, const DirRow2 *row)
 {
-	if(row == dp->dbclk_row)
-		dp->dbclk_row = -1;
-	else
-		gtk_clist_unselect_row(GTK_CLIST(dp->list), row, 0);
+	gtk_tree_selection_unselect_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(dp->view)), (GtkTreeIter *) row);
+	/* FIXME: Doesn't handle double-click specifically, might be bad. */
 }
 
 /* 1999-03-04 -	Unselect all rows. Real simple. */
 void dp_unselect_all(DirPane *dp)
 {
 	dp->dbclk_row = -1;
-	dp_freeze(dp);
-	gtk_signal_handler_block_by_func(GTK_OBJECT(dp->list), GTK_SIGNAL_FUNC(evt_dirpane_unselect_row), dp);
-	gtk_clist_unselect_all(GTK_CLIST(dp->list));
-	gtk_signal_handler_unblock_by_func(GTK_OBJECT(dp->list), GTK_SIGNAL_FUNC(evt_dirpane_unselect_row), dp);
-	dp_thaw(dp);
-	update_selection_stats(dp);
-	dp_show_stats(dp);
+	gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(dp->view)));
 }
 
 /* 2000-03-18 -	Since the select/unselect functions no longer return success or failure, the check
 **		is done explicitly here instead. Much better, really.
 */
-void dp_toggle(DirPane *dp, gint row)
+void dp_toggle(DirPane *dp, const DirRow2 *row)
 {
-	if(g_list_find(GTK_CLIST(dp->list)->selection, GINT_TO_POINTER(row)) == NULL)
-		dp_select(dp, row);
-	else
+	if(gtk_tree_selection_iter_is_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(dp->view)), (GtkTreeIter *) row))
 		dp_unselect(dp, row);
-}
-
-static void focus_select(DirPane *dp, gint row)
-{
-	if((dp->focus_row != -1) && dpf_get_focus_select())
-		dp_focus(dp, row);
-}
-
-/* 1999-03-04 -	A row in the pane was selected. Update statistics. */
-static void evt_dirpane_select_row(GtkWidget *wid, gint row, gint col, GdkEventButton *ev, gpointer user)
-{
-	DirPane	*dp = user;
-	DirRow	*dr;
-
-	if((dr = gtk_clist_get_row_data(GTK_CLIST(wid), row)) == NULL)
-		return;
-
-	if(S_ISDIR(DP_ROW_LSTAT(dr).st_mode))
-		dp->dir.sel.num_dirs++;
 	else
-		dp->dir.sel.num_files++;
-
-	dp->dir.sel.num_bytes  += DP_ROW_LSTAT(dr).st_size;
-	dp->dir.sel.num_blocks += DP_ROW_LSTAT(dr).st_blocks;
-	dp_show_stats(dp);
-
-	focus_select(dp, row);
-
-	if(dp->dbclk_row == row)
-		doubleclick(dp);
-}
-
-/* 1999-03-04 -	A row has been unselected, so we need to update our statistics.
-** 1999-03-06 -	Now does the double-click "activation". When we arrive here, the double-
-**		clicked row is no longer selected (dp_get_selection() will not include it),
-**		which is very important, for example for the directory history.
-*/
-static void evt_dirpane_unselect_row(GtkWidget *wid, gint row, gint col, GdkEventButton *ev, gpointer user)
-{
-	DirPane	*dp = user;
-
-	update_selection_stats(dp);
-	dp_show_stats(dp);
-
-	if(dp->dbclk_row >= 0)		/* Did a double-click occur resently? */
-		doubleclick(dp);
-}
-
-/* 1999-03-05 -	Update the state of the GDK_CONTROL_MASK bitmask in <state>, depending on how
-**		the given pane has its ctrl_mode formatting mode set.
-*/
-static guint update_ctrl_state(DirPane *dp, guint state)
-{
-	CtrlMode	mode = dp->main->cfg.dp_formatdp->index.ctrl_mode;
-
-	switch(mode)
-	{
-		case CTM_IGNORE:
-			break;
-		case CTM_SET:
-			state |= GDK_CONTROL_MASK;
-			break;
-		case CTM_RESET:
-			state &= ~GDK_CONTROL_MASK;
-			break;
-		case CTM_TOGGLE:
-			state ^= GDK_CONTROL_MASK;
-			break;
-	}
-	return state;
+		dp_select(dp, row);
 }
 
 /* 1998-06-18 -	This handles the situation when a user clicks on a row in a directory pane. Might envoke
@@ -608,19 +404,18 @@
 ** 1998-06-17 -	Added control-sensing to "extend" the current UNselection. Cool?
 ** 1999-03-05 -	Simplified since we now use GTK+'s built-in CList selection.
 ** 2003-10-08 -	Implemented Click-M-Click recognition.
+** 2009-11-07 -	Simplified for GTK+ 2.0 implementation of the main dirpane list widget. Dropped customized selection
+**		support (i.e. click and drag to multi-select); now it's always "system default" mode.
 */
 static gboolean evt_dirpane_button_press(GtkWidget *wid, GdkEventButton *event, gpointer user)
 {
 	static DirPane	*last_dp = NULL;
 	static GTimeVal	last_time;
 	const gchar	*mcmd;
-	gint		ret, row, col;
 	DirPane		*dp = user;
-	gboolean	change = last_dp && dp != last_dp;
+	const gboolean	change = last_dp && dp != last_dp;
 	GTimeVal	now;
 
-	dp_path_unfocus(dp);
-
 	/* Handle commands mapped to mouse buttons. This includes the RMB menu, typically. */
 	if((event->type == GDK_BUTTON_PRESS) && (mcmd = ctrl_mouse_map(dp->main->cfg.ctrlinfo, event)) != NULL)
 	{
@@ -629,7 +424,6 @@
 		evt_event_set((GdkEvent *) event);
 		csq_execute(dp->main, mcmd);
 		evt_event_clear(event->type);
-		gtk_signal_emit_stop_by_name(GTK_OBJECT(dp->list), "button_press_event");
 		return TRUE;
 	}
 
@@ -640,11 +434,11 @@
 		const gchar *cmd = ctrl_clickmclick_get_cmdseq(dp->main->cfg.ctrlinfo);
 		if(cmd && *cmd)
 		{
-			gfloat	elapsed = 1E-6f * (now.tv_usec - last_time.tv_usec) + (now.tv_sec - last_time.tv_sec);
+			const gfloat	elapsed = 1E-6f * (now.tv_usec - last_time.tv_usec) + (now.tv_sec - last_time.tv_sec);
+
 			if(elapsed < ctrl_clickmclick_get_delay(dp->main->cfg.ctrlinfo))
 			{
 				csq_execute(dp->main, cmd);
-				gtk_signal_emit_stop_by_name(GTK_OBJECT(dp->list), "button_press_event");
 				return TRUE;
 			}
 		}
@@ -652,1296 +446,1587 @@
 
 	dp_activate_queued(dp);
 	last_dp = dp;
-	ret = gtk_clist_get_selection_info(GTK_CLIST(wid), event->x, event->y, &row, &col);
-	if(ret && (row < dp->dir.num_rows))
-	{
-		if((event->type == GDK_2BUTTON_PRESS) && (row == dp->last_row2))
-		{
-			MainInfo	*min = dp->main;
-
-			dp->dbclk_row = row;
-
-			/* FIXME: This is horribly ugly. If control mode is set to "system default" (i.e., ignore),
-			** we need to handle the double-click right now, since we can't punt it to the selection
-			** handler as we usually do. This is very ugly, but I think it works.
-			*/
-			if(min->cfg.dp_formatdp->index.ctrl_mode == CTM_IGNORE)
-			{
-				doubleclick(dp);
-				dp_unselect(dp, row);
-			}
-			gtk_signal_emit_stop_by_name(GTK_OBJECT(dp->list), "button_press_event");
-		}
-		else
-			event->state = update_ctrl_state(dp, event->state);
-
-		dp->last_row2 = dp->last_row;
-		dp->last_row  = row;
-		last_time = now;
-	}
-	else
-	{
-		dp->last_row = dp->last_row2 = -1;
-		last_time.tv_sec = last_time.tv_usec = 0;	/* If click was outside, it can't start c-m-c. */
-	}
+	last_time = now;
 	return FALSE;
 }
 
-static void evt_dirpane_col_click(GtkWidget *wid, gint column, gpointer user)
+/* 2009-11-07 -	User clicked a column; update sorting data. Much easier now with GTK+ 2. */
+static void evt_pane_sort_column_clicked(GtkTreeSortable *sortable, gpointer user)
 {
-	DirPane	*dp = user;
-	DPSort	*sort;
-
-	if(!dp_activate(dp))		/* Only change sort if click didn't cause pane change. */
-	{
-		DHSel	*sel;
-
-		sort = &dp->main->cfg.dp_formatdp->index.sort;
-		if(sort->content == dp->main->cfg.dp_formatdp->index.formatcolumn.content)
-			sort->invert ^= 1;	/* Clicking on active title toggles inversion. */
-		else
-			sort->content = dp->main->cfg.dp_formatdp->index.formatcolumn.content;
-
-		sel = dph_dirsel_new(dp);
-		clear_selection_stats(&dp->dir.sel);
-		dp_resort(dp);
-		dp_redisplay(dp);
-		dph_dirsel_apply(dp, sel);
-		dph_dirsel_destroy(sel);
-	}
-}
+	DirPane		*dp = user;
+	DPSort		*sort;
+	gint		column;
+	GtkSortType	type;
 
-/* 1999-05-15 -	User resized a column. Update format. I hope this is a new signal... */
-static void evt_dirpane_resize_column(GtkWidget *wid, gint column, gint width, gpointer user)
-{
-	DirPane	*dp = user;
+	dp_activate(dp);
+	gtk_tree_sortable_get_sort_column_id(sortable, &column, &type);
 
-	dp->main->cfg.dp_formatdp->index.formatcolumn.width = width;
-	cfg_modified_set(dp->main);
+	sort = &dp->main->cfg.dp_formatdp->index.sort;
+	sort->content = column;
+	sort->invert = (type == GTK_SORT_DESCENDING);
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1998-05-29 -	Compute a result for qsort() comparison function, taking care to keep
-**		directories on top of files at all times.
-** 1998-06-07 -	Now implements all the sorting modes offered by Opus, meaning directories
-**		can be first, last, or mixed with the files. The inversion is also done here,
-**		making it a lot more "true" than the old hack.
-** 2000-04-16 -	Now resolves collisions by comparing names. This could be extended in the
-**		future to allow user-controlled multi-level sorting.
+/* 1999-04-27 -	Redisplay given pane. Will totally clear the GtkCList widget, and reformat
+**		all row data into it. Does *not* resort the pane's contents; use (the new)
+**		dp_resort() function for that. Also does *not* preserve the set of selected
+**		rows or the vertical position; use dp_redisplay_preserve() for that.
 */
-static gint qsort_result(gint s, const DirRow *da, const DirRow *db)
+void dp_redisplay(DirPane *dp)
 {
-	gint	isda, isdb;
+	g_warning("dp_redisplay() totally non-implemented");
+}
 
-	if(s == 0)		/* Did the two rows compare equal? */
-		s = the_strcmp(DP_ROW_NAME(da), DP_ROW_NAME(db));	/* Resolve using names. */
+/* 1999-04-27 -	Redisplay given pane, keeping both the selected set and the vertical position.
+**		This is the one to use in most cases.
+*/
+void dp_redisplay_preserve(DirPane *dp)
+{
+	DHSel	*sel;
+	gfloat	vpos;
 
-	if(the_sort.invert)
-		s = -s;
+	sel  = dph_dirsel_new(dp);
+	vpos = dph_vpos_get(dp);
+	dp_redisplay(dp);
+	dph_vpos_set(dp, vpos);
+	dph_dirsel_apply(dp, sel);
+	dph_dirsel_destroy(sel);
+}
 
-	if(DP_ROW_GET_STAT(da) != NULL)
-		isda = S_ISDIR(DP_ROW_STAT(da).st_mode);
-	else
-		isda = S_ISDIR(DP_ROW_LSTAT(da).st_mode);
+/* ----------------------------------------------------------------------------------------- */
 
-	if(DP_ROW_GET_STAT(db) != NULL)
-		isdb = S_ISDIR(DP_ROW_STAT(db).st_mode);
-	else
-		isdb = S_ISDIR(DP_ROW_LSTAT(db).st_mode);
-	switch(the_sort.mode)
+/* 1999-05-10 -	Unfocus the currently focused row of <dp>, if any. */
+void dp_unfocus(DirPane *dp)
+{
+	if(dp != NULL)
 	{
-		case DPS_DIRS_FIRST:
-			if(isda == isdb)
-				return s;
-			else if(isda)
-				return -1;
-			return 1;
-		case DPS_DIRS_LAST:
-			if(isda == isdb)
-				return s;
-			else if(isdb)
-				return -1;
-			return 1;
-		case DPS_DIRS_MIXED:
-			return s;
+		/* We use a depth-two path, which the actual view will never have. This qualifies
+		** (it seems) as a path that is "invalid" to the model, causing the focus to be
+		** removed.
+		**/
+		static GtkTreePath	*nowhere = NULL;
+
+		if(nowhere == NULL)
+			nowhere = gtk_tree_path_new_from_indices(1, 1, -1);
+		if(nowhere != NULL)
+			gtk_tree_view_set_cursor(GTK_TREE_VIEW(dp->view), nowhere, NULL, FALSE);
 	}
-	return s;		/* I bet this doesn't ever run. Gcc doesn't. */
 }
 
-/* 2000-04-16 -	Compare names for sorting. Since name-comparison is now automatically
-**		done as a collision-resolver by qsort_result() above, we don't need to
-**		do the actual string comparison here anymore.
-*/
-static gint qsort_cmp_name(gconstpointer ap, gconstpointer bp)
+/* 2003-11-30 -	A new dir has been entered, figure out if there should be focusing. */
+void dp_focus_enter_dir(DirPane *dp)
 {
-	return qsort_result(0, ap, bp);
+	if(dp->focus_row != -1)
+		return;
+	if(dp->old_focus_row == -1)
+		return;
 }
 
-/* 1998-05-29 -	A hairy macro, which can be used to generate sorting data from two dirrows, by numerically
-**		comparing one field in the stat() datas. The ARG argument should be the name of the field
-**		to compare, e.g. st_size, st_mode etc.
-*/
-#define	QBODY(ARG)	{const DirRow *da = ap, *db = bp;\
-			gint sd;\
-			\
-			sd = (DP_ROW_LSTAT(da). ARG) < (DP_ROW_LSTAT(db). ARG) ? -1 : (DP_ROW_LSTAT(da). ARG) > (DP_ROW_LSTAT(db). ARG);\
-			return qsort_result(sd, da, db);\
-			}
+/* ----------------------------------------------------------------------------------------- */
 
-/* This does the same as the one above, but is specialized to deal with time_t values, and thus
-** goes through the difftime() function to do the comparison.
+/* 1998-05-25 -	Moved this old workhorse into the new dirpane module, and discovered that
+**		it wasn't commented. Lazy me. Also modified its prototype, to take the
+**		DirPane to display rather than figuring it out from MainInfo.
 */
-#define	QTIMEBODY(ARG)	{const DirRow	*da = ap, *db = bp;\
-			gint	sd;\
-			\
-			sd = difftime(DP_ROW_LSTAT(da). ARG, DP_ROW_LSTAT(db). ARG);\
-			return qsort_result(sd, da, db);\
-			}
-
-static gint qsort_cmp_size(gconstpointer ap, gconstpointer bp)
+void dp_show_stats(DirPane *dp)
 {
-	QBODY(st_size);
-}
+	MainInfo *min;
 
-static gint qsort_cmp_blocks(gconstpointer ap, gconstpointer bp)
-{
-	QBODY(st_blocks);
-}
+	if((min = dp->main) != NULL)
+	{
+		gchar		buf256, selbuf32 = "", totbuf32 = "", *ptr = buf;
+		const SelInfo	*sel = &dp->dir.sel;
 
-static gint qsort_cmp_modeoct(gconstpointer ap, gconstpointer bp)
-{
-	QBODY(st_mode);
-}
+		ptr += g_snprintf(ptr, sizeof buf, _("%u/%u dirs, %u/%u files"),
+				  sel->num_dirs, dp->dir.tot_dirs,
+				  sel->num_files, dp->dir.tot_files);
+		sze_put_offset(selbuf, sizeof selbuf, sel->num_bytes,    SZE_AUTO, 1, ',');
+		sze_put_offset(totbuf, sizeof totbuf, dp->dir.tot_bytes, SZE_AUTO, 1, ',');
+		ptr += sprintf(ptr, _(" (%s/%s)"), selbuf, totbuf);
+		if(dp->dir.fs.valid)
+		{
+			gchar	dbuf32, pbuf32;
 
-static gint qsort_cmp_nlink(gconstpointer ap, gconstpointer bp)
-{
-	QBODY(st_nlink);
+			sze_put_offset(dbuf, sizeof dbuf, dp->dir.fs.fs_size - dp->dir.fs.fs_free, SZE_AUTO, 1, ',');
+			g_snprintf(pbuf, sizeof pbuf, "%.1f%%",
+				100.0 *
+				((gdouble) (dp->dir.fs.fs_size - dp->dir.fs.fs_free)
+				/
+				(gdouble) dp->dir.fs.fs_size));
+			ptr += sprintf(ptr, _(", %s (%s) used"), dbuf, pbuf);
+			sze_put_offset(dbuf, sizeof dbuf, dp->dir.fs.fs_free, SZE_AUTO, 3, ',');
+			ptr += sprintf(ptr, _(", %s free"), dbuf);
+		}
+		if(min->cfg.errors.display != ERR_DISPLAY_TITLEBAR)
+			gtk_label_set_text(GTK_LABEL(min->gui->top), buf);
+		else
+			gui_set_main_title(dp->main, buf);
+	}
 }
 
-static gint qsort_cmp_uiddec(gconstpointer ap, gconstpointer bp)
+/* 2010-08-03 -	Set the activate-status of the given pane's columns (that's what "col" refers to). Slighly hackish. */
+static void dp_set_col_active(DirPane *dp, gboolean active)
 {
-	QBODY(st_uid);
-}
+	guint	i;
 
-static gint qsort_cmp_uidstr(gconstpointer ap, gconstpointer bp)
-{
-	return qsort_result(the_strcmp( usr_lookup_uname(DP_ROW_LSTAT(((DirRow *) ap)).st_uid),
-					usr_lookup_uname(DP_ROW_LSTAT(((DirRow *) bp)).st_uid)),
-					ap, bp);
-}
+	if(dp != NULL)
+	{
+		GtkTreeViewColumn	*column;
 
-static gint qsort_cmp_giddec(gconstpointer ap, gconstpointer bp)
-{
-	QBODY(st_gid);
+		for(i = 0; (column = gtk_tree_view_get_column(GTK_TREE_VIEW(dp->view), i)) != NULL; i++)
+		{
+			GtkWidget	*header = gtk_tree_view_column_get_widget(column);
+
+			if(header != NULL)
+				gtk_widget_set_sensitive(header, active);
+		}
+	}
 }
 
-static gint qsort_cmp_gidstr(gconstpointer ap, gconstpointer bp)
+/* 2002-07-14 -	Do the pane rendering necessary to change active pane from <from> into <to>. */
+static void activate_render(DirPane *from, DirPane *to)
 {
-	return qsort_result(the_strcmp( usr_lookup_gname(DP_ROW_LSTAT(((DirRow *) ap)).st_gid),
-					usr_lookup_gname(DP_ROW_LSTAT(((DirRow *) bp)).st_gid)),
-					ap, bp);
+	if(from != NULL)
+	{
+		dp_unfocus(from);
+		dp_set_col_active(from, FALSE);
+	}
+	if(to != NULL)
+	{
+		dp_set_col_active(to, TRUE);
+		dp_show_stats(to);
+	}
 }
 
-static gint qsort_cmp_dev(gconstpointer ap, gconstpointer bp)
+/* 1999-06-09 -	Activate <dp>, making it the source pane for all operations. Returns TRUE if the activation
+**		meant that another pane was deactivated, FALSE if <dp> was already the activate pane.
+*/
+gboolean dp_activate(DirPane *dp)
 {
-	QBODY(st_rdev);
+	if(dp != NULL && dp->main->gui->cur_pane != dp)
+	{
+		activate_render(dp->main->gui->cur_pane, dp);
+		dp->main->gui->cur_pane = dp;
+		return TRUE;
+	}
+	return FALSE;
 }
 
-static gint qsort_cmp_devmaj(gconstpointer ap, gconstpointer bp)
+/* 2002-07-13 -	This runs when GTK+ is idle, and does the pane activation rendering, once. */
+static gint idle_activate(gpointer data)
 {
-	QBODY(st_rdev >> 8);
+	activate_render(the_activate_queue_info.old_cur, ((MainInfo *) data)->gui->cur_pane);
+	g_source_remove(the_activate_queue_info.handler);
+	the_activate_queue_info.handler = 0U;
+	return 0;
 }
 
-static gint qsort_cmp_devmin(gconstpointer ap, gconstpointer bp)
+/* 2002-07-13 -	Activate a pane, but queue the rendering until GTK+ is idle. This works around
+**		a very annoying bug/misfeature which causes "ghost" pane scrolling to occur.
+**		We only queue the rendering, since that seems to suffice, and we need to really
+**		change gentoo's idea of "active pane" immediately or things break.
+*/
+static void dp_activate_queued(DirPane *dp)
 {
-	QBODY(st_rdev & 0xFF);
+	if(the_activate_queue_info.handler)
+		g_source_remove(the_activate_queue_info.handler);
+	the_activate_queue_info.handler = g_idle_add(idle_activate, dp->main);
+	the_activate_queue_info.old_cur = dp->main->gui->cur_pane;
+	dp->main->gui->cur_pane = dp;
 }
 
-static gint qsort_cmp_atime(gconstpointer ap, gconstpointer bp)
+/* ----------------------------------------------------------------------------------------- */
+
+/* 1999-03-05 -	Answer whether given pane has one or more rows selected or not. */
+gboolean dp_has_selection(DirPane *dp)
 {
-	QTIMEBODY(st_atime);
+	if(dp->dbclk_row != -1)
+		return TRUE;
+	if(dp->focus_row != -1)
+		return TRUE;
+	return gtk_tree_selection_count_selected_rows(gtk_tree_view_get_selection(GTK_TREE_VIEW(dp->view))) > 0 && !no_repeat;
 }
 
-static gint qsort_cmp_mtime(gconstpointer ap, gconstpointer bp)
+/* 2011-01-03 -	Determine whether the given pane has a single selected row. */
+gboolean dp_has_single_selection(const DirPane *dp)
 {
-	QTIMEBODY(st_mtime);
+	return gtk_tree_selection_count_selected_rows(gtk_tree_view_get_selection(GTK_TREE_VIEW(dp->view))) == 1;
 }
 
-static gint qsort_cmp_ctime(gconstpointer ap, gconstpointer bp)
+/* 1999-03-06 -	Answer whether given <row> is currently selected. A bit more efficient
+**		than getting the entire list through dp_get_selection(), but only if
+**		you're not going to iterate the selection anyway.
+*/
+gboolean dp_is_selected(DirPane *dp, const DirRow2 *row)
 {
-	QTIMEBODY(st_ctime);
+	if(dp == NULL || row == NULL)
+		return FALSE;
+	return gtk_tree_selection_iter_is_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(dp->view)), (GtkTreeIter *) row);
 }
 
-/* 2000-04-17 -	Compare two rows based on their type names. */
-static gint qsort_cmp_type(gconstpointer ap, gconstpointer bp)
+static GSList * append_row(GSList *list, DirPane *dp, gint index)
 {
-	const DirRow	*da = ap, *db = bp;
+	gchar		buf16;
+	GtkTreeIter	*iter;
 
-	return qsort_result(the_strcmp(DP_ROW_TYPE(da)->name, DP_ROW_TYPE(db)->name), ap, bp);
-}
+	if((iter = g_malloc(sizeof *iter)) != NULL)
+	{
+		g_snprintf(buf, sizeof buf, "%d", index);
+		if(gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(dp->dir.store), iter, buf))
+			return g_slist_prepend(list, iter);
+		else
+			g_warning("**Unable to get iter for selection");
+	}
+	return list;
+}
 
-/* 1999-06-12 -	Compare two rows based on the styles they use. This is for icon column sorting. */
-static gint qsort_cmp_style(gconstpointer ap, gconstpointer bp)
+static void cb_append_row(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user)
 {
-	const DirRow	*da = ap, *db = bp;
+	GSList		**sel = user;
+	GtkTreeIter	*di;
 
-	return qsort_result(stl_style_compare_hierarchy(DP_ROW_TYPE(da)->style, DP_ROW_TYPE(db)->style), ap, bp);
+	if((di = g_malloc(sizeof *di)) != NULL)
+	{
+		*di = *iter;
+		*sel = g_slist_prepend(*sel, di);
+	}
 }
 
-typedef gint	(*sorter)(gconstpointer ap, gconstpointer bp);
+/* 1999-03-04 -	Return a GSList of selected rows. Each item's data member is a DirRow.
+**		Knows how to deal with a double click, too. This is going to be the new
+**		interface for all commands.
+** 1999-03-15 -	Now sorts the rows in address order, since otherwise the selection retains
+**		the order in which it was done by the user, and that is simply confusing.
+*/
+GSList * dp_get_selection(DirPane *dp)
+{
+	GSList	*sel = NULL;
+
+	no_repeat = FALSE;
+
+	if(dp->dbclk_row != -1)
+		sel = append_row(sel, dp, dp->dbclk_row);
+	else
+		gtk_tree_selection_selected_foreach(gtk_tree_view_get_selection(GTK_TREE_VIEW(dp->view)), cb_append_row, &sel);
+
+	if(sel)
+		fam_rescan_block();
+	sel = g_slist_reverse(sel);
+
+	return sel;
+}
+
+/* 1999-03-06 -	Get the "full" selection, regardless of whether there's a double clicked row or not.
+**		This should only be used if you really know what you're doing, and never by actual
+**		commands (which need the double-click support).
+*/
+GSList * dp_get_selection_full(const DirPane *dp)
+{
+	GSList	*sel = NULL;
+
+	gtk_tree_selection_selected_foreach(gtk_tree_view_get_selection(GTK_TREE_VIEW(dp->view)), cb_append_row, &sel);
+	if(sel)
+		fam_rescan_block();
+	return sel;
+}
 
-/* 1998-05-29 -	Select a sorting function based on the given pane. */
-static sorter choose_sorter(DirPane *dp)
+/* 1999-03-04 -	Free a selection list, handy when you're done traversing it. */
+void dp_free_selection(GSList *sel)
 {
-	switch(dp->main->cfg.dp_formatdp->index.sort.content)
+	if(sel != NULL)
 	{
-		case DPC_NAME:			return qsort_cmp_name;
-		case DPC_SIZE:			return qsort_cmp_size;
-		case DPC_BLOCKS:		return qsort_cmp_blocks;
-		case DPC_BLOCKSIZE:		return qsort_cmp_blocks;
-		case DPC_MODENUM:	/* Fall-through. */
-		case DPC_MODESTR:		return qsort_cmp_modeoct;
-		case DPC_NLINK:			return qsort_cmp_nlink;
-		case DPC_UIDNUM:		return qsort_cmp_uiddec;
-		case DPC_UIDSTR:		return qsort_cmp_uidstr;
-		case DPC_GIDNUM:		return qsort_cmp_giddec;
-		case DPC_GIDSTR:		return qsort_cmp_gidstr;
-		case DPC_DEVICE:		return qsort_cmp_dev;
-		case DPC_DEVMAJ:		return qsort_cmp_devmaj;
-		case DPC_DEVMIN:		return qsort_cmp_devmin;
-		case DPC_ATIME:			return qsort_cmp_atime;
-		case DPC_MTIME:			return qsort_cmp_mtime;
-		case DPC_CTIME:			return qsort_cmp_ctime;
-		case DPC_TYPE:			return qsort_cmp_type;
-		case DPC_ICON:			return qsort_cmp_style;
-
-		case DPC_NUM_TYPES:
-			;
+		GSList	*iter;
+
+		for(iter = sel; iter != NULL; iter = g_slist_next(iter))
+			g_free(iter->data);
+		g_slist_free(sel);
+		fam_rescan_unblock();
 	}
-	return NULL;
 }
 
-/* 2009-03-05 -	Compare two decimal strings, without converting the text to binary.
- *		Not super-efficient, but should be OK for this application, which
- *		is sorting of directory entries. Sample inputs: "4712" and "42".
-*/
-static gint compare_decimal(const gchar **a, const gchar **b)
-{
-	const gchar	*ap = *a, *bp = *b;
-	const gchar	*ba, *bb;
-	gsize		da, db;
-
-	/* Skip past any leading zeroes, as they are not significant. */
-	while(*ap == '0')
-		ap++;
-	while(*bp == '0')
-		bp++;
-	/* Save base pointers; this is where the numbers start. */
-	ba = ap;
-	bb = bp;
-	/* Skip to the end of each number. */
-	while(isdigit(*ap))
-		ap++;
-	while(isdigit(*bp))
-		bp++;
-	/* Now we can compute the number of digits in each. If they differ,
-	 * the difference gives the relationship immediately, since there
-	 * are no leading zeroes. "99" must be less than "100".
-	*/
-	da = ap - ba;
-	db = bp - bb;
-	if(da < db)
-		return -1;
-	if(db < da)
-		return 1;
-	/* Answer might be 0, update pointers so caller can continue. */
-	*a = ap;
-	*b = bp;
-	return strncmp(ba, bb, da);
-}
-
-/* 1999-08-29 -	Compare two strings, while dealing with embedded numerals in an "intelligent"
-**		fashion. Will compare "yo-12" as being greater than "yo-5", for example.
+/* ----------------------------------------------------------------------------------------- */
+
+/* 2009-10-01 -	Count entries as they are read in. */
+static void statistics_add_row(DirPane *dp, const GFileInfo *fi)
+{
+	if(g_file_info_get_file_type((GFileInfo *) fi) == G_FILE_TYPE_DIRECTORY)
+		dp->dir.tot_dirs++;
+	else
+		dp->dir.tot_files++;
+	dp->dir.tot_bytes += g_file_info_get_size((GFileInfo *) fi);
+}
+
+/* 2009-10-16 -	Add given row to the selection. */
+static void selection_add_row(DirPane *dp, const GFileInfo *fi)
+{
+	if(g_file_info_get_file_type((GFileInfo *) fi) == G_FILE_TYPE_DIRECTORY)
+		dp->dir.sel.num_dirs++;
+	else
+		dp->dir.sel.num_files++;
+	dp->dir.sel.num_bytes += g_file_info_get_size((GFileInfo *) fi);
+}
+
+/* 1999-04-08 -	Clear the selected statistics. */
+static void clear_selection_stats(SelInfo *sel)
+{
+	if(sel != NULL)
+	{
+		sel->num_dirs = 0;
+		sel->num_files = 0;
+		sel->num_bytes = 0;
+	}
+}
+
+/* 1999-04-09 -	Clear the total statistics fields for <dp>. */
+static void clear_total_stats(DirPane *dp)
+{
+	dp->dir.tot_files = dp->dir.tot_dirs = 0;
+	dp->dir.tot_bytes = 0;
+ 	dp->dir.fs.valid = FALSE;
+}
+
+/* 1999-01-03 -	Clear the statistics for <dp>. Useful when the pane's path is about to change. */
+static void clear_stats(DirPane *dp)
+{
+	clear_total_stats(dp);
+	clear_selection_stats(&dp->dir.sel);
+	dp->last_row = dp->last_row2 = -1;
+}
+
+/* 1999-04-08 -	Update the selection statistics for <dp>, by simply flushing them and recomputing from
+**		scratch. Does NOT use dp_get_selection(), for performance reasons (this is run on every
+**		unselection).
 */
-static gint numeric_strcmp(const gchar *a, const gchar *b)
+static void update_selection_stats(DirPane *dp)
+{
+	GtkTreeModel	*model = dp_get_tree_model(dp);
+	GtkTreeIter	iter;
+	SelInfo		*sel = &dp->dir.sel;
+
+	clear_selection_stats(sel);
+	if(gtk_tree_model_get_iter_first(model, &iter))
+	{
+		GtkTreeSelection	*ts = gtk_tree_view_get_selection(GTK_TREE_VIEW(dp->view));
+
+		/* Don't use gtk_tree_selection_get_selected_rows(), it's kind of costly. */
+		do
+		{
+			if(gtk_tree_selection_iter_is_selected(ts, &iter))
+			{
+				GFileInfo	*fi;
+
+				gtk_tree_model_get(model, &iter, COL_INFO, &fi, -1);
+				selection_add_row(dp, fi);
+			}
+		} while(gtk_tree_model_iter_next(model, &iter));
+	}
+}
+
+/* 1999-04-09 -	Update the tot_XXX fields in <dp>'s directory statistics. Handy after a (Get|Clear)Size. */
+void dp_update_stats(DirPane *dp)
 {
+	GtkTreeModel	*model = dp_get_tree_model(dp);
+	GtkTreeIter	iter;
 
-	for(;*a && *b;)
+	clear_total_stats(dp);
+	clear_selection_stats(&dp->dir.sel);
+	if(gtk_tree_model_get_iter_first(model, &iter))
 	{
-		if(isdigit((guchar) *a) && isdigit((guchar) *b))
+		GtkTreeSelection	*ts = gtk_tree_view_get_selection(GTK_TREE_VIEW(dp->view));
+
+		do
 		{
-			gint	rel;
+			GFileInfo	*fi;
+
+			gtk_tree_model_get(model, &iter, COL_INFO, &fi, -1);
+			statistics_add_row(dp, fi);
+			if(gtk_tree_selection_iter_is_selected(ts, &iter))
+				selection_add_row(dp, fi);
+		} while(gtk_tree_model_iter_next(model, &iter));
+	}
+}
+
+/* 1999-03-30 -	Update information about filesystem for given <dp>. */
+static void update_fs_info(DirPane *dp)
+{
+	GFileInfo	*fi;
 
-			rel = compare_decimal(&a, &b);
-			if(rel != 0)
-				return rel;
+	if((fi = g_file_query_filesystem_info(dp->dir.root, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE "," G_FILE_ATTRIBUTE_FILESYSTEM_FREE, NULL, NULL)) != NULL)
+	{
+		dp->dir.fs.fs_size = g_file_info_get_attribute_uint64(fi, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE);
+		dp->dir.fs.fs_free = g_file_info_get_attribute_uint64(fi, G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
+	}
+	dp->dir.fs.valid = (fi != NULL) && dp->dir.fs.fs_size > 0;
+}
+
+void dp_path_clear(DirPane *dp)
+{
+	GtkListStore	*store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(dp->path)));
+
+	gtk_list_store_clear(store);
+}
+
+void dp_path_focus(DirPane *dp)
+{
+	gtk_widget_grab_focus(dp->path);
+}
+
+void dp_path_unfocus(DirPane *dp)
+{
+	gtk_widget_grab_focus(dp->hide);
+#if 0
+	GdkEvent	fe;
+
+	/* HACK: This fakes a focus-out event on the path entry combo widget, which seems to work. */
+	fe.focus_change.type = GDK_FOCUS_CHANGE;
+	/* FIXME: If we required GTK+ 2.14 and greater, we could use gtk_widget_get_window(). */
+	fe.focus_change.window = GTK_WIDGET(dp->path)->window;
+	fe.focus_change.send_event = TRUE;
+	fe.focus_change.in = FALSE;
+	gtk_main_do_event(&fe);
+#endif
+}
+
+/* 2010-06-05 -	Internal "do it" routine to enter a new directory. Uses GIO error handling for all I/O. */
+static gboolean do_enter_dir(DirPane *dp, const gchar *path, GError **err)
+{
+	GFile		*here;
+	GFileEnumerator	*fe;
+
+	if((here = g_vfs_parse_name(dp->main->vfs.vfs, path)) == NULL)
+		return FALSE;
+
+	if((fe = g_file_enumerate_children(here, "*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, err)) != NULL)
+	{
+		GFileInfo	*fi, *tfi;
+		GtkTreeIter	iter;
+
+		if(dp->dir.root != NULL)
+			g_object_unref(dp->dir.root);
+		dp->dir.root = here;
+		gtk_list_store_clear(dp->dir.store);
+		g_strlcpy(dp->dir.path, path, sizeof dp->dir.path);
+
+		/* Decide whether the current directory is "local". */
+		if((fi = g_file_query_filesystem_info(here, G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW, NULL, err)) != NULL)
+		{
+			dp->dir.is_local = g_file_info_get_attribute_uint32(fi, G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW) != G_FILESYSTEM_PREVIEW_TYPE_NEVER;
+			g_object_unref(fi);
 		}
-		else if(*a != *b)
-			break;
 		else
-			a++, b++;
+			dp->dir.is_local = TRUE;
+
+		while((fi = g_file_enumerator_next_file(fe, NULL, err)) != NULL)
+		{
+			const gchar	*name = g_file_info_get_name(fi), *fn, *tname;
+			guint32		flags;
+			gchar		*ck;
+			gunichar	initial;
+
+			/* Apply classic Hide filtering rule. Nice. */
+			if(!(dp->main->cfg.dir_filter(name) && fut_check_hide(dp, name)))
+			{
+				g_object_unref(fi);
+				continue;
+			}
+			flags = (g_file_info_get_file_type(fi) != G_FILE_TYPE_DIRECTORY) ? DPRF_HAS_SIZE : 0;
+			fn = g_file_info_get_display_name(fi);
+			initial = g_utf8_get_char(fn);
+			ck = g_utf8_collate_key_for_filename(fn, -1);
+			/* The modern default is to be case-insensitive, glib's collation keys always are.
+			 * For us bearded old-sk00l folks, let's implement a kinda-sorta case-sensitive
+			 * collation key, based on the initial only. I think this will be Good Enough.
+			 *
+			 * It is a bit limited (@test and @TEST won't sort as you'd expect), but short.
+			*/
+			if(!dp->main->cfg.dp_formatdp->index.sort.nocase)
+			{
+				const gchar	ORDER_PUNCTUATION = '\1';
+				const gchar	ORDER_UPPERCASE = '\2';
+				const gchar	ORDER_LOWERCASE = '\3';
+
+				const size_t	out = strlen(ck) + 2;
+				gchar		*csck, *put;
+
+				if((csck = g_malloc(out)) != NULL)
+				{
+					put = csck;
+					if(g_unichar_ispunct(initial))
+						*put++ = ORDER_PUNCTUATION;
+					else if(g_unichar_isupper(initial))
+						*put++ = ORDER_UPPERCASE;
+					else if(g_unichar_islower(initial))
+						*put++ = ORDER_LOWERCASE;
+					memcpy(put, ck, out - 1);
+					g_free(ck);
+					ck = csck;
+				}
+			}
+			/* If the local object looks like a symbolic link, chase down the link target too.
+			 * This is not exactly Captain Slim on the memory side, but very handy especially
+			 * since we want to do things like style links to directories like directories.
+			 * Pre-GIO versions of gentoo did this too, by storing extra struct stats for links.
+			 */
+			if((tname = g_file_info_get_symlink_target(fi)) != NULL)
+			{
+				GFile	*target;
+
+				/* Try to be clever and figure out how to interpret the link target text. */
+				if(strstr(tname, "://") != NULL)	/* Does it look like an URI? */
+				{
+					target = g_vfs_get_file_for_uri(dp->main->vfs.vfs, tname);
+				}	/* No, does it look like a relative path, then? */
+				else if(strncmp(tname, "./", 2) == 0 || strncmp(tname, "..", 2) == 0)
+				{
+					target = g_file_resolve_relative_path(here, tname);
+				}
+				else	/* Assume just bare name, meaning link to child with same root. */
+				{
+					target = g_file_get_child(here, tname);
+				}
+				if(target != NULL)
+				{
+					GError	*terr = NULL;
+
+					/* If we got something, try to query the info for it. */
+					tfi = g_file_query_info(target, "standard::*", G_FILE_QUERY_INFO_NONE, NULL, &terr);
+					g_object_unref(G_OBJECT(target));
+					if(tfi != NULL && terr == NULL)
+					{
+						flags |= DPRF_LINK_EXISTS;
+						if(g_file_info_get_file_type(tfi) == G_FILE_TYPE_DIRECTORY)
+							flags |= DPRF_LINK_TO_DIR;
+					}
+					g_clear_error(&terr);
+				}
+			}
+			else
+				tfi = NULL;
+
+			gtk_list_store_append(dp->dir.store, &iter);
+			gtk_list_store_set(dp->dir.store, &iter,
+					COL_FILE, NULL,
+					COL_INFO, fi,
+					COL_FLAGS, flags,
+					COL_FILENAME_COLLATE_KEY, ck,
+					tfi != NULL ? COL_LINK_TARGET_INFO : -1, tfi,	/* Not too clever, I hope. */
+					-1);
+			statistics_add_row(dp, fi);
+			g_free(ck);
+			if(tfi)
+				g_object_unref(G_OBJECT(tfi));
+			g_object_unref(G_OBJECT(fi));
+		}
+		g_object_unref(fe);
 	}
-#if defined ENABLE_NLS
+	if(fe != NULL)
 	{
-		gchar	buf4 = { 0, 0, 0, 0 };
+		GtkTreeIter	iter;
 
-		buf0 = *a;
-		buf2 = *b;
-		return the_strcmp_case(buf, buf + 2);
+		typ_identify_begin(dp);
+		if(gtk_tree_model_get_iter_first(GTK_TREE_MODEL(dp->dir.store), &iter))
+		{
+			do
+			{
+				typ_identify(dp, &iter);
+			} while(gtk_tree_model_iter_next(GTK_TREE_MODEL(dp->dir.store), &iter));
+		}
+		if(!typ_identify_end(dp))
+			fe = NULL;
 	}
-#else
-	return *a - *b;
-#endif
+	return fe != NULL;
 }
 
-/* 1999-08-29 -	Compare two strings, while dealing with embedded numerals in an "intelligent" fashion.
-**		Will compare "yo-12" as being greater than "yo-5", for example. Ignores case.
-** 2002-06-16 -	Made slightly more I18N-aware, through minimal use of strcoll(). Not Unicode clean!
+/* 2003-11-14 -	Brand new version of this very old workhorse. Now reads in the directory in a single
+**		pass, using realloc() to grow various buffers on the fly. Slightly more wasteful of
+**		memory than the old two-pass version, but less code, more robust, and possibly a
+**		little bit faster. Returns TRUE on success.
 */
-static gint numeric_strcasecmp(const gchar *a, const gchar *b)
+gboolean dp_enter_dir(DirPane *dp, const gchar *path)
 {
-	for(;*a && *b;)
+	GError		*err = NULL;
+	gboolean	ok;
+
+	clear_stats(dp);
+	dp_unfocus(dp);
+
+	completion_clear(dp);
+
+	the_sort   = dp->main->cfg.dp_formatdp->index.sort;	/* Must be accessible by qsort() callbacks. */
+
+	if((ok = do_enter_dir(dp, path, &err)) == TRUE)
 	{
-		if(isdigit((guchar) *a) && isdigit((guchar) *b))
+		const gboolean	has_parent = g_file_has_parent(dp->dir.root, NULL);
+
+		update_fs_info(dp);
+		gtk_widget_set_sensitive(dp->parent, has_parent);
+		if(dp->hparent != NULL)
+			gtk_widget_set_sensitive(dp->hparent, has_parent);
+	}
+	else if(err)
+		err_set_gerror(dp->main, &err, path, NULL);
+
+	return ok;
+}
+
+/* ----------------------------------------------------------------------------------------- */
+
+/* 2002-07-20 -	Rescan contents of given pane.
+** NOTE NOTE	This routine does NOT change the error status, i.e. it does not call anything
+**		in the error module. This is important, since it's used in the exiting code
+**		of generic commands, for instance.
+** 2003-09-26 -	Don't activate <dp> for refresh, just do it anyway. Faster, hopefully safe.
+*/
+void dp_rescan(DirPane *dp)
+{
+	dph_state_save(dp);
+	dp_enter_dir(dp, dp->dir.path);
+	dph_state_restore(dp);
+}
+
+/* 2002-07-23 -	Special "weaker" version of dp_rescan(), with the added semantic difference that
+**		this is only ever called as part of the "clean-up" *after* a command has finished.
+**		The intent is to catch any changes to the pane done by the command, such as a
+**		deleted, renamed, moved or otherwise changed file. The reason it has a separate
+**		entrypoint is that with FAM, this needs to be stopped.
+** 2009-11-15 -	Rewritten, now that "FAM" is actually just an alias for GIO monitoring.
+*/
+void dp_rescan_post_cmd(DirPane *dp)
+{
+	if(!fam_is_monitored(dp))
+		dp_rescan(dp);
+}
+
+/* 2009-10-16 -	Rescans a single row of a pane. Handy for ClearSize, for instance. Not to be used for bulk reading. */
+gboolean dp_rescan_row(DirPane *dp, const DirRow2 *row, GError **error)
+{
+	GFile		*file;
+	GFileInfo	*fi = NULL;
+
+	if(dp == NULL || row == NULL)
+		return FALSE;
+	if((file = dp_get_file_from_row(dp, row)) != NULL)
+	{
+		GtkTreeModel	*m = dp_get_tree_model(dp);
+
+		if((fi = g_file_query_info(file, "*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, error)) != NULL)
 		{
-			gint	rel;
+			guint32	flags;
 
-			rel = compare_decimal(&a, &b);
-			if(rel != 0)
-				return rel;
+			/* Computes new flags value; clears HAS_SIZE for directories. */
+			gtk_tree_model_get(m, (GtkTreeIter *) row, COL_FLAGS, &flags, -1);
+			flags &= ~DPRF_HAS_SIZE;
+			flags |= (g_file_info_get_file_type(fi) != G_FILE_TYPE_DIRECTORY) ? DPRF_HAS_SIZE : 0;
+			gtk_list_store_set(GTK_LIST_STORE(m), (GtkTreeIter *) row, COL_INFO, fi, COL_FLAGS, flags, -1);
+		}
+		g_object_unref(file);
+	}
+	return fi != NULL;
+}
+
+/* ----------------------------------------------------------------------------------------- */
+
+/* 2008-09-20 -	Sets the history strings, available in the combo box. This is to prevent
+**		other modules (dirhistory, I'm looking at you!) from poking the widgets
+**		directly. Abstract, hide, and so on.
+** 2010-02-09 -	Converted to assume too much about dirhistory's internals. The list is now
+**		supposed to point at structures, that begin with a gchar * URI. Yes.
+*/
+void dp_history_set(DirPane *dp, const GList *locations)
+{
+	GtkListStore	*store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(dp->path)));
+	GtkTreeIter	iter;
+	guint		i;
+
+	gtk_list_store_clear(store);
+	for(i = 0; locations != NULL; locations = g_list_next(locations))
+	{
+		const gchar	*name = dph_entry_get_parse_name(locations->data);
+
+		if(*name)
+		{
+			gtk_list_store_append(store, &iter);
+			gtk_list_store_set(store, &iter, 0, name, -1);
+			i++;
 		}
-		else if(tolower((guchar) *a) != tolower((guchar) *b))
+	}
+	if(i > 0)
+	{
+		/* Was there any history set? If so, also jump to the first entry. */
+		g_signal_handler_block(G_OBJECT(gtk_bin_get_child(GTK_BIN(dp->path))), dp->sig_path_activate);
+		g_signal_handler_block(G_OBJECT(dp->path), dp->sig_path_changed);
+		gtk_combo_box_set_active(GTK_COMBO_BOX(dp->path), 0);
+		g_signal_handler_unblock(G_OBJECT(dp->path), dp->sig_path_changed);
+		g_signal_handler_unblock(G_OBJECT(gtk_bin_get_child(GTK_BIN(dp->path))), dp->sig_path_activate);
+	}
+}
+
+/* ----------------------------------------------------------------------------------------- */
+
+/* 2009-07-04 -	Refreshes the split, making sure it's correctly sized according to current settings. */
+void dp_split_refresh(MainInfo *min)
+{
+	gint	pw, ph, np, pos;
+
+	if(min == NULL || min->gui == NULL || min->gui->panes == NULL)
+		return;
+	if(!dp_realized(min))
+		return;
+
+	/* Inspect the size of the GtkPaned that holds the panes; the window's size
+	** doesn't work for vertical due to buttons. This is slightly hackish.
+	*/
+	gdk_window_get_size(min->gui->panes->window, &pw, &ph);
+	np = min->cfg.dp_paning.orientation == DPORIENT_HORIZ ? pw : ph;
+
+	/* Compute the proper new position, depending on the active paning mode. */
+	switch(min->cfg.dp_paning.mode)
+	{
+		case DPSPLIT_FREE:
+			return;
+		case DPSPLIT_RATIO:
+			pos = np * min->cfg.dp_paning.value;
+			break;
+		case DPSPLIT_ABS_LEFT:
+			pos = min->cfg.dp_paning.value;
+			break;
+		case DPSPLIT_ABS_RIGHT:
+			pos = np - min->cfg.dp_paning.value;
 			break;
-		else
-			a++, b++;
 	}
-#if defined ENABLE_NLS
+	if(pos >= 0)
 	{
-		gchar	buf4 = { 0, 0, 0, 0 };
-
-		buf0 = *a;
-		buf2 = *b;
-		return the_strcmp_nocase(buf, buf + 2);
+		g_signal_handler_block(G_OBJECT(min->gui->window), min->gui->sig_main_configure);
+		g_signal_handler_block(G_OBJECT(min->gui->panes), min->gui->sig_pane_notify);
+		gtk_paned_set_position(GTK_PANED(min->gui->panes), pos);
+		g_signal_handler_unblock(G_OBJECT(min->gui->panes), min->gui->sig_pane_notify);
+		g_signal_handler_unblock(G_OBJECT(min->gui->window), min->gui->sig_main_configure);
 	}
-#else
-	return tolower((guchar) *a) - tolower((guchar) *b);
-#endif
 }
 
-/* 1999-04-27 -	Resort the rows of <dp>, according to its format's sort info. Does not cause
-**		a redisplay; call dp_redisplay() for that.
-** 1999-05-30 -	Fixed a BIG problem: resorting messed up the stat->lstat connections on non-link
-**		rows. Very, very bad.
+/* ----------------------------------------------------------------------------------------- */
+
+/* 2003-11-08 -	Add a pathwidgtry user. Indirect, just adds a function that is later called
+**		(in dp_build()) to construct the widgetry. Returns key to use with show().
 */
-void dp_resort(DirPane *dp)
+guint dp_pathwidgetry_add(PageBuilder func)
 {
-	guint	i;
-
-	/* "NULL out" any non-link stat fields, to avoid breaking links during resorting. */
-	for(i = 0; i < dp->dir.num_rows; i++)
+	if(func && !g_slist_find(pathwidgetry_builders, func))
 	{
-		if(DP_ROW_GET_STAT(dp->dir.row + i) == &DP_ROW_LSTAT(dp->dir.row + i))
-			DP_ROW_SET_STAT(dp->dir.row + i, NULL);
+		pathwidgetry_builders = g_slist_append(pathwidgetry_builders, func);
+		return g_slist_length(pathwidgetry_builders);
 	}
+	return 0;
+}
 
-	the_sort   = dp->main->cfg.dp_formatdp->index.sort;	/* Must be accessible by qsort() callbacks. */
-	the_strcmp = the_sort.numerical ? (the_sort.nocase  ? numeric_strcasecmp : numeric_strcmp) :
-			the_sort.nocase ? the_strcmp_nocase : the_strcmp_case;
-
-	/* Resort the DirRow structures. */
-	qsort(dp->dir.row, dp->dir.num_rows, sizeof *dp->dir.row, choose_sorter(dp));
+/* 2003-11-08 -	Change to a new page of dirpane path widgetry. Returns page. */
+GtkWidget ** dp_pathwidgetry_show(DirPane *dp, guint key)
+{
+	GtkWidget	*page;
 
-	/* Now re-connect any NULL stat links, thus making them point at the lstat fields again. */
-	for(i = 0; i < dp->dir.num_rows; i++)
+	if((page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(dp->notebook), key)) != NULL)
 	{
-		if(DP_ROW_GET_STAT(dp->dir.row + i) == NULL)
-			DP_ROW_SET_STAT(dp->dir.row + i, &DP_ROW_LSTAT(dp->dir.row + i));
+		gtk_notebook_set_current_page(GTK_NOTEBOOK(dp->notebook), key);
+		return g_object_get_data(G_OBJECT(page), "dp-pathwidgetry");
 	}
+	return NULL;
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1999-04-27 -	Redisplay given pane. Will totally clear the GtkCList widget, and reformat
-**		all row data into it. Does *not* resort the pane's contents; use (the new)
-**		dp_resort() function for that. Also does *not* preserve the set of selected
-**		rows or the vertical position; use dp_redisplay_preserve() for that.
-*/
-void dp_redisplay(DirPane *dp)
+GtkTreeModel * dp_get_tree_model(const DirPane *dp)
 {
-	gchar	bufferDP_MAX_COLUMNS2 * PATH_MAX, *bufDP_MAX_COLUMNS;
-	guint	i, j, row, nc;
-
-	dp_freeze(dp);						/* Reduce ugly flicker. */
-	gtk_clist_clear(dp->list);
-	nc = dp->main->cfg.dp_formatdp->index.num_columns;
-	for(i = 0; i < dp->dir.num_rows; i++)
-	{
-		for(j = 0; j < nc; j++)
-			bufj = bufferj;
-		for(j = 0; j < nc; j++)
-			dpf_format_column(dp->main, dp, &dp->dir.rowi, j, &bufj);
-		row = gtk_clist_append(dp->list, buf);
-		gtk_clist_set_row_data(GTK_CLIST(dp->list), row, &dp->dir.rowi);
-		dpf_post_format_row(dp->main, dp, row);
-	}
-	dp_thaw(dp);
+	return (dp != NULL) ? GTK_TREE_MODEL(dp->dir.store) : NULL;
 }
 
-/* 1999-04-27 -	Redisplay given pane, keeping both the selected set and the vertical position.
-**		This is the one to use in most cases.
-*/
-void dp_redisplay_preserve(DirPane *dp)
+GFile * dp_get_file_from_row(const DirPane *dp, const DirRow2 *row)
 {
-	DHSel	*sel;
-	gfloat	vpos;
+	if(dp == NULL || row == NULL)
+		return NULL;
+	return g_file_get_child(dp->dir.root, dp_row_get_name(GTK_TREE_MODEL(dp->dir.store), row));
+}
 
-	sel  = dph_dirsel_new(dp);
-	vpos = dph_vpos_get(dp);
-	dp_redisplay(dp);
-	dph_vpos_set(dp, vpos);
-	dph_dirsel_apply(dp, sel);
-	dph_dirsel_destroy(sel);
+GFile * dp_get_file_from_name(const DirPane *dp, const gchar *name)
+{
+	if(dp == NULL || name == NULL)
+		return NULL;
+	return g_file_get_child(dp->dir.root, name);
 }
 
-/* ----------------------------------------------------------------------------------------- */
+GFile * dp_get_file_from_name_display(const DirPane *dp, const gchar *name)
+{
+	if(dp == NULL || name == NULL)
+		return NULL;
+	return g_file_get_child_for_display_name(dp->dir.root, name, NULL);
+}
 
-/* 1999-05-10 -	Unfocus the currently focused row of <dp>, if any. */
-void dp_unfocus(DirPane *dp)
+static void row_emit_changed(GtkTreeModel *model, const DirRow2 *row)
 {
-	if((dp != NULL) && (dp->focus_row >= 0))
+	GtkTreePath	*path;
+
+	if((path = gtk_tree_model_get_path(model, (GtkTreeIter *) row)) != NULL)
 	{
-		gtk_clist_set_row_style(dp->list, dp->focus_row, NULL);
-		dp->old_focus_row = dp->focus_row;
-		dp->focus_row = -1;
+		gtk_tree_model_row_changed(model, path, (GtkTreeIter *) row);
+		gtk_tree_path_free(path);
 	}
 }
 
-/* 1999-05-10 -	Attempt to focus the <row>'th row of <dp>. If there was a previous
-**		row focused, unfocus it first.
-** 2000-02-03 -	Rewritten, slightly. Now disables focusing if someone attempts to
-**		focus outside of the legal range, relying on higher-level code to
-**		apply sugar like edge wrapping.
-*/
-void dp_focus(DirPane *dp, gint row)
+void dp_row_set_ftype(GtkTreeModel *model, const DirRow2 *row, FType *ft)
 {
-	if(focus_style == NULL)
-	{
-		focus_style = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(dp->list)));
+	gtk_list_store_set(GTK_LIST_STORE(model), (GtkTreeIter *) row, COL_FTYPE, ft, -1);
+	row_emit_changed(model, row);
+}
 
-		focus_style->baseGTK_STATE_NORMAL = dp->main->cfg.dp_colors.colorDPCOL_FOCUS_UNSELECTED;
-		focus_style->bgGTK_STATE_SELECTED = dp->main->cfg.dp_colors.colorDPCOL_FOCUS_SELECTED;
-	}
+void dp_row_set_size(GtkTreeModel *model, const DirRow2 *row, guint64 size)
+{
+	GFileInfo	*fi;
 
-	dp_unfocus(dp);
+	gtk_tree_model_get(model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	g_file_info_set_size(fi, size);
+	/* Notify the owning GtkTreeModel that the data has changed; refreshes TreeViews. */
+	row_emit_changed(model, row);
+}
 
-	if((row < 0) || (row >= dp->dir.num_rows))
-	{
-		dp->focus_row = -1;
-		return;
-	}
+void dp_row_set_flag(GtkTreeModel *model, const DirRow2 *row, guint32 mask)
+{
+	guint32	old;
 
-	/* Bring the focused row into view, minimizing disruption while doing so. */
-	if(gtk_clist_row_is_visible(dp->list, row) != GTK_VISIBILITY_FULL)
-	{
-		if((dp->focus_row != -1))		/* Is there an already focused row? */
-		{
-			gint	delta = row - dp->focus_row;
+	gtk_tree_model_get(model, (GtkTreeIter *) row, COL_FLAGS, &old, -1);
+	gtk_list_store_set(GTK_LIST_STORE(model), (GtkTreeIter *) row, COL_FLAGS, old | mask, -1);
+}
 
-			if(ABS(delta) == 1)
-				gtk_clist_moveto(dp->list, row, -1, delta < 0 ? 0.0 : 1.0, -1);
-			else
-				gtk_clist_moveto(dp->list, row, -1, 0.5, 0.5);
-		}
-		else
-			gtk_clist_moveto(dp->list, row, -1, 0.5, 0.5);	/* If no previous focus, center the new one. */
-	}
-	gtk_clist_set_row_style(dp->list, row, focus_style);
-	dp->focus_row = row;
+const gchar * dp_row_get_name(const GtkTreeModel *model, const DirRow2 *row)
+{
+	GFileInfo	*fi;
+
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_name(fi);
 }
 
-/* 2003-11-30 -	A new dir has been entered, figure out if there should be focusing. */
-void dp_focus_enter_dir(DirPane *dp)
+const gchar * dp_row_get_name_display(const GtkTreeModel *model, const DirRow2 *row)
 {
-	if(dp->focus_row != -1)
-		return;
-	if(dp->old_focus_row == -1)
-		return;
-	dp_focus(dp, 0);
+	GFileInfo	*fi;
+
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_display_name(fi);
 }
 
-/* ----------------------------------------------------------------------------------------- */
+const gchar * dp_row_get_name_edit(const GtkTreeModel *model, const DirRow2 *row)
+{
+	GFileInfo	*fi;
 
-/* 1998-05-25 -	Moved this old workhorse into the new dirpane module, and discovered that
-**		it wasn't commented. Lazy me. Also modified its prototype, to take the
-**		DirPane to display rather than figuring it out from MainInfo.
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_edit_name(fi);
+}
+
+FType * dp_row_get_ftype(const GtkTreeModel *model, const DirRow2 *row)
+{
+	FType	*ft = NULL;
+
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_FTYPE, &ft, -1);
+	return ft;
+}
+
+/* 2010-11-23 -	Returns the type of the object in the indicated row, or its target if it's a symlink
+ *		and target is true. If it's a broken symlink, G_FILE_TYPE_UNKNOWN is returned.
 */
-void dp_show_stats(DirPane *dp)
+GFileType dp_row_get_file_type(const GtkTreeModel *model, const DirRow2 *row, gboolean target)
 {
-	MainInfo *min;
+	guint32		flags;
+	GFileInfo	*fi, *tfi;
 
-	if((min = dp->main) != NULL)
+	/* On the assumption that this call is somewhat expensive, grab data for both if-branches. */
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_FLAGS, &flags, COL_INFO, &fi, COL_LINK_TARGET_INFO, &tfi, -1);
+	if(target && g_file_info_get_file_type(fi) == G_FILE_TYPE_SYMBOLIC_LINK)
 	{
-		static gchar	size_format128 = "";
-		gchar		buf256, selbuf32 = "", totbuf32 = "", *ptr = buf;
-		const SelInfo	*sel = &dp->dir.sel;
+		if((flags & DPRF_LINK_EXISTS) && tfi != NULL)
+			return g_file_info_get_file_type(tfi);
+		return G_FILE_TYPE_UNKNOWN;
+	}
+	return g_file_info_get_file_type(fi);
+}
 
-		ptr += g_snprintf(ptr, sizeof buf, _("%u/%u dirs, %u/%u files"),
-				  sel->num_dirs, dp->dir.tot_dirs,
-				  sel->num_files, dp->dir.tot_files);
-		sze_put_size64(selbuf, sizeof selbuf, sel->num_bytes,    SZE_AUTO);
-		sze_put_size64(totbuf, sizeof totbuf, dp->dir.tot_bytes, SZE_AUTO);
-		if(size_format0 == '\0')
-		{
-			/* Format into static variable, lives for the duration of the program. */
-			g_snprintf(size_format, sizeof size_format, _(" (%%s/%%s, %%%s/%%%s blocks)"), G_GUINT64_FORMAT, G_GUINT64_FORMAT);
-		}
-		sprintf(ptr, size_format, selbuf, totbuf, sel->num_blocks, dp->dir.tot_blocks);
-		if(dp->dir.fs.valid)
-		{
-			gchar	dbuf32, pbuf32;
+goffset dp_row_get_size(const GtkTreeModel *model, const DirRow2 *row)
+{
+	GFileInfo	*fi;
 
-			sze_put_size64(dbuf, sizeof dbuf, (guint64) dp->dir.fs.stat.f_bsize * (guint64) (dp->dir.fs.stat.f_blocks - dp->dir.fs.stat.f_bavail), SZE_AUTO);
-			g_snprintf(pbuf, sizeof pbuf, "%.1f%%",
-				100.0 *
-				((gdouble) (dp->dir.fs.stat.f_blocks - dp->dir.fs.stat.f_bavail)
-				/
-				(gdouble) dp->dir.fs.stat.f_blocks));
-			ptr += sprintf(ptr, _(", %s (%s) used"), dbuf, pbuf);
-			sze_put_size64(dbuf, sizeof dbuf, (guint64) dp->dir.fs.stat.f_bsize * (guint64) dp->dir.fs.stat.f_bavail, SZE_AUTO);
-			ptr += sprintf(ptr, _(", %s free"), dbuf);
-		}
-		gtk_label_set_text(GTK_LABEL(min->gui->top), buf);
-	}
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_size(fi);
 }
 
-/* Blend from <a> to <b>. At <alpha>=0, <dst> is set to <a>, at 1 it is <b>.
-** This isn't as classy as a HSL-based blend, but on the other hand it is
-** a cute four lines of code.
-*/
-static void blend(GdkColor *dst, const GdkColor *a, const GdkColor *b, gfloat alpha)
+guint64 dp_row_get_blocks(const GtkTreeModel *model, const DirRow2 *row)
 {
-	const float ia = 1.0f - alpha;
+	GFileInfo	*fi;
 
-	dst->red   = alpha * a->red   + ia * b->red;
-	dst->green = alpha * a->green + ia * b->green;
-	dst->blue  = alpha * a->blue  + ia * b->blue;
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_attribute_uint64(fi, G_FILE_ATTRIBUTE_UNIX_BLOCKS);
 }
 
-/* 1998-09-06 -	Set background color of all <dp>'s column buttons. If <col> is NULL,
-**		the default background color (actually, the entire default style) will be used.
-*/
-static void dp_set_col_color(DirPane *dp, const GdkColor *col)
+guint64 dp_row_get_blocksize(const GtkTreeModel *model, const DirRow2 *row)
 {
-	guint	i;
+	GFileInfo	*fi;
 
-	if(dp != NULL)
-	{
-		GdkColor	bright, white, *pl = NULL;
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_attribute_uint64(fi, G_FILE_ATTRIBUTE_UNIX_BLOCKS) * g_file_info_get_attribute_uint32(fi, G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE);
+}
 
-		if(col != NULL)
-		{
-			white.red = white.green = white.blue = ~0;
-			blend(&bright, &white, col, 0.7f);
-			pl = &bright;
-		}
-		for(i = 0; i < GTK_CLIST(dp->list)->columns; i++)
-		{
-			gtk_widget_modify_bg(GTK_CLIST(dp->list)->columni.button, GTK_STATE_NORMAL,   col);
-			gtk_widget_modify_bg(GTK_CLIST(dp->list)->columni.button, GTK_STATE_PRELIGHT, pl);
-		}
-	}
+guint32 dp_row_get_mode(const GtkTreeModel *model, const DirRow2 *row)
+{
+	GFileInfo	*fi;
+
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_attribute_uint32(fi, G_FILE_ATTRIBUTE_UNIX_MODE);
 }
 
-/* 2002-07-14 -	Do the pane rendering necessary to change active pane from <from> into <to>. */
-static void activate_render(DirPane *from, DirPane *to)
+guint64 dp_row_get_time_accessed(const GtkTreeModel *model, const DirRow2 *row)
 {
-	if(from != NULL)
-	{
-		dp_unfocus(from);
-		dp_set_col_color(from, NULL);
-	}
-	if(to != NULL)
-	{
-		dp_set_col_color(to, &to->main->cfg.dp_colors.colorDPCOL_PANE_SELECTED);
-		dp_show_stats(to);
-		if(to->old_focus_row >= 0)
-			dp_focus(to, to->old_focus_row);
-	}
+	GFileInfo	*fi;
+
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_attribute_uint64(fi, G_FILE_ATTRIBUTE_TIME_ACCESS);
 }
 
-/* 1999-06-09 -	Activate <dp>, making it the source pane for all operations. Returns TRUE if the activation
-**		meant that another pane was deactivated, FALSE if <dp> was already the activate pane.
-*/
-gboolean dp_activate(DirPane *dp)
+guint64 dp_row_get_time_changed(const GtkTreeModel *model, const DirRow2 *row)
 {
-	if(dp != NULL && dp->main->gui->cur_pane != dp)
-	{
-		activate_render(dp->main->gui->cur_pane, dp);
-		dp->main->gui->cur_pane = dp;
-		return TRUE;
-	}
-	return FALSE;
+	GFileInfo	*fi;
+
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_attribute_uint64(fi, G_FILE_ATTRIBUTE_TIME_CHANGED);
 }
 
-/* 2002-07-13 -	This runs when GTK+ is idle, and does the pane activation rendering, once. */
-static gint idle_activate(gpointer data)
+guint64 dp_row_get_time_created(const GtkTreeModel *model, const DirRow2 *row)
 {
-	activate_render(the_activate_queue_info.old_cur, ((MainInfo *) data)->gui->cur_pane);
-	gtk_idle_remove(the_activate_queue_info.handler);
-	the_activate_queue_info.handler = 0U;
-	return 0;
+	GFileInfo	*fi;
+
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_attribute_uint64(fi, G_FILE_ATTRIBUTE_TIME_CREATED);
 }
 
-/* 2002-07-13 -	Activate a pane, but queue the rendering until GTK+ is idle. This works around
-**		a very annoying bug/misfeature which causes "ghost" pane scrolling to occur.
-**		We only queue the rendering, since that seems to suffice, and we need to really
-**		change gentoo's idea of "active pane" immediately or things break.
-*/
-static void dp_activate_queued(DirPane *dp)
+guint64 dp_row_get_time_modified(const GtkTreeModel *model, const DirRow2 *row)
 {
-	if(the_activate_queue_info.handler)
-		gtk_idle_remove(the_activate_queue_info.handler);
-	the_activate_queue_info.handler = gtk_idle_add(idle_activate, dp->main);
-	the_activate_queue_info.old_cur = dp->main->gui->cur_pane;
-	dp->main->gui->cur_pane = dp;
+	GFileInfo	*fi;
+
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_attribute_uint64(fi, G_FILE_ATTRIBUTE_TIME_MODIFIED);
 }
 
-/* ----------------------------------------------------------------------------------------- */
+guint32 dp_row_get_device(const GtkTreeModel *model, const DirRow2 *row)
+{
+	GFileInfo	*fi;
 
-/* 1999-03-05 -	Answer whether given pane has one or more rows selected or not. */
-gboolean dp_has_selection(DirPane *dp)
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_attribute_uint32(fi, G_FILE_ATTRIBUTE_UNIX_RDEV);
+}
+
+guint32 dp_row_get_gid(const GtkTreeModel *model, const DirRow2 *row)
 {
-	return (dp->dbclk_row != -1) || (dp->focus_row != -1) || (GTK_CLIST(dp->list)->selection != NULL && !no_repeat);
+	GFileInfo	*fi;
+
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_attribute_uint32(fi, G_FILE_ATTRIBUTE_UNIX_GID);
 }
 
-/* 1999-03-06 -	Answer whether given <row> is currently selected. A bit more efficient
-**		than getting the entire list through dp_get_selection(), but only if
-**		you're not going to iterate the selection anyway.
-*/
-gboolean dp_is_selected(DirPane *dp, DirRow *row)
+guint32 dp_row_get_uid(const GtkTreeModel *model, const DirRow2 *row)
 {
-	if((dp != NULL) && (row != NULL))
-	{
-		if((GTK_CLIST(dp->list)->selection == NULL) && dpf_get_fake_select() && (DP_ROW_INDEX(dp, row) == dp->focus_row))
-			return TRUE;
-		return g_list_find(GTK_CLIST(dp->list)->selection, GINT_TO_POINTER(DP_ROW_INDEX(dp, row))) != NULL;
-	}
-	return FALSE;
+	GFileInfo	*fi;
+
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_attribute_uint32(fi, G_FILE_ATTRIBUTE_UNIX_UID);
 }
 
-/* 1999-03-15 -	Compare two rows based on their indexes in the directory. Assumes their addresses
-**		are comparable, which they really should be.
-*/
-static gint compare_rows(gconstpointer a, gconstpointer b)
+guint32 dp_row_get_nlink(const GtkTreeModel *model, const DirRow2 *row)
 {
-	return GPOINTER_TO_UINT(a) - GPOINTER_TO_UINT(b);
+	GFileInfo	*fi;
+
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_attribute_uint32(fi, G_FILE_ATTRIBUTE_UNIX_NLINK);
 }
 
-/* 1999-03-04 -	Return a GSList of selected rows. Each item's data member is a DirRow.
-**		Knows how to deal with a double click, too. This is going to be the new
-**		interface for all commands.
-** 1999-03-15 -	Now sorts the rows in address order, since otherwise the selection retains
-**		the order in which it was done by the user, and that is simply confusing.
-*/
-GSList * dp_get_selection(DirPane *dp)
+const gchar * dp_row_get_link_target(const GtkTreeModel *model, const DirRow2 *row)
 {
-	GList	*iter;
-	GSList	*sel = NULL;
+	GFileInfo	*fi;
 
-	no_repeat = FALSE;
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_attribute_byte_string(fi, G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET);
+}
 
-	if(dp->dbclk_row != -1)
-		sel = g_slist_append(sel, gtk_clist_get_row_data(GTK_CLIST(dp->list), dp->dbclk_row));
-	else if((dp->focus_row != -1) && dpf_get_fake_select() && (GTK_CLIST(dp->list)->selection == NULL))
-	{
-		sel = g_slist_append(sel, gtk_clist_get_row_data(GTK_CLIST(dp->list), dp->focus_row));
-		no_repeat = TRUE;
-	}
-	else
-		for(iter = GTK_CLIST(dp->list)->selection; iter != NULL; iter = g_list_next(iter))
-			sel = g_slist_insert_sorted(sel, gtk_clist_get_row_data(GTK_CLIST(dp->list), GPOINTER_TO_INT(iter->data)),
-							compare_rows);
-	if(sel)
-		fam_rescan_block();
+gboolean dp_row_get_flags(const GtkTreeModel *model, const DirRow2 *row, guint32 mask)
+{
+	guint32	flags;
 
-	return sel;
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_FLAGS, &flags, -1);
+	return (flags & mask) == mask;
 }
 
-/* 1999-03-06 -	Get the "full" selection, regardless of whether there's a double clicked row or not.
-**		This should only be used if you really know what you're doing, and never by actual
-**		commands (which need the double-click support).
-*/
-GSList * dp_get_selection_full(const DirPane *dp)
+gboolean dp_row_get_can_read(const GtkTreeModel *model, const DirRow2 *row)
 {
-	const GList	*iter;
-	GSList		*sel = NULL;
+	GFileInfo	*fi;
 
-	for(iter = GTK_CLIST(dp->list)->selection; iter != NULL; iter = g_list_next(iter))
-		sel = g_slist_append(sel, gtk_clist_get_row_data(GTK_CLIST(dp->list), GPOINTER_TO_INT(iter->data)));
-	if(sel)
-		fam_rescan_block();
-	return sel;
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_attribute_boolean(fi, G_FILE_ATTRIBUTE_ACCESS_CAN_READ);
 }
 
-#if 0
-/* 1999-03-05 -	A little routine handy for debugging. */
-void dp_print_selection(DirPane *dp, const gchar *tag)
+gboolean dp_row_get_can_write(const GtkTreeModel *model, const DirRow2 *row)
 {
-	GList	*iter;
+	GFileInfo	*fi;
 
-	fprintf(stderr, "%10s Selection: ", tag);
-	for(iter = GTK_CLIST(dp->list)->selection; iter != NULL; iter = g_list_next(iter))
-		fprintf(stderr, "'%d' ", GPOINTER_TO_INT(iter->data));
-	fprintf(stderr, "\n");
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_attribute_boolean(fi, G_FILE_ATTRIBUTE_ACCESS_CAN_READ);
 }
-#endif
 
-/* 1999-03-04 -	Free a selection list, handy when you're done traversing it. */
-void dp_free_selection(GSList *sel)
+gboolean dp_row_get_can_execute(const GtkTreeModel *model, const DirRow2 *row)
 {
-	if(sel != NULL)
-	{
-		g_slist_free(sel);
-		fam_rescan_unblock();
-	}
+	GFileInfo	*fi;
+
+	gtk_tree_model_get((GtkTreeModel *) model, (GtkTreeIter *) row, COL_INFO, &fi, -1);
+	return g_file_info_get_attribute_boolean(fi, G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE);
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1998-05-25 -	Count entries as they are read in. */
-static void statistics_add_entry(DirPane *dp, struct stat *stat)
+/* 2009-11-02 -	Porting of the old qsort_result() function, adjusts comparison result to implement directory/file-grouping. */
+static gint sort_result(gint r, GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, const GFileInfo *fia, const GFileInfo *fib)
 {
-	if(S_ISDIR(stat->st_mode))
-		dp->dir.tot_dirs++;
-	else
-		dp->dir.tot_files++;
-	dp->dir.tot_bytes  += stat->st_size;
-	dp->dir.tot_blocks += stat->st_blocks;
-}
+	guint32		flags;
+	gboolean	da, db;
 
-/* 1999-04-08 -	Clear the selected statistics. */
-static void clear_selection_stats(SelInfo *sel)
-{
-	if(sel != NULL)
+	/* Did the two rows compare equal? Then resolve by checking the names. */
+	if(r == 0)
 	{
-		sel->num_dirs = 0;
-		sel->num_files = 0;
-		sel->num_bytes = 0;
-		sel->num_blocks = 0;
+		gchar	*cka, *ckb;
+
+		/* Read out the previously created collation keys, and just compare them. */
+		gtk_tree_model_get(model, a, COL_FILENAME_COLLATE_KEY, &cka, -1);
+		gtk_tree_model_get(model, b, COL_FILENAME_COLLATE_KEY, &ckb, -1);
+		r = strcmp(cka, ckb);
+		/* FIXME: This feels highly inefficient ... To work around, column must be G_TYPE_POINTER. */
+		g_free(ckb);
+		g_free(cka);
+	}
+
+	/* Resolve type of the row. If not immediate directory, it might be a symlink to one. */
+	da = g_file_info_get_file_type((GFileInfo *) fia) == G_FILE_TYPE_DIRECTORY;
+	if(!da)
+	{
+		gtk_tree_model_get(model, a, COL_FLAGS, &flags, -1);
+		da = (flags & DPRF_LINK_TO_DIR) != 0;
+	}
+	db = g_file_info_get_file_type((GFileInfo *) fib) == G_FILE_TYPE_DIRECTORY;
+	if(!db)
+	{
+		gtk_tree_model_get(model, b, COL_FLAGS, &flags, -1);
+		db = (flags & DPRF_LINK_TO_DIR) != 0;
+	}
+
+	switch(the_sort.mode)
+	{
+		case DPS_DIRS_FIRST:
+			if(da == db)
+				return r;
+			else if(da)
+				return -1;
+			return 1;
+		case DPS_DIRS_LAST:
+			if(da == db)
+				return r;
+			else if(db)
+				return -1;
+			return 1;
+		case DPS_DIRS_MIXED:
+			return r;
 	}
+	return r;		/* I bet this doesn't ever run. Gcc doesn't. */
 }
 
-/* 1999-04-09 -	Clear the total statistics fields for <dp>. */
-static void clear_total_stats(DirPane *dp)
+/* 2009-11-04 -	Return sort result, generating initial value by comparing <va> and <vb>. */
+static gint sort_result_uint32(guint32 va, guint32 vb, GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, const GFileInfo *fia, const GFileInfo *fib)
 {
-	dp->dir.tot_files = dp->dir.tot_dirs = 0;
-	dp->dir.tot_bytes = dp->dir.tot_blocks = 0;
- 	dp->dir.fs.valid = FALSE;
+	if(va < vb)
+		return sort_result(-1, model, a, b, fia, fib);
+	else if(va > vb)
+		return sort_result(1, model, a, b, fia, fib);
+	return sort_result(0, model, a, b, fia, fib);
 }
 
-/* 1999-01-03 -	Clear the statistics for <dp>. Useful when the pane's path is about to change. */
-static void clear_stats(DirPane *dp)
+/* 2009-11-04 -	Return sort result, generating initial value by comparing <va> and <vb>. */
+static gint sort_result_uint64(guint64 va, guint64 vb, GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, const GFileInfo *fia, const GFileInfo *fib)
 {
-	clear_total_stats(dp);
-	clear_selection_stats(&dp->dir.sel);
-	dp->last_row = dp->last_row2 = -1;
+	if(va < vb)
+		return sort_result(-1, model, a, b, fia, fib);
+	else if(va > vb)
+		return sort_result(1, model, a, b, fia, fib);
+	return sort_result(0, model, a, b, fia, fib);
 }
 
-/* 1999-04-08 -	Update the selection statistics for <dp>, by simply flushing them and recomputing from
-**		scratch. Does NOT use dp_get_selection(), for performance reasons (this is run on every
-**		unselection).
-*/
-static void update_selection_stats(DirPane *dp)
+/* 2009-11-02 -	Compare by name. This is assumed to be the most common case, so it should be quick. */
+static gint cmp_name(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
 {
-	GList	*iter;
-	DirRow	*dr;
-	SelInfo	*sel = &dp->dir.sel;
+	GFileInfo	*fia, *fib;
+	gint		r;
 
-	clear_selection_stats(sel);
-	for(iter = GTK_CLIST(dp->list)->selection; iter != NULL; iter = g_list_next(iter))
-	{
-		dr = gtk_clist_get_row_data(GTK_CLIST(dp->list), GPOINTER_TO_INT(iter->data));
-		if(S_ISDIR(DP_ROW_LSTAT(dr).st_mode))
-			sel->num_dirs++;
-		else
-			sel->num_files++;
-		sel->num_bytes  += DP_ROW_LSTAT(dr).st_size;
-		sel->num_blocks += DP_ROW_LSTAT(dr).st_blocks;
-	}
+	gtk_tree_model_get(model, a, COL_INFO, &fia, -1);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, -1);
+	r = sort_result(0, model, a, b, fia, fib);
+	g_object_unref(fib);
+	g_object_unref(fia);
+
+	return r;
 }
 
-/* 1999-04-09 -	Update the tot_XXX fields in <dp>'s directory statistics. Handy after a
-**		(Get|Clear)Size.
-*/
-void dp_update_stats(DirPane *dp)
+/* 2009-11-04 -	Compare by size. */
+static gint cmp_size(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
 {
-	DirRow	*dr;
-	guint	i;
+	GFileInfo	*fia, *fib;
+	guint64		sa, sb;
+	gint		r;
 
-	clear_total_stats(dp);
-	clear_selection_stats(&dp->dir.sel);
-	for(i = 0; i < dp->dir.num_rows; i++)
-	{
-		dr = &dp->dir.rowi;
+	gtk_tree_model_get(model, a, COL_INFO, &fia, -1);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, -1);
+	sa = g_file_info_get_size(fia);
+	sb = g_file_info_get_size(fib);
+	r = sort_result_uint64(sa, sb, model, a, b, fia, fib);
+	g_object_unref(fib);
+	g_object_unref(fia);
 
-		if(S_ISDIR(DP_ROW_LSTAT(dr).st_mode))
-			dp->dir.tot_dirs++;
-		else
-			dp->dir.tot_files++;
-		dp->dir.tot_bytes  += DP_ROW_LSTAT(dr).st_size;
-		dp->dir.tot_blocks += DP_ROW_LSTAT(dr).st_blocks;
-	}
+	return r;
 }
 
-/* 1999-03-30 -	Update information about filesystem for given <dp>. */
-static void update_fs_info(DirPane *dp)
+/* 2009-11-04 -	Compare access times. */
+static gint cmp_atime(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
 {
-	gint	old_errno = errno;
+	GFileInfo	*fia, *fib;
+	guint64		ta, tb;
+	gint		r;
 
-#if defined HAVE_STRUCT_STATVFS
-	dp->dir.fs.valid = statvfs(dp->dir.path, &dp->dir.fs.stat) == 0;
-#else
-	dp->dir.fs.valid = statfs(dp->dir.path, &dp->dir.fs.stat) == 0;
-#endif
-	errno = old_errno;
+	gtk_tree_model_get(model, a, COL_INFO, &fia, -1);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, -1);
+	ta = g_file_info_get_attribute_uint64(fia, G_FILE_ATTRIBUTE_TIME_ACCESS);
+	tb = g_file_info_get_attribute_uint64(fib, G_FILE_ATTRIBUTE_TIME_ACCESS);
+	r = sort_result_uint64(ta, tb, model, a, b, fia, fib);
+	g_object_unref(fib);
+	g_object_unref(fia);
+
+	return r;
 }
 
-/* 2003-11-11 -	Grow allocation from <n>. Grows expontentially up to a limit, then linearly. Heuristic. */
-static gsize row_grow(gsize n)
+/* 2009-11-04 -	Compare creation times. */
+static gint cmp_crtime(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
 {
-	const gsize	LINEAR = 128;
+	GFileInfo	*fia, *fib;
+	guint64		ta, tb;
+	gint		r;
 
-	if(n == 0)
-		return 1;
-	else if(n < LINEAR)
-		return n << 1;
-	return n + LINEAR;
+	gtk_tree_model_get(model, a, COL_INFO, &fia, -1);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, -1);
+	ta = g_file_info_get_attribute_uint64(fia, G_FILE_ATTRIBUTE_TIME_CREATED);
+	tb = g_file_info_get_attribute_uint64(fib, G_FILE_ATTRIBUTE_TIME_CREATED);
+	r = sort_result_uint64(ta, tb, model, a, b, fia, fib);
+	g_object_unref(fib);
+	g_object_unref(fia);
+
+	return r;
 }
 
-/* 2003-11-11 -	Store a row into given pane. Will grow buffers if required. Gruesome. */
-static void store_row(DirPane *dp, const char *name, const struct stat *stbuf, const FType *unknown)
+/* 2009-11-04 -	Compare modification times. */
+static gint cmp_mtime(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
 {
-	DirContents	*dir = &dp->dir;
-	DirRow		*row;
-	gsize		flen, dlen, nsize;
-	gchar		*dpl;
-	GError		*err = NULL;
-	int		errbuf = errno;
+	GFileInfo	*fia, *fib;
+	guint64		ta, tb;
+	gint		r;
 
-	/* Enough DirRow structures allocated? */
-	if(dir->num_rows == dir->row_alloc)
-	{
-		dir->row_alloc = row_grow(dir->row_alloc);
-		dir->row = g_realloc(dir->row, dir->row_alloc * sizeof *dir->row);
-	}
-
-	flen = strlen(name);
-	nsize = 0;
-	/* This call sometimes contaminates errno even when successful. */
-	dpl = g_filename_to_utf8(name, flen, NULL, &dlen, &err);
-	if(dpl != NULL)
-	{
-		dlen += 1;
-		nsize += dlen;
-		errno = errbuf;	/* If all went well, restore errno. */
-	}
-	else
-	{
-		printf("Unable to convert '%s' to UTF-8, check G_FILENAME_ENCODING\n", name);
-		if(err != NULL)
-		{
-/*			err_printf(dp->min, _("Conversion of filename to UTF-8 failed, code %d (%s)"), err->code, err->message);
-			err_show(dp->min);
-*/
- /*			printf(" glib said code %d, '%s'\n", err->code, err->message);*/
-			g_error_free(err);
-		}
-		dpl = g_strdup(_("!!Invalid filename!!"));
-		dlen = g_utf8_strlen(dpl, -1) + 1;
-	}
+	gtk_tree_model_get(model, a, COL_INFO, &fia, -1);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, -1);
+	ta = g_file_info_get_attribute_uint64(fia, G_FILE_ATTRIBUTE_TIME_MODIFIED);
+	tb = g_file_info_get_attribute_uint64(fib, G_FILE_ATTRIBUTE_TIME_MODIFIED);
+	r = sort_result_uint64(ta, tb, model, a, b, fia, fib);
+	g_object_unref(fib);
+	g_object_unref(fia);
 
-	flen += 1;
-	nsize += flen;
-/*	printf("'%s' is %u, plus %u bytes of UTF-8, total %u (%u with margin) %u/%u bytes used\n", name, flen, dlen, nsize, nsize + PATH_MAX + 256,
-	       dir->name_use, dir->name_alloc);
-*/
-	/* Enough name space allocated? */
-	if((dir->name_alloc - dir->name_use) < nsize + PATH_MAX)
-	{
-		dir->name_alloc += PATH_MAX + nsize + 256;	/* Enough for this name, even if symlink, and a few more. */
-		dir->name = g_realloc(dir->name, dir->name_alloc);
-	}
-	row = dir->row + dir->num_rows;
-/*	printf("writing %u bytes of disk name at %u\n", flen, dir->name_use);*/
-	memcpy(dir->name + dir->name_use, name, flen);
-	DP_ROW_NAME(row) = GUINT_TO_POINTER(dir->name_use);	/* Store offset only, since we might realloc() during read. */
-	dir->name_use += flen;
-/*	printf(" writing %u bytes of display name at %u\n", dlen, dir->name_use);*/
-	memcpy(dir->name + dir->name_use, dpl, dlen);
-	g_free(dpl);
-	DP_ROW_NAMED(row) = GUINT_TO_POINTER(dir->name_use);
-	dir->name_use += dlen;
-
-	DP_ROW_LSTAT(row) = *stbuf;
-	DP_ROW_SET_STAT(row, NULL);
-	DP_ROW_SET_STAT(row, &DP_ROW_LSTAT(row));	/* GTK2: This sometimes works. */
-	DP_ROW_FLAGS(row) = 0;
-	DP_ROW_TYPE(row) = unknown;
-	if(!S_ISDIR(DP_ROW_LSTAT(row).st_mode))
-		DP_ROW_FLAGS_SET(row, DPRF_HAS_SIZE);
-
-	DP_ROW_SET_LINKNAME(row, NULL);
-
-	if(S_ISLNK(DP_ROW_LSTAT(row).st_mode))	/* Is it a symlink? */
-	{
-		gint	len, oen = errno;
-
-		len = readlink(name, dir->name + dir->name_use, PATH_MAX);
-		if(len < 0)
-			len = 0;
-		dir->namedir->name_use + len = '\0';
-		DP_ROW_SET_LINKNAME(row, GUINT_TO_POINTER(dir->name_use));
-		/* Do we have enough stat buffer space? */
-		if(dir->stat_use >= dir->stat_alloc)
-		{
-			dir->stat_alloc = row_grow(dir->stat_alloc);
-			dir->stat = g_realloc(dir->stat, dir->stat_alloc * sizeof *dir->stat);
-		}
-		if(stat(dir->name + dir->name_use, dir->stat + dir->stat_use) == 0)
-		{
-			DP_ROW_SET_STAT(row, GINT_TO_POINTER(dir->stat_use));
-			DP_ROW_FLAGS_SET(row, DPRF_LINK_EXISTS);
-			dir->stat_use++;
-		}
-		errno = oen;
-		/* Now, we need to figure out the display version of the symlink contents, and store that. */
-		dpl = g_filename_to_utf8(dir->name + dir->name_use, len, NULL, &dlen, NULL);
-/*		printf("link '%s' converted to display '%s'\n", dir->name + dir->name_use, dpl);*/
-		/* Space enough to store the display link name? */
-		if(dir->name_alloc - dir->name_use < dlen + 1)
-		{
-			dir->name_alloc += dlen + 256;
-			dir->name = g_realloc(dir->name, dir->name_alloc);
-		}
-		memcpy(dir->name + dir->name_use + len + 1, dpl, dlen + 1);
-		DP_ROW_SET_LINKNAMED(row, GUINT_TO_POINTER(dir->name_use + len + 1));
-		g_free(dpl);
-		dir->name_use += (len + 1) + (dlen + 1);
-	}
-	dir->num_rows++;
+	return r;
 }
 
-void dp_path_clear(DirPane *dp)
+/* 2010-10-19 -	Compare changed times. */
+static gint cmp_chtime(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
 {
-	GtkListStore	*store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(dp->path)));
-	gtk_list_store_clear(store);
+	GFileInfo	*fia, *fib;
+	guint64		ta, tb;
+	gint		r;
+
+	gtk_tree_model_get(model, a, COL_INFO, &fia, -1);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, -1);
+	ta = g_file_info_get_attribute_uint64(fia, G_FILE_ATTRIBUTE_TIME_CHANGED);
+	tb = g_file_info_get_attribute_uint64(fib, G_FILE_ATTRIBUTE_TIME_CHANGED);
+	r = sort_result_uint64(ta, tb, model, a, b, fia, fib);
+	g_object_unref(fib);
+	g_object_unref(fia);
+
+	return r;
 }
 
-void dp_path_focus(DirPane *dp)
+static gint cmp_device(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
 {
-	gtk_widget_grab_focus(dp->path);
+	GFileInfo	*fia, *fib;
+	guint32		da, db;
+	gint		r;
+
+	gtk_tree_model_get(model, a, COL_INFO, &fia, -1);
+	da = g_file_info_get_attribute_uint32(fia, G_FILE_ATTRIBUTE_UNIX_RDEV);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, -1);
+	db = g_file_info_get_attribute_uint32(fib, G_FILE_ATTRIBUTE_UNIX_RDEV);
+	r = sort_result_uint32(da, db, model, a, b, fia, fib);
+	g_object_unref(fib);
+	g_object_unref(fia);
+
+	return r;
 }
 
-void dp_path_unfocus(DirPane *dp)
+static gint cmp_device_major(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
 {
-	gtk_widget_grab_focus(dp->hide);
-#if 0
-	GdkEvent	fe;
+	GFileInfo	*fia, *fib;
+	guint32		da, db;
+	gint		r;
 
-	/* HACK: This fakes a focus-out event on the path entry combo widget, which seems to work. */
-	fe.focus_change.type = GDK_FOCUS_CHANGE;
-	/* FIXME: If we required GTK+ 2.14 and greater, we could use gtk_widget_get_window(). */
-	fe.focus_change.window = GTK_WIDGET(dp->path)->window;
-	fe.focus_change.send_event = TRUE;
-	fe.focus_change.in = FALSE;
-	gtk_main_do_event(&fe);
-#endif
+	gtk_tree_model_get(model, a, COL_INFO, &fia, -1);
+	da = g_file_info_get_attribute_uint32(fia, G_FILE_ATTRIBUTE_UNIX_RDEV);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, -1);
+	db = g_file_info_get_attribute_uint32(fib, G_FILE_ATTRIBUTE_UNIX_RDEV);
+	r = sort_result_uint32(da >> 8, db >> 8, model, a, b, fia, fib);
+	g_object_unref(fib);
+	g_object_unref(fia);
+
+	return r;
 }
 
-/* 2003-11-14 -	Brand new version of this very old workhorse. Now reads in the directory in a single
-**		pass, using realloc() to grow various buffers on the fly. Slightly more wasteful of
-**		memory than the old two-pass version, but less code, more robust, and possibly a
-**		little bit faster. Returns TRUE on success.
-*/
-gboolean dp_enter_dir(DirPane *dp, const gchar *path)
+static gint cmp_device_minor(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
 {
-	gchar	new_pathPATH_MAX;
-	DIR	*dir;
-	FType	*unknown;
+	GFileInfo	*fia, *fib;
+	guint32		da, db;
+	gint		r;
 
-	if((path0 != '\0') && (path0 != G_DIR_SEPARATOR))
-		g_snprintf(new_path, sizeof new_path, "%s%s%s", dp->dir.path, G_DIR_SEPARATOR_S, path);
-	else
-		stu_strncpy(new_path, path, sizeof new_path);
+	gtk_tree_model_get(model, a, COL_INFO, &fia, -1);
+	da = g_file_info_get_attribute_uint32(fia, G_FILE_ATTRIBUTE_UNIX_RDEV);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, -1);
+	db = g_file_info_get_attribute_uint32(fib, G_FILE_ATTRIBUTE_UNIX_RDEV);
+	r = sort_result_uint32(da & 255, db & 255, model, a, b, fia, fib);
+	g_object_unref(fib);
+	g_object_unref(fia);
 
-	mnt_entering(dp->main, new_path, MNT_ALWAYS);
+	return r;
+}
 
-	/* To read a directory easily, we need to change to it. */
-	if(!fut_cd(new_path, NULL, 0))
-	{
-		if(dp->dir.path0 == '\0' && fut_cd(".", NULL, 0))	/* If no previous, try current. */
-			return dp_enter_dir(dp, ".");
-		return FALSE;
-	}
+static gint cmp_gid_num(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
+{
+	GFileInfo	*fia, *fib;
+	guint32		ga, gb;
+	gint		r;
 
-	clear_stats(dp);
-	update_fs_info(dp);
-	dp_unfocus(dp);
+	gtk_tree_model_get(model, a, COL_INFO, &fia, -1);
+	ga = g_file_info_get_attribute_uint32(fia, G_FILE_ATTRIBUTE_UNIX_GID);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, -1);
+	gb = g_file_info_get_attribute_uint32(fib, G_FILE_ATTRIBUTE_UNIX_GID);
+	r = sort_result_uint32(ga, gb, model, a, b, fia, fib);
+	g_object_unref(fib);
+	g_object_unref(fia);
 
-	completion_clear(dp);
+	return r;
+}
 
-	/* Reset buffer usage, reusing existing space if any. */
-	dp->dir.num_rows = 0;
-	dp->dir.name_use = 0;
-	dp->dir.stat_use = 0;
+static gint cmp_gid_str(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
+{
+	GFileInfo	*fia, *fib;
+	guint32		ga, gb;
+	const gchar	*gas, *gbs;
+	gint		r;
 
-	unknown = typ_type_get_unknown(&dp->main->cfg);
+	gtk_tree_model_get(model, a, COL_INFO, &fia, -1);
+	ga = g_file_info_get_attribute_uint32(fia, G_FILE_ATTRIBUTE_UNIX_GID);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, -1);
+	gb = g_file_info_get_attribute_uint32(fib, G_FILE_ATTRIBUTE_UNIX_GID);
+	if((gas = usr_lookup_gname(ga)) != NULL && (gbs = usr_lookup_gname(gb)) != NULL)
+		r = sort_result(strcmp(gas, gbs), model, a, b, fia, fib);
+	else
+		r = sort_result_uint32(ga, gb, model, a, b, fia, fib);
+	g_object_unref(fib);
+	g_object_unref(fia);
 
-	/* Open directory, and read in all entries. */
-	if((dir = opendir(".")) != NULL)
-	{
-		struct dirent	*de;
-		guint		i;
-/*		GTimer		*timer;
+	return r;
+}
 
-		timer = g_timer_new();
-		g_timer_start(timer);
-*/
-		/* Read in all items we can find, and let buffers grow as needed. */
-		while((de = readdir(dir)) != NULL)
-		{
-			struct stat	stbuf;
+static gint cmp_uid_num(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
+{
+	GFileInfo	*fia, *fib;
+	guint32		ua, ub;
+	gint		r;
 
-			if(!(dp->main->cfg.dir_filter(de->d_name) && fut_check_hide(dp, de->d_name)))
-				continue;
-			if(lstat(de->d_name, &stbuf) == 0)
-				store_row(dp, de->d_name, &stbuf, unknown);
-		}
-		closedir(dir);
+	gtk_tree_model_get(model, a, COL_INFO, &fia, -1);
+	ua = g_file_info_get_attribute_uint32(fia, G_FILE_ATTRIBUTE_UNIX_UID);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, -1);
+	ub = g_file_info_get_attribute_uint32(fib, G_FILE_ATTRIBUTE_UNIX_UID);
+	r = sort_result_uint32(ua, ub, model, a, b, fia, fib);
+	g_object_unref(fib);
+	g_object_unref(fia);
 
-		/* Now when scan is done, add buffer base to offsets stored, leaving final pointers. */
-		typ_identify_begin(dp->main);
-		for(i = 0; i < dp->dir.num_rows; i++)
-		{
-			DirRow	*row = dp->dir.row + i;
-
-/*			printf("%3u: %u -> ", i, GPOINTER_TO_UINT(DP_ROW_NAME(row)));*/
-			DP_ROW_NAME(row) = dp->dir.name + GPOINTER_TO_UINT(DP_ROW_NAME(row));
-/*			printf("'%s'\n", DP_ROW_NAME(row));
-			printf("     %u -> ", GPOINTER_TO_UINT(DP_ROW_NAMED(row)));
-*/			DP_ROW_NAMED(row) = dp->dir.name + GPOINTER_TO_UINT(DP_ROW_NAMED(row));
-/*			printf("'%s'\n", DP_ROW_NAMED(row));*/
-			if(DP_ROW_LINKNAME(row))
-			{
-				DP_ROW_SET_LINKNAME(row, dp->dir.name + GPOINTER_TO_UINT(DP_ROW_LINKNAME(row)));
-				DP_ROW_SET_LINKNAMED(row, dp->dir.name + GPOINTER_TO_UINT(DP_ROW_LINKNAMED(row)));
-				if(DP_ROW_FLAGS_CHK(row, DPRF_LINK_EXISTS))
-					DP_ROW_SET_STAT(row, dp->dir.stat + GPOINTER_TO_UINT(DP_ROW_GET_STAT(row)));
-				else
-					DP_ROW_SET_STAT(row, &DP_ROW_LSTAT(row));
-			}
-			else
-				DP_ROW_SET_STAT(row, &DP_ROW_LSTAT(row));
-			typ_identify(dp->main, row);
-			statistics_add_entry(dp, &DP_ROW_LSTAT(row));
-		}
-		typ_identify_end(dp->main, dp->dir.path);
-/*		g_timer_stop(timer);*/
-/*		printf("directory read, uses %d/%d bytes (%.1f%%) of name buffer space for %d rows\n",
-			dp->dir.name_use, dp->dir.name_alloc,
-			100.0 * dp->dir.name_use / dp->dir.name_alloc,
-			dp->dir.num_rows);
-*/
-/*		printf(" scan completed in %.1f ms\n", 1e3 * g_timer_elapsed(timer, NULL));
-		g_timer_destroy(timer);
-*/		/* Finally, store the new path in the DirPane. */
-		g_strlcpy(dp->dir.path, path, sizeof dp->dir.path);
-	}
-	dp_resort(dp);
-	return TRUE;
+	return r;
 }
 
-/* ----------------------------------------------------------------------------------------- */
-
-/* 2002-07-20 -	Rescan contents of given pane.
-** NOTE NOTE	This routine does NOT change the error status, i.e. it does not call anything
-**		in the error module. This is important, since it's used in the exiting code
-**		of generic commands, for instance.
-** 2003-09-26 -	Don't activate <dp> for refresh, just do it anyway. Faster, hopefully safe.
-*/
-void dp_rescan(DirPane *dp)
+static gint cmp_uid_str(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
 {
-	dph_state_save(dp);
-	dp_freeze(dp);
-	dp_enter_dir(dp, dp->dir.path);
-	dp_redisplay(dp);
-	dph_state_restore(dp);
-	dp_thaw(dp);
+	GFileInfo	*fia, *fib;
+	guint32		ua, ub;
+	const gchar	*uas, *ubs;
+	gint		r;
+
+	gtk_tree_model_get(model, a, COL_INFO, &fia, -1);
+	ua = g_file_info_get_attribute_uint32(fia, G_FILE_ATTRIBUTE_UNIX_UID);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, -1);
+	ub = g_file_info_get_attribute_uint32(fib, G_FILE_ATTRIBUTE_UNIX_UID);
+	if((uas = usr_lookup_uname(ua)) != NULL && (ubs = usr_lookup_gname(ub)) != NULL)
+		r = sort_result(strcmp(uas, ubs), model, a, b, fia, fib);
+	else
+		r = sort_result_uint32(ua, ub, model, a, b, fia, fib);
+	g_object_unref(fib);
+	g_object_unref(fia);
+
+	return r;
 }
 
-/* 2002-07-23 -	Special "weaker" version of dp_rescan(), with the added semantic difference that
-**		this is only ever called as part of the "clean-up" *after* a command has finished.
-**		The intent is to catch any changes to the pane done by the command, such as a
-**		deleted, renamed, moved or otherwise changed file. The reason it has a separate
-**		entrypoint is that with FAM, this needs to be stopped.
-*/
-void dp_rescan_post_cmd(DirPane *dp)
+static gint cmp_mode_num(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
 {
-#if defined HAVE_FAM
-	/* If FAM is compiled in, check if it's working, and if so trust it to handle rescan. */
-	if(fam_is_active())
-		return;
-#endif
-	/* If built without FAM, or FAM is not working, just do the rescan (fall-through). */
-	dp_rescan(dp);
-}
+	GFileInfo	*fia, *fib;
+	guint32		ma, mb;
+	gint		r;
 
-/* ----------------------------------------------------------------------------------------- */
+	gtk_tree_model_get(model, a, COL_INFO, &fia, -1);
+	ma = g_file_info_get_attribute_uint32(fia, G_FILE_ATTRIBUTE_UNIX_MODE);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, -1);
+	mb = g_file_info_get_attribute_uint32(fib, G_FILE_ATTRIBUTE_UNIX_MODE);
+	r = sort_result_uint32(ma, mb, model, a, b, fia, fib);
+	g_object_unref(fib);
+	g_object_unref(fia);
 
-/* 2008-09-20 -	Sets the history strings, available in the combo box. This is to prevent
- *		other modules (dirhistory, I'm looking at you!) from poking the widgets
- *		directly. Abstract, hide, and so on.
-*/
-void dp_history_set(DirPane *dp, const GList *strings)
+	return r;
+}
+
+static gint cmp_mode_str(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
 {
-	GtkListStore	*store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(dp->path)));
-	GtkTreeIter	iter;
-	guint		i;
+	GFileInfo	*fia, *fib;
+	gint		r;
+	char		mab16, mbb16;
 
-	gtk_list_store_clear(store);
-	for(i = 0; strings != NULL; strings = g_list_next(strings))
-	{
-		const gchar	*str = strings->data;
-		if(*str)
-		{
-			gtk_list_store_append(store, &iter);
-			gtk_list_store_set(store, &iter, 0, str, -1);
-			i++;
-		}
-	}
-	if(i > 0)
-	{
-		/* Was there any history set? If so, also jump to the first entry. */
-		gtk_signal_handler_block(GTK_OBJECT(gtk_bin_get_child(GTK_BIN(dp->path))), dp->sig_path_activate);
-		gtk_signal_handler_block(GTK_OBJECT(dp->path), dp->sig_path_changed);
-		gtk_combo_box_set_active(GTK_COMBO_BOX(dp->path), 0);
-		gtk_signal_handler_unblock(GTK_OBJECT(dp->path), dp->sig_path_changed);
-		gtk_signal_handler_unblock(GTK_OBJECT(gtk_bin_get_child(GTK_BIN(dp->path))), dp->sig_path_activate);
-	}
+	gtk_tree_model_get(model, a, COL_INFO, &fia, -1);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, -1);
+	stu_mode_to_text(mab, sizeof mab, g_file_info_get_attribute_uint32(fia, G_FILE_ATTRIBUTE_UNIX_MODE));
+	stu_mode_to_text(mbb, sizeof mbb, g_file_info_get_attribute_uint32(fib, G_FILE_ATTRIBUTE_UNIX_MODE));
+	r = sort_result(strcmp(mab, mbb), model, a, b, fia, fib);
+	g_object_unref(fib);
+	g_object_unref(fia);
+
+	return r;
 }
 
-/* ----------------------------------------------------------------------------------------- */
+static gint cmp_nlink(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
+{
+	GFileInfo	*fia, *fib;
+	guint32		na, nb;
+	gint		r;
 
-/* 2009-07-04 -	Refreshes the split, making sure it's correctly sized according to current settings. */
-void dp_split_refresh(MainInfo *min)
+	gtk_tree_model_get(model, a, COL_INFO, &fia, -1);
+	na = g_file_info_get_attribute_uint32(fia, G_FILE_ATTRIBUTE_UNIX_NLINK);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, -1);
+	nb = g_file_info_get_attribute_uint32(fib, G_FILE_ATTRIBUTE_UNIX_NLINK);
+	r = sort_result_uint32(na, nb, model, a, b, fia, fib);
+	g_object_unref(fib);
+	g_object_unref(fia);
+
+	return r;
+}
+
+static gint cmp_type(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
 {
-	gint	pw, ph, np, pos;
+	GFileInfo	*fia, *fib;
+	FType		*ta, *tb;
+	guint32		na, nb;
+	gint		r;
 
-	if(min == NULL || min->gui == NULL || min->gui->panes == NULL)
-		return;
-	if(!GTK_WIDGET_REALIZED(min->gui->panes))
-		return;
+	gtk_tree_model_get(model, a, COL_INFO, &fia, COL_FTYPE, &ta, -1);
+	na = g_file_info_get_attribute_uint32(fia, G_FILE_ATTRIBUTE_UNIX_NLINK);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, COL_FTYPE, &tb, -1);
+	nb = g_file_info_get_attribute_uint32(fib, G_FILE_ATTRIBUTE_UNIX_NLINK);
+	if(ta != NULL && tb != NULL)
+		r = sort_result(strcmp(ta->name, tb->name), model, a, b, fia, fib);
+	else
+		r = sort_result(0, model, a, b, fia, fib);
+	g_object_unref(fib);
+	g_object_unref(fia);
 
-	/* Inspect the size of the GtkPaned that holds the panes; the window's size
-	** doesn't work for vertical due to buttons. This is slightly hackish.
-	*/
-	gdk_window_get_size(min->gui->panes->window, &pw, &ph);
-	np = min->cfg.dp_paning.orientation == DPORIENT_HORIZ ? pw : ph;
+	return r;
+}
 
-	/* Compute the proper new position, depending on the active paning mode. */
-	switch(min->cfg.dp_paning.mode)
-	{
-		case DPSPLIT_FREE:
-			return;
-		case DPSPLIT_RATIO:
-			pos = np * min->cfg.dp_paning.value;
-			break;
-		case DPSPLIT_ABS_LEFT:
-			pos = min->cfg.dp_paning.value;
-			break;
-		case DPSPLIT_ABS_RIGHT:
-			pos = np - min->cfg.dp_paning.value;
-			break;
-	}
-	if(pos > 0)
+static gint cmp_uri(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user)
+{
+	DirPane		*dp = user;
+	GFileInfo	*fia, *fib;
+	GFile		*fa, *fb;
+	gint		r;
+
+	gtk_tree_model_get(model, a, COL_INFO, &fia, -1);
+	fa = dp_get_file_from_row(dp, a);
+	gtk_tree_model_get(model, b, COL_INFO, &fib, -1);
+	fb = dp_get_file_from_row(dp, b);
+	if(fa != NULL && fb != NULL)
 	{
-		g_signal_handler_block(G_OBJECT(min->gui->window), min->gui->sig_main_configure);
-		g_signal_handler_block(G_OBJECT(min->gui->panes), min->gui->sig_pane_notify);
-		gtk_paned_set_position(GTK_PANED(min->gui->panes), pos);
-		g_signal_handler_unblock(G_OBJECT(min->gui->panes), min->gui->sig_pane_notify);
-		g_signal_handler_unblock(G_OBJECT(min->gui->window), min->gui->sig_main_configure);
+		gchar	*ua, *ub;
+
+		ua = g_file_get_uri(fa);
+		ub = g_file_get_uri(fb);
+		r = sort_result(strcmp(ua, ub), model, a, b, fia, fib);
+		g_free(ub);
+		g_free(ua);
 	}
+	else
+		r = sort_result(0, model, a, b, fia, fib);
+	g_object_unref(fb);
+	g_object_unref(fib);
+	g_object_unref(fa);
+	g_object_unref(fia);
+
+	return r;
+
 }
 
-/* ----------------------------------------------------------------------------------------- */
+static void evt_row_activated(GtkWidget *wid, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user)
+{
+	dp_dbclk_row(user, gtk_tree_path_get_indices(path)0);
+}
 
-/* 2003-11-08 -	Add a pathwidgtry user. Indirect, just adds a function that is later called
-**		(in dp_build()) to construct the widgetry. Returns key to use with show().
-*/
-guint dp_pathwidgetry_add(PageBuilder func)
+/* 2009-10-01 -	The selection has somehow changed -- so recompute statistics display. */
+static void evt_selection_changed(GtkTreeSelection *ts, gpointer user)
 {
-	if(func && !g_slist_find(pathwidgetry_builders, func))
-	{
-		pathwidgetry_builders = g_slist_append(pathwidgetry_builders, func);
-		return g_slist_length(pathwidgetry_builders);
-	}
-	return 0;
+	update_selection_stats(user);
+	dp_show_stats(user);
 }
 
-/* 2003-11-08 -	Change to a new page of dirpane path widgetry. Returns page. */
-GtkWidget ** dp_pathwidgetry_show(DirPane *dp, guint key)
+static void dp_build_list2(DirPane *dp, const DPFormat *fmt)
 {
-	GtkWidget	*page;
+	gint		i;
+	const struct {
+	DPContent		content;
+	GtkTreeIterCompareFunc	func;
+	} sorters = {
+			{ DPC_NAME, cmp_name },
+			{ DPC_SIZE, cmp_size }, { DPC_BLOCKS, cmp_size }, { DPC_BLOCKSIZE, cmp_size },
+			{ DPC_ATIME, cmp_atime },
+			{ DPC_CRTIME, cmp_crtime },
+			{ DPC_MTIME, cmp_mtime },
+			{ DPC_CHTIME, cmp_chtime },
+			{ DPC_DEVICE, cmp_device }, { DPC_DEVMAJ, cmp_device_major}, { DPC_DEVMIN, cmp_device_minor },
+			{ DPC_GIDNUM, cmp_gid_num }, { DPC_GIDSTR, cmp_gid_str },
+			{ DPC_UIDNUM, cmp_uid_num }, { DPC_UIDSTR, cmp_uid_str },
+			{ DPC_MODENUM, cmp_mode_num }, { DPC_MODESTR, cmp_mode_str },
+			{ DPC_NLINK, cmp_nlink },
+			{ DPC_ICON, cmp_type } /* This might be unexpected? */,
+			{ DPC_TYPE, cmp_type },
+			{ DPC_URI_NOFILE, cmp_uri },
+	};
 
-	if((page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(dp->notebook), key)) != NULL)
-	{
-		gtk_notebook_set_page(GTK_NOTEBOOK(dp->notebook), key);
-		return gtk_object_get_data(GTK_OBJECT(page), "dp-pathwidgetry");
-	}
-	return NULL;
-}
+	dp->dir.store = gtk_list_store_new(COL_NUMBER_OF_COLUMNS, G_TYPE_OBJECT, G_TYPE_OBJECT, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_OBJECT, G_TYPE_UINT );
+	for(i = 0; i < sizeof sorters / sizeof *sorters; i++)
+		gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(dp->dir.store), sortersi.content, sortersi.func, dp, NULL);
 
-/* ----------------------------------------------------------------------------------------- */
+	dp->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(dp->dir.store));
+	gtk_tree_view_set_search_column(GTK_TREE_VIEW(dp->view), -1);
+	gtk_tree_view_set_enable_search(GTK_TREE_VIEW(dp->view), FALSE);
 
-/* 1998-06-26 -	A lot of code broken out from the giant function below and put here. This
-**		makes rebuilding just the list (and not the path entry, for example) a
-**		whole lot easier. Useful when config changes...
-** 1998-10-26 -	Since the path entry's location now is configurable, this routine is
-**		actually never called directly any longer. The true dp_build() always does
-**		the job. Function made static.
-*/
-static void dp_build_list(DPFormat *fmt, DirPane *dp)
-{
-	GtkWidget	*list;
-	gchar		*titleDP_MAX_COLUMNS, name32;
-	guint		i;
+	/* Connect signals. */
+	g_signal_connect(G_OBJECT(dp->view), "button_press_event", G_CALLBACK(evt_dirpane_button_press), dp);
+	g_signal_connect(G_OBJECT(dp->view), "row_activated", G_CALLBACK(evt_row_activated), dp);
+	gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(dp->view)), GTK_SELECTION_MULTIPLE);
+	dp->sig_sel_changed = g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(dp->view))), "changed", G_CALLBACK(evt_selection_changed), dp);
 
 	for(i = 0; i < fmt->num_columns; i++)
-		titlei = fmt->formati.title;
-	list = gtk_clist_new_with_titles(fmt->num_columns, title);
-	g_snprintf(name, sizeof name, "mainPane%d", dp->index);
-	gtk_widget_set_name(list, name);
-	GTK_WIDGET_UNSET_FLAGS(list, GTK_CAN_FOCUS);
-	for(i = 0; i < fmt->num_columns; i++)	/* A rather gross hack. */
 	{
-		gtk_clist_set_column_width(GTK_CLIST(list), i, fmt->formati.width);
-		gtk_clist_set_column_justification(GTK_CLIST(list), i, fmt->formati.just);
-		GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(list)->columni.button, GTK_CAN_FOCUS);
+		GtkCellRenderer		*cr;
+		GtkTreeCellDataFunc	cdf;
+		gpointer		user;
+		GtkWidget		*evbox, *lab;
+
+		/* Ask the formatting module for a cell data function. */
+		cdf = dpf_get_cell_data_func(dp, i, &user);
+		if(cdf != NULL)
+		{
+			GtkTreeViewColumn	*tc;
+			gfloat			xa;
+
+			switch(fmt->formati.content)
+			{
+			case DPC_NAME:
+			case DPC_SIZE:
+			case DPC_BLOCKS:
+			case DPC_ATIME:
+			case DPC_CRTIME:
+			case DPC_MTIME:
+			case DPC_CHTIME:
+			case DPC_MODESTR:
+			case DPC_MODENUM:
+			case DPC_UIDNUM:
+			case DPC_UIDSTR:
+			case DPC_GIDNUM:
+			case DPC_GIDSTR:
+			case DPC_NLINK:
+			case DPC_DEVICE:
+			case DPC_DEVMIN:
+			case DPC_DEVMAJ:
+			case DPC_URI_NOFILE:
+				cr = gtk_cell_renderer_text_new();
+				break;
+			case DPC_ICON:
+				cr = gtk_cell_renderer_pixbuf_new();
+				break;
+			default:
+				g_warning("Unsupported dirpane content type %d detected", fmt->formati.content);
+			}
+
+			tc = gtk_tree_view_column_new();
+			/* Wrap the title in a GtkEventBox so we have something we can access. */
+			evbox = gtk_event_box_new();
+			lab = gtk_label_new(fmt->formati.title);
+			gtk_container_add(GTK_CONTAINER(evbox), lab);
+			gtk_widget_show_all(evbox);
+			gtk_tree_view_column_set_widget(tc, evbox);
+			/* Compute legacy justification into alignment, and set for both header and content. */
+			switch(fmt->formati.just)
+			{
+			case GTK_JUSTIFY_LEFT:
+				xa = 0.f;
+				break;
+			case GTK_JUSTIFY_CENTER:
+				xa = 0.5f;
+				break;
+			case GTK_JUSTIFY_RIGHT:
+				xa = 1.0f;
+				break;
+			default:
+				xa = 0.5f;
+			}
+			gtk_tree_view_column_set_alignment(tc, xa);		/* Header. */
+			g_object_set(cr, "xalign", xa, NULL);			/* Content. */
+			g_object_set_data(G_OBJECT(cr), "main", dp->main);	/* Always handy. */
+			/* Set the content ID as the sort ID; they're unique and all. */
+			gtk_tree_view_column_set_sort_column_id(tc, fmt->formati.content);
+			/* Set the size, which we try to control ourselves. */
+			gtk_tree_view_column_set_sizing(tc, GTK_TREE_VIEW_COLUMN_FIXED);
+			gtk_tree_view_column_set_fixed_width(tc, fmt->formati.width);
+			gtk_tree_view_append_column(GTK_TREE_VIEW(dp->view), tc);
+			gtk_tree_view_column_pack_start(tc, cr, TRUE);
+			/* This must be done after column is appended. */
+			gtk_tree_view_column_set_cell_data_func(tc, cr, cdf, user, NULL);
+		}
 	}
-	g_signal_connect(G_OBJECT(list), "button_press_event", G_CALLBACK(evt_dirpane_button_press), dp);
-	g_signal_connect(G_OBJECT(list), "click_column", G_CALLBACK(evt_dirpane_col_click), dp);
-	g_signal_connect(G_OBJECT(list), "select_row", G_CALLBACK(evt_dirpane_select_row), dp);
-	g_signal_connect(G_OBJECT(list), "unselect_row", G_CALLBACK(evt_dirpane_unselect_row), dp);
-	g_signal_connect(G_OBJECT(list), "resize_column", G_CALLBACK(evt_dirpane_resize_column), dp);
-
-	gtk_widget_set_events(list, GDK_POINTER_MOTION_MASK);
-	if(fmt->scrollbar_always)
-		gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dp->scwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-	else
-		gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dp->scwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_clist_set_selection_mode(GTK_CLIST(list), GTK_SELECTION_EXTENDED);
-	dp->list = GTK_CLIST(list);
+	/* Set the user's preferred sorting column and order. */
+	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(dp->dir.store), fmt->sort.content, fmt->sort.invert ? GTK_SORT_DESCENDING : GTK_SORT_ASCENDING);
+	g_signal_connect(G_OBJECT(GTK_TREE_SORTABLE(dp->dir.store)), "sort_column_changed", G_CALLBACK(evt_pane_sort_column_clicked), dp);
+	gtk_container_add(GTK_CONTAINER(dp->scwin), dp->view);
 }
 
 /* 1998-05-23 -	Rewrote this one, now encloses stuff in a frame, which provides a fairly nice way to
@@ -1953,20 +2038,18 @@
 */
 GtkWidget * dp_build(MainInfo *min, DPFormat *fmt, DirPane *dp)
 {
-	GdkPixmap	*pix;
-	GdkBitmap	*msk;
-	GtkWidget	*hbox, *pr, *ihbox;
+	GtkWidget	*hbox, *ihbox;
 	GtkListStore	*model;
 	GSList		*iter;
 
 	if(pane_selected != NULL)
 	{
-		gtk_style_unref(pane_selected);
+		g_object_unref(pane_selected);
 		pane_selected = NULL;
 	}
 	if(focus_style != NULL)
 	{
-		gtk_style_unref(focus_style);
+		g_object_unref(focus_style);
 		focus_style = NULL;
 	}
 	if(dp == NULL)
@@ -1983,25 +2066,22 @@
 		gtk_scrolled_window_set_placement(GTK_SCROLLED_WINDOW(dp->scwin), GTK_CORNER_TOP_RIGHT);
 	else if(fmt->sbar_pos == SBP_RIGHT)
 		gtk_scrolled_window_set_placement(GTK_SCROLLED_WINDOW(dp->scwin), GTK_CORNER_TOP_LEFT);
-	dp_build_list(fmt, dp);
-	gtk_container_add(GTK_CONTAINER(dp->scwin), GTK_WIDGET(dp->list));
+
+	dp_build_list2(dp, fmt);
 
 	dp->notebook = gtk_notebook_new();
 	gtk_notebook_set_show_tabs(GTK_NOTEBOOK(dp->notebook), FALSE);
 	gtk_notebook_set_show_border(GTK_NOTEBOOK(dp->notebook), FALSE);
 	hbox = gtk_hbox_new(FALSE, 0);
-	pr   = gtk_button_new();	/* GTK2: This should probably be a stock image. */
-	if((pix = gdk_pixmap_colormap_create_from_xpm_d(NULL, gtk_widget_get_default_colormap(), &msk, NULL, icon_dirparent_xpm)) != NULL)
-	{
-		GtkWidget	*pmap;
-
-		if((pmap = gtk_pixmap_new(pix, msk)) != NULL)
-			gtk_container_add(GTK_CONTAINER(pr), pmap);
-	}
-	GTK_WIDGET_UNSET_FLAGS(pr, GTK_CAN_FOCUS);
-	g_signal_connect(G_OBJECT(pr), "clicked", G_CALLBACK(evt_parent_clicked), dp);
-	gtk_box_pack_start(GTK_BOX(hbox), pr, FALSE, FALSE, 0);
-	gtk_tooltips_set_tip(min->gui->main_tt, pr, _("Move up to the parent directory"), NULL);
+	dp->parent = gui_stock_button_new(GTK_STOCK_GO_UP);
+#if GTK_CHECK_VERSION(2, 2, 0)
+	gtk_widget_set_can_focus(dp->parent, FALSE);
+#else
+	GTK_WIDGET_UNSET_FLAGS(dp->parent, GTK_CAN_FOCUS);
+#endif
+	g_signal_connect(G_OBJECT(dp->parent), "clicked", G_CALLBACK(evt_parent_clicked), dp);
+	gtk_box_pack_start(GTK_BOX(hbox), dp->parent, FALSE, FALSE, 0);
+	gtk_widget_set_tooltip_text(dp->parent, _("Move up to the parent directory"));
 	dp->menu_top	 = NULL;
 	dp->menu_action  = NULL;
 	dp->mitem_action = NULL;
@@ -2023,12 +2103,12 @@
 	dp->sig_path_changed = g_signal_connect(G_OBJECT(dp->path), "changed", G_CALLBACK(evt_path_changed), dp);
 
 	gtk_box_pack_start(GTK_BOX(hbox), dp->path, TRUE, TRUE, 0);
-	gtk_tooltips_set_tip(min->gui->main_tt, dp->path, _("Enter path, then press Return to go there"), NULL);
+	gtk_widget_set_tooltip_text(dp->path, _("Enter path, then press Return to go there"));
 	dp->hide = gtk_toggle_button_new_with_label(_("H"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dp->hide), fmt->hide_allowed);
 	g_signal_connect(G_OBJECT(dp->hide), "clicked", G_CALLBACK(evt_hide_clicked), dp);
 	gtk_box_pack_start(GTK_BOX(hbox), dp->hide, FALSE, FALSE, 0);
-	gtk_tooltips_set_tip(min->gui->main_tt, dp->hide, _("Click to enable/disable Hide rule (When pressed in, the hide rule is active, and matching entries are hidden)"), NULL);
+	gtk_widget_set_tooltip_text(dp->hide, _("Click to enable/disable Hide rule (When pressed in, the hide rule is active, and matching entries are hidden)"));
 	gtk_notebook_append_page(GTK_NOTEBOOK(dp->notebook), hbox, NULL);
 
 	/* If we have any registered pathwidgetry builders, go through and add their output to notebook. */
@@ -2039,32 +2119,37 @@
 
 		if(func && (page = func(min)) != NULL)
 		{
-			gtk_object_set_data(GTK_OBJECT(*page), "dp-pathwidgetry", page);
+			g_object_set_data(G_OBJECT(*page), "dp-pathwidgetry", page);
 			gtk_notebook_append_page(GTK_NOTEBOOK(dp->notebook), *page, NULL);
 		}
 	}
 	if(fmt->huge_parent)
 	{
-		GtkWidget	*pbtn;
-
-		pbtn = gtk_button_new();
-		gtk_button_set_relief(GTK_BUTTON(pbtn), GTK_RELIEF_NONE);
-		g_signal_connect(G_OBJECT(pbtn), "clicked", G_CALLBACK(evt_hugeparent_clicked), dp);
-		gtk_tooltips_set_tip(min->gui->main_tt, pbtn, _("Move up to the parent directory"), NULL);
-		GTK_WIDGET_UNSET_FLAGS(pbtn, GTK_CAN_FOCUS);
+		dp->hparent = gtk_button_new();
+		gtk_button_set_relief(GTK_BUTTON(dp->hparent), GTK_RELIEF_NONE);
+		g_signal_connect(G_OBJECT(dp->hparent), "clicked", G_CALLBACK(evt_hugeparent_clicked), dp);
+		gtk_widget_set_tooltip_text(dp->hparent, _("Move up to the parent directory"));
+#if GTK_CHECK_VERSION(2, 2, 0)
+		gtk_widget_set_can_focus(dp->hparent, FALSE);
+#else
+		GTK_WIDGET_UNSET_FLAGS(dp->hparent, GTK_CAN_FOCUS);
+#endif
 		if(dp->index == 0)
 		{
-			gtk_box_pack_start(GTK_BOX(ihbox), pbtn, FALSE, FALSE, 0);
+			gtk_box_pack_start(GTK_BOX(ihbox), dp->hparent, FALSE, FALSE, 0);
 			gtk_box_pack_start(GTK_BOX(ihbox), dp->scwin, TRUE, TRUE, 0);
 		}
 		else
 		{
 			gtk_box_pack_start(GTK_BOX(ihbox), dp->scwin, TRUE, TRUE, 0);
-			gtk_box_pack_start(GTK_BOX(ihbox), pbtn, FALSE, FALSE, 0);
+			gtk_box_pack_start(GTK_BOX(ihbox), dp->hparent, FALSE, FALSE, 0);
 		}
 	}
 	else
+	{
 		gtk_box_pack_start(GTK_BOX(ihbox), dp->scwin, TRUE, TRUE, 0);
+		dp->hparent = NULL;
+	}
 
 	if(fmt->path_above)
 	{
@@ -2076,6 +2161,18 @@
 		gtk_box_pack_start(GTK_BOX(dp->vbox), ihbox, TRUE, TRUE, 0);
 		gtk_box_pack_start(GTK_BOX(dp->vbox), dp->notebook, FALSE, FALSE, 0);
 	}
+
+	if(fmt->set_font)
+	{
+		PangoFontDescription	*fdesc;
+
+		if((fdesc = pango_font_description_from_string(fmt->font_name)) != NULL)
+		{
+			gtk_widget_modify_font(dp->view, fdesc);
+			pango_font_description_free(fdesc);
+		}
+	}
+
 	gtk_widget_show_all(dp->vbox);
 	dp->dbclk_row = -1;
 	dp->focus_row = -1;

gentoo-0.15.6.tar.bz2/src/dirpane.h -> gentoo-0.19.9.tar.gz/src/dirpane.h Changed

@@ -11,11 +11,13 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-extern void		dp_initialize(DirPane *dp);
+extern void		dp_initialize(DirPane *dp, size_t num);
+
+extern gboolean		dp_realized(const MainInfo *min);
 
 extern DirPane *	dp_mirror(const MainInfo *min, const DirPane *dp);
-extern const gchar *	dp_full_name(const DirPane *dp, gint row);
-extern const gchar *	dp_name_quoted(const DirPane *dp, gint row, gboolean path);
+extern const gchar *	dp_full_name(const DirPane *dp, const DirRow2 *row);
+extern const gchar *	dp_name_quoted(const DirPane *dp, const DirRow2 *row, gboolean path);
 
 extern void		dp_show_stats(DirPane *dp);
 extern void		dp_update_stats(DirPane *dp);
@@ -26,11 +28,11 @@
 extern void		dp_redisplay_preserve(DirPane *dp);
 
 extern void		dp_unfocus(DirPane *dp);
-extern void		dp_focus(DirPane *dp, gint row);
 extern void		dp_focus_enter_dir(DirPane *dp);
 
 extern gboolean		dp_has_selection(DirPane *dp);
-extern gboolean		dp_is_selected(DirPane *dp, DirRow *row);
+extern gboolean		dp_has_single_selection(const DirPane *dp);
+extern gboolean		dp_is_selected(DirPane *dp, const DirRow2 *row);
 
 extern GSList *		dp_get_selection(DirPane *dp);
 extern GSList *		dp_get_selection_full(const DirPane *dp);
@@ -40,8 +42,10 @@
 extern void		dp_free_selection(GSList *sel);
 
 extern gboolean		dp_enter_dir(DirPane *dp, const gchar *path);
+
 extern void		dp_rescan(DirPane *dp);
 extern void		dp_rescan_post_cmd(DirPane *dp);
+extern gboolean		dp_rescan_row(DirPane *dp, const DirRow2 *row, GError **error);
 
 extern void		dp_path_clear(DirPane *dp);
 extern void		dp_path_focus(DirPane *dp);
@@ -49,16 +53,13 @@
 
 extern void		dp_history_set(DirPane *dp, const GList *paths);
 
-extern void		dp_freeze(DirPane *dp);
-extern void		dp_thaw(DirPane *dp);
-
 extern void		dp_dbclk_row(DirPane *dp, gint row);
 
-extern void		dp_select(DirPane *dp, gint row);
+extern void		dp_select(DirPane *dp, const DirRow2 *row);
 extern void		dp_select_all(DirPane *dp);
-extern void		dp_unselect(DirPane *dp, gint row);
+extern void		dp_unselect(DirPane *dp, const DirRow2 *row);
 extern void		dp_unselect_all(DirPane *dp);
-extern void		dp_toggle(DirPane *dp, gint row);
+extern void		dp_toggle(DirPane *dp,const DirRow2 *row);
 
 extern void		dp_split_refresh(MainInfo *min);
 
@@ -70,6 +71,45 @@
 extern guint		dp_pathwidgetry_add(PageBuilder func);
 extern GtkWidget **	dp_pathwidgetry_show(DirPane *dp, guint key);
 
+
+/* Data access functions. This very much exposes that we use a GtkTreeModel to store
+** the pane' data, but that is hardly a secret. This is done for performance; not
+** needing to pass a DirPane pointer frees up the 'user' pointer in CellRenderer
+** data callbacks. See also the dpformat module.
+*/
+extern GtkTreeModel *	dp_get_tree_model(const DirPane *dp);
+
+extern GFile *		dp_get_file_from_row(const DirPane *dp, const DirRow2 *row);
+extern GFile *		dp_get_file_from_name(const DirPane *dp, const gchar *name);
+extern GFile *		dp_get_file_from_name_display(const DirPane *dp, const gchar *name);
+
+extern void		dp_row_set_ftype(GtkTreeModel *model, const DirRow2 *row, FType *type);
+extern void		dp_row_set_size(GtkTreeModel *model, const DirRow2 *row, guint64 size);
+extern void		dp_row_set_flag(GtkTreeModel *model, const DirRow2 *row, guint32 mask);
+
+extern const gchar *	dp_row_get_name(const GtkTreeModel *model, const DirRow2 *row);
+extern const gchar *	dp_row_get_name_display(const GtkTreeModel *model, const DirRow2 *row);
+extern const gchar *	dp_row_get_name_edit(const GtkTreeModel *model, const DirRow2 *row);
+extern goffset		dp_row_get_size(const GtkTreeModel *model, const DirRow2 *row);
+extern guint64		dp_row_get_blocks(const GtkTreeModel *model, const DirRow2 *row);
+extern guint64		dp_row_get_blocksize(const GtkTreeModel *model, const DirRow2 *row);
+extern guint32		dp_row_get_mode(const GtkTreeModel *model, const DirRow2 *row);
+extern FType *		dp_row_get_ftype(const GtkTreeModel *model, const DirRow2 *row);
+extern GFileType	dp_row_get_file_type(const GtkTreeModel *model, const DirRow2 *row, gboolean target);
+extern guint64		dp_row_get_time_accessed(const GtkTreeModel *model, const DirRow2 *row);
+extern guint64		dp_row_get_time_changed(const GtkTreeModel *model, const DirRow2 *row);
+extern guint64		dp_row_get_time_created(const GtkTreeModel *model, const DirRow2 *row);
+extern guint64		dp_row_get_time_modified(const GtkTreeModel *model, const DirRow2 *row);
+extern guint32		dp_row_get_gid(const GtkTreeModel *model, const DirRow2 *row);
+extern guint32		dp_row_get_uid(const GtkTreeModel *model, const DirRow2 *row);
+extern guint32		dp_row_get_nlink(const GtkTreeModel *model, const DirRow2 *row);
+extern guint32		dp_row_get_device(const GtkTreeModel *model, const DirRow2 *row);
+extern const gchar *	dp_row_get_link_target(const GtkTreeModel *model, const DirRow2 *row);
+extern gboolean		dp_row_get_flags(const GtkTreeModel *model, const DirRow2 *row, guint32 mask);
+extern gboolean		dp_row_get_can_read(const GtkTreeModel *model, const DirRow2 *row);
+extern gboolean		dp_row_get_can_write(const GtkTreeModel *model, const DirRow2 *row);
+extern gboolean		dp_row_get_can_execute(const GtkTreeModel *model, const DirRow2 *row);
+
 extern GtkWidget *	dp_build(MainInfo *min, DPFormat *fmt, DirPane *dp);
 
 #endif		/* DIRPANE_H */

gentoo-0.15.6.tar.bz2/src/dpformat.c -> gentoo-0.19.9.tar.gz/src/dpformat.c Changed

@@ -13,6 +13,7 @@
 #include <time.h>
 
 #include "dpformat.h"
+#include "dirpane.h"
 #include "userinfo.h"
 #include "iconutil.h"
 #include "sizeutil.h"
@@ -46,11 +47,13 @@
 	{ DPC_DEVICE,		N_("Device Number"),		"device",	N_("Device") },
 	{ DPC_DEVMAJ,		N_("Device Number, major"),	"devmaj",	N_("DevMaj") },
 	{ DPC_DEVMIN,		N_("Device Number, minor"),	"devmin",	N_("DevMin") },
-	{ DPC_ATIME,		N_("Date of last Access"),	"atime",	N_("Accessed") },
-	{ DPC_MTIME,		N_("Date of last Modification"),"mtime",	N_("Modified") },
-	{ DPC_CTIME,		N_("Date of Creation"),		"ctime",	N_("Created") },
+	{ DPC_ATIME,		N_("Time of Last Access"),	"atime",	N_("Accessed") },
+	{ DPC_MTIME,		N_("Time of Last Modification"),"mtime",	N_("Modified") },
+	{ DPC_CRTIME,		N_("Time of Creation"),		"ctime",	N_("Created") },
+	{ DPC_CHTIME,		N_("Time of Last Change"),	"chtime",	N_("Changed") },
 	{ DPC_TYPE,		N_("Type Name"),		"type",		N_("Type") },
-	{ DPC_ICON,		N_("Icon"),			"icon",		N_("I") }
+	{ DPC_ICON,		N_("Icon"),			"icon",		N_("I") },
+	{ DPC_URI_NOFILE,	N_("URI (without file prefix)"),"urinofile",	N_("URI") },
 	};
 
 /* ----------------------------------------------------------------------------------------- */
@@ -135,28 +138,45 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 2000-04-16 -	Build and return a menu containing all the content type names. */
-GtkWidget * dpf_get_content_menu(GCallback sigfunc, gpointer user)
+/* 2010-05-12 -	Returns a tree model with two columns: one is the user-friendly name of a
+**		content type, and the other is the enum. Handy for building combos.
+*/
+static GtkTreeModel * get_content_model(void)
 {
-	GtkWidget	*menu, *item;
-	guint		i;
+	GtkListStore	*store;
+	gsize		i;
 
-	menu = gtk_menu_new();
-	for(i = 0; i < sizeof content_info / sizeof content_info0; i++)
+	store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
+	for(i = 0; i < sizeof content_info / sizeof *content_info; i++)
 	{
-		item = gtk_menu_item_new_with_label(_(content_infoi.name_full));
-		gtk_object_set_user_data(GTK_OBJECT(item), GUINT_TO_POINTER(content_infoi.id));
-		g_signal_connect(GTK_OBJECT(item), "activate", sigfunc, user);
-		gtk_menu_append(GTK_MENU(menu), item);
+		GtkTreeIter	iter;
+
+		gtk_list_store_append(store, &iter);
+		gtk_list_store_set(store, &iter, 0, _(content_infoi.name_full), 1, content_infoi.id, -1);
 	}
-	return menu;
+	return GTK_TREE_MODEL(store);
+}
+
+GtkWidget * dpf_get_content_combo_box(GCallback func, gpointer user)
+{
+	GtkTreeModel	*model = get_content_model();
+	GtkWidget	*wid;
+	GtkCellRenderer	*cr;
+
+	wid = gtk_combo_box_new_with_model(model);
+	cr = gtk_cell_renderer_text_new();
+	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(wid), cr, TRUE);
+	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(wid), cr, "text", 0, NULL);
+	g_signal_connect(G_OBJECT(wid), "changed", func, user);
+
+	return wid;
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
 void dpf_set_default_format(DpCFmt *fmt, DPContent content)
 {
-	stu_strncpy(fmt->title, dpf_get_content_title(content), sizeof fmt->title);
+	g_strlcpy(fmt->title, dpf_get_content_title(content), sizeof fmt->title);
 	fmt->content = content;
 	fmt->just  = GTK_JUSTIFY_LEFT;
 	fmt->width = 50;
@@ -168,7 +188,7 @@
 			fmt->width = 250;
 			break;
 		case DPC_SIZE:
-			fmt->extra.size.type = DPSIZE_BYTES;
+			fmt->extra.size.unit = SZE_BYTES;
 			fmt->extra.size.digits = 0;
 			fmt->extra.size.ticks  = 0;
 			fmt->extra.size.tick   = ',';
@@ -177,49 +197,53 @@
 			fmt->just = GTK_JUSTIFY_RIGHT;
 			break;
 		case DPC_BLOCKS:
-			stu_strncpy(fmt->extra.blocks.format, "%lu", sizeof fmt->extra.blocks.format);
+			g_strlcpy(fmt->extra.blocks.format, "%lu", sizeof fmt->extra.blocks.format);
 			break;
 		case DPC_BLOCKSIZE:
-			stu_strncpy(fmt->extra.blocksize.format, "%lu", sizeof fmt->extra.blocksize.format);
+			g_strlcpy(fmt->extra.blocksize.format, "%lu", sizeof fmt->extra.blocksize.format);
 			fmt->just = GTK_JUSTIFY_RIGHT;
 			break;
 		case DPC_MODENUM:
-			stu_strncpy(fmt->extra.mode.format, "%o", sizeof fmt->extra.mode.format);
+			g_strlcpy(fmt->extra.mode.format, "%o", sizeof fmt->extra.mode.format);
 			break;
 		case DPC_NLINK:
-			stu_strncpy(fmt->extra.nlink.format, "%u", sizeof fmt->extra.nlink.format);
+			g_strlcpy(fmt->extra.nlink.format, "%u", sizeof fmt->extra.nlink.format);
 			fmt->width = 75;
 			break;
 		case DPC_UIDNUM:
-			stu_strncpy(fmt->extra.uidnum.format, "%u", sizeof fmt->extra.uidnum.format);
+			g_strlcpy(fmt->extra.uidnum.format, "%u", sizeof fmt->extra.uidnum.format);
 			fmt->width = 75;
 			break;
 		case DPC_GIDNUM:
-			stu_strncpy(fmt->extra.gidnum.format, "%u", sizeof fmt->extra.gidnum.format);
+			g_strlcpy(fmt->extra.gidnum.format, "%u", sizeof fmt->extra.gidnum.format);
 			fmt->width = 75;
 			break;
 		case DPC_DEVICE:
-			stu_strncpy(fmt->extra.device.format, "%u", sizeof fmt->extra.device.format);
+			g_strlcpy(fmt->extra.device.format, "%u", sizeof fmt->extra.device.format);
 			fmt->width = 75;
 			break;
 		case DPC_DEVMAJ:
-			stu_strncpy(fmt->extra.devmaj.format, "%u", sizeof fmt->extra.devmaj.format);
+			g_strlcpy(fmt->extra.devmaj.format, "%u", sizeof fmt->extra.devmaj.format);
 			fmt->width = 75;
 			break;
 		case DPC_DEVMIN:
-			stu_strncpy(fmt->extra.devmin.format, "%u", sizeof fmt->extra.devmin.format);
+			g_strlcpy(fmt->extra.devmin.format, "%u", sizeof fmt->extra.devmin.format);
 			fmt->width = 75;
 			break;
 		case DPC_ATIME:
-			stu_strncpy(fmt->extra.a_time.format, "%Y-%m-%d %H:%M:%S", sizeof fmt->extra.a_time.format);
+			g_strlcpy(fmt->extra.a_time.format, "%Y-%m-%d %H:%M:%S", sizeof fmt->extra.a_time.format);
 			fmt->width = 184;
 			break;
-		case DPC_CTIME:
-			stu_strncpy(fmt->extra.c_time.format, "%Y-%m-%d %H:%M:%S", sizeof fmt->extra.c_time.format);
+		case DPC_CRTIME:
+			g_strlcpy(fmt->extra.cr_time.format, "%Y-%m-%d %H:%M:%S", sizeof fmt->extra.cr_time.format);
 			fmt->width = 184;
 			break;
 		case DPC_MTIME:
-			stu_strncpy(fmt->extra.m_time.format, "%Y-%m-%d %H:%M:%S", sizeof fmt->extra.c_time.format);
+			g_strlcpy(fmt->extra.m_time.format, "%Y-%m-%d %H:%M:%S", sizeof fmt->extra.m_time.format);
+			fmt->width = 184;
+			break;
+		case DPC_CHTIME:
+			g_strlcpy(fmt->extra.ch_time.format, "%Y-%m-%d %H:%M:%S", sizeof fmt->extra.ch_time.format);
 			fmt->width = 184;
 			break;
 		case DPC_TYPE:
@@ -255,27 +279,11 @@
 	fmt->path_above = FALSE;
 	fmt->hide_allowed = TRUE;
 	fmt->scrollbar_always = FALSE;
-	fmt->ctrl_mode = CTM_SET;
 
 	cfg->dp_format1 = cfg->dp_format0;
 
 	strcpy(cfg->dp_format1.def_path, ".");
 
-	cfg->dp_colors.colorDPCOL_PANE_SELECTED.red	= 0xEFBE;
-	cfg->dp_colors.colorDPCOL_PANE_SELECTED.green	= 0xEBAD;
-	cfg->dp_colors.colorDPCOL_PANE_SELECTED.blue	= 0xFFFF;
-	cfg->dp_colors.colorDPCOL_PANE_SELECTED.pixel	= 0UL;
-
-	cfg->dp_colors.colorDPCOL_FOCUS_UNSELECTED.red   = 0xAEBA;
-	cfg->dp_colors.colorDPCOL_FOCUS_UNSELECTED.green = 0x0000;
-	cfg->dp_colors.colorDPCOL_FOCUS_UNSELECTED.blue  = 0xF7DE;
-	cfg->dp_colors.colorDPCOL_FOCUS_UNSELECTED.pixel = 0UL;
-
-	cfg->dp_colors.colorDPCOL_FOCUS_SELECTED.red	   = 0xAEBA;
-	cfg->dp_colors.colorDPCOL_FOCUS_SELECTED.green   = 0x0000;
-	cfg->dp_colors.colorDPCOL_FOCUS_SELECTED.blue	   = 0x9E79;
-	cfg->dp_colors.colorDPCOL_FOCUS_SELECTED.pixel   = 0UL;
-
 	cfg->dp_paning.orientation = DPORIENT_HORIZ;
 	cfg->dp_paning.mode	   = DPSPLIT_RATIO;
 	cfg->dp_paning.value	   = 0.5;
@@ -286,238 +294,501 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1998-09-22 -	Format a name with additional type information in it (slash for directories,
-**		asterisk for executables, et cetera). Think ls -F.
+/* 2009-10-02 -	Gets the indicated content of a row, formatted as a string if possible. Note that this is independent
+**		of the selected content types for the display; you can always get at the content this way. It does
+**		cost you though. This is intended for human-speed operations, such as doing SelectRE on cell data.
+**		NOTE: This uses a "natural" formatting, rather than the high-featured formatting used for pane display.
 */
-static void format_typed_name(gchar *out, const gchar *name, mode_t mode)
-{
-	if(S_ISLNK(mode))
-		sprintf(out, "%s@", name);
-	else if(S_ISDIR(mode))
-		sprintf(out, "%s/", name);
-	else if(S_ISREG(mode) && (mode & S_IXUSR))
-		sprintf(out, "%s*", name);
-	else if(S_ISFIFO(mode))
-		sprintf(out, "%s|", name);
-	else if(S_ISSOCK(mode))
-		sprintf(out, "%s=", name);
-	else
-		strcpy(out, name);
+gboolean dpf_get_content(MainInfo *min, const DirPane *dp, const DirRow2 *row, DPContent content, gchar *out, gsize max)
+{
+	GtkTreeModel	*m;
+	const gchar	*name;
+	gchar		*root;
+	gsize		offset;
+	guint64		filedate;
+	GDate		date;
+
+	if(min == NULL || dp == NULL || row == NULL || out == NULL)
+		return FALSE;
+	m = dp_get_tree_model(dp);
+	switch(content)
+	{
+	case DPC_BLOCKS:
+		g_snprintf(out, max, "%" G_GUINT64_FORMAT, dp_row_get_blocks(m, row));
+		return TRUE;
+	case DPC_BLOCKSIZE:
+		g_snprintf(out, max, "%" G_GUINT64_FORMAT, dp_row_get_blocksize(m, row));
+		return TRUE;
+	case DPC_DEVICE:
+		g_snprintf(out, max, "%" G_GUINT32_FORMAT, dp_row_get_device(m, row));
+		return TRUE;
+	case DPC_DEVMAJ:
+		g_snprintf(out, max, "%" G_GUINT32_FORMAT, dp_row_get_device(m, row) >> 8);
+		return TRUE;
+	case DPC_DEVMIN:
+		g_snprintf(out, max, "%" G_GUINT32_FORMAT, dp_row_get_device(m, row) & 0xff);
+		return TRUE;
+	case DPC_GIDNUM:
+		g_snprintf(out, max, "%" G_GUINT32_FORMAT, dp_row_get_gid(m, row));
+		return TRUE;
+	case DPC_GIDSTR:
+		if((name = usr_lookup_gname(dp_row_get_gid(m, row))) != NULL)
+			g_snprintf(out, max, "%s", name);
+		else
+			g_snprintf(out, max, "%" G_GUINT32_FORMAT, dp_row_get_gid(m, row));
+		return TRUE;
+	case DPC_ICON:
+		/* We just can't squeeze the icon into a string. */
+		return FALSE;
+	case DPC_MODENUM:
+		g_snprintf(out, max, "%o", dp_row_get_mode(m, row));
+		return TRUE;
+	case DPC_MODESTR:
+		stu_mode_to_text(out, max, dp_row_get_mode(m, row));
+		return TRUE;
+	case DPC_NAME:
+		g_snprintf(out, max, "%s", dp_row_get_name_display(m, row));
+		return TRUE;
+	case DPC_NLINK:
+		g_snprintf(out, max, "%" G_GUINT32_FORMAT, dp_row_get_nlink(m, row));
+		return TRUE;
+	case DPC_SIZE:
+		g_snprintf(out, max, "%" G_GUINT64_FORMAT, dp_row_get_size(m, row));
+		return TRUE;
+	case DPC_ATIME:
+	case DPC_CRTIME:
+	case DPC_MTIME:
+	case DPC_CHTIME:
+	{
+		filedate = (content == DPC_ATIME) ? dp_row_get_time_accessed(m, row) :
+			   (content == DPC_CRTIME) ? dp_row_get_time_created(m, row) :
+			   (content == DPC_MTIME) ? dp_row_get_time_modified(m, row) :
+			   dp_row_get_time_changed(m, row);
+		g_date_set_time_t(&date, (time_t) filedate);
+		g_date_strftime(out, max, "%Y-%m-%d %H:%M:%S", &date);
+		return TRUE;
+	}
+	case DPC_TYPE:
+		g_snprintf(out, max, "%s", dp_row_get_ftype(m, row)->name);
+		return TRUE;
+	case DPC_UIDNUM:
+		g_snprintf(out, max, "%" G_GUINT32_FORMAT, dp_row_get_uid(m, row));
+		return TRUE;
+	case DPC_UIDSTR:
+		if((name = usr_lookup_uname(dp_row_get_uid(m, row))) != NULL)
+			g_snprintf(out, max, "%s", name);
+		else
+			g_snprintf(out, max, "%" G_GUINT32_FORMAT, dp_row_get_uid(m, row));
+		return TRUE;
+	case DPC_URI_NOFILE:
+		if((root = g_file_get_uri(dp->dir.root)) != NULL)
+		{
+			/* Skip the "file://" scheme prefix. */
+			offset = (strncmp(root, "file://", 7) == 0) * 7;	/* Too clever? */
+			g_snprintf(out, max, "%s/%s", root + offset, dp_row_get_name(m, row));
+			g_free(root);
+			return TRUE;
+		}
+		return FALSE;
+	case DPC_NUM_TYPES:
+		return FALSE;	/* Fail. */
+	}
+	return FALSE;
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 2002-03-27 -	A new "size" content formatter. This one is a lot more intelligent and feature-rich
-**		than the old one, and even incorporates the "IQ Size" content type, too. Way cleaner.
+/* 2010-02-22 -	Refactored this into a stand-alone function since it's not something I would like
+**		seeing copied elsewhere (like, say, in the Styles config preview code).
 */
-static void put_size(gchar **out, const DC_Size *dcs, const DirRow *row)
+void dpf_cell_set_style_colors(GtkCellRenderer *r, const Style *style, gboolean do_fg)
 {
-	gchar	*uptr, *unit = NULL;
+	const GdkColor	*fg = NULL, *bg = NULL;
 
-	if(!(S_ISDIR(DP_ROW_LSTAT(row).st_mode) && dcs->dir_show_fs_size) && !DP_ROW_FLAGS_CHK(row, DPRF_HAS_SIZE))
-		return;
-	if(dcs->type == DPSIZE_NATIVE)			/* Native gets it done right away, in a single line. */
-		g_snprintf(*out, 64, "%" G_GUINT64_FORMAT, (guint64) DP_ROW_LSTAT(row).st_size);
+	if(style != NULL)
+	{
+		if(do_fg)
+			fg = stl_style_property_get_color(style, SPN_COL_UNSEL_FG);
+		bg = stl_style_property_get_color(style, SPN_COL_UNSEL_BG);
+	}
+	if(do_fg)
+	{
+		if(fg != NULL)
+			g_object_set(G_OBJECT(r), "foreground-gdk", fg, "foreground-set", TRUE, NULL);
+		else
+			g_object_set(G_OBJECT(r), "foreground-set", FALSE, NULL);
+	}
+
+	if(bg != NULL)
+		g_object_set(G_OBJECT(r), "cell-background-gdk", bg, "cell-background-set", TRUE, NULL);
 	else
+		g_object_set(G_OBJECT(r), "cell-background-set", FALSE, NULL);
+}
+
+/* 2009-07-15 -	Formats the colors, if any, for the given renderer. The foreground is optional,
+**		since not all renderers (such as pixbuf) support a foreground color. This needs to be done
+**		per-column, there's no way of doing it per-row in GTK+ 2.0. :/
+*/
+static void format_colors_row2(GtkTreeModel *model, const DirRow2 *row, GtkCellRenderer *r, gboolean do_fg)
+{
+	FType	*ft;
+	Style	*st = NULL;
+
+	ft = dp_row_get_ftype(model, row);
+	if(ft != NULL)
+		st = ft->style;
+	dpf_cell_set_style_colors(r, st, do_fg);
+}
+
+static void cdf_name(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	const DC_Name	*cfg = user;
+	const gchar	*dname = dp_row_get_name_display(model, iter);
+
+	if(cfg->show_type || cfg->show_linkname)
 	{
-		gdouble	size = DP_ROW_LSTAT(row).st_size;
-
-		if(dcs->type == DPSIZE_KILOBYTES)
-			size /= 1024.0;
-		else if(dcs->type == DPSIZE_MEGABYTES)
-			size /= 1024.0 * 1024.0;
-		else if(dcs->type == DPSIZE_GIGABYTES)
-			size /= 1024.0 * 1024.0 * 1024.0;
-		else if(dcs->type == DPSIZE_SMART)	/* Let's do this inline, for speed. */
+		gchar		buf1024;
+		const gchar	*type = "", *tdname;
+
+		if(cfg->show_type)
 		{
-			if(size < (1 << 10))
-				unit = _("B");
-			else if(size < (1 << 20))
-			{
-				size /= 1024.0;
-				unit = _("KB");
-			}
-			else if(size < (1 << 30))
-			{
-				size /= 1024.0 * 1024.0;
-				unit = _("MB");
-			}
-			else
-			{
-				size /= 1024.0 * 1024.0 * 1024.0;
-				unit = _("GB");
-			}
+			const mode_t	mode = dp_row_get_mode(model, iter);
+
+			if(S_ISLNK(mode))
+				type = "@";
+			else if(S_ISDIR(mode))
+				type = "/";
+			else if(S_ISREG(mode) && (mode & S_IXUSR))
+				type = "*";
+			else if(S_ISFIFO(mode))
+				type = "|";
+			else if(S_ISSOCK(mode))
+				type = "=";
 		}
-		if(dcs->digits && (size - (guint64) size) != 0.0)
-			uptr = *out + 32 + sprintf(*out + 32, dcs->dformat, size - (guint64) size);
-		else
-			*(uptr = *out + 33) = '\0';
-		if(dcs->ticks)
-			*out = stu_tickify(*out + 32 + 1, size, dcs->tick);
+		/* \xe2\x86\x92 is UTF-8 for 'right arrow', Unicode character U+2190. */
+		if(cfg->show_linkname && (tdname = dp_row_get_link_target(model, iter)) != NULL)
+			g_snprintf(buf, sizeof buf, "%s%s \xe2\x86\x92 %s", dname, type, tdname);
 		else
-			*out = stu_tickify(*out + 32 + 1, size, '\0');
-		if(unit)
-			strcpy(uptr, unit);
+			g_snprintf(buf, sizeof buf, "%s%s", dname, type);
+
+		g_object_set(renderer, "text", buf, NULL);
 	}
+	else
+		g_object_set(renderer, "text", dname, NULL);
+
+	format_colors_row2(model, iter, renderer, TRUE);
 }
 
-/* 1998-05-23 -	Format column <column> of given directory line into <out>.
-** 1998-05-31 -	Added support for showing the device number (and also to split it into its major and minor
-**		components, of course).
-** 1998-06-21 -	Added the <dp> argument, since it is required to find the formatting info nowadays.
-**		Implemented framework for supporting column-specific configuration. Excellent place to stuff
-**		the formatting strings used for date columns, for example.
-** 1998-06-24 -	By direct logical extension, I made all numerical columns' formatting configurable.
-** 1998-08-10 -	Made this routine a bit more complex, and added it's friend the post-insertion
-**		dpf_post_format_column() function (below).
-** 2002-04-28 -	Added one level of indirection to the <out> argument, for new size formatting.
-*/
-void dpf_format_column(MainInfo *min, const DirPane *dp, const DirRow *row, guint column, gchar **out)
+static void cdf_size(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
 {
-	const DPFormat	*fmt;
-	const DpCFmt	*col_fmt;
-	const gchar	*name;
-	struct tm	*tm;
+	const DC_Size	*cfg = user;
+	goffset		size;
+	gchar		buf64;
 
-	fmt = &min->cfg.dp_formatdp->index;
-	if(column >= fmt->num_columns)
+	if(!cfg->dir_show_fs_size && dp_row_get_file_type(model, iter, TRUE) == G_FILE_TYPE_DIRECTORY)
+	{
+		g_object_set(renderer, "text", "", NULL);
 		return;
+	}
+	size = dp_row_get_size(model, iter);
+	sze_put_offset(buf, sizeof buf, size, cfg->unit, cfg->digits, cfg->ticks ? cfg->tick : '\0');
+	g_object_set(renderer, "text", buf, NULL);
+	format_colors_row2(model, iter, renderer, TRUE);
+}
 
-	**out = '\0';
-	col_fmt = &fmt->formatcolumn;
+static void cdf_blocks(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	guint64	blocks;
+	gchar	buf64;
 
-	switch(col_fmt->content)
+	blocks = dp_row_get_blocks(model, iter);
+	g_snprintf(buf, sizeof buf, "%" G_GUINT64_FORMAT, blocks);
+	g_object_set(renderer, "text", buf, NULL);
+	format_colors_row2(model, iter, renderer, TRUE);
+}
+
+static void cdf_icon(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	FType		*ftype;
+
+	if((ftype = dp_row_get_ftype(model, iter)) != NULL)
 	{
-		case DPC_NAME:	/* GTK2: Need more stuff here, for symlinks. */
-			if(col_fmt->extra.name.show_type)
-				format_typed_name(*out, DP_ROW_NAMED(row), DP_ROW_LSTAT(row).st_mode);
-			else
-				sprintf(*out, "%s", DP_ROW_NAMED(row));
-			if(S_ISLNK(DP_ROW_LSTAT(row).st_mode) && col_fmt->extra.name.show_linkname && DP_ROW_LINKNAMED(row)0)
-				sprintf(strchr(*out, '\0'), " -> %s", DP_ROW_LINKNAMED(row));
-			break;
-		case DPC_SIZE:
-			put_size(out, &col_fmt->extra.size, row);
-			break;
-		case DPC_BLOCKS:
-			sprintf(*out, col_fmt->extra.blocks.format, DP_ROW_LSTAT(row).st_blocks);
-			break;
-		case DPC_BLOCKSIZE:
-			sprintf(*out, col_fmt->extra.blocksize.format, DP_ROW_LSTAT(row).st_blocks * dp->dir.fs.stat.f_bsize);
-			break;
-		case DPC_MODENUM:
-			sprintf(*out, col_fmt->extra.mode.format, DP_ROW_LSTAT(row).st_mode);
-			break;
-		case DPC_MODESTR:
-			stu_mode_to_text(*out, 32, DP_ROW_LSTAT(row).st_mode);
-			break;
-		case DPC_NLINK:
-			sprintf(*out, col_fmt->extra.nlink.format, DP_ROW_LSTAT(row).st_nlink);
-			break;
+		const Style	*stl = ftype->style;
+		const gchar	*iname;
 
-		case DPC_UIDNUM:
-			sprintf(*out, col_fmt->extra.uidnum.format, DP_ROW_LSTAT(row).st_uid);
-			break;
-		case DPC_UIDSTR:
-			if((name = usr_lookup_uname(DP_ROW_LSTAT(row).st_uid)) != NULL)
-				strcpy(*out, name);
-			else
-				sprintf(*out, "%d", (gint) DP_ROW_LSTAT(row).st_uid);
-			break;
-		case DPC_GIDNUM:
-			sprintf(*out, col_fmt->extra.gidnum.format, DP_ROW_LSTAT(row).st_gid);
-			break;
-		case DPC_GIDSTR:
-			if((name = usr_lookup_gname(DP_ROW_LSTAT(row).st_gid)) != NULL)
-				strcpy(*out, name);
-			else
-				sprintf(*out, "%d", (gint) DP_ROW_LSTAT(row).st_gid);
-			break;
+		if((iname = stl_style_property_get_icon(stl, SPN_ICON_UNSEL)) != NULL)
+		{
+			GdkPixbuf	*pbuf;
+			MainInfo	*min = g_object_get_data(G_OBJECT(renderer), "main");
 
-		case DPC_DEVICE:
-			sprintf(*out, col_fmt->extra.device.format, DP_ROW_LSTAT(row).st_rdev);
-			break;
-		case DPC_DEVMAJ:
-			sprintf(*out, col_fmt->extra.devmaj.format, DP_ROW_LSTAT(row).st_rdev >> 8);
-				break;
-		case DPC_DEVMIN:
-			sprintf(*out, col_fmt->extra.devmin.format, DP_ROW_LSTAT(row).st_rdev & 0xFF);
-			break;
+			if((pbuf = ico_icon_get_pixbuf(min, iname)) != NULL)
+				g_object_set(renderer, "pixbuf", pbuf, NULL);
+		}
+	}
+	format_colors_row2(model, iter, renderer, FALSE);
+}
 
-		case DPC_ATIME:
-			if((tm = localtime(&DP_ROW_LSTAT(row).st_atime)) != NULL)
-				strftime(*out, 32, col_fmt->extra.a_time.format, tm);
-			break;
-		case DPC_MTIME:
-			if((tm = localtime(&DP_ROW_LSTAT(row).st_mtime)) != NULL)
-				strftime(*out, 32, col_fmt->extra.m_time.format, tm);
-			break;
-		case DPC_CTIME:
-			if((tm = localtime(&DP_ROW_LSTAT(row).st_ctime)) != NULL)
-				strftime(*out, 32, col_fmt->extra.c_time.format, tm);
-			break;
-		case DPC_TYPE:
-			if(DP_ROW_TYPE(row) != NULL)
-				sprintf(*out, "%s", DP_ROW_TYPE(row)->name);
-			else
-				sprintf(*out, "(none)");
-			break;
-		case DPC_ICON:
-			break;
-		case DPC_NUM_TYPES:
-			break;
+static void do_cdf_time(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, const gchar *format, guint64 timestamp)
+{
+	const time_t	now = (time_t) (timestamp & 0xffffffffu);
+	struct tm	local;
+
+	/* Use old-school Unix-y functions, since glib doesn't provide much until 2.26. Then we get GDateTime, w00t. :| */
+	if(localtime_r(&now, &local) != NULL)
+	{
+		gchar	buf32 = "\x1";	/* Marker char, to detect strftime() failure/success. */
+		size_t	got;
+
+		got = strftime(buf, sizeof buf, format, &local);
+		if((got == 0 && buf0 == '\x1') || got == sizeof buf)	/* Try to detect (and handle!) failure. */
+			buf0 = '\0';
+		g_object_set(renderer, "text", buf, NULL);
 	}
+	else
+		g_object_set(renderer, "text", "", NULL);
+	format_colors_row2(model, iter, renderer, TRUE);
 }
 
-/* 1998-08-11 -	Format the given row, once it has actually been added to the dirpane. Modified
-**		from a routine created yesterday. Takes into account the selection-state for
-**		the row, and sets the colors accordingly. This is called when the user does a
-**		selection/unselection, too.
-** 1998-09-19 -	Something in the clist color setting seems to clear errno sometimes (!), which
-**		really isn't acceptable. So now we just save and restore errno. Stupid.
-** 1999-03-04 -	No longer cares about the old "selected" flag, since it's no longer there.
-*/
-void dpf_post_format_row(MainInfo *min, DirPane *dp, gint row)
+static void cdf_atime(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
 {
-	DPFormat	*fmt;
-	const gchar	*iname;
-	guint		col;
-	gint		oe = errno;
-	Style		*stl;
-	GdkPixmap	*ipix;
-	GdkBitmap	*imsk;
-
-	fmt = &min->cfg.dp_formatdp->index;
-	stl = DP_ROW_TYPE(&dp->dir.rowrow)->style;
-	if(stl == NULL)
+	do_cdf_time(col, renderer, model, iter, user, dp_row_get_time_accessed(model, iter));
+}
+
+static void cdf_crtime(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	do_cdf_time(col, renderer, model, iter, user, dp_row_get_time_created(model, iter));
+}
+
+static void cdf_mtime(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	do_cdf_time(col, renderer, model, iter, user, dp_row_get_time_modified(model, iter));
+}
+
+static void cdf_chtime(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	do_cdf_time(col, renderer, model, iter, user, dp_row_get_time_changed(model, iter));
+}
+
+static void cdf_devmax(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	gchar	buf16;
+
+	g_snprintf(buf, sizeof buf, user, dp_row_get_device(model, iter) >> 8);
+	g_object_set(renderer, "text", buf, NULL);
+	format_colors_row2(model, iter, renderer, TRUE);
+}
+
+static void cdf_device(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	gchar	buf16;
+
+	g_snprintf(buf, sizeof buf, user, dp_row_get_device(model, iter));
+	g_object_set(renderer, "text", buf, NULL);
+	format_colors_row2(model, iter, renderer, TRUE);
+}
+
+static void cdf_devmin(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	gchar	buf16;
+
+	g_snprintf(buf, sizeof buf, user, dp_row_get_device(model, iter) & 255);
+	g_object_set(renderer, "text", buf, NULL);
+	format_colors_row2(model, iter, renderer, TRUE);
+}
+
+static void cdf_gidnum(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	gchar	buf16;
+
+	g_snprintf(buf, sizeof buf, user, dp_row_get_gid(model, iter));
+	g_object_set(renderer, "text", buf, NULL);
+	format_colors_row2(model, iter, renderer, TRUE);
+}
+
+static void cdf_gidstr(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	guint32		gid;
+	const gchar	*group;
+
+	gid = dp_row_get_gid(model, iter);
+	if((group = usr_lookup_gname(gid)) != NULL)
+		g_object_set(renderer, "text", group, NULL);
+	else
 	{
-		g_warning("DpFormat: No style for \"%s\"", DP_ROW_NAME(&dp->dir.rowrow));
-		return;
+		gchar	buf16;
+
+		g_snprintf(buf, sizeof buf, user, gid);
+		g_object_set(renderer, "text", buf, NULL);
 	}
-	iname = stl_style_property_get_icon(stl, SPN_ICON_UNSEL);
-	for(col = 0; col < min->cfg.dp_formatdp->index.num_columns; col++)
+	format_colors_row2(model, iter, renderer, TRUE);
+}
+
+static void cdf_modenum(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	gchar	buf32;
+
+	g_snprintf(buf, sizeof buf, user, dp_row_get_mode(model, iter));
+	g_object_set(renderer, "text", buf, NULL);
+	format_colors_row2(model, iter, renderer, TRUE);
+}
+
+static void cdf_modestr(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	gchar	buf16;
+
+	stu_mode_to_text(buf, sizeof buf, dp_row_get_mode(model, iter));
+	g_object_set(renderer, "text", buf, NULL);
+	format_colors_row2(model, iter, renderer, TRUE);
+}
+
+static void cdf_type(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	const FType	*ft;
+
+	if((ft = dp_row_get_ftype(model, iter)) != NULL)
+	{
+		g_object_set(renderer, "text", ft->name, NULL);
+		format_colors_row2(model, iter, renderer, TRUE);
+	}
+}
+
+static void cdf_uidnum(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	gchar	buf16;
+
+	g_snprintf(buf, sizeof buf, "%u", dp_row_get_uid(model, iter));
+	g_object_set(renderer, "text", buf, NULL);
+	format_colors_row2(model, iter, renderer, TRUE);
+}
+
+static void cdf_uidstr(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	guint32		uid;
+	const gchar	*name;
+
+	uid = dp_row_get_uid(model, iter);
+
+	if((name = usr_lookup_uname(uid)) != NULL)
+		g_object_set(renderer, "text", name, NULL);
+	else
 	{
-		if(fmt->formatcol.content == DPC_ICON)
+		gchar	buf32;
+
+		g_snprintf(buf, sizeof buf, user, uid);
+		g_object_set(renderer, "text", buf, NULL);
+	}
+	format_colors_row2(model, iter, renderer, TRUE);
+}
+
+static void cdf_nlink(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	gchar	buf16;
+
+	g_snprintf(buf, sizeof buf, "%u", dp_row_get_nlink(model, iter));
+	g_object_set(renderer, "text", buf, NULL);
+	format_colors_row2(model, iter, renderer, TRUE);
+}
+
+static void cdf_uri(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user)
+{
+	DirPane	*dp = user;
+	GFile	*file;
+
+	if((file = dp_get_file_from_row(dp, iter)) != NULL)
+	{
+		gchar	*uri, buf512;
+
+		if((uri = g_file_get_uri(file)) != NULL)
 		{
-			if((ipix = ico_icon_get(min, iname, &imsk)) != NULL)
-				gtk_clist_set_pixmap(GTK_CLIST(dp->list), row, col, ipix, imsk);
+			if(strncmp(uri, "file://", 7) == 0)
+				g_snprintf(buf, sizeof buf, "%s", uri + 7);
 			else
-				gtk_clist_set_text(GTK_CLIST(dp->list), row, col, "");
+				g_snprintf(buf, sizeof buf, "%s", uri);
+			g_free(uri);
 		}
+		else
+			g_snprintf(buf, sizeof buf, "(failed)");
+		g_object_set(renderer, "text", buf, NULL);
+		format_colors_row2(model, iter, renderer, TRUE);
 	}
-	dpf_format_colors_row(dp, row);
-	errno = oe;
 }
 
-/* 1999-05-10 -	Set colors of <row> in <dp> to the correct style's colors. */
-void dpf_format_colors_row(DirPane *dp, gint row)
+GtkTreeCellDataFunc dpf_get_cell_data_func(DirPane *dp, gint column, gpointer *user)
 {
-	Style			*stl;
-	register GdkColor	*col;
+	DPFormat	*fmt;
+	DpCFmt		*col_fmt;
 
-	stl = DP_ROW_TYPE(&dp->dir.rowrow)->style;
+	fmt = &dp->main->cfg.dp_formatdp->index;
+	if(column >= fmt->num_columns)
+		return NULL;
+	col_fmt = &fmt->formatcolumn;
 
-	if((col = (GdkColor *) stl_style_property_get_color(stl, SPN_COL_UNSEL_BG)) != NULL)
-		gtk_clist_set_background(GTK_CLIST(dp->list), row, col);
-	gtk_clist_set_foreground(GTK_CLIST(dp->list), row, (GdkColor *) stl_style_property_get_color(stl, SPN_COL_UNSEL_FG));
+	switch(col_fmt->content)
+	{
+	case DPC_ATIME:
+		*user = col_fmt->extra.a_time.format;
+		return cdf_atime;
+	case DPC_BLOCKS:
+		*user = col_fmt->extra.blocks.format;
+		return cdf_blocks;
+	case DPC_BLOCKSIZE:
+		return NULL;
+	case DPC_CRTIME:
+		*user = col_fmt->extra.cr_time.format;
+		return cdf_crtime;
+	case DPC_CHTIME:
+		*user = col_fmt->extra.ch_time.format;
+		return cdf_chtime;
+	case DPC_DEVMAJ:
+		*user = col_fmt->extra.devmaj.format;
+		return cdf_devmax;
+	case DPC_DEVICE:
+		*user = col_fmt->extra.device.format;
+		return cdf_device;
+	case DPC_DEVMIN:
+		*user = col_fmt->extra.devmin.format;
+		return cdf_devmin;
+	case DPC_GIDNUM:
+		*user = col_fmt->extra.gidnum.format;
+		return cdf_gidnum;
+	case DPC_GIDSTR:
+		*user = col_fmt->extra.gidnum.format;
+		return cdf_gidstr;
+	case DPC_ICON:
+		*user = NULL;
+		return cdf_icon;
+	case DPC_MODENUM:
+		*user = col_fmt->extra.mode.format;
+		return cdf_modenum;
+	case DPC_MODESTR:
+		*user = NULL;
+		return cdf_modestr;
+	case DPC_MTIME:
+		*user = col_fmt->extra.m_time.format;
+		return cdf_mtime;
+	case DPC_NAME:
+		*user = &col_fmt->extra.name;
+		return cdf_name;
+	case DPC_NLINK:
+		*user = col_fmt->extra.nlink.format;
+		return cdf_nlink;
+	case DPC_SIZE:
+		*user = &col_fmt->extra.size;
+		return cdf_size;
+	case DPC_TYPE:
+		return cdf_type;
+	case DPC_UIDNUM:
+		*user = col_fmt->extra.uidnum.format;
+		return cdf_uidnum;
+	case DPC_UIDSTR:
+		*user = col_fmt->extra.uidnum.format;	/* Yes, numerical again. */
+		return cdf_uidstr;
+	case DPC_URI_NOFILE:
+		*user = dp;
+		return cdf_uri;
+	default:
+		*user = NULL;
+	}
+	return NULL;
 }
+

gentoo-0.15.6.tar.bz2/src/dpformat.h -> gentoo-0.19.9.tar.gz/src/dpformat.h Changed

@@ -10,11 +10,16 @@
 extern DPContent	dpf_get_content_from_mnemonic(const gchar *name);
 extern const gchar *	dpf_get_content_title(DPContent content);
 
-extern GtkWidget *	dpf_get_content_menu(GtkSignalFunc sigfunc, gpointer user);
+extern GtkWidget *	dpf_get_content_combo_box(GCallback func, gpointer user);
 
 extern void		dpf_set_default_format(DpCFmt *fmt, DPContent content);
 extern void		dpf_init_defaults(CfgInfo *cfg);
 
-extern void		dpf_format_column(MainInfo *min, const DirPane *dp, const DirRow *line, guint column, gchar **out);
-extern void		dpf_post_format_row(MainInfo *min, DirPane *dp, gint row);
 extern void		dpf_format_colors_row(DirPane *dp, gint row);
+
+extern gboolean		dpf_get_content(MainInfo *min, const DirPane *dp, const DirRow2 *row, DPContent content, gchar *out, gsize max);
+
+extern void		dpf_cell_set_style_colors(GtkCellRenderer *r, const Style *st, gboolean do_fg);
+
+extern GtkTreeCellDataFunc	dpf_get_cell_data_func(DirPane *dp, gint column, gpointer *user);
+extern void		dpf_format_colors_row2(const DirPane *dp, const DirRow2 *row, GtkCellRenderer *r, gboolean do_fg);

gentoo-0.15.6.tar.bz2/src/errors.c -> gentoo-0.19.9.tar.gz/src/errors.c Changed

@@ -10,7 +10,6 @@
 #include <stdarg.h>
 #include <string.h>
 
-#include "convutil.h"
 #include "dirpane.h"
 #include "dialog.h"
 #include "guiutil.h"
@@ -26,7 +25,6 @@
 void err_clear(MainInfo *min)
 {
 	error_desc0 = '\0';
-	errno = 0;
 }
 
 /* 1999-01-21 -	Format an arbitrary string and print it on the status (error) line.
@@ -46,50 +44,65 @@
 /* 1998-05-30 -	Added special treatment of code == -1; this means that there is no
 **		errno-compatible error information available, and the entire thing
 **		is then suppressed.
+** 2010-03-07 -	Assumes filenames are displayable, i.e. in UTF-8.
 */
 gint err_set(MainInfo *min, gint code, const gchar *source, const gchar *obj)
 {
-	gint	old_errno = errno;
-
 	if(source != NULL)
 	{
-		Conv	conv;
-		gchar	*src_display, *obj_display;
-
-		/* Assume that the source and object names are in the filesystem encoding, and convert. */
-		conv_init(&conv);
-		src_display = conv_begin_reverse(&conv, source);
-		obj_display = conv_add_reverse(&conv, obj);
 		if(code >= 0)
 		{
 			const gchar	*desc;
 
 			desc = g_strerror(code);
 			if(obj != NULL)
-				g_snprintf(error_desc, sizeof error_desc, _("Couldn't %s \"%s\": %s (code %d)"), src_display, obj_display, desc, code);
+				g_snprintf(error_desc, sizeof error_desc, _("Couldn't %s \"%s\": %s (code %d)"), source, obj, desc, code);
 			else
-				g_snprintf(error_desc, sizeof error_desc, _("Couldn't %s \"%s\" (code %d)"), src_display, obj_display, code);
+				g_snprintf(error_desc, sizeof error_desc, _("Couldn't %s \"%s\" (code %d)"), source, obj, code);
 		}
 		else
 		{
 			if(obj != NULL)
-				g_snprintf(error_desc, sizeof error_desc, _("Couldn't %s \"%s\""), src_display, obj_display);
+				g_snprintf(error_desc, sizeof error_desc, _("Couldn't %s \"%s\""), source, obj);
 			else
-				g_snprintf(error_desc, sizeof error_desc, _("Couldn't %s"), src_display);
+				g_snprintf(error_desc, sizeof error_desc, _("Couldn't %s"), source);
 		}
-		conv_end(&conv);
 	}
-	errno = old_errno;
 	return 1;
 }
 
+/* 2009-08-06 -	Sets the error report from a GError, which is what most GIO calls will generate. This frees the GError, too. The file is not freed! */
+void err_set_gerror(MainInfo *min, GError **err, const gchar *source, const GFile *file)
+{
+	if(err != NULL && *err != NULL)
+	{
+		/* If a file was supplied, extract the name and include in the displayed message. */
+		if(file != NULL)
+		{
+			gchar	*pn = g_file_get_parse_name((GFile *) file);
+
+			g_snprintf(error_desc, sizeof error_desc, _("%s (%s)"), (*err)->message, pn);
+			g_free(pn);
+		}
+		else
+			g_snprintf(error_desc, sizeof error_desc, _("%s"), (*err)->message);
+		g_error_free(*err);
+		*err = NULL;
+	}
+}
+
 void err_show(MainInfo *min)
 {
 	if(error_desc0 != '\0')
 	{
-		gtk_label_set_text(GTK_LABEL(min->gui->top), error_desc);
-		gui_events_flush();
-		if(min->cfg.errors.dialog)
+		if(min->cfg.errors.display == ERR_DISPLAY_STATUSBAR)
+		{
+			gtk_label_set_text(GTK_LABEL(min->gui->top), error_desc);
+			gui_events_flush();
+		}
+		else if(min->cfg.errors.display == ERR_DISPLAY_TITLEBAR)
+			gui_set_main_title(min, error_desc);
+		else if(min->cfg.errors.display == ERR_DISPLAY_DIALOG)
 			dlg_dialog_async_new_simple(error_desc, "Error", "OK", NULL, NULL);
 		if(min->cfg.errors.beep)
 			gdk_beep();

gentoo-0.15.6.tar.bz2/src/errors.h -> gentoo-0.19.9.tar.gz/src/errors.h Changed

gentoo-0.15.6.tar.bz2/src/file.c -> gentoo-0.19.9.tar.gz/src/file.c Changed

@@ -18,6 +18,7 @@
 #include <unistd.h>
 
 #include "dialog.h"
+#include "errors.h"
 #include "children.h"
 #include "file.h"
 
@@ -32,56 +33,22 @@
 
 static void start_file(MainInfo *min, const gchar *cmd)
 {
-	pid_t	child;
-	gint	fd_in2, fd_out2;
+	gchar	*argv = { "file", "file", "-n", "-f", "-", NULL };
+	GPid	child;
+	GError	*err = NULL;
 
-	if(pipe(fd_in) != 0)
-		return;
-	if(pipe(fd_out) != 0)
+	if(g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &child, &file_info.file_in, &file_info.file_out, NULL, &err))
 	{
-		close(fd_inSTDIN_FILENO);
-		close(fd_inSTDOUT_FILENO);
-		return;
+		chd_register("file", child, CGF_RUNINBG, 0);
 	}
-	child = fork();
-	if(child == 0)		/* Now in child? */
+	else
 	{
-		guint	bits = 0U;
+		gchar	buf1024;
 
-		if(close(STDIN_FILENO) == 0)
-		{
-			if(dup(fd_inSTDIN_FILENO) == STDIN_FILENO)
-				bits |= (close(fd_inSTDOUT_FILENO) == 0);
-		}
-		if(close(STDOUT_FILENO) == 0)
-		{
-			if(dup(fd_outSTDOUT_FILENO) == STDOUT_FILENO)
-				bits |= (close(fd_outSTDIN_FILENO) == 0) << 1;
-		}
-		if(bits == 3U)
-			execlp(cmd, cmd, "-n", "-f", "-", NULL);
-		fprintf(stderr, "FILE: execlp() of '%s' failed (code %d)\n", cmd, errno);
-		exit(EXIT_FAILURE);
-	}
-	else if(child > 0)	/* In parent? */
-	{
-		chd_register(cmd, child, CGF_RUNINBG, FALSE);
-		file_info.file_in  = fd_inSTDOUT_FILENO;
-		file_info.file_out = fd_outSTDIN_FILENO;
-		if(close(fd_inSTDIN_FILENO) == 0)
-		{
-			if(close(fd_outSTDOUT_FILENO) == 0)
-			{
-				if(fcntl(file_info.file_out, F_SETFL, O_NONBLOCK) == 0)
-					return;
-			}
-		}
+		g_snprintf(buf, sizeof buf, "Couldn't run the 'file' command:\n%s", err->message);
+		dlg_dialog_async_new_error(buf);
+		g_error_free(err);
 	}
-	close(fd_inSTDIN_FILENO);
-	close(fd_inSTDOUT_FILENO);
-	close(fd_outSTDIN_FILENO);
-	close(fd_outSTDOUT_FILENO);
-	dlg_dialog_async_new_error("Couldn't fork() to run\nthe 'file' command!");
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -117,13 +84,12 @@
 		{
 			if(FD_ISSET(file_info.file_out, &fds_read))
 			{
-				errno = 0;
 				if((got = read(file_info.file_out, resp, sizeof resp - 1)) > 0)
 				{
 					const gchar	*cp;
 
 					respgot - 1 = '\0';
-					if((cp = strchr(resp, ':')) != NULL)
+					if((cp = strrchr(resp, ':')) != NULL)
 					{
 						cp++;
 						while(*cp && isspace((guchar) *cp))
@@ -131,12 +97,8 @@
 						return cp;
 					}
 				}
-				if(errno && errno != EAGAIN)
-					perror("Read from pipe");
 			}
 		}
-		else
-			perror("select");
 	}
 	return NULL;
 }

gentoo-0.15.6.tar.bz2/src/fileutil.c -> gentoo-0.19.9.tar.gz/src/fileutil.c Changed

@@ -29,11 +29,6 @@
 
 #define	MIN_COPY_CHUNK	(1 << 17)
 
-/* Path components are relative to this if they're not absolute. */
-static gchar	base_pathPATH_MAX;
-/* The length of the base. Saves some calls to strlen() in the middle of everything. :) */
-static gint	base_len;
-
 /* ----------------------------------------------------------------------------------------- */
 
 /* 1998-05-21 -	Enter a directory, saving the old path for restoration later.
@@ -212,336 +207,246 @@
 */
 gboolean fut_exists(const gchar *name)
 {
-	gint		old_errno = errno;
-	gboolean	ret;
+	return access(name, F_OK) == 0;
+}
 
-	ret = (access(name, F_OK) == 0);
-	errno = old_errno;
+/* ----------------------------------------------------------------------------------------- */
 
-	return ret;
-}
+static gboolean	do_size_gfile_info(MainInfo *min, const GFile *object, const GFileInfo *fi, guint64 *bytes, FUCount *fc, GError **error);
 
-/* 1998-12-18 -	Sets <size> to the size of file <name>, in bytes. Returns 1 on success,
-**		0 on failure (in case <size> is never touched).
-*/
-gboolean fut_size(const gchar *name, gsize *size)
+static gboolean do_size_gfile_dir(MainInfo *min, const GFile *root, guint64 *bytes, FUCount *fc, GError **error)
 {
-	struct stat	s;
-	gint		old_errno = errno, ret = 0;
+	GFileEnumerator	*fe;
+	GFileInfo	*fi;
+	GFile		*child;
+	gboolean	ok = TRUE;
 
-	if(name != NULL && size != NULL && (ret = (stat(name, &s)) == 0))
-		*size = (gsize) s.st_size;
-	errno = old_errno;
-	return ret ? TRUE : FALSE;
-}
+	if((fe = g_file_enumerate_children((GFile *) root, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, error)) == NULL)
+		return FALSE;
+	while(ok && ((fi = g_file_enumerator_next_file(fe, NULL, error)) != NULL))
+	{
+		if((child = g_file_get_child_for_display_name((GFile *) root, g_file_info_get_display_name(fi), NULL)) != NULL)
+		{
+			ok = do_size_gfile_info(min, child, fi, bytes, fc, error);
+			g_object_unref(child);
+		}
+		else
+			ok = FALSE;
+		g_object_unref(fi);
+	}
+	if(ok && fc != NULL)
+		fc->num_total = fc->num_dirs + fc->num_files + fc->num_links + fc->num_specials;
 
-/* 1999-02-03 -	Works just like fut_size above, but takes an open file descriptor
-**		instead of a filename. Sometimes handy.
-*/
-gboolean fut_fsize(gint fd, gsize *size)
-{
-	struct stat	s;
-	gint		old_errno = errno, ret = 0;
+	g_object_unref(fe);
 
-	if(fd >= 0 && size != NULL && (ret = (fstat(fd, &s)) == 0))
-		*size = (gsize) s.st_size;
-	errno = old_errno;
-	return ret ? TRUE : FALSE;
+	return ok;
 }
 
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1998-12-20 -	This is under the hood of the fut_dir_size() function. */
-static gint recurse_dir_size(MainInfo *min, const gchar *path, guint64 *bytes, FUCount *fc, gboolean with_progress)
+static gboolean do_size_gfile_info(MainInfo *min, const GFile *object, const GFileInfo *fi, guint64 *bytes, FUCount *fc, GError **error)
 {
-	gchar		old_dirPATH_MAX;
-	DIR		*dir;
-	struct dirent	*de;
-	struct stat	stat;
+	gboolean	ret = TRUE;
 
-	if(path == NULL)
-		return 0;
-
-	if(fut_cd(path, old_dir, sizeof old_dir))
+	if(bytes != NULL)
+		*bytes += g_file_info_get_size((GFileInfo *) fi);
+	if(fc != NULL)
 	{
-		if((dir = opendir(".")) != NULL)
-		{
-			err_clear(min);
-			while((de = readdir(dir)) != NULL)
-			{
-				if(with_progress)
-				{
-					pgs_progress_item_begin(min, de->d_name, 0);
-					if(pgs_progress_item_update(min, 0) == PGS_CANCEL)
-					{
-						errno = EINTR;
-						break;
-					}
-				}
-				if(!min->cfg.dir_filter(de->d_name))
-					continue;
-				if(lstat(de->d_name, &stat) == 0)
-				{
-					if(bytes != NULL)
-						(*bytes) += stat.st_size;
-					if(fc != NULL)
-					{
-						fc->num_bytes  += (guint64) stat.st_size;
-						fc->num_blocks += (guint64) stat.st_blocks;
-					}
-					if(S_ISDIR(stat.st_mode))
-					{
-						if(fc != NULL)
-							fc->num_dirs++;
-						recurse_dir_size(min, de->d_name, bytes, fc, with_progress);
-					}
-					else if(!S_ISDIR(stat.st_mode) && fc != NULL)
-					{
-						if(S_ISREG(stat.st_mode))
-							fc->num_files++;
-						else if(S_ISLNK(stat.st_mode))
-							fc->num_links++;
-						else if(S_ISCHR(stat.st_mode))
-							fc->num_cdevs++;
-						else if(S_ISBLK(stat.st_mode))
-							fc->num_bdevs++;
-						else if(S_ISFIFO(stat.st_mode))
-							fc->num_fifos++;
-						else if(S_ISSOCK(stat.st_mode))
-							fc->num_socks++;
-					}
-				}
-				if(with_progress)
-					pgs_progress_item_end(min);
-			}
-			closedir(dir);
-		}
-		fut_cd(old_dir, NULL, 0);
+		fc->num_bytes += g_file_info_get_size((GFileInfo *) fi);
+		fc->num_blocks += g_file_info_get_attribute_uint64((GFileInfo *) fi, G_FILE_ATTRIBUTE_UNIX_BLOCKS);
 	}
-	return errno == 0;
+	switch(g_file_info_get_file_type((GFileInfo *) fi))
+	{
+	case G_FILE_TYPE_REGULAR:
+		if(fc != NULL)
+			fc->num_files++;
+		break;
+	case G_FILE_TYPE_DIRECTORY:
+		if(fc != NULL)
+			fc->num_dirs++;
+		ret = do_size_gfile_dir(min, object, bytes, fc, error);
+		break;
+	case G_FILE_TYPE_SYMBOLIC_LINK:
+		if(fc != NULL)
+			fc->num_links++;
+		break;
+	case G_FILE_TYPE_SPECIAL:
+		/* FIXME: This is not supported in the GIO world ... Has to go. */
+		break;
+	default:
+		g_warning("Can't handle irregular file type in do_size_gfile_info()");
+	}
+	return ret;
 }
 
-static gint do_dir_size(MainInfo *min, const gchar *path, guint64 *bytes, FUCount *fc, gboolean with_progress)
+gboolean fut_size_gfile(MainInfo *min, const GFile *file, guint64 *bytes, FUCount *fc, GError **error)
 {
-	gint	ret;
+	GFileInfo	*fi;
+	gboolean	ret = TRUE;
 
+	if(min == NULL || file == NULL)
+		return FALSE;
+	if((fi = g_file_query_info((GFile *) file, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, error)) == NULL)
+		return FALSE;
 	if(fc != NULL)		/* If there is a fc present, wipe it clean. */
 	{
 		fc->num_dirs  = 0U;
 		fc->num_files = 0U;
 		fc->num_links = 0U;
-		fc->num_cdevs = 0U;
-		fc->num_bdevs = 0U;
-		fc->num_fifos = 0U;
-		fc->num_socks = 0U;
+		fc->num_specials = 0U;
 
 		fc->num_total = 0U;
 
 		fc->num_bytes  = 0ULL;
 		fc->num_blocks = 0ULL;
 	}
-	if((ret = recurse_dir_size(min, path, bytes, fc, with_progress)) != 0 && fc != NULL)
-		fc->num_total = fc->num_dirs + fc->num_files + fc->num_links + fc->num_cdevs +
-				fc->num_bdevs + fc->num_fifos + fc->num_socks;
+	ret = do_size_gfile_info(min, file, fi, bytes, fc, error);
+	/* Adjust, don't consider a directory to contain itself. */
+	if(g_file_info_get_file_type(fi) == G_FILE_TYPE_DIRECTORY && fc != NULL)
+		fc->num_dirs--;
+  	g_object_unref(fi);
 
 	return ret;
 }
 
-/* 1998-12-19 -	Scan recursively at <path>, accumulating total number of bytes seen, as well as counting
-**		how many different "objects" (dirs, files, links etc) were seen. Will never follow a link
-**		to a dir or count it as anything but a soft link. <fc> can be NULL if you just don't care.
-**		Returns 1 on success, 0 on failure (such as permission denied).
-** 1999-03-22 -	Now zeros the <bytes> value before beginning. This fixes a bug in the GetSize command.
-*/
-gint fut_dir_size(MainInfo *min, const gchar *path, guint64 *bytes, FUCount *fc)
-{
-	return do_dir_size(min, path, bytes, fc, FALSE);
-}
-
-/* 1999-03-28 -	Size up a directory, with GUI progress indication. */
-gint fut_dir_size_progress(MainInfo *min, const gchar *path, guint64 *bytes, FUCount *fc)
-{
-	return do_dir_size(min, path, bytes, fc, TRUE);
-}
-
 /* ----------------------------------------------------------------------------------------- */
 
-/* Transversal state for a single directory when doing asynchronous dir sizing. */
 typedef struct {
-	DIR 	*dir;
-	gchar	*path;
-} DirSizeState;
+	GStaticMutex	mutex;	/* Lock this before accessing counts. */
+	gboolean	changed;	/* This is set if the data has changed. */
+	FUCount		counts;
+} FUCountSafe;
 
-/* An "operation" is the result of a single call to fut_dir_size_start(). */
 typedef struct {
+	GFile		*root;
+	GCancellable	*cancel;
+	FUCountSafe	counts;		/* Here's where the thread updates. */
+	guint		depth;
 	SizeFunc	func;
-	gpointer	user;
-	FUCount	count;
-	DirSizeState	*current;
-	GSList	*stack;
-} DirSizeOp;
-
-/* Global state for asynchronous directory size computation. */
-static struct {
-	guint	idle;
-	GList	*ops;
-} dir_size_info = { 0U };
-
-/* 2003-10-16 -	Open given path and return new dir size state struct describing it. */
-static DirSizeState * dir_size_open(const gchar *path)
-{
-	DirSizeState	*st;
-
-	st = g_malloc(sizeof *st);
-	if((st->dir = opendir(path)) != NULL)
-	{
-		st->path = g_strdup(path);
-		return st;
-	}
-	g_free(st);
-	return NULL;
-}
+	gpointer	func_user;
+	guint		timeout;
+	GThread		*thread;
+} SizeGFileInfo;
 
-/* 2003-10-16 -	Free a directory state. */
-static void dir_size_free(DirSizeState *state)
+static void thread_recurse_directory(GFile *root, SizeGFileInfo *info)
 {
-	if(state->dir)
-		closedir(state->dir);
-	g_free(state->path);
-	g_free(state);
-}
+	GFileEnumerator	*fen;
 
-/* 2003-10-16 -	Update asynchronous directory sizing. */
-static gboolean dir_size_update(DirSizeOp *op)
-{
-	int	i;
-	struct dirent	*de;
-	struct stat	stbuf;
-
-	for(i = 0; op->current && i < 32; i++)
+	if((fen = g_file_enumerate_children(root, "*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, info->cancel, NULL)) != NULL)
 	{
-		if((de = readdir(op->current->dir)) != NULL)
-		{
-			gchar	fullPATH_MAX;
+		GFileInfo	*fin;
 
-			if(strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0)
-				continue;
-			/* Don't CD for asynchronous reasons. Build full paths, it's fairly cheap. */
-			g_snprintf(full, sizeof full, "%s%s%s", op->current->path, G_DIR_SEPARATOR_S, de->d_name);
-			if(lstat(full, &stbuf) == 0)
+		while(!g_cancellable_is_cancelled(info->cancel) && (fin = g_file_enumerator_next_file(fen, info->cancel, NULL)) != NULL)
+		{
+			const GFileType	type = g_file_info_get_file_type(fin);
+
+			/* Grab the lock, and increase the proper counter based on type. */
+			g_static_mutex_lock(&info->counts.mutex);
+			info->counts.counts.num_total++;
+			if(type == G_FILE_TYPE_REGULAR)
+				info->counts.counts.num_files++;
+			else if(type == G_FILE_TYPE_DIRECTORY)
+				info->counts.counts.num_dirs++;
+			else if(type == G_FILE_TYPE_SYMBOLIC_LINK)
+				info->counts.counts.num_links++;
+			else if(type == G_FILE_TYPE_SPECIAL)
+				info->counts.counts.num_specials++;
+			info->counts.changed = TRUE;
+			/* All done, release the lock for the rest. */
+			g_static_mutex_unlock(&info->counts.mutex);
+
+			/* Wait now, if that was a directory we need to enter it! */
+			if(type == G_FILE_TYPE_DIRECTORY)
 			{
-				op->count.num_bytes  += (guint64) stbuf.st_size;
-				op->count.num_blocks += (guint64) stbuf.st_blocks;
-				if(S_ISDIR(stbuf.st_mode))
-				{
-					DirSizeState	*nd;
+				GFile	*child;
 
-					if((nd = dir_size_open(full)) != NULL)
-					{
-						op->stack   = g_slist_prepend(op->stack, op->current);
-						op->current = nd;
-						op->count.num_dirs++;
-					}
-				}
-				else
+				if((child = g_file_get_child(root, g_file_info_get_name(fin))) != NULL)
 				{
-					if(S_ISREG(stbuf.st_mode))
-						op->count.num_files++;
-					else if(S_ISLNK(stbuf.st_mode))
-						op->count.num_links++;
-					else if(S_ISCHR(stbuf.st_mode))
-						op->count.num_cdevs++;
-					else if(S_ISBLK(stbuf.st_mode))
-						op->count.num_bdevs++;
-					else if(S_ISFIFO(stbuf.st_mode))
-						op->count.num_fifos++;
-					else if(S_ISSOCK(stbuf.st_mode))
-						op->count.num_socks++;
+					info->depth++;
+					thread_recurse_directory(child, info);
+					info->depth--;
+					g_object_unref(child);
 				}
 			}
 		}
+		g_file_enumerator_close(fen, info->cancel, NULL);
+		g_object_unref(G_OBJECT(fen));
+	}
+}
 
-		if(de == NULL)
-		{
-			dir_size_free(op->current);
-			op->current = NULL;
-			if(op->stack != NULL)
-			{
-				GSList	*top = op->stack;
+static gpointer size_gfile_thread_func(gpointer data)
+{
+	SizeGFileInfo	*info = data;
 
-				op->stack = g_slist_remove_link(op->stack, top);
-				op->current = top->data;
-				g_slist_free_1(top);
-			}
-		}
-	}
-	/* After looping around for a while, tell op owner new numbers. */
-	op->func(&op->count, op->user);
-	return op->current != NULL;
+	thread_recurse_directory(info->root, info);
+
+	return NULL;
 }
 
-/* 2003-10-16 -	GTK+ idle callback for asynchronous directory sizing. Update all on-going operations. */
-static gint idle_dir_size(gpointer user)
+static gboolean cb_size_gfile_timeout(gpointer user)
 {
-	GList	*iter, *next;
+	SizeGFileInfo	*info = user;
 
-	for(iter = dir_size_info.ops; iter != NULL; iter = next)
+	/* Has the data changed? */
+	if(info->counts.changed)
 	{
-		next = g_list_next(iter);
-		if(!dir_size_update(iter->data))
-			fut_dir_size_stop(iter->data);
+		FUCount	local;
+
+		/* Try to quickly create a local copy. */
+		g_static_mutex_lock(&info->counts.mutex);
+		local = info->counts.counts;
+		info->counts.changed = FALSE;
+		g_static_mutex_unlock(&info->counts.mutex);
+
+		/* Then call callback using the local copy, leaving the true data free to
+		 * update by the thread while the GUI-building code in the callback runs.
+		 */
+		info->func(&local, info->func_user);
 	}
-	return TRUE;
+	return !g_cancellable_is_cancelled(info->cancel);
 }
 
-/* 2003-10-16 -	Start off a new operation, by allocating, initializing it, and adding it to list. */
-gpointer fut_dir_size_start(const gchar *path, SizeFunc func, gpointer user)
+gpointer fut_dir_size_gfile_start(GFile *dir, SizeFunc func, gpointer user)
 {
-	DirSizeOp	*op;
+	SizeGFileInfo	*info;
 
-	op = g_malloc(sizeof *op);
-	op->func = func;
-	op->user = user;
-	memset(&op->count, 0, sizeof op->count);
-	op->current = dir_size_open(path);
-	op->stack = NULL;
+	if(dir == NULL || func == NULL)
+		return NULL;
 
-	dir_size_info.ops = g_list_append(dir_size_info.ops, op);
+	info = g_malloc(sizeof *info);
+	info->root = dir;
+	info->cancel = g_cancellable_new();
+	g_static_mutex_init(&info->counts.mutex);
+	info->counts.changed = FALSE;
+	memset(&info->counts.counts, 0, sizeof info->counts.counts);
+	info->depth = 0;
+	info->func = func;
+	info->func_user = user;
 
-	/* If the idle function isn't active, start it up. */
-	if(dir_size_info.idle == 0U)
-		dir_size_info.idle = gtk_idle_add_priority(G_PRIORITY_LOW, idle_dir_size, NULL);
-	return op;
-}
+	info->timeout = g_timeout_add(350, cb_size_gfile_timeout, info);
 
-/* 2003-10-16 -	Stop a directory sizing operation. */
-void fut_dir_size_stop(gpointer handle)
-{
-	DirSizeOp	*op = handle;
-	GList	*link;
+	info->thread = g_thread_create(size_gfile_thread_func, info, TRUE, NULL);
 
-	if((link = g_list_find(dir_size_info.ops, op)) != NULL)
-	{
-		GSList	*iter;
+	return info;
+}
 
-		dir_size_info.ops = g_list_remove(dir_size_info.ops, op);
+void fut_dir_size_gfile_stop(gpointer handle)
+{
+	SizeGFileInfo	*info = handle;
 
-		op->func(NULL, op->user);
+	if(info == NULL)
+		return;
+	/* If we remove this first, and we know we're not in it now (main thread only), we can be
+	 * pretty sure it's safe to tear down the rest since the timeout function won't run again.
+	 */
+	g_source_remove(info->timeout);
 
-		if(op->current)
-			dir_size_free(op->current);
-		for(iter = op->stack; iter != NULL; iter = g_slist_next(iter))
-			dir_size_free(iter->data);
-		g_slist_free(op->stack);
-		g_free(op);
+	/* Now, stop the thread and kill everything. */
+	g_cancellable_cancel(info->cancel);
+	g_thread_join(info->thread);
+	if(info->counts.changed)
+		info->func(&info->counts.counts, info->func_user);
 
-		/* If no more operations active, stop the idle function too. */
-		if(dir_size_info.ops == NULL)
-		{
-			gtk_idle_remove(dir_size_info.idle);
-			dir_size_info.idle = 0U;
-		}
-	}
+	g_object_unref(G_OBJECT(info->cancel));
+	g_free(info);
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -646,7 +551,7 @@
 	}
 	if(temp)
 	{
-		stu_strncpy(component, temp->str, PATH_MAX);
+		g_strlcpy(component, temp->str, PATH_MAX);
 		g_string_free(temp, TRUE);
 	}
 }
@@ -671,7 +576,7 @@
 			g_string_assign(temp, "");
 		g_string_append(temp, ptr);
 		if(*temp->str)
-			stu_strncpy(component, temp->str, PATH_MAX);
+			g_strlcpy(component, temp->str, PATH_MAX);
 		else
 			g_snprintf(component, PATH_MAX, "~%s", uname);
 		g_string_free(temp, TRUE);
@@ -684,6 +589,7 @@
 	eval_env(buffer);
 	if(buffer0 == '~')
 		eval_home(buffer);
+#if 0	/* FIXME: This needs to become URL-aware, in a big way. */
 	else if(buffer0 != G_DIR_SEPARATOR && base_path0 == G_DIR_SEPARATOR)
 	{
 		gint	len = strlen(buffer);
@@ -696,6 +602,7 @@
 			bufferbase_len = G_DIR_SEPARATOR;
 		}
 	}
+#endif
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -816,81 +723,6 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1999-11-13 -	Basic low-level file copying routine. Reads from <in>, writes into <out>,
-**		both of which must be open with the appropriate modes. Copies by reading
-**		<chunk_size> bytes at a time. Will handle files having 0 as their size, like
-**		most of the fun things in the /proc directory (on Linux systems).
-**		Returns the number of bytes successfully written to destination. Note that
-**		for empty files, a return value of 0 indicates success.
-** 2000-07-16 -	Bug fix: the interruption check was done after the write(), so small files
-**		that fit into the chunk_size could not be interrupted. Oops.
-** 2006-01-06 -	When writing across a SMB mount, write() seems to dislike large chunks, so
-**		we need to do the write()s multiple times for each read(). Odd.
-*/
-off_t fut_copy(gint in, gint out, gsize chunk_size)
-{
-	gpointer	buf;
-	gconstpointer	wbuf;
-	gssize		got, wrote, to_write;
-	off_t		put = 0U;
-
-	if((in < 0) || (out < 0))
-		return 0;
-
-	chunk_size = MAX(chunk_size, MIN_COPY_CHUNK);
-
-	buf = g_malloc(chunk_size);
-	while((got = read(in, buf, chunk_size)) > 0)
-	{
-		if(!pgs_progress_item_update(NULL, put))
-		{
-			errno = EINTR;
-			break;
-		}
-		for(to_write = got, wbuf = buf; to_write > 0; to_write -= wrote, wbuf += wrote, put += wrote)
-		{
-			wrote = write(out, wbuf, to_write);
-			if(wrote < 0)
-			{
-				fprintf(stderr, "gentoo: fut_copy() failed to write %" G_GSSIZE_FORMAT "-byte block, errno=%d--aborting copy\n", got, errno);
-				goto fail;
-			}
-		}
-	}
-fail:
-	g_free(buf);
-
-	return put;
-}
-
-/* 1999-11-13 -	Copy just <length> bytes from <in> to <out>. */
-off_t fut_copy_partial(gint in, gint out, gsize chunk_size, gsize length)
-{
-	gpointer	buf;
-	gssize		got, wrote, block;
-	off_t		put = 0U;
-
-	chunk_size = MAX(MIN_COPY_CHUNK, MIN(chunk_size, length));
-
-	buf = g_malloc(chunk_size);
-	while(put < length)
-	{
-		block = (put + chunk_size <= length) ? chunk_size : length - put;
-		got = read(in, buf, block);
-		if(got <= 0)
-			break;
-		wrote = write(out, buf, block);
-		if(wrote < 0)
-			break;
-		put += block;
-	}
-	g_free(buf);
-
-	return put;
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
 /* 1998-09-07 -	Check if the user described by (<uid>,<gid>), which is the user currently running
 **		gentoo, is allowed to READ from a file described by <stat>. Note that this is a
 **		complex check.
@@ -950,33 +782,6 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1999-05-29 -	Check if there is a file named <name> in <path>. If such a file exists, check
-**		if the current user can execute it. This is handy as a prelude to actually doing
-**		a fork()/exec() pair on <name>, since it allows simpler error handling. If execution
-**		is not possible, set errno to something suitable and return FALSE. If everything
-**		looks fins (not a guarantee exec() will succeed), clear errno and return TRUE.
-*/
-gboolean fut_locate_executable(const gchar *path, const gchar *name)
-{
-	errno = EINVAL;		/* Assume the worst. */
-
-	if((path != NULL) && (name != NULL))
-	{
-		const gchar	*pname;
-
-		if((pname = fut_locate(path, name)) != NULL)
-		{
-			if(access(pname, X_OK) == 0)
-				return TRUE;
-		}
-		else
-			errno = ENOENT;
-	}
-	return FALSE;
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
 /* 1998-10-26 -	Check if the user doesn't want to see <name>. Returns TRUE if the file is
 **		NOT hidden, FALSE if it is. If <name> is NULL, we free any allocated resources
 **		and then return TRUE. This is very useful when the RE source is changing.
@@ -1027,24 +832,3 @@
 	}
 	return TRUE;					/* When in doubt, hide nothing. */
 }
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1998-08-30 -	Initialize the file utility module. Grabs the current working directory for
-**		use as the global 'base' for paths. Run this early!
-*/
-void fut_initialize(void)
-{
-	if(getcwd(base_path, sizeof base_path) == NULL)
-	{
-		fprintf(stderr, "FILEUTIL: Couldn't get current working dir - defaulting to /\n");
-		stu_strncpy(base_path, "/", sizeof base_path);
-	}
-	base_len = strlen(base_path);
-}
-
-/* 2003-11-10 -	Change back to the directory saved in fut_initialize(). Might help profiling. */
-void fut_finalize(void)
-{
-	fut_cd(base_path, NULL, 0U);
-}

gentoo-0.15.6.tar.bz2/src/fileutil.h -> gentoo-0.19.9.tar.gz/src/fileutil.h Changed

@@ -7,10 +7,7 @@
 	guint	num_dirs;
 	guint	num_files;
 	guint	num_links;
-	guint	num_cdevs;
-	guint	num_bdevs;
-	guint	num_fifos;
-	guint	num_socks;	/* In your topmost drawer? :) */
+	guint	num_specials;
 
 	guint	num_total;	/* Sum of the above. */
 
@@ -20,9 +17,8 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* Synchronous routines for directory size computation. */
-gint		fut_dir_size(MainInfo *min, const gchar *path, guint64 *bytes, FUCount *fc);
-gint		fut_dir_size_progress(MainInfo *min, const gchar *path, guint64 *bytes, FUCount *fc);
+/* Directory size computation, the next generation. */
+gboolean	fut_size_gfile(MainInfo *min, const GFile *dir, guint64 *bytes, FUCount *fc, GError **error);
 
 /* Asynchronous directory size computation. Calls <func> with a const FUCount *
 ** every now and then, then with NULL when done.
@@ -31,6 +27,10 @@
 gpointer	fut_dir_size_start(const gchar *path, SizeFunc func, gpointer user);
 void		fut_dir_size_stop(gpointer handle);
 
+/* Asynchronous (in fact, multi-threaded) directory size computation. */
+gpointer	fut_dir_size_gfile_start(GFile *dir, SizeFunc func, gpointer user);
+void		fut_dir_size_gfile_stop(gpointer handle);
+
 const gchar *	fut_locate(const gchar *paths, const gchar *name);
 GList *		fut_scan_path(const gchar *paths, gint (*filter)(const gchar *path, const gchar *name));
 void		fut_free_path(GList *list);
@@ -38,9 +38,6 @@
 
 void		fut_interpolate(gchar *buffer);
 
-off_t		fut_copy(gint in, gint out, gsize chunk_size);
-off_t		fut_copy_partial(gint in, gint out, gsize chunk_size, gsize length);
-
 gboolean	fut_cd(const gchar *new_dir, gchar *old, gsize old_max);
 
 #if 0
@@ -54,17 +51,10 @@
 gboolean	fut_is_parent_of(const char *from, const char *to);
 
 gboolean	fut_exists(const gchar *name);
-gboolean	fut_size(const gchar *name, gsize *size);
-gboolean	fut_fsize(gint fd, gsize *size);
 
 gboolean	fut_can_read(const struct stat *stat, uid_t uid, gid_t gid);
 gboolean	fut_can_read_named(const gchar *name);
 gboolean	fut_can_write(const struct stat *stat, uid_t uid, gid_t gid);
 gboolean	fut_can_execute(const struct stat *stat, uid_t uid, gid_t gid);
 
-gboolean	fut_locate_executable(const gchar *path, const gchar *name);
-
 gboolean	fut_check_hide(DirPane *dp, const gchar *name);
-
-void		fut_initialize(void);
-void		fut_finalize(void);

gentoo-0.15.6.tar.bz2/src/gentoo.c -> gentoo-0.19.9.tar.gz/src/gentoo.c Changed

@@ -19,6 +19,7 @@
 #include "file.h"
 #include "fileutil.h"
 #include "gfam.h"
+#include "guiutil.h"
 #include "xmlutil.h"
 #include "strutil.h"
 #include "types.h"
@@ -30,18 +31,17 @@
 #include "cmdseq.h"
 #include "children.h"
 #include "dpformat.h"
-#include "mount.h"
 #include "keyboard.h"
 #include "controls.h"
 #include "iconutil.h"
 #include "cmdseq_config.h"
 #include "menus.h"
+#include "nag_dialog.h"
 
 #include "cfg_module.h"
+#include "cfg_nag.h"
 #include "cfg_windows.h"
 
-#include "graphics/icon_iconify.xpm"
-
 /* ----------------------------------------------------------------------------------------- */
 
 /* 1998-05-18 -	Filter out files the user really doesn't want to see, and that recursive
@@ -79,12 +79,6 @@
 {
 	dp->index = index;
 	dp->complete.prefix0 = '\0';
-	dp->dir.row = NULL;
-	dp->dir.row_alloc = 0;
-	dp->dir.num_rows  = 0;
-	dp->dir.name = NULL;
-	dp->dir.name_alloc = 0;
-	dp->dir.name_use   = 0;
 	dp->dir.stat = NULL;
 	dp->dir.stat_alloc = 0;
 	dp->dir.stat_use   = 0;
@@ -98,7 +92,7 @@
 	gint		pos, pw, ph, np;
 	gdouble		old;
 
-	if(!GTK_WIDGET_REALIZED(min->gui->panes))
+	if(!dp_realized(min))
 		return;
 
 	pos = gtk_paned_get_position(GTK_PANED(obj));
@@ -142,26 +136,46 @@
 	gui->sig_pane_notify = g_signal_connect(G_OBJECT(gui->panes), "notify::position", G_CALLBACK(evt_paned_notify_position), min);
 	gtk_widget_show(gui->panes);
 
+	gtk_widget_grab_focus(min->gui->pane0.view);
+
 	return gui->panes;
 }
 
+static void evt_top_button_press_event(GtkWidget *top, GdkEventButton *evt, gpointer user)
+{
+	if(evt->button == 1 && evt->type == GDK_2BUTTON_PRESS)
+		csq_execute(user, "About");
+}
+
 /* 1998-05-19 -	Create the top widgetry, returning something the caller can just add to a box. Sets the
 **		<label> pointer to a GtkLabel which can be used later to display funny messages and stuff.
 **		The label is internally wrapped in a GtkEventbox, which makes updating it possible without
 **		causing instant epilepsy in everyone watching. GTK+ really is smooth.
 ** 1998-11-26 -	Made the label focusable (?), in order to *finally* have somewhere safe to put the focus
 **		when I don't want it on path entry widgets. Nice.
+** 2010-10-03 -	Added sneaky click-listener, so that we can run About on double-click.
 */
-static GtkWidget * build_top(GtkWidget **label)
+static GtkWidget * build_top(MainInfo *min)
 {
+	GtkLabel	**label = (GtkLabel **) &min->gui->top;
 	GtkWidget	*top, *lab;
 
+	if(min->cfg.errors.display == ERR_DISPLAY_TITLEBAR)
+	{
+		if(*label != NULL)
+			gtk_widget_destroy(GTK_WIDGET(*label));
+		*label = NULL;
+		return NULL;
+	}
+
 	top = gtk_event_box_new();
 	lab = gtk_label_new("");
 	gtk_container_add(GTK_CONTAINER(top), lab);
 	gtk_widget_show_all(top);
 	if(label != NULL)
-		*label = lab;
+		*label = GTK_LABEL(lab);
+	g_signal_connect(G_OBJECT(top), "button_press_event", G_CALLBACK(evt_top_button_press_event), min);
+
 	return top;
 }
 
@@ -180,6 +194,25 @@
 	return hbox;
 }
 
+void rebuild_top(MainInfo *min)
+{
+	GtkWidget	*top;
+
+	if(min->gui->top != NULL)
+	{
+		gtk_widget_destroy(min->gui->top);
+		min->gui->top = NULL;
+	}
+	top = build_top(min);
+	if(top != NULL)
+	{
+		gtk_box_pack_start(GTK_BOX(min->gui->vbox), top, FALSE, FALSE, 0);
+		gtk_box_reorder_child(GTK_BOX(min->gui->vbox), top, 0);
+	}
+	dp_show_stats(min->gui->cur_pane);
+	gui_set_main_title(min, NULL);
+}
+
 /* 1998-10-26 -	Rebuild the middle part of the GUI, i.e. the panes. */
 void rebuild_middle(MainInfo *min)
 {
@@ -211,37 +244,6 @@
 	gtk_widget_show(min->gui->bottom);
 }
 
-/* 1999-03-26 -	Set icon for when gentoo gets iconified. Neato.
-** 2002-08-10 -	It seems gdk_window_set_icon_name() has problems when the locale gets set to
-**		something more interesting than "C". So we work around that.
-*/
-static void window_set_icon(GtkWidget *win)
-{
-	GdkPixmap	*pmap;
-	GdkBitmap	*bmap;
-
-	if((pmap = gdk_pixmap_create_from_xpm_d(win->window, &bmap, NULL, icon_iconify_xpm)) != NULL)
-	{
-		const gchar	*op;
-		gchar		old256;
-
-		gdk_window_set_icon(win->window, NULL, pmap, bmap);
-#if defined ENABLE_NLS
-		if((op = setlocale(LC_ALL, NULL)) != NULL)
-		{
-			g_snprintf(old, sizeof old, "%s", op);
-			setlocale(LC_ALL, "C");
-		}
-#endif
-		gdk_window_set_icon_name(win->window, PACKAGE);
-#if defined ENABLE_NLS
-		if(op != NULL)
-			setlocale(LC_ALL, old);
-#endif
-		gdk_window_set_group(win->window, win->window);
-	}
-}
-
 /* 2008-04-20 -	Replaced old size_allocation-tracking code with new, using configure events instead. */
 static gboolean evt_main_configure(GtkWidget *wid, GdkEventConfigure *req, gpointer user)
 {
@@ -257,27 +259,25 @@
 	min->gui = g_malloc(sizeof *min->gui);
 	min->gui->window = NULL;
 	min->gui->window = win_window_open(min->cfg.wininfo, WIN_MAIN);
-	gtk_object_set_user_data(GTK_OBJECT(min->gui->window), min);
+	g_object_set_data(G_OBJECT(min->gui->window), "user", min);
 	min->gui->sig_main_configure = g_signal_connect(G_OBJECT(min->gui->window), "configure_event", G_CALLBACK(evt_main_configure), min);
 	min->gui->sig_main_delete = g_signal_connect(G_OBJECT(min->gui->window), "delete_event", G_CALLBACK(evt_main_delete), min);
 	min->gui->pane0.main = min->gui->pane1.main = min;
-	min->gui->pane0.list = min->gui->pane1.list = NULL;
 	min->gui->vbox = gtk_vbox_new(FALSE, 0);
-	min->gui->main_tt = gtk_tooltips_new();
 	min->gui->kbd_ctx = kbd_context_new(min);
 
-	top = build_top(&min->gui->top);
+	top = build_top(min);
 	if((panes = build_dirpanes(min)) != NULL)
 	{
 		bottom = build_bottom(min);
-		gtk_box_pack_start(GTK_BOX(min->gui->vbox), top,    FALSE, FALSE, 0);
+		if(top != NULL)
+			gtk_box_pack_start(GTK_BOX(min->gui->vbox), top,    FALSE, FALSE, 0);
 		gtk_box_pack_start(GTK_BOX(min->gui->vbox), panes,  TRUE,  TRUE,  0);
 		gtk_box_pack_start(GTK_BOX(min->gui->vbox), bottom, FALSE, FALSE, 0);
 		gtk_widget_show_all(min->gui->vbox);
 		min->gui->middle = panes;
 		min->gui->bottom = bottom;
 		min->gui->cur_pane = &min->gui->pane0;
-		gtk_tooltips_enable(min->gui->main_tt);
 		kbd_context_attach(min->gui->kbd_ctx, GTK_WINDOW(min->gui->window));
 		ctrl_keys_install(min->cfg.ctrlinfo, min->gui->kbd_ctx);
 		return min->gui->vbox;
@@ -324,7 +324,7 @@
 static void init_cmd_options(CfgInfo *cfg)
 {
 	cfg->opt_overwrite.show_info = TRUE;
-	stu_strncpy(cfg->opt_overwrite.datefmt, "%Y-%m-%d %H:%M.%S", sizeof cfg->opt_overwrite.datefmt);
+	g_strlcpy(cfg->opt_overwrite.datefmt, "%Y-%m-%d %H:%M.%S", sizeof cfg->opt_overwrite.datefmt);
 }
 
 #if 0
@@ -345,10 +345,6 @@
 		if((adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(min->gui->cur_pane->scwin))) != NULL)
 			printf("Adj: lower=%g upper=%g value=%g\n", adj->lower, adj->upper, adj->value);
 	}
-	else if((evt->keyval == GDK_s))
-		dp_focus(min->gui->cur_pane, 3);
-	else if(evt->keyval == GDK_x)
-		dp_focus(min->gui->cur_pane, 8);
 	else if(evt->keyval == GDK_z)
 		dp_unfocus(min->gui->cur_pane);
 	else if(evt->keyval == GDK_d)
@@ -374,12 +370,13 @@
 #endif
 
 /* 2002-02-19 -	Resolve what the initial directory is going to be, and go there. */
-static void enter_initial_dirs(MainInfo *min, const gchar *dirleft, const gchar *dirright)
+static gboolean enter_initial_dirs(MainInfo *min, const gchar *dirleft, const gchar *dirright)
 {
 	const gchar	*dir;
 	const gchar	*odir2;
 	const gchar	*cmd = { "ActivateLeft", "ActivateRight" };
 	gint		i;
+	gboolean	ok = TRUE;
 
 	odir0 = dirleft;
 	odir1 = dirright;
@@ -389,82 +386,99 @@
 		{
 			dir = min->cfg.dp_formati.def_path;
 			if(!dir0)
-			{
 				dir = dph_history_get_first(&min->gui->panei);
-				if(dir == NULL)
-					dir = ".";
-			}
-		}
-		if(dir && *dir)
-		{
-			csq_execute(min, cmdi);
-			csq_execute_format(min, "DirEnter 'dir=%s'", stu_escape(dir));
 		}
+		if(dir == NULL)
+			dir = usr_get_home();
+		csq_execute(min, cmdi);
+		ok &= csq_execute_format(min, "DirEnter 'dir=%s'", stu_escape(dir)) != 0;
 	}
+
+	return ok;
 }
 
 /* 2003-11-25 -	An idle handler that should only trigger once, to run commands from command line. */
 static gint evt_idle_run(gpointer user)
 {
 	MainInfo	*min = user;
-	const GList	*list;
 
-	for(list = opt_arg_get("run", min->opt, min->opt_num); list != NULL; list = g_list_next(list))
-		csq_execute(min, list->data);
+	if(min->run_commands != NULL)
+	{
+		gsize	i;
+
+		for(i = 0; min->run_commandsi != NULL; i++)
+			csq_execute(min, min->run_commandsi);
+	}
+
 	return FALSE;		/* Causes the handler to be removed, once really is enough. */
 }
 
 int main(int argc, char *argv)
 {
-	enum { OPT_VERSION = 1 << 0, OPT_LOCALEINFO = 1 << 1, OPT_ROOTOK = 1 << 2,
-		OPT_NORC = 1 << 3, OPT_NOGTKRC = 1 << 4, OPT_NOFAM = 1 << 5 };
-	OptDesc	od = { { '\0', "version",  OPT_ARG_NONE, OPT_VERSION,	N_("Report the version to standard output, and exit.") },
+	static MainInfo	min = { NULL };
+
+	gboolean	show_version = FALSE;
+	gboolean	show_locale_info = FALSE;
+	gboolean	root_ok = FALSE;
+	gboolean	no_rc = FALSE, no_gtk_rc = FALSE;
+	gchar		*dir_left = NULL;
+	gchar		*dir_right = NULL;
+	GOptionEntry	option_entries = {
+	{ "version", 0, G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_NONE, &show_version,  N_("Report the version to standard output, and exit."), NULL },
 #if defined ENABLE_NLS
-			 { '\0', "locale-info", OPT_ARG_NONE, OPT_LOCALEINFO, N_("Report internal locale details, and exit.") },
-#endif
- 			 { '\0', "root-ok",  OPT_ARG_NONE, OPT_ROOTOK,	N_("Allows gentoo to be run by the root user. Could be dangerous.") },
-			 { '\0', "no-rc",    OPT_ARG_NONE, OPT_NORC,	N_("Do not load the ~/.gentoorc configuration file; instead, use default values.") },
-			 { '\0', "no-gtkrc", OPT_ARG_NONE, OPT_NOGTKRC,	N_("Do not load the ~/.gentoogtkrc GTK+ configuration file; instead, use system defaults.") },
-#if defined HAVE_FAM
-			 { '\0', "no-fam",   OPT_ARG_NONE, OPT_NOFAM,	N_("Do not use FAM to automatically detect changes in viewed directories.") },
+	{ "locale-info", 0, G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_NONE, &show_locale_info, N_("Report internal locale details, and exit."), NULL },
 #endif
-			 { '1',  "left",     OPT_ARG_REQ,      0U, N_("Use ARG as path for the left directory pane. Overrides default (and history).") },
-			 { '2',  "right",    OPT_ARG_REQ,      0U, N_("Use ARG as path for the right directory pane. Overrides default (and history).") },
-			 { 'r',  "run",	     OPT_ARG_REQ_LIST, 0U, N_("Run ARG, a gentoo command. Done before user interaction allowed, but after configuration "
-								      "file has been read in. Can be used many times to run several commands in sequence.") }
-			};
-	guint32		opt_flags, cfg_flags = 0U;
+	{ "root-ok", 0, G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_NONE, &root_ok, N_("Allows gentoo to be run by the root user. Could be dangerous."), NULL },
+	{ "no-rc", 0, G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_NONE, &no_rc, N_("Do not load the ~/.gentoorc configuration file; instead, use default values."), NULL },
+	{ "no-gtk-rc", 0, G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_NONE, &no_gtk_rc, N_("Do not load the ~/.gentoogtkrc GTK+ configuration file; instead, use system defaults."), NULL },
+	{ "run", 'r', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_STRING_ARRAY, &min.run_commands, N_("Run COMMAND, a gentoo command. Done before user interaction allowed, but after configuration "
+			      "file has been read in. Can be used many times to run several commands in sequence."), N_("COMMAND") },
+	{ "left", '1', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_STRING, &dir_left, N_("Use DIR as path for the left directory pane. Overrides default (and history)."), N_("DIR") },
+	{ "right", '2', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_STRING, &dir_right, N_("Use DIR as path for the right directory pane. Overrides default (and history)."), N_("DIR") },
+	{ NULL }
+	};
+	gint		i;
 	GtkWidget	*box;
-	static MainInfo	min = { 0 };
+	GOptionContext	*context;
+	GError		*err = NULL;
 
-	/* Make options available to idle callback that runs commands from invocation. A bit ugly. */
-	min.opt     = od;
-	min.opt_num = sizeof od / sizeof *od;
+	/* Must be run very early, before we start using glib functionality too much. */
+	g_thread_init(NULL);
 
-#if defined ENABLE_NLSa
+#if defined ENABLE_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
-	for(opt_flags = 0; opt_flags < sizeof od / sizeof *od; opt_flags++)
-		odopt_flags.help = _(odopt_flags.help);
-	gtk_set_locale();
+	/* Translate help texts for command line options. */
+	for(i = 0; option_entriesi.long_name != NULL; i++)
+	{
+		option_entriesi.description = _(option_entriesi.description);
+		option_entriesi.arg_description = _(option_entriesi.arg_description);
+	}
 #endif
-	/* Must be run early, before anyone changes the directory. */
-	fut_initialize();
+
+	/* Use glib's option parser, for consistency, features and just less code in general. Nice. */
+	context = g_option_context_new(_("- a graphical file manager using GTK+"));
+	g_option_context_add_main_entries(context, option_entries, PACKAGE);
+	g_option_context_add_group(context, gtk_get_option_group(TRUE));	/* Import GTK+'s options. */
+	if(!g_option_context_parse(context, &argc, &argv, &err))
+	{
+		g_print(_("Failed to parse command line options: %s\n"), err->message);
+		return EXIT_FAILURE;
+	}
 
 	/* Must be run before application-level options parsing. */
 	gtk_init(&argc, &argv);
 
-	opt_flags = opt_parse(&argc, argv, od, sizeof od / sizeof *od);
-	if(argc < 1)
-		return argc < -1 ? EXIT_FAILURE : EXIT_SUCCESS;
-	if(opt_flags & OPT_VERSION)
+	min.vfs.vfs = g_vfs_get_default();
+
+	if(show_version)
 	{
 		puts(VERSION);
 		return EXIT_SUCCESS;
 	}
 #if defined ENABLE_NLS
-	if(opt_flags & OPT_LOCALEINFO)
+	if(show_locale_info)
 	{
 		const gchar	*enc, *cset, **fenc;
 
@@ -487,7 +501,7 @@
 	}
 #endif
 
-	if(geteuid() == 0 && !(opt_flags & OPT_ROOTOK))
+	if(geteuid() == 0 && !root_ok)
 	{
 		fprintf(stderr, _("%s: To run as root, envoke with the '--root-ok' option\n"), argv0);
 		return EXIT_FAILURE;
@@ -496,13 +510,11 @@
 	gtk_quit_add(1, quit_handler, &min);
 
 	dpf_initialize();
-	sze_initialize();
 	mnu_initialize();
 
 	min.cfg.flags = 0;
 	dpf_init_defaults(&min.cfg);
 	csq_init_commands(&min);
-	mnt_init_defaults(&min.cfg);
 	min.cfg.menus = mnu_menuinfo_new_default(&min);
 	btn_buttoninfo_new_default(&min, &min.cfg.buttons);
 	min.cfg.buttonlayout = btl_buttonlayout_new();
@@ -511,63 +523,63 @@
 	typ_init(&min.cfg);
 	min.cfg.wininfo	 = win_wininfo_new_default(&min);
 	min.cfg.ctrlinfo = ctrl_new_default(&min);
-	min.cfg.errors.dialog = FALSE;
+	min.cfg.errors.display = ERR_DISPLAY_STATUSBAR;
+	cng_initialize(&min.cfg.nag);
 	min.cfg.dir_filter = dir_filter;
 	chd_initialize(&min);
 	min.que = que_initialize();
 
 	min.ico = ico_initialize(&min);
 
-	if(!(opt_flags & OPT_NORC))
-		cfg_flags = cfg_load_config(&min);
+	min.cfg.flags = 0;
+	if(!no_rc)
+		cfg_load_config(&min);
 	if(!usr_init())
 		g_warning(_("Couldn't initialize userinfo module - username resolving won't work"));
-	if(!(opt_flags & OPT_NOGTKRC))
+	if(!no_gtk_rc)
 		load_gtk_rc(&min);
 
-	if((min.cfg.mount.mode != MNT_NEVER) && (!mnt_init(&min)))
-		g_warning(_("Couldn't initialize mount data - automounting won't work"));
-
-	if(!(opt_flags & OPT_NOFAM))
-		fam_initialize(&min);
-
 	if((box = build_gui(&min)) != NULL)
 	{
-		gchar	welcome128;
+		dp_initialize(min.gui->pane, sizeof min.gui->pane / sizeof *min.gui->pane);
 
-		dp_initialize(min.gui->pane);
+		fam_initialize(&min);
 
 		dlg_main_window_set(GTK_WINDOW(min.gui->window));
 		dlg_position_set(min.cfg.dialogs.pos);
 #if 0
 		g_signal_connect(G_OBJECT(min.gui->window), "key_press_event", G_CALLBACK(evt_key_press), &min);
 #endif
-		min.cfg.flags = 0;
 		init_cmd_options(&min.cfg);
 
 		gtk_container_add(GTK_CONTAINER(min.gui->window), box);
 
 		dph_history_load(&min, min.gui->pane, sizeof min.gui->pane / sizeof *min.gui->pane);
 
-		gtk_window_set_policy(GTK_WINDOW(min.gui->window), TRUE, TRUE, FALSE);
+		gtk_window_set_resizable(GTK_WINDOW(min.gui->window), TRUE);
 
-		window_set_icon(min.gui->window);
 		win_window_show(min.gui->window);
 
-		enter_initial_dirs(&min, opt_arg_get("left", od, sizeof od / sizeof *od), opt_arg_get("right", od, sizeof od / sizeof *od));
-		if(errno == 0)
+		err_clear(&min);
+		if(enter_initial_dirs(&min, dir_left, dir_right))
 		{
-			g_snprintf(welcome, sizeof welcome, _("gentoo v%s by Emil Brink <emil@obsession.se>"), VERSION);
-			gtk_label_set_text(GTK_LABEL(min.gui->top), welcome);
+			if(min.gui->top != NULL)
+			{
+				gchar	buf128;
+
+				g_snprintf(buf, sizeof buf, _("gentoo v%s by Emil Brink <emil@obsession.se>"), VERSION);
+				gtk_label_set_text(GTK_LABEL(min.gui->top), buf);
+			}
 		}
+		else
+			err_show(&min);
 
-		gtk_idle_add(evt_idle_run, &min);
-		err_clear(&min);
+		ndl_dialog_sync_new_wait(&min, "gio-warning", _("Development Version Warning"), _("This version of gentoo is considered somewhat new and untested. There have been major changes to almost all parts of the program since the previous version. Please be a bit careful, and make sure you report any problem to the author. Thanks."));
+
+		g_idle_add(evt_idle_run, &min);
 		gtk_main();
 	}
 	fam_shutdown(&min);
-	mnt_shutdown(&min);
-	fut_finalize();
 
 	return EXIT_SUCCESS;
 }

gentoo-0.15.6.tar.bz2/src/gentoo.h -> gentoo-0.19.9.tar.gz/src/gentoo.h Changed

@@ -46,12 +46,6 @@
 #include <time.h>
 #include <unistd.h>
 
-#if defined HAVE_STRUCT_STATVFS
-#include <sys/statvfs.h>
-#elif defined HAVE_STRUCT_STATFS
-#include <sys/statfs.h>
-#endif
-
 /* The various BSDs seem to have a lot in common. Let's try and use that,
 ** and save some typing in various tests below. This should probably all
 ** be replaced by proper Autoconfed stuff at some point.
@@ -66,10 +60,16 @@
 #include <sys/mount.h>
 #endif
 
-#define	GTK_DISABLE_COMPAT_H		/* No GTK+ 1.0.6-compatibility required. */
+#undef GTK_ENABLE_BROKEN		/* We can't use autoconf to undefine symbols. */
+#include <gio/gio.h>
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
+/* Fix for < Glib 2.20. */
+#ifndef G_GOFFSET_FORMAT
+#define G_GOFFSET_FORMAT G_GINT64_FORMAT
+#endif
+
 /* Not all systems' <mman.h> seem to define this. */
 #if !defined MAP_FAILED
 #define	MAP_FAILED	((void *) -1)
@@ -125,32 +125,35 @@
 #include "dirhistory.h"
 #include "window.h"
 #include "menus.h"
-#include "options.h"
+#include "sizeutil.h"
 
 #define	KEY_NAME_SIZE	(32)
 
 #define	CSQ_NAME_SIZE	(32)
 
-#define	FT_NAME_SIZE	(32)
-#define	FT_SUFFIX_SIZE	(32)
-#define	FT_NAMERE_SIZE	(64)
-#define	FT_FILERE_SIZE	(64)
-
-#define	FTFL_REQPERM	(1<<0)
-#define	FTFL_REQSUFFIX	(1<<1)
-#define	FTFL_NAMEMATCH	(1<<2)
-#define	FTFL_NAMEGLOB	(1<<3)
-#define	FTFL_FILEMATCH	(1<<4)
-#define	FTFL_FILEGLOB	(1<<5)
-#define	FTFL_NAMENOCASE	(1<<6)
-#define	FTFL_FILENOCASE	(1<<7)
-
-#define	FTPM_SETUID	(1<<0)
-#define	FTPM_SETGID	(1<<1)
-#define	FTPM_STICKY	(1<<2)
-#define	FTPM_READ	(1<<3)
-#define	FTPM_WRITE	(1<<4)
-#define	FTPM_EXECUTE	(1<<5)
+/* FileType-related constants. */
+enum {
+	FT_NAME_SIZE	= (32),
+	FT_SUFFIX_SIZE	= (32),
+	FT_NAMERE_SIZE	= (64),
+	FT_FILERE_SIZE	= (64),
+
+	FTFL_REQPERM	= (1<<0),
+	FTFL_REQSUFFIX	= (1<<1),
+	FTFL_NAMEMATCH	= (1<<2),
+	FTFL_NAMEGLOB	= (1<<3),
+	FTFL_FILEMATCH	= (1<<4),
+	FTFL_FILEGLOB	= (1<<5),
+	FTFL_NAMENOCASE	= (1<<6),
+	FTFL_FILENOCASE	= (1<<7),
+
+	FTPM_SETUID	= (1<<0),
+	FTPM_SETGID	= (1<<1),
+	FTPM_STICKY	= (1<<2),
+	FTPM_READ	= (1<<3),
+	FTPM_WRITE	= (1<<4),
+	FTPM_EXECUTE	= (1<<5),
+};
 
 typedef struct {			/* Used to map stat() info onto names. */
 	gchar	nameFT_NAME_SIZE;		/* Human-readable name of filetype (e.g. "GIF image", "MP3 song"). */
@@ -172,25 +175,23 @@
 
 typedef enum {	DPC_NAME, DPC_SIZE, DPC_BLOCKS, DPC_BLOCKSIZE, DPC_MODENUM, DPC_MODESTR,
 		DPC_NLINK, DPC_UIDNUM, DPC_UIDSTR, DPC_GIDNUM, DPC_GIDSTR, DPC_DEVICE, DPC_DEVMAJ, DPC_DEVMIN,
-		DPC_ATIME, DPC_MTIME, DPC_CTIME,
+		DPC_ATIME, DPC_MTIME, DPC_CRTIME, DPC_CHTIME,
 		DPC_TYPE, DPC_ICON,
+		DPC_URI_NOFILE,
 		DPC_NUM_TYPES } DPContent;
 
 typedef struct {
-	gint	show_type : 1;			/* Append type-character (from "@ / * | =") to names? */
-	gint	show_linkname : 1;		/* Append " -> destination" on symbolic links? */
+	guint	show_type : 1;			/* Append type-character (from "@ / * | =") to names? */
+	guint	show_linkname : 1;		/* Append " -> destination" on symbolic links? */
 } DC_Name;
 
-typedef enum {  DPSIZE_NATIVE = 0, DPSIZE_BYTES, DPSIZE_KILOBYTES, DPSIZE_MEGABYTES, DPSIZE_GIGABYTES,
-		DPSIZE_SMART  = 32 } DPSizeType;
-
 typedef struct {
-	DPSizeType	type;
-	gint		ticks : 1;
+	SzUnit		unit;
+	guint		ticks : 1;
 	gchar		tick;
 	gint		digits;
 	gchar		dformatDP_FORMAT_SIZE;	/* Hidden from user, not saved, built by config code. */
-	gint		dir_show_fs_size : 1;		/* Show filesystem size for directories? */
+	guint		dir_show_fs_size : 1;		/* Show filesystem size for directories? */
 } DC_Size;
 
 typedef struct {
@@ -206,7 +207,7 @@
 	DC_Size	size;
 	DC_Fmt	blocks, blocksize;
 	DC_Fmt	mode, nlink, uidnum, gidnum, device, devmaj, devmin;
-	DC_Time	a_time, m_time, c_time;		/* Accessed, modified & changed, right? */
+	DC_Time	a_time, m_time, cr_time, ch_time;
 } DpCExtra;
 
 typedef struct {
@@ -224,13 +225,11 @@
 	SortMode	mode;			/* Controls placement of directories. */
 	gboolean	invert;			/* If set, we sort backwards (Z-A). */
 	gboolean	nocase;			/* Set for case-insensitive string comparisons. Lame! */
-	gboolean	numerical;		/* Special numerical mode (way cool)? */
 } DPSort;
 
 typedef enum { SBP_IGNORE = 0, SBP_LEFT, SBP_RIGHT } SBarPos;
 
-/* Click mode -- determines if (and how) we alter the CONTROL state for pane clicks. */
-typedef enum { CTM_IGNORE = 0, CTM_SET, CTM_RESET, CTM_TOGGLE } CtrlMode;
+#define	FONT_MAX	128
 
 typedef struct {
 	guint		num_columns;
@@ -242,15 +241,10 @@
 	gboolean	scrollbar_always;	/* Set to always show scrollbar, regardless of # of entries. */
 	gboolean	huge_parent;		/* Set to enable huge, tall, Opus-like parent button. */
 	SBarPos		sbar_pos;		/* Position of scrollbar. */
-	CtrlMode	ctrl_mode;		/* Controls altering of the Control key state for pane clicks. */
+	gboolean	set_font;		/* Set to override GTK+'s default font. */
+	gchar		font_nameFONT_MAX;	/* Last-set font name, remains valid even when set_font == FALSE. */
 } DPFormat;
 
-typedef enum { DPCOL_PANE_SELECTED = 0, DPCOL_FOCUS_UNSELECTED, DPCOL_FOCUS_SELECTED, DPCOL_NUM } DpCol;
-
-typedef struct {
-	GdkColor	colorDPCOL_NUM;
-} DPColors;
-
 typedef enum { DPORIENT_HORIZ = 0, DPORIENT_VERT } DpOrient;
 typedef enum { DPSPLIT_FREE = 0,   DPSPLIT_RATIO, DPSPLIT_ABS_LEFT, DPSPLIT_ABS_RIGHT } DpSplit;
 
@@ -269,18 +263,22 @@
 /* ----------------------------------------------------------------------------------------- */
 
 /* General command row flags. */
-#define	CGF_RUNINBG		(1<<0)		/* Run in command in background? */
-#define	CGF_KILLPREV		(1<<1)		/* Kill previous instance of program (only background)? */
-#define	CGF_GRABOUTPUT		(1<<2)		/* Capture the output into a special window? */
-#define	CGF_SURVIVE		(1<<3)		/* Survive when gentoo quits (only background)? */
+enum {
+	CGF_RUNINBG = (1<<0),		/* Run in command in background? */
+	CGF_KILLPREV = (1<<1),		/* Kill previous instance of program (only background)? */
+	CGF_GRABOUTPUT = (1<<2),		/* Capture the output into a special window? */
+	CGF_SURVIVE = (1<<3)		/* Survive when gentoo quits (only background)? */
+};
 
 /* These flags are for the before- and after-flag fields. */
-#define	CBAF_RESCAN_SOURCE	(1<<0)		/* Rescan the source dir pane? */
-#define	CBAF_RESCAN_DEST	(1<<1)
-#define	CBAF_CD_SOURCE		(1<<2)		/* These save some config work. */
-#define	CBAF_CD_DEST		(1<<3)
-#define CBAF_REQSEL_SOURCE	(1<<4)		/* Command won't run if there's no source selection when envoked. */
-#define CBAF_REQSEL_DEST	(1<<5)		/* Command won't run if there's no destination selection when envoked. */
+enum {
+	CBAF_RESCAN_SOURCE = (1<<0),		/* Rescan the source dir pane? */
+	CBAF_RESCAN_DEST = (1<<1),
+	CBAF_CD_SOURCE = (1<<2),		/* These save some config work. */
+	CBAF_CD_DEST = (1<<3),
+	CBAF_REQSEL_SOURCE = (1<<4),		/* Command won't run if there's no source selection when envoked. */
+	CBAF_REQSEL_DEST = (1<<5)		/* Command won't run if there's no destination selection when envoked. */
+};
 
 typedef struct {		/* Extra info for external commands. */
 	guint32	gflags;			/* General flags. */
@@ -323,7 +321,7 @@
 } ButtonInfo;
 
 typedef struct {			/* Options for overwrite-confirmation dialog module. */
-	gint	show_info : 1;			/* Show info (sizes & dates) for conflicting files? */
+	guint	show_info : 1;			/* Show info (sizes & dates) for conflicting files? */
 	gchar	datefmtDP_DATEFMT_SIZE;	/* How to format dates? */
 } OptOverwrite;
 
@@ -333,7 +331,7 @@
 	HMode	mode;
 	gchar	hide_re_srcMAXNAMLEN;		/* Regular expression; matches are hidden if mode == HIDE_REGEXP. */
 	regex_t	*hide_re;			/* Compiled version of the RE. */
-	gint	no_case : 1;			/* Ignore case in the RE? */
+	guint	no_case : 1;			/* Ignore case in the RE? */
 } HideInfo;
 
 typedef enum {	PTID_ICON = 0, PTID_GTKRC, PTID_FSTAB, PTID_MTAB,
@@ -344,30 +342,25 @@
 	HideInfo	hideinfo;			/* Info about which files should be hidden. */
 } PathInfo;
 
-/* This controls how often we do mounts, if ever. The levels are:
-** MNT_NEVER	Disable all mounting.
-** MNT_ALWAYS	Does a mount attempt on every directory scan. Might be slow.
-*/
-typedef enum { MNT_NEVER = 0, MNT_ALWAYS }	MntMode;
-
-typedef struct {			/* Configuration info for automounting. */
-	MntMode	mode;				/* Global mounting mode. MNT_NEVER */
-	gint	check_nlink : 1;		/* Require nlink == 2 before mounting? TRUE */
-	gint	show_stderr : 1;		/* Show stderr of mount/umount command? TRUE */
-	gint	umount_exit : 1;		/* Unmount all mounted dirs at exit? TRUE */
-	gchar	cmd_mountMAXNAMLEN;		/* Full name to command to use for mounting. "/bin/mount" */
-	gchar	cmd_umountMAXNAMLEN;		/* This command is used for unmounting. "/bin/umount" */
-} MountInfo;
-
 typedef struct {			/* Configuration information for dialogs. */
 	GtkWindowPosition	pos;		/* How should dialogs be positioned? */
 } DialogInfo;
 
+typedef enum {
+	ERR_DISPLAY_STATUSBAR,
+	ERR_DISPLAY_TITLEBAR,
+	ERR_DISPLAY_DIALOG
+} ErrDisplay;
+
 typedef struct {
-	gboolean	dialog;			/* Use dialog for errors? */
+	ErrDisplay	display;		/* How should error (and status messages) be shown? */
 	gboolean	beep;			/* Do a gdk_beep() on error? */
 } ErrInfo;
 
+typedef struct {
+	GHashTable	*ignored;		/* Keyed on 'tag', if present ignore the dialog. */
+} NagInfo;
+
 #define	CFLG_CHANGED	(1<<0)		/* Config has changed. Set on "OK", cleared by cfg_save_all(). */
 
 typedef struct {			/* Holds all configuration info. */
@@ -375,7 +368,6 @@
 	GList		*type;			/* List of types (FType structures). */
 	StyleInfo	*style;			/* Opaque style container. */
 	DPFormat	dp_format2;
-	DPColors	dp_colors;		/* Global color information used to render dirpanes. */
 	DPPaning	dp_paning;		/* Controls how the paned view acts. */
 	DPHistory	dp_history;		/* History list option. */
 	OptOverwrite	opt_overwrite;
@@ -384,19 +376,23 @@
 	ButtonLayout	*buttonlayout;
 	CmdInfo		commands;
 	PathInfo	path;
-	MountInfo	mount;
 	WinInfo		*wininfo;
 	DialogInfo	dialogs;
 	CtrlInfo	*ctrlinfo;
 	ErrInfo		errors;
 	gboolean	(*dir_filter)(const gchar *name);
+	NagInfo		nag;
 } CfgInfo;
 
 typedef struct GuiInfo	GuiInfo;
 
+typedef struct {
+	GVfs		*vfs;
+} VfsInfo;
+
 struct MainInfo {				/* gentoo's single most central data structure. */
-	OptDesc		*opt;
-	gsize		opt_num;
+	gchar		**run_commands;		/* From the command line --run option, kept first for initializer in main(). */
+	VfsInfo		vfs;
 	CfgInfo		cfg;
 	GuiInfo		*gui;
 	IconInfo	*ico;
@@ -412,43 +408,9 @@
 	GtkEntryCompletion	*compl;			/* A GTK+ 2.0 completion object, attached to the pane's path entry. */
 } PathComplete;
 
-/* These macros are used to access fields of a DirRow structure. */
-#define	DP_ROW_NAME(r)		((r)->dr_names.disk)
-#define	DP_ROW_NAMED(r)		((r)->dr_names.display)
-#define	DP_ROW_LSTAT(r)		((r)->dr_lstat)
-#define	DP_ROW_STAT(r)		(*((r)->dr_stat))
-#define	DP_ROW_LINKNAME(r)	((r)->dr_linknames.disk)
-#define	DP_ROW_LINKNAMED(r)	((r)->dr_linknames.display)
-#define	DP_ROW_FLAGS(r)		((r)->dr_flags)
-#define	DP_ROW_FLAGS_SET(r,f)	(DP_ROW_FLAGS(r) |= (f))
-#define	DP_ROW_FLAGS_CLR(r,f)	(DP_ROW_FLAGS(r) &= ~(f))
-#define	DP_ROW_FLAGS_CHK(r,f)	((DP_ROW_FLAGS(r) & (f)) == (f))
-#define	DP_ROW_TYPE(r)		((r)->dr_type)
-#define	DP_ROW_INDEX(p,r)	((r) - (p)->dir.row)
-
-#define	DP_ROW_SET_STAT(r,s)	(((r)->dr_stat) = (s))
-#define	DP_ROW_GET_STAT(r)	((r)->dr_stat)
-#define	DP_ROW_SET_LINKNAME(r,n) ((r)->dr_linknames.disk = (n))
-#define	DP_ROW_SET_LINKNAMED(r,n) ((r)->dr_linknames.display = (n))
-
-/* These macros are to be used when accessing a DirRow through a selection list, which
-** is the most frequent case. The 's' parameter is the SList iterator.
-*/
-#define	DP_SEL_ROW(s)		((DirRow *) (s)->data)
-#define	DP_SEL_NAME(s)		(DP_ROW_NAME(DP_SEL_ROW(s)))
-#define	DP_SEL_NAMED(s)		(DP_ROW_NAMED(DP_SEL_ROW(s)))
-#define	DP_SEL_LSTAT(s)		(DP_ROW_LSTAT(DP_SEL_ROW(s)))
-#define	DP_SEL_STAT(s)		(DP_ROW_STAT(DP_SEL_ROW(s)))
-#define	DP_SEL_LINKNAME(s)	(DP_ROW_LINKNAME(DP_SEL_ROW(s)))
-#define	DP_SEL_FLAGS(s)		(DP_ROW_FLAGS(DP_SEL_ROW(s)))
-#define	DP_SEL_FLAGS_SET(s,f)	(DP_ROW_FLAGS_SET(DP_SEL_ROW(s), (f)))
-#define	DP_SEL_FLAGS_CLR(s,f)	(DP_ROW_FLAGS_CLR(DP_SEL_ROW(s), (f)))
-#define	DP_SEL_FLAGS_CHK(s,f)	(DP_ROW_FLAGS_CHK(DP_SEL_ROW(s), f))
-#define	DP_SEL_TYPE(s)		(DP_ROW_TYPE(DP_SEL_ROW(s)))
-#define	DP_SEL_INDEX(p,s)	(DP_ROW_INDEX((p), DP_SEL_ROW(s)))
-
-enum {	DPRF_HAS_SIZE = 1 << 0,			/* Set when a row has a "real" size (not set for directories unless GetSize:d). */
-	DPRF_LINK_EXISTS = 1 << 1		/* Set when a symlink's target exists. */
+enum {	DPRF_HAS_SIZE	 = 1 << 0,		/* Set when a row has a "real" size (not set for directories unless GetSize:d). */
+	DPRF_LINK_EXISTS = 1 << 1,		/* Set when a symlink's target exists. */
+	DPRF_LINK_TO_DIR = 1 << 2		/* Set when symlink points at (valid) directory. Implies DPRF_LINK_EXISTS. */
 };
 
 typedef struct {			/* A filename, in both on-disk and display formats. */
@@ -465,30 +427,30 @@
 	const FType	*dr_type;		/* Type information. */
 } DirRow;
 
+typedef GtkTreeIter	DirRow2;
+
 typedef struct {
 	guint		num_dirs, num_files;
-	guint64		num_bytes, num_blocks;
+	guint64		num_bytes;
 } SelInfo;
 
 typedef struct {			/* Some trivial file system information. Updated on rescan. */
 	gboolean	valid;			/* Set if the structure's contents are valid. */
-#if defined HAVE_STRUCT_STATVFS
-	struct statvfs	stat;			/* Holds information about filesystem. */
-#elif defined HAVE_STRUCT_STATFS || defined GENTOO_ON_BSD
-	struct statfs	stat;
-#endif
+	guint64		fs_size;		/* Size of filesystem, in bytes. */
+	guint64		fs_free;		/* Free bytes in this filesystem. */
 } FsInfo;
 
+#define	URI_MAX		(2000)			/* This should only rarely be used, and hopefully ease out once GIO gets more mature. */
+
 typedef struct {
-	gchar		pathPATH_MAX;		/* Contents apply to this path. */
+	gchar		pathURI_MAX;		/* Contents apply to this path. */
 	gchar		*pathd;			/* Dynamically allocated display version of the path. Beware! */
+	GtkListStore	*store;			/* Actual ListStore holding the pane's contents. Insert and clear here. */
+	GFile		*root;			/* A GFile representing the current location shown. */
+	gboolean	is_local;		/* Is the root considered local? Used to control 'file' etc. */
 	guint		num_rows;		/* Number of valid rows. */
 	guint		tot_dirs, tot_files;	/* Total number of entries in directory. */
-	guint64		tot_bytes, tot_blocks;	/* Sum of all sizes (in bytes & blocks). */
-	DirRow		*row;			/* A bunch of rows. */
-	gsize		row_alloc;		/* Number of allocated rows. */
-	gchar		*name;			/* This holds name info (filenames and link names). */
-	gsize		name_alloc, name_use;	/* Allocated and used name bytes. */
+	guint64		tot_bytes;		/* Sum of all sizes, in bytes. */
 	struct stat	*stat;			/* Info about link targets. */
 	gsize		stat_alloc, stat_use;	/* Allocated and used link stat structs. */
 	SelInfo		sel;
@@ -502,11 +464,13 @@
 	guint		index;			/* Index of *this* pane, in the grand scheme of things. */
 	GtkWidget	*vbox;
 	GtkWidget	*notebook;		/* Notebook holding (normally) path widgetry. */
+	GtkWidget	*parent;		/* The common parent button. */
+	GtkWidget	*hparent;		/* The "huge" parent button, if enabled in config. */
 	GtkWidget	*path;			/* GTK+ 2.0 GtkComboBox showing path and path history. */
 	PathComplete	complete;		/* Information for completing the path. */
 	GtkWidget	*hide;			/* A toggle button showing (and controlling) hide status. Focus target! */
 	GtkWidget	*scwin;			/* Scrolling window for clist to live in. */
-	GtkCList	*list;			/* The actual clist that shows all stuff. */
+	GtkWidget	*view;			/* GtkTreeView for viewing the pane. */
 	GtkWidget	*menu_top;		/* The top-level menu, typically shown by right-clicking. */
 	GtkWidget	*mitem_action;		/* The item in the top-level menu that contains the actions submenu. */
 	GtkWidget	*menu_action;		/* The menu containing the intersection of all available actions on the selection. */
@@ -517,6 +481,7 @@
 	gint		dbclk_row;		/* The row that was double clicked, or -1. */
 	gint		focus_row;		/* The last row to be rendered focused, or -1. */
 	gint		old_focus_row;		/* Used to remember focus when pane is deactivated. */
+	guint		sig_sel_changed;	/* Signal for the "changed" event on the view's GtkTreeSelection. */
 	guint		sig_path_activate;	/* Signal for the "activate" event on path entry combo box. */
 	guint		sig_path_changed;	/* Signal for the "changed" event on the path entry combo box. */
 };
@@ -527,7 +492,6 @@
 	GtkWidget	*window;
 	guint		sig_main_configure;
 	guint		sig_main_delete;
-	GtkTooltips	*main_tt;		/* Tooltips for main window. Used by dirpane widgets. */
 	KbdContext	*kbd_ctx;		/* Keyboard context, for shortcuts. */
 	GtkWidget	*vbox;			/* Vbox that contains entire GUI. */
 	GtkWidget	*top;			/* A label showing status (selections, free space, etc). */
@@ -547,5 +511,6 @@
 /* These are defined in the main "gentoo.c" module, but really shouldn't be. Until they
 ** get a module of their own, they need to be prototyped like this. :(
 */
+extern void	rebuild_top(MainInfo *min);
 extern void	rebuild_middle(MainInfo *min);
 extern void	rebuild_bottom(MainInfo *min);

gentoo-0.15.6.tar.bz2/src/gfam.c -> gentoo-0.19.9.tar.gz/src/gfam.c Changed

@@ -8,269 +8,183 @@
 **		it will be built as stubs that do nothing. Use --disable-fam to manually turn it off.
 **
 **		Btw, this module is named "gfam" because plain "fam.h" collided with <fam.h>. Weird.
+** 2009-11-10 -	Totally rewritten (and I do mean *totally*), now simply wraps GIO's monitoring. For
+**		the usual dried up grapes' sake, I left the name of the module alone. Later ...
 */
 
 #include "gentoo.h"
 
-#if defined HAVE_FAM
-#include <fam.h>
-#endif
-
 #include "dialog.h"
 #include "dirpane.h"
 #include "miscutil.h"
 
 #include "gfam.h"
 
-/* If we don't have FAM, or it has been disabled, simply define the necessary functions
-** as do-nothing stubs. Since the interface is (still?) pretty simple, it's easier and
-** cleaner to do it in this all-at-once way, rather than scattering #if defined HAVE_FAMs
-** all over the place. Perhaps the compiler can even optimize these stubs out?
-*/
-#if !defined HAVE_FAM
-
-gboolean fam_initialize(MainInfo *min)
-{
-	return TRUE;
-}
-
-gboolean fam_is_active(void)
-{
-	return FALSE;
-}
-
-void fam_monitor(const DirPane *dp)
-{
-}
-
-void fam_rescan_block(void)
-{
-}
-
-void fam_rescan_unblock(void)
-{
-}
-
-void fam_shutdown(MainInfo *min)
-{
-}
-
-#else	/* If HAVE_FAM is actually defined, provide functional functions. */
-
 /* ----------------------------------------------------------------------------------------- */
 
-#define	MAGIC_OFFSET	16
+static const guint RESCAN_INTERVAL = 50;	/* Milliseconds. */
 
 static struct {
-	gboolean	ok;
-	MainInfo	*min;
-	FAMConnection	conn;
-	FAMRequest	req2;
-	guint		block_cnt;		/* If set, don't rescan. */
-	guint		block_rescan;		/* Used to track what needs to be reloaded on unblock(). */
-	guint		timeout2;		/* Used to notify of pending refresh after rate limiting. */
-	gint		next_req;		/* Index number to use for next request, increments. */
-} the_faminfo = { FALSE };
+	struct {
+	DirPane		*dp;
+	GFileMonitor	*monitor;
+	gulong		sig_changed;
+	}		pane2;
+	gulong		block_count;
+	guint		rescan_mask;
+	guint		timeout;
+} monitor_info;
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 2003-09-30 -	Timeout handler to catch rate limited refreshes. Set when a refresh is denied
-**		by the rate limiter, to do a final refresh since one is known to be needed.
-*/
-static gboolean evt_fam_timeout(gpointer data)
-{
-	guint index = GPOINTER_TO_UINT(data);
-
-	if(the_faminfo.block_cnt)
-		the_faminfo.block_rescan |= (1 << index);
-	else
-		dp_rescan(&the_faminfo.min->gui->paneindex);
-
-	the_faminfo.timeoutindex = 0U;
-	return FALSE;
-}
-
-/* Refresh rate period is always in this range, in seconds. */
-#define	LIMIT_MIN	0.3f
-#define	LIMIT_MAX	2.0f
-
-/* 2003-09-30 -	Rate limit pane rescans. Tracks elaped time since last rescan, and limit the frequency of
-**		actual rescans performed. Returns TRUE if it did do the rescan, FALSE if not. The rate of
-**		rescanning is dynamically altered based on how long it takes to do; aiming to keep the a
-**		1:4 ratio between time to rescan and time between rescans.
-*/
-static gboolean rescan_rate_limited(guint index)
+gboolean fam_initialize(MainInfo *min)
 {
-	static gfloat	limit = LIMIT_MIN;			/* Dynamically adjusted based on refresh time. */
-	static GTimeVal stamp2 = { { 0 }, { 0 } };
-	static gfloat elapsed2 = { 0.0f, 0.0f};		/* Time since last rescan allowed. */
-	GTimeVal now;
-	gboolean ret = TRUE;
+	guint	i;
 
-	g_get_current_time(&now);
-	if(stampindex.tv_sec && stampindex.tv_usec)
+	for(i = 0; i < sizeof monitor_info.pane / sizeof *monitor_info.pane; i++)
 	{
-		gfloat dt = msu_diff_timeval(stamp + index, &now);
-		if(dt < limit)
-		{
-			elapsedindex += dt;
-			if(elapsedindex < limit)	/* When blocking has reached limit, let a request through. */
-			{
-				if(the_faminfo.timeoutindex)
-					gtk_timeout_remove(the_faminfo.timeoutindex);
-				the_faminfo.timeoutindex = gtk_timeout_add(1000.0f * limit, evt_fam_timeout, GUINT_TO_POINTER(index));
-				ret = FALSE;
-			}
-		}
+		monitor_info.panei.dp = &min->gui->panei;
+		monitor_info.panei.monitor = NULL;
+		monitor_info.panei.sig_changed = 0;
 	}
-	stampindex = now;
+	monitor_info.block_count = 0;
+	monitor_info.rescan_mask = 0;
+	monitor_info.timeout = 0;
 
-	if(ret)	/* Refresh needed; do it, measure how long it takes, and update rate. */
-	{
-		gfloat	dt;
-
-		dp_rescan(&the_faminfo.min->gui->paneindex);
-		g_get_current_time(&now);
-		dt = msu_diff_timeval(&stampindex, &now);
-		limit = 3.0f * dt;		/* 3 plus 1 is four. */
-		if(limit < LIMIT_MIN)
-			limit = LIMIT_MIN;
-		else if(limit > LIMIT_MAX)
-			limit = LIMIT_MAX;
-		elapsedindex = 0.0f;
-		if(the_faminfo.timeoutindex)
-		{
-			gtk_timeout_remove(the_faminfo.timeoutindex);
-			the_faminfo.timeoutindex = 0U;
-		}
-	}
-	return ret;
+	return TRUE;
 }
 
-/* 2002-07-22 -	Rescan all panes whose index bit is set in <rescan>. Overkill. */
-static void rescan_issue(guint rescan)
+gboolean fam_is_active(void)
 {
-	guint	i, f = 0;
-
-	for(i = 0; i < sizeof the_faminfo.req / sizeof *the_faminfo.req; i++)
-	{
-		if(rescan & (1 << i))
-		{
-			if(rescan_rate_limited(i))
-				f |= the_faminfo.min->gui->cur_pane == &the_faminfo.min->gui->panei;
-		}
-	}
-	if(f)
-		dp_show_stats(the_faminfo.min->gui->cur_pane);
+	return TRUE;
 }
 
-/* 2002-07-22 -	GTK+ calls this whenever a FAM event is reported. We filter out the interesting
-**		ones, and issue rescans on the affected panes, either now or buffered for later.
-*/
-static void evt_fam_monitor(gpointer data, gint source, GdkInputCondition cond)
+static gboolean evt_timeout(gpointer data)
 {
-	FAMEvent	evt;
-	guint		rescan = 0U, i;
+	guint	i, mask;
 
-	while(FAMPending(&the_faminfo.conn))
+	if(monitor_info.block_count > 0)
+		goto remove_and_exit;	/* It's not often, but here's one! */
+	mask = monitor_info.rescan_mask;
+	for(i = 0; i < sizeof monitor_info.pane / sizeof *monitor_info.pane; i++)
 	{
-		if(FAMNextEvent(&the_faminfo.conn, &evt) == 1)	/* Returns -1 on error, annoyingly enough. */
+		if(mask & (1U << i))
 		{
-			/* Explicitly filter, keeping only events that make sense. */
-			if(evt.code == FAMChanged || evt.code == FAMDeleted ||
-			   evt.code == FAMCreated || evt.code == FAMMoved)
+			GTimer	*timer;
+
+			timer = g_timer_new();
+			dp_rescan(monitor_info.panei.dp);
+			if(timer != NULL)
 			{
-				/* Figure out which pane this is from, and set bit. */
-				for(i = 0; i < sizeof the_faminfo.min->gui->pane / sizeof *the_faminfo.min->gui->pane; i++)
-				{
-					if(evt.fr.reqnum == the_faminfo.reqi.reqnum)
-						rescan |= (1 << i);
-				}
+				gint	limit;
+
+				g_timer_stop(timer);
+				limit = g_timer_elapsed(timer, NULL);
+				g_timer_destroy(timer);
+				if(limit < 50)
+					limit = 50;
+				else if(limit > 10000)
+					limit = 10000;
+				g_file_monitor_set_rate_limit(monitor_info.panei.monitor, limit);
 			}
 		}
 	}
-	if(the_faminfo.block_cnt)
-		the_faminfo.block_rescan |= rescan;	/* Non-destructive, important. */
-	else if(rescan)
-		rescan_issue(rescan);
+	monitor_info.rescan_mask = 0;
+
+remove_and_exit:
+	/* The timeout is always a one-shot; clear handle and ask glib to delete. */
+	monitor_info.timeout = 0;
+	return FALSE;
 }
 
-/* 2002-07-22 -	Initialize FAM subsystem, by opening a connection and hooking up with GTK+'s event loop. */
-gboolean fam_initialize(MainInfo *min)
+static void queue_rescan(guint pane)
 {
-	the_faminfo.min = min;
-	the_faminfo.next_req = 0;
-	if(FAMOpen2(&the_faminfo.conn, PACKAGE) == 0)
+	monitor_info.rescan_mask |= (1U << pane);
+	if(monitor_info.block_count == 0)
 	{
-		guint	i;
-
-		for(i = 0; i < sizeof the_faminfo.req / sizeof *the_faminfo.req; i++)
-			the_faminfo.reqi.reqnum = -1;
-
-		/* Hook us into the main GTK+ event detection system. Simple. */
-		gtk_input_add_full(FAMCONNECTION_GETFD(&the_faminfo.conn), GDK_INPUT_READ, evt_fam_monitor, NULL, NULL, NULL);
-		the_faminfo.ok = TRUE;
-		the_faminfo.block_cnt = 0;
+		if(monitor_info.timeout == 0)
+			monitor_info.timeout = g_timeout_add(RESCAN_INTERVAL, evt_timeout, NULL);
 	}
-	else
-		g_warning(_("FAM open failed, error %d--FAM will not be used"), FAMErrno);
-
-	return the_faminfo.ok;
 }
 
-/* 2002-07-22 -	Just tell a caller if FAM is indeed in use. Says "FALSE" if built without FAM. */
-gboolean fam_is_active(void)
+static void evt_monitor_changed(GFileMonitor *monitor, GFile *file, GFile *other_file, GFileMonitorEvent event, gpointer user)
 {
-	return the_faminfo.ok;
+	DirPane	*dp = user;
+
+	if(event == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT || event == G_FILE_MONITOR_EVENT_CREATED || event == G_FILE_MONITOR_EVENT_DELETED)
+		queue_rescan(dp->index);
 }
 
-/* 2002-07-22 -	Start monitoring the directory of <dp>. Can't take path only, need to key it to pane index for rescan. */
-void fam_monitor(const DirPane *dp)
+gboolean fam_monitor(const DirPane *dp)
 {
-	if(!the_faminfo.ok)
-		return;
-	if(the_faminfo.reqdp->index.reqnum > 0)
+	if(dp == NULL)
+		return FALSE;
+	if(dp->index >= sizeof monitor_info.pane / sizeof *monitor_info.pane)
+	{
+		g_error("Too many panes, can't monitor pane with index %d", dp->index);
+		return FALSE;
+	}
+	if(monitor_info.panedp->index.monitor != NULL)
 	{
-		if(FAMCancelMonitor(&the_faminfo.conn, &the_faminfo.reqdp->index) != 0)
-			g_warning(_("Couldn't cancel FAM monitor: %s (restart with --no-fam to go around, perhaps)"), FamErrlistFAMErrno);
+		g_object_unref(monitor_info.panedp->index.monitor);
+		monitor_info.panedp->index.sig_changed = 0;
 	}
-	the_faminfo.reqdp->index.reqnum = ++the_faminfo.next_req;
-	if(FAMMonitorDirectory2(&the_faminfo.conn, dp->dir.path, &the_faminfo.reqdp->index) != 0)
+	if(dp->dir.root == NULL)
 	{
-		the_faminfo.reqdp->index.reqnum = 0;
-		g_warning(_("Couldn't add FAM monitor on \"%s\": %s (restart with --no-fam to go around, perhaps)"), dp->dir.path, FamErrlistFAMErrno);
+		g_error("No root GFile, failing to monitor pane with index %u\n", dp->index);
+		return FALSE;
 	}
+	if((monitor_info.panedp->index.monitor = g_file_monitor(dp->dir.root, G_FILE_MONITOR_WATCH_MOUNTS, NULL, NULL)) != NULL)
+		monitor_info.panedp->index.sig_changed = g_signal_connect(G_OBJECT(monitor_info.panedp->index.monitor), "changed", G_CALLBACK(evt_monitor_changed), (gpointer) dp);
+	else
+		g_error("GIO failed to attach monitor to '%s'", dp->dir.path);
+	return monitor_info.panedp->index.monitor != NULL;
+}
+
+gboolean fam_is_monitored(const DirPane *dp)
+{
+	if(dp == NULL)
+		return FALSE;
+	if(dp->index >= sizeof monitor_info.pane / sizeof *monitor_info.pane)
+		return FALSE;
+	return monitor_info.panedp->index.monitor != NULL;
 }
 
-/* 2002-07-22 -	Caller is about to start doing stuff for which no rescans are allowed until unblock() is called.
-**		This prevents dp_rescan() from reallocating the core buffers, and thus rendering the caller's
-**		dp_get_selection() list to change meaning, which can be *very* devastating.
-*/
 void fam_rescan_block(void)
 {
-	if(the_faminfo.block_cnt == 0)
-		the_faminfo.block_rescan = 0U;
-	the_faminfo.block_cnt++;
+	monitor_info.block_count++;
 }
 
-/* 2002-07-22 -	Unblock rescans. If any FAM events occured during block, issue the rescans now. */
 void fam_rescan_unblock(void)
 {
-	if(the_faminfo.block_cnt)
+	guint	i;
+
+	if(--monitor_info.block_count == 0)
 	{
-		the_faminfo.block_cnt--;
-		if(the_faminfo.block_cnt == 0U)
-			rescan_issue(the_faminfo.block_rescan);
+		for(i = 0; i < sizeof monitor_info.pane / sizeof *monitor_info.pane; i++)
+		{
+			if(monitor_info.rescan_mask & (1U << i))
+			{
+				queue_rescan(i);
+				monitor_info.rescan_mask &= ~(1U << i);
+			}
+		}
 	}
-	else
-		g_warning("Non-balanced fam_rescan_unblock() call detected; underflow");
 }
 
-/* 2002-07-22 -	Shut down FAM system, by closing the connection. */
 void fam_shutdown(MainInfo *min)
 {
-	if(the_faminfo.ok)
-		FAMClose(&the_faminfo.conn);
-}
+	guint	i;
+
+	if(monitor_info.timeout != 0)
+		g_source_remove(monitor_info.timeout);
 
-#endif		/* HAVE_FAM */
+	for(i = 0; i < sizeof monitor_info.pane / sizeof *monitor_info.pane; i++)
+	{
+		if(monitor_info.panei.monitor != NULL && monitor_info.panei.sig_changed != 0)
+		{
+			g_object_unref(monitor_info.panei.monitor);
+			monitor_info.panei.sig_changed = 0;
+		}
+	}
+}

gentoo-0.15.6.tar.bz2/src/gfam.h -> gentoo-0.19.9.tar.gz/src/gfam.h Changed

gentoo-0.19.9.tar.gz/src/graphics/icon_gentoo_small.xpm Added

@@ -0,0 +1,155 @@
+/* XPM */
+static const char * icon_gentoo_small_xpm = {
+"32 32 120 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #010200",
+"@ 	c #152208",
+"# 	c #1E310B",
+"$ 	c #142108",
+"% 	c #000100",
+"& 	c #040601",
+"* 	c #325213",
+"= 	c #49761B",
+"- 	c #6EB329",
+"; 	c #7FCF30",
+"> 	c #51831E",
+", 	c #263E0E",
+"' 	c #010100",
+") 	c #020301",
+"! 	c #121D07",
+"~ 	c #5E9923",
+"{ 	c #7BC82E",
+" 	c #80D030",
+"^ 	c #77C12C",
+"/ 	c #48751B",
+"( 	c #050902",
+"_ 	c #253C0E",
+": 	c #6FB52A",
+"< 	c #7CC92E",
+" 	c #273F0E",
+"} 	c #28420F",
+"| 	c #1A2B0A",
+"1 	c #6DB229",
+"2 	c #78C32D",
+"3 	c #2B4510",
+"4 	c #030501",
+"5 	c #101A06",
+"6 	c #68AA27",
+"7 	c #78C22D",
+"8 	c #68A927",
+"9 	c #1B2B0A",
+"0 	c #7DCB2F",
+"a 	c #385C15",
+"b 	c #345413",
+"c 	c #74BD2C",
+"d 	c #365914",
+"e 	c #1D300B",
+"f 	c #0B1304",
+"g 	c #4D7D1D",
+"h 	c #080D03",
+"i 	c #0C1304",
+"j 	c #77C12D",
+"k 	c #71B82B",
+"l 	c #3F6617",
+"m 	c #67A726",
+"n 	c #101906",
+"o 	c #0A1104",
+"p 	c #629F25",
+"q 	c #050802",
+"r 	c #4D7C1D",
+"s 	c #79C42D",
+"t 	c #2D4A11",
+"u 	c #7DCC2F",
+"v 	c #131F07",
+"w 	c #619E25",
+"x 	c #73BB2B",
+"y 	c #060902",
+"z 	c #68A827",
+"A 	c #49771C",
+"B 	c #030401",
+"C 	c #162308",
+"D 	c #4E7F1D",
+"E 	c #273F0F",
+"F 	c #63A125",
+"G 	c #0F1805",
+"H 	c #172509",
+"I 	c #335213",
+"J 	c #436C19",
+"K 	c #416A19",
+"L 	c #5F9B24",
+"M 	c #0F1806",
+"N 	c #253D0E",
+"O 	c #5A9222",
+"P 	c #3A5F16",
+"Q 	c #0B1204",
+"R 	c #5C9522",
+"S 	c #6DB129",
+"T 	c #416A18",
+"U 	c #4A781C",
+"V 	c #385B15",
+"W 	c #7CCA2F",
+"X 	c #76C02C",
+"Y 	c #070C03",
+"Z 	c #72BA2B",
+"` 	c #142007",
+" .	c #53871F",
+"..	c #599021",
+"+.	c #040702",
+"@.	c #446F1A",
+"#.	c #7FCE30",
+"$.	c #4B7B1C",
+"%.	c #1B2C0A",
+"&.	c #47731B",
+"*.	c #66A526",
+"=.	c #355614",
+"-.	c #0C1405",
+";.	c #5F9A24",
+">.	c #243A0D",
+",.	c #72B92B",
+"'.	c #23380D",
+").	c #75BE2C",
+"!.	c #578D21",
+"~.	c #010201",
+"{.	c #5C9623",
+".	c #406718",
+"^.	c #5D9723",
+"/.	c #70B52A",
+"(.	c #6FB42A",
+"_.	c #355714",
+":.	c #080E03",
+"<.	c #192909",
+".	c #568C20",
+"}.	c #192809",
+"                          . . . . . .                           ",
+"                  . . . . . . . . . . . . . .                   ",
+"              . . . . . . . . . . . . . . . . . .               ",
+"            . . . . . . . . . . . . . . . . . . . .             ",
+"          . . . . . . . + @ # # $ % . . . . . . . . .           ",
+"        . . . . . . & * = - ; > , ' . . . . . . . . . .         ",
+"      . . . . . ) ! ~ {  ^ / ( . . . . . . . . . . . . .       ",
+"    . . . . . . _ :   <  . . . . } | . . . . . . . . . .     ",
+"    . . . . ) _ 1   2 3 . . 4 5 6 7 8 9 . . . . . . . . .     ",
+"  . . . . . ! :   0 a . . ' b c    d . . . e f . . . . .   ",
+"  . . . . & ~    g h . . i j    k # . . . l ~ & . . . .   ",
+"  . . . . * {   m n . . o p     g . . . q r { * . . . .   ",
+"  . . . + =   s 3 . . . t {    u v . . . i w  = + . . .   ",
+". . . . @ -   x @ . . y z     A B . . . C   - @ . . . . ",
+". . . . #    D . . . E     F G . . . . H    # . . . . ",
+". . . . #    I . . . J    F ) . . . . . K    # . . . . ",
+". . . . #    C . . . L   F M . . . . . . ~    # . . . . ",
+". . . . #    C . . . N O P ) . Q R h . . . S    # . . . . ",
+". . . . @ -   C . . . . . . . . T  h . . @ x   - @ . . . . ",
+"  . . . + =   U . . . . . . y V W X Y . . 3 s   = + . . .   ",
+"  . . . . * {  Z ` . . . . )  .j  ..+.. . @.  { * . . . .   ",
+"  . . . . & ~  #.X $.%.# &.*.   =.% . -.;.  ~ & . . . .   ",
+"  . . . . . ! :          X >.. . @ ,. : ! . . . . .   ",
+"    . . . . ) _ 1         D & . . '. )._ ) . . . .     ",
+"    . . . . . . _ :       !.~.. . . {. .. . . . . .     ",
+"      . . . . . ) ! ^./././.(._.:.. . . <..}.& . . . . .       ",
+"        . . . . . . . . . . . . . . . . . . . . . . . .         ",
+"          . . . . . . . . . . . . . . . . . . . . . .           ",
+"            . . . . . . . . . . . . . . . . . . . .             ",
+"              . . . . . . . . . . . . . . . . . .               ",
+"                  . . . . . . . . . . . . . .                   ",
+"                          . . . . . .                           "};

gentoo-0.15.6.tar.bz2/src/guiutil.c -> gentoo-0.19.9.tar.gz/src/guiutil.c Changed

@@ -48,21 +48,27 @@
 	return but;
 }
 
+/* 2010-06-05 -	Wrapper since I can't get gtk_button_new_from_stock() to behave the way I like. Weird. */
+GtkWidget * gui_stock_button_new(const gchar *stock_id)
+{
+	GtkWidget	*btn, *img;
+
+	btn = gtk_button_new();
+	img = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_MENU);
+	gtk_button_set_image(GTK_BUTTON(btn), img);
+
+	return btn;
+}
+
 /* 1999-04-26 -	Create a button with a "details" icon on it. This is typically a magnifying
 **		class. This button is a graphical replacement for a button labeled "...".
 ** 2009-04-23 -	Happy ten year anniversary, gui_details_button_new()! W00t! Rewritten to use
 **		GTK+ 2.0 stock image, GTK_STOCK_FIND is what we use. It used to be a magnifying
 **		glass, but in current GTK+ it's a pair of binoculars. Oh well.
 */
-GtkWidget * gui_details_button_new(GdkWindow *win)
+GtkWidget * gui_details_button_new(void)
 {
-	GtkWidget	*btn, *img;
-
-	btn = gtk_button_new();
-	/* This is a bit of a hack; even the MENU size is not quite small enough. */
-	img = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
-	gtk_button_set_image(GTK_BUTTON(btn), img);
-	return btn;
+	return gui_stock_button_new(GTK_STOCK_FIND);
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -78,8 +84,8 @@
 	for(i = 0; i < num; i++)
 	{
 		buti = gtk_radio_button_new_with_label(list, _(labeli));
-		list = gtk_radio_button_group(GTK_RADIO_BUTTON(buti));
-		gtk_object_set_user_data(GTK_OBJECT(buti), GUINT_TO_POINTER(i));
+		list = gtk_radio_button_get_group(GTK_RADIO_BUTTON(buti));
+		g_object_set_data(G_OBJECT(buti), "user", GUINT_TO_POINTER(i));
 	}
 	return list;
 }
@@ -131,7 +137,7 @@
 
 	if(!pbar->terminate)
 	{
-		gtk_progress_bar_update(GTK_PROGRESS_BAR(pbar->bar), value);
+		gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pbar->bar), value);
 		if((obj != NULL) && (pbar->obj != NULL))
 			gtk_label_set_text(GTK_LABEL(pbar->obj), obj);
 		gui_events_flush();
@@ -161,7 +167,7 @@
 **		determine which item was selected, each item will have its index (from 0)
 **		set as object's user data. Not pretty, but still simple and useful.
 */
-GtkWidget * gui_build_menu(const gchar *text, GtkSignalFunc func, gpointer user)
+GtkWidget * gui_build_menu(const gchar *text, GCallback func, gpointer user)
 {
 	GtkWidget	*menu, *item;
 	guint		i;
@@ -172,15 +178,63 @@
 		item = gtk_menu_item_new_with_label(_(texti));
 		if(func != NULL)
 		{
-			gtk_object_set_user_data(GTK_OBJECT(item), GUINT_TO_POINTER(i));
+			g_object_set_data(G_OBJECT(item), "user", GUINT_TO_POINTER(i));
 			g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(func), user);
 		}
-		gtk_menu_append(GTK_MENU(menu), item);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 		gtk_widget_show(item);
 	}
 	return menu;
 }
 
+
+/* 2010-05-10 -	Trampoline for the gui_build_combo_box()-constructed widgets. Computes the
+**		index that was selected, and hands that to the user-supplied callback.
+*/
+static void evt_combo_changed(GtkWidget *wid, gpointer user)
+{
+	const gint	item = gtk_combo_box_get_active(GTK_COMBO_BOX(wid));
+
+	if(item >= 0)
+	{
+		GCallback	func = g_object_get_data(G_OBJECT(wid), "callback");
+
+		if(func != NULL)
+			((void(*)(GtkWidget*, guint, gpointer))func)(wid, item, user);
+	}
+}
+
+/* 2010-05-09 -	Merry birthday, me! :D This is a replacement for the old gui_build_menu().
+**		It builds a text-based GtkComboBox, and calls the given function like so:
+**			void callback(GtkWidget *combo, guint index, gpointer user);
+**		Simple, and friendly.
+*/
+GtkWidget * gui_build_combo_box(const gchar *text, GCallback func, gpointer user)
+{
+	GtkWidget	*cbox;
+	gulong		handler;
+
+	cbox = gtk_combo_box_new_text();
+	g_object_set_data(G_OBJECT(cbox), "callback", func);
+	for(; *text != NULL; text++)
+		gtk_combo_box_append_text(GTK_COMBO_BOX(cbox), _(*text));
+	handler = g_signal_connect(G_OBJECT(cbox), "changed", G_CALLBACK(evt_combo_changed), user);
+	g_object_set_data(G_OBJECT(cbox), "handler", GINT_TO_POINTER(handler));
+
+	return cbox;
+}
+
+/* 2010-11-02 -	Block the signal handler. Since it's a bit encapsulated, a function here is needed. */
+void gui_combo_box_set_blocked(GtkWidget *widget, gboolean blocked)
+{
+	const gulong	handler = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "handler"));
+
+	if(blocked)
+		g_signal_handler_block(G_OBJECT(widget), handler);
+	else
+		g_signal_handler_unblock(G_OBJECT(widget), handler);
+}
+
 /* ----------------------------------------------------------------------------------------- */
 
 GuiHandlerGroup * gui_handler_group_new(void)
@@ -241,18 +295,26 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 2008-07-04 -	Flush pending GTK+ events. This is handy as a separate function, even though
-**		it's only two lines of actual code. It seems that on some systems (Ubuntu),
-**		GTK+ smashes errno when running the event flush, and this encapsulation
-**		gives us a chance of handling that easily.
+void gui_set_main_title(MainInfo *min, const gchar *title)
+{
+	gchar	buf256;
+
+	if(title != NULL && *title != '\0')
+	{
+		g_snprintf(buf, sizeof buf, "gentoo - %s", title);
+		win_window_set_title(min->gui->window, buf);
+	}
+	else
+		win_window_set_title(min->gui->window, "gentoo");
+}
+
+/* ----------------------------------------------------------------------------------------- */
+
+/* 2008-07-04 -	Flush pending GTK+ events.
+** 2010-03-04 -	Comments trimmed, legacy code removed. Just the events, thanks.
 */
 void gui_events_flush(void)
 {
-	gint	old_errno = errno;
-
-	/* Due to side-effects, this can clobber errno, so save it. */
 	while(gtk_events_pending())
 		gtk_main_iteration();
-
-	errno = old_errno;
 }

gentoo-0.15.6.tar.bz2/src/guiutil.h -> gentoo-0.19.9.tar.gz/src/guiutil.h Changed

@@ -4,14 +4,17 @@
 */
 
 extern GtkWidget *	gui_arrow_button_new(GtkArrowType at);
-extern GtkWidget *	gui_details_button_new(GdkWindow *win);
+extern GtkWidget *	gui_stock_button_new(const gchar *stock_id);
+extern GtkWidget *	gui_details_button_new(void);
 extern GSList *		gui_radio_group_new(guint num, const gchar **label, GtkWidget *but);
 
 extern gpointer		gui_progress_begin(const gchar *body, const gchar *button);
 extern gboolean		gui_progress_update(gpointer anchor, gfloat value, const gchar *obj);
 extern void		gui_progress_end(gpointer anchor);
 
-extern GtkWidget *	gui_build_menu(const gchar *text, GtkSignalFunc func, gpointer data);
+extern GtkWidget *	gui_build_menu(const gchar *text, GCallback func, gpointer data);
+extern GtkWidget *	gui_build_combo_box(const gchar *text, GCallback func, gpointer user);
+extern void		gui_combo_box_set_blocked(GtkWidget *widget, gboolean blocked);
 
 typedef struct GuiHandlerGroup	GuiHandlerGroup;
 
@@ -20,4 +23,6 @@
 extern void		gui_handler_group_block(const GuiHandlerGroup *g);
 extern void		gui_handler_group_unblock(const GuiHandlerGroup *g);
 
+extern void		gui_set_main_title(MainInfo *min, const gchar *title);
+
 extern void		gui_events_flush(void);

gentoo-0.15.6.tar.bz2/src/iconutil.c -> gentoo-0.19.9.tar.gz/src/iconutil.c Changed

@@ -11,6 +11,8 @@
 **		name really kind of rolls off your tongue, doesn't it?). Simplified things.
 ** 1999-11-21 -	Rewrote the ico_flush() function, to use g_hash_table_foreach_remove(),
 **		which made it a lot shorter and cleaner. Good.
+** 2010-02-22 -	Time flies. Removed old-style pixmap+mask representations, now always uses
+**		the more 2.0-y GdkPixbufs all over the place.
 */
 
 #include "gentoo.h"
@@ -36,18 +38,12 @@
 struct IconInfo {
 	GHashTable	*icon;			/* Provides name-to-pixmap lookup. */
 	const gchar	*path;			/* A local copy of the PTID_ICONS path. */
-	GdkPixmap	*empty_pixmap;		/* An empty icon. It's just blank! */
-	GdkBitmap	*empty_mask;		/* The very empty mask. */
 	GdkPixbuf	*empty;
-	GdkPixmap	*fail_pixmap;		/* This is returned if a named icon isn't found. */
-	GdkBitmap	*fail_mask;		/* Mask for unable-to-load case. */
 	GdkPixbuf	*fail;
 };
 
 typedef struct {
 	gchar		namePATH_MAX;		/* This is real big. */
-	GdkPixmap	*pixmap;
-	GdkBitmap	*mask;
 	GdkPixbuf	*pixbuf;
 } IconGfx;
 
@@ -70,10 +66,7 @@
 
 	ico->icon = g_hash_table_new(g_str_hash, cmp_icon);
 
-	ico->empty_pixmap = gdk_pixmap_colormap_create_from_xpm_d(NULL, gtk_widget_get_default_colormap(), &ico->empty_mask, NULL, icon_empty_xpm);
 	ico->empty = gdk_pixbuf_new_from_xpm_data((const char **) icon_empty_xpm);
-
-	ico->fail_pixmap  = gdk_pixmap_colormap_create_from_xpm_d(NULL, gtk_widget_get_default_colormap(), &ico->fail_mask, NULL, icon_failed_xpm);
 	ico->fail = gdk_pixbuf_new_from_xpm_data((const char **) icon_failed_xpm);
 
 	ico->path = min->cfg.path.pathPTID_ICON->str;
@@ -130,82 +123,16 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1998-08-15 -	Internal icon loader. Uses the (new) file utility function 'fut_locate' to
-**		search the icon path. A configurable icon path is on the agenda...
-** 1999-08-28 -	Removed need for passing a GdkWindow, by using the _colormap_ pixmap creator. Good?
-*/
-static IconGfx * load(IconInfo *ico, const gchar *name)
-{
-	const gchar	*fname;
-	IconGfx		*ig;
-
-	ig = g_malloc(sizeof *ig);
-	stu_strncpy(ig->name, name, sizeof ig->name);
-	ig->pixbuf = NULL;
-	if(strcmp(name, ICON_NONE) == 0)		/* Is it the special, reserved, blank icon? */
-	{
-		ig->pixmap = ico->empty_pixmap;
-		ig->mask   = ico->empty_mask;
-		ig->pixbuf = ico->empty;
-		return ig;
-	}
-	if((fname = fut_locate(ico->path, name)) != NULL)
-	{
-		if((ig->pixmap = gdk_pixmap_colormap_create_from_xpm(NULL, gtk_widget_get_default_colormap(), &ig->mask, NULL, fname)) != NULL)
-		{
-			gdk_pixmap_ref(ig->pixmap);
-			gdk_bitmap_ref(ig->mask);
-			return ig;
-		}
-	}
-	g_free(ig);
-
-	return NULL;
-}
-
-/* 1998-08-15 -	Internal icon retrieval function. Does a lookup in the hash table, loads
-**		from disk if not found.
-*/
-static GdkPixmap * get_or_load(IconInfo *ico, const gchar *name, GdkBitmap **mask)
-{
-	IconGfx	*ig;
-
-	if(ico->icon == NULL)
-		ico->icon = g_hash_table_new(g_str_hash, cmp_icon);
-	if(ico->icon != NULL)
-	{
-		if((ig = g_hash_table_lookup(ico->icon, name)) != NULL)
-		{
-			*mask = ig->mask;
-			return ig->pixmap;
-		}
-		else if((ig = load(ico, name)) != NULL)
-		{
-			g_hash_table_insert(ico->icon, ig->name, ig);
-			*mask = ig->mask;
-			return ig->pixmap;
-		}
-		else
-		{
-			*mask = ico->fail_mask;
-			return ico->fail_pixmap;
-		}
-	}
-	return NULL;
-}
-
 static IconGfx * load_pixbuf(IconInfo *ico, const gchar *name)
 {
 	const gchar	*fname;
 	IconGfx		*ig;
 
 	ig = g_malloc(sizeof *ig);
-	stu_strncpy(ig->name, name, sizeof ig->name);
+	g_strlcpy(ig->name, name, sizeof ig->name);
 	if(strcmp(name, ICON_NONE) == 0)		/* Is it the special, reserved, blank icon? */
 	{
-		ig->pixmap = ico->empty_pixmap;
-		ig->mask   = ico->empty_mask;
-		ig->pixbuf = NULL;
+		ig->pixbuf = ico->empty;
 		return ig;
 	}
 	if((fname = fut_locate(ico->path, name)) != NULL)
@@ -224,30 +151,16 @@
 		ico->icon = g_hash_table_new(g_str_hash, cmp_icon);
 	if((ig = g_hash_table_lookup(ico->icon, name)) != NULL)
 		return ig->pixbuf;
-	else if((ig = load_pixbuf(ico, name)) != NULL)
+	if((ig = load_pixbuf(ico, name)) != NULL)
+	{
+		g_hash_table_insert(ico->icon, ig->name, ig);
 		return ig->pixbuf;
+	}
 	return ico->fail;
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1998-08-15 -	Retrieve a pixmap corresponding to the given <name>, which is typically
-**		an (unqualified) file name, such as "Makefile.xpm". Returns a pointer to
-**		a GDK pixmap, and fills in the <mask> pointer with a pointer to the mask
-**		needed when rendering this pixmap. Returns NULL on failure.
-** 1999-08-28 -	Removed silly GdkWindow argument. Nicer.
-** 2008-07-29 -	FIXME DEPRECATED This interface needs to go.
-*/
-GdkPixmap * ico_icon_get(MainInfo *min, const gchar *name, GdkBitmap **mask)
-{
-	if((name == NULL) || (*name == '\0') || (mask == NULL))
-		return NULL;
-
-	min->ico->path = min->cfg.path.pathPTID_ICON->str;	/* Make sure we have a fresh path. */
-
-	return get_or_load(min->ico, name, mask);
-}
-
 /* 2008-07-29 -	New interface, this returns a GDK Pixbuf which is far more useful in these
  *		times of GTK+ 2 than the old GdkPixmap/GdkBitmap combo.
 */
@@ -267,11 +180,10 @@
 */
 static gboolean kill_icon(gpointer key, gpointer value, gpointer user)
 {
-	IconGfx	*icon = value;
+	IconGfx	*gfx = value;
 
-	gdk_pixmap_unref(icon->pixmap);
-	gdk_bitmap_unref(icon->mask);
-	g_free(icon);
+	g_object_unref(gfx->pixbuf);
+	g_free(gfx);
 
 	return TRUE;			/* Tells glib to actually remove hash entry. */
 }

gentoo-0.15.6.tar.bz2/src/iconutil.h -> gentoo-0.19.9.tar.gz/src/iconutil.h Changed

gentoo-0.15.6.tar.bz2/src/keyboard.c -> gentoo-0.19.9.tar.gz/src/keyboard.c Changed

@@ -12,9 +12,10 @@
 
 #include <stdarg.h>
 
-#include "keyboard.h"
 #include "cmdseq.h"
 
+#include "keyboard.h"
+
 /* ----------------------------------------------------------------------------------------- */
 
 typedef struct {
@@ -211,10 +212,10 @@
 ** 2000-02-09 -	Now knows about, and applies, the modifier mask allowing e.g. NumLock to be
 **		ignored.
 */
-static void evt_key_press(GtkWidget *wid, GdkEventKey *evt, gpointer user)
+static gboolean evt_key_press(GtkWidget *wid, GdkEventKey *evt, gpointer user)
 {
 	KbdContext	*ctx = user;
-	KbdEntry	*ent;
+	KbdEntry	*ent = NULL;
 	gchar		*key;
 	gint		ret;
 	GdkModifierType	mod;
@@ -238,17 +239,17 @@
 					ent->entry.gdkevent.func((GdkEvent *) evt, ent->entry.gdkevent.user);
 					break;
 				case KET_GTKOBJECT:
-					gtk_signal_emit_by_name(GTK_OBJECT(ent->entry.object.obj),
+					g_signal_emit_by_name(G_OBJECT(ent->entry.object.obj),
 								ent->entry.object.signame, ent->entry.object.user, &ret);
 					break;
 				case KET_CMDSEQ:
 					csq_execute(ctx->min, ent->entry.cmdseq.cmdseq);
 					break;
 			}
-			gtk_signal_emit_stop_by_name(GTK_OBJECT(wid), "key_press_event");
 		}
 		g_free(key);
 	}
+	return ent != NULL;
 }
 
 /* 1999-03-10 -	Attach a keyboard context to a window. This will cause all keyboard events

gentoo-0.19.9.tar.gz/src/list_dialog.c Added

@@ -0,0 +1,218 @@
+/*
+** 2010-06-13 -	Implementation of the list/string editor dialog.
+*/
+
+#include "gentoo.h"
+
+#include "dialog.h"
+
+#include "list_dialog.h"
+
+typedef struct {
+	Dialog		*dlg;
+	GtkListStore	*store;
+	GtkWidget	*view;
+	GtkWidget	*add;
+	GtkWidget	*delete;
+	const gchar	*new_text;	/* Default for new adds. */
+	gchar		separator;
+} LDlgInfo;
+
+/* 2010-06-13 -	Splits the given string by the separator char, and appends each string into the model. */
+static void string_to_model(GtkListStore *store, const gchar *string, gunichar separator)
+{
+	GString	*sep;
+	gchar	**vec;
+
+	sep = g_string_sized_new(8);
+	sep = g_string_append_unichar(sep, separator);
+	vec = g_strsplit(string, sep->str, -1);
+	if(vec != NULL)
+	{
+		guint	i;
+
+		for(i = 0; veci != NULL; i++)
+		{
+			GtkTreeIter	iter;
+
+			gtk_list_store_append(store, &iter);
+			gtk_list_store_set(store, &iter, 0, veci, -1);
+		}
+		g_strfreev(vec);
+	}
+	g_string_free(sep, TRUE);
+}
+
+/* 2010-06-14 -	Convert the contents of the tree model into a single string, using the separator. */
+static gboolean model_to_string(gchar *string, gsize max, const GtkListStore *store, gunichar separator)
+{
+	GtkTreeIter	iter;
+	gboolean	ret = TRUE;
+
+	if(max == 0)
+		return FALSE;
+
+	if(gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
+	{
+		gchar	*prev = NULL, *put = string;
+
+		max--;	/* T-800 has made a reservation. */
+		do
+		{
+			gchar	*str = NULL;
+
+			gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, &str, -1);
+			if(str != NULL)
+			{
+				gsize	len = strlen(str);
+
+				/* Does it fit? */
+				if(len + 1 <= max)	/* FIXME: Assumes separator is 1-byte. */
+				{
+					if(prev != NULL)
+						*put++ = separator & 0xff;	/* FIXME: Assumes separator is 1-byte. */
+					memcpy(put, str, len);
+					put += len;
+					*put = '\0';
+					max -= len;
+				}
+				else
+					ret = FALSE;
+				prev = str;
+				g_free(str);
+			}
+		} while(ret && gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter));
+		*put = '\0';
+	}
+	return ret;
+}
+
+/* 2010-06-26 -	Inserting text into cell renderer entry; filter out separator. */
+static void evt_cell_renderer_entry_insert_text(GtkEditable *editable, gchar *new_text, gint new_text_length, gint *position, gpointer user)
+{
+	LDlgInfo	*ldi = user;
+	gchar		*get = new_text, *put = get;
+
+	/* Remove any occurance of the separator character, in-place. See any Giraffes to ride? :| */
+	while(*get)
+	{
+		if(*get == ldi->separator)
+			get++;
+		else
+			*put++ = *get++;
+	}
+	*put = '\0';
+}
+
+/* 2010-06-26 -	Editing starting, set up filtering to avoid input the separator. */
+static void evt_cell_renderer_editing_started(GtkCellRenderer *renderer, GtkCellEditable *editable, gchar *path, gpointer user)
+{
+	if(!GTK_IS_ENTRY(editable)) 
+		return;
+	g_signal_connect(G_OBJECT(editable), "insert_text", G_CALLBACK(evt_cell_renderer_entry_insert_text), user);
+}
+
+static void evt_cell_renderer_edited(GtkCellRendererText *cr, const gchar *path, const gchar *new_text, gpointer user)
+{
+	GtkTreeIter	iter;
+
+	if(gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(user), &iter, path))
+	{
+		gtk_list_store_set(GTK_LIST_STORE(user), &iter, 0, new_text, -1);
+	}
+}
+
+static void evt_view_row_activated(GtkTreeView *tv, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user)
+{
+	gtk_tree_view_set_cursor(tv, path, column, TRUE);
+}
+
+static void evt_view_selection_changed(GtkTreeSelection *sel, gpointer user)
+{
+	LDlgInfo	*ldi = user;
+	const gboolean	has_sel = gtk_tree_selection_count_selected_rows(sel) > 0;
+
+	gtk_widget_set_sensitive(ldi->delete, has_sel);
+}
+
+/* 2010-06-26 -	Add a new item, just below the currently selected one. Make it editable. */
+static void evt_add_clicked(GtkWidget *wid, gpointer user)
+{
+	LDlgInfo	*ldi = user;
+	GtkTreeIter	iter, new;
+	GtkTreeModel	*model;
+	GtkTreePath	*path;
+
+	if(gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(ldi->view)), &model, &iter))
+		gtk_list_store_insert_after(GTK_LIST_STORE(model), &new, &iter);
+	else
+		gtk_list_store_append(GTK_LIST_STORE(model), &new);
+	gtk_list_store_set(GTK_LIST_STORE(model), &new, 0, ldi->new_text, -1);
+	if((path = gtk_tree_model_get_path(model, &new)) != NULL)
+	{
+		GtkTreeViewColumn	*col = gtk_tree_view_get_column(GTK_TREE_VIEW(ldi->view), 0);
+		gtk_tree_view_set_cursor(GTK_TREE_VIEW(ldi->view), path, col, TRUE);
+		gtk_tree_path_free(path);
+	}
+}
+
+/* 2010-06-26 -	Delete the currently selected item. */
+static void evt_delete_clicked(GtkWidget *wid, gpointer user)
+{
+	LDlgInfo	*ldi = user;
+	GtkTreeIter	iter;
+	GtkTreeModel	*model;
+
+	if(!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(ldi->view)), &model, &iter))
+		return;
+	gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
+}
+
+void ldl_dialog_sync_new_wait(gchar *list, gsize max, gunichar separator, const gchar *title)
+{
+	LDlgInfo		ldi;
+	GtkWidget		*vbox, *scwin, *hbox;
+	GtkCellRenderer		*cr;
+	GtkTreeViewColumn	*vc;
+	GtkTreeSelection	*sel;
+
+	ldi.store = gtk_list_store_new(1, G_TYPE_STRING);
+	vbox = gtk_vbox_new(FALSE, 0);
+	ldi.view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(ldi.store));
+	cr = gtk_cell_renderer_text_new();
+	g_object_set(G_OBJECT(cr), "editable", TRUE, NULL);
+	g_signal_connect(G_OBJECT(cr), "editing-started", G_CALLBACK(evt_cell_renderer_editing_started), &ldi);
+	g_signal_connect(G_OBJECT(cr), "edited", G_CALLBACK(evt_cell_renderer_edited), ldi.store);
+	vc = gtk_tree_view_column_new_with_attributes("(string)", cr, "text", 0, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(ldi.view), vc);
+	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(ldi.view), FALSE);
+	gtk_tree_view_set_reorderable(GTK_TREE_VIEW(ldi.view), TRUE);
+	g_signal_connect(G_OBJECT(ldi.view), "row_activated", G_CALLBACK(evt_view_row_activated), NULL);
+	scwin = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_container_add(GTK_CONTAINER(scwin), ldi.view);
+	gtk_box_pack_start(GTK_BOX(vbox), scwin, TRUE, TRUE, 0);
+
+	hbox = gtk_hbox_new(FALSE, 0);
+	ldi.add = gtk_button_new_from_stock(GTK_STOCK_ADD);
+	g_signal_connect(G_OBJECT(ldi.add), "clicked", G_CALLBACK(evt_add_clicked), &ldi);
+	gtk_box_pack_start(GTK_BOX(hbox), ldi.add, TRUE, TRUE, 0);
+	ldi.delete = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+	g_signal_connect(G_OBJECT(ldi.delete), "clicked", G_CALLBACK(evt_delete_clicked), &ldi);
+	gtk_box_pack_start(GTK_BOX(hbox), ldi.delete, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+	string_to_model(ldi.store, list, separator);
+
+	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(ldi.view));
+	g_signal_connect(G_OBJECT(sel), "changed", G_CALLBACK(evt_view_selection_changed), &ldi);
+	gtk_tree_selection_set_mode(GTK_TREE_SELECTION(sel), GTK_SELECTION_BROWSE);
+
+	ldi.new_text = _("(New Item)");
+	ldi.separator = separator;
+
+	ldi.dlg = dlg_dialog_sync_new(vbox, title, _("OK|Cancel"));
+	dlg_dialog_sync_wait(ldi.dlg);
+	model_to_string(list, max, ldi.store, separator);
+	g_object_unref(ldi.store);
+}

gentoo-0.19.9.tar.gz/src/list_dialog.h Added

gentoo-0.15.6.tar.bz2/src/menus.c -> gentoo-0.19.9.tar.gz/src/menus.c Changed

@@ -106,7 +106,7 @@
 		return NULL;
 
 	m = g_malloc(sizeof *m);
-	stu_strncpy(m->name, name, sizeof m->name);
+	g_strlcpy(m->name, name, sizeof m->name);
 	m->item = g_array_new(FALSE, FALSE, sizeof (MenuItem));
 	m->used = FALSE;
 
@@ -148,7 +148,7 @@
 	MenuItem	mi;
 
 	mi.type = ITEM_SIMPLE;
-	stu_strncpy(mi.data.simple.label.label, label, sizeof mi.data.simple.label.label);
+	g_strlcpy(mi.data.simple.label.label, label, sizeof mi.data.simple.label.label);
 	mi.data.simple.label.icon0 = '\0';
 	mi.data.simple.cmdseq = g_string_new(cmdseq);
 	menu_append(m, &mi);
@@ -167,9 +167,9 @@
 	MenuItem	mi;
 
 	mi.type = ITEM_SUBMENU;
-	stu_strncpy(mi.data.submenu.label.label, label, sizeof mi.data.submenu.label.label);
+	g_strlcpy(mi.data.submenu.label.label, label, sizeof mi.data.submenu.label.label);
 	mi.data.submenu.label.icon0 = '\0';
-	stu_strncpy(mi.data.submenu.menu, menu, sizeof mi.data.submenu.menu);
+	g_strlcpy(mi.data.submenu.menu, menu, sizeof mi.data.submenu.menu);
 	menu_append(m, &mi);
 }
 
@@ -214,7 +214,7 @@
 {
 	MainInfo	*min;
 
-	min = gtk_object_get_user_data(GTK_OBJECT(wid));
+	min = g_object_get_data(G_OBJECT(wid), "user");
 	csq_execute_format(min, "FileAction action='%s'", user);
 }
 
@@ -228,16 +228,22 @@
 
 	if((slist = dp_get_selection(dp)) != NULL)
 	{
-		GSList	*iter, *styles = NULL, *actions = NULL;
-		GList	*palist, *piter;
-		Style	*stl;
+		GSList		*iter, *styles = NULL, *actions = NULL;
+		GList		*palist, *piter;
+		GtkTreeModel	*tm = dp_get_tree_model(dp);
+		Style		*stl;
 
 		/* Build list of all styles used by rows in selection. */
 		for(iter = slist; iter != NULL; iter = g_slist_next(iter))
 		{
-			stl = DP_SEL_TYPE(iter)->style;
-			if(g_slist_find(styles, stl) == NULL)
-				styles = g_slist_prepend(styles, stl);
+			const FType	*ftype = dp_row_get_ftype(tm, iter->data);
+
+			if(ftype != NULL)
+			{
+				stl = ftype->style;
+				if(g_slist_find(styles, stl) == NULL)
+					styles = g_slist_prepend(styles, stl);
+			}
 		}
 
 		/* Compute intersection of all styles' action properties. */
@@ -262,9 +268,9 @@
 			for(iter = actions; iter != NULL; iter = g_slist_next(iter))
 			{
 				item = gtk_menu_item_new_with_label(iter->data);
-				gtk_object_set_user_data(GTK_OBJECT(item), min);
+				g_object_set_data(G_OBJECT(item), "user", min);
 				g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(evt_menu_action_activate), iter->data);
-				gtk_menu_append(GTK_MENU(menu), item);
+				gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 				gtk_widget_show(item);
 			}
 			g_slist_free(actions);
@@ -277,7 +283,7 @@
 
 		item = gtk_menu_item_new_with_label(_("(No Selection)"));
 		gtk_widget_set_sensitive(item, FALSE);
-		gtk_menu_append(GTK_MENU(menu), item);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 		gtk_widget_show(item);
 	}
 }
@@ -299,21 +305,21 @@
 	strftime(buf, sizeof buf, "%H:%M.%S", nowf);
 
 	item = gtk_menu_item_new_with_label(buf);
-	gtk_menu_append(GTK_MENU(menu), item);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	gtk_widget_show(item);
 }
 
 /* 2004-04-18 -	User picked an item from the <ParentsMenu> menu. Go there. */
 static void evt_menu_parents_activate(GtkWidget *wid, gpointer user)
 {
-	gchar	*text = NULL;
+	const gchar	*text = NULL;
 
 	if(!GTK_IS_MENU_ITEM(wid))
 		return;
 	wid = GTK_BIN(wid)->child;
 	if(!GTK_IS_LABEL(wid))
 		return;
-	gtk_label_get(GTK_LABEL(wid), &text);
+	text = gtk_label_get_text(GTK_LABEL(wid));
 	if(text != NULL)
 		csq_execute_format(user, "DirEnter 'dir=%s'", stu_escape(text));
 }
@@ -335,12 +341,12 @@
 			break;
 		item = gtk_menu_item_new_with_label(canon);
 		g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(evt_menu_parents_activate), min);
-		gtk_menu_append(GTK_MENU(menu), item);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	}
 	/* Always append a root ("/") item, since the root has itself as its parent. Avoids empty menu, as bonus. */
 	item = gtk_menu_item_new_with_label("/");
 	g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(evt_menu_parents_activate), min);
-	gtk_menu_append(GTK_MENU(menu), item);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	gtk_widget_show_all(menu);
 }
 
@@ -351,22 +357,23 @@
 {
 	MainInfo	*min;
 
-	min = gtk_object_get_user_data(GTK_OBJECT(wid));
+	min = g_object_get_data(G_OBJECT(wid), "user");
 	csq_execute(min, user);
 }
 
 static void evt_menu_show(GtkWidget *wid, gpointer user)
 {
 	DynMenu	*dm = user;
-	dm->build(gtk_object_get_user_data(GTK_OBJECT(wid)), wid);
+	dm->build(g_object_get_data(G_OBJECT(wid), "user"), wid);
 }
 
 static void evt_menu_hide(GtkWidget *wid, gpointer user)
 {
-	GList	*iter;
+	GList	*list, *iter;
 
-	for(iter = gtk_container_children(GTK_CONTAINER(wid)); iter != NULL; iter = g_list_next(iter))
+	for(iter = list = gtk_container_get_children(GTK_CONTAINER(wid)); iter != NULL; iter = g_list_next(iter))
 		gtk_container_remove(GTK_CONTAINER(wid), iter->data);
+	g_list_free(list);
 }
 
 static GtkWidget * do_menu_widget_build(const MenuInfo *mi, const gchar *name, Menu *parent)
@@ -387,7 +394,7 @@
 	if((d = g_hash_table_lookup(dynamic_hash, name)) != NULL)
 	{
 		menu = gtk_menu_new();
-		gtk_object_set_user_data(GTK_OBJECT(menu), mi->min);
+		g_object_set_data(G_OBJECT(menu), "user", mi->min);
 		g_signal_connect(G_OBJECT(menu), "show", G_CALLBACK(evt_menu_show), d);
 		g_signal_connect(G_OBJECT(menu), "hide", G_CALLBACK(evt_menu_hide), d);
 		return menu;
@@ -406,7 +413,7 @@
 				menuitem = gtk_menu_item_new_with_label(mit->data.simple.label.label);
 				g_signal_connect(G_OBJECT(menuitem), "activate",
 						 G_CALLBACK(evt_menu_activate), mit->data.simple.cmdseq->str);
-				gtk_object_set_user_data(GTK_OBJECT(menuitem), mi->min);
+				g_object_set_data(G_OBJECT(menuitem), "user", mi->min);
 				break;
 			case ITEM_SEPARATOR:
 				menuitem = gtk_menu_item_new();
@@ -425,7 +432,7 @@
 		}
 		if(menuitem)
 		{
-			gtk_menu_append(GTK_MENU(menu), menuitem);
+			gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 			gtk_widget_show(menuitem);
 		}
 	}
@@ -469,7 +476,7 @@
 	gboolean	ret;
 
 	gui_events_flush();
-	gtk_signal_emit_by_name(GTK_OBJECT(wid), "destroy_event", NULL, &ret);
+	g_signal_emit_by_name(G_OBJECT(wid), "destroy_event", NULL, &ret);
 }
 
 gboolean mnu_menu_popup(const MenuInfo *mi, const gchar *name, GtkMenuPositionFunc pos, gpointer data, guint button, guint32 activate_time)
@@ -557,6 +564,7 @@
 	return nmi;
 }
 
+#if 0
 static void append_menu(gpointer key, gpointer value, gpointer user)
 {
 	GList	**list = user;
@@ -615,6 +623,7 @@
 
 	return choice == 0 ? (selected ? selected : MENU_NONE) : NULL;
 }
+#endif
 
 static void destroy_menu(gpointer key, gpointer value, gpointer user)
 {

gentoo-0.19.9.tar.gz/src/nag_dialog.c Added

@@ -0,0 +1,52 @@
+/*
+** 2009-12-28 -	This is the implementation of the brand-new "nag" dialog. The first intended use is to
+**		allow a bit friendlier indication of deprecated/removed commands, by keeping them listed
+**		and replacing the body with a call here.
+*/
+
+#include "gentoo.h"
+
+#include "cfg_nag.h"
+#include "configure.h"
+#include "dialog.h"
+
+#include "nag_dialog.h"
+
+/* ----------------------------------------------------------------------------------------- */
+
+gboolean ndl_dialog_sync_new_wait(MainInfo *min, const gchar *tag, const gchar *title, const gchar *body)
+{
+	GtkWidget	*vbox, *wid, *ignore;
+	gboolean	ret = FALSE;
+	Dialog		*dlg;
+
+	if(cng_is_ignored(&min->cfg.nag, tag))
+		return TRUE;
+
+	/* Not already ignored, so build and present dialog. */
+	vbox = gtk_vbox_new(FALSE, 0);
+	wid = gtk_label_new(NULL);
+	gtk_label_set_width_chars(GTK_LABEL(wid), 60);
+	gtk_label_set_justify(GTK_LABEL(wid), GTK_JUSTIFY_LEFT);
+	gtk_label_set_line_wrap(GTK_LABEL(wid), TRUE);
+	gtk_label_set_line_wrap_mode(GTK_LABEL(wid), PANGO_WRAP_WORD);
+	gtk_label_set_markup(GTK_LABEL(wid), body);
+	gtk_box_pack_start(GTK_BOX(vbox), wid, FALSE, FALSE, 0);
+
+	dlg = dlg_dialog_sync_new(vbox, title, _("OK"));
+	ignore = gtk_check_button_new_with_mnemonic(_("_Don't show this dialog again"));
+	dlg_dialog_sync_action_add(dlg, ignore);
+	/* We don't care for the dialog's response; there's only one action button after all. */
+	dlg_dialog_sync_wait(dlg);
+
+	/* The widgets are still around, so check directly if check button was checked. */
+	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ignore)))
+	{
+		cng_ignore(&min->cfg.nag, tag);
+		cfg_modified_set(min);
+		ret = TRUE;
+	}
+	dlg_dialog_sync_destroy(dlg);
+
+	return ret;
+}

gentoo-0.19.9.tar.gz/src/nag_dialog.h Added

gentoo-0.15.6.tar.bz2/src/odmultibutton.c -> gentoo-0.19.9.tar.gz/src/odmultibutton.c Changed

@@ -1,12 +1,14 @@
 /*
+** Custom button widget, that supports having a secondary click-function associated with being
+** clicked by the middle mouse button. Very much inspired by Directory Opus on the Amiga.
 **
+** Original GTK+ 1.2.x version written by Johan Hanson, re-written for GTK+ 2.0 by Emil Brink.
 */
 
 #include <stdio.h>
 #include <stdlib.h>
 
-/* ODMultiButton is 2.x pure, like freshly fallen snow. */
-#define GTK_DISABLE_DEPRECATED
+#include "config.h"
 
 #include <gtk/gtk.h>
 
@@ -73,8 +75,8 @@
 		}
 		if(p != NULL)
 		{
-			if(GTK_WIDGET_STATE(widget) != GTK_WIDGET_STATE(p))
-				gtk_widget_set_state(p, GTK_WIDGET_STATE(widget));
+			if(gtk_widget_get_state(widget) != gtk_widget_get_state(p))
+				gtk_widget_set_state(p, gtk_widget_get_state(widget));
 			gtk_widget_show(p);
 			if(gtk_widget_get_parent(p) != NULL)
 				gtk_widget_reparent(p, widget);
@@ -86,7 +88,7 @@
 		}
 		mb->last_index = index;
 	}
-	if(GTK_WIDGET_DRAWABLE(widget))
+	if(gtk_widget_is_drawable(widget))
 		gtk_widget_queue_draw(widget);
 }
 
@@ -122,10 +124,8 @@
 
 	mb = OD_MULTIBUTTON(widget);
 
-	req->width  = 2 * (gtk_container_get_border_width(GTK_CONTAINER(widget)) + 1 +
-			gtk_widget_get_style(widget)->xthickness);
-	req->height = 2 * (gtk_container_get_border_width(GTK_CONTAINER(widget)) + 1 +
-			gtk_widget_get_style(widget)->ythickness);
+	req->width  = 2 * (gtk_container_get_border_width(GTK_CONTAINER(widget)) + 1 + gtk_widget_get_style(widget)->xthickness);
+	req->height = 2 * (gtk_container_get_border_width(GTK_CONTAINER(widget)) + 1 + gtk_widget_get_style(widget)->ythickness);
 
 	/* Included for completeness, ODMultiButton can't actually be focused. */
 	gtk_widget_style_get(GTK_WIDGET(widget), "focus-line-width", &focus_width, "focus-padding", &focus_pad, NULL);
@@ -142,11 +142,9 @@
 */
 static void od_multibutton_paint_dog_ear(GtkWidget *widget, GdkRectangle *area)
 {
-	GtkStateType	state;
+	const GtkStateType	state = gtk_widget_get_state(widget);
 
-	state = GTK_WIDGET_STATE(widget);
-
-	if(GTK_WIDGET_DRAWABLE(widget) && state != GTK_STATE_ACTIVE)
+	if(gtk_widget_is_drawable(widget) && state != GTK_STATE_ACTIVE)
 	{
 		GtkStyle	*style = gtk_widget_get_style(widget);
 		const guint	EARSIZE = 5;
@@ -209,7 +207,7 @@
 	g_return_if_fail(area != NULL);
 	g_return_if_fail(OD_IS_MULTIBUTTON(widget));
 
-	if(GTK_WIDGET_DRAWABLE(widget))
+	if(gtk_widget_is_drawable(widget))
 	{
 		ODMultiButton	*mb = OD_MULTIBUTTON(widget);
 
@@ -321,7 +319,13 @@
 {
 	guint	i;
 
+#if GTK_CHECK_VERSION(2, 2, 0)
+	gtk_widget_set_can_focus(GTK_WIDGET(mb), FALSE);
+	gtk_widget_set_can_default(GTK_WIDGET(mb), FALSE);
+	gtk_widget_set_receives_default(GTK_WIDGET(mb), FALSE);
+#else
 	GTK_WIDGET_UNSET_FLAGS(mb, GTK_CAN_FOCUS | GTK_CAN_DEFAULT | GTK_RECEIVES_DEFAULT);
+#endif
 	for(i = 0; i < sizeof mb->page / sizeof *mb->page; i++)
 	{
 		mb->pagei.widget = NULL;
@@ -449,7 +453,7 @@
 			od_multibutton_reset_label(mb, index, GTK_LABEL(w), text, bg, fg);
 			if(GTK_WIDGET(mb)->parent)
 				gtk_widget_queue_resize(GTK_WIDGET(mb));
-			if(GTK_WIDGET_DRAWABLE(mb))
+			if(gtk_widget_is_drawable(GTK_WIDGET(mb)))
 				gtk_widget_queue_draw(GTK_WIDGET(mb));
 		}
 	}

gentoo-0.15.6.tar.bz2/src/overwrite.c -> gentoo-0.19.9.tar.gz/src/overwrite.c Changed

@@ -9,8 +9,8 @@
 */
 
 #include "gentoo.h"
-#include "convutil.h"
 #include "dialog.h"
+#include "dirpane.h"
 #include "errors.h"
 #include "strutil.h"
 #include "fileutil.h"
@@ -55,109 +55,78 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-static void get_info(MainInfo *min, gchar *buf, gsize buf_size, const gchar *old_file, const gchar *new_file)
+static OvwRes proceed_file(GFileInfo *fi)
 {
-	gchar		o_date64, n_date64;
-	struct stat	o_st, n_st;
-
-	if((stat(old_file, &o_st) == 0) && (stat(new_file, &n_st) == 0))
-	{
-		gchar	format256;
-		strftime(o_date, sizeof o_date, min->cfg.opt_overwrite.datefmt, localtime(&o_st.st_ctime));
-		strftime(n_date, sizeof n_date, min->cfg.opt_overwrite.datefmt, localtime(&n_st.st_ctime));
-		/* Build formatting string. This is done as an extra step since we need to use
-		 * GLib macros to abstract the exact string, but we want to maintain i18n support.
-		 * This happens at interactive rates, so no point in buffering the format.
-		 */
-		g_snprintf(format, sizeof format,
-				_("\nOld: %%%s bytes, changed on %%s,\n"
-				  "New: %%%s bytes, changed on %%s."), G_GUINT64_FORMAT, G_GUINT64_FORMAT);
-		/* Then try again, plugging in the size and date information. */
-		g_snprintf(buf, buf_size, format,  (guint64) o_st.st_size, o_date,  (guint64) n_st.st_size, n_date);
-	}
+	return g_file_info_get_file_type(fi) == G_FILE_TYPE_DIRECTORY ? OVW_PROCEED_DIR : OVW_PROCEED_FILE;
 }
 
-/* 2001-01-01 -	Attempt to detect recursive overwrites, i.e. cases like copying the directory
-**		"/test" to "/test/a". Incredibly heuristical, this one.
-*/
-static gboolean check_recursion(const gchar *f_new, const gchar *f_old)
+OvwRes ovw_overwrite_unary_file(DirPane *dst, const GFile *dst_file)
 {
-	if(f_new != NULL)
-	{
-		gint	len_old = strlen(f_old), len_new = strlen(f_new);
+	GFileInfo	*fi;
+	OvwRes		res = OVW_PROCEED;
 
-		if(len_old >= len_new && f_oldlen_new == G_DIR_SEPARATOR && strncmp(f_old, f_new, len_new) == 0)
-			return TRUE;
-	}
-	return FALSE;
-}
+	/* If overwrite-checking has not even begun, abort abort. */
+	if(ovw_info.level == 0)
+		return OVW_CANCEL;
 
-static OvwRes proceed(const struct stat *stbuf)
-{
-	return S_ISDIR(stbuf->st_mode) ? OVW_PROCEED_DIR : OVW_PROCEED_FILE;
-}
+	if(dst_file == NULL)
+		return OVW_PROCEED;
 
-/* 2003-11-23 -	Inform the overwrite system that the file whose complete (absolute) name is
-**		in <old_file> is about to be overwritten by <new_file> (if given). Returns:
-**		OVW_SKIP	 Skip this file, but continue with the overall operation.
-**		OVW_PROCEED	 No collision, proceed.
-**		OVW_PROCEED_FILE Collision with file, but proceed anyway.
-**		OVW_PROCEED_DIR	 Collision with directory, but proceed anyway.
-**		OVW_CANCEL	 Abort the entire operation.
-*/
-OvwRes ovw_overwrite_file(MainInfo *min, const gchar *old_file, const gchar *new_file)
-{
-	if(ovw_info.level)
+	if((fi = g_file_query_info((GFile *) dst_file, "standard::*", 0, NULL, NULL)) != NULL)
 	{
-		gchar		bufPATH_MAX + 2048;
+		gchar		bufPATH_MAX + 2048, *dn;
 		gint		dlg_res, len;
-		struct stat	stbuf;
-
-		if(!(ovw_info.flags & OVWF_NO_RECURSE_TEST) && check_recursion(new_file, old_file))
-		{
-			errno = EINVAL;
-			return OVW_CANCEL;
-		}
 
-		err_clear(min);
-		if(lstat(old_file, &stbuf) == 0)
+		if(ovw_info.do_all)			/* Already answered "All"? */
+			res = proceed_file(fi);
+		else if(ovw_info.skip_all)		/* Already answered "Skip All"? */
+			res = OVW_SKIP;
+		else
 		{
-			Conv	conv;
-			gchar	*old_dpl;
-
-			if(ovw_info.do_all)		/* Already answered "All"? */
-				return proceed(&stbuf);
-			if(ovw_info.skip_all)		/* Already answered "Skip All"? */
-				return OVW_SKIP;
-
-			old_dpl = conv_begin_reverse(&conv, old_file);
-			len = g_snprintf(buf, sizeof buf, ovw_info.fmt, old_dpl);
-			conv_end(&conv);
-			if(new_file != NULL && min->cfg.opt_overwrite.show_info)
-				get_info(min, buf + len, sizeof buf - len - 1, old_file, new_file);
+			dn = g_file_get_parse_name((GFile *) dst_file);
+			len = g_snprintf(buf, sizeof buf, ovw_info.fmt, dn);
+			g_free(dn);
 			gtk_label_set_text(GTK_LABEL(ovw_info.label), buf);
 
 			dlg_res = dlg_dialog_sync_wait(ovw_info.dlg);
 			switch(dlg_res)
 			{
-				case DLG_POSITIVE:	/* OK ? */
-					return proceed(&stbuf);
-				case 1:			/* All? */
-					ovw_info.do_all = TRUE;
-					return proceed(&stbuf);
-				case 2:			/* Skip? */
-					return OVW_SKIP;
-				case 3:
-					ovw_info.skip_all = TRUE;
-					return OVW_SKIP;
-				default:
-					return OVW_CANCEL;
+			case DLG_POSITIVE:	/* OK ? */
+				res = proceed_file(fi);
+				break;
+			case 1:			/* All? */
+				ovw_info.do_all = TRUE;
+				res = proceed_file(fi);
+				break;
+			case 2:			/* Skip? */
+				res = OVW_SKIP;
+				break;
+			case 3:
+				ovw_info.skip_all = TRUE;
+				res = OVW_SKIP;
+				break;
+			default:
+				res = OVW_CANCEL;
 			}
 		}
-		err_clear(min);			/* Don't let EEXIST leak out. */
-		return OVW_PROCEED;
+		g_object_unref(fi);
+
+		return res;
+	}
+	return OVW_PROCEED;
+}
+
+OvwRes ovw_overwrite_unary_name(DirPane *dst, const gchar *dst_name)
+{
+	OvwRes	res = OVW_PROCEED;
+	GFile	*file;
+
+	if((file = dp_get_file_from_name(dst, dst_name)) != NULL)
+	{
+		res = ovw_overwrite_unary_file(dst, file);
+		g_object_unref(file);
 	}
-	return OVW_CANCEL;
+	return res;
 }
 
 /* ----------------------------------------------------------------------------------------- */

gentoo-0.15.6.tar.bz2/src/overwrite.h -> gentoo-0.19.9.tar.gz/src/overwrite.h Changed

gentoo-0.15.6.tar.bz2/src/progress.c -> gentoo-0.19.9.tar.gz/src/progress.c Changed

@@ -27,7 +27,7 @@
 static struct {
 	guint		level;		/* Current begin/end nesting level. Keep first!! */
 	guint32		flags;		/* Flags from original progress_begin() call. */
-	gboolean	cancel;		/* Gets set as soon as user clicks the button. */
+	GCancellable	*cancel;	/* This is from the future. */
 	gboolean	show_byte;	/* Show total bytes progress bar? */
 	gboolean	show_item;	/* Show the item bar? */
 	gboolean	delayed;	/* Set to 1 during initial display delay. */
@@ -73,7 +73,7 @@
 	for(iter = slist = dp_get_selection(dp); iter != NULL; iter = g_slist_next(iter), num++)
 	{
 		if(size)
-			*size += (guint64) DP_SEL_LSTAT(iter).st_size;
+			*size += dp_row_get_size(dp_get_tree_model(dp), iter->data);
 	}
 	dp_free_selection(slist);
 	return num;
@@ -94,41 +94,40 @@
 	for(iter = slist = dp_get_selection(dp); iter != NULL; iter = g_slist_next(iter), num++)
 	{
 		if(size)
-			*size += (gsize) DP_SEL_LSTAT(iter).st_size;
-		if(S_ISDIR(DP_SEL_LSTAT(iter).st_mode))
+			*size += dp_row_get_size(dp_get_tree_model(dp), iter->data);
+		if(dp_row_get_file_type(dp_get_tree_model(dp), iter->data, TRUE) == G_FILE_TYPE_DIRECTORY)
 		{
 			FUCount	fu;
+			GFile	*dir;
 
-			if(fut_dir_size(min, dp_full_name(dp, DP_SEL_INDEX(dp, iter)), size, &fu))
+			dir = dp_get_file_from_row(dp, iter->data);
+			if(fut_size_gfile(min, dir, size, &fu, NULL))
 				num += fu.num_total;
+			g_object_unref(dir);
 		}
 	}
 	dp_free_selection(slist);
+
 	return num;
 }
 
 static gint evt_delete(GtkWidget *wid, GdkEvent *evt, gpointer user)
 {
-	*(gboolean *) user = TRUE;
-	errno = EINTR;
+	g_cancellable_cancel(user);
 	return TRUE;
 }
 
 /* 1998-09-30 -	A callback for the big "Cancel" button. */
 static gint evt_cancel_clicked(GtkWidget *wid, gpointer user)
 {
-	*(gboolean *) user = TRUE;
-	errno = EINTR;
+	g_cancellable_cancel(user);
 	return TRUE;
 }
 
 static gint evt_keypress(GtkWidget *wid, GdkEventKey *evt, gpointer user)
 {
 	if(evt->keyval == GDK_Escape)
-	{
-		*(gboolean *) user = TRUE;
-		errno = EINTR;
-	}
+		g_cancellable_cancel(user);
 	return TRUE;
 }
 
@@ -146,7 +145,6 @@
 			flags &= PFLG_BUSY_MODE;	/* Clear any other flag. */
 
 		pgs_info.flags	    = flags;
-		pgs_info.cancel	    = FALSE;
 		pgs_info.show_byte  = (flags & PFLG_BYTE_VISIBLE) ? TRUE : FALSE;
 		pgs_info.show_item  = (flags & PFLG_ITEM_VISIBLE) ? TRUE : FALSE;
 		pgs_info.delayed    = TRUE;
@@ -154,6 +152,11 @@
 		pgs_info.byte_pos   = 0;
 		pgs_info.last_secs  = 0U;
 
+		if(pgs_info.cancel == NULL)
+			pgs_info.cancel = g_cancellable_new();
+		else
+			g_cancellable_reset(pgs_info.cancel);
+
 		if(flags & PFLG_COUNT_RECURSIVE)
 			pgs_info.tot_num = count_recursive_selected(min, &pgs_info.byte_tot);
 		else
@@ -164,17 +167,15 @@
 		pgs_info.dlg  = gtk_dialog_new();
 		gtk_widget_set_size_request(pgs_info.dlg, 384, -1);
 		pgs_info.body = gtk_label_new(op_name);
-		g_signal_connect(G_OBJECT(pgs_info.dlg), "delete_event", G_CALLBACK(evt_delete), &pgs_info.cancel);
-		g_signal_connect(G_OBJECT(pgs_info.dlg), "key_press_event", G_CALLBACK(evt_keypress), &pgs_info.cancel);
+		g_signal_connect(G_OBJECT(pgs_info.dlg), "delete_event", G_CALLBACK(evt_delete), pgs_info.cancel);
+		g_signal_connect(G_OBJECT(pgs_info.dlg), "key_press_event", G_CALLBACK(evt_keypress), pgs_info.cancel);
 		gtk_box_pack_start(GTK_BOX(GTK_DIALOG(pgs_info.dlg)->vbox), pgs_info.body, FALSE, FALSE, 0);
 
 		hbox = gtk_hbox_new(FALSE, 0);
 		pgs_info.tot_pgs = gtk_progress_bar_new();
 		if(flags & PFLG_BUSY_MODE)
 		{
-			gtk_progress_set_activity_mode(GTK_PROGRESS(pgs_info.tot_pgs), TRUE);
-			gtk_progress_bar_set_activity_step(GTK_PROGRESS_BAR(pgs_info.tot_pgs), 3);
-			gtk_progress_bar_set_activity_blocks(GTK_PROGRESS_BAR(pgs_info.tot_pgs), 10);
+			gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(pgs_info.tot_pgs), 1.f / 10.f);
 			gtk_box_pack_start(GTK_BOX(hbox), pgs_info.tot_pgs, TRUE, TRUE, 0);
 		}
 		else
@@ -186,12 +187,12 @@
 			label = gtk_label_new(buf);
 			gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 5);
 		}
-		gtk_progress_bar_update(GTK_PROGRESS_BAR(pgs_info.tot_pgs), 0.0f);
+		gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pgs_info.tot_pgs), 0.f);
 		gtk_box_pack_start(GTK_BOX(GTK_DIALOG(pgs_info.dlg)->vbox), hbox, FALSE, FALSE, 0);
 
 		if(pgs_info.show_byte)
 		{
-			sze_put_size64(size_buf, sizeof size_buf, pgs_info.byte_tot, SZE_AUTO);
+			sze_put_offset(size_buf, sizeof size_buf, pgs_info.byte_tot, SZE_AUTO, 3, ',');
 			g_snprintf(buf, sizeof buf, _("Total (%s)"), size_buf);
 			label = gtk_label_new(buf);
 			gtk_box_pack_start(GTK_BOX(GTK_DIALOG(pgs_info.dlg)->vbox), label, FALSE, FALSE, 0);
@@ -206,7 +207,7 @@
 			hbox = gtk_hbox_new(FALSE, 0);
 			pgs_info.item_pgs = gtk_progress_bar_new();
 			gtk_box_pack_start(GTK_BOX(hbox), pgs_info.item_pgs, TRUE, TRUE, 0);
-			gtk_progress_bar_update(GTK_PROGRESS_BAR(pgs_info.item_pgs), 0.0f);
+			gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pgs_info.item_pgs), 0.f);
 			gtk_box_pack_start(GTK_BOX(GTK_DIALOG(pgs_info.dlg)->vbox), hbox, FALSE, FALSE, 0);
 		}
 		if(!(flags & PFLG_BUSY_MODE))
@@ -217,7 +218,7 @@
 		else
 			pgs_info.eta = NULL;
 		cancel = gtk_button_new_with_label(_("Cancel"));
-		g_signal_connect(G_OBJECT(cancel), "clicked", G_CALLBACK(evt_cancel_clicked), &pgs_info.cancel);
+		g_signal_connect(G_OBJECT(cancel), "clicked", G_CALLBACK(evt_cancel_clicked), pgs_info.cancel);
 		gtk_box_pack_start(GTK_BOX(GTK_DIALOG(pgs_info.dlg)->action_area), cancel, TRUE, TRUE, 0);
 
 		g_get_current_time(&pgs_info.time_begin);
@@ -227,6 +228,11 @@
 	pgs_info.level++;
 }
 
+GCancellable * pgs_progress_get_cancellable(void)
+{
+	return pgs_info.cancel;
+}
+
 /* 1998-09-30 -	End a progress-reporting session. Closes down the dialog box. */
 void pgs_progress_end(MainInfo *min)
 {
@@ -244,21 +250,7 @@
 void pgs_progress_item_begin(MainInfo *min, const gchar *name, off_t size)
 {
 	if(pgs_info.flags & PFLG_BUSY_MODE)
-	{
-		GtkAdjustment	*adj;
-		gfloat		val;
-		static gint	scale = 10;
-
-		if(!--scale)
-		{
-			adj = GTK_PROGRESS(pgs_info.tot_pgs)->adjustment;
-			val = adj->value + 1;
-			if(val > adj->upper)
-				val = adj->lower;
-			gtk_progress_bar_update(GTK_PROGRESS_BAR(pgs_info.tot_pgs), val);
-			scale = 10;
-		}
-	}
+		gtk_progress_bar_pulse(GTK_PROGRESS_BAR(pgs_info.tot_pgs));
 	else
 		pgs_info.tot_pos++;
 
@@ -268,7 +260,7 @@
 	{
 		gchar	size_buf32, bufFILENAME_MAX + 32;
 
-		sze_put_size64(size_buf, sizeof size_buf, size, SZE_AUTO);
+		sze_put_offset(size_buf, sizeof size_buf, size, SZE_AUTO, 3, ',');
 		g_snprintf(buf, sizeof buf, "%s (%s)", name, size_buf);
 		gtk_label_set_text(GTK_LABEL(pgs_info.item), buf);
 	}
@@ -284,8 +276,6 @@
 
 	if(pgs_info.dlg != NULL)
 	{
-		gint	old_errno = errno;
-
 		g_get_current_time(&time_now);
 		if(pgs_info.delayed)
 		{
@@ -311,7 +301,7 @@
 					pgs_info.last_secs = secs;
 					spd = (pgs_info.byte_pos + pos) / secs;
 					eta = (pgs_info.byte_tot - (pgs_info.byte_pos + pos)) / spd;
-					sze_put_size(spdbuf, sizeof spdbuf, spd, SZE_AUTO);
+					sze_put_offset(spdbuf, sizeof spdbuf, spd, SZE_AUTO, 3, ',');
 					g_snprintf(buf, sizeof buf, _("Elapsed %02d:%02d  Speed %s/s  ETA %02u:%02u"),
 						pgs_info.last_secs / 60, pgs_info.last_secs % 60, spdbuf,
 						eta / 60, eta % 60);
@@ -323,12 +313,11 @@
 			gtk_widget_show_all(pgs_info.dlg);
 		}
 		if(pgs_info.show_byte && pgs_info.byte_tot)
-			gtk_progress_bar_update(GTK_PROGRESS_BAR(pgs_info.byte_pgs), (gfloat) (pgs_info.byte_pos + pos) / pgs_info.byte_tot);
+			gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pgs_info.byte_pgs), (gfloat) (pgs_info.byte_pos + pos) / pgs_info.byte_tot);
 		if(pgs_info.show_item && pgs_info.item_size)
-			gtk_progress_bar_update(GTK_PROGRESS_BAR(pgs_info.item_pgs), (gfloat) pos / pgs_info.item_size);
+			gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pgs_info.item_pgs), (gfloat) pos / pgs_info.item_size);
 		gui_events_flush();
-		errno = old_errno;
-		if(pgs_info.cancel)
+		if(g_cancellable_is_cancelled(pgs_info.cancel))
 			return PGS_CANCEL;
 	}
 	return PGS_PROCEED;
@@ -337,11 +326,8 @@
 /* 1998-09-30 -	Done with an item. */
 void pgs_progress_item_end(MainInfo *min)
 {
-	gint	old_errno = errno;
-
 	pgs_info.byte_pos += pgs_info.item_size;
-	gtk_progress_bar_update(GTK_PROGRESS_BAR(pgs_info.tot_pgs), (gfloat) pgs_info.tot_pos / pgs_info.tot_num);
-	gui_events_flush();
 
-	errno = old_errno;
+	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pgs_info.tot_pgs), (gfloat) pgs_info.tot_pos / pgs_info.tot_num);
+	gui_events_flush();
 }

gentoo-0.15.6.tar.bz2/src/progress.h -> gentoo-0.19.9.tar.gz/src/progress.h Changed

@@ -7,10 +7,12 @@
 
 typedef enum { PGS_CANCEL, PGS_PROCEED } PgsRes;
 
-#define	PFLG_COUNT_RECURSIVE	(1<<0)	/* Count # of items recursively? */
-#define	PFLG_ITEM_VISIBLE	(1<<1)	/* Display progress for individual items? */
-#define	PFLG_BYTE_VISIBLE	(1<<2)	/* Display total byte progress? */
-#define	PFLG_BUSY_MODE		(1<<10)	/* Just indicate "busyness", no direct filesystem coupling. */
+enum {
+	PFLG_COUNT_RECURSIVE	= (1<<0),	/* Count # of items recursively? */
+	PFLG_ITEM_VISIBLE	= (1<<1),	/* Display progress for individual items? */
+	PFLG_BYTE_VISIBLE	= (1<<2),	/* Display total byte progress? */
+	PFLG_BUSY_MODE		= (1<<10)	/* Just indicate "busyness", no direct filesystem coupling. */
+};
 
 /* ----------------------------------------------------------------------------------------- */
 
@@ -19,6 +21,8 @@
 */
 extern void	pgs_progress_begin(MainInfo *min, const gchar *op_name, guint32 flags);
 
+extern GCancellable *	pgs_progress_get_cancellable(void);
+
 /* Use these three calls to report the progress of each item. */
 extern void	pgs_progress_item_begin(MainInfo *min, const gchar *name, off_t size);
 extern PgsRes	pgs_progress_item_update(MainInfo *min, off_t pos);

gentoo-0.15.6.tar.bz2/src/queue.c -> gentoo-0.19.9.tar.gz/src/queue.c Changed

gentoo-0.15.6.tar.bz2/src/sizeutil.c -> gentoo-0.19.9.tar.gz/src/sizeutil.c Changed

@@ -11,6 +11,7 @@
 #include "gentoo.h"
 
 #include <ctype.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -20,219 +21,200 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* An array of named multipliers, used for different units. Keep sorted on name, since
-** we use a binary-search when querying it (hmm, file that under "software engineering:
-** overkills, blatant and obvious", I guess).
-*/
-static struct UnitInfo {
-	const gchar	*name;
+/* Information about the various units we support. Note that the "config" names are slighly legacy. */
+static const struct {
+	const gchar	*unit;
+	const gchar	*config;
+	const gchar	*label;
 	gdouble		multiplier;
-} unit_info = { { N_("BYTES"), 1.0},
-		  { N_("GB"), (gdouble) (1 << 30) },
-		  { N_("KB"), (gdouble) (1 << 10) },
-		  { N_("MB"), (gdouble) (1 << 20) }
-		};
-
-/* An array of pre-built formatting strings. We use these since the exact g_snprintf()
-** format specifier needed for 64-bit numbers is a compile-time constant, so we can't
-** just write it in the source. It's G_GUINT64_FORMAT. We therefore use an extra step
-** during the sze_initialize() call, to build the actual run-time formatting strings.
-** It's all very meta. The size here is exaggerated, for translation.
-*/
-static struct
-{
-	gchar	none24;
-	gchar	bytes24;
-	gchar	kb24;
-	gchar	mb24;
-	gchar	gb24;
-} size_format;
-
-static gdouble get_multiplier(const gchar *unit);
+} sze_unit_info = {
+		{ "", "native", N_("Unformatted Size"), 1 },
+		{ "", "bytesnounit", N_("Formatted Size, Without Unit") },
+		{ N_("bytes"), "bytes", N_("Formatted Size, in Bytes"), 1 },
+		{ N_("KB"), "kilobytes", N_("Formatted Size, in Kilobytes"), 1024.0 },
+		{ N_("MB"), "megabytes", N_("Formatted Size, in Megabytes"), 1024.0 * 1024.0 },
+		{ N_("GB"), "gigabytes", N_("Formatted Size, in Gigabytes"), 1024.0 * 1024.0 * 1024.0 },
+		{ N_("TB"), "tb", N_("Formatted Size, in Terabytes"), 1024.0 * 1024.0 * 1024.0 * 1024.0 },
+		{ "", "smart", N_("Formatted Size, Automatic Unit"), -1.0 }
+	};
 
 /* ----------------------------------------------------------------------------------------- */
 
-static gint comp_ui(gconstpointer a, gconstpointer b)
+const gchar * sze_get_unit_label(SzUnit unit)
 {
-	return strcoll(((const struct UnitInfo *) a)->name, ((const struct UnitInfo *) b)->name);
+	return sze_unit_infounit.label;
 }
 
-/* 2000-07-02 -	Initialize unit_info, by translating it and then sorting it. */
-void sze_initialize(void)
+/* 2010-09-22 -	Given a SzUnit, this returns a unique symbolic name. This name is intended for
+**		use when externally representing the SzUnit, i.e. in a configuration file.
+*/
+const gchar * sze_get_unit_config_name(SzUnit unit)
 {
-	guint	i;
-
-	for(i = 0; i < sizeof unit_info / sizeof unit_info0; i++)
-		unit_infoi.name = _(unit_infoi.name);
-	qsort(unit_info, sizeof unit_info / sizeof unit_info0, sizeof unit_info0, comp_ui);
-
-	g_snprintf(size_format.none, sizeof size_format.none, _("%%%s"), G_GUINT64_FORMAT);
-	g_snprintf(size_format.bytes, sizeof size_format.bytes, _("%%%s bytes"), G_GUINT64_FORMAT);
-	g_snprintf(size_format.kb, sizeof size_format.kb, _("%%%s KB"), G_GUINT64_FORMAT);
-	g_snprintf(size_format.mb, sizeof size_format.mb, _("%%%s MB"), G_GUINT64_FORMAT);
-	g_snprintf(size_format.gb, sizeof size_format.gb, _("%%%s GB"), G_GUINT64_FORMAT);
+	return sze_unit_infounit.config;
 }
 
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1998-09-01 -	Initialize a binary search for the multiplier associated with the given
-**		unit name.
+/* 2010-09-22 -	Parse a config name as returned by sze_get_unit_config_name(), and return the
+**		corresponding SzeUnit. If the name is unknown, SZE_NONE is returned.
 */
-static gdouble get_multiplier(const gchar *unit)
+SzUnit sze_parse_unit_config_name(const gchar *name)
 {
-	struct UnitInfo	*ui;
+	size_t	i;
 
-	ui = bsearch(&unit, unit_info, sizeof unit_info / sizeof *unit_info, sizeof *unit_info, comp_ui);
-	return ui ? ui->multiplier : -1;
+	for(i = 0; i < sizeof sze_unit_info / sizeof *sze_unit_info; i++)
+	{
+		if(strcmp(sze_unit_infoi.config, name) == 0)
+			return (SzUnit) i;
+	}
+	return SZE_NONE;
 }
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1998-08-31 -	Attempt to parse a size from the string beginning at <buf>. Parsing rules:
-**		* Initial whitespace is ignored.
-**		* The first thing that can be parsed as a positive number will be. Floating
-**		  point notation is (somewhat) understood.
-**		* After the number, a unit can appear, optionally prefixed by whitespace.
-**		  Legal units are: bytes, KB (1024 bytes), MB (1024^2 bytes) and GB (1024^3).
-**		  If no unit appears, bytes (multiplier=1) is assumed. Unknown units are ignored.
+/* 2010-09-22 -	Skip characters at <s> while <classifier> returns TRUE. */
+static const gchar * utf8_skip_class(const gchar *s, gboolean (*classifier)(gunichar ch))
+{
+	while(*s)
+	{
+		const gunichar	here = g_utf8_get_char(s);
+		if(!classifier(here))
+			return s;
+		s = g_utf8_next_char(s);
+	}
+	return s;
+}
+
+/* 2010-09-22 -	Attempt to parse an offset from string at <buf>. The string can be UTF-8.
+**		* Leading spaces are stripped.
+**		* A trailing unit from the set of units supported by this module can appear.
 */
-gsize sze_get_size(const gchar *buf)
+goffset sze_get_offset(const gchar *buf)
 {
-	gchar	unit16;
-	gdouble	ipart = 0.0f, fpart = 0.0f, weight = 0.1f, num, mult = 1.0f;
+	gunichar	here;
 
-	while(isspace((guchar) *buf))
-		buf++;
+	buf = utf8_skip_class(buf, g_unichar_isspace);
 
-	if(isdigit((guchar) *buf))
+	here = g_utf8_get_char(buf);
+	if(g_ascii_isdigit(here))
 	{
-		while(isdigit((guchar) *buf))
-		{
-			ipart *= 10.0f;
-			ipart += *buf - '0';
-			buf++;
-		}
-		if(*buf == '.')
-		{
-			for(buf++; isdigit((guchar) *buf); buf++, weight /= 10.0f)
-				fpart += (*buf - '0') * weight;
-		}
-		num = ipart + fpart;
-		while(isspace((guchar) *buf))
-			buf++;
-		if(sscanf(buf, "%8s", unit) == 1)
+		gchar		*end = NULL;
+		const gdouble	value = strtod(buf, &end);
+		gdouble		multiplier = 1;
+
+		if(end > buf)
 		{
-			g_strup(unit);
-			if((mult = get_multiplier(unit)) < 0)
-				mult = 1.0f;
+			gchar		ubuf32;
+			const gchar	*unit = utf8_skip_class(end, g_unichar_isspace);
+			const gchar	*uend = utf8_skip_class(unit, g_unichar_isalpha);
+			const gsize	len = uend - unit;
+
+			/* Any unit found? */
+			if(uend > unit && len < sizeof ubuf - 1)
+			{
+				gsize	i;
+
+				memcpy(ubuf, unit, len);
+				ubuflen = '\0';
+				for(i = 0; i < SZE_NUM_UNITS; i++)
+				{
+					if(strcmp(_(sze_unit_infoi.unit), unit) == 0)
+					{
+						multiplier = sze_unit_infoi.multiplier;
+						break;
+					}
+				}
+			}
+			else if(len >= sizeof ubuf)
+				g_warning("Unable to parse unit at '%s', too long", unit);
 		}
-		return (gsize) mult * num;
+		return value * multiplier;
 	}
-	return (gsize) -1;
+	return -1;
 }
 
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1998-09-01 -	Output the given <size> as a string in <buf>, using no more than <buf_max>
-**		bytes to do so. The <unit> controls which unit will be appended to the number.
-**		It should be one of:
-**		SZE_NONE	No unit is appended. Function degenerates into snprintf().
-**		SZE_BYTES	The unit will be "bytes".
-**		SZE_KB		Unit is "KB"; divides the size down by 1024. 4711 => "4.60 KB".
-**		SZE_MB		Megabytes, divisor is 1024 squared.
-**		SZE_GB		Gigabytes, using a divisor of 1024 cubed.
-**		SZE_AUTO	Automatic unit selection; uses heuristics to determine which
-**				unit works "best". Avoids "0.87 GB", digs "890.08 MB".
-**		This function returns the number of characters written to <buf>, not including
-**		the terminating '\0'-character.
+/* 2010-08-08 -	Format an offset, which the is native type used in GIO for file sizes. Since it's
+**		pretty much guaranteed to be 64 bits, it's all we need. We pretend it's unsigned.
 */
-guint sze_put_size(gchar *buf, gsize buf_max, off_t size, SzUnit unit)
+gint sze_put_offset(gchar *buf, gsize buf_max, goffset value, SzUnit unit, guint precision, gchar tick)
 {
-	const gchar	*fmt = NULL;
+	gchar		tmp32, *fsize, *funit = "";
 	gdouble		temp = 0.0;
+	static gchar	fmt16;
+	static guint	fmt_precision = 0, fmt_tick = 0;
 
-	switch(unit)
+	/* Check if we need to re-format the formatting string. Quite meta. */
+	if(precision != fmt_precision || tick != (gchar) fmt_tick)
 	{
-		case SZE_NONE:
-			return g_snprintf(buf, buf_max, size_format.none, (guint64) size);
-		case SZE_BYTES:
-			return g_snprintf(buf, buf_max, size_format.bytes, (guint64) size);
-		case SZE_KB:
-			if((size & ((1 << 10) - 1)) == 0)
-				return g_snprintf(buf, buf_max, size_format.kb, (guint64) size >> 10);
-			temp = (gdouble) size / (1 << 10);
-			fmt  = _("%.2f KB");
-			break;
-		case SZE_MB:
-			if((size & ((1 << 20) - 1)) == 0)
-				return g_snprintf(buf, buf_max, size_format.mb, (guint64) size >> 20);
-			temp = (gdouble) size / (1 << 20);
-			fmt  = _("%.2f MB");
-			break;
-		case SZE_GB:
-			if((size & ((1 << 30) - 1)) == 0)
-				return g_snprintf(buf, buf_max, size_format.gb, (guint64) size >> 30);
-			temp = (gdouble) size / (1 << 30);
-			fmt  = _("%.2f GB");
-			break;
-		case SZE_AUTO:
-			if(size < (1 << 10))
-				return sze_put_size(buf, buf_max, size, SZE_BYTES);
-			else if(size < (1 << 20))
-				return sze_put_size(buf, buf_max, size, SZE_KB);
-			else if(size < (1 << 30))
-				return sze_put_size(buf, buf_max, size, SZE_MB);
-			else
-				return sze_put_size(buf, buf_max, size, SZE_GB);
+		g_snprintf(fmt, sizeof fmt, "%%.%uf %%s", precision);
+		fmt_precision = precision;
+		fmt_tick = tick;
 	}
-	if(fmt != NULL)
-		return g_snprintf(buf, buf_max, fmt, temp);
-	return 0U;
-}
-
-/* 1999-05-09 -	A version of the above that deals explicitly with 64-bit sizes. Handy
-**		for the total selection, file system free bytes, and stuff.
-*/
-guint sze_put_size64(gchar *buf, gsize buf_max, guint64 size, SzUnit unit)
-{
-	const gchar	*fmt = NULL;
-	gdouble		temp = 0.0;
 
 	switch(unit)
 	{
 		case SZE_NONE:
-			return g_snprintf(buf, buf_max, size_format.none, size);
+			return g_snprintf(buf, buf_max, "%" G_GUINT64_FORMAT, value);
+		case SZE_BYTES_NO_UNIT:
+			break;
 		case SZE_BYTES:
-			return g_snprintf(buf, buf_max, size_format.bytes, size);
+			funit = _("bytes");
+			break;
 		case SZE_KB:
-			if((size & ((G_GINT64_CONSTANT(1) << 10) - 1)) == 0)
-				return g_snprintf(buf, buf_max, size_format.kb, size >> 10);
-			temp = (gdouble) size / (G_GINT64_CONSTANT(1) << 10);
-			fmt  = _("%.2f KB");
+			temp = value / 1024.0;
+			funit = _("KB");
 			break;
 		case SZE_MB:
-			if((size & ((G_GINT64_CONSTANT(1) << 20) - 1)) == 0)
-				return g_snprintf(buf, buf_max, size_format.mb, size >> 20);
-			temp = (gdouble) size / (G_GINT64_CONSTANT(1) << 20);
-			fmt  = _("%.2f MB");
+			temp = value / (1024.0 * 1024.0);
+			funit = _("MB");
 			break;
 		case SZE_GB:
-			if((size & ((G_GINT64_CONSTANT(1) << 30) - 1)) == 0)
-				return g_snprintf(buf, buf_max, size_format.gb, size >> 30);
-			temp = (gdouble) size / (G_GINT64_CONSTANT(1) << 30);
-			fmt  = _("%.2f GB");
+			temp = value / (1024.0 * 1024.0 * 1024.0);
+			funit = _("GB");
+			break;
+		case SZE_TB:
+			temp = value / (1024.0 * 1024.0 * 1024.0 * 1024.0);
+			funit = _("TB");
 			break;
 		case SZE_AUTO:
-			if(size < (G_GINT64_CONSTANT(1) << 10))
-				return sze_put_size64(buf, buf_max, size, SZE_BYTES);
-			else if(size < (G_GINT64_CONSTANT(1) << 20))
-				return sze_put_size64(buf, buf_max, size, SZE_KB);
-			else if(size < (G_GINT64_CONSTANT(1) << 30))
-				return sze_put_size64(buf, buf_max, size, SZE_MB);
-			else
-				return sze_put_size64(buf, buf_max, size, SZE_GB);
+			if(value < (1 << 10))
+				return sze_put_offset(buf, buf_max, value, SZE_BYTES, precision, tick);
+			else if(value < (G_GINT64_CONSTANT(1) << 20))
+				return sze_put_offset(buf, buf_max, value, SZE_KB, precision, tick);
+			else if(value < (G_GINT64_CONSTANT(1) << 30))
+				return sze_put_offset(buf, buf_max, value, SZE_MB, precision, tick);
+			else if(value < (G_GINT64_CONSTANT(1) << 40))
+				return sze_put_offset(buf, buf_max, value, SZE_GB, precision, tick);
+			return sze_put_offset(buf, buf_max, value, SZE_TB, precision, tick);
+		default:
+			return 0;
+	}
+
+	/* Nothing in the temporary double? Then just use value as-is. */
+	if(temp == 0.0)
+	{
+		tmpsizeof tmp - 1 = '\0';
+		fsize = stu_tickify(tmp + sizeof tmp - 1, value, tick);
+		return g_snprintf(buf, buf_max, "%s %s", fsize, funit);
+	}
+	/* Now format the floating point version using both ticks and user's precision. Not, eh, super fast. */
+	if(tick != 0)
+	{
+		gchar		tmp232;
+		gdouble		fraction;
+		const gdouble	scale = pow(10, precision);
+
+		/* Round the floating point version to the desired precision. */
+		temp *= scale;
+		temp += 0.5;
+		temp = (gint) temp;
+		temp /= scale;
+
+		/* Now split into integer and fraction parts, so we can format properly. */
+		fraction = modf(temp, &temp);
+		tmpsizeof tmp - 1 = '\0';
+		fsize = stu_tickify(tmp + sizeof tmp - 1, (long) temp, tick);
+		/* Format fraction+unit. */
+		g_snprintf(tmp2, sizeof tmp2, fmt, fraction, funit);
+		return g_snprintf(buf, buf_max, "%s%s", fsize, tmp2 + 1);	/* Skip the parts before the decimal point. */
 	}
-	if(fmt != NULL)
-		return g_snprintf(buf, buf_max, fmt, temp);
-	return 0U;
+	return g_snprintf(buf, buf_max, fmt, temp, funit);
 }

gentoo-0.15.6.tar.bz2/src/sizeutil.h -> gentoo-0.19.9.tar.gz/src/sizeutil.h Changed

@@ -5,12 +5,21 @@
 #if !defined SIZEUTIL_H
 #define	SIZEUTIL_H
 
-typedef enum { SZE_NONE, SZE_BYTES, SZE_KB, SZE_MB, SZE_GB, SZE_AUTO } SzUnit;
+/* This enum must be 1:1 with the integers from 0..(SZE_NUM_UNITS-1), to simplify life elsewhere. */
+typedef enum {
+	SZE_NONE, SZE_BYTES_NO_UNIT, SZE_BYTES,
+	SZE_KB, SZE_MB, SZE_GB, SZE_TB, SZE_AUTO,
+	SZE_NUM_UNITS
+} SzUnit;
 
 extern void	sze_initialize(void);
 
-extern gsize	sze_get_size(const gchar *buf);
-extern guint	sze_put_size(gchar *buf, gsize buf_max, off_t size, SzUnit unit);
-extern guint	sze_put_size64(gchar *buf, gsize buf_max, guint64 size, SzUnit unit);
+extern const gchar *	sze_get_unit_label(SzUnit unit);
+
+extern const gchar *	sze_get_unit_config_name(SzUnit unit);
+extern SzUnit		sze_parse_unit_config_name(const gchar *name);
+
+extern goffset		sze_get_offset(const gchar *buf);
+extern gint		sze_put_offset(gchar *buf, gsize buf_max, goffset offset, SzUnit unit, guint precision, gchar tick);
 
 #endif		/* SIZEUTIL_H */

gentoo-0.15.6.tar.bz2/src/strutil.c -> gentoo-0.19.9.tar.gz/src/strutil.c Changed

@@ -18,31 +18,6 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1998-08-02 -	Copy at most <n> bytes from <src> to <dst>, including the terminating
-**		'\0'-byte. If <src> is longer than <n-1>, it will be truncated with a
-**		'\0'-byte at position n-1. Example: stu_strncpy(b, "string", 1) would
-**		put a '\0'-byte at b0 and return. Basically, think of the <n> as a
-**		limiter on the number of bytes at <dst> we're allowed to touch, and
-**		then fit a string-copying idea on top of that. :^) Works for me, and a
-**		lot better than the standard strncpy(), too. Returns <dst>.
-*/
-gchar * stu_strncpy(gchar *dst, const gchar *src, gssize n)
-{
-	gchar	*ret = dst;
-
-	if(dst && !src && n)
-		*dst = '\0';
-	else if(dst && src && (n >= 1))
-	{
-		for(n--; n > 0 && *src != '\0'; n--)
-			*dst++ = *src++;
-		*dst = '\0';
-	}
-	return ret;
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
 /* 2002-04-28 -	Create a textual representation of <n>, with <tick> inserted every
 **		3rd digit (counting from the right) into <buf>. Returns pointer to
 **		first digit.
@@ -66,39 +41,6 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1999-09-11 -	Return pointer to first occurance of <c> in <str>, disregarding case.
-**		If <c> cannot be found, NULL is returned. The string is not modified.
-*/
-const gchar * stu_strcasechr(const gchar *str, gchar c)
-{
-	for(c = toupper((guchar) c); *str; str++)
-	{
-		if(toupper((guchar) *str) == c)
-			return str;
-	}
-	return NULL;
-}
-
-/* 1998-09-06 -	This function has a silly name. It is used to get a pointer to the
-**		last occurance of the character <c> in the string <str>, ignoring case.
-**		It returns such a pointer, or NULL if <c> doesn't appear in <str>. The
-**		string being searched is not modified.
-*/
-const gchar * stu_strcaserchr(const gchar *str, gchar c)
-{
-	const gchar	*ptr;
-	gsize		len;
-
-	if((len = strlen(str)) == 0)
-		return NULL;
-
-	for(c = toupper((guchar) c), ptr = str + len - 1; ptr >= str; ptr--)
-		if(toupper((guchar) *ptr) == c)
-			return ptr;
-
-	return NULL;
-}
-
 /* 1998-08-02 -	Check if <string> ends with the suffix <suffix>. Note that this is fairly
 **		general; it does not assume (or require) <suffix> to begin with a period
 **		or any some such. If you want it to, include the period yourself. Returns
@@ -420,3 +362,136 @@
 	}
 	return str->str;
 }
+
+/* ----------------------------------------------------------------------------------------- */
+
+/* 2009-10-11 -	Do a simple "search and replace", on a single input string. The text in <find>
+**		is searched for, and replaced with <replace>. If <global>, all instances are
+**		replaced, otherwise only the first.
+**
+**		Note: All strings are assumed to be UTF-8 encoded.
+**		Example: input="fr�knar �r inte �ckligt", find="�", replace="e"
+*/
+guint stu_replace_simple(GString *output, const gchar *input, const gchar *find, const gchar *replace, gboolean global, gboolean nocase)
+{
+	gboolean	busy;
+	gsize		flen;
+	guint		count = 0;
+
+	if(output == NULL || input == NULL || find == NULL || replace == NULL)
+		return count;
+
+	/* Make sure output is clean. */
+	g_string_truncate(output, 0);
+	flen = strlen(find);
+
+	do
+	{
+		gchar	*hit;
+
+		/* Plain old strstr() works on UTF-8. */
+		if((hit = strstr(input, find)) != NULL)
+		{
+			gsize	pfx = hit - input;
+			g_string_append_len(output, input, pfx);
+			input += flen + pfx;
+			g_string_append(output, replace);
+			busy = global;
+			count += 1;
+		}
+		else
+			busy = FALSE;
+	} while(busy);
+	/* There might be a trailing tail, here. */
+	g_string_append(output, input);
+
+	return count;
+}
+
+/* ----------------------------------------------------------------------------------------- */
+
+/* 2010-03-07 -	Tries to look up a character in the given string, by calling the filtering function for each
+**		character. If the function returns true, a pointer to the character is returned, else NULL.
+*/
+const gchar * stu_utf8_find(const gchar *string, gboolean (*function)(gunichar ch, gpointer user), gpointer user)
+{
+	if(string == NULL || function == NULL)
+		return NULL;
+
+	while(*string != '\0')
+	{
+		gunichar	here = g_utf8_get_char(string);
+
+		if(function(here, user))
+			return string;
+		string = g_utf8_next_char(string);
+	}
+	return NULL;
+}
+
+/* ----------------------------------------------------------------------------------------- */
+
+/* 2010-12-03 -	Interpolate things looking like "{this}" by replacing with the value of the key "this" from
+**		the dictionary. Fun for the whole family. To get an explicit brace, escape with backslash
+**		(which has the power to escape anything, for simplicity).
+*/
+gboolean stu_interpolate_dictionary(gchar *out, gsize size, const gchar *format, const GHashTable *dictionary)
+{
+	gchar		key32, *kput = NULL, *obase = out, here, *out_end;
+	gboolean	in_key = FALSE;
+	gconstpointer	value;
+
+	/* A NULL dictionary can be okay, but not if it's referenced. Lazy. */
+	if(out == NULL || size <= 1 || format == NULL)
+		return FALSE;
+
+	out_end = out + size - 1;
+	while((here = *format++) != '\0' && out < out_end)
+	{
+		if(in_key)
+		{
+			if(here == '}')
+			{
+				*kput = '\0';
+				/* If we got this far without a hash, fail. */
+				if(!dictionary)
+					return FALSE;
+				if((value = g_hash_table_lookup((GHashTable *) dictionary, key)) != NULL)
+				{
+					const gsize	vlen = strlen(value);
+
+					if(vlen <= (out_end - out))
+					{
+						strcpy(out, value);
+						out += vlen;
+					}
+				}
+				in_key = FALSE;
+			}
+			else if(kput < (key + sizeof key - 1))	/* Silently drop overflowing key characters. */
+				*kput++ = here;
+			continue;
+		}
+		else if(here == '{')
+		{
+			kput = key;
+			in_key = TRUE;
+			continue;
+		}
+		else if(here == '\\')
+		{
+			if(*format != '\0')
+			{
+				*out++ = *format;
+				format++;
+				continue;
+			}
+			else
+				break;
+		}
+		*out++ = here;
+	}
+	*out = '\0';
+
+	return TRUE;
+}

gentoo-0.15.6.tar.bz2/src/strutil.h -> gentoo-0.19.9.tar.gz/src/strutil.h Changed

@@ -12,12 +12,8 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-extern gchar *		stu_strncpy(gchar *dst, const gchar *src, gssize n);
-
 extern gchar *		stu_tickify(gchar *buf, guint64 n, gchar tick);
 
-extern const gchar *	stu_strcasechr(const gchar *str, gchar c);
-extern const gchar *	stu_strcaserchr(const gchar *str, gchar c);
 extern gboolean		stu_has_suffix(const gchar *string, const char *suffix);
 
 extern gint		stu_strcmp_vector(const gchar *string, const gchar **vector, gsize vector_size, gint def);
@@ -33,3 +29,9 @@
 extern gchar **		stu_split_args(const char *argstring);
 
 extern const gchar *	stu_escape(const gchar *string);
+
+extern guint		stu_replace_simple(GString *output, const gchar *input, const gchar *find, const gchar *replace, gboolean global, gboolean nocase);
+
+extern const gchar *	stu_utf8_find(const gchar *string, gboolean (*function)(gunichar ch, gpointer user), gpointer user);
+
+extern gboolean		stu_interpolate_dictionary(gchar *output, gsize size, const gchar *format, const GHashTable *dictionary);

gentoo-0.15.6.tar.bz2/src/style_dialog.c -> gentoo-0.19.9.tar.gz/src/style_dialog.c Changed

gentoo-0.15.6.tar.bz2/src/styles.c -> gentoo-0.19.9.tar.gz/src/styles.c Changed

@@ -34,14 +34,16 @@
 ** used in the old_load_property() function, when converting to the more modern string-
 ** based property names used by this module.
 */
-#define	L_TYPE_UNSEL_BGCOL	(0)
-#define	L_TYPE_UNSEL_FGCOL	(1)
-#define	L_TYPE_UNSEL_ICON	(2)
-#define	L_TYPE_ACTN_DEFAULT	(6)
-#define	L_TYPE_ACTN_VIEW	(7)
-#define	L_TYPE_ACTN_EDIT	(8)
-#define	L_TYPE_ACTN_PRINT	(9)
-#define	L_TYPE_ACTN_PLAY	(10)
+enum {
+	L_TYPE_UNSEL_BGCOL	= 0,
+	L_TYPE_UNSEL_FGCOL	= 1,
+	L_TYPE_UNSEL_ICON	= 2,
+	L_TYPE_ACTN_DEFAULT	= 6,
+	L_TYPE_ACTN_VIEW	= 7,
+	L_TYPE_ACTN_EDIT	= 8,
+	L_TYPE_ACTN_PRINT	= 9,
+	L_TYPE_ACTN_PLAY	= 10
+};
 
 typedef struct {
 	gchar		nameSTL_PROPERTY_NAME_SIZE;	/* Unique property identifier. */
@@ -177,7 +179,7 @@
 	else	/* No property found, so create a fresh linking one. */
 	{
 		pr = g_malloc(sizeof *pr);
-		stu_strncpy(pr->name, ppr->name, sizeof pr->name);
+		g_strlcpy(pr->name, ppr->name, sizeof pr->name);
 		pr->override = FALSE;
 		pr->value = ppr->value;
 		g_hash_table_insert(stl->properties, pr->name, pr);
@@ -757,84 +759,10 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-/* 1999-05-22 -	User just expanded a node in the tree. */
-static void evt_style_expand(GtkWidget *wid, gpointer user)
-{
-	Style		*stl = gtk_object_get_user_data(GTK_OBJECT(wid));
-	gboolean	*modified;
-
-	stl->expand = TRUE;
-	if((modified = user) != NULL)
-		*modified = TRUE;
-}
-
-/* 1999-05-22 -	User collapsed a style node. */
-static void evt_style_collapse(GtkWidget *wid, gpointer user)
-{
-	Style		*stl = gtk_object_get_user_data(GTK_OBJECT(wid));
-	gboolean	*modified;
-
-	stl->expand = FALSE;
-	if((modified = user) != NULL)
-		*modified = TRUE;
-}
-
-/* 1999-05-22 -	Recursively build a tree rooted at <node>, and add it to <parent>. */
-static void build_branch(GNode *node, GtkWidget *parent, Style *ignore, gboolean *modify_flag)
-{
-	GtkWidget	*item;
-
-	for(; (node != NULL); node = node->next)
-	{
-		if((ignore != NULL) && (node->data == ignore))
-			continue;
-		item = gtk_tree_item_new_with_label(((Style *) node->data)->name);
-		gtk_object_set_user_data(GTK_OBJECT(item), node->data);
-		gtk_tree_append(GTK_TREE(parent), item);
-		gtk_widget_show(item);
-		if(node->children)
-		{
-			GtkWidget	*tree;
-
-			tree = gtk_tree_new();
-			build_branch(node->children, tree, ignore, modify_flag);
-			gtk_tree_item_set_subtree(GTK_TREE_ITEM(item), tree);
-			g_signal_connect(G_OBJECT(item), "expand", G_CALLBACK(evt_style_expand), modify_flag);
-			g_signal_connect(G_OBJECT(item), "collapse", G_CALLBACK(evt_style_collapse), modify_flag);
-		}
-		if(((Style *) node->data)->expand)
-			gtk_tree_item_expand(GTK_TREE_ITEM(item));
-	}
-}
-
-/* 1999-05-22 -	Create and populate a GtkTree widget, holding the style tree. Recursive. To track selections
-**		in the tree, use the "selection_changed" signal, together with the GTK_TREE_SELECTION() macro.
-*/
-GtkTree * stl_styleinfo_build(StyleInfo *si, gboolean *modify_flag)
-{
-	GtkWidget	*tree;
-
-	tree = gtk_tree_new();
-	build_branch(si->styles, tree, NULL, modify_flag);
-
-	return GTK_TREE(tree);
-}
-
-/* 1999-05-24 -	Build a partial style tree, ignoring any branch rooted at <ignore>. */
-GtkTree * stl_styleinfo_build_partial(StyleInfo *si, Style *ignore)
-{
-	GtkWidget	*tree;
-
-	tree = gtk_tree_new();
-	build_branch(si->styles, tree, ignore, NULL);
-
-	return GTK_TREE(tree);
-}
-
 /* 2006-03-02 -	Append a branch of the style tree to the given store. This does not collapse/expand it
  *		properly, since that's not doable with GTK+2 at this level (it's a view property).
 */
-static void append_branch2(GtkTreeStore *store, const GNode *node, GtkTreeIter *parent, const Style *ignore, gboolean *modify_flag)
+static void append_branch(GtkTreeStore *store, const GNode *node, GtkTreeIter *parent, const Style *ignore, gboolean *modify_flag)
 {
 	GtkTreeIter	child;
 
@@ -847,17 +775,17 @@
 						  TREE_COLUMN_STYLE, node->data,
 						  -1);
 		if(node->children != NULL)
-			append_branch2(store, node->children, &child, ignore, modify_flag);
+			append_branch(store, node->children, &child, ignore, modify_flag);
 	}
 }
 
 /* 2006-03-02 -	Build a partial style store, ignoring any branch rooted at <ignore>. */
-GtkTreeStore * stl_styleinfo_build_partial2(const StyleInfo *si, const Style *ignore)
+GtkTreeStore * stl_styleinfo_build_partial(const StyleInfo *si, const Style *ignore)
 {
 	GtkTreeStore	*store;
 
 	store = gtk_tree_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
-	append_branch2(store, si->styles, NULL, ignore, NULL);
+	append_branch(store, si->styles, NULL, ignore, NULL);
 
 	return store;
 }
@@ -938,7 +866,7 @@
 	Style	*stl;
 
 	stl = g_malloc(sizeof *stl);
-	stu_strncpy(stl->name, name, sizeof stl->name);
+	g_strlcpy(stl->name, name, sizeof stl->name);
 	stl->styleinfo = NULL;
 	stl->properties = g_hash_table_new(g_str_hash, g_str_equal);
 	stl->expand = TRUE;
@@ -1013,7 +941,7 @@
 Style * stl_style_get(GtkWidget *wid)
 {
 	if(wid != NULL)
-		return gtk_object_get_user_data(GTK_OBJECT(wid));
+		return g_object_get_data(G_OBJECT(wid), "user");
 	return NULL;
 }
 
@@ -1036,14 +964,7 @@
 void stl_style_set_name(Style *stl, const gchar *name)
 {
 	if((stl != NULL) && (name != NULL))
-		stu_strncpy(stl->name, name, sizeof stl->name);
-}
-
-/* 1999-05-24 -	Update label of treeitem <wid> to <name>. This is only useful in config. */
-void stl_style_set_name_widget(GtkWidget *wid, const gchar *name)
-{
-	if((wid != NULL) && GTK_IS_TREE_ITEM(wid) && (name != NULL))
-		gtk_label_set_text(GTK_LABEL(GTK_BIN(wid)->child), name);
+		g_strlcpy(stl->name, name, sizeof stl->name);
 }
 
 /* 1999-05-20 -	Just get a pointer (read-only, as usual) to the style's name. */
@@ -1171,7 +1092,7 @@
 	else
 	{
 		pr = g_malloc(sizeof *pr);
-		stu_strncpy(pr->name, name, sizeof pr->name);
+		g_strlcpy(pr->name, name, sizeof pr->name);
 		g_hash_table_insert(stl->properties, pr->name, pr);
 	}
 	pr->override = TRUE;
@@ -1226,7 +1147,7 @@
 	if((stl != NULL) && (value != NULL))
 	{
 		pr = style_get_property(stl, property, SPT_ICON);
-		stu_strncpy(pr->value->data.icon, value, sizeof pr->value->data.icon);
+		g_strlcpy(pr->value->data.icon, value, sizeof pr->value->data.icon);
 		styleinfo_update(stl->styleinfo);
 	}
 }
@@ -1247,7 +1168,7 @@
 /* ----------------------------------------------------------------------------------------- */
 
 /* 1999-05-19 -	Get a read-only pointer to the color held in a color-property. */
-const GdkColor * stl_style_property_get_color(Style *stl, const gchar *property)
+const GdkColor * stl_style_property_get_color(const Style *stl, const gchar *property)
 {
 	StlProp	*pr;
 
@@ -1260,7 +1181,7 @@
 }
 
 /* 1999-05-19 -	Get a (read-only) icon name of an appropriately typed property. */
-const gchar * stl_style_property_get_icon(Style *stl, const gchar *property)
+const gchar * stl_style_property_get_icon(const Style *stl, const gchar *property)
 {
 	StlProp	*pr;
 
@@ -1427,7 +1348,7 @@
 	}
 	/* Remove from hash table, rename, and re-insert. */
 	g_hash_table_remove(stl->properties, pr->name);
-	stu_strncpy(pr->name, new_name, sizeof pr->name);
+	g_strlcpy(pr->name, new_name, sizeof pr->name);
 	g_hash_table_insert(stl->properties, pr->name, pr);
 	/* Name changed. Now traverse children, and remove non-overridden instances. */
 	if((me = g_node_find(stl->styleinfo->styles, G_PRE_ORDER, G_TRAVERSE_ALL, stl)) != NULL)

gentoo-0.15.6.tar.bz2/src/styles.h -> gentoo-0.19.9.tar.gz/src/styles.h Changed

@@ -37,9 +37,7 @@
 StyleInfo *	stl_styleinfo_default(void);
 StyleInfo *	stl_styleinfo_copy(StyleInfo *si);
 void		stl_styleinfo_destroy(StyleInfo *si);
-GtkTree *	stl_styleinfo_build(StyleInfo *si, gboolean *modify_flag);
-GtkTree *	stl_styleinfo_build_partial(StyleInfo *si, Style *ignore);
-GtkTreeStore *	stl_styleinfo_build_partial2(const StyleInfo *si, const Style *ignore);
+GtkTreeStore *	stl_styleinfo_build_partial(const StyleInfo *si, const Style *ignore);
 
 Style *		stl_styleinfo_get_style_iter(const StyleInfo *si, GtkTreeStore *store, GtkTreeIter *iter);
 gboolean	stl_styleinfo_tree_find_style(const StyleInfo *si, GtkTreeStore *store, const Style *style, GtkTreeIter *iter);
@@ -89,8 +87,8 @@
 void		stl_style_property_set_color_rgb(Style *stl, const gchar *property, guint16 red, guint16 green, guint16 blue);
 void		stl_style_property_set_icon(Style *stl, const gchar *property, const gchar *value);
 void		stl_style_property_set_action(Style *stl, const gchar *property, const gchar *value);
-const GdkColor*	stl_style_property_get_color(Style *stl, const gchar *property);
-const gchar *	stl_style_property_get_icon(Style *stl, const gchar *property);
+const GdkColor*	stl_style_property_get_color(const Style *stl, const gchar *property);
+const gchar *	stl_style_property_get_icon(const Style *stl, const gchar *property);
 const gchar *	stl_style_property_get_action(Style *stl, const gchar *property);
 gboolean	stl_style_property_get_override(Style *stl, const gchar *property);
 GList *		stl_style_property_get_actions(Style *stl);

gentoo-0.15.6.tar.bz2/src/textview.c -> gentoo-0.19.9.tar.gz/src/textview.c Changed

@@ -24,7 +24,7 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include "convutil.h"
+#include "convstream.h"
 #include "errors.h"
 #include "fileutil.h"
 #include "dirpane.h"
@@ -33,7 +33,7 @@
 #include "strutil.h"
 #include "textview.h"
 
-#define	HEX_ROW_SIZE	(16)		/* Must be multiple of four! */
+#define	HEX_ROW_SIZE	(32)		/* Must be multiple of four! */
 #define	HEX_UNPRINTABLE	('.')
 
 /* ----------------------------------------------------------------------------------------- */
@@ -68,7 +68,9 @@
 	GtkWidget	*blabel;		/* A label that is in the action box. */
 	GtkWidget	*bplabel;		/* This label shows file position. */
 	guint		search_pos;		/* Offset into text to start next search at. */
-	guint		keypress_handler;	/* Handler ID for the keypress event. */
+	gulong		delete_handler;		/* Handler ID for the delete event. */
+	gulong		keypress_handler;	/* Handler ID for the keypress event. */
+	ConvStream	*convstream;		/* Used to abstract away encoding issues. */
 } TxvInfo;
 
 /* ----------------------------------------------------------------------------------------- */
@@ -96,7 +98,7 @@
 {
 	TxvInfo	*txi;
 
-	if((wid != NULL) && ((txi = gtk_object_get_user_data(GTK_OBJECT(wid))) != NULL))
+	if((wid != NULL) && ((txi = g_object_get_data(G_OBJECT(wid), "user")) != NULL))
 	{
 		if(goto_dialog.dlg != NULL)		/* Goto dialog window open? Then close it. */
 		{
@@ -119,42 +121,16 @@
 {
 	really_destroy(wid);
 
-	return TRUE;
+	return FALSE;
 }
 
-/* 2008-03-15 -	Helper routine since appending text now needs a bit more thinking to handle UTF-8.
- *		Returns FALSE is conversion failed and the caller should probably give up.
-*/
-static gboolean do_text_append(TxvInfo *txi, const gchar *text, gsize length)
+/* 2010-07-19 -	Rewritten in a much simpler way. Now, input is expected to be UTF-8, so we don't need to check/convert. */
+static void do_text_append(TxvInfo *txi, const gchar *text, gsize length)
 {
 	GtkTextIter	iter;
-	const gchar	*eptr;
 
 	gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(txi->buffer), &iter);
-	if(g_utf8_validate(text, length, &eptr))
-		gtk_text_buffer_insert(GTK_TEXT_BUFFER(txi->buffer), &iter, text, length);
-	else
-	{
-		gchar	*utf8;
-		gsize	bin, bout;
-		GError	*err = NULL;
-
-		if((utf8 = g_locale_to_utf8(text, length, &bin, &bout, &err)) != NULL)
-		{
-			gtk_text_buffer_insert(GTK_TEXT_BUFFER(txi->buffer), &iter, utf8, bout);
-			g_free(utf8);
-		}
-		if(err != NULL)
-		{
-			const gchar	*local = NULL;
-
-			g_get_charset(&local);
-			err_printf(txi->min, _("Unable to convert text from native character set (%s) to UTF-8: %s"), local, err->message);
-			g_error_free(err);
-			return FALSE;
-		}
-	}
-	return TRUE;
+	gtk_text_buffer_insert(GTK_TEXT_BUFFER(txi->buffer), &iter, text, length);
 }
 
 /* 1999-03-02 -	Users of this module no longer have access to the GtkText widget, so
@@ -164,7 +140,7 @@
 {
 	TxvInfo		*txi;
 
-	if((wid == NULL) || ((txi = gtk_object_get_user_data(GTK_OBJECT(wid))) == NULL) || length < 1)
+	if((wid == NULL) || ((txi = g_object_get_data(G_OBJECT(wid), "user")) == NULL) || length < 1)
 		return;
 	do_text_append(txi, text, length);
 }
@@ -184,7 +160,7 @@
 		txv_text_append(wid, text, length);
 		return;
 	}
-	if((wid == NULL) || ((txi = gtk_object_get_user_data(GTK_OBJECT(wid))) == NULL) || length < 1)
+	if((wid == NULL) || ((txi = g_object_get_data(G_OBJECT(wid), "user")) == NULL) || length < 1)
 		return;
 	pos = gtk_text_buffer_get_char_count(GTK_TEXT_BUFFER(txi->buffer));
 	do_text_append(txi, text, length);
@@ -200,6 +176,28 @@
 	gtk_text_buffer_apply_tag(GTK_TEXT_BUFFER(txi->buffer), tag, &start, &end);
 }
 
+static void sink_text(const gchar *text, gsize length, gpointer user)
+{
+	TxvInfo	*txi = user;
+
+	/* Is the conversion stream trying to signal us an error? */
+	if(length == 0)
+	{
+		gchar	msg256;
+		gsize	len;
+		GdkColor red;
+
+		len = g_snprintf(msg, sizeof msg, _("\n** Text conversion from charset '%s' failed, aborting."), text);
+		red.red = 0xffff;
+		red.green = 0;
+		red.blue = 0;
+		red.pixel = 0;
+		txv_text_append_with_color(txi->win, msg, len, &red);
+		return;
+	}
+	do_text_append(txi, text, length);
+}
+
 /* 1998-12-18 -	Rewrote this a couple of times today. Note how this version really doesn't
 **		care about the size of its input file; it just reads until reading fails.
 **		This makes it possible to look at /proc files, which have size 0.
@@ -211,47 +209,36 @@
 **		using normal file I/O if mmap() fails, which can happen on certain filesystems.
 ** 1999-03-02 -	New interface, renamed.
 ** 1999-04-06 -	Added the <buf_size> argument, which is used when mmap() isn't.
+** 2010-02-28 -	Ported to GIO, mmap support removed (sadly).
 */
-gint txv_text_load(GtkWidget *wid, const gchar *name, gboolean use_mmap, gsize buf_size)
+gint txv_text_load(GtkWidget *wid, GFile *file, gsize buf_size, const gchar *encoding, GError **err)
 {
-	gchar	*buf;
-	gint	fd, ret = 0;
-	TxvInfo	*txi;
+	GFileInputStream	*is;
+	TxvInfo			*txi;
 
-	if((wid == NULL) || ((txi = gtk_object_get_user_data(GTK_OBJECT(wid))) == NULL) || (name == NULL))
+	if((wid == NULL) || ((txi = g_object_get_data(G_OBJECT(wid), "user")) == NULL) || (file == NULL))
 		return 0;
 
-	txv_set_label_from_filename(wid, name);
+	txv_set_label_from_file(wid, file);
 
 	err_clear(txi->min);
-	if((fd = open(name, O_RDONLY)) >= 0)
+	if((is = g_file_read(file, NULL, err)) != NULL)
 	{
-		gsize	size;
+		gchar		*buf;
+		gssize		got;
+		ConvStream	*cs;
 
-		if(use_mmap && fut_size(name, &size) && (size > 0) &&
-		   (buf = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0)) != MAP_FAILED)
+		buf = g_malloc(buf_size);
+		cs = convstream_new(encoding, 32 << 10, sink_text, txi);
+		while((got = g_input_stream_read(G_INPUT_STREAM(is), buf, buf_size, NULL, err)) > 0)
 		{
-			do_text_append(txi, buf, size);
-			munmap(buf, size);
+			convstream_source(cs, buf, got);
 		}
-		else
-		{
-			gssize	got;
-
-			buf = g_malloc(buf_size);
-			while((got = read(fd, buf, buf_size)) > 0)
-			{
-				if(!do_text_append(txi, buf, got))
-					break;
-			}
-			g_free(buf);
-		}
-		close(fd);
+		convstream_destroy(cs);
+		g_free(buf);
+		g_object_unref(is);
 	}
-	if(errno != 0)
-		err_set(txi->min, errno, _("File reading"), (gchar *) name);
-
-	return ret;
+	return *err == NULL;
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -292,21 +279,20 @@
 **		number of bytes at a time, it was grossly inefficient to load the entire file.
 **		Now we do plenty of small read()s instead, which I'm sure is slower, but at
 **		least doesn't waste memory.
+** 2010-02-28 -	Ported to use GIO.
 */
-gint txv_text_load_hex(GtkWidget *win, const gchar *name)
+gint txv_text_load_hex(GtkWidget *win, GFile *file, GError **err)
 {
 	gchar		line8 + 1 + (HEX_ROW_SIZE / 4) * 9 + 1 + HEX_ROW_SIZE + 1 + 1,
 			group9 * (HEX_ROW_SIZE / 4) + 1, textHEX_ROW_SIZE + 1;
-	guchar		bufHEX_ROW_SIZE;
-	gint		fd, len, chunk;
-	gsize		offset = 0;
 	TxvInfo		*txi;
-/*	GtkTextTag	*tag;*/
+	GFileInputStream *is;
+	GtkTextTag	*tag;
 
-	if((win == NULL) || ((txi = gtk_object_get_user_data(GTK_OBJECT(win))) == NULL) || (name == NULL))
+	if((win == NULL) || ((txi = g_object_get_data(G_OBJECT(win), "user")) == NULL) || (file == NULL))
 		return 0;
 
-	txv_set_label_from_filename(win, name);
+	txv_set_label_from_file(win, file);
 
 	memset(group, ' ', sizeof group - 1);
 	groupsizeof group - 1 = '\0';
@@ -314,12 +300,14 @@
 	textsizeof text - 1   = '\0';
 
 	err_clear(txi->min);
-	if((fd = open(name, O_RDONLY)) >= 0)
+	if((is = g_file_read(file, NULL, err)) != NULL)
 	{
+		guchar		bufHEX_ROW_SIZE;
 		GtkTextIter	iter;
+		gsize		offset = 0, chunk, len;
 
 		gtk_text_buffer_get_start_iter(GTK_TEXT_BUFFER(txi->buffer), &iter);
-		while((chunk = read(fd, buf, sizeof buf)) > 0)
+		while((chunk = g_input_stream_read(G_INPUT_STREAM(is), buf, sizeof buf, NULL, err)) > 0)
 		{
 			if(chunk < sizeof buf)
 			{
@@ -332,15 +320,15 @@
 			gtk_text_buffer_insert(GTK_TEXT_BUFFER(txi->buffer), &iter, line, len);
 			offset += chunk;
 		}
-		close(fd);
+		g_object_unref(is);
 	}
 
-/*	if((tag = gtk_text_tag_new("fixed")) != NULL)
+	if((tag = gtk_text_tag_new("fixed")) != NULL)
 	{
 		GtkTextIter	start, end;
 		GtkTextTagTable	*tt;
 
-		g_object_set(G_OBJECT(tag), "font", "fixed", NULL);
+		g_object_set(G_OBJECT(tag), "family", "Monospace", NULL);
 		tt = gtk_text_buffer_get_tag_table(GTK_TEXT_BUFFER(txi->buffer));
 		gtk_text_tag_table_add(tt, tag);
 		gtk_text_buffer_get_start_iter(GTK_TEXT_BUFFER(txi->buffer), &start);
@@ -348,10 +336,8 @@
 		gtk_text_buffer_apply_tag(GTK_TEXT_BUFFER(txi->buffer), tag, &start, &end);
 		g_object_unref(G_OBJECT(tag));
 	}
-*/
-	if(errno != 0)
-		err_set(txi->min, errno, _("File reading"), (gchar *) name);
-	return errno != 0;
+
+	return *err == NULL;
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -376,7 +362,7 @@
 */
 static gint evt_keypress(GtkWidget *wid, GdkEventKey *evt, gpointer user)
 {
-	TxvInfo	*txi = gtk_object_get_user_data(GTK_OBJECT(wid));
+	TxvInfo	*txi = g_object_get_data(G_OBJECT(wid), "user");
 
 	if(evt->keyval == GDK_Escape || evt->keyval == GDK_Left)
 		really_destroy(wid);
@@ -428,36 +414,33 @@
 static gint evt_move_clicked(GtkWidget *wid, gpointer user)
 {
 	TxvInfo		*txi = user;
-	GtkAdjustment	*adj;
 	GtkTextIter	iter;
 	gint		bx, by;
 
 	gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(txi->text), GTK_TEXT_WINDOW_WIDGET, 0, 0, &bx, &by);
 	gtk_text_view_get_line_at_y(GTK_TEXT_VIEW(txi->text), &iter, by, NULL);
 
-	if((adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(txi->scwin))) != NULL)
+	switch((MoveID) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(wid), "user")))
 	{
-		switch((MoveID) GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(wid))))
-		{
-			case MVE_UP:
-				gtk_text_view_backward_display_line(GTK_TEXT_VIEW(txi->text), &iter);
-				gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(txi->text), &iter, 0.0, TRUE, 0.0, 0.0);
-				break;
-			case MVE_DOWN:
-				gtk_text_view_forward_display_line(GTK_TEXT_VIEW(txi->text), &iter);
-				gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(txi->text), &iter, 0.0, TRUE, 0.0, 0.0);
-				break;
-			case MVE_TOP:
-				gtk_text_buffer_get_start_iter(GTK_TEXT_BUFFER(txi->buffer), &iter);
-				gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(txi->text), &iter, 0.0, TRUE, 0.0, 0.0);
-				reset_search(txi);
-				break;
-			case MVE_BOTTOM:
-				gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(txi->buffer), &iter);
-				gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(txi->text), &iter, 0.0, TRUE, 0.0, 0.0);
-				reset_search(txi);
-				break;
-		}
+		case MVE_UP:
+			gtk_text_view_backward_display_line(GTK_TEXT_VIEW(txi->text), &iter);
+			gtk_text_view_backward_display_line_start(GTK_TEXT_VIEW(txi->text), &iter);
+			gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(txi->text), &iter, 0.0, TRUE, 0.0, 0.0);
+			break;
+		case MVE_DOWN:
+			gtk_text_view_forward_display_line(GTK_TEXT_VIEW(txi->text), &iter);
+			gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(txi->text), &iter, 0.0, TRUE, 0.0, 0.0);
+			break;
+		case MVE_TOP:
+			gtk_text_buffer_get_start_iter(GTK_TEXT_BUFFER(txi->buffer), &iter);
+			gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(txi->text), &iter, 0.0, TRUE, 0.0, 0.0);
+			reset_search(txi);
+			break;
+		case MVE_BOTTOM:
+			gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(txi->buffer), &iter);
+			gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(txi->text), &iter, 0.0, TRUE, 0.0, 1.0);
+			reset_search(txi);
+			break;
 	}
 	return TRUE;
 }
@@ -482,7 +465,7 @@
 	{
 		const gchar	*txt;
 		gchar		unit;
-		gint		value;
+		gint		value, line;
 		GtkTextIter	iter;
 
 		txt = gtk_entry_get_text(GTK_ENTRY(goto_dialog.entry));
@@ -494,8 +477,8 @@
 			switch(unit)
 			{
 			case '%':
-				value = (adj->upper * value) / 100;
-				gtk_text_buffer_get_iter_at_line(GTK_TEXT_BUFFER(txi->buffer), &iter, value);
+				line = (gtk_text_buffer_get_line_count(GTK_TEXT_BUFFER(txi->buffer)) * value) / 100;
+				gtk_text_buffer_get_iter_at_line(GTK_TEXT_BUFFER(txi->buffer), &iter, line);
 				break;
 			case 'M':
 			case 'm':
@@ -529,7 +512,7 @@
 		win = txi->win;
 		really_destroy(win);
 	}
-	return TRUE;
+	return FALSE;
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -612,7 +595,8 @@
 	srch_dialog.vbox  = gtk_vbox_new(FALSE, 0);
 	srch_dialog.label = gtk_label_new(_("Enter Text to Search For (RE)"));
 	gtk_box_pack_start(GTK_BOX(srch_dialog.vbox), srch_dialog.label, FALSE, FALSE, 0);
-	srch_dialog.entry = gtk_entry_new_with_max_length(SEARCH_RE_SIZE - 1);
+	srch_dialog.entry = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(srch_dialog.entry), SEARCH_RE_SIZE - 1);
 	gtk_entry_set_text(GTK_ENTRY(srch_dialog.entry), last_search.re);
 	gtk_editable_select_region(GTK_EDITABLE(srch_dialog.entry), 0, -1);
 	gtk_box_pack_start(GTK_BOX(srch_dialog.vbox), srch_dialog.entry, FALSE, FALSE, 0);
@@ -634,7 +618,7 @@
 		GString	*tmp;
 
 		txt = gtk_entry_get_text(GTK_ENTRY(srch_dialog.entry));
-		stu_strncpy(last_search.re, txt, sizeof last_search.re);
+		g_strlcpy(last_search.re, txt, sizeof last_search.re);
 		last_search.no_case = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(srch_dialog.fnocase));
 		last_search.no_lf   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(srch_dialog.fnolf));
 		if(txt != NULL && (tmp = g_string_new("(")) != NULL)
@@ -695,11 +679,12 @@
 
 	txi->min = min;
 	txi->search_pos = 0;		/* Start searching from the beginning. */
-	txi->keypress_handler = 0;
+	txi->delete_handler = 0u;
+	txi->keypress_handler = 0u;
 
 	txi->win = win_window_open(min->cfg.wininfo, WIN_TEXTVIEW);
-	gtk_object_set_user_data(GTK_OBJECT(txi->win), txi);
-	g_signal_connect(G_OBJECT(txi->win), "delete_event", G_CALLBACK(evt_delete), txi);
+	g_object_set_data(G_OBJECT(txi->win), "user", txi);
+	txv_connect_delete(txi->win, NULL, NULL);
 	txv_connect_keypress(txi->win, NULL, NULL);
 
 	vbox = gtk_vbox_new(FALSE, 0);
@@ -711,8 +696,8 @@
 
 	txi->scwin = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txi->scwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	g_signal_connect_after(GTK_OBJECT(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(txi->scwin))),
-				"value_changed", GTK_SIGNAL_FUNC(evt_pos_changed), txi);
+	g_signal_connect_after(G_OBJECT(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(txi->scwin))),
+				"value_changed", G_CALLBACK(evt_pos_changed), txi);
 	gtk_container_add(GTK_CONTAINER(txi->scwin), txi->text);
 
 	gtk_box_pack_start(GTK_BOX(vbox), txi->scwin, TRUE, TRUE, 0);
@@ -732,37 +717,37 @@
 
 	accel = gtk_accel_group_new();
 
-	btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
-	gtk_object_set_user_data(GTK_OBJECT(btn), GINT_TO_POINTER(MVE_UP));
+	btn = gui_stock_button_new(GTK_STOCK_GO_UP);
+	g_object_set_data(G_OBJECT(btn), "user", GINT_TO_POINTER(MVE_UP));
 	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(evt_move_clicked), txi);
 	gtk_box_pack_start(GTK_BOX(txi->bhbox), btn, FALSE, FALSE, 0);
-	btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
-	gtk_object_set_user_data(GTK_OBJECT(btn), GINT_TO_POINTER(MVE_DOWN));
+	btn = gui_stock_button_new(GTK_STOCK_GO_DOWN);
+	g_object_set_data(G_OBJECT(btn), "user", GINT_TO_POINTER(MVE_DOWN));
 	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(evt_move_clicked), txi);
 	gtk_box_pack_start(GTK_BOX(txi->bhbox), btn, FALSE, FALSE, 0);
-	btn = gtk_button_new_from_stock(GTK_STOCK_GOTO_TOP);
-	gtk_object_set_user_data(GTK_OBJECT(btn), GINT_TO_POINTER(MVE_TOP));
+	btn = gui_stock_button_new(GTK_STOCK_GOTO_TOP);
+	g_object_set_data(G_OBJECT(btn), "user", GINT_TO_POINTER(MVE_TOP));
 	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(evt_move_clicked), txi);
 	gtk_widget_add_accelerator(btn, "clicked", accel, GDK_Home, 0, 0);
 	gtk_box_pack_start(GTK_BOX(txi->bhbox), btn, FALSE, FALSE, 0);
-	btn = gtk_button_new_from_stock(GTK_STOCK_GOTO_BOTTOM);
-	gtk_object_set_user_data(GTK_OBJECT(btn), GINT_TO_POINTER(MVE_BOTTOM));
+	btn = gui_stock_button_new(GTK_STOCK_GOTO_BOTTOM);
+	g_object_set_data(G_OBJECT(btn), "user", GINT_TO_POINTER(MVE_BOTTOM));
 	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(evt_move_clicked), txi);
 	gtk_widget_add_accelerator(btn, "clicked", accel, GDK_End, 0, 0);
 	gtk_box_pack_start(GTK_BOX(txi->bhbox), btn, FALSE, FALSE, 0);
 
 	bhbox = gtk_hbox_new(FALSE, 0);
-	btn = gtk_button_new_from_stock(GTK_STOCK_JUMP_TO);
+	btn = gui_stock_button_new(GTK_STOCK_JUMP_TO);
 	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(evt_goto_clicked), txi);
 	gtk_box_pack_start(GTK_BOX(bhbox), btn, FALSE, FALSE, 0);
 
-	btn = gtk_button_new_from_stock(GTK_STOCK_FIND);
+	btn = gui_stock_button_new(GTK_STOCK_FIND);
 	gtk_widget_add_accelerator(btn, "clicked", accel, GDK_F, GDK_CONTROL_MASK, 0);
 	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(evt_search_clicked), txi);
 	gtk_box_pack_start(GTK_BOX(bhbox), btn, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(txi->bhbox), bhbox, FALSE, FALSE, 5);
 
-	btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+	btn = gui_stock_button_new(GTK_STOCK_CLOSE);
 	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(evt_close_clicked), txi);
 	gtk_box_pack_start(GTK_BOX(txi->bhbox), btn, FALSE, TRUE, 0);
 	gtk_widget_set_sensitive(txi->bhbox, FALSE);
@@ -787,27 +772,47 @@
 	win_window_show(textviewer);
 }
 
+/* 2010-03-13 -	Factored this one out of txv_connect_delete() and txv_connect_keypress, below. */
+static gulong connect_handler(TxvInfo *txi, gulong *handler, const gchar *signame, GCallback func, GCallback default_func, gpointer user)
+{
+	if(*handler != 0u)
+	{
+		g_signal_handler_disconnect(G_OBJECT(txi->win), *handler);
+		*handler = 0;
+	}
+	if(func == NULL)		/* Reset internal handler? */
+	{
+		func = default_func;
+		user = txi->win;
+	}
+	*handler = g_signal_connect(G_OBJECT(txi->win), signame, func, user);
+	return *handler;
+}
+
+/* 2010-03-13 -	Replace the module's own default delete handler with a custom handler.
+**		Note that in order to not leak memory, any custom handler must call
+**		txv_close() itself to clean up after the view.
+*/
+gulong txv_connect_delete(GtkWidget *wid, GCallback func, gpointer user)
+{
+	TxvInfo	*txi;
+
+	if((wid == NULL) || ((txi = g_object_get_data(G_OBJECT(wid), "user")) == NULL))
+		return 0;
+	return connect_handler(txi, &txi->delete_handler, "delete_event", func, G_CALLBACK(evt_delete), user);
+}
+
 /* 1999-03-02 -	Install a keypress handler on the textviewing window. This cannot be
 **		done directly by the module user, since we have an internal handler
 **		and they don't seem to chain properly... Odd.
 */
-guint txv_connect_keypress(GtkWidget *wid, GtkSignalFunc func, gpointer user)
+gulong txv_connect_keypress(GtkWidget *wid, GCallback func, gpointer user)
 {
 	TxvInfo	*txi;
 
-	if((wid == NULL) || ((txi = gtk_object_get_user_data(GTK_OBJECT(wid))) == NULL))
+	if((wid == NULL) || ((txi = g_object_get_data(G_OBJECT(wid), "user")) == NULL))
 		return 0;
-	if(txi->keypress_handler > 0)
-	{
-		gtk_signal_disconnect(GTK_OBJECT(wid), txi->keypress_handler);
-		txi->keypress_handler = 0;
-	}
-	if(func == NULL)		/* Reset internal handler? */
-	{
-		func = GTK_SIGNAL_FUNC(evt_keypress);
-		user = wid;
-	}
-	return txi->keypress_handler = g_signal_connect(G_OBJECT(wid), "key_press_event", G_CALLBACK(func), user);
+	return connect_handler(txi, &txi->keypress_handler, "key_press_event", func, G_CALLBACK(evt_keypress), user);
 }
 
 /* 1999-01-05 -	Set the label. This is kind of redundant, but true to the original Opus look. :)
@@ -817,22 +822,25 @@
 {
 	TxvInfo	*txi;
 
-	if(wid != NULL && (txi = gtk_object_get_user_data(GTK_OBJECT(wid))) != NULL && text != NULL)
+	if(wid != NULL && (txi = g_object_get_data(G_OBJECT(wid), "user")) != NULL && text != NULL)
 	{
 		win_window_set_title(wid, text);
 		gtk_label_set_text(GTK_LABEL(txi->blabel), text);
 	}
 }
 
-/* 2009-05-27 -	Set the label of the view, based on a filename input. This needs encoding-conversion. */
-void txv_set_label_from_filename(GtkWidget *wid, const gchar *filename)
+/* 2009-05-27 -	Set the label of the view, based on a filename input. This needs encoding-conversion.
+** 2010-02-28 -	Converted to GIO.
+*/
+void txv_set_label_from_file(GtkWidget *wid, GFile *file)
 {
-	Conv	conv;
-	gchar	*dpl;
+	gchar	*dn;
 
-	dpl = conv_begin_reverse(&conv, filename);
-	txv_set_label(wid, dpl);
-	conv_end(&conv);
+	if((dn = g_file_get_parse_name(file)) != NULL)
+	{
+		txv_set_label(wid, dn);
+		g_free(dn);
+	}
 }
 
 /* 1999-03-02 -	Enable the text widget for viewing. Called once all insertions are done. */
@@ -840,7 +848,7 @@
 {
 	TxvInfo	*txi;
 
-	if((wid != NULL) && ((txi = gtk_object_get_user_data(GTK_OBJECT(wid))) != NULL))
+	if((wid != NULL) && ((txi = g_object_get_data(G_OBJECT(wid), "user")) != NULL))
 	{
 		gtk_widget_show(wid);	/* Just in case. */
 /*		gtk_adjustment_set_value(GTK_ADJUSTMENT(GTK_TEXT(txi->text)->vadj), 0.0f);*/
@@ -857,10 +865,6 @@
 {
 	TxvInfo	*txi;
 
-	if(wid != NULL && (txi = gtk_object_get_user_data(GTK_OBJECT(wid))) != NULL)
-	{
-		GtkWidget	*win = txi->win;
-
-		really_destroy(win);		/* This makes the TxvInfo go away. */
-	}
+	if(wid != NULL && (txi = g_object_get_data(G_OBJECT(wid), "user")) != NULL)
+		really_destroy(txi->win);		/* This makes the TxvInfo go away. */
 }

gentoo-0.15.6.tar.bz2/src/textview.h -> gentoo-0.19.9.tar.gz/src/textview.h Changed

@@ -16,18 +16,17 @@
 
 extern void	txv_show(GtkWidget *textviewer);
 
-/* Use this to connect a "key_press_event" handler on the window. Call with
-** <func>==NULL to reset internal handler.
-*/
-extern guint	txv_connect_keypress(GtkWidget *wid, GtkSignalFunc func, gpointer user);
+extern gulong	txv_connect_delete(GtkWidget *wid, GCallback func, gpointer user);
+extern gulong	txv_connect_keypress(GtkWidget *wid, GCallback func, gpointer user);
 
 extern void	txv_set_label(GtkWidget *wid, const gchar *text);
-extern void	txv_set_label_from_filename(GtkWidget *wid, const gchar *filename);
+extern void	txv_set_label_from_file(GtkWidget *wid, GFile *file);
 
 extern void	txv_text_append(GtkWidget *wid, const gchar *text, gsize length);
 extern void	txv_text_append_with_color(GtkWidget *wid, const gchar *text, gsize length, const GdkColor *color);
-extern gint	txv_text_load(GtkWidget *wid, const gchar *name, gboolean use_mmap, gsize buf_size);
-extern gint	txv_text_load_hex(GtkWidget *wid, const gchar *name);
+
+extern gint	txv_text_load(GtkWidget *wid, GFile *file, gsize buf_size, const gchar *encoding, GError **err);
+extern gint	txv_text_load_hex(GtkWidget *wid, GFile *file, GError **err);
 
 extern void	txv_enable(GtkWidget *wid);

gentoo-0.15.6.tar.bz2/src/types.c -> gentoo-0.19.9.tar.gz/src/types.c Changed

@@ -30,6 +30,7 @@
 
 #include <stddef.h>
 
+#include "dirpane.h"
 #include "errors.h"
 #include "strutil.h"
 #include "styles.h"
@@ -41,10 +42,10 @@
 /* Collected variables that deal with 'file' into a struct, for clarity. */
 static struct
 {
-	gboolean		file_used;		/* Any types using 'file' active? */
-	GSList			*files;			/* Current list of files to inspect. */
-	gboolean		sigpipe_installed;	/* SIGPIPE handler installed? */
-	volatile sig_atomic_t	sigpipe_occured;	/* Did we just catch SIGPIPE? */
+	gboolean	file_used;		/* Any types using 'file' active? */
+	GSList		*files;			/* Current list of files to inspect. */
+	gboolean	sigpipe_installed;	/* SIGPIPE handler installed? */
+	volatile gint	sigpipe_occured;	/* Did we just catch SIGPIPE? */
 } file_info;
 
 /* ----------------------------------------------------------------------------------------- */
@@ -63,7 +64,7 @@
 
 	if((type = g_malloc(sizeof *type)) != NULL)
 	{
-		stu_strncpy(type->name, name, sizeof type->name);
+		g_strlcpy(type->name, name, sizeof type->name);
 		type->mode  = mode;
 		type->perm  = perm;
 		type->flags = 0UL;
@@ -77,17 +78,17 @@
 
 		if(suffix != NULL)
 		{
-			stu_strncpy(type->suffix, suffix, sizeof type->suffix);
+			g_strlcpy(type->suffix, suffix, sizeof type->suffix);
 			type->flags |= FTFL_REQSUFFIX;
 		}
 		if(name_re != NULL)
 		{
-			stu_strncpy(type->name_re_src, name_re, sizeof type->name_re_src);
+			g_strlcpy(type->name_re_src, name_re, sizeof type->name_re_src);
 			type->flags |= FTFL_NAMEMATCH;
 		}
 		if(file_re != NULL)
 		{
-			stu_strncpy(type->file_re_src, file_re, sizeof type->file_re_src);
+			g_strlcpy(type->file_re_src, file_re, sizeof type->file_re_src);
 			type->flags |= FTFL_FILEMATCH;
 		}
 		type->style = NULL;
@@ -156,13 +157,11 @@
 /* 1998-09-07 -	Check if the file described by <line> matches the permissions requirements
 **		in <type>. Returns 1 if so, otherwise 0.
 ** 1999-03-14 -	Made the access to the DirRow (previously DirLine) a lot more abstract.
+** 2010-03-27 -	It's been a while, I guess. Porting to GIO and DirRow2.
 */
-static gint check_perm(const FType *type, DirRow *row)
+static gint check_perm(const FType *type, GtkTreeModel *model, const DirRow2 *row)
 {
-	gint	pr = 1, pw = 1, px = 1;
 	mode_t	mode = 0;
-	uid_t	uid;
-	gid_t	gid;
 
 	/* First build mode mask, for SetUID, SetGID and sticky. */
 	if(type->perm & FTPM_SETUID)
@@ -173,21 +172,25 @@
 		mode |= S_ISVTX;
 
 	/* Now we know the mode requirements - check if fulfilled. */
-	if((mode != 0) && ((DP_ROW_STAT(row).st_mode & mode) != mode))
+	if((mode != 0) && ((dp_row_get_mode(model, row) & mode) != mode))
 		return 0;
 
-	uid = geteuid();
-	gid = getegid();
-
-	/* Still here? Fine, then do (unorthodox, user-centric) read/write/execute permission checks. */
 	if(type->perm & FTPM_READ)
-		pr = fut_can_read(&DP_ROW_STAT(row), uid, gid);
+	{
+		if(!dp_row_get_can_read(model, row))
+			return 0;
+	}
 	if(type->perm & FTPM_WRITE)
-		pw = fut_can_write(&DP_ROW_STAT(row), uid, gid);
+	{
+		if(!dp_row_get_can_write(model, row))
+			return 0;
+	}
 	if(type->perm & FTPM_EXECUTE)
-		px = fut_can_execute(&DP_ROW_STAT(row), uid, gid);
-
-	return pr && pw && px;
+	{
+		if(!dp_row_get_can_execute(model, row))
+			return 0;
+	}
+	return 1;
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -212,48 +215,44 @@
 			g_free(glob_re);			/* Free the globbed version. */
 	}
 	if(*re != NULL)
-		return regexec(*re, string, 0, NULL, 0) != REG_NOMATCH;
-	return REG_NOMATCH;	/* FIXME: Weird! */
+		return regexec(*re, string, 0, NULL, 0) == 0;
+	return 0;
 }
 
-/* 1998-08-02 -	Attempt to apply the identification rules given in by the type <type> to the
-**		dirpane line in <user>. The string <fout> is output from 'file' on this very file,
-**		or NULL if 'file' hasn't yet been run. Returns TRUE if there is indeed a match. Note how
-**		regular expressions are compiled if they're not already, and that the compiled
-**		version is then kept for future use. This places some demands on the memory
-**		handling later (config etc) but I'll deal with that then...
-** 1998-08-26 -	Extended. Now actually does check against 'file' output.
-** 1998-08-30 -	Now supports glob->RE translations for name and file matches. Smooth.
-** 1998-09-15 -	Moved the actual RE checking out to a function of its own, since it was getting complex.
-** 1999-03-14 -	Replaced DirLine with new, opaque, DirRow.
-*/
-static gint check_type(FType *type, DirRow *row, const gchar *fout)
+static gboolean check_type(DirPane *dp, const DirRow2 *row, FType *type, const gchar *fout)
 {
-	guint		tries = 0, hits = 0;
+	gint		tries = 0, hits = 0;
 	const gchar	*name;
+	GFileType	tt;
+	GtkTreeModel	*model;
 
-	/* Everything matches the unknown type, and that's a fact. */
+	/* Catch-all: all files match the unknown type. */
 	if(TYP_IS_UNKNOWN(type))
-		return 1;
+		return TRUE;
 
-	/* For links, get actual name (without path) and use that. */
-	if(S_ISLNK(DP_ROW_LSTAT(row).st_mode))
-	{
-		if((name = strrchr(DP_ROW_LINKNAME(row), G_DIR_SEPARATOR)) == NULL)
-			name = DP_ROW_LINKNAME(row);
-		else
-			name++;
-	}
+	/* FIXME: Translate type's legacy type-information into simple GFileType value. */
+	if(S_ISREG(type->mode))
+		tt = G_FILE_TYPE_REGULAR;
+	else if(S_ISDIR(type->mode))
+		tt = G_FILE_TYPE_DIRECTORY;
+	else if(S_ISLNK(type->mode))
+		tt = G_FILE_TYPE_SYMBOLIC_LINK;
+	else if(S_ISFIFO(type->mode) || S_ISSOCK(type->mode))
+		tt = G_FILE_TYPE_SPECIAL;
 	else
-		name = DP_ROW_NAME(row);
+		tt = G_FILE_TYPE_UNKNOWN;
 
-	/* Apply the mode test first, since it's no doubt the fastest. */
-	if(((DP_ROW_STAT(row).st_mode) & S_IFMT) != type->mode)
-		return 0;
+	model = dp_get_tree_model(dp);
+
+	/* Apply the type test first, since it's the fastest. */
+	if(tt != dp_row_get_file_type(model, row, TRUE))
+		return FALSE;
+	name = dp_row_get_name(model, row);
+	/* Now do the rest, and count the number of matches. */
 	if(type->flags & FTFL_REQPERM)
 	{
 		tries++;
-		hits += check_perm(type, row);
+		hits += check_perm(type, model, row);
 	}
 	if(type->flags & FTFL_REQSUFFIX)
 	{
@@ -271,199 +270,7 @@
 		if(fout != NULL)
 			hits += check_re(type->file_re_src, &type->file_re, type->flags & FTFL_FILEGLOB, type->flags & FTFL_FILENOCASE, fout);
 	}
-	return tries == hits;
-}
-
-/* 1998-08-02 -	Identify the <line>, i.e. attempt to find an FType that matches it, and assign
-**		a pointer to that FType to the line's "type" field. If no user-defined type
-**		is found, we assign the root type ("Unknown").
-** 1998-08-26 -	Now returns TRUE if a "sophisticated" type was indeed found, FALSE if the "Unknown"
-**		type had to do. Also has become 'static', since you can't call this outside of
-**		the framework established by typ_identify_begin()/typ_idenfify_end(). Note use
-**		of NULL as third arg to check_type(), since we haven't started running 'file'
-**		yet.
-** 1999-03-14 -	Replaced DirLine with DirRow.
-*/
-static gint identify(MainInfo *min, DirRow *row)
-{
-	const GList	*here;
-
-	for(here = min->cfg.type; here != NULL; here = g_list_next(here))
-	{
-		if(check_type((FType *) here->data, row, NULL))
-		{
-			DP_ROW_TYPE(row) = here->data;
-			break;
-		}
-	}
-	return !TYP_IS_UNKNOWN((FType *) here->data);
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1998-08-26 -	A rewrite of the much of the (three weeks old) file typing architecture, in
-**		order to accomodate use of 'file' in a way even resembling something efficient.
-**		Rather than just calling typ_identify() on a dirline, you call first this
-**		function, which initializes some state. You then, repeatedly, call typ_identify()
-**		for all lines you wish to type. Then call typ_identify_end(). Done!
-*/
-void typ_identify_begin(MainInfo *min)
-{
-	GList	*here;
-
-	if(file_info.files != NULL)
-		fprintf(stderr, "**TYPES: Attempted to nest calls to typ_identify_begin()!\n");
-
-	for(here = min->cfg.type; here != NULL; here = g_list_next(here))
-	{
-		if(((FType *) here->data)->flags & FTFL_FILEMATCH)
-			break;
-	}
-	file_info.file_used = (here != NULL);
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1998-08-26 -	Identify the given line. If identification fails, i.e. if the "Unknown" type is
-**		assigned to the line, remember the line for later exposure to the external
-**		'file' command.
-*/
-void typ_identify(MainInfo *min, DirRow *row)
-{
-	if(!identify(min, row) && file_info.file_used)
-		file_info.files = g_slist_prepend(file_info.files, row);
-}
-
-/* ----------------------------------------------------------------------------------------- */
-
-/* 1998-08-26 -	Attempt to match all types in list against <line>, knowing that 'file' said
-**		<fout>. Only types that include a 'file'-matching RE are checked, of course.
-**		Returns the matching type if any, or NULL if there's no match.
-*/
-static FType * match_file(GList *list, DirRow *row, const gchar *fout)
-{
-	FType	*type;
-
-	for(; (list != NULL) && (type = (FType *) list->data); list = g_list_next(list))
-	{
-		if(check_type(type, row, fout))
-			return type;
-	}
-	return NULL;
-}
-
-/* 2009-03-11 -	Trivial SIGPIPE handler, that just sets a global flag. */
-static void sigpipe_handler(int sig)
-{
-	if(sig != SIGPIPE)
-		return;
-	file_info.sigpipe_occured = 1;
-}
-
-/* 2009-03-11 -	Installs a signal handler for SIGPIPE, so we can catch broken 'file' runs. */
-static gboolean install_handler(void)
-{
-	struct sigaction	act;
-
-	if(file_info.sigpipe_installed)
-		return TRUE;
-
-	act.sa_handler = sigpipe_handler;
-	sigemptyset(&act.sa_mask);
-	act.sa_flags	= 0;
-
-	return file_info.sigpipe_installed = (sigaction(SIGPIPE, &act, NULL) == 0);
-}
-
-/* 1998-08-26 -	End of batched identification. If any unknown's were found *and* we know that
-**		there are 1 or more types using the 'file' recognition support, we need to
-**		call 'file'. The idea here is that we only want to execute the 'file' command
-**		once, no matter how many files need identification. Also, we use redirection
-**		of stdin for 'file' to supply it with file names to check (via its "-f -" option),
-**		since writing out the names to disk seems inefficient.
-** 2009-03-08 -	Totally rewritten, now uses glib's fancy spawning to run the subprocess, and
-**		keeps it all going in pipes, without touching disk. This removes the need for
-**		a temporary filename, and should improve performance.
-*/
-void typ_identify_end(MainInfo *min, const gchar *path)
-{
-	gchar	*argv = { "file", "-n", "-f", "-", NULL };
-	GPid	file_pid;
-	gint	file_stdin, file_stdout;
-	GError	*error = NULL;
-
-	if(file_info.files == NULL)
-		return;
-
-	install_handler();
-
-	if(g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
-				    NULL, NULL, &file_pid, &file_stdin, &file_stdout, NULL, &error))
-	{
-		FILE	*in;
-
-		if((in = fdopen(file_stdout, "rt")) != NULL)
-		{
-			GSList	*here;
-
-			for(here = file_info.files; here != NULL; here = g_slist_next(here))
-			{
-				gchar	bufFILENAME_MAX + 256;
-				size_t	len, to_go;
-				ssize_t	wrote;
-
-				len = g_snprintf(buf, sizeof buf, "%s\n", DP_SEL_NAME(here));
-				if(len >= sizeof buf)	/* Handle overflow by just skipping that file. */
-					continue;
-				for(to_go = len; to_go > 0; to_go -= wrote)
-				{
-					file_info.sigpipe_occured = 0;
-					err_clear(min);
-					wrote = write(file_stdin, buf + (len - to_go), to_go);
-					if(errno == EPIPE)
-						file_info.sigpipe_occured = 1;
-					if(wrote < 0)
-						break;
-					else if(file_info.sigpipe_occured)
-						break;
-				}
-				if(file_info.sigpipe_occured)
-					break;
-				if(fgets(buf, sizeof buf, in) != NULL)
-				{
-					const char	*fout;
-					FType		*type;
-
-					if((fout = strchr(buf, ':')) == NULL)
-						continue;
-					for(fout++; isspace(*fout); fout++)
-						;
-					if((type = match_file(min->cfg.type, DP_SEL_ROW(here), fout)) != NULL)
-						DP_SEL_TYPE(here) = type;
-				}
-			}
-			fclose(in);
-		}
-		close(file_stdin);
-		close(file_stdout);
-		g_spawn_close_pid(file_pid);
-		err_clear(min);
-		if(file_info.sigpipe_occured)
-		{
-			/* FIXME: This is problematic; the nice printf() text is often lost due to free space printing. */
-			err_printf(min, _("Got SIGPIPE when writing to 'file' process (%s), it seems to have terminated prematurely."), argv0);
-			/* FIXME: As a last resort, this at leas "sticks" so an error gets shown when we get out. */
-			errno = EPIPE;
-		}
-	}
-	else
-	{
-		g_prefix_error(&error, _("Unable to run spawn 'file' command: "));
-		err_printf(min, "%s", error->message);
-		g_error_free(error);
-	}
-	g_slist_free(file_info.files);
-	file_info.files = NULL;
+	return (tries == hits);
 }
 
 /* ----------------------------------------------------------------------------------------- */
@@ -570,7 +377,7 @@
 */
 GList * typ_type_set_name(GList *list, FType *type, const gchar *name)
 {
-	stu_strncpy(type->name, name, sizeof type->name);
+	g_strlcpy(type->name, name, sizeof type->name);
 	return list;
 }
 
@@ -602,3 +409,183 @@
 
 	return g_list_insert(list, type, np);
 }
+
+/* ----------------------------------------------------------------------------------------- */
+
+void typ_identify_begin(DirPane *dp)
+{
+	GList	*here;
+
+	if(file_info.files != NULL)
+		g_warning("**TYPES: Attempted to nest calls to typ_identify_begin()!");
+
+	for(here = dp->main->cfg.type; here != NULL; here = g_list_next(here))
+	{
+		if(((FType *) here->data)->flags & FTFL_FILEMATCH)
+			break;
+	}
+	file_info.file_used = (here != NULL);
+}
+
+static FType * identify(DirPane *dp, const DirRow2 *row)
+{
+	const GList	*here;
+
+	for(here = dp->main->cfg.type; here != NULL; here = g_list_next(here))
+	{
+		if(check_type(dp, row, here->data, NULL))
+			return here->data;
+	}
+	return NULL;
+}
+
+void typ_identify(DirPane *dp, const DirRow2 *row)
+{
+	FType	*ft;
+
+	ft = identify(dp, row);
+	if(ft != NULL)
+		dp_row_set_ftype(dp_get_tree_model(dp), row, ft);
+	if(TYP_IS_UNKNOWN(ft) && file_info.file_used)
+	{
+		DirRow2	*sr;
+
+		sr = g_slice_alloc(sizeof *sr);
+		memcpy(sr, row, sizeof *sr);
+		file_info.files = g_slist_prepend(file_info.files, sr);
+	}
+}
+
+/* 2010-03-13 -	Attempt to match all types in list against <line>, knowing that 'file' said
+**		<fout>. Only types that include a 'file'-matching RE are checked, of course.
+**		Returns the matching type if any, or NULL if there's no match.
+*/
+static FType * match_file(DirPane *dp, GList *list, DirRow2 *row, const gchar *fout)
+{
+	FType	*type;
+
+	for(; (list != NULL) && (type = (FType *) list->data); list = g_list_next(list))
+	{
+		if(check_type(dp, row, list->data, fout))
+			return type;
+	}
+	return NULL;
+}
+
+/* 2009-03-11 -	Trivial SIGPIPE handler, that just sets a global flag. */
+static void sigpipe_handler(int sig)
+{
+	if(sig != SIGPIPE)
+		return;
+	g_atomic_int_set(&file_info.sigpipe_occured, 1);
+}
+
+/* 2009-03-11 -	Installs a signal handler for SIGPIPE, so we can catch broken 'file' runs. */
+static gboolean install_handler(void)
+{
+	struct sigaction	act;
+
+	if(file_info.sigpipe_installed)
+		return TRUE;
+
+	act.sa_handler = sigpipe_handler;
+	sigemptyset(&act.sa_mask);
+	act.sa_flags	= 0;
+
+	return file_info.sigpipe_installed = (sigaction(SIGPIPE, &act, NULL) == 0);
+}
+
+gboolean typ_identify_end(DirPane *dp)
+{
+	gchar		*argv = { "file", "-n", "-f", "-", NULL }, *path;
+	GPid		file_pid;
+	gint		file_stdin, file_stdout;
+	GError		*error = NULL;
+	GtkTreeModel	*tm = dp_get_tree_model(dp);
+	GSList		*here;
+	gboolean	ret = TRUE;
+
+	if(file_info.files == NULL || !dp->dir.is_local)
+		return TRUE;
+	if((path = g_file_get_path(dp->dir.root)) == NULL)
+		return TRUE;
+
+	install_handler();
+
+	if(g_spawn_async_with_pipes(path, argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
+				    NULL, NULL, &file_pid, &file_stdin, &file_stdout, NULL, &error))
+	{
+		FILE	*in;
+
+		if((in = fdopen(file_stdout, "rt")) != NULL)
+		{
+			for(here = file_info.files; here != NULL; here = g_slist_next(here))
+			{
+				gchar	bufURI_MAX + 256, *path;
+				size_t	len, to_go;
+				ssize_t	wrote;
+
+				/* Handle missing path by skipping, just like we do below. */
+				if((path = g_file_get_path(dp_get_file_from_row(dp, here->data))) == NULL)
+					continue;
+				len = g_snprintf(buf, sizeof buf, "%s\n", path);
+				g_free(path);
+				if(len >= sizeof buf)	/* Handle overflow by just skipping that file. */
+					continue;
+				g_atomic_int_set(&file_info.sigpipe_occured, 0);
+				for(to_go = len; to_go > 0; to_go -= wrote)
+				{
+					wrote = write(file_stdin, buf + (len - to_go), to_go);
+					if(wrote < 0)
+					{
+						if(errno == EPIPE)
+							g_atomic_int_set(&file_info.sigpipe_occured, 1);
+						break;
+					}
+				}
+				if(g_atomic_int_get(&file_info.sigpipe_occured))
+					break;
+				if(fgets(buf, sizeof buf, in) != NULL)
+				{
+					const char	*fout;
+					char		*lf;
+					FType		*type;
+
+					if((fout = strrchr(buf, ':')) == NULL)
+						continue;
+					for(fout++; isspace(*fout); fout++)
+						;
+					if((lf = strchr(fout + 1, '\n')) != NULL)
+						*lf = '\0';
+					if((type = match_file(dp, dp->main->cfg.type, here->data, fout)) != NULL)
+						dp_row_set_ftype(tm, here->data, type);
+				}
+			}
+			fclose(in);
+		}
+		close(file_stdin);
+		close(file_stdout);
+		g_spawn_close_pid(file_pid);
+		if(g_atomic_int_get(&file_info.sigpipe_occured))
+		{
+			/* FIXME: This is problematic; the nicely formatted text is often lost due to free space printing. */
+			err_printf(dp->main, _("Got SIGPIPE when writing to 'file' process (%s), it seems to have terminated prematurely."), argv0);
+			ret = FALSE;
+		}
+	}
+	else
+	{
+		g_prefix_error(&error, _("Unable to run spawn 'file' command: "));
+		err_printf(dp->main, "%s", error->message);
+		g_error_free(error);
+		ret = FALSE;
+	}
+	/* Walk list once more, freeing all data. */
+	for(here = file_info.files; here != NULL; here = g_slist_next(here))
+		g_slice_free1(sizeof (DirRow2), here->data);
+	g_slist_free(file_info.files);
+	file_info.files = NULL;
+	g_free(path);
+
+	return ret;
+}

gentoo-0.15.6.tar.bz2/src/types.h -> gentoo-0.19.9.tar.gz/src/types.h Changed

gentoo-0.15.6.tar.bz2/src/userinfo.c -> gentoo-0.19.9.tar.gz/src/userinfo.c Changed

@@ -153,6 +153,22 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
+/* 2010-02-11 -	Returns the current user's home directory. Implemented according to the
+**		guidelines in the glib documentation. Does never return NULL or an empty'
+**		string, defaults to "/" if all else fails. Prefers $HOME over passwd.
+*/
+const gchar * usr_get_home(void)
+{
+	const char *home = g_getenv ("HOME");
+	if(!home)
+		home = g_get_home_dir();
+	if(!home || *home == '\0')
+		return "/";
+	return home;
+}
+
+/* ----------------------------------------------------------------------------------------- */
+
 /* 1998-05-29 -	Rewritten & renamed. This routine looks up the name of the user with the given
 **		<uid>. Returns pointer to string, or NULL if the user is unknown.
 */
@@ -204,7 +220,7 @@
 		if((uname = usr_lookup_uname(geteuid())) != NULL)
 			return g_hash_table_lookup(the_usr.dict_uhome, uname);
 	}
-	return g_hash_table_lookup(the_usr.dict_uhome, uname);
+	return usr_get_home();
 }
 
 /* 1998-05-29 -	Rewritten & renamed. This routine looks up the name of the group with the given

gentoo-0.15.6.tar.bz2/src/userinfo.h -> gentoo-0.19.9.tar.gz/src/userinfo.h Changed

gentoo-0.15.6.tar.bz2/src/window.c -> gentoo-0.19.9.tar.gz/src/window.c Changed

@@ -10,6 +10,7 @@
 #include <stdlib.h>
 
 #include "guiutil.h"
+#include "graphics/icon_gentoo_small.xpm"
 
 #include "window.h"
 
@@ -17,28 +18,28 @@
 
 typedef struct
 {
-	guint32 id;			/* Unique identifier for this windata. */
-	WinType type;			/* What type of window? */
-	gboolean persistent;		/* Makes close() actually do a hide(). */
-	const gchar *title;		/* Text for window's title bar. */
-	const gchar *label;		/* Short descriptive label (like "main", "config" etc). */
-	gboolean pos_grab;
-	gboolean size_grab;
-	/* Data below here is stored in config file. */
-	gint x, y;			/* Window's opening position. */
-	gint width, height;		/* The desired size of this window. */
-	gboolean pos_use;		/* Should we set use the recorded position? */
-	gboolean pos_update;		/* Update recorded position when window closes? */
-	gboolean size_use;		/* Use recorded size? */
-	gboolean size_update;		/* Update recorded size with current size on close? */
+	guint32		id;			/* Unique identifier for this windata. */
+	WinType		type;			/* What type of window? */
+	gboolean	persistent;		/* Makes close() actually do a hide(). */
+	const gchar	*title;			/* Text for window's title bar. */
+	const gchar	*label;			/* Short descriptive label (like "main", "config" etc). */
+	gboolean	pos_grab;
+	gboolean	size_grab;
+	/* Data below here is stored in configuration file. */
+	gint		x, y;			/* Window's opening position. */
+	gint		width, height;		/* The desired size of this window. */
+	gboolean	pos_use;		/* Should we set use the recorded position? */
+	gboolean	pos_update;		/* Update recorded position when window closes? */
+	gboolean	size_use;		/* Use recorded size? */
+	gboolean	size_update;		/* Update recorded size with current size on close? */
 } WinDef;
 
 struct WinInfo
 {
-	MainInfo *min;			/* The handiness of this pointer cannot be overstated. */
-	GList *windows;			/* List of WinDef:s as per above. There's no rush. */
-	gint	border_width;		/* User's idea of her window manager's border size. Hackish. */
-	gint	border_height;
+	MainInfo	*min;			/* The handiness of this pointer cannot be overstated. */
+	GList		*windows;		/* List of WinDef:s as per above. There's no rush. */
+	gint		border_width;		/* User's idea of her window manager's border size. Hackish. */
+	gint		border_height;
 };
 
 /* ----------------------------------------------------------------------------------------- */
@@ -147,17 +148,17 @@
 	gboolean *modified;
 
 	*flag = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wid));
-	if((modified = gtk_object_get_user_data(GTK_OBJECT(wid))) != NULL)
+	if((modified = g_object_get_data(G_OBJECT(wid), "modified")) != NULL)
 		*modified = TRUE;
 }
 
-static void evt_integer_changed(GtkWidget *wid, gpointer user)
+static void evt_integer_changed(GtkAdjustment *adj, gpointer user)
 {
 	gint *value = user;
 	gboolean *modified;
 
-	*value = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(wid));
-	if((modified = gtk_object_get_user_data(GTK_OBJECT(wid))) != NULL)
+	*value = gtk_adjustment_get_value(adj);
+	if((modified = g_object_get_data(G_OBJECT(adj), "modified")) != NULL)
 		*modified = TRUE;
 }
 
@@ -172,13 +173,11 @@
 	MainInfo *min;
 	WinDef *wd = user;
 
-	min = gtk_object_get_data(GTK_OBJECT(wid), "min");
+	min = g_object_get_data(G_OBJECT(wid), "min");
 	gdk_window_get_position(min->gui->window->window, &wd->x, &wd->y);
-	gtk_spin_button_set_value(GTK_SPIN_BUTTON(gtk_object_get_data(
-			GTK_OBJECT(wid), "spin1")), wd->x);
-	gtk_spin_button_set_value(GTK_SPIN_BUTTON(gtk_object_get_data(
-			GTK_OBJECT(wid), "spin2")), wd->y);
-	*(gboolean *) gtk_object_get_data(GTK_OBJECT(wid), "modified") = TRUE;
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(g_object_get_data(G_OBJECT(wid), "spin1")), wd->x);
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(g_object_get_data(G_OBJECT(wid), "spin2")), wd->y);
+	*(gboolean *) g_object_get_data(G_OBJECT(wid), "modified") = TRUE;
 }
 
 /* Grab size. Works only for main gentoo window. See comment for pos_grab above. */
@@ -187,11 +186,11 @@
 	MainInfo *min;
 	WinDef *wd = user;
 
-	min = gtk_object_get_data(GTK_OBJECT(wid), "min");
+	min = g_object_get_data(G_OBJECT(wid), "min");
 	gdk_window_get_size(min->gui->window->window, &wd->width, &wd->height);
-	gtk_spin_button_set_value(GTK_SPIN_BUTTON(gtk_object_get_data(GTK_OBJECT(wid), "spin1")), wd->width);
-	gtk_spin_button_set_value(GTK_SPIN_BUTTON(gtk_object_get_data(GTK_OBJECT(wid), "spin2")), wd->height);
-	*(gboolean *) gtk_object_get_data(GTK_OBJECT(wid), "modified") = TRUE;
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(g_object_get_data(G_OBJECT(wid), "spin1")), wd->width);
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(g_object_get_data(G_OBJECT(wid), "spin2")), wd->height);
+	*(gboolean *) g_object_get_data(G_OBJECT(wid), "modified") = TRUE;
 }
 
 static GtkWidget * subframe_build(const WinInfo *wi, WinDef *win, gint type, gboolean *modified)
@@ -207,13 +206,13 @@
 	vbox = gtk_vbox_new(FALSE, 0);
 	cbtn = gtk_check_button_new_with_label(_("Set on Open?"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cbtn), (type == SUBFRAME_POSITION) ? win_window_pos_use_get(wi, win->id) : win_window_size_use_get(wi, win->id));
-	gtk_object_set_user_data(GTK_OBJECT(cbtn), modified);
+	g_object_set_data(G_OBJECT(cbtn), "modified", modified);
 	g_signal_connect(G_OBJECT(cbtn), "clicked", G_CALLBACK(evt_boolean_clicked), (type == SUBFRAME_POSITION) ? &win->pos_use : &win->size_use);
 	gtk_box_pack_start(GTK_BOX(vbox), cbtn, FALSE, FALSE, 0);
 
 	cbtn = gtk_check_button_new_with_label(_("Update on Close?"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cbtn), (type == SUBFRAME_POSITION) ? win_window_pos_update_get(wi, win->id) : win_window_size_update_get(wi, win->id));
-	gtk_object_set_user_data(GTK_OBJECT(cbtn), modified);
+	g_object_set_data(G_OBJECT(cbtn), "modified", modified);
 	g_signal_connect(G_OBJECT(cbtn), "clicked", G_CALLBACK(evt_boolean_clicked), (type == SUBFRAME_POSITION) ? &win->pos_update : &win->size_update);
 	gtk_box_pack_start(GTK_BOX(vbox), cbtn, FALSE, FALSE, 0);
 
@@ -228,15 +227,15 @@
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 0, 0);
 	adj = gtk_adjustment_new(val1, -1.0, 65535.0, 1.0, 25.0, 0.0);
 	spin1 = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 0.0, 0.0);
-	gtk_object_set_user_data(GTK_OBJECT(spin1), modified);
-	g_signal_connect(G_OBJECT(spin1), "changed", G_CALLBACK(evt_integer_changed), type == SUBFRAME_POSITION ? &win->x : &win->width);
+	g_object_set_data(G_OBJECT(adj), "modified", modified);
+	g_signal_connect(G_OBJECT(adj), "value_changed", G_CALLBACK(evt_integer_changed), type == SUBFRAME_POSITION ? &win->x : &win->width);
 	gtk_table_attach(GTK_TABLE(table), spin1, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
 	label = gtk_label_new(_(etext2 * type + 1));
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, 0, 0, 0, 0);
 	adj = gtk_adjustment_new(val2, -1.0, 65535.0, 1.0, 25.0, 0.0);
 	spin2 = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 0.0, 0.0);
-	gtk_object_set_user_data(GTK_OBJECT(spin2), modified);
-	g_signal_connect(G_OBJECT(spin2), "changed", G_CALLBACK(evt_integer_changed), type == SUBFRAME_POSITION ? &win->y : &win->height);
+	g_object_set_data(G_OBJECT(adj), "modified", modified);
+	g_signal_connect(G_OBJECT(adj), "value_changed", G_CALLBACK(evt_integer_changed), type == SUBFRAME_POSITION ? &win->y : &win->height);
 	gtk_table_attach(GTK_TABLE(table), spin2, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
 	if((type == SUBFRAME_POSITION && win->pos_grab) || (type == SUBFRAME_SIZE && win->size_grab))
 	{
@@ -244,10 +243,10 @@
 
 		grab = gtk_button_new_with_label(_("Grab"));
 
-		gtk_object_set_data(GTK_OBJECT(grab), "min", wi->min);
-		gtk_object_set_data(GTK_OBJECT(grab), "spin1", spin1);
-		gtk_object_set_data(GTK_OBJECT(grab), "spin2", spin2);
-		gtk_object_set_data(GTK_OBJECT(grab), "modified", modified);
+		g_object_set_data(G_OBJECT(grab), "min", wi->min);
+		g_object_set_data(G_OBJECT(grab), "spin1", spin1);
+		g_object_set_data(G_OBJECT(grab), "spin2", spin2);
+		g_object_set_data(G_OBJECT(grab), "modified", modified);
 		g_signal_connect(G_OBJECT(grab), "clicked", type == SUBFRAME_POSITION ? G_CALLBACK(evt_pos_grab_clicked) : G_CALLBACK(evt_size_grab_clicked), win);
 		gtk_table_attach(GTK_TABLE(table), grab, 2, 3, 0, 2, 0, 0, 0, 0);
 	}
@@ -572,6 +571,19 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
+/* 2010-12-12 -	Rewritten to not use deprecated (and crazy-seeming) GDK calls. */
+static void window_set_icon(GtkWindow *win)
+{
+	GdkPixbuf	*pbuf;
+
+	if((pbuf = gdk_pixbuf_new_from_xpm_data(icon_gentoo_small_xpm)) != NULL)
+	{
+		gtk_window_set_default_icon(pbuf);
+		gtk_window_set_icon_name(win, PACKAGE);
+		g_object_unref(G_OBJECT(pbuf));	/* I believe GTK+ owns this, now. */
+	}
+}
+
 /* 1999-12-23 -	Open the window described by <key> in <wi>. The window will not be shown yet. */
 GtkWidget * win_window_open(const WinInfo *wi, guint32 id)
 {
@@ -580,9 +592,6 @@
 	if((wd = window_find(wi, id)) != NULL)
 	{
 		GtkWidget *wid = NULL;
-		gint old_errno;
-
-		old_errno = errno;
 
 		switch (wd->type)
 		{
@@ -594,19 +603,20 @@
 			wid = gtk_window_new(GTK_WINDOW_POPUP);
 			break;
 		case WIN_TYPE_COMPLEX_DIALOG:
-			wid = gtk_dialog_new();
+			wid = win_dialog_open(wi->min->gui->window);
 			break;
 		}
-		gtk_object_set_data(GTK_OBJECT(wid), "wininfo", (gpointer) wi);
-		gtk_object_set_data(GTK_OBJECT(wid), "windef", (gpointer) wd);
+		g_object_set_data(G_OBJECT(wid), "wininfo", (gpointer) wi);
+		g_object_set_data(G_OBJECT(wid), "windef", (gpointer) wd);
 		if(!wd->pos_use)
 			gtk_window_set_position(GTK_WINDOW(wid), GTK_WIN_POS_MOUSE);
 		gtk_widget_realize(wid);
-		if(wi->min->gui != NULL && id != WIN_MAIN)
+		if(id == WIN_MAIN)
+			window_set_icon(GTK_WINDOW(wid));
+		else if(id != WIN_MAIN && id != WIN_TYPE_COMPLEX_DIALOG && wi->min->gui != NULL)
 			gtk_window_set_transient_for(GTK_WINDOW(wid), GTK_WINDOW(wi->min->gui->window));
 		if(wd->title != NULL)
 			win_window_set_title(wid, wd->title);
-		errno = old_errno;
 		return wid;
 	}
 	return NULL;
@@ -621,8 +631,8 @@
 
 	if((wd = window_find(wi, id)) != NULL)
 	{
-		gtk_object_set_data(GTK_OBJECT(window), "wininfo", (gpointer) wi);
-		gtk_object_set_data(GTK_OBJECT(window), "windef", wd);
+		g_object_set_data(G_OBJECT(window), "wininfo", (gpointer) wi);
+		g_object_set_data(G_OBJECT(window), "windef", wd);
 	}
 }
 
@@ -637,7 +647,6 @@
 #if defined ENABLE_NLS
 	gchar obuf256; /* Buffer, subsequent setlocale() call kills it otherwise. */
 	const gchar *op;
-	int old_errno = errno; /* Buffer the errno, so any errors here don't leak out. */
 
 	/* Get current locale, before slamming "C" in there. */
 	if((op = setlocale(LC_ALL, NULL)) != NULL)
@@ -655,7 +664,6 @@
 #if defined ENABLE_NLS
 	if(op != NULL)
 	setlocale(LC_ALL, obuf);
-	errno = old_errno; /* Restore the errno, ignoring any errors that might have happened here. */
 #endif
 }
 
@@ -666,24 +674,35 @@
 {
 	WinInfo	*wi;
 	WinDef	*wd;
-	gint	old_errno;
 
+#if GTK_CHECK_VERSION(2, 20, 0)
+	if(gtk_widget_get_visible(window))
+		return;
+#else
 	if(GTK_WIDGET_VISIBLE(window))
 		return;
+#endif
 
-	wi = gtk_object_get_data(GTK_OBJECT(window), "wininfo");
-	wd = gtk_object_get_data(GTK_OBJECT(window), "windef");
+	wi = g_object_get_data(G_OBJECT(window), "wininfo");
+	wd = g_object_get_data(G_OBJECT(window), "windef");
 	if((wd != NULL) && wd->size_use && wd->width >= 0)
 		gtk_window_set_default_size(GTK_WINDOW(window), wd->width, wd->height);
+	/* For the main window, make sure to make it possible to shrink very much. */
+	if(wd != NULL && wd->id == WIN_MAIN)
+	{
+		GdkGeometry	geo;
+
+		geo.min_width = 10;
+		geo.min_height = 10;
+		gtk_window_set_geometry_hints(GTK_WINDOW(window), window, &geo, GDK_HINT_MIN_SIZE);
+	}
 
 	/* This causes the window to appear at some more or less random position. We then reposition
 	** it to the configured place. This is visually distracting, unattractive, and almost s*cks,
 	** but unfortunately I haven't been able to figure out how to fix it. If you move the show()
 	** call to below the if, it works, but not all the time. :( Tips welcome.
 	*/
-	old_errno = errno;
 	gtk_widget_show_all(window);
-	errno = old_errno;
 
 	/* If user wants to set position, check where it ended up and move it home. */
 	if((wd != NULL) && wd->pos_use && wd->x >= 0)
@@ -723,7 +742,7 @@
 {
 	WinDef *wd;
 
-	if((wd = gtk_object_get_data(GTK_OBJECT(win), "windef")) != NULL)
+	if((wd = g_object_get_data(G_OBJECT(win), "windef")) != NULL)
 	{
 		gboolean ret = FALSE;
 		gint ta, tb;
@@ -753,7 +772,7 @@
 {
 	WinDef *wd;
 
-	if((wd = gtk_object_get_data(GTK_OBJECT(win), "windef")) != NULL)
+	if((wd = g_object_get_data(G_OBJECT(win), "windef")) != NULL)
 	{
 		gboolean ret;
 
@@ -767,3 +786,18 @@
 	gtk_widget_destroy(win);
 	return FALSE;
 }
+
+/* ----------------------------------------------------------------------------------------- */
+
+/* 2010-12-12 -	New single way of opening a dialog, that tries to make sure it gets the proper
+**		linkage to the main window. This shares the icon, among (possibly) other things.
+*/
+GtkWidget * win_dialog_open(GtkWidget *main_window)
+{
+	GtkWidget	*wid = gtk_dialog_new();
+
+	if(main_window != NULL)
+		gtk_window_set_transient_for(GTK_WINDOW(wid), GTK_WINDOW(main_window));
+
+	return wid;
+}

gentoo-0.15.6.tar.bz2/src/window.h -> gentoo-0.19.9.tar.gz/src/window.h Changed

gentoo-0.15.6.tar.bz2/src/xmlutil.c -> gentoo-0.19.9.tar.gz/src/xmlutil.c Changed