diff -Nru ghex-3.3.90/aclocal.m4 ghex-3.3.91/aclocal.m4
--- ghex-3.3.90/aclocal.m4	2012-02-21 06:09:18.000000000 +0000
+++ ghex-3.3.91/aclocal.m4	2012-03-05 17:30:35.000000000 +0000
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -403,12 +404,15 @@
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 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 1
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -418,7 +422,7 @@
 [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.11.1], [],
+m4_if([$1], [1.11.3], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -434,19 +438,21 @@
 # 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.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 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 1
+
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -528,14 +534,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 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 10
+# serial 12
 
 # 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,
@@ -575,6 +581,7 @@
   # 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'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -639,7 +646,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | 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.
@@ -704,10 +711,13 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -929,12 +939,15 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 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 1
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -974,8 +987,8 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
+# 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -995,7 +1008,7 @@
        [disable], [m4_define([am_maintainer_other], [enable])],
        [m4_define([am_maintainer_other], [enable])
         m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
 [  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
@@ -1106,12 +1119,15 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 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 1
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check for `mkdir -p'.
@@ -1134,13 +1150,14 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 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_MANGLE_OPTION(NAME)
 # -----------------------
@@ -1148,13 +1165,13 @@
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -1230,13 +1247,13 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011  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 1
+# serial 2
 
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
@@ -1251,18 +1268,50 @@
 no)  AM_DEFAULT_VERBOSITY=1;;
 *)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
+dnl
+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using `$V' instead of `$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
 AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 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 1
+
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
@@ -1285,13 +1334,13 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 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
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -1300,13 +1349,13 @@
 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.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1328,10 +1377,11 @@
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
 m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
      [m4_case([$1], [ustar],, [pax],,
               [m4_fatal([Unknown tar format])])
 AC_MSG_CHECKING([how to create a $1 tar archive])
diff -Nru ghex-3.3.90/config.guess ghex-3.3.91/config.guess
--- ghex-3.3.90/config.guess	2012-02-21 06:09:19.000000000 +0000
+++ ghex-3.3.91/config.guess	2012-03-05 17:30:36.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2012-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,9 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -144,7 +145,7 @@
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -180,7 +181,7 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -223,7 +224,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +270,10 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,7 +299,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -394,23 +398,23 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -480,8 +484,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -494,7 +498,7 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -551,7 +555,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -594,52 +598,52 @@
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -730,22 +734,22 @@
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -769,14 +773,14 @@
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -788,13 +792,12 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
@@ -803,15 +806,18 @@
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-    	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -866,7 +872,7 @@
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -878,20 +884,29 @@
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -933,7 +948,7 @@
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
@@ -959,7 +974,7 @@
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -967,14 +982,17 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -983,11 +1001,11 @@
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1019,7 +1037,7 @@
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1047,13 +1065,13 @@
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1088,8 +1106,8 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1132,10 +1150,10 @@
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1161,11 +1179,11 @@
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1230,6 +1248,9 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@@ -1275,13 +1296,13 @@
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1321,11 +1342,11 @@
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 
diff -Nru ghex-3.3.90/config.sub ghex-3.3.91/config.sub
--- ghex-3.3.90/config.sub	2012-02-21 06:09:19.000000000 +0000
+++ ghex-3.3.91/config.sub	2012-03-05 17:30:36.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2012-01-01'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -75,8 +75,9 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,8 +124,9 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
@@ -156,8 +158,8 @@
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -173,10 +175,10 @@
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -249,13 +251,17 @@
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| maxq | mb | microblaze | mcore | mep | metag \
@@ -281,29 +287,39 @@
 	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
+	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -313,6 +329,18 @@
 		basic_machine=mt-unknown
 		;;
 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -332,16 +360,19 @@
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -367,25 +398,29 @@
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -410,7 +445,7 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -480,11 +515,20 @@
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -516,7 +560,7 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -674,7 +718,6 @@
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -732,7 +775,7 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
+	microblaze)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw32)
@@ -771,10 +814,18 @@
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -839,6 +890,12 @@
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -921,9 +978,10 @@
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -1017,6 +1075,9 @@
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1073,20 +1134,8 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1156,6 +1205,9 @@
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1253,11 +1305,11 @@
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
+	-auroraux)
+		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1293,8 +1345,9 @@
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1341,7 +1394,7 @@
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1390,7 +1443,7 @@
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1435,6 +1488,8 @@
 	-dicos*)
 		os=-dicos
 		;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1457,10 +1512,10 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1472,8 +1527,17 @@
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1493,14 +1557,11 @@
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1527,7 +1588,7 @@
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
diff -Nru ghex-3.3.90/configure ghex-3.3.91/configure
--- ghex-3.3.90/configure	2012-02-21 06:09:19.000000000 +0000
+++ ghex-3.3.91/configure	2012-03-05 17:30:35.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for ghex 3.3.90.
+# Generated by GNU Autoconf 2.68 for ghex 3.3.91.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=ghex>.
 #
@@ -571,8 +571,8 @@
 # Identity of this package.
 PACKAGE_NAME='ghex'
 PACKAGE_TARNAME='ghex'
-PACKAGE_VERSION='3.3.90'
-PACKAGE_STRING='ghex 3.3.90'
+PACKAGE_VERSION='3.3.91'
+PACKAGE_STRING='ghex 3.3.91'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=ghex'
 PACKAGE_URL=''
 
@@ -684,7 +684,6 @@
 PKG_CONFIG_PATH
 PKG_CONFIG
 GSETTINGS_DISABLE_SCHEMAS_COMPILE
-GLIB_GENMARSHAL
 CPP
 OTOOL64
 OTOOL
@@ -718,6 +717,7 @@
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -733,6 +733,8 @@
 CC
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -1383,7 +1385,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 ghex 3.3.90 to adapt to many kinds of systems.
+\`configure' configures ghex 3.3.91 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1453,7 +1455,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ghex 3.3.90:";;
+     short | recursive ) echo "Configuration of ghex 3.3.91:";;
    esac
   cat <<\_ACEOF
 
@@ -1485,7 +1487,7 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1591,7 +1593,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ghex configure 3.3.90
+ghex configure 3.3.91
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2014,7 +2016,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ghex $as_me 3.3.90, which was
+It was created by ghex $as_me 3.3.91, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2836,7 +2838,7 @@
 
 # Define the identity of the package.
  PACKAGE='ghex'
- VERSION='3.3.90'
+ VERSION='3.3.91'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2866,19 +2868,19 @@
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
 
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then :
   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
@@ -2909,6 +2911,33 @@
 no)  AM_DEFAULT_VERBOSITY=1;;
 *)   AM_DEFAULT_VERBOSITY=0;;
 esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
 AM_BACKSLASH='\'
 
 
@@ -3754,6 +3783,7 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -3778,6 +3808,7 @@
   # 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'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -3837,7 +3868,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | 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.
@@ -3904,8 +3935,8 @@
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -4750,6 +4781,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -4789,7 +4825,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -5218,7 +5254,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -5859,13 +5895,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -6012,6 +6048,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -6400,7 +6437,7 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -6411,7 +6448,20 @@
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -7051,7 +7101,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -7062,6 +7118,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -7094,6 +7151,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -7115,7 +7173,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -7519,7 +7579,22 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -7597,6 +7672,10 @@
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -8056,7 +8135,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -8147,18 +8228,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -8520,7 +8616,6 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -8770,8 +8865,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -9150,6 +9244,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -9195,6 +9290,7 @@
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -9223,10 +9319,6 @@
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -9239,7 +9331,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -9278,7 +9370,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -9902,11 +9993,6 @@
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -9996,7 +10082,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -10005,7 +10091,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -10070,7 +10156,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -10209,7 +10295,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -10217,10 +10303,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -10228,7 +10310,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -10246,7 +10328,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -10266,17 +10348,18 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -10337,7 +10420,7 @@
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -10353,7 +10436,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -10390,9 +10473,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10478,7 +10561,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -10547,7 +10630,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10572,7 +10655,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -10596,7 +10679,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -10627,7 +10710,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10637,7 +10720,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -11419,6 +11502,8 @@
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -11470,47 +11555,6 @@
 done
 
 
-# Extract the first word of "glib-genmarshal", so it can be a program name with args.
-set dummy glib-genmarshal; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GLIB_GENMARSHAL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GLIB_GENMARSHAL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # 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_GLIB_GENMARSHAL="$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
-GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
-if test -n "$GLIB_GENMARSHAL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5
-$as_echo "$GLIB_GENMARSHAL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
 
 
   # Check whether --enable-schemas-compile was given.
@@ -11752,6 +11796,10 @@
 _ACEOF
 
 
+ATK_MIN_VERSION=1.0.0
+GLIB_MIN_VERSION=2.31.10
+GTK_MIN_VERSION=3.3.8
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGTKHEX" >&5
@@ -11761,15 +11809,21 @@
     pkg_cv_LIBGTKHEX_CFLAGS="$LIBGTKHEX_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0	\\
-		  atk >= 1.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0	\
-		  atk >= 1.0.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+	atk >= \$ATK_MIN_VERSION
+	gtk+-3.0 >= \$GTK_MIN_VERSION
+\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "
+	atk >= $ATK_MIN_VERSION
+	gtk+-3.0 >= $GTK_MIN_VERSION
+") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBGTKHEX_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0	\
-		  atk >= 1.0.0" 2>/dev/null`
+  pkg_cv_LIBGTKHEX_CFLAGS=`$PKG_CONFIG --cflags "
+	atk >= $ATK_MIN_VERSION
+	gtk+-3.0 >= $GTK_MIN_VERSION
+" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11780,15 +11834,21 @@
     pkg_cv_LIBGTKHEX_LIBS="$LIBGTKHEX_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0	\\
-		  atk >= 1.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0	\
-		  atk >= 1.0.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+	atk >= \$ATK_MIN_VERSION
+	gtk+-3.0 >= \$GTK_MIN_VERSION
+\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "
+	atk >= $ATK_MIN_VERSION
+	gtk+-3.0 >= $GTK_MIN_VERSION
+") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBGTKHEX_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0	\
-		  atk >= 1.0.0" 2>/dev/null`
+  pkg_cv_LIBGTKHEX_LIBS=`$PKG_CONFIG --libs "
+	atk >= $ATK_MIN_VERSION
+	gtk+-3.0 >= $GTK_MIN_VERSION
+" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11808,17 +11868,23 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBGTKHEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= 3.0	\
-		  atk >= 1.0.0" 2>&1`
+	        LIBGTKHEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
+	atk >= $ATK_MIN_VERSION
+	gtk+-3.0 >= $GTK_MIN_VERSION
+" 2>&1`
         else
-	        LIBGTKHEX_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= 3.0	\
-		  atk >= 1.0.0" 2>&1`
+	        LIBGTKHEX_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+	atk >= $ATK_MIN_VERSION
+	gtk+-3.0 >= $GTK_MIN_VERSION
+" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBGTKHEX_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gtk+-3.0 >= 3.0	\
-		  atk >= 1.0.0) were not met:
+	as_fn_error $? "Package requirements (
+	atk >= $ATK_MIN_VERSION
+	gtk+-3.0 >= $GTK_MIN_VERSION
+) were not met:
 
 $LIBGTKHEX_PKG_ERRORS
 
@@ -11864,15 +11930,21 @@
     pkg_cv_GHEX_CFLAGS="$GHEX_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 >= 2.26	\\
-		  gtk+-3.0 >= 3.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.26	\
-		  gtk+-3.0 >= 3.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+	gio-2.0 >= \$GLIB_MIN_VERSION
+	gtk+-3.0 >= \$GTK_MIN_VERSION
+\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "
+	gio-2.0 >= $GLIB_MIN_VERSION
+	gtk+-3.0 >= $GTK_MIN_VERSION
+") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GHEX_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.26	\
-		  gtk+-3.0 >= 3.0" 2>/dev/null`
+  pkg_cv_GHEX_CFLAGS=`$PKG_CONFIG --cflags "
+	gio-2.0 >= $GLIB_MIN_VERSION
+	gtk+-3.0 >= $GTK_MIN_VERSION
+" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11883,15 +11955,21 @@
     pkg_cv_GHEX_LIBS="$GHEX_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 >= 2.26	\\
-		  gtk+-3.0 >= 3.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.26	\
-		  gtk+-3.0 >= 3.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+	gio-2.0 >= \$GLIB_MIN_VERSION
+	gtk+-3.0 >= \$GTK_MIN_VERSION
+\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "
+	gio-2.0 >= $GLIB_MIN_VERSION
+	gtk+-3.0 >= $GTK_MIN_VERSION
+") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GHEX_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.26	\
-		  gtk+-3.0 >= 3.0" 2>/dev/null`
+  pkg_cv_GHEX_LIBS=`$PKG_CONFIG --libs "
+	gio-2.0 >= $GLIB_MIN_VERSION
+	gtk+-3.0 >= $GTK_MIN_VERSION
+" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11911,17 +11989,23 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GHEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 >= 2.26	\
-		  gtk+-3.0 >= 3.0" 2>&1`
+	        GHEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
+	gio-2.0 >= $GLIB_MIN_VERSION
+	gtk+-3.0 >= $GTK_MIN_VERSION
+" 2>&1`
         else
-	        GHEX_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= 2.26	\
-		  gtk+-3.0 >= 3.0" 2>&1`
+	        GHEX_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+	gio-2.0 >= $GLIB_MIN_VERSION
+	gtk+-3.0 >= $GTK_MIN_VERSION
+" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GHEX_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gio-2.0 >= 2.26	\
-		  gtk+-3.0 >= 3.0) were not met:
+	as_fn_error $? "Package requirements (
+	gio-2.0 >= $GLIB_MIN_VERSION
+	gtk+-3.0 >= $GTK_MIN_VERSION
+) were not met:
 
 $GHEX_PKG_ERRORS
 
@@ -12225,7 +12309,7 @@
 INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
        INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
       INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< $@'
       INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
       INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
     INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -12551,7 +12635,7 @@
 if test $? -ne 0; then
    as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
 $as_echo "$IT_PERL_VERSION" >&6; }
 fi
@@ -15268,7 +15352,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ghex $as_me 3.3.90, which was
+This file was extended by ghex $as_me 3.3.91, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15334,7 +15418,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ghex config.status 3.3.90
+ghex config.status 3.3.91
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -15471,6 +15555,7 @@
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -15553,7 +15638,6 @@
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -15609,6 +15693,7 @@
 # Quote evaled strings.
 for var in SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -15659,7 +15744,6 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -16475,8 +16559,8 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -16530,6 +16614,9 @@
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -16831,10 +16918,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
diff -Nru ghex-3.3.90/configure.ac ghex-3.3.91/configure.ac
--- ghex-3.3.90/configure.ac	2012-02-21 06:05:46.000000000 +0000
+++ ghex-3.3.91/configure.ac	2012-03-05 17:20:59.000000000 +0000
@@ -1,5 +1,5 @@
 AC_PREREQ(2.61)
-AC_INIT([ghex],[3.3.90],[http://bugzilla.gnome.org/enter_bug.cgi?product=ghex],[ghex])
+AC_INIT([ghex],[3.3.91],[http://bugzilla.gnome.org/enter_bug.cgi?product=ghex],[ghex])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/ghex-window.c])
@@ -26,8 +26,6 @@
 # Check for library functions.
 AC_CHECK_FUNCS([pow strstr strtoul])
 
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-
 GLIB_GSETTINGS
 
 LIBGTKHEX_RELEASE=3.0
@@ -36,15 +34,21 @@
 AC_DEFINE_UNQUOTED(LIBGTKHEX_RELEASE_STRING, "$LIBGTKHEX_RELEASE_STRING",
                    [GtkHex library release string.])
 
-PKG_CHECK_MODULES(LIBGTKHEX,
-		  gtk+-3.0 >= 3.0	\
-		  atk >= 1.0.0)
+ATK_MIN_VERSION=1.0.0
+GLIB_MIN_VERSION=2.31.10
+GTK_MIN_VERSION=3.3.8
+
+PKG_CHECK_MODULES(LIBGTKHEX, [
+	atk >= $ATK_MIN_VERSION
+	gtk+-3.0 >= $GTK_MIN_VERSION
+])
 AC_SUBST(LIBGTKHEX_LIBS)
 AC_SUBST(LIBGTKHEX_CFLAGS)
 
-PKG_CHECK_MODULES(GHEX,
-		  gio-2.0 >= 2.26	\
-		  gtk+-3.0 >= 3.0)
+PKG_CHECK_MODULES(GHEX, [
+	gio-2.0 >= $GLIB_MIN_VERSION
+	gtk+-3.0 >= $GTK_MIN_VERSION
+])
 AC_SUBST(GHEX_CFLAGS)
 AC_SUBST(GHEX_LIBS)
 
diff -Nru ghex-3.3.90/data/Makefile.in ghex-3.3.91/data/Makefile.in
--- ghex-3.3.90/data/Makefile.in	2012-02-21 06:09:19.000000000 +0000
+++ ghex-3.3.91/data/Makefile.in	2012-03-05 17:30:36.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -53,11 +53,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = gtkhex-3.pc
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -82,6 +82,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(desktopdir)" \
 	"$(DESTDIR)$(pkgconfigdir)"
 DATA = $(convert_DATA) $(desktop_DATA) $(pkgconfig_DATA)
@@ -122,7 +128,6 @@
 GHEX_CFLAGS = @GHEX_CFLAGS@
 GHEX_LIBS = @GHEX_LIBS@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -318,9 +323,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(convertdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(convertdir)" && rm -f $$files
+	dir='$(DESTDIR)$(convertdir)'; $(am__uninstall_files_from_dir)
 install-desktopDATA: $(desktop_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
@@ -338,9 +341,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
+	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
@@ -358,9 +359,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -415,10 +414,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru ghex-3.3.90/debian/changelog ghex-3.3.91/debian/changelog
--- ghex-3.3.90/debian/changelog	2012-02-21 13:31:35.000000000 +0000
+++ ghex-3.3.91/debian/changelog	2012-03-05 19:06:59.000000000 +0000
@@ -1,3 +1,11 @@
+ghex (3.3.91-0ubuntu1) precise; urgency=low
+
+  * New upstream release.
+  * debian/control.in:
+    - Bump minimum glib and gtk for switch to gresource
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 05 Mar 2012 14:06:52 -0500
+
 ghex (3.3.90-0ubuntu1) precise; urgency=low
 
   * New upstream release.
diff -Nru ghex-3.3.90/debian/control ghex-3.3.91/debian/control
--- ghex-3.3.90/debian/control	2012-02-21 13:31:37.000000000 +0000
+++ ghex-3.3.91/debian/control	2012-03-05 19:07:01.000000000 +0000
@@ -12,9 +12,9 @@
 Build-Depends: cdbs,
                gnome-pkg-tools,
                debhelper (>= 8),
-               libgtk-3-dev (>= 3.0.0),
+               libgtk-3-dev (>= 3.3.8),
                libgail-3-dev,
-               libglib2.0-dev (>= 2.26),
+               libglib2.0-dev (>= 2.31.10),
                libatk1.0-dev (>= 1.0.0),
                gettext,
                intltool (>= 0.41.1),
diff -Nru ghex-3.3.90/debian/control.in ghex-3.3.91/debian/control.in
--- ghex-3.3.90/debian/control.in	2012-02-21 13:31:35.000000000 +0000
+++ ghex-3.3.91/debian/control.in	2012-03-05 19:06:59.000000000 +0000
@@ -7,9 +7,9 @@
 Build-Depends: cdbs,
                gnome-pkg-tools,
                debhelper (>= 8),
-               libgtk-3-dev (>= 3.0.0),
+               libgtk-3-dev (>= 3.3.8),
                libgail-3-dev,
-               libglib2.0-dev (>= 2.26),
+               libglib2.0-dev (>= 2.31.10),
                libatk1.0-dev (>= 1.0.0),
                gettext,
                intltool (>= 0.41.1),
diff -Nru ghex-3.3.90/depcomp ghex-3.3.91/depcomp
--- ghex-3.3.90/depcomp	2012-02-21 06:09:20.000000000 +0000
+++ ghex-3.3.91/depcomp	2012-03-05 17:30:36.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-12-04.11; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
   object      Object file output by `PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -90,10 +90,18 @@
    # This is just like msvisualcpp but w/o cygpath translation.
    # Just convert the backslash-escaped backslashes to single forward
    # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
+   cygpath_u='sed s,\\\\,/,g'
    depmode=msvisualcpp
 fi
 
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -158,10 +166,12 @@
 ' < "$tmpdepfile" |
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -405,6 +415,52 @@
    rm -f "$tmpdepfile"
    ;;
 
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test "$stat" = 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/	\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/	/
+  G
+  p
+}' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
   # dependency tracking mechanisms from slower ones.
@@ -503,7 +559,9 @@
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
   sed '1,2d' "$tmpdepfile" | tr ' ' '
 ' | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
diff -Nru ghex-3.3.90/help/Makefile.in ghex-3.3.91/help/Makefile.in
--- ghex-3.3.90/help/Makefile.in	2012-02-21 06:09:19.000000000 +0000
+++ ghex-3.3.91/help/Makefile.in	2012-03-05 17:30:36.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -76,11 +76,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -121,7 +121,6 @@
 GHEX_CFLAGS = @GHEX_CFLAGS@
 GHEX_LIBS = @GHEX_LIBS@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -387,6 +386,7 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/gnome-doc-utils.make:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -456,10 +456,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru ghex-3.3.90/icons/16x16/Makefile.in ghex-3.3.91/icons/16x16/Makefile.in
--- ghex-3.3.90/icons/16x16/Makefile.in	2012-02-21 06:09:19.000000000 +0000
+++ ghex-3.3.91/icons/16x16/Makefile.in	2012-03-05 17:30:36.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -52,11 +52,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -81,6 +81,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(iconsdir)"
 DATA = $(icons_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -120,7 +126,6 @@
 GHEX_CFLAGS = @GHEX_CFLAGS@
 GHEX_LIBS = @GHEX_LIBS@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -306,9 +311,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -363,10 +366,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru ghex-3.3.90/icons/22x22/Makefile.in ghex-3.3.91/icons/22x22/Makefile.in
--- ghex-3.3.90/icons/22x22/Makefile.in	2012-02-21 06:09:19.000000000 +0000
+++ ghex-3.3.91/icons/22x22/Makefile.in	2012-03-05 17:30:36.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -52,11 +52,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -81,6 +81,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(iconsdir)"
 DATA = $(icons_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -120,7 +126,6 @@
 GHEX_CFLAGS = @GHEX_CFLAGS@
 GHEX_LIBS = @GHEX_LIBS@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -306,9 +311,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -363,10 +366,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru ghex-3.3.90/icons/24x24/Makefile.in ghex-3.3.91/icons/24x24/Makefile.in
--- ghex-3.3.90/icons/24x24/Makefile.in	2012-02-21 06:09:19.000000000 +0000
+++ ghex-3.3.91/icons/24x24/Makefile.in	2012-03-05 17:30:36.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -52,11 +52,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -81,6 +81,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(iconsdir)"
 DATA = $(icons_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -120,7 +126,6 @@
 GHEX_CFLAGS = @GHEX_CFLAGS@
 GHEX_LIBS = @GHEX_LIBS@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -306,9 +311,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -363,10 +366,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru ghex-3.3.90/icons/32x32/Makefile.in ghex-3.3.91/icons/32x32/Makefile.in
--- ghex-3.3.90/icons/32x32/Makefile.in	2012-02-21 06:09:20.000000000 +0000
+++ ghex-3.3.91/icons/32x32/Makefile.in	2012-03-05 17:30:36.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -52,11 +52,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -81,6 +81,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(iconsdir)"
 DATA = $(icons_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -120,7 +126,6 @@
 GHEX_CFLAGS = @GHEX_CFLAGS@
 GHEX_LIBS = @GHEX_LIBS@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -306,9 +311,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -363,10 +366,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru ghex-3.3.90/icons/48x48/Makefile.in ghex-3.3.91/icons/48x48/Makefile.in
--- ghex-3.3.90/icons/48x48/Makefile.in	2012-02-21 06:09:20.000000000 +0000
+++ ghex-3.3.91/icons/48x48/Makefile.in	2012-03-05 17:30:36.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -52,11 +52,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -81,6 +81,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(iconsdir)" "$(DESTDIR)$(svgdir)"
 DATA = $(icons_DATA) $(svg_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -120,7 +126,6 @@
 GHEX_CFLAGS = @GHEX_CFLAGS@
 GHEX_LIBS = @GHEX_LIBS@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -311,9 +316,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
 install-svgDATA: $(svg_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(svgdir)" || $(MKDIR_P) "$(DESTDIR)$(svgdir)"
@@ -331,9 +334,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(svg_DATA)'; test -n "$(svgdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(svgdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(svgdir)" && rm -f $$files
+	dir='$(DESTDIR)$(svgdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -388,10 +389,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru ghex-3.3.90/icons/Makefile.in ghex-3.3.91/icons/Makefile.in
--- ghex-3.3.90/icons/Makefile.in	2012-02-21 06:09:20.000000000 +0000
+++ ghex-3.3.91/icons/Makefile.in	2012-03-05 17:30:36.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -51,11 +51,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -136,7 +136,6 @@
 GHEX_CFLAGS = @GHEX_CFLAGS@
 GHEX_LIBS = @GHEX_LIBS@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -507,10 +506,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru ghex-3.3.90/INSTALL ghex-3.3.91/INSTALL
--- ghex-3.3.90/INSTALL	2012-02-21 06:09:20.000000000 +0000
+++ ghex-3.3.91/INSTALL	2012-03-05 17:30:36.000000000 +0000
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
diff -Nru ghex-3.3.90/install-sh ghex-3.3.91/install-sh
--- ghex-3.3.90/install-sh	2012-02-21 06:09:19.000000000 +0000
+++ ghex-3.3.91/install-sh	2012-03-05 17:30:36.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -200,7 +208,11 @@
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=\(\)!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then
diff -Nru ghex-3.3.90/ltmain.sh ghex-3.3.91/ltmain.sh
--- ghex-3.3.90/ltmain.sh	2012-02-21 06:09:16.000000000 +0000
+++ ghex-3.3.91/ltmain.sh	2012-03-05 17:30:33.000000000 +0000
@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4
+#         $progname:	(GNU libtool) 2.4.2
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4
+VERSION=2.4.2
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6147,7 +6160,8 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6831,7 +6845,7 @@
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7316,6 +7330,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7432,7 +7447,7 @@
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8020,6 +8035,11 @@
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8058,11 +8078,7 @@
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9152,6 +9168,8 @@
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9261,7 +9279,8 @@
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
diff -Nru ghex-3.3.90/m4/intltool.m4 ghex-3.3.91/m4/intltool.m4
--- ghex-3.3.90/m4/intltool.m4	2012-02-21 06:09:17.000000000 +0000
+++ ghex-3.3.91/m4/intltool.m4	2012-03-05 17:30:33.000000000 +0000
@@ -66,7 +66,7 @@
 INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
        INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
       INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< [$]@' 
       INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
       INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
     INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
@@ -119,7 +119,7 @@
 if test $? -ne 0; then
    AC_MSG_ERROR([perl 5.8.1 is required for intltool])
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    AC_MSG_RESULT([$IT_PERL_VERSION])
 fi
 if test "x$2" != "xno-xml"; then
diff -Nru ghex-3.3.90/m4/libtool.m4 ghex-3.3.91/m4/libtool.m4
--- ghex-3.3.90/m4/libtool.m4	2012-02-21 06:09:16.000000000 +0000
+++ ghex-3.3.91/m4/libtool.m4	2012-03-05 17:30:33.000000000 +0000
@@ -1,8 +1,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -11,8 +11,8 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -146,6 +146,8 @@
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -637,7 +639,7 @@
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -801,6 +803,7 @@
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -822,6 +825,31 @@
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -852,6 +880,10 @@
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -954,7 +986,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -962,6 +1000,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -973,6 +1012,7 @@
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
       [lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -990,7 +1030,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1035,8 +1077,8 @@
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1047,6 +1089,8 @@
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -1330,14 +1374,27 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1414,13 +1471,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -1600,6 +1657,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1639,7 +1701,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -2185,7 +2247,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2194,7 +2256,7 @@
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2259,7 +2321,7 @@
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -2398,7 +2460,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2406,10 +2468,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2417,7 +2475,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2435,7 +2493,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2455,17 +2513,18 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -2526,7 +2585,7 @@
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2542,7 +2601,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -2579,9 +2638,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2648,7 +2707,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -2717,7 +2776,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2742,7 +2801,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2766,7 +2825,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -2797,7 +2856,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2807,7 +2866,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3229,7 +3288,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3649,6 +3708,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -4233,7 +4293,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
@@ -4325,18 +4387,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -4496,7 +4573,9 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -4521,7 +4600,6 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4772,8 +4850,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5068,6 +5145,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5114,10 +5192,6 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5130,7 +5204,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5169,7 +5243,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5611,9 +5684,6 @@
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -5771,7 +5841,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6141,7 +6210,7 @@
         esac
         ;;
 
-      freebsd[[12]]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6902,12 +6971,18 @@
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -7104,7 +7179,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7237,7 +7311,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7424,6 +7497,77 @@
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -7493,6 +7637,13 @@
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
diff -Nru ghex-3.3.90/m4/ltoptions.m4 ghex-3.3.91/m4/ltoptions.m4
--- ghex-3.3.90/m4/ltoptions.m4	2012-02-21 06:09:16.000000000 +0000
+++ ghex-3.3.91/m4/ltoptions.m4	2012-03-05 17:30:33.000000000 +0000
@@ -326,9 +326,24 @@
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
diff -Nru ghex-3.3.90/m4/ltversion.m4 ghex-3.3.91/m4/ltversion.m4
--- ghex-3.3.90/m4/ltversion.m4	2012-02-21 06:09:16.000000000 +0000
+++ ghex-3.3.91/m4/ltversion.m4	2012-03-05 17:30:33.000000000 +0000
@@ -9,15 +9,15 @@
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff -Nru ghex-3.3.90/Makefile.in ghex-3.3.91/Makefile.in
--- ghex-3.3.90/Makefile.in	2012-02-21 06:09:20.000000000 +0000
+++ ghex-3.3.91/Makefile.in	2012-03-05 17:30:36.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -57,11 +57,11 @@
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -84,9 +84,11 @@
 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)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -115,6 +117,8 @@
 GZIP_ENV = --best
 DIST_ARCHIVES = $(distdir).tar.xz
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -152,7 +156,6 @@
 GHEX_CFLAGS = @GHEX_CFLAGS@
 GHEX_LIBS = @GHEX_LIBS@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -284,7 +287,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -320,10 +323,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -552,14 +553,18 @@
 	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__remove_distdir)
 
 dist-lzma: distdir
 	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
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -576,7 +581,7 @@
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -590,6 +595,8 @@
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -609,6 +616,7 @@
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -637,8 +645,16 @@
 	  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:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -669,10 +685,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -760,8 +781,8 @@
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-hdr \
+	dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-generic distclean-hdr \
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
diff -Nru ghex-3.3.90/missing ghex-3.3.91/missing
--- ghex-3.3.90/missing	2012-02-21 06:09:19.000000000 +0000
+++ ghex-3.3.91/missing	2012-03-05 17:30:36.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@
   help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
@@ -226,7 +216,7 @@
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@
     touch $file
     ;;
 
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and is $msg.
diff -Nru ghex-3.3.90/NEWS ghex-3.3.91/NEWS
--- ghex-3.3.90/NEWS	2012-02-21 06:05:46.000000000 +0000
+++ ghex-3.3.91/NEWS	2012-03-05 17:18:24.000000000 +0000
@@ -1,4 +1,24 @@
 ===========
+GHex 3.3.91
+===========
+
+Changes:
+ - Store the UI definition file as resource data (Jasper St. Pierre)
+ - Better experience for the "Goto Byte..." dialog (Jasper St. Pierre)
+ - Various code cleanups (Jasper St. Pierre)
+
+Translation updates:
+ - French (Claude Paroz)
+ - Lithuanian (Algimantas Margevičius)
+ - Norwegian bokmål (Kjartan Maraas)
+ - Polish (Piotr Drąg)
+ - Serbian (Мирослав Николић)
+ - Slovenian (Matej Urbančič)
+ - Spanish (Daniel Mustieles)
+ - Swedish (Daniel Nylander)
+
+
+===========
 GHex 3.3.90
 ===========
 
diff -Nru ghex-3.3.90/po/es.po ghex-3.3.91/po/es.po
--- ghex-3.3.90/po/es.po	2012-02-21 01:13:58.000000000 +0000
+++ ghex-3.3.91/po/es.po	2012-02-21 16:57:13.000000000 +0000
@@ -14,8 +14,8 @@
 "Project-Id-Version: ghex.HEAD.es\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=ghex&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-02-18 21:30+0000\n"
-"PO-Revision-Date: 2012-02-20 09:45+0100\n"
+"POT-Creation-Date: 2012-02-21 04:50+0000\n"
+"PO-Revision-Date: 2012-02-21 14:03+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:673
-#: ../src/ghex-window.c:1107
+#: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:675
+#: ../src/ghex-window.c:1109
 msgid "GHex"
 msgstr "GHex"
 
@@ -61,49 +61,49 @@
 msgid "Character table"
 msgstr "Tabla de caracteres"
 
-#: ../src/converter.c:231
+#: ../src/converter.c:232
 msgid "Base Converter"
 msgstr "Conversor de base"
 
 #. entries
-#: ../src/converter.c:252
+#: ../src/converter.c:253
 msgid "_Binary:"
 msgstr "_Binario:"
 
-#: ../src/converter.c:254
+#: ../src/converter.c:255
 msgid "_Octal:"
 msgstr "_Octal:"
 
-#: ../src/converter.c:256
+#: ../src/converter.c:257
 msgid "_Decimal:"
 msgstr "_Decimal:"
 
-#: ../src/converter.c:258
+#: ../src/converter.c:259
 msgid "_Hex:"
 msgstr "_Hex:"
 
-#: ../src/converter.c:260
+#: ../src/converter.c:261
 msgid "_ASCII:"
 msgstr "_ASCII:"
 
 #. get cursor button
-#: ../src/converter.c:264
+#: ../src/converter.c:265
 msgid "_Get cursor value"
 msgstr "O_btener el valor del cursor"
 
-#: ../src/converter.c:278
+#: ../src/converter.c:279
 msgid "Get cursor value"
 msgstr "Obtiene el valor del cursor"
 
-#: ../src/converter.c:278
+#: ../src/converter.c:279
 msgid "Gets the value at cursor in binary, octal, decimal, hex and ASCII"
 msgstr "Obtiene el valor del cursor en binario, octal, decimal, hex y ASCII"
 
-#: ../src/converter.c:418
+#: ../src/converter.c:419
 msgid "ERROR"
 msgstr "ERROR"
 
-#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:866
+#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:873
 #, c-format
 msgid "GHex (%s): Find Data"
 msgstr "GHex (%s): Buscar datos"
@@ -185,7 +185,7 @@
 msgid "Closes advanced find window"
 msgstr "Cierra la ventana de búsqueda avanzada"
 
-#: ../src/findreplace.c:355 ../src/ui.c:864
+#: ../src/findreplace.c:355 ../src/ui.c:871
 #, c-format
 msgid "GHex (%s): Find & Replace Data"
 msgstr "GHex (%s): Buscar y reemplazar datos"
@@ -240,7 +240,7 @@
 msgid "Closes find and replace data window"
 msgstr "Cierra la ventana buscar y reemplazar"
 
-#: ../src/findreplace.c:434 ../src/ui.c:862
+#: ../src/findreplace.c:434 ../src/ui.c:869
 #, c-format
 msgid "GHex (%s): Jump To Byte"
 msgstr "GHex (%s): Saltar al byte"
@@ -274,16 +274,16 @@
 msgid "There is no string to search for!"
 msgstr "No hay cadena de búsqueda."
 
-#: ../src/findreplace.c:548 ../src/findreplace.c:686 ../src/findreplace.c:877
+#: ../src/findreplace.c:548 ../src/findreplace.c:686 ../src/findreplace.c:876
 msgid "End Of File reached"
 msgstr "Se ha alcanzado el fin del archivo (EOF)"
 
 #: ../src/findreplace.c:549 ../src/findreplace.c:582 ../src/findreplace.c:685
-#: ../src/findreplace.c:878 ../src/findreplace.c:901
+#: ../src/findreplace.c:877 ../src/findreplace.c:900
 msgid "String was not found!\n"
 msgstr "No se encontró la cadena.\n"
 
-#: ../src/findreplace.c:581 ../src/findreplace.c:900
+#: ../src/findreplace.c:581 ../src/findreplace.c:899
 msgid "Beginning Of File reached"
 msgstr "Se ha alcanzado el inicio del archivo (BOF)"
 
@@ -351,314 +351,314 @@
 "No se puede abrir el URI:\n"
 "%s"
 
-#: ../src/ghex-window.c:94
+#: ../src/ghex-window.c:96
 #, c-format
 msgid ""
 "Can not open file:\n"
 "%s"
 msgstr "No se puede abrir el archivo:\\ %s"
 
-#: ../src/ghex-window.c:325
+#: ../src/ghex-window.c:327
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../src/ghex-window.c:326
+#: ../src/ghex-window.c:328
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/ghex-window.c:327
+#: ../src/ghex-window.c:329
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/ghex-window.c:328
+#: ../src/ghex-window.c:330
 msgid "_Group Data As"
 msgstr "A_grupar datos como"
 
 #. View submenu
-#: ../src/ghex-window.c:329
+#: ../src/ghex-window.c:331
 msgid "_Windows"
 msgstr "_Ventanas"
 
-#: ../src/ghex-window.c:330
+#: ../src/ghex-window.c:332
 msgid "_Help"
 msgstr "Ay_uda"
 
 #. File menu
-#: ../src/ghex-window.c:333
+#: ../src/ghex-window.c:335
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../src/ghex-window.c:334
+#: ../src/ghex-window.c:336
 msgid "Open a file"
 msgstr "Abrir un archivo"
 
-#: ../src/ghex-window.c:336
+#: ../src/ghex-window.c:338
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ../src/ghex-window.c:337
+#: ../src/ghex-window.c:339
 msgid "Save the current file"
 msgstr "Guarda el archivo actual"
 
-#: ../src/ghex-window.c:339
+#: ../src/ghex-window.c:341
 msgid "Save _As..."
 msgstr "G_uardar como..."
 
-#: ../src/ghex-window.c:340
+#: ../src/ghex-window.c:342
 msgid "Save the current file with a different name"
 msgstr "Guarda el archivo actual con un nombre distinto"
 
-#: ../src/ghex-window.c:342
+#: ../src/ghex-window.c:344
 msgid "Save As _HTML..."
 msgstr "Guardar como _HTML..."
 
-#: ../src/ghex-window.c:343
+#: ../src/ghex-window.c:345
 msgid "Export data to HTML source"
 msgstr "Exportar los datos a código HTML"
 
-#: ../src/ghex-window.c:345
+#: ../src/ghex-window.c:347
 msgid "_Revert"
 msgstr "_Revertir"
 
-#: ../src/ghex-window.c:346
+#: ../src/ghex-window.c:348
 msgid "Revert to a saved version of the file"
 msgstr "Volver a una versión guardada del archivo"
 
-#: ../src/ghex-window.c:348
+#: ../src/ghex-window.c:350
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: ../src/ghex-window.c:349
+#: ../src/ghex-window.c:351
 msgid "Print the current file"
 msgstr "Imprimir el archivo actual"
 
-#: ../src/ghex-window.c:351
+#: ../src/ghex-window.c:353
 msgid "Print Previe_w..."
 msgstr "Vista prelimina_r de impresión..."
 
-#: ../src/ghex-window.c:352
+#: ../src/ghex-window.c:354
 msgid "Preview printed data"
 msgstr "Previsualizar datos impresos"
 
-#: ../src/ghex-window.c:354
+#: ../src/ghex-window.c:356
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../src/ghex-window.c:355
+#: ../src/ghex-window.c:357
 msgid "Close the current file"
 msgstr "Cerrar el archivo actual"
 
-#: ../src/ghex-window.c:357
+#: ../src/ghex-window.c:359
 msgid "E_xit"
 msgstr "_Salir"
 
-#: ../src/ghex-window.c:358
+#: ../src/ghex-window.c:360
 msgid "Exit the program"
 msgstr "Salir del programa"
 
 #. Edit menu
-#: ../src/ghex-window.c:362
+#: ../src/ghex-window.c:364
 msgid "_Undo"
 msgstr "_Deshacer"
 
-#: ../src/ghex-window.c:363
+#: ../src/ghex-window.c:365
 msgid "Undo the last action"
 msgstr "Deshacer la última acción"
 
-#: ../src/ghex-window.c:365
+#: ../src/ghex-window.c:367
 msgid "_Redo"
 msgstr "_Rehacer"
 
-#: ../src/ghex-window.c:366
+#: ../src/ghex-window.c:368
 msgid "Redo the undone action"
 msgstr "Rehace la acción deshecha"
 
-#: ../src/ghex-window.c:368
+#: ../src/ghex-window.c:370
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../src/ghex-window.c:369
+#: ../src/ghex-window.c:371
 msgid "Copy selection to clipboard"
 msgstr "Copiar selección a portapapeles"
 
-#: ../src/ghex-window.c:371
+#: ../src/ghex-window.c:373
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: ../src/ghex-window.c:372
+#: ../src/ghex-window.c:374
 msgid "Cut selection"
 msgstr "Cortar selección"
 
-#: ../src/ghex-window.c:374
+#: ../src/ghex-window.c:376
 msgid "Pa_ste"
 msgstr "_Pegar"
 
-#: ../src/ghex-window.c:375
+#: ../src/ghex-window.c:377
 msgid "Paste data from clipboard"
 msgstr "Pegar datos del portapapeles"
 
-#: ../src/ghex-window.c:377
+#: ../src/ghex-window.c:379
 msgid "_Find"
 msgstr "_Buscar"
 
-#: ../src/ghex-window.c:378
+#: ../src/ghex-window.c:380
 msgid "Search for a string"
 msgstr "Buscar una cadena"
 
-#: ../src/ghex-window.c:380
+#: ../src/ghex-window.c:382
 msgid "_Advanced Find"
 msgstr "Buscar _avanzado"
 
-#: ../src/ghex-window.c:381
+#: ../src/ghex-window.c:383
 msgid "Advanced Find"
 msgstr "Buscar avanzado"
 
-#: ../src/ghex-window.c:383
+#: ../src/ghex-window.c:385
 msgid "R_eplace"
 msgstr "_Reemplazar"
 
-#: ../src/ghex-window.c:384
+#: ../src/ghex-window.c:386
 msgid "Replace a string"
 msgstr "Reemplazar una cadena"
 
-#: ../src/ghex-window.c:386
+#: ../src/ghex-window.c:388
 msgid "_Goto Byte..."
 msgstr "_Ir al byte..."
 
-#: ../src/ghex-window.c:387
+#: ../src/ghex-window.c:389
 msgid "Jump to a certain position"
 msgstr "Saltar a una posición dada"
 
-#: ../src/ghex-window.c:389
+#: ../src/ghex-window.c:391
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../src/ghex-window.c:390
+#: ../src/ghex-window.c:392
 msgid "Configure the application"
 msgstr "Configurar la aplicación"
 
 #. View menu
-#: ../src/ghex-window.c:394
+#: ../src/ghex-window.c:396
 msgid "_Add View"
 msgstr "_Añadir vista"
 
-#: ../src/ghex-window.c:395
+#: ../src/ghex-window.c:397
 msgid "Add a new view to the buffer"
 msgstr "Añade una nueva vista al búfer"
 
-#: ../src/ghex-window.c:397
+#: ../src/ghex-window.c:399
 msgid "_Remove View"
 msgstr "_Eliminar vista"
 
-#: ../src/ghex-window.c:398
+#: ../src/ghex-window.c:400
 msgid "Remove the current view of the buffer"
 msgstr "Elimina la vista actual del búfer"
 
 #. Help menu
-#: ../src/ghex-window.c:402
+#: ../src/ghex-window.c:404
 msgid "_Contents"
 msgstr "_Contenidos"
 
-#: ../src/ghex-window.c:403
+#: ../src/ghex-window.c:405
 msgid "Help on this application"
 msgstr "Ayuda sobre de esta aplicación"
 
-#: ../src/ghex-window.c:405
+#: ../src/ghex-window.c:407
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../src/ghex-window.c:406
+#: ../src/ghex-window.c:408
 msgid "About this application"
 msgstr "Acerca de esta aplicación"
 
 #. Edit menu
-#: ../src/ghex-window.c:413
+#: ../src/ghex-window.c:415
 msgid "_Insert Mode"
 msgstr "Modo _insertar"
 
-#: ../src/ghex-window.c:414
+#: ../src/ghex-window.c:416
 msgid "Insert/overwrite data"
 msgstr "Insertar/sobrescribir datos"
 
 #. Windows menu
-#: ../src/ghex-window.c:418
+#: ../src/ghex-window.c:420
 msgid "Character _Table"
 msgstr "_Tabla de caracteres"
 
-#: ../src/ghex-window.c:419
+#: ../src/ghex-window.c:421
 msgid "Show the character table"
 msgstr "Mostrar la tabla de caracteres"
 
-#: ../src/ghex-window.c:421
+#: ../src/ghex-window.c:423
 msgid "_Base Converter"
 msgstr "Conversor de _base"
 
-#: ../src/ghex-window.c:422
+#: ../src/ghex-window.c:424
 msgid "Open base conversion dialog"
 msgstr "Abrir diálogo de conversión de base"
 
-#: ../src/ghex-window.c:424
+#: ../src/ghex-window.c:426
 msgid "Type Conversion _Dialog"
 msgstr "_Diálogo de conversión de tipo"
 
-#: ../src/ghex-window.c:425
+#: ../src/ghex-window.c:427
 msgid "Show the type conversion dialog in the edit window"
 msgstr "Mostrar el diálogo de conversión de tipo en la ventana de edición"
 
-#: ../src/ghex-window.c:431 ../src/ui.c:48
+#: ../src/ghex-window.c:433 ../src/ui.c:48
 msgid "_Bytes"
 msgstr "_Bytes"
 
-#: ../src/ghex-window.c:432
+#: ../src/ghex-window.c:434
 msgid "Group data by 8 bits"
 msgstr "Agrupar datos por 8 bits"
 
-#: ../src/ghex-window.c:433 ../src/ui.c:49
+#: ../src/ghex-window.c:435 ../src/ui.c:49
 msgid "_Words"
 msgstr "_Palabras"
 
-#: ../src/ghex-window.c:434
+#: ../src/ghex-window.c:436
 msgid "Group data by 16 bits"
 msgstr "Agrupar datos por 16 bits"
 
-#: ../src/ghex-window.c:435 ../src/ui.c:50
+#: ../src/ghex-window.c:437 ../src/ui.c:50
 msgid "_Longwords"
 msgstr "Palabras _largas"
 
-#: ../src/ghex-window.c:436
+#: ../src/ghex-window.c:438
 msgid "Group data by 32 bits"
 msgstr "Agrupar datos por 32 bits"
 
-#: ../src/ghex-window.c:583
+#: ../src/ghex-window.c:585
 #, c-format
 msgid "Failed to load UI: %s"
 msgstr "Fallo al cargar la IU: %s"
 
-#: ../src/ghex-window.c:792
+#: ../src/ghex-window.c:794
 #, c-format
 msgid "Offset: %s"
 msgstr "Desplazamiento: %s"
 
-#: ../src/ghex-window.c:795
+#: ../src/ghex-window.c:797
 #, c-format
 msgid "; %s bytes from %s to %s selected"
 msgstr "; seleccionados %s bytes desde %s hasta %s"
 
-#: ../src/ghex-window.c:1067
+#: ../src/ghex-window.c:1069
 #, c-format
 msgid "Activate file %s"
 msgstr "Activar archivo %s"
 
-#: ../src/ghex-window.c:1103
+#: ../src/ghex-window.c:1105
 #, c-format
 msgid "%s - GHex"
 msgstr "%s - GHex"
 
-#: ../src/ghex-window.c:1229
+#: ../src/ghex-window.c:1231
 msgid "Select a file to save buffer as"
 msgstr "Seleccione un archivo en el que guardar el búfer actual"
 
-#: ../src/ghex-window.c:1261
+#: ../src/ghex-window.c:1263
 #, c-format
 msgid ""
 "File %s exists.\n"
@@ -667,20 +667,20 @@
 "El archivo %s existe.\n"
 "¿Desea sobreescribirlo?"
 
-#: ../src/ghex-window.c:1287 ../src/ui.c:293
+#: ../src/ghex-window.c:1289 ../src/ui.c:300
 #, c-format
 msgid "Saved buffer to file %s"
 msgstr "Búfer guardado en el archivo %s"
 
-#: ../src/ghex-window.c:1294
+#: ../src/ghex-window.c:1296
 msgid "Error saving file!"
 msgstr "Error al guardar el archivo."
 
-#: ../src/ghex-window.c:1300
+#: ../src/ghex-window.c:1302
 msgid "Can't open file for writing!"
 msgstr "No se puede abrir el archivo para escritura."
 
-#: ../src/ghex-window.c:1345
+#: ../src/ghex-window.c:1347
 #, c-format
 msgid ""
 "File %s has changed since last save.\n"
@@ -689,15 +689,15 @@
 "El archivo %s ha cambiado desde la última vez que se guardó.\n"
 "¿Desea guardar los cambios?"
 
-#: ../src/ghex-window.c:1349
+#: ../src/ghex-window.c:1351
 msgid "Do_n't save"
 msgstr "_No guardar"
 
-#: ../src/ghex-window.c:1369 ../src/ui.c:281
+#: ../src/ghex-window.c:1371 ../src/ui.c:288
 msgid "You don't have the permissions to save the file!"
 msgstr "No tiene permisos para guardar el archivo."
 
-#: ../src/ghex-window.c:1373 ../src/ui.c:286
+#: ../src/ghex-window.c:1375 ../src/ui.c:293
 msgid "An error occurred while saving file!"
 msgstr "Sucedió un error al guardar el archivo."
 
@@ -726,12 +726,12 @@
 msgstr "32 bits sin signo:"
 
 #: ../src/hex-dialog.c:64
-msgid "32 bit float:"
-msgstr "flotante de 32 bits:"
+msgid "Float 32 bit:"
+msgstr "32 bits en coma flotante:"
 
 #: ../src/hex-dialog.c:65
-msgid "64 bit float:"
-msgstr "flotante de 64 bits:"
+msgid "Float 64 bit:"
+msgstr "64 bits en coma flotante:"
 
 #: ../src/hex-dialog.c:66
 msgid "Hexadecimal:"
@@ -745,19 +745,19 @@
 msgid "Binary:"
 msgstr "Binario:"
 
-#: ../src/hex-dialog.c:197
+#: ../src/hex-dialog.c:204
 msgid "Show little endian decoding"
 msgstr "Mostrar decodificación little endian"
 
-#: ../src/hex-dialog.c:204
+#: ../src/hex-dialog.c:211
 msgid "Show unsigned and float as hexadecimal"
 msgstr "Mostrar unsigned y float como hexadecimal"
 
-#: ../src/hex-dialog.c:210
+#: ../src/hex-dialog.c:217
 msgid "Stream Length:"
 msgstr "Longitud del flujo:"
 
-#: ../src/hex-dialog.c:232
+#: ../src/hex-dialog.c:239
 msgid "FIXME: no conversion function"
 msgstr "FIXME: no hay función de conversión"
 
@@ -889,51 +889,51 @@
 msgid "Fonts"
 msgstr "Tipografía"
 
-#: ../src/preferences.c:239
+#: ../src/preferences.c:245
 msgid "_Data font:"
 msgstr "Tipografía de los _datos:"
 
-#: ../src/preferences.c:255
+#: ../src/preferences.c:259
 msgid "Data font"
 msgstr "Tipografía de los datos"
 
-#: ../src/preferences.c:255
+#: ../src/preferences.c:259
 msgid "Select the data font"
 msgstr "Selecciona la tipografía de los datos"
 
-#: ../src/preferences.c:269
+#: ../src/preferences.c:268
 msgid "Header fo_nt:"
 msgstr "Tipografía de las _cabeceras:"
 
-#: ../src/preferences.c:284
+#: ../src/preferences.c:281
 msgid "Header font"
 msgstr "Tipografía de las cabeceras"
 
-#: ../src/preferences.c:284
+#: ../src/preferences.c:281
 msgid "Select the header font"
 msgstr "Selecciona la tipografía de las cabeceras"
 
-#: ../src/preferences.c:310
+#: ../src/preferences.c:306
 msgid "_Print shaded box over:"
 msgstr "Sobreim_primir un recuadro sombreado:"
 
-#: ../src/preferences.c:322
+#: ../src/preferences.c:318
 msgid "Box size"
 msgstr "Tamaño del recuadro"
 
-#: ../src/preferences.c:322
+#: ../src/preferences.c:318
 msgid "Select size of box (in number of lines)"
 msgstr "Seleccione el tamaño del recuadro (cantidad de líneas)"
 
-#: ../src/preferences.c:326
+#: ../src/preferences.c:322
 msgid "lines (0 for no box)"
 msgstr "líneas (0 significa sin recuadro)"
 
-#: ../src/preferences.c:333
+#: ../src/preferences.c:329
 msgid "Printing"
 msgstr "Imprimiendo"
 
-#: ../src/preferences.c:451 ../src/ui.c:202
+#: ../src/preferences.c:447 ../src/ui.c:209
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -942,11 +942,11 @@
 "Ha ocurrido un error al mostrar ayuda: \n"
 "%s"
 
-#: ../src/preferences.c:503
+#: ../src/preferences.c:499
 msgid "Can not open desired font!"
 msgstr "No se puede abrir la tipografía deseada."
 
-#: ../src/preferences.c:564
+#: ../src/preferences.c:560
 msgid ""
 "The offset format string contains invalid format specifier.\n"
 "Only 'x', 'X', 'p', 'P', 'd' and 'o' are allowed."
@@ -968,7 +968,7 @@
 msgid "ASCII data"
 msgstr "datos ASCII"
 
-#: ../src/ui.c:151
+#: ../src/ui.c:150
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -980,7 +980,7 @@
 "Free Software Foundation; ya sea la versión 2 de la Licencia, o (a su "
 "elección) cualquier versión posterior."
 
-#: ../src/ui.c:155
+#: ../src/ui.c:154
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -992,7 +992,7 @@
 "IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Vea la Licencia Pública General GNU "
 "para más detalles."
 
-#: ../src/ui.c:159
+#: ../src/ui.c:158
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -1002,48 +1002,54 @@
 "con este programa, si no es así, escriba a la Free Software Foundation, Inc, "
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 EE UU."
 
-#: ../src/ui.c:171
+#. Translators: these two strings here indicate the copyright time span,
+#. e.g. 1998-2012.
+#: ../src/ui.c:170
+msgid "Copyright © %Id–%Id The GHex authors"
+msgstr "Copyright © %Id–%Id Los autores de GHex"
+
+#: ../src/ui.c:174
 msgid "A binary file editor"
 msgstr "Un editor de archivos binarios"
 
-#: ../src/ui.c:177
+#: ../src/ui.c:180
 msgid "About GHex"
 msgstr "Acerca de GHex"
 
-#: ../src/ui.c:178
+#: ../src/ui.c:181
 msgid "translator-credits"
 msgstr "Daniel Mustieles <daniel.mustieles@gmail.com>, 2007-2010"
 
-#: ../src/ui.c:181
+#: ../src/ui.c:184
 msgid "GHex Website"
 msgstr "Página web de GHex"
 
-#: ../src/ui.c:311
+#: ../src/ui.c:318
 msgid "Select a file to open"
 msgstr "Seleccione un archivo para abrir"
 
-#: ../src/ui.c:342
+#: ../src/ui.c:349
 #, c-format
 msgid "Loaded file %s"
 msgstr "Se ha cargado el archivo %s"
 
-#: ../src/ui.c:350
+#: ../src/ui.c:357
 msgid "Can not open file!"
 msgstr "No se puede abrir el archivo."
 
-#: ../src/ui.c:415
+#: ../src/ui.c:422
 msgid "Select path and file name for the HTML source"
 msgstr "Seleccione la ruta y nombre del archivo para el código HTML"
 
-#: ../src/ui.c:447
+#: ../src/ui.c:454
 msgid "You need to specify a base name for the HTML files."
 msgstr "Debe especificar un nombre base para los archivos HTML."
 
-#: ../src/ui.c:458 ../src/ui.c:484
+#: ../src/ui.c:465 ../src/ui.c:491
 msgid "You don't have the permission to write to the selected path.\n"
 msgstr "No tiene permisos para escribir en la ruta especificada.\n"
 
-#: ../src/ui.c:470
+#: ../src/ui.c:477
 msgid ""
 "Saving to HTML will overwrite some files.\n"
 "Do you want to proceed?"
@@ -1051,16 +1057,22 @@
 "Al guardar como HTML se sobrescribirán algunos archivos.\n"
 "¿Desea continuar?"
 
-#: ../src/ui.c:738
+#: ../src/ui.c:745
 #, c-format
 msgid "Really revert file %s?"
 msgstr "¿Desea realmente revertir los cambios del archivo %s?"
 
-#: ../src/ui.c:752
+#: ../src/ui.c:759
 #, c-format
 msgid "Reverted buffer from file %s"
 msgstr "Se ha revertido el búfer desde el archivo %s"
 
+#~ msgid "32 bit float:"
+#~ msgstr "flotante de 32 bits:"
+
+#~ msgid "64 bit float:"
+#~ msgstr "flotante de 64 bits:"
+
 #~ msgid ""
 #~ "GHex could not find the font \"%s\".\n"
 #~ "GHex is unable to print without this font installed."
diff -Nru ghex-3.3.90/po/fr.po ghex-3.3.91/po/fr.po
--- ghex-3.3.90/po/fr.po	2012-02-09 00:02:51.000000000 +0000
+++ ghex-3.3.91/po/fr.po	2012-03-02 09:42:11.000000000 +0000
@@ -1,5 +1,5 @@
 # French translation of ghex.
-# Copyright (C) 1998-2011 Free Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
 # This file is under the same license as the ghex package.
 #
 # Vincent Renardias <vincent@ldsol.com>, 1998-2000.
@@ -14,24 +14,25 @@
 "Project-Id-Version: ghex 2.8.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=ghex&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-08-04 08:07+0000\n"
-"PO-Revision-Date: 2011-07-31 17:03+0200\n"
-"Last-Translator: Bruno Brouard <annoa.b@gmail.com>\n"
+"POT-Creation-Date: 2012-02-21 04:50+0000\n"
+"PO-Revision-Date: 2012-02-28 22:29+0100\n"
+"Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: ../ghex.desktop.in.h:1 ../src/ghex-window.c:654 ../src/ghex-window.c:1100
+#: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:675
+#: ../src/ghex-window.c:1109
 msgid "GHex"
 msgstr "GHex"
 
-#: ../ghex.desktop.in.h:2
+#: ../data/ghex.desktop.in.h:2
 msgid "Hex Editor"
 msgstr "Éditeur hexadécimal"
 
-#: ../ghex.desktop.in.h:3
+#: ../data/ghex.desktop.in.h:3
 msgid "Inspect and edit binary files"
 msgstr "Examiner et modifier des fichiers binaires"
 
@@ -59,50 +60,50 @@
 msgid "Character table"
 msgstr "Table de caractères"
 
-#: ../src/converter.c:231
+#: ../src/converter.c:232
 msgid "Base Converter"
 msgstr "Convertisseur de base"
 
 #. entries
-#: ../src/converter.c:252
+#: ../src/converter.c:253
 msgid "_Binary:"
 msgstr "_Binaire :"
 
-#: ../src/converter.c:254
+#: ../src/converter.c:255
 msgid "_Octal:"
 msgstr "_Octal :"
 
-#: ../src/converter.c:256
+#: ../src/converter.c:257
 msgid "_Decimal:"
 msgstr "_Décimal :"
 
-#: ../src/converter.c:258
+#: ../src/converter.c:259
 msgid "_Hex:"
 msgstr "_Hexa :"
 
-#: ../src/converter.c:260
+#: ../src/converter.c:261
 msgid "_ASCII:"
 msgstr "_ASCII :"
 
 #. get cursor button
-#: ../src/converter.c:264
+#: ../src/converter.c:265
 msgid "_Get cursor value"
 msgstr "_Prendre la valeur sous le curseur"
 
-#: ../src/converter.c:278
+#: ../src/converter.c:279
 msgid "Get cursor value"
 msgstr "Prendre la valeur sous le curseur"
 
-#: ../src/converter.c:278
+#: ../src/converter.c:279
 msgid "Gets the value at cursor in binary, octal, decimal, hex and ASCII"
 msgstr ""
 "Prend la valeur sous le curseur en binaire, octal, décimal, hexa et ASCII"
 
-#: ../src/converter.c:418
+#: ../src/converter.c:419
 msgid "ERROR"
 msgstr "ERREUR"
 
-#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:864
+#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:873
 #, c-format
 msgid "GHex (%s): Find Data"
 msgstr "GHex (%s) : rechercher des données"
@@ -184,7 +185,7 @@
 msgid "Closes advanced find window"
 msgstr "Ferme la fenêtre de recherche avancée"
 
-#: ../src/findreplace.c:355 ../src/ui.c:862
+#: ../src/findreplace.c:355 ../src/ui.c:871
 #, c-format
 msgid "GHex (%s): Find & Replace Data"
 msgstr "GHex (%s) : rechercher et remplacer des données"
@@ -239,7 +240,7 @@
 msgid "Closes find and replace data window"
 msgstr "Ferme la fenêtre de remplacement"
 
-#: ../src/findreplace.c:434 ../src/ui.c:860
+#: ../src/findreplace.c:434 ../src/ui.c:869
 #, c-format
 msgid "GHex (%s): Jump To Byte"
 msgstr "GHex (%s) : aller à l'octet"
@@ -273,16 +274,16 @@
 msgid "There is no string to search for!"
 msgstr "Il n'y a pas de chaîne à rechercher !"
 
-#: ../src/findreplace.c:548 ../src/findreplace.c:686 ../src/findreplace.c:877
+#: ../src/findreplace.c:548 ../src/findreplace.c:686 ../src/findreplace.c:876
 msgid "End Of File reached"
 msgstr "Fin du fichier atteinte"
 
 #: ../src/findreplace.c:549 ../src/findreplace.c:582 ../src/findreplace.c:685
-#: ../src/findreplace.c:878 ../src/findreplace.c:901
+#: ../src/findreplace.c:877 ../src/findreplace.c:900
 msgid "String was not found!\n"
 msgstr "La chaîne n'a pas été trouvée !\n"
 
-#: ../src/findreplace.c:581 ../src/findreplace.c:900
+#: ../src/findreplace.c:581 ../src/findreplace.c:899
 msgid "Beginning Of File reached"
 msgstr "Début du fichier atteint"
 
@@ -350,7 +351,7 @@
 "Impossible d'ouvrir l'URI :\n"
 "%s"
 
-#: ../src/ghex-window.c:94
+#: ../src/ghex-window.c:96
 #, c-format
 msgid ""
 "Can not open file:\n"
@@ -359,303 +360,308 @@
 "Impossible d'ouvrir le fichier :\n"
 "%s"
 
-#: ../src/ghex-window.c:325
+#: ../src/ghex-window.c:327
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../src/ghex-window.c:326
+#: ../src/ghex-window.c:328
 msgid "_Edit"
 msgstr "É_dition"
 
-#: ../src/ghex-window.c:327
+#: ../src/ghex-window.c:329
 msgid "_View"
 msgstr "Afficha_ge"
 
-#: ../src/ghex-window.c:328
+#: ../src/ghex-window.c:330
 msgid "_Group Data As"
 msgstr "_Grouper les données par"
 
 #. View submenu
-#: ../src/ghex-window.c:329
+#: ../src/ghex-window.c:331
 msgid "_Windows"
 msgstr "Fe_nêtres"
 
-#: ../src/ghex-window.c:330
+#: ../src/ghex-window.c:332
 msgid "_Help"
 msgstr "_Aide"
 
 #. File menu
-#: ../src/ghex-window.c:333
+#: ../src/ghex-window.c:335
 msgid "_Open..."
 msgstr "_Ouvrir..."
 
-#: ../src/ghex-window.c:334
+#: ../src/ghex-window.c:336
 msgid "Open a file"
 msgstr "Ouvre un fichier"
 
-#: ../src/ghex-window.c:336
+#: ../src/ghex-window.c:338
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ../src/ghex-window.c:337
+#: ../src/ghex-window.c:339
 msgid "Save the current file"
 msgstr "Enregistre le fichier en cours"
 
-#: ../src/ghex-window.c:339
+#: ../src/ghex-window.c:341
 msgid "Save _As..."
 msgstr "Enregistrer _sous..."
 
-#: ../src/ghex-window.c:340
+#: ../src/ghex-window.c:342
 msgid "Save the current file with a different name"
 msgstr "Enregistre le fichier en cours avec un nom différent"
 
-#: ../src/ghex-window.c:342
+#: ../src/ghex-window.c:344
 msgid "Save As _HTML..."
 msgstr "Enregistrer en _HTML..."
 
-#: ../src/ghex-window.c:343
+#: ../src/ghex-window.c:345
 msgid "Export data to HTML source"
 msgstr "Exporte les données en code source HTML"
 
-#: ../src/ghex-window.c:345
+#: ../src/ghex-window.c:347
 msgid "_Revert"
 msgstr "_Récupérer"
 
-#: ../src/ghex-window.c:346
+#: ../src/ghex-window.c:348
 msgid "Revert to a saved version of the file"
 msgstr "Récupère la version enregistrée du fichier"
 
-#: ../src/ghex-window.c:348
+#: ../src/ghex-window.c:350
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: ../src/ghex-window.c:349
+#: ../src/ghex-window.c:351
 msgid "Print the current file"
 msgstr "Imprime le fichier en cours"
 
-#: ../src/ghex-window.c:351
+#: ../src/ghex-window.c:353
 msgid "Print Previe_w..."
 msgstr "_Aperçu avant impression..."
 
-#: ../src/ghex-window.c:352
+#: ../src/ghex-window.c:354
 msgid "Preview printed data"
 msgstr "Aperçu des données imprimées"
 
-#: ../src/ghex-window.c:354
+#: ../src/ghex-window.c:356
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../src/ghex-window.c:355
+#: ../src/ghex-window.c:357
 msgid "Close the current file"
 msgstr "Ferme le fichier actuel"
 
-#: ../src/ghex-window.c:357
+#: ../src/ghex-window.c:359
 msgid "E_xit"
 msgstr "_Quitter"
 
-#: ../src/ghex-window.c:358
+#: ../src/ghex-window.c:360
 msgid "Exit the program"
 msgstr "Quitte le programme"
 
 #. Edit menu
-#: ../src/ghex-window.c:362
+#: ../src/ghex-window.c:364
 msgid "_Undo"
 msgstr "A_nnuler"
 
-#: ../src/ghex-window.c:363
+#: ../src/ghex-window.c:365
 msgid "Undo the last action"
 msgstr "Annule la dernière action"
 
-#: ../src/ghex-window.c:365
+#: ../src/ghex-window.c:367
 msgid "_Redo"
 msgstr "_Refaire"
 
-#: ../src/ghex-window.c:366
+#: ../src/ghex-window.c:368
 msgid "Redo the undone action"
 msgstr "Refait la dernière action annulée"
 
-#: ../src/ghex-window.c:368
+#: ../src/ghex-window.c:370
 msgid "_Copy"
 msgstr "_Copier"
 
-#: ../src/ghex-window.c:369
+#: ../src/ghex-window.c:371
 msgid "Copy selection to clipboard"
 msgstr "Copie la sélection vers le presse-papiers"
 
-#: ../src/ghex-window.c:371
+#: ../src/ghex-window.c:373
 msgid "Cu_t"
 msgstr "Co_uper"
 
-#: ../src/ghex-window.c:372
+#: ../src/ghex-window.c:374
 msgid "Cut selection"
 msgstr "Coupe la sélection"
 
-#: ../src/ghex-window.c:374
+#: ../src/ghex-window.c:376
 msgid "Pa_ste"
 msgstr "C_oller"
 
-#: ../src/ghex-window.c:375
+#: ../src/ghex-window.c:377
 msgid "Paste data from clipboard"
 msgstr "Colle les données du presse-papiers"
 
-#: ../src/ghex-window.c:377
+#: ../src/ghex-window.c:379
 msgid "_Find"
 msgstr "_Rechercher"
 
-#: ../src/ghex-window.c:378
+#: ../src/ghex-window.c:380
 msgid "Search for a string"
 msgstr "Rechercher une chaîne"
 
-#: ../src/ghex-window.c:380
+#: ../src/ghex-window.c:382
 msgid "_Advanced Find"
 msgstr "Recherche _avancée"
 
-#: ../src/ghex-window.c:381
+#: ../src/ghex-window.c:383
 msgid "Advanced Find"
 msgstr "Recherche avancée"
 
-#: ../src/ghex-window.c:383
+#: ../src/ghex-window.c:385
 msgid "R_eplace"
 msgstr "Re_mplacer"
 
-#: ../src/ghex-window.c:384
+#: ../src/ghex-window.c:386
 msgid "Replace a string"
 msgstr "Remplacer une chaîne"
 
-#: ../src/ghex-window.c:386
+#: ../src/ghex-window.c:388
 msgid "_Goto Byte..."
 msgstr "Aller à l'_octet..."
 
-#: ../src/ghex-window.c:387
+#: ../src/ghex-window.c:389
 msgid "Jump to a certain position"
 msgstr "Va à la position"
 
-#: ../src/ghex-window.c:389
+#: ../src/ghex-window.c:391
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../src/ghex-window.c:390
+#: ../src/ghex-window.c:392
 msgid "Configure the application"
 msgstr "Configure l'application"
 
 #. View menu
-#: ../src/ghex-window.c:394
+#: ../src/ghex-window.c:396
 msgid "_Add View"
 msgstr "A_jouter une vue"
 
-#: ../src/ghex-window.c:395
+#: ../src/ghex-window.c:397
 msgid "Add a new view to the buffer"
 msgstr "Ajoute une nouvelle une vue au tampon"
 
-#: ../src/ghex-window.c:397
+#: ../src/ghex-window.c:399
 msgid "_Remove View"
 msgstr "_Supprimer la vue"
 
-#: ../src/ghex-window.c:398
+#: ../src/ghex-window.c:400
 msgid "Remove the current view of the buffer"
 msgstr "Supprime la vue courante du tampon"
 
 #. Help menu
-#: ../src/ghex-window.c:402
+#: ../src/ghex-window.c:404
 msgid "_Contents"
 msgstr "_Sommaire"
 
-#: ../src/ghex-window.c:403
+#: ../src/ghex-window.c:405
 msgid "Help on this application"
 msgstr "Aide sur cette application"
 
-#: ../src/ghex-window.c:405
+#: ../src/ghex-window.c:407
 msgid "_About"
 msgstr "À _propos"
 
-#: ../src/ghex-window.c:406
+#: ../src/ghex-window.c:408
 msgid "About this application"
 msgstr "À propos de cette application"
 
 #. Edit menu
-#: ../src/ghex-window.c:413
+#: ../src/ghex-window.c:415
 msgid "_Insert Mode"
 msgstr "Mode d'_insertion"
 
-#: ../src/ghex-window.c:414
+#: ../src/ghex-window.c:416
 msgid "Insert/overwrite data"
 msgstr "Insère/écrase les données"
 
 #. Windows menu
-#: ../src/ghex-window.c:418
+#: ../src/ghex-window.c:420
 msgid "Character _Table"
 msgstr "_Table de caractères"
 
-#: ../src/ghex-window.c:419
+#: ../src/ghex-window.c:421
 msgid "Show the character table"
 msgstr "Afficher la table de caractères"
 
-#: ../src/ghex-window.c:421
+#: ../src/ghex-window.c:423
 msgid "_Base Converter"
 msgstr "_Convertisseur de base"
 
-#: ../src/ghex-window.c:422
+#: ../src/ghex-window.c:424
 msgid "Open base conversion dialog"
 msgstr "Fait des changements de base numérique"
 
-#: ../src/ghex-window.c:424
+#: ../src/ghex-window.c:426
 msgid "Type Conversion _Dialog"
 msgstr "_Boîte de dialogue de conversion de type"
 
-#: ../src/ghex-window.c:425
+#: ../src/ghex-window.c:427
 msgid "Show the type conversion dialog in the edit window"
 msgstr ""
 "Afficher la boîte de dialogue de conversion de type dans la fenêtre d'édition"
 
-#: ../src/ghex-window.c:431 ../src/ui.c:48
+#: ../src/ghex-window.c:433 ../src/ui.c:48
 msgid "_Bytes"
 msgstr "_Octets"
 
-#: ../src/ghex-window.c:432
+#: ../src/ghex-window.c:434
 msgid "Group data by 8 bits"
 msgstr "Groupe les données par 8 bits"
 
-#: ../src/ghex-window.c:433 ../src/ui.c:49
+#: ../src/ghex-window.c:435 ../src/ui.c:49
 msgid "_Words"
 msgstr "_Mots"
 
-#: ../src/ghex-window.c:434
+#: ../src/ghex-window.c:436
 msgid "Group data by 16 bits"
 msgstr "Groupe les données par 16 bits"
 
-#: ../src/ghex-window.c:435 ../src/ui.c:50
+#: ../src/ghex-window.c:437 ../src/ui.c:50
 msgid "_Longwords"
 msgstr "Mots _longs"
 
-#: ../src/ghex-window.c:436
+#: ../src/ghex-window.c:438
 msgid "Group data by 32 bits"
 msgstr "Groupe les données par 32 bits"
 
-#: ../src/ghex-window.c:773
+#: ../src/ghex-window.c:585
+#, c-format
+msgid "Failed to load UI: %s"
+msgstr "Impossible de charger l'interface utilisateur : %s"
+
+#: ../src/ghex-window.c:794
 #, c-format
 msgid "Offset: %s"
 msgstr "Décalage : %s"
 
-#: ../src/ghex-window.c:776
+#: ../src/ghex-window.c:797
 #, c-format
 msgid "; %s bytes from %s to %s selected"
 msgstr "; %s octets, de %s à %s sélectionnés"
 
-#: ../src/ghex-window.c:1060
+#: ../src/ghex-window.c:1069
 #, c-format
 msgid "Activate file %s"
 msgstr "Activer le fichier %s"
 
-#: ../src/ghex-window.c:1096
+#: ../src/ghex-window.c:1105
 #, c-format
 msgid "%s - GHex"
 msgstr "%s - GHex"
 
-#: ../src/ghex-window.c:1224
+#: ../src/ghex-window.c:1231
 msgid "Select a file to save buffer as"
 msgstr "Sélectionnez un fichier où enregistrer le tampon"
 
-#: ../src/ghex-window.c:1280
+#: ../src/ghex-window.c:1263
 #, c-format
 msgid ""
 "File %s exists.\n"
@@ -664,20 +670,20 @@
 "Le fichier %s existe.\n"
 "Voulez-vous l'écraser ?"
 
-#: ../src/ghex-window.c:1313 ../src/ui.c:293
+#: ../src/ghex-window.c:1289 ../src/ui.c:300
 #, c-format
 msgid "Saved buffer to file %s"
 msgstr "Tampon enregistré dans le fichier %s"
 
-#: ../src/ghex-window.c:1319
+#: ../src/ghex-window.c:1296
 msgid "Error saving file!"
 msgstr "Erreur lors de l'enregistrement du fichier !"
 
-#: ../src/ghex-window.c:1325
+#: ../src/ghex-window.c:1302
 msgid "Can't open file for writing!"
 msgstr "Impossible d'ouvrir le fichier en écriture !"
 
-#: ../src/ghex-window.c:1370
+#: ../src/ghex-window.c:1347
 #, c-format
 msgid ""
 "File %s has changed since last save.\n"
@@ -686,15 +692,15 @@
 "Le document %s a été modifié depuis son dernier enregistrement.\n"
 "Voulez-vous enregistrer les modifications ?"
 
-#: ../src/ghex-window.c:1374
+#: ../src/ghex-window.c:1351
 msgid "Do_n't save"
 msgstr "_Ne pas enregistrer"
 
-#: ../src/ghex-window.c:1394 ../src/ui.c:281
+#: ../src/ghex-window.c:1371 ../src/ui.c:288
 msgid "You don't have the permissions to save the file!"
 msgstr "Vous n'avez pas les droits pour enregistrer ce fichier !"
 
-#: ../src/ghex-window.c:1398 ../src/ui.c:286
+#: ../src/ghex-window.c:1375 ../src/ui.c:293
 msgid "An error occurred while saving file!"
 msgstr "Erreur lors de l'enregistrement du fichier !"
 
@@ -723,11 +729,11 @@
 msgstr "Non signé 32 bit :"
 
 #: ../src/hex-dialog.c:64
-msgid "32 bit float:"
+msgid "Float 32 bit:"
 msgstr "Flottant 32 bit :"
 
 #: ../src/hex-dialog.c:65
-msgid "64 bit float:"
+msgid "Float 64 bit:"
 msgstr "Flottant 64 bit :"
 
 #: ../src/hex-dialog.c:66
@@ -742,19 +748,19 @@
 msgid "Binary:"
 msgstr "Binaire :"
 
-#: ../src/hex-dialog.c:197
+#: ../src/hex-dialog.c:204
 msgid "Show little endian decoding"
 msgstr "Afficher les mots de poids faible en tête"
 
-#: ../src/hex-dialog.c:204
+#: ../src/hex-dialog.c:211
 msgid "Show unsigned and float as hexadecimal"
 msgstr "Afficher les non signés et flottants comme hexadécimal"
 
-#: ../src/hex-dialog.c:210
+#: ../src/hex-dialog.c:217
 msgid "Stream Length:"
 msgstr "Longueur du flux :"
 
-#: ../src/hex-dialog.c:232
+#: ../src/hex-dialog.c:239
 msgid "FIXME: no conversion function"
 msgstr "ÀCORRIGER : aucune fonction de conversion"
 
@@ -762,26 +768,26 @@
 msgid "New document"
 msgstr "Nouveau document"
 
-#: ../src/hex-document.c:790
+#: ../src/hex-document.c:785
 #, c-format
 msgid "Page"
 msgstr "Page"
 
-#: ../src/hex-document.c:796 ../src/hex-document.c:921
+#: ../src/hex-document.c:791 ../src/hex-document.c:916
 #, c-format
 msgid "Hex dump generated by"
 msgstr "Sortie hexa générée par"
 
-#: ../src/hex-document.c:807
+#: ../src/hex-document.c:802
 msgid "Saving to HTML..."
 msgstr "Enregistrer en HTML..."
 
-#: ../src/hex-document.c:844
+#: ../src/hex-document.c:839
 #, c-format
 msgid "Previous page"
 msgstr "Page précédente"
 
-#: ../src/hex-document.c:859
+#: ../src/hex-document.c:854
 #, c-format
 msgid "Next page"
 msgstr "Page suivante"
@@ -812,7 +818,7 @@
 "Exécuter « %s --help » pour consulter la liste complète des options en ligne "
 "de commande.\n"
 
-#: ../src/main.c:81 ../src/main.c:94
+#: ../src/main.c:80 ../src/main.c:93
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Chaîne de géométrie « %s » non valide\n"
@@ -886,51 +892,51 @@
 msgid "Fonts"
 msgstr "Polices"
 
-#: ../src/preferences.c:239
+#: ../src/preferences.c:245
 msgid "_Data font:"
 msgstr "Police des _données :"
 
-#: ../src/preferences.c:255
+#: ../src/preferences.c:259
 msgid "Data font"
 msgstr "Police des données"
 
-#: ../src/preferences.c:255
+#: ../src/preferences.c:259
 msgid "Select the data font"
 msgstr "Sélectionnez une police de données"
 
-#: ../src/preferences.c:269
+#: ../src/preferences.c:268
 msgid "Header fo_nt:"
 msgstr "_Police de l'en-tête :"
 
-#: ../src/preferences.c:284
+#: ../src/preferences.c:281
 msgid "Header font"
 msgstr "Police de l'en-tête"
 
-#: ../src/preferences.c:284
+#: ../src/preferences.c:281
 msgid "Select the header font"
 msgstr "Sélectionnez une police pour l'en-tête"
 
-#: ../src/preferences.c:310
+#: ../src/preferences.c:306
 msgid "_Print shaded box over:"
 msgstr "_Imprimer une boîte ombrée par-dessus :"
 
-#: ../src/preferences.c:322
+#: ../src/preferences.c:318
 msgid "Box size"
 msgstr "Taille de la boîte"
 
-#: ../src/preferences.c:322
+#: ../src/preferences.c:318
 msgid "Select size of box (in number of lines)"
 msgstr "Choisissez la taille de la boîte (en nombre de lignes)"
 
-#: ../src/preferences.c:326
+#: ../src/preferences.c:322
 msgid "lines (0 for no box)"
 msgstr "lignes (0 pour aucune boîte)"
 
-#: ../src/preferences.c:333
+#: ../src/preferences.c:329
 msgid "Printing"
 msgstr "Impression"
 
-#: ../src/preferences.c:453 ../src/ui.c:202
+#: ../src/preferences.c:447 ../src/ui.c:209
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -939,11 +945,11 @@
 "Il y a eu une erreur lors de l'affichage de l'aide : \n"
 "%s"
 
-#: ../src/preferences.c:506
+#: ../src/preferences.c:499
 msgid "Can not open desired font!"
 msgstr "Impossible d'ouvrir la police indiquée !"
 
-#: ../src/preferences.c:569
+#: ../src/preferences.c:560
 msgid ""
 "The offset format string contains invalid format specifier.\n"
 "Only 'x', 'X', 'p', 'P', 'd' and 'o' are allowed."
@@ -952,7 +958,7 @@
 "invalide.\n"
 "Seul « x », « X », « p », « P », « d » et « o » sont autorisés."
 
-#: ../src/print.c:58
+#: ../src/print.c:57
 #, c-format
 msgid "Page: %i/%i"
 msgstr "Page : %i/%i"
@@ -965,15 +971,7 @@
 msgid "ASCII data"
 msgstr "données ASCII"
 
-#: ../src/ui.c:144
-msgid ""
-"Copyright © 1998 - 2006 Jaka Močnik\n"
-"Copyright © 2006 - 2010 GHex Contributors"
-msgstr ""
-"Copyright © 1998 - 2006 Jaka Močnik\n"
-"Copyright © 2006 - 2010 Contributeurs GHex"
-
-#: ../src/ui.c:151
+#: ../src/ui.c:150
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -985,7 +983,7 @@
 "telle que publiée par la Free Software Foundation ; version 2 de la licence, "
 "ou (à votre choix) toute version ultérieure."
 
-#: ../src/ui.c:155
+#: ../src/ui.c:154
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -997,7 +995,7 @@
 "D'ADAPTATION À UN OBJET PARTICULIER. Pour plus de détails, voir la Licence "
 "Publique Générale GNU."
 
-#: ../src/ui.c:159
+#: ../src/ui.c:158
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -1007,15 +1005,21 @@
 "programme ; si ce n'est pas le cas, écrivez à la Free Software Foundation, "
 "Inc.,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/ui.c:171
+#. Translators: these two strings here indicate the copyright time span,
+#. e.g. 1998-2012.
+#: ../src/ui.c:170
+msgid "Copyright © %Id–%Id The GHex authors"
+msgstr "Copyright © %Id–%Id Les auteurs de GHex"
+
+#: ../src/ui.c:174
 msgid "A binary file editor"
 msgstr "Un éditeur de fichiers binaires"
 
-#: ../src/ui.c:177
+#: ../src/ui.c:180
 msgid "About GHex"
 msgstr "À propos de GHex"
 
-#: ../src/ui.c:178
+#: ../src/ui.c:181
 msgid "translator-credits"
 msgstr ""
 "Vincent Renardias <vincent@ldsol.com>\n"
@@ -1026,36 +1030,36 @@
 "Robert-André Mauchin <zebob.m@gmail.com>\n"
 "Bruno Brouard <annoa.g@gmail.com>"
 
-#: ../src/ui.c:181
+#: ../src/ui.c:184
 msgid "GHex Website"
 msgstr "Site Web de GHex"
 
-#: ../src/ui.c:311
+#: ../src/ui.c:318
 msgid "Select a file to open"
 msgstr "Sélectionnez un fichier à ouvrir"
 
-#: ../src/ui.c:342
+#: ../src/ui.c:349
 #, c-format
 msgid "Loaded file %s"
 msgstr "Fichier %s chargé"
 
-#: ../src/ui.c:350
+#: ../src/ui.c:357
 msgid "Can not open file!"
 msgstr "Impossible d'ouvrir le fichier !"
 
-#: ../src/ui.c:415
+#: ../src/ui.c:422
 msgid "Select path and file name for the HTML source"
 msgstr "Sélectionnez le chemin et un nom de fichier pour la source HTML"
 
-#: ../src/ui.c:449
+#: ../src/ui.c:454
 msgid "You need to specify a base name for the HTML files."
 msgstr "Vous devez préciser un nom de base pour les fichiers HTML."
 
-#: ../src/ui.c:460 ../src/ui.c:484
+#: ../src/ui.c:465 ../src/ui.c:491
 msgid "You don't have the permission to write to the selected path.\n"
 msgstr "Vous n'avez pas le droit d'écrire dans le répertoire choisi.\n"
 
-#: ../src/ui.c:471
+#: ../src/ui.c:477
 msgid ""
 "Saving to HTML will overwrite some files.\n"
 "Do you want to proceed?"
@@ -1063,115 +1067,12 @@
 "L'enregistrement en HTML va écraser certains fichiers.\n"
 "Voulez-vous l'effectuer ?"
 
-#: ../src/ui.c:736
+#: ../src/ui.c:745
 #, c-format
 msgid "Really revert file %s?"
 msgstr "Voulez-vous vraiment récupérer le fichier %s ?"
 
-#: ../src/ui.c:750
+#: ../src/ui.c:759
 #, c-format
 msgid "Reverted buffer from file %s"
 msgstr "Tampon rétabli depuis le fichier %s"
-
-#~ msgid "Add View"
-#~ msgstr "Ajouter une vue"
-
-#~ msgid "Bytes"
-#~ msgstr "Octets"
-
-#~ msgid "Character Table..."
-#~ msgstr "Table de caractères..."
-
-#~ msgid "Contents"
-#~ msgstr "Sommaire"
-
-#~ msgid "Converter..."
-#~ msgstr "Convertir..."
-
-#~ msgid "Copy"
-#~ msgstr "Copier"
-
-#~ msgid "Cut"
-#~ msgstr "Couper"
-
-#~ msgid "Exit"
-#~ msgstr "Quitter"
-
-#~ msgid "Export to HTML..."
-#~ msgstr "Exporter en HTML..."
-
-#~ msgid "Find"
-#~ msgstr "Rechercher"
-
-#~ msgid "Goto Byte"
-#~ msgstr "Aller à l'octet"
-
-#~ msgid "Help Chat"
-#~ msgstr "Aide Chat"
-
-#~ msgid "Insert Mode"
-#~ msgstr "Mode d'insertion"
-
-#~ msgid "Longwords"
-#~ msgstr "Mots longs"
-
-#~ msgid "Open"
-#~ msgstr "Ouvrir"
-
-#~ msgid "Paste"
-#~ msgstr "Coller"
-
-#~ msgid "Preferences"
-#~ msgstr "Préférences"
-
-#~ msgid "Print"
-#~ msgstr "Imprimer"
-
-#~ msgid "Print Preview..."
-#~ msgstr "Aperçu avant impression..."
-
-#~ msgid "Redo"
-#~ msgstr "Rétablir"
-
-#~ msgid "Remove View"
-#~ msgstr "Supprimer la vue"
-
-#~ msgid "Revert"
-#~ msgstr "Récupérer"
-
-#~ msgid "Save"
-#~ msgstr "Enregistrer"
-
-#~ msgid "Save As"
-#~ msgstr "Enregistrer sous"
-
-#~ msgid "Type Conversion Dialog..."
-#~ msgstr "Boîte de dialogue de conversion de type..."
-
-#~ msgid "Undo"
-#~ msgstr "Annuler"
-
-#~ msgid "Words"
-#~ msgstr "Mots"
-
-#~ msgid "Could not initialize Bonobo!\n"
-#~ msgstr "Impossible d'initialiser Bonobo !\n"
-
-#~ msgid ""
-#~ "GHex could not find the font \"%s\".\n"
-#~ "GHex is unable to print without this font installed."
-#~ msgstr ""
-#~ "GHex ne peut pas trouver la police « %s ».\n"
-#~ "GHex ne peut pas imprimer si cette police n'est pas installée."
-
-#~ msgid "Printing file..."
-#~ msgstr "Impression du fichier..."
-
-#~ msgid "Print Hex Document"
-#~ msgstr "Affiche un document hexa"
-
-#~ msgid "Pages"
-#~ msgstr "Pages"
-
-#~ msgid "GHex (%s): Print Preview"
-#~ msgstr "GHex (%s) : aperçu avant impression"
diff -Nru ghex-3.3.90/po/lt.po ghex-3.3.91/po/lt.po
--- ghex-3.3.90/po/lt.po	2012-02-09 00:02:51.000000000 +0000
+++ ghex-3.3.91/po/lt.po	2012-03-04 22:10:39.000000000 +0000
@@ -1,24 +1,25 @@
 # Lithuanian translation for ghex.
 # Copyright (C) 2011 ghex's COPYRIGHT HOLDER
 # This file is distributed under the same license as the ghex package.
-# Algimantas Margevičius <gymka@mail.ru>, 2011.
+# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ghex master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=ghex&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-09-27 09:00+0000\n"
-"PO-Revision-Date: 2011-10-08 18:08+0300\n"
-"Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=ghex&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-03-01 23:51+0000\n"
+"PO-Revision-Date: 2012-03-03 08:21+0200\n"
+"Last-Translator: Algimantas Margevičius <margevicius.algimantas@gmail.com>\n"
 "Language-Team: Lietuvių <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
+"100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ../data/ghex.desktop.in.h:1
-#: ../src/ghex-window.c:651
-#: ../src/ghex-window.c:1097
+#: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:650
+#: ../src/ghex-window.c:1084
 msgid "GHex"
 msgstr "GHex"
 
@@ -38,8 +39,7 @@
 msgid "Hex"
 msgstr "Šešioliktainis"
 
-#: ../src/chartable.c:147
-#: ../src/preferences.c:142
+#: ../src/chartable.c:147 ../src/preferences.c:142
 msgid "Decimal"
 msgstr "Dešimtainis"
 
@@ -55,78 +55,72 @@
 msgid "Character table"
 msgstr "Simbolių lentelė"
 
-#: ../src/converter.c:231
+#: ../src/converter.c:232
 msgid "Base Converter"
 msgstr "Bazės konvertavimas"
 
 #. entries
-#: ../src/converter.c:252
+#: ../src/converter.c:253
 msgid "_Binary:"
 msgstr "_Dvejetainis:"
 
-#: ../src/converter.c:254
+#: ../src/converter.c:255
 msgid "_Octal:"
 msgstr "_Aštuntainis:"
 
-#: ../src/converter.c:256
+#: ../src/converter.c:257
 msgid "_Decimal:"
 msgstr "_Dešimtainis:"
 
-#: ../src/converter.c:258
+#: ../src/converter.c:259
 msgid "_Hex:"
 msgstr "_Šešioliktainis:"
 
-#: ../src/converter.c:260
+#: ../src/converter.c:261
 msgid "_ASCII:"
 msgstr "_ASCII:"
 
 #. get cursor button
-#: ../src/converter.c:264
+#: ../src/converter.c:265
 msgid "_Get cursor value"
 msgstr "_Gauti žymeklio reikšmę"
 
-#: ../src/converter.c:278
+#: ../src/converter.c:279
 msgid "Get cursor value"
 msgstr "Gauti žymeklio reikšmę"
 
-#: ../src/converter.c:278
+#: ../src/converter.c:279
 msgid "Gets the value at cursor in binary, octal, decimal, hex and ASCII"
-msgstr "Gauna žymeklio reikšmę dvejetaine, aštuntaine, dešimtaine, šešioliktaine ir ASCII išraiška"
+msgstr ""
+"Gauna žymeklio reikšmę dvejetaine, aštuntaine, dešimtaine, šešioliktaine ir "
+"ASCII išraiška"
 
-#: ../src/converter.c:418
+#: ../src/converter.c:419
 msgid "ERROR"
 msgstr "KLAIDA"
 
-#: ../src/findreplace.c:97
-#: ../src/findreplace.c:221
-#: ../src/ui.c:864
+#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:873
 #, c-format
 msgid "GHex (%s): Find Data"
 msgstr "GHex (%s): Surasti duomenis"
 
-#: ../src/findreplace.c:101
-#: ../src/findreplace.c:161
-#: ../src/findreplace.c:359
+#: ../src/findreplace.c:101 ../src/findreplace.c:161 ../src/findreplace.c:359
 msgid "Find String"
 msgstr "Surasti eilutę"
 
-#: ../src/findreplace.c:108
-#: ../src/findreplace.c:258
+#: ../src/findreplace.c:108 ../src/findreplace.c:258
 msgid "Find _Next"
 msgstr "Surasti _kitą"
 
-#: ../src/findreplace.c:115
-#: ../src/findreplace.c:267
+#: ../src/findreplace.c:115 ../src/findreplace.c:267
 msgid "Find _Previous"
 msgstr "Surasti _ankstesnį"
 
-#: ../src/findreplace.c:138
-#: ../src/findreplace.c:413
+#: ../src/findreplace.c:138 ../src/findreplace.c:413
 msgid "Find Data"
 msgstr "Surasti duomenis"
 
-#: ../src/findreplace.c:138
-#: ../src/findreplace.c:413
+#: ../src/findreplace.c:138 ../src/findreplace.c:413
 msgid "Enter the hex data or ASCII data to search for"
 msgstr "Įveskite duomenis paieškai šešioliktaine ar ASCII išraiška"
 
@@ -134,8 +128,7 @@
 msgid "Find Next"
 msgstr "Surasti kitą"
 
-#: ../src/findreplace.c:139
-#: ../src/findreplace.c:415
+#: ../src/findreplace.c:139 ../src/findreplace.c:415
 msgid "Finds the next occurrence of the search string"
 msgstr "Suranda kitą žodį, atitinkantį paieškos kriterijus"
 
@@ -147,9 +140,7 @@
 msgid "Finds the previous occurrence of the search string "
 msgstr "Suranda ankstesnį žodį, atitinkantį paieškos kriterijus"
 
-#: ../src/findreplace.c:141
-#: ../src/findreplace.c:418
-#: ../src/findreplace.c:466
+#: ../src/findreplace.c:141 ../src/findreplace.c:418 ../src/findreplace.c:469
 msgid "Cancel"
 msgstr "Atsisakyti"
 
@@ -190,8 +181,7 @@
 msgid "Closes advanced find window"
 msgstr "Užveria papildomą paieškos langą"
 
-#: ../src/findreplace.c:355
-#: ../src/ui.c:862
+#: ../src/findreplace.c:355 ../src/ui.c:871
 #, c-format
 msgid "GHex (%s): Find & Replace Data"
 msgstr "GHex (%s): Surasti ir pakeisti"
@@ -244,82 +234,70 @@
 msgid "Closes find and replace data window"
 msgstr "Užveria paieškos ir keitimo langą"
 
-#: ../src/findreplace.c:434
-#: ../src/ui.c:860
+#: ../src/findreplace.c:434 ../src/ui.c:869
 #, c-format
 msgid "GHex (%s): Jump To Byte"
 msgstr "GHex (%s): Peršokti į baitą"
 
-#: ../src/findreplace.c:464
+#: ../src/findreplace.c:467
 msgid "Jump to byte"
 msgstr "Peršokti į baitą"
 
-#: ../src/findreplace.c:464
+#: ../src/findreplace.c:467
 msgid "Enter the byte to jump to"
 msgstr "Įvesk baitą, į kurį pereiti"
 
-#: ../src/findreplace.c:465
+#: ../src/findreplace.c:468
 msgid "OK"
 msgstr "GERAI"
 
-#: ../src/findreplace.c:465
+#: ../src/findreplace.c:468
 msgid "Jumps to the specified byte"
 msgstr "Peršoka į nurodytą baitą"
 
-#: ../src/findreplace.c:466
+#: ../src/findreplace.c:469
 msgid "Closes jump to byte window"
 msgstr "Užveria peršokimo į baitą langą"
 
-#: ../src/findreplace.c:529
-#: ../src/findreplace.c:563
-#: ../src/findreplace.c:670
+#: ../src/findreplace.c:532 ../src/findreplace.c:566 ../src/findreplace.c:673
 msgid "There is no active document to search!"
 msgstr "Nėra aktyvaus dokumento, kuriame galima būtų ieškoti!"
 
-#: ../src/findreplace.c:536
-#: ../src/findreplace.c:570
-#: ../src/findreplace.c:677
-#: ../src/findreplace.c:711
-#: ../src/findreplace.c:756
+#: ../src/findreplace.c:539 ../src/findreplace.c:573 ../src/findreplace.c:680
+#: ../src/findreplace.c:714 ../src/findreplace.c:759
 msgid "There is no string to search for!"
 msgstr "Nėra paieškos eilutės!"
 
-#: ../src/findreplace.c:548
-#: ../src/findreplace.c:686
-#: ../src/findreplace.c:877
+#: ../src/findreplace.c:551 ../src/findreplace.c:689 ../src/findreplace.c:879
 msgid "End Of File reached"
 msgstr "Pasiekta failo pabaiga"
 
-#: ../src/findreplace.c:549
-#: ../src/findreplace.c:582
-#: ../src/findreplace.c:685
-#: ../src/findreplace.c:878
-#: ../src/findreplace.c:901
+#: ../src/findreplace.c:552 ../src/findreplace.c:585 ../src/findreplace.c:688
+#: ../src/findreplace.c:880 ../src/findreplace.c:903
 msgid "String was not found!\n"
 msgstr "Eilutė rastas!\n"
 
-#: ../src/findreplace.c:581
-#: ../src/findreplace.c:900
+#: ../src/findreplace.c:584 ../src/findreplace.c:902
 msgid "Beginning Of File reached"
 msgstr "Prieita failo pradžia"
 
-#: ../src/findreplace.c:598
+#: ../src/findreplace.c:601
 msgid "There is no active document to move the cursor in!"
 msgstr "Nėra dokumento, į kurį būtų galima nuvesti žymeklį!"
 
-#: ../src/findreplace.c:616
+#: ../src/findreplace.c:619
 msgid "No offset has been specified!"
 msgstr "Nenurodyta poslinkio reikšmė!"
 
-#: ../src/findreplace.c:641
+#: ../src/findreplace.c:644
 msgid "The specified offset is beyond the  file boundaries!"
 msgstr "Nurodytas poslinkis yra už failo ribų!"
 
-#: ../src/findreplace.c:649
+#: ../src/findreplace.c:652
 msgid "Can not position cursor beyond the End Of File!"
 msgstr "Negaliu perkelti žymeklio už failo pabaigos!"
 
-#: ../src/findreplace.c:656
+#: ../src/findreplace.c:659
 msgid ""
 "You may only give the offset as:\n"
 "  - a positive decimal number, or\n"
@@ -331,24 +309,23 @@
 "  - šešioliktainį skaičių, pradedantį '0x', arba\n"
 "  - „+“ arba „-“ ženklas ir santykinis poslinkis"
 
-#: ../src/findreplace.c:702
+#: ../src/findreplace.c:705
 msgid "There is no active buffer to replace data in!"
 msgstr "Nėra aktyvaus buferio, kuriame galim būtų pakeisti duomenis!"
 
-#: ../src/findreplace.c:727
-#: ../src/findreplace.c:728
+#: ../src/findreplace.c:730 ../src/findreplace.c:731
 msgid "End Of File reached!"
 msgstr "Pasiekta failo pabaiga!"
 
-#: ../src/findreplace.c:747
+#: ../src/findreplace.c:750
 msgid "There is no active document to replace data in!"
 msgstr "Nėra aktyvaus dokumento, kuriame galim būtų pakeisti duomenis!"
 
-#: ../src/findreplace.c:777
+#: ../src/findreplace.c:780
 msgid "No occurrences were found."
 msgstr "Nerasta pasikartojimų."
 
-#: ../src/findreplace.c:780
+#: ../src/findreplace.c:783
 #, c-format
 msgid "Replaced %d occurrence."
 msgid_plural "Replaced %d occurrences."
@@ -356,7 +333,7 @@
 msgstr[1] "Pakeisti %d pasikartojimai."
 msgstr[2] "Pakeista %d pasikartojimų."
 
-#: ../src/findreplace.c:820
+#: ../src/findreplace.c:823
 msgid "No string to search for!"
 msgstr "Nėra ko ieškoti!"
 
@@ -369,7 +346,7 @@
 "Nepavyko atverti URI:\n"
 "%s"
 
-#: ../src/ghex-window.c:94
+#: ../src/ghex-window.c:96
 #, c-format
 msgid ""
 "Can not open file:\n"
@@ -378,305 +355,302 @@
 "Nepavyko atverti failo:\n"
 "%s"
 
-#: ../src/ghex-window.c:325
+#: ../src/ghex-window.c:327
 msgid "_File"
 msgstr "_Failas"
 
-#: ../src/ghex-window.c:326
+#: ../src/ghex-window.c:328
 msgid "_Edit"
 msgstr "_Keisti"
 
-#: ../src/ghex-window.c:327
+#: ../src/ghex-window.c:329
 msgid "_View"
 msgstr "_Rodymas"
 
-#: ../src/ghex-window.c:328
+#: ../src/ghex-window.c:330
 msgid "_Group Data As"
 msgstr "_Grupuoti duomenis kaip"
 
 #. View submenu
-#: ../src/ghex-window.c:329
+#: ../src/ghex-window.c:331
 msgid "_Windows"
 msgstr "_Langai"
 
-#: ../src/ghex-window.c:330
+#: ../src/ghex-window.c:332
 msgid "_Help"
 msgstr "_Žinynas"
 
 #. File menu
-#: ../src/ghex-window.c:333
+#: ../src/ghex-window.c:335
 msgid "_Open..."
 msgstr "_Atverti"
 
-#: ../src/ghex-window.c:334
+#: ../src/ghex-window.c:336
 msgid "Open a file"
 msgstr "Atverti failą"
 
-#: ../src/ghex-window.c:336
+#: ../src/ghex-window.c:338
 msgid "_Save"
 msgstr "_Išsaugoti"
 
-#: ../src/ghex-window.c:337
+#: ../src/ghex-window.c:339
 msgid "Save the current file"
 msgstr "Išsaugoti šį failą"
 
-#: ../src/ghex-window.c:339
+#: ../src/ghex-window.c:341
 msgid "Save _As..."
 msgstr "Išsaugoti _kaip..."
 
-#: ../src/ghex-window.c:340
+#: ../src/ghex-window.c:342
 msgid "Save the current file with a different name"
 msgstr "Išsaugoti šį failą kitu vardu"
 
-#: ../src/ghex-window.c:342
+#: ../src/ghex-window.c:344
 msgid "Save As _HTML..."
 msgstr "Išsaugoti kaip _HTML..."
 
-#: ../src/ghex-window.c:343
+#: ../src/ghex-window.c:345
 msgid "Export data to HTML source"
 msgstr "Eksportuoti duomenis į HTML pradinį kodą"
 
-#: ../src/ghex-window.c:345
+#: ../src/ghex-window.c:347
 msgid "_Revert"
 msgstr "_Atstatyti"
 
-#: ../src/ghex-window.c:346
+#: ../src/ghex-window.c:348
 msgid "Revert to a saved version of the file"
 msgstr "Sugrąžina išsaugotą failo versiją"
 
-#: ../src/ghex-window.c:348
+#: ../src/ghex-window.c:350
 msgid "_Print"
 msgstr "_Spausdinti"
 
-#: ../src/ghex-window.c:349
+#: ../src/ghex-window.c:351
 msgid "Print the current file"
 msgstr "Spausdina failą"
 
-#: ../src/ghex-window.c:351
+#: ../src/ghex-window.c:353
 msgid "Print Previe_w..."
 msgstr "Spausdinti peržiū_rą..."
 
-#: ../src/ghex-window.c:352
+#: ../src/ghex-window.c:354
 msgid "Preview printed data"
 msgstr "Peržiūrėti spausdinamus duomenis"
 
-#: ../src/ghex-window.c:354
+#: ../src/ghex-window.c:356
 msgid "_Close"
 msgstr "_Užverti"
 
-#: ../src/ghex-window.c:355
+#: ../src/ghex-window.c:357
 msgid "Close the current file"
 msgstr "Užverti dabartinį failą"
 
-#: ../src/ghex-window.c:357
+#: ../src/ghex-window.c:359
 msgid "E_xit"
 msgstr "Iš_eiti"
 
-#: ../src/ghex-window.c:358
+#: ../src/ghex-window.c:360
 msgid "Exit the program"
 msgstr "Išeiti iš programos"
 
 #. Edit menu
-#: ../src/ghex-window.c:362
+#: ../src/ghex-window.c:364
 msgid "_Undo"
 msgstr "_Atšaukti"
 
-#: ../src/ghex-window.c:363
+#: ../src/ghex-window.c:365
 msgid "Undo the last action"
 msgstr "Panaikina paskutinį veiksmą"
 
-#: ../src/ghex-window.c:365
+#: ../src/ghex-window.c:367
 msgid "_Redo"
 msgstr "_Pakartoti"
 
-#: ../src/ghex-window.c:366
+#: ../src/ghex-window.c:368
 msgid "Redo the undone action"
 msgstr "Pakartoja atšauktą veiksmą"
 
-#: ../src/ghex-window.c:368
+#: ../src/ghex-window.c:370
 msgid "_Copy"
 msgstr "_Kopijuoti"
 
-#: ../src/ghex-window.c:369
+#: ../src/ghex-window.c:371
 msgid "Copy selection to clipboard"
 msgstr "Kopijuoti pasirinkimą į iškarpinę"
 
-#: ../src/ghex-window.c:371
+#: ../src/ghex-window.c:373
 msgid "Cu_t"
 msgstr "Iškirp_ti"
 
-#: ../src/ghex-window.c:372
+#: ../src/ghex-window.c:374
 msgid "Cut selection"
 msgstr "Iškerpa pasirinkimą"
 
-#: ../src/ghex-window.c:374
+#: ../src/ghex-window.c:376
 msgid "Pa_ste"
 msgstr "Į_dėti"
 
-#: ../src/ghex-window.c:375
+#: ../src/ghex-window.c:377
 msgid "Paste data from clipboard"
 msgstr "Įdeda duomenis iš iškarpinės"
 
-#: ../src/ghex-window.c:377
+#: ../src/ghex-window.c:379
 msgid "_Find"
 msgstr "_Ieškoti"
 
-#: ../src/ghex-window.c:378
+#: ../src/ghex-window.c:380
 msgid "Search for a string"
 msgstr "Ieškoti eilutės"
 
-#: ../src/ghex-window.c:380
+#: ../src/ghex-window.c:382
 msgid "_Advanced Find"
 msgstr "_Išplėstinė paieška"
 
-#: ../src/ghex-window.c:381
+#: ../src/ghex-window.c:383
 msgid "Advanced Find"
 msgstr "Išplėstinė paieška"
 
-#: ../src/ghex-window.c:383
+#: ../src/ghex-window.c:385
 msgid "R_eplace"
 msgstr "Pa_keisti"
 
-#: ../src/ghex-window.c:384
+#: ../src/ghex-window.c:386
 msgid "Replace a string"
 msgstr "Pakeisti žodį"
 
-#: ../src/ghex-window.c:386
+#: ../src/ghex-window.c:388
 msgid "_Goto Byte..."
 msgstr "_Eiti į baitą..."
 
-#: ../src/ghex-window.c:387
+#: ../src/ghex-window.c:389
 msgid "Jump to a certain position"
 msgstr "Peršokti į nurodytą vietą"
 
-#: ../src/ghex-window.c:389
+#: ../src/ghex-window.c:391
 msgid "_Preferences"
 msgstr "_Nustatymai"
 
-#: ../src/ghex-window.c:390
+#: ../src/ghex-window.c:392
 msgid "Configure the application"
 msgstr "Konfigūruoti programą"
 
 #. View menu
-#: ../src/ghex-window.c:394
+#: ../src/ghex-window.c:396
 msgid "_Add View"
 msgstr "_Pridėti rodinį"
 
-#: ../src/ghex-window.c:395
+#: ../src/ghex-window.c:397
 msgid "Add a new view to the buffer"
 msgstr "Pridėti rodinį buferiui"
 
-#: ../src/ghex-window.c:397
+#: ../src/ghex-window.c:399
 msgid "_Remove View"
 msgstr "_Pašalinti rodinį"
 
-#: ../src/ghex-window.c:398
+#: ../src/ghex-window.c:400
 msgid "Remove the current view of the buffer"
 msgstr "Pašalinti esamą rodinį"
 
 #. Help menu
-#: ../src/ghex-window.c:402
+#: ../src/ghex-window.c:404
 msgid "_Contents"
 msgstr "_Turinys"
 
-#: ../src/ghex-window.c:403
+#: ../src/ghex-window.c:405
 msgid "Help on this application"
 msgstr "Programos žinynas"
 
-#: ../src/ghex-window.c:405
+#: ../src/ghex-window.c:407
 msgid "_About"
 msgstr "_Apie"
 
-#: ../src/ghex-window.c:406
+#: ../src/ghex-window.c:408
 msgid "About this application"
 msgstr "Apie programą"
 
 #. Edit menu
-#: ../src/ghex-window.c:413
+#: ../src/ghex-window.c:415
 msgid "_Insert Mode"
 msgstr "_Įterpimo režimas"
 
-#: ../src/ghex-window.c:414
+#: ../src/ghex-window.c:416
 msgid "Insert/overwrite data"
 msgstr "Įterpti/perrašyti duomenis"
 
 #. Windows menu
-#: ../src/ghex-window.c:418
+#: ../src/ghex-window.c:420
 msgid "Character _Table"
 msgstr "Simbolių _Lentelė"
 
-#: ../src/ghex-window.c:419
+#: ../src/ghex-window.c:421
 msgid "Show the character table"
 msgstr "Parodyti simbolių lentelę"
 
-#: ../src/ghex-window.c:421
+#: ../src/ghex-window.c:423
 msgid "_Base Converter"
 msgstr "_Bazės konvertavimas"
 
-#: ../src/ghex-window.c:422
+#: ../src/ghex-window.c:424
 msgid "Open base conversion dialog"
 msgstr "Atverti sistemos keitimo langą"
 
-#: ../src/ghex-window.c:424
+#: ../src/ghex-window.c:426
 msgid "Type Conversion _Dialog"
 msgstr "Tipo konvertavimo _langas"
 
-#: ../src/ghex-window.c:425
+#: ../src/ghex-window.c:427
 msgid "Show the type conversion dialog in the edit window"
 msgstr "Rodyti tipo konvertavimo langą redagavimo lange"
 
-#: ../src/ghex-window.c:431
-#: ../src/ui.c:48
+#: ../src/ghex-window.c:433 ../src/ui.c:48
 msgid "_Bytes"
 msgstr "_Baitai"
 
-#: ../src/ghex-window.c:432
+#: ../src/ghex-window.c:434
 msgid "Group data by 8 bits"
 msgstr "Grupuoti duomenis po 8 bitus"
 
-#: ../src/ghex-window.c:433
-#: ../src/ui.c:49
+#: ../src/ghex-window.c:435 ../src/ui.c:49
 msgid "_Words"
 msgstr "_Žodžiai"
 
-#: ../src/ghex-window.c:434
+#: ../src/ghex-window.c:436
 msgid "Group data by 16 bits"
 msgstr "Grupuoti duomenis po 16 bitų"
 
-#: ../src/ghex-window.c:435
-#: ../src/ui.c:50
+#: ../src/ghex-window.c:437 ../src/ui.c:50
 msgid "_Longwords"
 msgstr "_Ilgi žodžiai"
 
-#: ../src/ghex-window.c:436
+#: ../src/ghex-window.c:438
 msgid "Group data by 32 bits"
 msgstr "Grupuoti duomenis po 32 bitus"
 
-#: ../src/ghex-window.c:770
+#: ../src/ghex-window.c:769
 #, c-format
 msgid "Offset: %s"
 msgstr "Poslinkis: %s"
 
-#: ../src/ghex-window.c:773
+#: ../src/ghex-window.c:772
 #, c-format
 msgid "; %s bytes from %s to %s selected"
 msgstr "; %s baitai nuo %s iki %s pasirinkti"
 
-#: ../src/ghex-window.c:1057
+#: ../src/ghex-window.c:1044
 #, c-format
 msgid "Activate file %s"
 msgstr "Aktyvuoti failą %s"
 
-#: ../src/ghex-window.c:1093
+#: ../src/ghex-window.c:1080
 #, c-format
 msgid "%s - GHex"
 msgstr "%s - GHex"
 
-#: ../src/ghex-window.c:1221
+#: ../src/ghex-window.c:1206
 msgid "Select a file to save buffer as"
 msgstr "Pasirinkti failą, į kurį saugoti buferį kaip"
 
-#: ../src/ghex-window.c:1277
+#: ../src/ghex-window.c:1238
 #, c-format
 msgid ""
 "File %s exists.\n"
@@ -685,21 +659,20 @@
 "Failas %s egzistuoja.\n"
 "Perrašyti?"
 
-#: ../src/ghex-window.c:1310
-#: ../src/ui.c:293
+#: ../src/ghex-window.c:1264 ../src/ui.c:300
 #, c-format
 msgid "Saved buffer to file %s"
 msgstr "Buferis išsaugotas faile %s"
 
-#: ../src/ghex-window.c:1316
+#: ../src/ghex-window.c:1271
 msgid "Error saving file!"
 msgstr "Klaida saugant failą!"
 
-#: ../src/ghex-window.c:1322
+#: ../src/ghex-window.c:1277
 msgid "Can't open file for writing!"
 msgstr "Negaliu atidaryti failo rašymui!"
 
-#: ../src/ghex-window.c:1367
+#: ../src/ghex-window.c:1322
 #, c-format
 msgid ""
 "File %s has changed since last save.\n"
@@ -708,17 +681,15 @@
 "Failas %s buvo pakeistas nuo paskutinio saugojimo.\n"
 "Ar išsaugoti keitimus?"
 
-#: ../src/ghex-window.c:1371
+#: ../src/ghex-window.c:1326
 msgid "Do_n't save"
 msgstr "Nesa_ugoti"
 
-#: ../src/ghex-window.c:1391
-#: ../src/ui.c:281
+#: ../src/ghex-window.c:1346 ../src/ui.c:288
 msgid "You don't have the permissions to save the file!"
 msgstr "Neturite teisių išsaugoti failą!"
 
-#: ../src/ghex-window.c:1395
-#: ../src/ui.c:286
+#: ../src/ghex-window.c:1350 ../src/ui.c:293
 msgid "An error occurred while saving file!"
 msgstr "Klaida bandant išsaugoti failą!"
 
@@ -747,11 +718,11 @@
 msgstr "32 bitų be ženklo:"
 
 #: ../src/hex-dialog.c:64
-msgid "32 bit float:"
+msgid "Float 32 bit:"
 msgstr "32 bitų slankaus kablelio:"
 
 #: ../src/hex-dialog.c:65
-msgid "64 bit float:"
+msgid "Float 64 bit:"
 msgstr "64 bitų slankaus kablelio:"
 
 #: ../src/hex-dialog.c:66
@@ -766,47 +737,46 @@
 msgid "Binary:"
 msgstr "Dvejetainis:"
 
-#: ../src/hex-dialog.c:197
+#: ../src/hex-dialog.c:204
 msgid "Show little endian decoding"
 msgstr "Rodyti didėjančio reikšmingumo (little endian) dekodavimą"
 
-#: ../src/hex-dialog.c:204
+#: ../src/hex-dialog.c:211
 msgid "Show unsigned and float as hexadecimal"
 msgstr "Rodyti be ženklo ir slankaus kablelio kaip šešioliktainius"
 
-#: ../src/hex-dialog.c:210
+#: ../src/hex-dialog.c:217
 msgid "Stream Length:"
 msgstr "Srauto ilgis:"
 
-#: ../src/hex-dialog.c:232
+#: ../src/hex-dialog.c:239
 msgid "FIXME: no conversion function"
 msgstr "IŠTAISYK: nėra konvertavimo funkcijos"
 
-#: ../src/hex-document.c:436
+#: ../src/hex-document.c:435
 msgid "New document"
 msgstr "Naujas dokumentas"
 
-#: ../src/hex-document.c:790
+#: ../src/hex-document.c:784
 #, c-format
 msgid "Page"
 msgstr "Puslapis"
 
-#: ../src/hex-document.c:796
-#: ../src/hex-document.c:921
+#: ../src/hex-document.c:790 ../src/hex-document.c:915
 #, c-format
 msgid "Hex dump generated by"
 msgstr "Šešioliktainę išklotinę sukūrė"
 
-#: ../src/hex-document.c:807
+#: ../src/hex-document.c:801
 msgid "Saving to HTML..."
 msgstr "Saugojama į HTML..."
 
-#: ../src/hex-document.c:844
+#: ../src/hex-document.c:838
 #, c-format
 msgid "Previous page"
 msgstr "Ankstesnis puslapis"
 
-#: ../src/hex-document.c:859
+#: ../src/hex-document.c:853
 #, c-format
 msgid "Next page"
 msgstr "Kitas puslapis"
@@ -836,8 +806,7 @@
 "%s\n"
 "Paleisk '%s --help' visoms galimoms komandoms pamatyti.\n"
 
-#: ../src/main.c:81
-#: ../src/main.c:94
+#: ../src/main.c:80 ../src/main.c:93
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Neteisingas geometrijos apibrėžimas „%s“\n"
@@ -911,52 +880,51 @@
 msgid "Fonts"
 msgstr "Šriftai"
 
-#: ../src/preferences.c:239
+#: ../src/preferences.c:245
 msgid "_Data font:"
 msgstr "_Duomenų šriftas:"
 
-#: ../src/preferences.c:255
+#: ../src/preferences.c:259
 msgid "Data font"
 msgstr "Duomenų šriftas"
 
-#: ../src/preferences.c:255
+#: ../src/preferences.c:259
 msgid "Select the data font"
 msgstr "Pasirinkite duomenų šriftą"
 
-#: ../src/preferences.c:269
+#: ../src/preferences.c:268
 msgid "Header fo_nt:"
 msgstr "Antraštės šrif_tas:"
 
-#: ../src/preferences.c:284
+#: ../src/preferences.c:281
 msgid "Header font"
 msgstr "Antraštės šriftas"
 
-#: ../src/preferences.c:284
+#: ../src/preferences.c:281
 msgid "Select the header font"
 msgstr "Pasirinkite antraštės šriftą"
 
-#: ../src/preferences.c:310
+#: ../src/preferences.c:306
 msgid "_Print shaded box over:"
 msgstr "_Spausdinti rėmelyje su šešėliu:"
 
-#: ../src/preferences.c:322
+#: ../src/preferences.c:318
 msgid "Box size"
 msgstr "Rėmelio dydis"
 
-#: ../src/preferences.c:322
+#: ../src/preferences.c:318
 msgid "Select size of box (in number of lines)"
 msgstr "Pasirinkite rėmelio dydį (išreikštą eilučių skaičiumi)"
 
-#: ../src/preferences.c:326
+#: ../src/preferences.c:322
 msgid "lines (0 for no box)"
 msgstr "eilutės (0, jei be rėmelio)"
 
-#: ../src/preferences.c:333
+#: ../src/preferences.c:329
 msgid "Printing"
 msgstr "Spausdinama"
 
-#: ../src/preferences.c:451
-#: ../src/ui.c:202
+#: ../src/preferences.c:447 ../src/ui.c:209
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -965,11 +933,11 @@
 "Kilo klaida atveriant žinyną:\n"
 "%s"
 
-#: ../src/preferences.c:503
+#: ../src/preferences.c:499
 msgid "Can not open desired font!"
 msgstr "Negaliu atidaryti pageidaujamo šrifto!"
 
-#: ../src/preferences.c:564
+#: ../src/preferences.c:560
 msgid ""
 "The offset format string contains invalid format specifier.\n"
 "Only 'x', 'X', 'p', 'P', 'd' and 'o' are allowed."
@@ -990,72 +958,90 @@
 msgid "ASCII data"
 msgstr "ASCII duomenys"
 
-#: ../src/ui.c:144
+#: ../src/ui.c:150
 msgid ""
-"Copyright © 1998 - 2006 Jaka Močnik\n"
-"Copyright © 2006 - 2010 GHex Contributors"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
 msgstr ""
-"Autorinės teisės © 1998 - 2006 Jaka Močnik\n"
-"Autorinės teisės © 2006 - 2010 GHex pagalbininkai"
+"Ši programa yra laisva programinė įranga; jūs galite ją platinti bei keisti "
+"pagal GNU bendrosios viešos licencijos sąlygas, kaip jas pateikia Free "
+"Software Foundation; licencijos versija 2 arba (jūsų pasirinkta) bet kuri "
+"vėlesnė versija."
 
-#: ../src/ui.c:151
-msgid "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
-msgstr "Ši programa yra laisva programinė įranga; jūs galite ją platinti bei keisti pagal GNU bendrosios viešos licencijos sąlygas, kaip jas pateikia Free Software Foundation; licencijos versija 2 arba (jūsų pasirinkta) bet kuri vėlesnė versija."
-
-#: ../src/ui.c:155
-msgid "This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
-msgstr "Ši programa platinama tikintis, kad ji bus naudinga, be BE JOKIOS GARANTIJOS; netgi be numanomos PREKYBINĖS ar TINKAMUMO TAM TIKRAM TIKSLUI garantijos. Daugiau informacijos rasite GNU bendrojoje viešoje licencijoje."
-
-#: ../src/ui.c:159
-msgid "You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
-msgstr "Jūs turėjote gauti GNU bendros viešosios licencijos kopiją kartu su programa; jei negavote, parašykite į Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
+#: ../src/ui.c:154
+msgid ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
+msgstr ""
+"Ši programa platinama tikintis, kad ji bus naudinga, be BE JOKIOS "
+"GARANTIJOS; netgi be numanomos PREKYBINĖS ar TINKAMUMO TAM TIKRAM TIKSLUI "
+"garantijos. Daugiau informacijos rasite GNU bendrojoje viešoje licencijoje."
+
+#: ../src/ui.c:158
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
+msgstr ""
+"Jūs turėjote gauti GNU bendros viešosios licencijos kopiją kartu su "
+"programa; jei negavote, parašykite į Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
+
+#. Translators: these two strings here indicate the copyright time span,
+#. e.g. 1998-2012.
+#: ../src/ui.c:170
+msgid "Copyright © %Id–%Id The GHex authors"
+msgstr "Autorinės teisės © %Id–%Id GHex autoriai"
 
-#: ../src/ui.c:171
+#: ../src/ui.c:174
 msgid "A binary file editor"
 msgstr "Dvejetainių failų redaktorius"
 
-#: ../src/ui.c:177
+#: ../src/ui.c:180
 msgid "About GHex"
 msgstr "Apie GHex"
 
-#: ../src/ui.c:178
+#: ../src/ui.c:181
 msgid "translator-credits"
 msgstr ""
 "padėka vertėjams:\n"
 "Algimantas Margevičius\n"
 "Aurimas Černius"
 
-#: ../src/ui.c:181
+#: ../src/ui.c:184
 msgid "GHex Website"
 msgstr "GHex svetainė"
 
-#: ../src/ui.c:311
+#: ../src/ui.c:318
 msgid "Select a file to open"
 msgstr "Pasirinkite failą atvėrimui"
 
-#: ../src/ui.c:342
+#: ../src/ui.c:349
 #, c-format
 msgid "Loaded file %s"
 msgstr "Įkeltas failas %s"
 
-#: ../src/ui.c:350
+#: ../src/ui.c:357
 msgid "Can not open file!"
 msgstr "Negaliu atverti failo!"
 
-#: ../src/ui.c:415
+#: ../src/ui.c:422
 msgid "Select path and file name for the HTML source"
 msgstr "Pasirink kelią ir failo vardą HTML pradiniam kodui"
 
-#: ../src/ui.c:449
+#: ../src/ui.c:454
 msgid "You need to specify a base name for the HTML files."
 msgstr "Turi nurodyti vardą HTML failams."
 
-#: ../src/ui.c:460
-#: ../src/ui.c:484
+#: ../src/ui.c:465 ../src/ui.c:491
 msgid "You don't have the permission to write to the selected path.\n"
 msgstr "Neturi teisės rašyti į pasirinktą kelią.\n"
 
-#: ../src/ui.c:471
+#: ../src/ui.c:477
 msgid ""
 "Saving to HTML will overwrite some files.\n"
 "Do you want to proceed?"
@@ -1063,13 +1049,25 @@
 "Saugant į HTML perrašys kelis failus.\n"
 "Tęsti?"
 
-#: ../src/ui.c:736
+#: ../src/ui.c:745
 #, c-format
 msgid "Really revert file %s?"
 msgstr "Tikrai atstatyti failą %s?"
 
-#: ../src/ui.c:750
+#: ../src/ui.c:759
 #, c-format
 msgid "Reverted buffer from file %s"
 msgstr "Atstatytas buferis iš failo %s"
 
+#~ msgid "32 bit float:"
+#~ msgstr "32 bitų slankaus kablelio:"
+
+#~ msgid "64 bit float:"
+#~ msgstr "64 bitų slankaus kablelio:"
+
+#~ msgid ""
+#~ "Copyright © 1998 - 2006 Jaka Močnik\n"
+#~ "Copyright © 2006 - 2010 GHex Contributors"
+#~ msgstr ""
+#~ "Autorinės teisės © 1998 - 2006 Jaka Močnik\n"
+#~ "Autorinės teisės © 2006 - 2010 GHex pagalbininkai"
diff -Nru ghex-3.3.90/po/Makefile.in.in ghex-3.3.91/po/Makefile.in.in
--- ghex-3.3.90/po/Makefile.in.in	2012-02-21 06:09:17.000000000 +0000
+++ ghex-3.3.91/po/Makefile.in.in	2012-03-05 17:30:33.000000000 +0000
@@ -49,8 +49,8 @@
 XGETTEXT = @XGETTEXT@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
 
 ALL_LINGUAS = @ALL_LINGUAS@
 
diff -Nru ghex-3.3.90/po/nb.po ghex-3.3.91/po/nb.po
--- ghex-3.3.90/po/nb.po	2012-02-09 00:02:51.000000000 +0000
+++ ghex-3.3.91/po/nb.po	2012-02-23 08:39:12.000000000 +0000
@@ -1,13 +1,13 @@
-# Norwegian (bokmål dialect) translation of the ghex module
+# Norwegian bokmål translation of ghex.
 # Copyright (C) 1998, 1999 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas@gnome.org>, 1998-2011.
+# Kjartan Maraas <kmaraas@gnome.org>, 1998-2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ghex\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-10 16:03+0200\n"
-"PO-Revision-Date: 2011-08-10 16:09+0200\n"
+"POT-Creation-Date: 2012-02-22 20:47+0100\n"
+"PO-Revision-Date: 2012-02-22 20:51+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "Language: no\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:651
-#: ../src/ghex-window.c:1097
+#: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:675
+#: ../src/ghex-window.c:1109
 msgid "GHex"
 msgstr "GHex"
 
@@ -53,50 +53,50 @@
 msgid "Character table"
 msgstr "Tegntabell"
 
-#: ../src/converter.c:231
+#: ../src/converter.c:232
 msgid "Base Converter"
 msgstr "Basiskonvertering"
 
 #. entries
-#: ../src/converter.c:252
+#: ../src/converter.c:253
 msgid "_Binary:"
 msgstr "_Binær:"
 
-#: ../src/converter.c:254
+#: ../src/converter.c:255
 msgid "_Octal:"
 msgstr "_Oktal:"
 
-#: ../src/converter.c:256
+#: ../src/converter.c:257
 msgid "_Decimal:"
 msgstr "_Desimal:"
 
-#: ../src/converter.c:258
+#: ../src/converter.c:259
 msgid "_Hex:"
 msgstr "_Heksadesimal:"
 
-#: ../src/converter.c:260
+#: ../src/converter.c:261
 msgid "_ASCII:"
 msgstr "_ASCII:"
 
 #. get cursor button
-#: ../src/converter.c:264
+#: ../src/converter.c:265
 msgid "_Get cursor value"
 msgstr "_Hent markørverdi"
 
-#: ../src/converter.c:278
+#: ../src/converter.c:279
 msgid "Get cursor value"
 msgstr "Hent markørverdi"
 
-#: ../src/converter.c:278
+#: ../src/converter.c:279
 msgid "Gets the value at cursor in binary, octal, decimal, hex and ASCII"
 msgstr ""
 "Henter verdien ved markøren i binær, oktal, desimal, heksadesimal og ASCII"
 
-#: ../src/converter.c:418
+#: ../src/converter.c:419
 msgid "ERROR"
 msgstr "FEIL"
 
-#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:864
+#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:873
 #, c-format
 msgid "GHex (%s): Find Data"
 msgstr "GHex (%s): Finn data"
@@ -178,7 +178,7 @@
 msgid "Closes advanced find window"
 msgstr "Lukker vinduet avansert søk"
 
-#: ../src/findreplace.c:355 ../src/ui.c:862
+#: ../src/findreplace.c:355 ../src/ui.c:871
 #, c-format
 msgid "GHex (%s): Find & Replace Data"
 msgstr "GHex (%s): Søk og erstatt data"
@@ -231,7 +231,7 @@
 msgid "Closes find and replace data window"
 msgstr "Lukker «finn og erstatt data»-vinduet"
 
-#: ../src/findreplace.c:434 ../src/ui.c:860
+#: ../src/findreplace.c:434 ../src/ui.c:869
 #, c-format
 msgid "GHex (%s): Jump To Byte"
 msgstr "GHex (%s): Hopp til byte"
@@ -265,16 +265,16 @@
 msgid "There is no string to search for!"
 msgstr "Ingen streng å søke etter!"
 
-#: ../src/findreplace.c:548 ../src/findreplace.c:686 ../src/findreplace.c:877
+#: ../src/findreplace.c:548 ../src/findreplace.c:686 ../src/findreplace.c:876
 msgid "End Of File reached"
 msgstr "Slutten på filen nådd"
 
 #: ../src/findreplace.c:549 ../src/findreplace.c:582 ../src/findreplace.c:685
-#: ../src/findreplace.c:878 ../src/findreplace.c:901
+#: ../src/findreplace.c:877 ../src/findreplace.c:900
 msgid "String was not found!\n"
 msgstr "Strengen ble ikke funnet!\n"
 
-#: ../src/findreplace.c:581 ../src/findreplace.c:900
+#: ../src/findreplace.c:581 ../src/findreplace.c:899
 msgid "Beginning Of File reached"
 msgstr "Begynnelsen på filen nådd"
 
@@ -342,7 +342,7 @@
 "Kan ikke åpne URI:\n"
 "%s"
 
-#: ../src/ghex-window.c:94
+#: ../src/ghex-window.c:96
 #, c-format
 msgid ""
 "Can not open file:\n"
@@ -351,302 +351,307 @@
 "Kan ikke åpne fil:\n"
 "%s"
 
-#: ../src/ghex-window.c:325
+#: ../src/ghex-window.c:327
 msgid "_File"
 msgstr "_Fil"
 
-#: ../src/ghex-window.c:326
+#: ../src/ghex-window.c:328
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../src/ghex-window.c:327
+#: ../src/ghex-window.c:329
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/ghex-window.c:328
+#: ../src/ghex-window.c:330
 msgid "_Group Data As"
 msgstr "Grupper data som"
 
 #. View submenu
-#: ../src/ghex-window.c:329
+#: ../src/ghex-window.c:331
 msgid "_Windows"
 msgstr "_Vinduer"
 
-#: ../src/ghex-window.c:330
+#: ../src/ghex-window.c:332
 msgid "_Help"
 msgstr "_Hjelp"
 
 #. File menu
-#: ../src/ghex-window.c:333
+#: ../src/ghex-window.c:335
 msgid "_Open..."
 msgstr "_Åpne …"
 
-#: ../src/ghex-window.c:334
+#: ../src/ghex-window.c:336
 msgid "Open a file"
 msgstr "Åpne en fil"
 
-#: ../src/ghex-window.c:336
+#: ../src/ghex-window.c:338
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../src/ghex-window.c:337
+#: ../src/ghex-window.c:339
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
-#: ../src/ghex-window.c:339
+#: ../src/ghex-window.c:341
 msgid "Save _As..."
 msgstr "Lagre _som …"
 
-#: ../src/ghex-window.c:340
+#: ../src/ghex-window.c:342
 msgid "Save the current file with a different name"
 msgstr "Lagre aktiv fil med et nytt navn"
 
-#: ../src/ghex-window.c:342
+#: ../src/ghex-window.c:344
 msgid "Save As _HTML..."
 msgstr "Lagre som _HTML …"
 
-#: ../src/ghex-window.c:343
+#: ../src/ghex-window.c:345
 msgid "Export data to HTML source"
 msgstr "Eksporter data til HTML kilde"
 
-#: ../src/ghex-window.c:345
+#: ../src/ghex-window.c:347
 msgid "_Revert"
 msgstr "Fo_rkast"
 
-#: ../src/ghex-window.c:346
+#: ../src/ghex-window.c:348
 msgid "Revert to a saved version of the file"
 msgstr "Gå tilbake til en lagret versjon av filen"
 
-#: ../src/ghex-window.c:348
+#: ../src/ghex-window.c:350
 msgid "_Print"
 msgstr "_Skriv ut"
 
-#: ../src/ghex-window.c:349
+#: ../src/ghex-window.c:351
 msgid "Print the current file"
 msgstr "Skriv ut aktivt fil"
 
-#: ../src/ghex-window.c:351
+#: ../src/ghex-window.c:353
 msgid "Print Previe_w..."
 msgstr "Forhånds_visning av utskrift …"
 
-#: ../src/ghex-window.c:352
+#: ../src/ghex-window.c:354
 msgid "Preview printed data"
 msgstr "Forhåndsvis utskriftsdata"
 
-#: ../src/ghex-window.c:354
+#: ../src/ghex-window.c:356
 msgid "_Close"
 msgstr "_Lukk"
 
-#: ../src/ghex-window.c:355
+#: ../src/ghex-window.c:357
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: ../src/ghex-window.c:357
+#: ../src/ghex-window.c:359
 msgid "E_xit"
 msgstr "A_vslutt"
 
-#: ../src/ghex-window.c:358
+#: ../src/ghex-window.c:360
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
 #. Edit menu
-#: ../src/ghex-window.c:362
+#: ../src/ghex-window.c:364
 msgid "_Undo"
 msgstr "_Angre"
 
-#: ../src/ghex-window.c:363
+#: ../src/ghex-window.c:365
 msgid "Undo the last action"
 msgstr "Angre siste handling"
 
-#: ../src/ghex-window.c:365
+#: ../src/ghex-window.c:367
 msgid "_Redo"
 msgstr "_Gjenopprett"
 
-#: ../src/ghex-window.c:366
+#: ../src/ghex-window.c:368
 msgid "Redo the undone action"
 msgstr "Gjenopprett angret handling"
 
-#: ../src/ghex-window.c:368
+#: ../src/ghex-window.c:370
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: ../src/ghex-window.c:369
+#: ../src/ghex-window.c:371
 msgid "Copy selection to clipboard"
 msgstr "Kopier utvalg til utklippstavlen"
 
-#: ../src/ghex-window.c:371
+#: ../src/ghex-window.c:373
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
-#: ../src/ghex-window.c:372
+#: ../src/ghex-window.c:374
 msgid "Cut selection"
 msgstr "Klipp ut utvalg"
 
-#: ../src/ghex-window.c:374
+#: ../src/ghex-window.c:376
 msgid "Pa_ste"
 msgstr "Lim _inn"
 
-#: ../src/ghex-window.c:375
+#: ../src/ghex-window.c:377
 msgid "Paste data from clipboard"
 msgstr "Lim inn data fra utklippstavlen"
 
-#: ../src/ghex-window.c:377
+#: ../src/ghex-window.c:379
 msgid "_Find"
 msgstr "_Finn"
 
-#: ../src/ghex-window.c:378
+#: ../src/ghex-window.c:380
 msgid "Search for a string"
 msgstr "Søk etter en streng"
 
-#: ../src/ghex-window.c:380
+#: ../src/ghex-window.c:382
 msgid "_Advanced Find"
 msgstr "_Avansert søk"
 
-#: ../src/ghex-window.c:381
+#: ../src/ghex-window.c:383
 msgid "Advanced Find"
 msgstr "Avansert søk"
 
-#: ../src/ghex-window.c:383
+#: ../src/ghex-window.c:385
 msgid "R_eplace"
 msgstr "_Erstatt"
 
-#: ../src/ghex-window.c:384
+#: ../src/ghex-window.c:386
 msgid "Replace a string"
 msgstr "Erstatt en streng"
 
-#: ../src/ghex-window.c:386
+#: ../src/ghex-window.c:388
 msgid "_Goto Byte..."
 msgstr "Gå til byte …"
 
-#: ../src/ghex-window.c:387
+#: ../src/ghex-window.c:389
 msgid "Jump to a certain position"
 msgstr "Hopp til en bestemt posisjon"
 
-#: ../src/ghex-window.c:389
+#: ../src/ghex-window.c:391
 msgid "_Preferences"
 msgstr "_Brukervalg"
 
-#: ../src/ghex-window.c:390
+#: ../src/ghex-window.c:392
 msgid "Configure the application"
 msgstr "Konfigurer applikasjonen"
 
 #. View menu
-#: ../src/ghex-window.c:394
+#: ../src/ghex-window.c:396
 msgid "_Add View"
 msgstr "L_egg til visning"
 
-#: ../src/ghex-window.c:395
+#: ../src/ghex-window.c:397
 msgid "Add a new view to the buffer"
 msgstr "Legg til en ny visning i bufferen"
 
-#: ../src/ghex-window.c:397
+#: ../src/ghex-window.c:399
 msgid "_Remove View"
 msgstr "Fje_rn visning"
 
-#: ../src/ghex-window.c:398
+#: ../src/ghex-window.c:400
 msgid "Remove the current view of the buffer"
 msgstr "Fjern nåværende visning av bufferen"
 
 #. Help menu
-#: ../src/ghex-window.c:402
+#: ../src/ghex-window.c:404
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../src/ghex-window.c:403
+#: ../src/ghex-window.c:405
 msgid "Help on this application"
 msgstr "Hjelp om denne applikasjonen"
 
-#: ../src/ghex-window.c:405
+#: ../src/ghex-window.c:407
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/ghex-window.c:406
+#: ../src/ghex-window.c:408
 msgid "About this application"
 msgstr "Om denne applikasjonen"
 
 #. Edit menu
-#: ../src/ghex-window.c:413
+#: ../src/ghex-window.c:415
 msgid "_Insert Mode"
 msgstr "_Innsettingsmodus"
 
-#: ../src/ghex-window.c:414
+#: ../src/ghex-window.c:416
 msgid "Insert/overwrite data"
 msgstr "Sett inn/overskriv data"
 
 #. Windows menu
-#: ../src/ghex-window.c:418
+#: ../src/ghex-window.c:420
 msgid "Character _Table"
 msgstr "_Tegntabell"
 
-#: ../src/ghex-window.c:419
+#: ../src/ghex-window.c:421
 msgid "Show the character table"
 msgstr "Vis tegntabellen"
 
-#: ../src/ghex-window.c:421
+#: ../src/ghex-window.c:423
 msgid "_Base Converter"
 msgstr "_Basiskonvertering"
 
-#: ../src/ghex-window.c:422
+#: ../src/ghex-window.c:424
 msgid "Open base conversion dialog"
 msgstr "Åpne dialog for konvertering"
 
-#: ../src/ghex-window.c:424
+#: ../src/ghex-window.c:426
 msgid "Type Conversion _Dialog"
 msgstr "_Dialog for konvertering mellom typer"
 
-#: ../src/ghex-window.c:425
+#: ../src/ghex-window.c:427
 msgid "Show the type conversion dialog in the edit window"
 msgstr "Vis dialog for konvertering mellom typer i redigeringsvinduet"
 
-#: ../src/ghex-window.c:431 ../src/ui.c:48
+#: ../src/ghex-window.c:433 ../src/ui.c:48
 msgid "_Bytes"
 msgstr "Bytes"
 
-#: ../src/ghex-window.c:432
+#: ../src/ghex-window.c:434
 msgid "Group data by 8 bits"
 msgstr "Grupper data i 8 bits grupper"
 
-#: ../src/ghex-window.c:433 ../src/ui.c:49
+#: ../src/ghex-window.c:435 ../src/ui.c:49
 msgid "_Words"
 msgstr "Ord"
 
-#: ../src/ghex-window.c:434
+#: ../src/ghex-window.c:436
 msgid "Group data by 16 bits"
 msgstr "Grupper data i 16 bits grupper"
 
-#: ../src/ghex-window.c:435 ../src/ui.c:50
+#: ../src/ghex-window.c:437 ../src/ui.c:50
 msgid "_Longwords"
 msgstr "Lange ord"
 
-#: ../src/ghex-window.c:436
+#: ../src/ghex-window.c:438
 msgid "Group data by 32 bits"
 msgstr "_Grupper data i 32 bits grupper"
 
-#: ../src/ghex-window.c:770
+#: ../src/ghex-window.c:585
+#, c-format
+msgid "Failed to load UI: %s"
+msgstr "Klarte ikke å laste brukergrensesnitt: %s"
+
+#: ../src/ghex-window.c:794
 #, c-format
 msgid "Offset: %s"
 msgstr "Avstand: %s"
 
-#: ../src/ghex-window.c:773
+#: ../src/ghex-window.c:797
 #, c-format
 msgid "; %s bytes from %s to %s selected"
 msgstr "; %s bytes fra %s til %s valgt"
 
-#: ../src/ghex-window.c:1057
+#: ../src/ghex-window.c:1069
 #, c-format
 msgid "Activate file %s"
 msgstr "Aktiver fil %s"
 
-#: ../src/ghex-window.c:1093
+#: ../src/ghex-window.c:1105
 #, c-format
 msgid "%s - GHex"
 msgstr "%s - GHex"
 
-#: ../src/ghex-window.c:1221
+#: ../src/ghex-window.c:1231
 msgid "Select a file to save buffer as"
 msgstr "Velg en fil for lagring av buffer"
 
-#: ../src/ghex-window.c:1277
+#: ../src/ghex-window.c:1263
 #, c-format
 msgid ""
 "File %s exists.\n"
@@ -655,20 +660,20 @@
 "Filen %s eksisterer.\n"
 "Vil du overskrive den?"
 
-#: ../src/ghex-window.c:1310 ../src/ui.c:293
+#: ../src/ghex-window.c:1289 ../src/ui.c:300
 #, c-format
 msgid "Saved buffer to file %s"
 msgstr "Lagret buffer til fil %s"
 
-#: ../src/ghex-window.c:1316
+#: ../src/ghex-window.c:1296
 msgid "Error saving file!"
 msgstr "Feil under lagring av fil!"
 
-#: ../src/ghex-window.c:1322
+#: ../src/ghex-window.c:1302
 msgid "Can't open file for writing!"
 msgstr "Kan ikke åpne filen for skriving!"
 
-#: ../src/ghex-window.c:1367
+#: ../src/ghex-window.c:1347
 #, c-format
 msgid ""
 "File %s has changed since last save.\n"
@@ -677,15 +682,15 @@
 "Filen %s er endret siden forrige lagring.\n"
 "Vil du lagre endringene?"
 
-#: ../src/ghex-window.c:1371
+#: ../src/ghex-window.c:1351
 msgid "Do_n't save"
 msgstr "I_kke lagre"
 
-#: ../src/ghex-window.c:1391 ../src/ui.c:281
+#: ../src/ghex-window.c:1371 ../src/ui.c:288
 msgid "You don't have the permissions to save the file!"
 msgstr "Du har ikke tilgang til å lagre filen!"
 
-#: ../src/ghex-window.c:1395 ../src/ui.c:286
+#: ../src/ghex-window.c:1375 ../src/ui.c:293
 msgid "An error occurred while saving file!"
 msgstr "En feil oppsto ved lagring av filen!"
 
@@ -714,12 +719,12 @@
 msgstr "32-bits uten fortegn:"
 
 #: ../src/hex-dialog.c:64
-msgid "32 bit float:"
-msgstr "32-bits flyttall:"
+msgid "Float 32 bit:"
+msgstr "Flyttal 32-bit:"
 
 #: ../src/hex-dialog.c:65
-msgid "64 bit float:"
-msgstr "64-bit flyttall:"
+msgid "Float 64 bit:"
+msgstr "Flyttall 64-bit:"
 
 #: ../src/hex-dialog.c:66
 msgid "Hexadecimal:"
@@ -733,19 +738,19 @@
 msgid "Binary:"
 msgstr "Binær:"
 
-#: ../src/hex-dialog.c:197
+#: ../src/hex-dialog.c:204
 msgid "Show little endian decoding"
 msgstr "Vis little endian dekoding"
 
-#: ../src/hex-dialog.c:204
+#: ../src/hex-dialog.c:211
 msgid "Show unsigned and float as hexadecimal"
 msgstr "Vis flyttall og tall uten fortegn som heksadesimale tall"
 
-#: ../src/hex-dialog.c:210
+#: ../src/hex-dialog.c:217
 msgid "Stream Length:"
 msgstr "Lengde på strøm:"
 
-#: ../src/hex-dialog.c:232
+#: ../src/hex-dialog.c:239
 msgid "FIXME: no conversion function"
 msgstr "FIXME: ingen konverteringsfunksjon"
 
@@ -753,26 +758,26 @@
 msgid "New document"
 msgstr "Nytt dokument"
 
-#: ../src/hex-document.c:790
+#: ../src/hex-document.c:785
 #, c-format
 msgid "Page"
 msgstr "Side"
 
-#: ../src/hex-document.c:796 ../src/hex-document.c:921
+#: ../src/hex-document.c:791 ../src/hex-document.c:916
 #, c-format
 msgid "Hex dump generated by"
 msgstr "Hex dump generert av"
 
-#: ../src/hex-document.c:807
+#: ../src/hex-document.c:802
 msgid "Saving to HTML..."
 msgstr "Lagrer som HTML …"
 
-#: ../src/hex-document.c:844
+#: ../src/hex-document.c:839
 #, c-format
 msgid "Previous page"
 msgstr "Forrige side"
 
-#: ../src/hex-document.c:859
+#: ../src/hex-document.c:854
 #, c-format
 msgid "Next page"
 msgstr "Neste side"
@@ -800,9 +805,10 @@
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "%s\n"
-"Kjør «%s --help» for å se en full liste med tilgjengelige kommandolinjeflagg.\n"
+"Kjør «%s --help» for å se en full liste med tilgjengelige "
+"kommandolinjeflagg.\n"
 
-#: ../src/main.c:81 ../src/main.c:94
+#: ../src/main.c:80 ../src/main.c:93
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Ugyldig geometristreng «%s»\n"
@@ -876,51 +882,51 @@
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: ../src/preferences.c:239
+#: ../src/preferences.c:245
 msgid "_Data font:"
 msgstr "_Skrift for data:"
 
-#: ../src/preferences.c:255
+#: ../src/preferences.c:259
 msgid "Data font"
 msgstr "Skrifttype for data"
 
-#: ../src/preferences.c:255
+#: ../src/preferences.c:259
 msgid "Select the data font"
 msgstr "Velg skrift for data"
 
-#: ../src/preferences.c:269
+#: ../src/preferences.c:268
 msgid "Header fo_nt:"
 msgstr "Skrift for _topptekst:"
 
-#: ../src/preferences.c:284
+#: ../src/preferences.c:281
 msgid "Header font"
 msgstr "Skrifttype for topptekst"
 
-#: ../src/preferences.c:284
+#: ../src/preferences.c:281
 msgid "Select the header font"
 msgstr "Velg skrift for topptekst"
 
-#: ../src/preferences.c:310
+#: ../src/preferences.c:306
 msgid "_Print shaded box over:"
 msgstr "S_kriv ut skyggelagt boks over:"
 
-#: ../src/preferences.c:322
+#: ../src/preferences.c:318
 msgid "Box size"
 msgstr "Størrelse på boks"
 
-#: ../src/preferences.c:322
+#: ../src/preferences.c:318
 msgid "Select size of box (in number of lines)"
 msgstr "Velg størrelse på boksen (antall linjer)"
 
-#: ../src/preferences.c:326
+#: ../src/preferences.c:322
 msgid "lines (0 for no box)"
 msgstr "linjer (0 for ingen boks)"
 
-#: ../src/preferences.c:333
+#: ../src/preferences.c:329
 msgid "Printing"
 msgstr "Utskrift"
 
-#: ../src/preferences.c:451 ../src/ui.c:202
+#: ../src/preferences.c:447 ../src/ui.c:209
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -929,11 +935,11 @@
 "Det oppsto en feil under visning av hjelp: \n"
 "%s"
 
-#: ../src/preferences.c:503
+#: ../src/preferences.c:499
 msgid "Can not open desired font!"
 msgstr "Kan ikke åpne ønsket skrifttype!"
 
-#: ../src/preferences.c:564
+#: ../src/preferences.c:560
 msgid ""
 "The offset format string contains invalid format specifier.\n"
 "Only 'x', 'X', 'p', 'P', 'd' and 'o' are allowed."
@@ -941,7 +947,7 @@
 "Formatstrengen for avstand inneholder en ugyldig formatspesifikatorer.\n"
 "Kun 'x', 'X', 'p', 'P', 'd' eller 'o' er tillat."
 
-#: ../src/print.c:58
+#: ../src/print.c:57
 #, c-format
 msgid "Page: %i/%i"
 msgstr "Side: %i %i"
@@ -954,79 +960,77 @@
 msgid "ASCII data"
 msgstr "ASCII data"
 
-#: ../src/ui.c:144
-msgid ""
-"Copyright © 1998 - 2006 Jaka Močnik\n"
-"Copyright © 2006 - 2010 GHex Contributors"
-msgstr ""
-"Opphavsrett © 1998 - 2006 Jaka Mocnik\n"
-"Opphavsrett © 2006 - 2010 GHex bidragsytere"
-
-#: ../src/ui.c:151
+#: ../src/ui.c:150
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
 "Software Foundation; either version 2 of the License, or (at your option) "
 "any later version."
-msgstr ""
+msgstr "Dette programmet er fri programvare. Du kan redistribuere og/eller endre programmet under betingelsene gitt i GNU General Public License som utgitt av Free Software Foundation; enten versjon 2 av lisensen, eller (hvis du ønsker det) enhver senere versjon."
 
-#: ../src/ui.c:155
+#: ../src/ui.c:154
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
 "more details."
-msgstr ""
+msgstr "Programmet distribueres i håp om at programmet er nyttig, men uten NOEN GARANTI, ikke engang implisitt garanti om at det er SALGBART eller PASSER ET BESTEMT FORMÅL. Se GNU General Public License for detaljer."
 
-#: ../src/ui.c:159
+#: ../src/ui.c:158
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
-msgstr ""
+msgstr "Du skal ha mottatt en kopi av GNU General Public License sammen med dette programmet. Hvis dette ikke er tilfelle, kan du skrive til Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
+
+#. Translators: these two strings here indicate the copyright time span,
+#. e.g. 1998-2012.
+#: ../src/ui.c:170
+msgid "Copyright © %Id–%Id The GHex authors"
+msgstr "Opphavsrett © %Id-%Id GHex-forfatterene"
 
-#: ../src/ui.c:171
+#: ../src/ui.c:174
 msgid "A binary file editor"
 msgstr "En binærfileditor"
 
-#: ../src/ui.c:177
+#: ../src/ui.c:180
 msgid "About GHex"
 msgstr "Om GHex"
 
-#: ../src/ui.c:178
+#: ../src/ui.c:181
 msgid "translator-credits"
 msgstr "Kjartan Maraas <kmaraas@gnome.org>"
 
-#: ../src/ui.c:181
+#: ../src/ui.c:184
 msgid "GHex Website"
 msgstr "Nettsted for GHex"
 
-#: ../src/ui.c:311
+#: ../src/ui.c:318
 msgid "Select a file to open"
 msgstr "Velg en fil å åpne"
 
-#: ../src/ui.c:342
+#: ../src/ui.c:349
 #, c-format
 msgid "Loaded file %s"
 msgstr "Lastet fil %s"
 
-#: ../src/ui.c:350
+#: ../src/ui.c:357
 msgid "Can not open file!"
 msgstr "Kan ikke åpne filen!"
 
-#: ../src/ui.c:415
+#: ../src/ui.c:422
 msgid "Select path and file name for the HTML source"
 msgstr "Velg sti og filnavn for HTML kilden"
 
-#: ../src/ui.c:449
+#: ../src/ui.c:454
 msgid "You need to specify a base name for the HTML files."
 msgstr "Du må spesifisere et basisnavn for HTML filene."
 
-#: ../src/ui.c:460 ../src/ui.c:484
+#: ../src/ui.c:465 ../src/ui.c:491
 msgid "You don't have the permission to write to the selected path.\n"
 msgstr "Du har ikke tilgang til å skrive til valgt sti.\n"
 
-#: ../src/ui.c:471
+#: ../src/ui.c:477
 msgid ""
 "Saving to HTML will overwrite some files.\n"
 "Do you want to proceed?"
@@ -1034,178 +1038,12 @@
 "Lagring av HTML vil overskrive noen filer.\n"
 "Vil du fortsette?"
 
-#: ../src/ui.c:736
+#: ../src/ui.c:745
 #, c-format
 msgid "Really revert file %s?"
 msgstr "Virkelig forkaste filen %s?"
 
-#: ../src/ui.c:750
+#: ../src/ui.c:759
 #, c-format
 msgid "Reverted buffer from file %s"
 msgstr "Forkastet buffer fra fil %s"
-
-#~ msgid "C_ut"
-#~ msgstr "Klipp _ut"
-
-#~ msgid "Character Table..."
-#~ msgstr "Tegntabell..."
-
-#~ msgid "Contents"
-#~ msgstr "Innhold"
-
-#~ msgid "Converter..."
-#~ msgstr "Konverterer..."
-
-#~ msgid "Copy"
-#~ msgstr "Kopier"
-
-#~ msgid "Cut"
-#~ msgstr "Klipp ut"
-
-#~ msgid "Exit"
-#~ msgstr "Avslutt"
-
-#~ msgid "Export to HTML..."
-#~ msgstr "Eksporter til HTML..."
-
-#~ msgid "Find"
-#~ msgstr "Finn"
-
-#~ msgid "Goto Byte"
-#~ msgstr "Gå til byte"
-
-#~ msgid "Help Chat"
-#~ msgstr "Hjelp pratekanal"
-
-#~ msgid "Insert Mode"
-#~ msgstr "Innsettingsmodus"
-
-#~ msgid "Longwords"
-#~ msgstr "Lange ord"
-
-#~ msgid "Open"
-#~ msgstr "Åpne"
-
-#~ msgid "Paste"
-#~ msgstr "Lim inn"
-
-#~ msgid "Preferences"
-#~ msgstr "Brukervalg"
-
-#~ msgid "Print"
-#~ msgstr "Skriv ut"
-
-#~ msgid "Print Preview..."
-#~ msgstr "Forhåndsvisning av utskrift..."
-
-#~ msgid "Redo"
-#~ msgstr "Gjenopprett"
-
-#~ msgid "Remove View"
-#~ msgstr "Fjern visning"
-
-#~ msgid "Revert"
-#~ msgstr "Forkast"
-
-#~ msgid "Save"
-#~ msgstr "Lagre"
-
-#~ msgid "Save As"
-#~ msgstr "Lagre som"
-
-#~ msgid "Type Conversion Dialog..."
-#~ msgstr "Dialog for konvertering mellom typer..."
-
-#~ msgid "Undo"
-#~ msgstr "Angre"
-
-#~ msgid "Words"
-#~ msgstr "Ord"
-
-#~ msgid "_Paste"
-#~ msgstr "_Lim inn"
-
-#~ msgid "_Insert a new preview phrase."
-#~ msgstr "Sett _inn en ny forhåndsvisningstekst."
-
-#~ msgid "Modify preview phrase..."
-#~ msgstr "Endre tekst for forhåndsvisning..."
-
-#~ msgid "Preview"
-#~ msgstr "Forhåndsvisning"
-
-#~ msgid "_Modify preview phrase..."
-#~ msgstr "_Endre tekst for forhåndsvisning..."
-
-#~ msgid "Font Selection"
-#~ msgstr "Skriftvalg"
-
-#~ msgid "Sans Regular 12"
-#~ msgstr "Sans Regular 12"
-
-#~ msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-#~ msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZzÆæØøÅå"
-
-#~ msgid "Pick a Font"
-#~ msgstr "Velg en skrift"
-
-#~ msgid "Title"
-#~ msgstr "Tittel"
-
-#~ msgid "The title of the selection dialog box"
-#~ msgstr "Tittel på dialogboksen for utvalget"
-
-#~ msgid "Font name"
-#~ msgstr "Skriftnavn"
-
-#~ msgid "Name of the selected font"
-#~ msgstr "Navn på valgt skrift"
-
-#~ msgid "Preview text"
-#~ msgstr "Tekst for forhåndsvisning"
-
-#~ msgid "Preview text shown in the dialog"
-#~ msgstr "Tekst som vises i forhåndsvisningsdialogen"
-
-#~ msgid "Use font in label"
-#~ msgstr "Bruk skrift i etikett"
-
-#~ msgid "Use font in the label in font info mode"
-#~ msgstr "Bruk skrift i etikett i informasjonsmodus for skrift"
-
-#~ msgid "Font size for label"
-#~ msgstr "Skriftstørrelse for etikett"
-
-#~ msgid "Font size for label in font info mode"
-#~ msgstr "Skriftstørrelse for etikett i informasjonsmodus for skrift"
-
-#~ msgid "Show size"
-#~ msgstr "Vis størrelse"
-
-#~ msgid "Show size in font info mode"
-#~ msgstr "Vis størrelse i informasjonsmodus for skrift"
-
-#~ msgid "Could not initialize Bonobo!\n"
-#~ msgstr "Kunne ikke initiere Bonobo!\n"
-
-#~ msgid ""
-#~ "GHex could not find the font \"%s\".\n"
-#~ "GHex is unable to print without this font installed."
-#~ msgstr ""
-#~ "GHex kunne ikke finne skrifttypen \"%s\".\n"
-#~ "GHex kan ikke skrive ut hvis ikke denne skrifttypen er installert."
-
-#~ msgid "Released under the terms of GNU Public License"
-#~ msgstr "Utgitt under vilkårene gitt i GNU Public License"
-
-#~ msgid "Printing file..."
-#~ msgstr "Skriver ut fil..."
-
-#~ msgid "Print Hex Document"
-#~ msgstr "Skriv ut Hex dokument"
-
-#~ msgid "Pages"
-#~ msgstr "Sider"
-
-#~ msgid "GHex (%s): Print Preview"
-#~ msgstr "GHex (%s): Forhåndsvisning av utskrift"
diff -Nru ghex-3.3.90/po/pl.po ghex-3.3.91/po/pl.po
--- ghex-3.3.90/po/pl.po	2012-02-21 01:21:58.000000000 +0000
+++ ghex-3.3.91/po/pl.po	2012-02-22 09:52:49.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: ghex\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-18 21:04+0100\n"
-"PO-Revision-Date: 2012-02-18 21:05+0100\n"
+"POT-Creation-Date: 2012-02-21 20:29+0100\n"
+"PO-Revision-Date: 2012-02-21 20:30+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -21,8 +21,8 @@
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: Poland\n"
 
-#: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:673
-#: ../src/ghex-window.c:1107
+#: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:675
+#: ../src/ghex-window.c:1109
 msgid "GHex"
 msgstr "GHex"
 
@@ -58,51 +58,51 @@
 msgid "Character table"
 msgstr "Tablica znaków"
 
-#: ../src/converter.c:231
+#: ../src/converter.c:232
 msgid "Base Converter"
 msgstr "Konwerter zapisu liczb"
 
 #. entries
-#: ../src/converter.c:252
+#: ../src/converter.c:253
 msgid "_Binary:"
 msgstr "_Binarnie:"
 
-#: ../src/converter.c:254
+#: ../src/converter.c:255
 msgid "_Octal:"
 msgstr "Ó_semkowo:"
 
-#: ../src/converter.c:256
+#: ../src/converter.c:257
 msgid "_Decimal:"
 msgstr "_Dziesiętnie:"
 
-#: ../src/converter.c:258
+#: ../src/converter.c:259
 msgid "_Hex:"
 msgstr "_Szesnastkowo:"
 
-#: ../src/converter.c:260
+#: ../src/converter.c:261
 msgid "_ASCII:"
 msgstr "_ASCII:"
 
 #. get cursor button
-#: ../src/converter.c:264
+#: ../src/converter.c:265
 msgid "_Get cursor value"
 msgstr "_Pobierz wartość pod kursorem"
 
-#: ../src/converter.c:278
+#: ../src/converter.c:279
 msgid "Get cursor value"
 msgstr "Pobierz wartość pod kursorem"
 
-#: ../src/converter.c:278
+#: ../src/converter.c:279
 msgid "Gets the value at cursor in binary, octal, decimal, hex and ASCII"
 msgstr ""
 "Pobiera wartość pod kursorem w formie binarnej, ósemkowej, dziesiętnej, "
 "szesnastkowej i ASCII"
 
-#: ../src/converter.c:418
+#: ../src/converter.c:419
 msgid "ERROR"
 msgstr "BŁĄD"
 
-#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:866
+#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:873
 #, c-format
 msgid "GHex (%s): Find Data"
 msgstr "GHex (%s): wyszukiwanie danych"
@@ -184,7 +184,7 @@
 msgid "Closes advanced find window"
 msgstr "Zamyka okno zaawansowanego wyszukiwania"
 
-#: ../src/findreplace.c:355 ../src/ui.c:864
+#: ../src/findreplace.c:355 ../src/ui.c:871
 #, c-format
 msgid "GHex (%s): Find & Replace Data"
 msgstr "GHex (%s): wyszukiwanie i zamiana danych"
@@ -237,7 +237,7 @@
 msgid "Closes find and replace data window"
 msgstr "Zamyka okno wyszukiwania i zmiany danych"
 
-#: ../src/findreplace.c:434 ../src/ui.c:862
+#: ../src/findreplace.c:434 ../src/ui.c:869
 #, c-format
 msgid "GHex (%s): Jump To Byte"
 msgstr "GHex (%s): przejście do bajtu"
@@ -271,16 +271,16 @@
 msgid "There is no string to search for!"
 msgstr "Brak ciągu do wyszukania."
 
-#: ../src/findreplace.c:548 ../src/findreplace.c:686 ../src/findreplace.c:877
+#: ../src/findreplace.c:548 ../src/findreplace.c:686 ../src/findreplace.c:876
 msgid "End Of File reached"
 msgstr "Osiągnięto koniec pliku"
 
 #: ../src/findreplace.c:549 ../src/findreplace.c:582 ../src/findreplace.c:685
-#: ../src/findreplace.c:878 ../src/findreplace.c:901
+#: ../src/findreplace.c:877 ../src/findreplace.c:900
 msgid "String was not found!\n"
 msgstr "Nie odnaleziono ciągu.\n"
 
-#: ../src/findreplace.c:581 ../src/findreplace.c:900
+#: ../src/findreplace.c:581 ../src/findreplace.c:899
 msgid "Beginning Of File reached"
 msgstr "Osiągnięto początek pliku"
 
@@ -349,7 +349,7 @@
 "Nie można otworzyć adresu URI:\n"
 "%s"
 
-#: ../src/ghex-window.c:94
+#: ../src/ghex-window.c:96
 #, c-format
 msgid ""
 "Can not open file:\n"
@@ -358,307 +358,307 @@
 "Nie można otworzyć pliku:\n"
 "%s"
 
-#: ../src/ghex-window.c:325
+#: ../src/ghex-window.c:327
 msgid "_File"
 msgstr "_Plik"
 
-#: ../src/ghex-window.c:326
+#: ../src/ghex-window.c:328
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../src/ghex-window.c:327
+#: ../src/ghex-window.c:329
 msgid "_View"
 msgstr "_Widok"
 
-#: ../src/ghex-window.c:328
+#: ../src/ghex-window.c:330
 msgid "_Group Data As"
 msgstr "_Grupowanie danych"
 
 #. View submenu
-#: ../src/ghex-window.c:329
+#: ../src/ghex-window.c:331
 msgid "_Windows"
 msgstr "O_kna"
 
-#: ../src/ghex-window.c:330
+#: ../src/ghex-window.c:332
 msgid "_Help"
 msgstr "Pomo_c"
 
 #. File menu
-#: ../src/ghex-window.c:333
+#: ../src/ghex-window.c:335
 msgid "_Open..."
 msgstr "_Otwórz..."
 
-#: ../src/ghex-window.c:334
+#: ../src/ghex-window.c:336
 msgid "Open a file"
 msgstr "Otwiera plik"
 
-#: ../src/ghex-window.c:336
+#: ../src/ghex-window.c:338
 msgid "_Save"
 msgstr "_Zapisz"
 
-#: ../src/ghex-window.c:337
+#: ../src/ghex-window.c:339
 msgid "Save the current file"
 msgstr "Zapisuje bieżący plik"
 
-#: ../src/ghex-window.c:339
+#: ../src/ghex-window.c:341
 msgid "Save _As..."
 msgstr "Z_apisz jako..."
 
-#: ../src/ghex-window.c:340
+#: ../src/ghex-window.c:342
 msgid "Save the current file with a different name"
 msgstr "Zapisuje bieżący plik pod inną nazwą"
 
-#: ../src/ghex-window.c:342
+#: ../src/ghex-window.c:344
 msgid "Save As _HTML..."
 msgstr "Zapisz w formacie _HTML..."
 
-#: ../src/ghex-window.c:343
+#: ../src/ghex-window.c:345
 msgid "Export data to HTML source"
 msgstr "Eksportuje dane do pliku HTML"
 
-#: ../src/ghex-window.c:345
+#: ../src/ghex-window.c:347
 msgid "_Revert"
 msgstr "_Przywróć"
 
-#: ../src/ghex-window.c:346
+#: ../src/ghex-window.c:348
 msgid "Revert to a saved version of the file"
 msgstr "Przywraca zapisaną wersję pliku"
 
-#: ../src/ghex-window.c:348
+#: ../src/ghex-window.c:350
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: ../src/ghex-window.c:349
+#: ../src/ghex-window.c:351
 msgid "Print the current file"
 msgstr "Drukuje bieżący plik"
 
-#: ../src/ghex-window.c:351
+#: ../src/ghex-window.c:353
 msgid "Print Previe_w..."
 msgstr "Podgląd _wydruku..."
 
-#: ../src/ghex-window.c:352
+#: ../src/ghex-window.c:354
 msgid "Preview printed data"
 msgstr "Wyświetla podgląd drukowanych danych"
 
-#: ../src/ghex-window.c:354
+#: ../src/ghex-window.c:356
 msgid "_Close"
 msgstr "Za_mknij"
 
-#: ../src/ghex-window.c:355
+#: ../src/ghex-window.c:357
 msgid "Close the current file"
 msgstr "Zamyka bieżący plik"
 
-#: ../src/ghex-window.c:357
+#: ../src/ghex-window.c:359
 msgid "E_xit"
 msgstr "Za_kończ"
 
-#: ../src/ghex-window.c:358
+#: ../src/ghex-window.c:360
 msgid "Exit the program"
 msgstr "Kończy działanie programu"
 
 #. Edit menu
-#: ../src/ghex-window.c:362
+#: ../src/ghex-window.c:364
 msgid "_Undo"
 msgstr "Cof_nij"
 
-#: ../src/ghex-window.c:363
+#: ../src/ghex-window.c:365
 msgid "Undo the last action"
 msgstr "Cofa ostatnią czynność"
 
-#: ../src/ghex-window.c:365
+#: ../src/ghex-window.c:367
 msgid "_Redo"
 msgstr "P_onów"
 
-#: ../src/ghex-window.c:366
+#: ../src/ghex-window.c:368
 msgid "Redo the undone action"
 msgstr "Ponawia cofniętą czynność"
 
-#: ../src/ghex-window.c:368
+#: ../src/ghex-window.c:370
 msgid "_Copy"
 msgstr "S_kopiuj"
 
-#: ../src/ghex-window.c:369
+#: ../src/ghex-window.c:371
 msgid "Copy selection to clipboard"
 msgstr "Kopiuje zaznaczenie do schowka"
 
-#: ../src/ghex-window.c:371
+#: ../src/ghex-window.c:373
 msgid "Cu_t"
 msgstr "Wy_tnij"
 
-#: ../src/ghex-window.c:372
+#: ../src/ghex-window.c:374
 msgid "Cut selection"
 msgstr "Wycina zaznaczenie"
 
-#: ../src/ghex-window.c:374
+#: ../src/ghex-window.c:376
 msgid "Pa_ste"
 msgstr "_Wklej"
 
-#: ../src/ghex-window.c:375
+#: ../src/ghex-window.c:377
 msgid "Paste data from clipboard"
 msgstr "Wkleja dane ze schowka"
 
-#: ../src/ghex-window.c:377
+#: ../src/ghex-window.c:379
 msgid "_Find"
 msgstr "_Znajdź"
 
-#: ../src/ghex-window.c:378
+#: ../src/ghex-window.c:380
 msgid "Search for a string"
 msgstr "Wyszukuje ciąg"
 
-#: ../src/ghex-window.c:380
+#: ../src/ghex-window.c:382
 msgid "_Advanced Find"
 msgstr "Z_aawansowane wyszukiwanie"
 
-#: ../src/ghex-window.c:381
+#: ../src/ghex-window.c:383
 msgid "Advanced Find"
 msgstr "Zaawansowane wyszukiwanie"
 
-#: ../src/ghex-window.c:383
+#: ../src/ghex-window.c:385
 msgid "R_eplace"
 msgstr "Z_mień"
 
-#: ../src/ghex-window.c:384
+#: ../src/ghex-window.c:386
 msgid "Replace a string"
 msgstr "Zmienia ciąg"
 
-#: ../src/ghex-window.c:386
+#: ../src/ghex-window.c:388
 msgid "_Goto Byte..."
 msgstr "_Przejdź do bajtu..."
 
-#: ../src/ghex-window.c:387
+#: ../src/ghex-window.c:389
 msgid "Jump to a certain position"
 msgstr "Przechodzi do określonej pozycji"
 
-#: ../src/ghex-window.c:389
+#: ../src/ghex-window.c:391
 msgid "_Preferences"
 msgstr "_Preferencje"
 
-#: ../src/ghex-window.c:390
+#: ../src/ghex-window.c:392
 msgid "Configure the application"
 msgstr "Konfiguruje program"
 
 #. View menu
-#: ../src/ghex-window.c:394
+#: ../src/ghex-window.c:396
 msgid "_Add View"
 msgstr "Dod_aj widok"
 
-#: ../src/ghex-window.c:395
+#: ../src/ghex-window.c:397
 msgid "Add a new view to the buffer"
 msgstr "Dodaje nowy widok do bufora"
 
-#: ../src/ghex-window.c:397
+#: ../src/ghex-window.c:399
 msgid "_Remove View"
 msgstr "_Usuń widok"
 
-#: ../src/ghex-window.c:398
+#: ../src/ghex-window.c:400
 msgid "Remove the current view of the buffer"
 msgstr "Usuwa bieżący widok bufora"
 
 #. Help menu
-#: ../src/ghex-window.c:402
+#: ../src/ghex-window.c:404
 msgid "_Contents"
 msgstr "_Spis treści"
 
-#: ../src/ghex-window.c:403
+#: ../src/ghex-window.c:405
 msgid "Help on this application"
 msgstr "Pomoc tego programu"
 
-#: ../src/ghex-window.c:405
+#: ../src/ghex-window.c:407
 msgid "_About"
 msgstr "_O programie"
 
-#: ../src/ghex-window.c:406
+#: ../src/ghex-window.c:408
 msgid "About this application"
 msgstr "Informacje o tym programie"
 
 #. Edit menu
-#: ../src/ghex-window.c:413
+#: ../src/ghex-window.c:415
 msgid "_Insert Mode"
 msgstr "Tryb _wstawiania"
 
-#: ../src/ghex-window.c:414
+#: ../src/ghex-window.c:416
 msgid "Insert/overwrite data"
 msgstr "Wstawia/zastępuje dane"
 
 #. Windows menu
-#: ../src/ghex-window.c:418
+#: ../src/ghex-window.c:420
 msgid "Character _Table"
 msgstr "_Tablica znaków"
 
-#: ../src/ghex-window.c:419
+#: ../src/ghex-window.c:421
 msgid "Show the character table"
 msgstr "Wyświetla tablicę znaków"
 
-#: ../src/ghex-window.c:421
+#: ../src/ghex-window.c:423
 msgid "_Base Converter"
 msgstr "Konwerter _zapisu liczb"
 
-#: ../src/ghex-window.c:422
+#: ../src/ghex-window.c:424
 msgid "Open base conversion dialog"
 msgstr "Otwiera okno konwersji między systemami liczenia"
 
-#: ../src/ghex-window.c:424
+#: ../src/ghex-window.c:426
 msgid "Type Conversion _Dialog"
 msgstr "_Okno konwersji pomiędzy rodzajami"
 
-#: ../src/ghex-window.c:425
+#: ../src/ghex-window.c:427
 msgid "Show the type conversion dialog in the edit window"
 msgstr "Wyświetla okno konwersji między rodzajami w oknie modyfikacji"
 
-#: ../src/ghex-window.c:431 ../src/ui.c:48
+#: ../src/ghex-window.c:433 ../src/ui.c:48
 msgid "_Bytes"
 msgstr "_Bajty"
 
-#: ../src/ghex-window.c:432
+#: ../src/ghex-window.c:434
 msgid "Group data by 8 bits"
 msgstr "Grupuje dane po 8 bitów"
 
-#: ../src/ghex-window.c:433 ../src/ui.c:49
+#: ../src/ghex-window.c:435 ../src/ui.c:49
 msgid "_Words"
 msgstr "_Słowa"
 
-#: ../src/ghex-window.c:434
+#: ../src/ghex-window.c:436
 msgid "Group data by 16 bits"
 msgstr "Grupuje dane po 16 bitów"
 
-#: ../src/ghex-window.c:435 ../src/ui.c:50
+#: ../src/ghex-window.c:437 ../src/ui.c:50
 msgid "_Longwords"
 msgstr "_Długie słowa"
 
-#: ../src/ghex-window.c:436
+#: ../src/ghex-window.c:438
 msgid "Group data by 32 bits"
 msgstr "Grupuje dane po 32 bity"
 
-#: ../src/ghex-window.c:583
+#: ../src/ghex-window.c:585
 #, c-format
 msgid "Failed to load UI: %s"
 msgstr "Wczytanie interfejsu użytkownika się nie powiodło: %s"
 
-#: ../src/ghex-window.c:792
+#: ../src/ghex-window.c:794
 #, c-format
 msgid "Offset: %s"
 msgstr "Przesunięcie: %s"
 
-#: ../src/ghex-window.c:795
+#: ../src/ghex-window.c:797
 #, c-format
 msgid "; %s bytes from %s to %s selected"
 msgstr "; zaznaczono %s bajtów od %s do %s"
 
-#: ../src/ghex-window.c:1067
+#: ../src/ghex-window.c:1069
 #, c-format
 msgid "Activate file %s"
 msgstr "Aktywuje plik %s"
 
-#: ../src/ghex-window.c:1103
+#: ../src/ghex-window.c:1105
 #, c-format
 msgid "%s - GHex"
 msgstr "%s - GHex"
 
-#: ../src/ghex-window.c:1229
+#: ../src/ghex-window.c:1231
 msgid "Select a file to save buffer as"
 msgstr "Wybór pliku do zapisu buforu"
 
-#: ../src/ghex-window.c:1261
+#: ../src/ghex-window.c:1263
 #, c-format
 msgid ""
 "File %s exists.\n"
@@ -667,20 +667,20 @@
 "Plik o nazwie %s już istnieje.\n"
 "Zastąpić go?"
 
-#: ../src/ghex-window.c:1287 ../src/ui.c:293
+#: ../src/ghex-window.c:1289 ../src/ui.c:300
 #, c-format
 msgid "Saved buffer to file %s"
 msgstr "Zapisano bufor do pliku %s"
 
-#: ../src/ghex-window.c:1294
+#: ../src/ghex-window.c:1296
 msgid "Error saving file!"
 msgstr "Błąd podczas zapisywania pliku."
 
-#: ../src/ghex-window.c:1300
+#: ../src/ghex-window.c:1302
 msgid "Can't open file for writing!"
 msgstr "Nie można otworzyć pliku do zapisania."
 
-#: ../src/ghex-window.c:1345
+#: ../src/ghex-window.c:1347
 #, c-format
 msgid ""
 "File %s has changed since last save.\n"
@@ -689,15 +689,15 @@
 "Plik %s został zmieniony od ostatniego zapisu.\n"
 "Zapisać zmiany?"
 
-#: ../src/ghex-window.c:1349
+#: ../src/ghex-window.c:1351
 msgid "Do_n't save"
 msgstr "_Bez zapisywania"
 
-#: ../src/ghex-window.c:1369 ../src/ui.c:281
+#: ../src/ghex-window.c:1371 ../src/ui.c:288
 msgid "You don't have the permissions to save the file!"
 msgstr "Brak uprawnień do zapisania pliku."
 
-#: ../src/ghex-window.c:1373 ../src/ui.c:286
+#: ../src/ghex-window.c:1375 ../src/ui.c:293
 msgid "An error occurred while saving file!"
 msgstr "Wystąpił błąd podczas zapisywania pliku."
 
@@ -726,11 +726,11 @@
 msgstr "Niepodpisane 32 bity:"
 
 #: ../src/hex-dialog.c:64
-msgid "32 bit float:"
+msgid "Float 32 bit:"
 msgstr "Zmiennoprzecinkowe 32 bity:"
 
 #: ../src/hex-dialog.c:65
-msgid "64 bit float:"
+msgid "Float 64 bit:"
 msgstr "Zmiennoprzecinkowe 64 bity:"
 
 #: ../src/hex-dialog.c:66
@@ -745,19 +745,19 @@
 msgid "Binary:"
 msgstr "Binarnie:"
 
-#: ../src/hex-dialog.c:197
+#: ../src/hex-dialog.c:204
 msgid "Show little endian decoding"
 msgstr "Wyświetlanie dekodowania cienkokońcowości"
 
-#: ../src/hex-dialog.c:204
+#: ../src/hex-dialog.c:211
 msgid "Show unsigned and float as hexadecimal"
 msgstr "Wyświetlanie niepodpisanych i zmiennoprzecinkowych jako szesnastkowe"
 
-#: ../src/hex-dialog.c:210
+#: ../src/hex-dialog.c:217
 msgid "Stream Length:"
 msgstr "Długość potoku:"
 
-#: ../src/hex-dialog.c:232
+#: ../src/hex-dialog.c:239
 msgid "FIXME: no conversion function"
 msgstr "FIXME: brak funkcji konwersji"
 
@@ -889,51 +889,51 @@
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: ../src/preferences.c:239
+#: ../src/preferences.c:245
 msgid "_Data font:"
 msgstr "Czcionka _danych:"
 
-#: ../src/preferences.c:255
+#: ../src/preferences.c:259
 msgid "Data font"
 msgstr "Czcionka danych"
 
-#: ../src/preferences.c:255
+#: ../src/preferences.c:259
 msgid "Select the data font"
 msgstr "Wybór czcionki danych"
 
-#: ../src/preferences.c:269
+#: ../src/preferences.c:268
 msgid "Header fo_nt:"
 msgstr "Czcionka _nagłówka:"
 
-#: ../src/preferences.c:284
+#: ../src/preferences.c:281
 msgid "Header font"
 msgstr "Czcionka nagłówka"
 
-#: ../src/preferences.c:284
+#: ../src/preferences.c:281
 msgid "Select the header font"
 msgstr "Wybór czcionki nagłówka"
 
-#: ../src/preferences.c:310
+#: ../src/preferences.c:306
 msgid "_Print shaded box over:"
 msgstr "_Drukowanie przyciemnionego prostokąta co:"
 
-#: ../src/preferences.c:322
+#: ../src/preferences.c:318
 msgid "Box size"
 msgstr "Rozmiar prostokąta"
 
-#: ../src/preferences.c:322
+#: ../src/preferences.c:318
 msgid "Select size of box (in number of lines)"
 msgstr "Wybór rozmiar prostokąta (w wierszach)"
 
-#: ../src/preferences.c:326
+#: ../src/preferences.c:322
 msgid "lines (0 for no box)"
 msgstr "wierszy (0 wyłącza przyciemnianie)"
 
-#: ../src/preferences.c:333
+#: ../src/preferences.c:329
 msgid "Printing"
 msgstr "Drukowanie"
 
-#: ../src/preferences.c:451 ../src/ui.c:202
+#: ../src/preferences.c:447 ../src/ui.c:209
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -942,11 +942,11 @@
 "Wystąpił błąd podczas wyświetlania pomocy: \n"
 "%s"
 
-#: ../src/preferences.c:503
+#: ../src/preferences.c:499
 msgid "Can not open desired font!"
 msgstr "Nie można otworzyć żądanej czcionki."
 
-#: ../src/preferences.c:564
+#: ../src/preferences.c:560
 msgid ""
 "The offset format string contains invalid format specifier.\n"
 "Only 'x', 'X', 'p', 'P', 'd' and 'o' are allowed."
@@ -967,15 +967,7 @@
 msgid "ASCII data"
 msgstr "danych ASCII"
 
-#: ../src/ui.c:144
-msgid ""
-"Copyright © 1998 - 2006 Jaka Močnik\n"
-"Copyright © 2006 - 2010 GHex Contributors"
-msgstr ""
-"Copyright © 1998 - 2006 Jaka Močnik\n"
-"Copyright © 2006 - 2010 współtwórcy programu GHex"
-
-#: ../src/ui.c:151
+#: ../src/ui.c:150
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -987,7 +979,7 @@
 "przez Fundację Wolnego Oprogramowania (Free Software Foundation) - według "
 "wersji drugiej tej Licencji lub którejś z późniejszych wersji."
 
-#: ../src/ui.c:155
+#: ../src/ui.c:154
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -999,7 +991,7 @@
 "HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania "
 "bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną GNU."
 
-#: ../src/ui.c:159
+#: ../src/ui.c:158
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -1010,48 +1002,54 @@
 "- proszę napisać do Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA 02110-1301 USA."
 
-#: ../src/ui.c:171
+#. Translators: these two strings here indicate the copyright time span,
+#. e.g. 1998-2012.
+#: ../src/ui.c:170
+msgid "Copyright © %Id–%Id The GHex authors"
+msgstr "Copyright © %Id–%Id Autorzy programu GHex"
+
+#: ../src/ui.c:174
 msgid "A binary file editor"
 msgstr "Edytor plików binarnych"
 
-#: ../src/ui.c:177
+#: ../src/ui.c:180
 msgid "About GHex"
 msgstr "O programie GHex"
 
-#: ../src/ui.c:178
+#: ../src/ui.c:181
 msgid "translator-credits"
 msgstr "Aviary.pl <gnomepl@aviary.pl>, 2012"
 
-#: ../src/ui.c:181
+#: ../src/ui.c:184
 msgid "GHex Website"
 msgstr "Witryna programu GHex"
 
-#: ../src/ui.c:311
+#: ../src/ui.c:318
 msgid "Select a file to open"
 msgstr "Wybór pliku do otwarcia"
 
-#: ../src/ui.c:342
+#: ../src/ui.c:349
 #, c-format
 msgid "Loaded file %s"
 msgstr "Wczytano plik %s"
 
-#: ../src/ui.c:350
+#: ../src/ui.c:357
 msgid "Can not open file!"
 msgstr "Nie można otworzyć pliku."
 
-#: ../src/ui.c:415
+#: ../src/ui.c:422
 msgid "Select path and file name for the HTML source"
 msgstr "Wybór ścieżki i nazwy pliku dla źródła HTML"
 
-#: ../src/ui.c:447
+#: ../src/ui.c:454
 msgid "You need to specify a base name for the HTML files."
 msgstr "Należy podać podstawową nazwę dla plików HTML."
 
-#: ../src/ui.c:458 ../src/ui.c:484
+#: ../src/ui.c:465 ../src/ui.c:491
 msgid "You don't have the permission to write to the selected path.\n"
 msgstr "Brak uprawnień do zapisu w wybranej ścieżce.\n"
 
-#: ../src/ui.c:470
+#: ../src/ui.c:477
 msgid ""
 "Saving to HTML will overwrite some files.\n"
 "Do you want to proceed?"
@@ -1059,12 +1057,12 @@
 "Zapisanie w formacie HTML spowoduje zastąpienie pewnych plików.\n"
 "Kontynuować?"
 
-#: ../src/ui.c:738
+#: ../src/ui.c:745
 #, c-format
 msgid "Really revert file %s?"
 msgstr "Na pewno przywrócić plik %s?"
 
-#: ../src/ui.c:752
+#: ../src/ui.c:759
 #, c-format
 msgid "Reverted buffer from file %s"
 msgstr "Przywrócono bufor z pliku %s"
diff -Nru ghex-3.3.90/po/sl.po ghex-3.3.91/po/sl.po
--- ghex-3.3.90/po/sl.po	2012-02-09 00:02:51.000000000 +0000
+++ ghex-3.3.91/po/sl.po	2012-02-22 09:52:49.000000000 +0000
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the ghex package.
 #
 # Jaka Močnik <jaka.mocnik@kiss.uni-lj.si>, 2000.
-# Matej Urbančič <mateju@svn.gnome.org>, 2009 - 2010.
+# Matej Urbančič <mateju@svn.gnome.org>, 2009 - 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ghex master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=ghex&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-08-23 18:16+0000\n"
-"PO-Revision-Date: 2011-08-29 20:12+0100\n"
+"POT-Creation-Date: 2012-02-21 19:30+0000\n"
+"PO-Revision-Date: 2012-02-21 22:27+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: \n"
@@ -23,8 +23,8 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: ../data/ghex.desktop.in.h:1
-#: ../src/ghex-window.c:651
-#: ../src/ghex-window.c:1097
+#: ../src/ghex-window.c:675
+#: ../src/ghex-window.c:1109
 msgid "GHex"
 msgstr "GHex"
 
@@ -61,51 +61,51 @@
 msgid "Character table"
 msgstr "Razpredelnica znakov"
 
-#: ../src/converter.c:231
+#: ../src/converter.c:232
 msgid "Base Converter"
 msgstr "Pretvornik številske osnove"
 
 #. entries
-#: ../src/converter.c:252
+#: ../src/converter.c:253
 msgid "_Binary:"
 msgstr "_Dvojiško:"
 
-#: ../src/converter.c:254
+#: ../src/converter.c:255
 msgid "_Octal:"
 msgstr "_Osmiško:"
 
-#: ../src/converter.c:256
+#: ../src/converter.c:257
 msgid "_Decimal:"
 msgstr "_Desetiško:"
 
-#: ../src/converter.c:258
+#: ../src/converter.c:259
 msgid "_Hex:"
 msgstr "_Šestnajstiško:"
 
-#: ../src/converter.c:260
+#: ../src/converter.c:261
 msgid "_ASCII:"
 msgstr "_ASCII"
 
 #. get cursor button
-#: ../src/converter.c:264
+#: ../src/converter.c:265
 msgid "_Get cursor value"
 msgstr "_Pridobi vrednost pod kazalko"
 
-#: ../src/converter.c:278
+#: ../src/converter.c:279
 msgid "Get cursor value"
 msgstr "_Pridobi vrednost pod kazalko"
 
-#: ../src/converter.c:278
+#: ../src/converter.c:279
 msgid "Gets the value at cursor in binary, octal, decimal, hex and ASCII"
 msgstr "Pridobi vrednost pod kazalko v dvojiškem, osmiškem, desetiškem in šestnajstiškem sistemu ter kot ASCII niz"
 
-#: ../src/converter.c:418
+#: ../src/converter.c:419
 msgid "ERROR"
 msgstr "NAPAKA"
 
 #: ../src/findreplace.c:97
 #: ../src/findreplace.c:221
-#: ../src/ui.c:864
+#: ../src/ui.c:873
 #, c-format
 msgid "GHex (%s): Find Data"
 msgstr "GHex (%s): iskanje niza"
@@ -197,7 +197,7 @@
 msgstr "Zapre pogovorno okno naprednega iskanja"
 
 #: ../src/findreplace.c:355
-#: ../src/ui.c:862
+#: ../src/ui.c:871
 #, c-format
 msgid "GHex (%s): Find & Replace Data"
 msgstr "GHex (%s): iskanje in zamenjava nizov"
@@ -251,7 +251,7 @@
 msgstr "Zapre pogovorno okno zamenjave"
 
 #: ../src/findreplace.c:434
-#: ../src/ui.c:860
+#: ../src/ui.c:869
 #, c-format
 msgid "GHex (%s): Jump To Byte"
 msgstr "GHex (%s): skoči na bit"
@@ -292,20 +292,20 @@
 
 #: ../src/findreplace.c:548
 #: ../src/findreplace.c:686
-#: ../src/findreplace.c:877
+#: ../src/findreplace.c:876
 msgid "End Of File reached"
 msgstr "Dosežen je konec datoteke"
 
 #: ../src/findreplace.c:549
 #: ../src/findreplace.c:582
 #: ../src/findreplace.c:685
-#: ../src/findreplace.c:878
-#: ../src/findreplace.c:901
+#: ../src/findreplace.c:877
+#: ../src/findreplace.c:900
 msgid "String was not found!\n"
 msgstr "Niza ni mogoče najti!\n"
 
 #: ../src/findreplace.c:581
-#: ../src/findreplace.c:900
+#: ../src/findreplace.c:899
 msgid "Beginning Of File reached"
 msgstr "Dosežen je začetek datoteke"
 
@@ -376,7 +376,7 @@
 "Ni mogoče odpreti naslova URI:\n"
 "%s"
 
-#: ../src/ghex-window.c:94
+#: ../src/ghex-window.c:96
 #, c-format
 msgid ""
 "Can not open file:\n"
@@ -385,305 +385,310 @@
 "Ni mogoče odpreti datoteke URI:\n"
 "%s"
 
-#: ../src/ghex-window.c:325
+#: ../src/ghex-window.c:327
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../src/ghex-window.c:326
+#: ../src/ghex-window.c:328
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../src/ghex-window.c:327
+#: ../src/ghex-window.c:329
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../src/ghex-window.c:328
+#: ../src/ghex-window.c:330
 msgid "_Group Data As"
 msgstr "_Združi podatke kot"
 
 #. View submenu
-#: ../src/ghex-window.c:329
+#: ../src/ghex-window.c:331
 msgid "_Windows"
 msgstr "_Okna"
 
-#: ../src/ghex-window.c:330
+#: ../src/ghex-window.c:332
 msgid "_Help"
 msgstr "Pomo_č"
 
 #. File menu
-#: ../src/ghex-window.c:333
+#: ../src/ghex-window.c:335
 msgid "_Open..."
 msgstr "_Odpri ..."
 
-#: ../src/ghex-window.c:334
+#: ../src/ghex-window.c:336
 msgid "Open a file"
 msgstr "Odpri datoteko"
 
-#: ../src/ghex-window.c:336
+#: ../src/ghex-window.c:338
 msgid "_Save"
 msgstr "_Shrani"
 
-#: ../src/ghex-window.c:337
+#: ../src/ghex-window.c:339
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
-#: ../src/ghex-window.c:339
+#: ../src/ghex-window.c:341
 msgid "Save _As..."
 msgstr "S_hrani kot ..."
 
-#: ../src/ghex-window.c:340
+#: ../src/ghex-window.c:342
 msgid "Save the current file with a different name"
 msgstr "Shrani trenutno datoteko z drugim imenom"
 
-#: ../src/ghex-window.c:342
+#: ../src/ghex-window.c:344
 msgid "Save As _HTML..."
 msgstr "Shrani kot H_TML ..."
 
-#: ../src/ghex-window.c:343
+#: ../src/ghex-window.c:345
 msgid "Export data to HTML source"
 msgstr "Shrani datoteko kot HTML"
 
-#: ../src/ghex-window.c:345
+#: ../src/ghex-window.c:347
 msgid "_Revert"
 msgstr "_Povrni"
 
-#: ../src/ghex-window.c:346
+#: ../src/ghex-window.c:348
 msgid "Revert to a saved version of the file"
 msgstr "Povrni na shranjeno različico datoteke"
 
-#: ../src/ghex-window.c:348
+#: ../src/ghex-window.c:350
 msgid "_Print"
 msgstr "_Natisni"
 
-#: ../src/ghex-window.c:349
+#: ../src/ghex-window.c:351
 msgid "Print the current file"
 msgstr "Natisni trenutno datoteko"
 
-#: ../src/ghex-window.c:351
+#: ../src/ghex-window.c:353
 msgid "Print Previe_w..."
 msgstr "_Predogled tiskanja ..."
 
-#: ../src/ghex-window.c:352
+#: ../src/ghex-window.c:354
 msgid "Preview printed data"
 msgstr "Predogled natisnjenih podatkov"
 
-#: ../src/ghex-window.c:354
+#: ../src/ghex-window.c:356
 msgid "_Close"
 msgstr "_Zapri"
 
-#: ../src/ghex-window.c:355
+#: ../src/ghex-window.c:357
 msgid "Close the current file"
 msgstr "Zapri trenutno datoteko"
 
-#: ../src/ghex-window.c:357
+#: ../src/ghex-window.c:359
 msgid "E_xit"
 msgstr "_Končaj"
 
-#: ../src/ghex-window.c:358
+#: ../src/ghex-window.c:360
 msgid "Exit the program"
 msgstr "Končaj program"
 
 #. Edit menu
-#: ../src/ghex-window.c:362
+#: ../src/ghex-window.c:364
 msgid "_Undo"
 msgstr "_Razveljavi"
 
-#: ../src/ghex-window.c:363
+#: ../src/ghex-window.c:365
 msgid "Undo the last action"
 msgstr "Razveljavi zadnje dejanje"
 
-#: ../src/ghex-window.c:365
+#: ../src/ghex-window.c:367
 msgid "_Redo"
 msgstr "_Ponovno uveljavi"
 
-#: ../src/ghex-window.c:366
+#: ../src/ghex-window.c:368
 msgid "Redo the undone action"
 msgstr "Ponovno uveljavi razveljavljeno dejanje"
 
-#: ../src/ghex-window.c:368
+#: ../src/ghex-window.c:370
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: ../src/ghex-window.c:369
+#: ../src/ghex-window.c:371
 msgid "Copy selection to clipboard"
 msgstr "Kopiraj izbrano na odložišče"
 
-#: ../src/ghex-window.c:371
+#: ../src/ghex-window.c:373
 msgid "Cu_t"
 msgstr "_Izreži"
 
-#: ../src/ghex-window.c:372
+#: ../src/ghex-window.c:374
 msgid "Cut selection"
 msgstr "Izreži izbor"
 
-#: ../src/ghex-window.c:374
+#: ../src/ghex-window.c:376
 msgid "Pa_ste"
 msgstr "_Prilepi"
 
-#: ../src/ghex-window.c:375
+#: ../src/ghex-window.c:377
 msgid "Paste data from clipboard"
 msgstr "Prilepi podatke iz odložišča"
 
-#: ../src/ghex-window.c:377
+#: ../src/ghex-window.c:379
 msgid "_Find"
 msgstr "_Poišči"
 
-#: ../src/ghex-window.c:378
+#: ../src/ghex-window.c:380
 msgid "Search for a string"
 msgstr "Poišči niz"
 
-#: ../src/ghex-window.c:380
+#: ../src/ghex-window.c:382
 msgid "_Advanced Find"
 msgstr "Napre_dno iskanje"
 
-#: ../src/ghex-window.c:381
+#: ../src/ghex-window.c:383
 msgid "Advanced Find"
 msgstr "Napredno iskanje"
 
-#: ../src/ghex-window.c:383
+#: ../src/ghex-window.c:385
 msgid "R_eplace"
 msgstr "_Zamenjaj"
 
-#: ../src/ghex-window.c:384
+#: ../src/ghex-window.c:386
 msgid "Replace a string"
 msgstr "Zamenjaj niz"
 
-#: ../src/ghex-window.c:386
+#: ../src/ghex-window.c:388
 msgid "_Goto Byte..."
 msgstr "Skoči na _bit ..."
 
-#: ../src/ghex-window.c:387
+#: ../src/ghex-window.c:389
 msgid "Jump to a certain position"
 msgstr "Skoči na določeno mesto"
 
-#: ../src/ghex-window.c:389
+#: ../src/ghex-window.c:391
 msgid "_Preferences"
 msgstr "_Možnosti"
 
-#: ../src/ghex-window.c:390
+#: ../src/ghex-window.c:392
 msgid "Configure the application"
 msgstr "Nastavitve programa"
 
 #. View menu
-#: ../src/ghex-window.c:394
+#: ../src/ghex-window.c:396
 msgid "_Add View"
 msgstr "_Dodaj pogled"
 
-#: ../src/ghex-window.c:395
+#: ../src/ghex-window.c:397
 msgid "Add a new view to the buffer"
 msgstr "Dodaj nov pogled v medpomnilnik"
 
-#: ../src/ghex-window.c:397
+#: ../src/ghex-window.c:399
 msgid "_Remove View"
 msgstr "_Zapri pogled"
 
-#: ../src/ghex-window.c:398
+#: ../src/ghex-window.c:400
 msgid "Remove the current view of the buffer"
 msgstr "Odstrani trenutni pogled medpomnilnika"
 
 #. Help menu
-#: ../src/ghex-window.c:402
+#: ../src/ghex-window.c:404
 msgid "_Contents"
 msgstr "_Vsebina"
 
-#: ../src/ghex-window.c:403
+#: ../src/ghex-window.c:405
 msgid "Help on this application"
 msgstr "Pomoč za delo s programom"
 
-#: ../src/ghex-window.c:405
+#: ../src/ghex-window.c:407
 msgid "_About"
 msgstr "_O programu..."
 
-#: ../src/ghex-window.c:406
+#: ../src/ghex-window.c:408
 msgid "About this application"
 msgstr "O programu"
 
 #. Edit menu
-#: ../src/ghex-window.c:413
+#: ../src/ghex-window.c:415
 msgid "_Insert Mode"
 msgstr "Način _vstavljanja"
 
-#: ../src/ghex-window.c:414
+#: ../src/ghex-window.c:416
 msgid "Insert/overwrite data"
 msgstr "Vstavi/Prepiši podatke"
 
 #. Windows menu
-#: ../src/ghex-window.c:418
+#: ../src/ghex-window.c:420
 msgid "Character _Table"
 msgstr "_Razpredelnica znakov"
 
-#: ../src/ghex-window.c:419
+#: ../src/ghex-window.c:421
 msgid "Show the character table"
 msgstr "Pokaži razpredelnico znakov"
 
-#: ../src/ghex-window.c:421
+#: ../src/ghex-window.c:423
 msgid "_Base Converter"
 msgstr "_Pretvornik številske osnove"
 
-#: ../src/ghex-window.c:422
+#: ../src/ghex-window.c:424
 msgid "Open base conversion dialog"
 msgstr "Odpri pretvornik"
 
-#: ../src/ghex-window.c:424
+#: ../src/ghex-window.c:426
 msgid "Type Conversion _Dialog"
 msgstr "Pogovorno okno _pretvornika"
 
-#: ../src/ghex-window.c:425
+#: ../src/ghex-window.c:427
 msgid "Show the type conversion dialog in the edit window"
 msgstr "Pokaži pogovorno okno pretvornika v oknu urejevalnika"
 
-#: ../src/ghex-window.c:431
+#: ../src/ghex-window.c:433
 #: ../src/ui.c:48
 msgid "_Bytes"
 msgstr "_Biti"
 
-#: ../src/ghex-window.c:432
+#: ../src/ghex-window.c:434
 msgid "Group data by 8 bits"
 msgstr "Združi podatke kot 8 bitne zveze"
 
-#: ../src/ghex-window.c:433
+#: ../src/ghex-window.c:435
 #: ../src/ui.c:49
 msgid "_Words"
 msgstr "_Besede"
 
-#: ../src/ghex-window.c:434
+#: ../src/ghex-window.c:436
 msgid "Group data by 16 bits"
 msgstr "Združi podatke kot 16 bitne zveze"
 
-#: ../src/ghex-window.c:435
+#: ../src/ghex-window.c:437
 #: ../src/ui.c:50
 msgid "_Longwords"
 msgstr "_Dolge besede"
 
-#: ../src/ghex-window.c:436
+#: ../src/ghex-window.c:438
 msgid "Group data by 32 bits"
 msgstr "Združi podatke kot 32 bitne zveze"
 
-#: ../src/ghex-window.c:770
+#: ../src/ghex-window.c:585
+#, c-format
+msgid "Failed to load UI: %s"
+msgstr "Nalaganje uporabniškega vmesnika je spodletelo: %s"
+
+#: ../src/ghex-window.c:794
 #, c-format
 msgid "Offset: %s"
 msgstr "Odmik: %s"
 
-#: ../src/ghex-window.c:773
+#: ../src/ghex-window.c:797
 #, c-format
 msgid "; %s bytes from %s to %s selected"
 msgstr "; %s bitov od %s do %s izbranih"
 
-#: ../src/ghex-window.c:1057
+#: ../src/ghex-window.c:1069
 #, c-format
 msgid "Activate file %s"
 msgstr "Uporabi datoteko %s"
 
-#: ../src/ghex-window.c:1093
+#: ../src/ghex-window.c:1105
 #, c-format
 msgid "%s - GHex"
 msgstr "%s - GHex"
 
-#: ../src/ghex-window.c:1221
+#: ../src/ghex-window.c:1231
 msgid "Select a file to save buffer as"
 msgstr "Izbor datoteke za shranjevanje medpomnilnika"
 
-#: ../src/ghex-window.c:1277
+#: ../src/ghex-window.c:1263
 #, c-format
 msgid ""
 "File %s exists.\n"
@@ -692,21 +697,21 @@
 "Datoteka %s obstaja.\n"
 "Ali jo želite prepisati?"
 
-#: ../src/ghex-window.c:1310
-#: ../src/ui.c:293
+#: ../src/ghex-window.c:1289
+#: ../src/ui.c:300
 #, c-format
 msgid "Saved buffer to file %s"
 msgstr "Medpomnilnik je shranjen v datoteko %s"
 
-#: ../src/ghex-window.c:1316
+#: ../src/ghex-window.c:1296
 msgid "Error saving file!"
 msgstr "Napaka med shranjevanjem datoteke!"
 
-#: ../src/ghex-window.c:1322
+#: ../src/ghex-window.c:1302
 msgid "Can't open file for writing!"
 msgstr "Ni mogoče odpreti datoteke za pisanje!"
 
-#: ../src/ghex-window.c:1367
+#: ../src/ghex-window.c:1347
 #, c-format
 msgid ""
 "File %s has changed since last save.\n"
@@ -715,17 +720,17 @@
 "Datoteka %s je bila spremenjena.\n"
 "Ali želite shraniti spremembe?"
 
-#: ../src/ghex-window.c:1371
+#: ../src/ghex-window.c:1351
 msgid "Do_n't save"
 msgstr "_Ne shrani"
 
-#: ../src/ghex-window.c:1391
-#: ../src/ui.c:281
+#: ../src/ghex-window.c:1371
+#: ../src/ui.c:288
 msgid "You don't have the permissions to save the file!"
 msgstr "Ni ustreznih pravic za shranjevanje datoteke!"
 
-#: ../src/ghex-window.c:1395
-#: ../src/ui.c:286
+#: ../src/ghex-window.c:1375
+#: ../src/ui.c:293
 msgid "An error occurred while saving file!"
 msgstr "Prišlo je do napake med shranjevanjem datoteke!"
 
@@ -754,12 +759,12 @@
 msgstr "Nepodpisano 32-bitno:"
 
 #: ../src/hex-dialog.c:64
-msgid "32 bit float:"
-msgstr "32-bitno, plavajoča vejica:"
+msgid "Float 32 bit:"
+msgstr "Plavajoče 32-bitno:"
 
 #: ../src/hex-dialog.c:65
-msgid "64 bit float:"
-msgstr "64-bitno, plavajoča vejica:"
+msgid "Float 64 bit:"
+msgstr "Plavajoče 64-bitno:"
 
 #: ../src/hex-dialog.c:66
 msgid "Hexadecimal:"
@@ -773,19 +778,19 @@
 msgid "Binary:"
 msgstr "Dvojiško:"
 
-#: ../src/hex-dialog.c:197
+#: ../src/hex-dialog.c:204
 msgid "Show little endian decoding"
 msgstr "Pokaži kodiranje little endian"
 
-#: ../src/hex-dialog.c:204
+#: ../src/hex-dialog.c:211
 msgid "Show unsigned and float as hexadecimal"
 msgstr "Šestnajstiški prikaz nepodpisanih števil in plavajoče vejice"
 
-#: ../src/hex-dialog.c:210
+#: ../src/hex-dialog.c:217
 msgid "Stream Length:"
 msgstr "Dolžina podatka:"
 
-#: ../src/hex-dialog.c:232
+#: ../src/hex-dialog.c:239
 msgid "FIXME: no conversion function"
 msgstr "POPRAVI: ni funkcije za pretvorbo"
 
@@ -793,27 +798,27 @@
 msgid "New document"
 msgstr "Nov dokument"
 
-#: ../src/hex-document.c:790
+#: ../src/hex-document.c:785
 #, c-format
 msgid "Page"
 msgstr "Stran"
 
-#: ../src/hex-document.c:796
-#: ../src/hex-document.c:921
+#: ../src/hex-document.c:791
+#: ../src/hex-document.c:916
 #, c-format
 msgid "Hex dump generated by"
 msgstr "Šestnajstiški izpis je ustvaril"
 
-#: ../src/hex-document.c:807
+#: ../src/hex-document.c:802
 msgid "Saving to HTML..."
 msgstr "Shranjevanje kot HTML ..."
 
-#: ../src/hex-document.c:844
+#: ../src/hex-document.c:839
 #, c-format
 msgid "Previous page"
 msgstr "Predhodna stran"
 
-#: ../src/hex-document.c:859
+#: ../src/hex-document.c:854
 #, c-format
 msgid "Next page"
 msgstr "Naslednja stran"
@@ -843,8 +848,8 @@
 "%s\n"
 "Zaženite '%s --help' za podroben pregled celotnega seznama možnosti ukazne vrstice.\n"
 
-#: ../src/main.c:81
-#: ../src/main.c:94
+#: ../src/main.c:80
+#: ../src/main.c:93
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Neveljaven geometrijski niz \"%s\"\n"
@@ -918,52 +923,52 @@
 msgid "Fonts"
 msgstr "Pisave"
 
-#: ../src/preferences.c:239
+#: ../src/preferences.c:245
 msgid "_Data font:"
 msgstr "Pisava _podatkov"
 
-#: ../src/preferences.c:255
+#: ../src/preferences.c:259
 msgid "Data font"
 msgstr "Pisava podatkov"
 
-#: ../src/preferences.c:255
+#: ../src/preferences.c:259
 msgid "Select the data font"
 msgstr "Izbor pisave podatkov"
 
-#: ../src/preferences.c:269
+#: ../src/preferences.c:268
 msgid "Header fo_nt:"
 msgstr "Pisava _glave:"
 
-#: ../src/preferences.c:284
+#: ../src/preferences.c:281
 msgid "Header font"
 msgstr "Pisava glave"
 
-#: ../src/preferences.c:284
+#: ../src/preferences.c:281
 msgid "Select the header font"
 msgstr "Izbor pisave glave"
 
-#: ../src/preferences.c:310
+#: ../src/preferences.c:306
 msgid "_Print shaded box over:"
 msgstr "_Natisni senčenje preko:"
 
-#: ../src/preferences.c:322
+#: ../src/preferences.c:318
 msgid "Box size"
 msgstr "Velikost polja"
 
-#: ../src/preferences.c:322
+#: ../src/preferences.c:318
 msgid "Select size of box (in number of lines)"
 msgstr "Izbor velikosti polja (v številu vrstic)"
 
-#: ../src/preferences.c:326
+#: ../src/preferences.c:322
 msgid "lines (0 for no box)"
 msgstr "vrstic (0 za brez polja)"
 
-#: ../src/preferences.c:333
+#: ../src/preferences.c:329
 msgid "Printing"
 msgstr "Tiskanje"
 
-#: ../src/preferences.c:451
-#: ../src/ui.c:202
+#: ../src/preferences.c:447
+#: ../src/ui.c:209
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -972,11 +977,11 @@
 "Prišlo je do napake med prikazovanjem pomoči: \n"
 "%s"
 
-#: ../src/preferences.c:503
+#: ../src/preferences.c:499
 msgid "Can not open desired font!"
 msgstr "Ni mogoče odpreti želene pisave!"
 
-#: ../src/preferences.c:564
+#: ../src/preferences.c:560
 msgid ""
 "The offset format string contains invalid format specifier.\n"
 "Only 'x', 'X', 'p', 'P', 'd' and 'o' are allowed."
@@ -997,35 +1002,33 @@
 msgid "ASCII data"
 msgstr "ASCII niz"
 
-#: ../src/ui.c:144
-msgid ""
-"Copyright © 1998 - 2006 Jaka Močnik\n"
-"Copyright © 2006 - 2010 GHex Contributors"
-msgstr ""
-"Avtorske pravice © 1998 - 2006 Jaka Močnik\n"
-"Avtorske pravice © 2006 - 2010 GHex skupina"
-
-#: ../src/ui.c:151
+#: ../src/ui.c:150
 msgid "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
 msgstr "Program je prosti program. Lahko ga razširjate in/ali spreminjate pod pogoji Splošnega javnega dovoljenja GNU (GPL) kot jo je objavila organizacija Free Software Foundation; bodisi pod različico 2 ali (po vašem mnenju) katerokoli kasnejšo različico."
 
-#: ../src/ui.c:155
+#: ../src/ui.c:154
 msgid "This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
 msgstr "Ta program je na voljo v upanju, da bo uporaben, vendar je BREZ VSAKRŠNEGA JAMSTVA; tudi brez jamstva o USTREZNOSTI ZA PRODAJO ali PRIMERNOSTI ZA UPORABO. Za več podrobnosti si oglejte besedilo splošnega javnega dovoljenja (GNU GPL)."
 
-#: ../src/ui.c:159
+#: ../src/ui.c:158
 msgid "You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
 msgstr "S programom bi morali dobiti tudi kopijo Splošnega Javnega dovoljenja (GNU General Public License); v primeru, da je niste, stopite v stik s Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA "
 
-#: ../src/ui.c:171
+#. Translators: these two strings here indicate the copyright time span,
+#. e.g. 1998-2012.
+#: ../src/ui.c:170
+msgid "Copyright © %Id–%Id The GHex authors"
+msgstr "Avtorske pravice © %Id–%Id Avtorji programa GHex"
+
+#: ../src/ui.c:174
 msgid "A binary file editor"
 msgstr "Urejevalnik dvojiških datotek"
 
-#: ../src/ui.c:177
+#: ../src/ui.c:180
 msgid "About GHex"
 msgstr "O programu"
 
-#: ../src/ui.c:178
+#: ../src/ui.c:181
 msgid "translator-credits"
 msgstr ""
 "Matic Žgur <mr.zgur@gmail.com>\n"
@@ -1033,37 +1036,37 @@
 "Tilen Travnik <tilen.travnik@guest.arnes.si>\n"
 "Matej Urbančič <mateju@svn.gnome.org>"
 
-#: ../src/ui.c:181
+#: ../src/ui.c:184
 msgid "GHex Website"
 msgstr "Spletišče GHex"
 
-#: ../src/ui.c:311
+#: ../src/ui.c:318
 msgid "Select a file to open"
 msgstr "Izbor datoteke za odpiranje"
 
-#: ../src/ui.c:342
+#: ../src/ui.c:349
 #, c-format
 msgid "Loaded file %s"
 msgstr "Naložena datoteka %s"
 
-#: ../src/ui.c:350
+#: ../src/ui.c:357
 msgid "Can not open file!"
 msgstr "Ni mogoče odpreti datoteke!"
 
-#: ../src/ui.c:415
+#: ../src/ui.c:422
 msgid "Select path and file name for the HTML source"
 msgstr "Izbor imenika in datoteke za vir HTML"
 
-#: ../src/ui.c:449
+#: ../src/ui.c:454
 msgid "You need to specify a base name for the HTML files."
 msgstr "Izbrati je treba osnovno ime za datoteke HTML"
 
-#: ../src/ui.c:460
-#: ../src/ui.c:484
+#: ../src/ui.c:465
+#: ../src/ui.c:491
 msgid "You don't have the permission to write to the selected path.\n"
 msgstr "Ni ustreznih dovoljenj za pisanje v izbrano mapo.\n"
 
-#: ../src/ui.c:471
+#: ../src/ui.c:477
 msgid ""
 "Saving to HTML will overwrite some files.\n"
 "Do you want to proceed?"
@@ -1071,16 +1074,29 @@
 "S shranjevanjem v zapisu HTML bodo prepisane nekatere datoteke.\n"
 "Ali želite nadaljevati?"
 
-#: ../src/ui.c:736
+#: ../src/ui.c:745
 #, c-format
 msgid "Really revert file %s?"
 msgstr "Ali naj se povrne vsebina datoteke %s?"
 
-#: ../src/ui.c:750
+#: ../src/ui.c:759
 #, c-format
 msgid "Reverted buffer from file %s"
 msgstr "Povrnjen medpomnilnik iz datoteke %s"
 
+#~ msgid "32 bit float:"
+#~ msgstr "32-bitno, plavajoča vejica:"
+
+#~ msgid "64 bit float:"
+#~ msgstr "64-bitno, plavajoča vejica:"
+
+#~ msgid ""
+#~ "Copyright © 1998 - 2006 Jaka Močnik\n"
+#~ "Copyright © 2006 - 2010 GHex Contributors"
+#~ msgstr ""
+#~ "Avtorske pravice © 1998 - 2006 Jaka Močnik\n"
+#~ "Avtorske pravice © 2006 - 2010 GHex skupina"
+
 #~ msgid "Hexadecimal Editor"
 #~ msgstr "Urejevalnik šestnajstiških datotek"
 
diff -Nru ghex-3.3.90/po/sr@latin.po ghex-3.3.91/po/sr@latin.po
--- ghex-3.3.90/po/sr@latin.po	2012-02-09 00:02:51.000000000 +0000
+++ ghex-3.3.91/po/sr@latin.po	2012-03-02 09:42:11.000000000 +0000
@@ -1,27 +1,27 @@
 # Serbian translation of ghex
-# Courtesy of Prevod.org team (http://www.prevod.org/) -- 2003.
+# Courtesy of Prevod.org team (http://www.prevod.org/) -- 2003—2012.
 # This file is distributed under the same license as the ghex package.
 # Maintainer: Slobodan Sredojević <ssl@uns.ns.ac.yu>
-# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011.
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.2.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=ghex&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-08-17 12:12+0000\n"
-"PO-Revision-Date: 2011-07-28 21:50+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=ghex&k"
+"eywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-02-21 04:50+0000\n"
+"PO-Revision-Date: 2012-02-26 20:54+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: Serbian (sr)\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:651
-#: ../src/ghex-window.c:1097
+#: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:675
+#: ../src/ghex-window.c:1109
 msgid "GHex"
 msgstr "Gheks"
 
@@ -30,14 +30,13 @@
 msgstr "Heksadecimalni uređivač"
 
 #: ../data/ghex.desktop.in.h:3
-#, fuzzy
 #| msgid "Inspect and edit the contents of files"
 msgid "Inspect and edit binary files"
-msgstr "Pregledajte i izmenite sadržaj datoteka"
+msgstr "Pregledajte i izmenite izvršne datoteke"
 
 #: ../src/chartable.c:147
 msgid "ASCII"
-msgstr "ASCII"
+msgstr "ASKRI"
 
 #: ../src/chartable.c:147
 msgid "Hex"
@@ -59,51 +58,51 @@
 msgid "Character table"
 msgstr "Tabela znakova"
 
-#: ../src/converter.c:231
+#: ../src/converter.c:232
 msgid "Base Converter"
 msgstr "Osnovni pretvarač"
 
 #. entries
-#: ../src/converter.c:252
+#: ../src/converter.c:253
 msgid "_Binary:"
 msgstr "_Binarno:"
 
-#: ../src/converter.c:254
+#: ../src/converter.c:255
 msgid "_Octal:"
 msgstr "_Oktalno:"
 
-#: ../src/converter.c:256
+#: ../src/converter.c:257
 msgid "_Decimal:"
 msgstr "_Decimalno:"
 
-#: ../src/converter.c:258
+#: ../src/converter.c:259
 msgid "_Hex:"
 msgstr "_Heksadecimalno:"
 
-#: ../src/converter.c:260
+#: ../src/converter.c:261
 msgid "_ASCII:"
-msgstr "_ASCII:"
+msgstr "_ASKRI:"
 
 #. get cursor button
-#: ../src/converter.c:264
+#: ../src/converter.c:265
 msgid "_Get cursor value"
 msgstr "Podatak pod _kursorom"
 
-#: ../src/converter.c:278
+#: ../src/converter.c:279
 msgid "Get cursor value"
-msgstr "Podatas pod kursorom"
+msgstr "Podatak pod kursorom"
 
-#: ../src/converter.c:278
+#: ../src/converter.c:279
 msgid "Gets the value at cursor in binary, octal, decimal, hex and ASCII"
 msgstr ""
-"Prihvati vrednost prikazanu na mestu kursora kao binarnu, decimalnu,"
-"heksadecimalnu i aski(ASCII)"
+"Prihvati vrednost prikazanu na mestu kursora kao binarnu, "
+"decimalnu,heksadecimalnu i ASKRI"
 
-#: ../src/converter.c:418
+#: ../src/converter.c:419
 msgid "ERROR"
 msgstr "GREŠKA"
 
-#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:864
+#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:873
 #, c-format
 msgid "GHex (%s): Find Data"
 msgstr "Gheks (%s): pronađi podatak"
@@ -126,7 +125,7 @@
 
 #: ../src/findreplace.c:138 ../src/findreplace.c:413
 msgid "Enter the hex data or ASCII data to search for"
-msgstr "Zadajte heksadecimalni ili Aski(ASCII) niz znakova koji tražite"
+msgstr "Zadajte heksadecimalni ili ASKRI niz znakova koji tražite"
 
 #: ../src/findreplace.c:139
 msgid "Find Next"
@@ -142,7 +141,7 @@
 
 #: ../src/findreplace.c:140
 msgid "Finds the previous occurrence of the search string "
-msgstr "Traži prethodno pojavljivanje zatatog niza znakova"
+msgstr "Traži prethodno pojavljivanje zatatog niza znakova "
 
 #: ../src/findreplace.c:141 ../src/findreplace.c:418 ../src/findreplace.c:466
 msgid "Cancel"
@@ -185,7 +184,7 @@
 msgid "Closes advanced find window"
 msgstr "Zatvara napredni prozor traženja"
 
-#: ../src/findreplace.c:355 ../src/ui.c:862
+#: ../src/findreplace.c:355 ../src/ui.c:871
 #, c-format
 msgid "GHex (%s): Find & Replace Data"
 msgstr "Gheks (%s): pronađi i zameni podatak"
@@ -212,7 +211,7 @@
 
 #: ../src/findreplace.c:414
 msgid "Enter the hex data or ASCII data to replace with"
-msgstr "Zadajte heksadecimalnu ili aski(ASCII) vrednost koju zamenjujete"
+msgstr "Zadajte heksadecimalnu ili ASKRI vrednost koju zamenjujete"
 
 #: ../src/findreplace.c:415
 msgid "Find next"
@@ -238,7 +237,7 @@
 msgid "Closes find and replace data window"
 msgstr "Zatvara pronaži i zameni prozor"
 
-#: ../src/findreplace.c:434 ../src/ui.c:860
+#: ../src/findreplace.c:434 ../src/ui.c:869
 #, c-format
 msgid "GHex (%s): Jump To Byte"
 msgstr "Gheks (%s): Skoči na bajt"
@@ -272,16 +271,16 @@
 msgid "There is no string to search for!"
 msgstr "Ne postoji niska za pretragu!"
 
-#: ../src/findreplace.c:548 ../src/findreplace.c:686 ../src/findreplace.c:877
+#: ../src/findreplace.c:548 ../src/findreplace.c:686 ../src/findreplace.c:876
 msgid "End Of File reached"
 msgstr "Dostignut je kraj datoteke"
 
 #: ../src/findreplace.c:549 ../src/findreplace.c:582 ../src/findreplace.c:685
-#: ../src/findreplace.c:878 ../src/findreplace.c:901
+#: ../src/findreplace.c:877 ../src/findreplace.c:900
 msgid "String was not found!\n"
 msgstr "Niz znakova nije pronađen!\n"
 
-#: ../src/findreplace.c:581 ../src/findreplace.c:900
+#: ../src/findreplace.c:581 ../src/findreplace.c:899
 msgid "Beginning Of File reached"
 msgstr "Dostignut je početak datoteke"
 
@@ -337,6 +336,7 @@
 msgstr[0] "Zamenio sam %d pojavljivanje."
 msgstr[1] "Zamenio sam %d pojavljivanja."
 msgstr[2] "Zamenio sam %d pojavljivanja."
+msgstr[3] "Zamenio sam jedno pojavljivanje."
 
 #: ../src/findreplace.c:820
 msgid "No string to search for!"
@@ -351,7 +351,7 @@
 "Ne mogu da otvorim adresu:\n"
 "%s"
 
-#: ../src/ghex-window.c:94
+#: ../src/ghex-window.c:96
 #, c-format
 msgid ""
 "Can not open file:\n"
@@ -360,302 +360,307 @@
 "Ne mogu da otvorim datoteku:\n"
 "%s"
 
-#: ../src/ghex-window.c:325
+#: ../src/ghex-window.c:327
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../src/ghex-window.c:326
+#: ../src/ghex-window.c:328
 msgid "_Edit"
 msgstr "_Uređivanje"
 
-#: ../src/ghex-window.c:327
+#: ../src/ghex-window.c:329
 msgid "_View"
 msgstr "P_regled"
 
-#: ../src/ghex-window.c:328
+#: ../src/ghex-window.c:330
 msgid "_Group Data As"
 msgstr "_Grupiši podatke u"
 
 #. View submenu
-#: ../src/ghex-window.c:329
+#: ../src/ghex-window.c:331
 msgid "_Windows"
 msgstr "Pro_zori"
 
-#: ../src/ghex-window.c:330
+#: ../src/ghex-window.c:332
 msgid "_Help"
 msgstr "_Pomoć"
 
 #. File menu
-#: ../src/ghex-window.c:333
+#: ../src/ghex-window.c:335
 msgid "_Open..."
 msgstr "_Otvori..."
 
-#: ../src/ghex-window.c:334
+#: ../src/ghex-window.c:336
 msgid "Open a file"
 msgstr "Otvori datoteku"
 
-#: ../src/ghex-window.c:336
+#: ../src/ghex-window.c:338
 msgid "_Save"
 msgstr "_Sačuvaj"
 
-#: ../src/ghex-window.c:337
+#: ../src/ghex-window.c:339
 msgid "Save the current file"
 msgstr "Sačuvaj tekuću datoteku"
 
-#: ../src/ghex-window.c:339
+#: ../src/ghex-window.c:341
 msgid "Save _As..."
 msgstr "_Sačuvaj kao..."
 
-#: ../src/ghex-window.c:340
+#: ../src/ghex-window.c:342
 msgid "Save the current file with a different name"
-msgstr "Sačuvaj tekuću datoteku pod drugim imenom"
+msgstr "Sačuvajte tekuću datoteku pod drugim nazivom"
 
-#: ../src/ghex-window.c:342
+#: ../src/ghex-window.c:344
 msgid "Save As _HTML..."
 msgstr "Sačuvaj kao HTML..."
 
-#: ../src/ghex-window.c:343
+#: ../src/ghex-window.c:345
 msgid "Export data to HTML source"
-msgstr "Izvezi podatke u izvornu HTML datoteku"
+msgstr "Izvezite podatke u izvornu HTML datoteku"
 
-#: ../src/ghex-window.c:345
+#: ../src/ghex-window.c:347
 msgid "_Revert"
 msgstr "_Vrati"
 
-#: ../src/ghex-window.c:346
+#: ../src/ghex-window.c:348
 msgid "Revert to a saved version of the file"
 msgstr "Ponovo učitaj snimljenu verziju datoteke"
 
-#: ../src/ghex-window.c:348
+#: ../src/ghex-window.c:350
 msgid "_Print"
 msgstr "_Štampaj"
 
-#: ../src/ghex-window.c:349
+#: ../src/ghex-window.c:351
 msgid "Print the current file"
 msgstr "Odštampaj tekuću datoteku"
 
-#: ../src/ghex-window.c:351
+#: ../src/ghex-window.c:353
 msgid "Print Previe_w..."
 msgstr "Prikaz _pre štampanja..."
 
-#: ../src/ghex-window.c:352
+#: ../src/ghex-window.c:354
 msgid "Preview printed data"
 msgstr "Prikaz pre štampanja"
 
-#: ../src/ghex-window.c:354
+#: ../src/ghex-window.c:356
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../src/ghex-window.c:355
+#: ../src/ghex-window.c:357
 msgid "Close the current file"
 msgstr "Zatvara tekuću datoteku"
 
-#: ../src/ghex-window.c:357
+#: ../src/ghex-window.c:359
 msgid "E_xit"
 msgstr "_Kraj rada"
 
-#: ../src/ghex-window.c:358
+#: ../src/ghex-window.c:360
 msgid "Exit the program"
 msgstr "Kraj rada"
 
 #. Edit menu
-#: ../src/ghex-window.c:362
+#: ../src/ghex-window.c:364
 msgid "_Undo"
 msgstr "Opo_zovi"
 
-#: ../src/ghex-window.c:363
+#: ../src/ghex-window.c:365
 msgid "Undo the last action"
 msgstr "Opozovi poslednju radnju"
 
-#: ../src/ghex-window.c:365
+#: ../src/ghex-window.c:367
 msgid "_Redo"
 msgstr "_Ponovi"
 
-#: ../src/ghex-window.c:366
+#: ../src/ghex-window.c:368
 msgid "Redo the undone action"
 msgstr "Ponovi poslednju poništenu radnju"
 
-#: ../src/ghex-window.c:368
+#: ../src/ghex-window.c:370
 msgid "_Copy"
 msgstr "_Umnoži"
 
-#: ../src/ghex-window.c:369
+#: ../src/ghex-window.c:371
 msgid "Copy selection to clipboard"
 msgstr "Prenesi označeno na spisak isečaka"
 
-#: ../src/ghex-window.c:371
+#: ../src/ghex-window.c:373
 msgid "Cu_t"
 msgstr "I_seci"
 
-#: ../src/ghex-window.c:372
+#: ../src/ghex-window.c:374
 msgid "Cut selection"
 msgstr "Iseci označeno"
 
-#: ../src/ghex-window.c:374
+#: ../src/ghex-window.c:376
 msgid "Pa_ste"
 msgstr "U_baci"
 
-#: ../src/ghex-window.c:375
+#: ../src/ghex-window.c:377
 msgid "Paste data from clipboard"
 msgstr "Ubaci poslednju stavku sa spiska isečaka"
 
-#: ../src/ghex-window.c:377
+#: ../src/ghex-window.c:379
 msgid "_Find"
 msgstr "_Pronađi"
 
-#: ../src/ghex-window.c:378
+#: ../src/ghex-window.c:380
 msgid "Search for a string"
 msgstr "Traži niz znakova"
 
-#: ../src/ghex-window.c:380
+#: ../src/ghex-window.c:382
 msgid "_Advanced Find"
 msgstr "_Napredna pretraga"
 
-#: ../src/ghex-window.c:381
+#: ../src/ghex-window.c:383
 msgid "Advanced Find"
 msgstr "Napredna pretraga"
 
-#: ../src/ghex-window.c:383
+#: ../src/ghex-window.c:385
 msgid "R_eplace"
 msgstr "_Zameni"
 
-#: ../src/ghex-window.c:384
+#: ../src/ghex-window.c:386
 msgid "Replace a string"
 msgstr "Zameni niz znakova"
 
-#: ../src/ghex-window.c:386
+#: ../src/ghex-window.c:388
 msgid "_Goto Byte..."
 msgstr "_Skoči na bajt..."
 
-#: ../src/ghex-window.c:387
+#: ../src/ghex-window.c:389
 msgid "Jump to a certain position"
 msgstr "Skoči na određeno mesto"
 
-#: ../src/ghex-window.c:389
+#: ../src/ghex-window.c:391
 msgid "_Preferences"
 msgstr "_Postavke"
 
-#: ../src/ghex-window.c:390
+#: ../src/ghex-window.c:392
 msgid "Configure the application"
 msgstr "Podesite program"
 
 #. View menu
-#: ../src/ghex-window.c:394
+#: ../src/ghex-window.c:396
 msgid "_Add View"
 msgstr "_Novi prikaz"
 
-#: ../src/ghex-window.c:395
+#: ../src/ghex-window.c:397
 msgid "Add a new view to the buffer"
 msgstr "Prikaži bafer u novom prozoru"
 
-#: ../src/ghex-window.c:397
+#: ../src/ghex-window.c:399
 msgid "_Remove View"
 msgstr "_Ukloni prikaz"
 
-#: ../src/ghex-window.c:398
+#: ../src/ghex-window.c:400
 msgid "Remove the current view of the buffer"
 msgstr "Ukloni tekući prikaz bafera"
 
 #. Help menu
-#: ../src/ghex-window.c:402
+#: ../src/ghex-window.c:404
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../src/ghex-window.c:403
+#: ../src/ghex-window.c:405
 msgid "Help on this application"
 msgstr "Uputstvo za korišćenje programa"
 
-#: ../src/ghex-window.c:405
+#: ../src/ghex-window.c:407
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/ghex-window.c:406
+#: ../src/ghex-window.c:408
 msgid "About this application"
 msgstr "O programu"
 
 #. Edit menu
-#: ../src/ghex-window.c:413
+#: ../src/ghex-window.c:415
 msgid "_Insert Mode"
 msgstr "_Direktan unos"
 
-#: ../src/ghex-window.c:414
+#: ../src/ghex-window.c:416
 msgid "Insert/overwrite data"
 msgstr "Direktno unesite podatak"
 
 #. Windows menu
-#: ../src/ghex-window.c:418
+#: ../src/ghex-window.c:420
 msgid "Character _Table"
 msgstr "Tabela _znakova"
 
-#: ../src/ghex-window.c:419
+#: ../src/ghex-window.c:421
 msgid "Show the character table"
 msgstr "Prikaži tabelu znakova"
 
-#: ../src/ghex-window.c:421
+#: ../src/ghex-window.c:423
 msgid "_Base Converter"
 msgstr "_Osnovni pretvarač"
 
-#: ../src/ghex-window.c:422
+#: ../src/ghex-window.c:424
 msgid "Open base conversion dialog"
 msgstr "Otvori prozorče za osnovno pretvaranje"
 
-#: ../src/ghex-window.c:424
+#: ../src/ghex-window.c:426
 msgid "Type Conversion _Dialog"
 msgstr "Prozorče _vrste konverzije"
 
-#: ../src/ghex-window.c:425
+#: ../src/ghex-window.c:427
 msgid "Show the type conversion dialog in the edit window"
 msgstr "Prikaži prozorče vrste konverzije u prozoru uređivača"
 
-#: ../src/ghex-window.c:431 ../src/ui.c:48
+#: ../src/ghex-window.c:433 ../src/ui.c:48
 msgid "_Bytes"
 msgstr "Ba_jte (1 bajt)"
 
-#: ../src/ghex-window.c:432
+#: ../src/ghex-window.c:434
 msgid "Group data by 8 bits"
 msgstr "Grupiši podatke u 8 bita"
 
-#: ../src/ghex-window.c:433 ../src/ui.c:49
+#: ../src/ghex-window.c:435 ../src/ui.c:49
 msgid "_Words"
 msgstr "_Reči (2 bajta)"
 
-#: ../src/ghex-window.c:434
+#: ../src/ghex-window.c:436
 msgid "Group data by 16 bits"
 msgstr "Grupiši podatke u 16 bita"
 
-#: ../src/ghex-window.c:435 ../src/ui.c:50
+#: ../src/ghex-window.c:437 ../src/ui.c:50
 msgid "_Longwords"
 msgstr "_Duge reči (4 bajta)"
 
-#: ../src/ghex-window.c:436
+#: ../src/ghex-window.c:438
 msgid "Group data by 32 bits"
 msgstr "Grupiši podatke u 32 bita"
 
-#: ../src/ghex-window.c:770
+#: ../src/ghex-window.c:585
+#, c-format
+msgid "Failed to load UI: %s"
+msgstr "Nisam uspeo da učitam KS: %s"
+
+#: ../src/ghex-window.c:794
 #, c-format
 msgid "Offset: %s"
 msgstr "Pomeraj: %s"
 
-#: ../src/ghex-window.c:773
+#: ../src/ghex-window.c:797
 #, c-format
 msgid "; %s bytes from %s to %s selected"
 msgstr "; %s bajtova od %s do %s izabranih"
 
-#: ../src/ghex-window.c:1057
+#: ../src/ghex-window.c:1069
 #, c-format
 msgid "Activate file %s"
 msgstr "Aktiviraj datoteku %s"
 
-#: ../src/ghex-window.c:1093
+#: ../src/ghex-window.c:1105
 #, c-format
 msgid "%s - GHex"
 msgstr "%s — Gheks"
 
-#: ../src/ghex-window.c:1221
+#: ../src/ghex-window.c:1231
 msgid "Select a file to save buffer as"
 msgstr "Izaberite ime za datoteku u koju se upisuje bafer"
 
-#: ../src/ghex-window.c:1277
+#: ../src/ghex-window.c:1263
 #, c-format
 msgid ""
 "File %s exists.\n"
@@ -664,20 +669,20 @@
 "Datoteka %s postoji.\n"
 "Da li želite da je prepišete?"
 
-#: ../src/ghex-window.c:1310 ../src/ui.c:293
+#: ../src/ghex-window.c:1289 ../src/ui.c:300
 #, c-format
 msgid "Saved buffer to file %s"
 msgstr "Bafer je zabeležen u datoteku %s"
 
-#: ../src/ghex-window.c:1316
+#: ../src/ghex-window.c:1296
 msgid "Error saving file!"
 msgstr "Greška pri snimanju datoteke"
 
-#: ../src/ghex-window.c:1322
+#: ../src/ghex-window.c:1302
 msgid "Can't open file for writing!"
 msgstr "Ne mogu otvoriti datoteku za pisanje"
 
-#: ../src/ghex-window.c:1367
+#: ../src/ghex-window.c:1347
 #, c-format
 msgid ""
 "File %s has changed since last save.\n"
@@ -686,15 +691,15 @@
 "Datoteka %s je promenjena od poslednjeg upisa.\n"
 "Da li želite da sačuvate promene?"
 
-#: ../src/ghex-window.c:1371
+#: ../src/ghex-window.c:1351
 msgid "Do_n't save"
 msgstr "Ne snim_aj"
 
-#: ../src/ghex-window.c:1391 ../src/ui.c:281
+#: ../src/ghex-window.c:1371 ../src/ui.c:288
 msgid "You don't have the permissions to save the file!"
 msgstr "Nemate prava da snimite datoteku!"
 
-#: ../src/ghex-window.c:1395 ../src/ui.c:286
+#: ../src/ghex-window.c:1375 ../src/ui.c:293
 msgid "An error occurred while saving file!"
 msgstr "Došlo je do greške prilikom čuvanja datoteke!"
 
@@ -723,12 +728,12 @@
 msgstr "Neoznačeno 32‑bitno:"
 
 #: ../src/hex-dialog.c:64
-msgid "32 bit float:"
-msgstr "32-bitni pokretni:"
+msgid "Float 32 bit:"
+msgstr "Pokretno 32‑bitno:"
 
 #: ../src/hex-dialog.c:65
-msgid "64 bit float:"
-msgstr "64-bitni pokretni:"
+msgid "Float 64 bit:"
+msgstr "Pokretno 64‑bitno:"
 
 #: ../src/hex-dialog.c:66
 msgid "Hexadecimal:"
@@ -742,19 +747,19 @@
 msgid "Binary:"
 msgstr "Binarno:"
 
-#: ../src/hex-dialog.c:197
+#: ../src/hex-dialog.c:204
 msgid "Show little endian decoding"
 msgstr "Prikaži dekodiranje u malom poretku"
 
-#: ../src/hex-dialog.c:204
+#: ../src/hex-dialog.c:211
 msgid "Show unsigned and float as hexadecimal"
 msgstr "Prikaži neoznačene i pokretne kao heksadecimalne"
 
-#: ../src/hex-dialog.c:210
+#: ../src/hex-dialog.c:217
 msgid "Stream Length:"
 msgstr "Dužina pritoka:"
 
-#: ../src/hex-dialog.c:232
+#: ../src/hex-dialog.c:239
 msgid "FIXME: no conversion function"
 msgstr "ISPRAVIME: nema funkcije za konverziju"
 
@@ -762,26 +767,26 @@
 msgid "New document"
 msgstr "Novi dokument"
 
-#: ../src/hex-document.c:790
+#: ../src/hex-document.c:785
 #, c-format
 msgid "Page"
 msgstr "Stranica"
 
-#: ../src/hex-document.c:796 ../src/hex-document.c:921
+#: ../src/hex-document.c:791 ../src/hex-document.c:916
 #, c-format
 msgid "Hex dump generated by"
 msgstr "Heksadecimalni izbačaj napravljen od strane"
 
-#: ../src/hex-document.c:807
+#: ../src/hex-document.c:802
 msgid "Saving to HTML..."
-msgstr "Beležim datoteku kao HTML..."
+msgstr "Čuvam kao HTML..."
 
-#: ../src/hex-document.c:844
+#: ../src/hex-document.c:839
 #, c-format
 msgid "Previous page"
 msgstr "Prethodna strana"
 
-#: ../src/hex-document.c:859
+#: ../src/hex-document.c:854
 #, c-format
 msgid "Next page"
 msgstr "Sledeća strana"
@@ -813,7 +818,7 @@
 "Pokrenite „%s --help“ da vidite potpunu listu dostupnih opcija komandne "
 "linije.\n"
 
-#: ../src/main.c:81 ../src/main.c:94
+#: ../src/main.c:80 ../src/main.c:93
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Netačan geometrijski niz znakova „%s“\n"
@@ -824,7 +829,7 @@
 
 #: ../src/preferences.c:101
 msgid "_Maximum number of undo levels:"
-msgstr "_Maksimalni broj poništavanja:"
+msgstr "_Najveći broj poništavanja:"
 
 #: ../src/preferences.c:121
 msgid "Undo levels"
@@ -832,7 +837,7 @@
 
 #: ../src/preferences.c:121
 msgid "Select maximum number of undo levels"
-msgstr "Izaberite maksimalni broj poništavanja"
+msgstr "Izaberite najveći broj poništavanja"
 
 #: ../src/preferences.c:125
 msgid "_Show cursor offset in statusbar as:"
@@ -887,51 +892,51 @@
 msgid "Fonts"
 msgstr "Slova"
 
-#: ../src/preferences.c:239
+#: ../src/preferences.c:245
 msgid "_Data font:"
 msgstr "_Slova za podatke:"
 
-#: ../src/preferences.c:255
+#: ../src/preferences.c:259
 msgid "Data font"
 msgstr "Vrsta slova sa kojima su prikazani podaci"
 
-#: ../src/preferences.c:255
+#: ../src/preferences.c:259
 msgid "Select the data font"
 msgstr "Izaberite slova za podatke"
 
-#: ../src/preferences.c:269
+#: ../src/preferences.c:268
 msgid "Header fo_nt:"
 msgstr "Slova za zaglavlje:"
 
-#: ../src/preferences.c:284
+#: ../src/preferences.c:281
 msgid "Header font"
 msgstr "Slova za zaglavlje"
 
-#: ../src/preferences.c:284
+#: ../src/preferences.c:281
 msgid "Select the header font"
 msgstr "Izaberite slova za zaglavlje"
 
-#: ../src/preferences.c:310
+#: ../src/preferences.c:306
 msgid "_Print shaded box over:"
 msgstr "Osenči svakih drugih:"
 
-#: ../src/preferences.c:322
+#: ../src/preferences.c:318
 msgid "Box size"
 msgstr "Osenčena oblast"
 
-#: ../src/preferences.c:322
+#: ../src/preferences.c:318
 msgid "Select size of box (in number of lines)"
 msgstr "Osenčena oblast (izražena u linijama)"
 
-#: ../src/preferences.c:326
+#: ../src/preferences.c:322
 msgid "lines (0 for no box)"
 msgstr "linija (0 isključuje ovu mogućnost)"
 
-#: ../src/preferences.c:333
+#: ../src/preferences.c:329
 msgid "Printing"
 msgstr "Štampanje"
 
-#: ../src/preferences.c:451 ../src/ui.c:202
+#: ../src/preferences.c:447 ../src/ui.c:209
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -940,17 +945,17 @@
 "Dogodila se greška pri prikazu pomoći: \n"
 "%s"
 
-#: ../src/preferences.c:503
+#: ../src/preferences.c:499
 msgid "Can not open desired font!"
 msgstr "Ne mogu otvoriti željeno slovo!"
 
-#: ../src/preferences.c:564
+#: ../src/preferences.c:560
 msgid ""
 "The offset format string contains invalid format specifier.\n"
 "Only 'x', 'X', 'p', 'P', 'd' and 'o' are allowed."
 msgstr ""
 "Formatni niz znakova pomeraja sadrži netačan specifikator.\n"
-"Jedino su dozvoljena slova 'x', 'X', 'p', 'P', 'd' and 'o'"
+"Dozvoljena slova su „x“, „X“, „p“, „P“, „d“ i „o“"
 
 #: ../src/print.c:57
 #, c-format
@@ -963,17 +968,9 @@
 
 #: ../src/ui.c:56
 msgid "ASCII data"
-msgstr "aski(ASCII) podatak"
-
-#: ../src/ui.c:144
-msgid ""
-"Copyright © 1998 - 2006 Jaka Močnik\n"
-"Copyright © 2006 - 2010 GHex Contributors"
-msgstr ""
-"Autorska prava © 1998 - 2006 Jaka Močnik\n"
-"Autorska prava © 2006 - 2010 Doprinosioci Gheksa"
+msgstr "ASKRI podatak"
 
-#: ../src/ui.c:151
+#: ../src/ui.c:150
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -985,7 +982,7 @@
 "softvera; bilo verzije 2 te Licence, ili (po vašem mišljenju) bilo koje novije "
 "verzije."
 
-#: ../src/ui.c:155
+#: ../src/ui.c:154
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -997,7 +994,7 @@
 "PRILAGOĐENOSTI ODREĐENOJ NAMENI. Pogledajte GNU Opštu javnu licencu za više "
 "detalja."
 
-#: ../src/ui.c:159
+#: ../src/ui.c:158
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -1008,15 +1005,21 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  "
 "USA“"
 
-#: ../src/ui.c:171
+#. Translators: these two strings here indicate the copyright time span,
+#. e.g. 1998-2012.
+#: ../src/ui.c:170
+msgid "Copyright © %Id–%Id The GHex authors"
+msgstr "Autorska prava © %Id–%Id Autori Gheksa"
+
+#: ../src/ui.c:174
 msgid "A binary file editor"
 msgstr "Uređivač binarnih datoteka"
 
-#: ../src/ui.c:177
+#: ../src/ui.c:180
 msgid "About GHex"
 msgstr "O Gheksu"
 
-#: ../src/ui.c:178
+#: ../src/ui.c:181
 msgid "translator-credits"
 msgstr ""
 "Slobodan Sredojević <ssl@uns.ns.ac.yu>\n"
@@ -1024,36 +1027,36 @@
 "\n"
 "Prevod.org — prevod na srpski jezik."
 
-#: ../src/ui.c:181
+#: ../src/ui.c:184
 msgid "GHex Website"
 msgstr "Veb stranica Gheksa"
 
-#: ../src/ui.c:311
+#: ../src/ui.c:318
 msgid "Select a file to open"
 msgstr "Izaberite datoteku"
 
-#: ../src/ui.c:342
+#: ../src/ui.c:349
 #, c-format
 msgid "Loaded file %s"
 msgstr "Učitana datoteka %s"
 
-#: ../src/ui.c:350
+#: ../src/ui.c:357
 msgid "Can not open file!"
 msgstr "Ne mogu otvoriti datoteku"
 
-#: ../src/ui.c:415
+#: ../src/ui.c:422
 msgid "Select path and file name for the HTML source"
 msgstr "Izaberite putanju i ime datoteke za izvornu HTML datoteku"
 
-#: ../src/ui.c:449
+#: ../src/ui.c:454
 msgid "You need to specify a base name for the HTML files."
 msgstr "Morate zadati osnovno ime za HTML datoteke."
 
-#: ../src/ui.c:460 ../src/ui.c:484
+#: ../src/ui.c:465 ../src/ui.c:491
 msgid "You don't have the permission to write to the selected path.\n"
 msgstr "Nemate dozvolu upisa za navedenu putanju.\n"
 
-#: ../src/ui.c:471
+#: ../src/ui.c:477
 msgid ""
 "Saving to HTML will overwrite some files.\n"
 "Do you want to proceed?"
@@ -1061,16 +1064,29 @@
 "Snimanjem HTML datoteke neke datoteke će biti prepisane.\n"
 "Da li želite da nastavite?"
 
-#: ../src/ui.c:736
+#: ../src/ui.c:745
 #, c-format
 msgid "Really revert file %s?"
 msgstr "Zaista želite da ponovo učitate datoteku %s?"
 
-#: ../src/ui.c:750
+#: ../src/ui.c:759
 #, c-format
 msgid "Reverted buffer from file %s"
 msgstr "Bafer je vraćen iz datoteke %s"
 
+#~ msgid "32 bit float:"
+#~ msgstr "32-bitni pokretni:"
+
+#~ msgid "64 bit float:"
+#~ msgstr "64-bitni pokretni:"
+
+#~ msgid ""
+#~ "Copyright © 1998 - 2006 Jaka Močnik\n"
+#~ "Copyright © 2006 - 2010 GHex Contributors"
+#~ msgstr ""
+#~ "Autorska prava © 1998 - 2006 Jaka Močnik\n"
+#~ "Autorska prava © 2006 - 2010 Doprinosioci Gheksa"
+
 #~| msgid "GNOME Hexadecimal Editor"
 #~ msgid "Hexadecimal Editor"
 #~ msgstr "Heksadecimalni uređivač"
diff -Nru ghex-3.3.90/po/sr.po ghex-3.3.91/po/sr.po
--- ghex-3.3.90/po/sr.po	2012-02-09 00:02:51.000000000 +0000
+++ ghex-3.3.91/po/sr.po	2012-03-02 09:42:11.000000000 +0000
@@ -1,27 +1,27 @@
 # Serbian translation of ghex
-# Courtesy of Prevod.org team (http://www.prevod.org/) -- 2003.
+# Courtesy of Prevod.org team (http://www.prevod.org/) -- 2003—2012.
 # This file is distributed under the same license as the ghex package.
 # Maintainer: Слободан Средојевић <ssl@uns.ns.ac.yu>
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.2.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=ghex&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-08-17 12:12+0000\n"
-"PO-Revision-Date: 2011-07-28 21:50+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=ghex&k"
+"eywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-02-21 04:50+0000\n"
+"PO-Revision-Date: 2012-02-26 20:54+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: Serbian (sr)\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:651
-#: ../src/ghex-window.c:1097
+#: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:675
+#: ../src/ghex-window.c:1109
 msgid "GHex"
 msgstr "Гхекс"
 
@@ -30,14 +30,13 @@
 msgstr "Хексадецимални уређивач"
 
 #: ../data/ghex.desktop.in.h:3
-#, fuzzy
 #| msgid "Inspect and edit the contents of files"
 msgid "Inspect and edit binary files"
-msgstr "Прегледајте и измените садржај датотека"
+msgstr "Прегледајте и измените извршне датотеке"
 
 #: ../src/chartable.c:147
 msgid "ASCII"
-msgstr "ASCII"
+msgstr "АСКРИ"
 
 #: ../src/chartable.c:147
 msgid "Hex"
@@ -59,51 +58,51 @@
 msgid "Character table"
 msgstr "Табела знакова"
 
-#: ../src/converter.c:231
+#: ../src/converter.c:232
 msgid "Base Converter"
 msgstr "Основни претварач"
 
 #. entries
-#: ../src/converter.c:252
+#: ../src/converter.c:253
 msgid "_Binary:"
 msgstr "_Бинарно:"
 
-#: ../src/converter.c:254
+#: ../src/converter.c:255
 msgid "_Octal:"
 msgstr "_Октално:"
 
-#: ../src/converter.c:256
+#: ../src/converter.c:257
 msgid "_Decimal:"
 msgstr "_Децимално:"
 
-#: ../src/converter.c:258
+#: ../src/converter.c:259
 msgid "_Hex:"
 msgstr "_Хексадецимално:"
 
-#: ../src/converter.c:260
+#: ../src/converter.c:261
 msgid "_ASCII:"
-msgstr "_ASCII:"
+msgstr "_АСКРИ:"
 
 #. get cursor button
-#: ../src/converter.c:264
+#: ../src/converter.c:265
 msgid "_Get cursor value"
 msgstr "Податак под _курсором"
 
-#: ../src/converter.c:278
+#: ../src/converter.c:279
 msgid "Get cursor value"
-msgstr "Податас под курсором"
+msgstr "Податак под курсором"
 
-#: ../src/converter.c:278
+#: ../src/converter.c:279
 msgid "Gets the value at cursor in binary, octal, decimal, hex and ASCII"
 msgstr ""
-"Прихвати вредност приказану на месту курсора као бинарну, децималну,"
-"хексадецималну и аски(ASCII)"
+"Прихвати вредност приказану на месту курсора као бинарну, "
+"децималну,хексадецималну и АСКРИ"
 
-#: ../src/converter.c:418
+#: ../src/converter.c:419
 msgid "ERROR"
 msgstr "ГРЕШКА"
 
-#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:864
+#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:873
 #, c-format
 msgid "GHex (%s): Find Data"
 msgstr "Гхекс (%s): пронађи податак"
@@ -126,7 +125,7 @@
 
 #: ../src/findreplace.c:138 ../src/findreplace.c:413
 msgid "Enter the hex data or ASCII data to search for"
-msgstr "Задајте хексадецимални или Аски(ASCII) низ знакова који тражите"
+msgstr "Задајте хексадецимални или АСКРИ низ знакова који тражите"
 
 #: ../src/findreplace.c:139
 msgid "Find Next"
@@ -142,7 +141,7 @@
 
 #: ../src/findreplace.c:140
 msgid "Finds the previous occurrence of the search string "
-msgstr "Тражи претходно појављивање зататог низа знакова"
+msgstr "Тражи претходно појављивање зататог низа знакова "
 
 #: ../src/findreplace.c:141 ../src/findreplace.c:418 ../src/findreplace.c:466
 msgid "Cancel"
@@ -185,7 +184,7 @@
 msgid "Closes advanced find window"
 msgstr "Затвара напредни прозор тражења"
 
-#: ../src/findreplace.c:355 ../src/ui.c:862
+#: ../src/findreplace.c:355 ../src/ui.c:871
 #, c-format
 msgid "GHex (%s): Find & Replace Data"
 msgstr "Гхекс (%s): пронађи и замени податак"
@@ -212,7 +211,7 @@
 
 #: ../src/findreplace.c:414
 msgid "Enter the hex data or ASCII data to replace with"
-msgstr "Задајте хексадецималну или аски(ASCII) вредност коју замењујете"
+msgstr "Задајте хексадецималну или АСКРИ вредност коју замењујете"
 
 #: ../src/findreplace.c:415
 msgid "Find next"
@@ -238,7 +237,7 @@
 msgid "Closes find and replace data window"
 msgstr "Затвара пронажи и замени прозор"
 
-#: ../src/findreplace.c:434 ../src/ui.c:860
+#: ../src/findreplace.c:434 ../src/ui.c:869
 #, c-format
 msgid "GHex (%s): Jump To Byte"
 msgstr "Гхекс (%s): Скочи на бајт"
@@ -272,16 +271,16 @@
 msgid "There is no string to search for!"
 msgstr "Не постоји ниска за претрагу!"
 
-#: ../src/findreplace.c:548 ../src/findreplace.c:686 ../src/findreplace.c:877
+#: ../src/findreplace.c:548 ../src/findreplace.c:686 ../src/findreplace.c:876
 msgid "End Of File reached"
 msgstr "Достигнут је крај датотеке"
 
 #: ../src/findreplace.c:549 ../src/findreplace.c:582 ../src/findreplace.c:685
-#: ../src/findreplace.c:878 ../src/findreplace.c:901
+#: ../src/findreplace.c:877 ../src/findreplace.c:900
 msgid "String was not found!\n"
 msgstr "Низ знакова није пронађен!\n"
 
-#: ../src/findreplace.c:581 ../src/findreplace.c:900
+#: ../src/findreplace.c:581 ../src/findreplace.c:899
 msgid "Beginning Of File reached"
 msgstr "Достигнут је почетак датотеке"
 
@@ -337,6 +336,7 @@
 msgstr[0] "Заменио сам %d појављивање."
 msgstr[1] "Заменио сам %d појављивања."
 msgstr[2] "Заменио сам %d појављивања."
+msgstr[3] "Заменио сам једно појављивање."
 
 #: ../src/findreplace.c:820
 msgid "No string to search for!"
@@ -351,7 +351,7 @@
 "Не могу да отворим адресу:\n"
 "%s"
 
-#: ../src/ghex-window.c:94
+#: ../src/ghex-window.c:96
 #, c-format
 msgid ""
 "Can not open file:\n"
@@ -360,302 +360,307 @@
 "Не могу да отворим датотеку:\n"
 "%s"
 
-#: ../src/ghex-window.c:325
+#: ../src/ghex-window.c:327
 msgid "_File"
 msgstr "_Датотека"
 
-#: ../src/ghex-window.c:326
+#: ../src/ghex-window.c:328
 msgid "_Edit"
 msgstr "_Уређивање"
 
-#: ../src/ghex-window.c:327
+#: ../src/ghex-window.c:329
 msgid "_View"
 msgstr "П_реглед"
 
-#: ../src/ghex-window.c:328
+#: ../src/ghex-window.c:330
 msgid "_Group Data As"
 msgstr "_Групиши податке у"
 
 #. View submenu
-#: ../src/ghex-window.c:329
+#: ../src/ghex-window.c:331
 msgid "_Windows"
 msgstr "Про_зори"
 
-#: ../src/ghex-window.c:330
+#: ../src/ghex-window.c:332
 msgid "_Help"
 msgstr "_Помоћ"
 
 #. File menu
-#: ../src/ghex-window.c:333
+#: ../src/ghex-window.c:335
 msgid "_Open..."
 msgstr "_Отвори..."
 
-#: ../src/ghex-window.c:334
+#: ../src/ghex-window.c:336
 msgid "Open a file"
 msgstr "Отвори датотеку"
 
-#: ../src/ghex-window.c:336
+#: ../src/ghex-window.c:338
 msgid "_Save"
 msgstr "_Сачувај"
 
-#: ../src/ghex-window.c:337
+#: ../src/ghex-window.c:339
 msgid "Save the current file"
 msgstr "Сачувај текућу датотеку"
 
-#: ../src/ghex-window.c:339
+#: ../src/ghex-window.c:341
 msgid "Save _As..."
 msgstr "_Сачувај као..."
 
-#: ../src/ghex-window.c:340
+#: ../src/ghex-window.c:342
 msgid "Save the current file with a different name"
-msgstr "Сачувај текућу датотеку под другим именом"
+msgstr "Сачувајте текућу датотеку под другим називом"
 
-#: ../src/ghex-window.c:342
+#: ../src/ghex-window.c:344
 msgid "Save As _HTML..."
-msgstr "Сачувај као HTML..."
+msgstr "Сачувај као ХТМЛ..."
 
-#: ../src/ghex-window.c:343
+#: ../src/ghex-window.c:345
 msgid "Export data to HTML source"
-msgstr "Извези податке у изворну HTML датотеку"
+msgstr "Извезите податке у изворну ХТМЛ датотеку"
 
-#: ../src/ghex-window.c:345
+#: ../src/ghex-window.c:347
 msgid "_Revert"
 msgstr "_Врати"
 
-#: ../src/ghex-window.c:346
+#: ../src/ghex-window.c:348
 msgid "Revert to a saved version of the file"
 msgstr "Поново учитај снимљену верзију датотеке"
 
-#: ../src/ghex-window.c:348
+#: ../src/ghex-window.c:350
 msgid "_Print"
 msgstr "_Штампај"
 
-#: ../src/ghex-window.c:349
+#: ../src/ghex-window.c:351
 msgid "Print the current file"
 msgstr "Одштампај текућу датотеку"
 
-#: ../src/ghex-window.c:351
+#: ../src/ghex-window.c:353
 msgid "Print Previe_w..."
 msgstr "Приказ _пре штампања..."
 
-#: ../src/ghex-window.c:352
+#: ../src/ghex-window.c:354
 msgid "Preview printed data"
 msgstr "Приказ пре штампања"
 
-#: ../src/ghex-window.c:354
+#: ../src/ghex-window.c:356
 msgid "_Close"
 msgstr "_Затвори"
 
-#: ../src/ghex-window.c:355
+#: ../src/ghex-window.c:357
 msgid "Close the current file"
 msgstr "Затвара текућу датотеку"
 
-#: ../src/ghex-window.c:357
+#: ../src/ghex-window.c:359
 msgid "E_xit"
 msgstr "_Крај рада"
 
-#: ../src/ghex-window.c:358
+#: ../src/ghex-window.c:360
 msgid "Exit the program"
 msgstr "Крај рада"
 
 #. Edit menu
-#: ../src/ghex-window.c:362
+#: ../src/ghex-window.c:364
 msgid "_Undo"
 msgstr "Опо_зови"
 
-#: ../src/ghex-window.c:363
+#: ../src/ghex-window.c:365
 msgid "Undo the last action"
 msgstr "Опозови последњу радњу"
 
-#: ../src/ghex-window.c:365
+#: ../src/ghex-window.c:367
 msgid "_Redo"
 msgstr "_Понови"
 
-#: ../src/ghex-window.c:366
+#: ../src/ghex-window.c:368
 msgid "Redo the undone action"
 msgstr "Понови последњу поништену радњу"
 
-#: ../src/ghex-window.c:368
+#: ../src/ghex-window.c:370
 msgid "_Copy"
 msgstr "_Умножи"
 
-#: ../src/ghex-window.c:369
+#: ../src/ghex-window.c:371
 msgid "Copy selection to clipboard"
 msgstr "Пренеси означено на списак исечака"
 
-#: ../src/ghex-window.c:371
+#: ../src/ghex-window.c:373
 msgid "Cu_t"
 msgstr "И_сеци"
 
-#: ../src/ghex-window.c:372
+#: ../src/ghex-window.c:374
 msgid "Cut selection"
 msgstr "Исеци означено"
 
-#: ../src/ghex-window.c:374
+#: ../src/ghex-window.c:376
 msgid "Pa_ste"
 msgstr "У_баци"
 
-#: ../src/ghex-window.c:375
+#: ../src/ghex-window.c:377
 msgid "Paste data from clipboard"
 msgstr "Убаци последњу ставку са списка исечака"
 
-#: ../src/ghex-window.c:377
+#: ../src/ghex-window.c:379
 msgid "_Find"
 msgstr "_Пронађи"
 
-#: ../src/ghex-window.c:378
+#: ../src/ghex-window.c:380
 msgid "Search for a string"
 msgstr "Тражи низ знакова"
 
-#: ../src/ghex-window.c:380
+#: ../src/ghex-window.c:382
 msgid "_Advanced Find"
 msgstr "_Напредна претрага"
 
-#: ../src/ghex-window.c:381
+#: ../src/ghex-window.c:383
 msgid "Advanced Find"
 msgstr "Напредна претрага"
 
-#: ../src/ghex-window.c:383
+#: ../src/ghex-window.c:385
 msgid "R_eplace"
 msgstr "_Замени"
 
-#: ../src/ghex-window.c:384
+#: ../src/ghex-window.c:386
 msgid "Replace a string"
 msgstr "Замени низ знакова"
 
-#: ../src/ghex-window.c:386
+#: ../src/ghex-window.c:388
 msgid "_Goto Byte..."
 msgstr "_Скочи на бајт..."
 
-#: ../src/ghex-window.c:387
+#: ../src/ghex-window.c:389
 msgid "Jump to a certain position"
 msgstr "Скочи на одређено место"
 
-#: ../src/ghex-window.c:389
+#: ../src/ghex-window.c:391
 msgid "_Preferences"
 msgstr "_Поставке"
 
-#: ../src/ghex-window.c:390
+#: ../src/ghex-window.c:392
 msgid "Configure the application"
 msgstr "Подесите програм"
 
 #. View menu
-#: ../src/ghex-window.c:394
+#: ../src/ghex-window.c:396
 msgid "_Add View"
 msgstr "_Нови приказ"
 
-#: ../src/ghex-window.c:395
+#: ../src/ghex-window.c:397
 msgid "Add a new view to the buffer"
 msgstr "Прикажи бафер у новом прозору"
 
-#: ../src/ghex-window.c:397
+#: ../src/ghex-window.c:399
 msgid "_Remove View"
 msgstr "_Уклони приказ"
 
-#: ../src/ghex-window.c:398
+#: ../src/ghex-window.c:400
 msgid "Remove the current view of the buffer"
 msgstr "Уклони текући приказ бафера"
 
 #. Help menu
-#: ../src/ghex-window.c:402
+#: ../src/ghex-window.c:404
 msgid "_Contents"
 msgstr "_Садржај"
 
-#: ../src/ghex-window.c:403
+#: ../src/ghex-window.c:405
 msgid "Help on this application"
 msgstr "Упутство за коришћење програма"
 
-#: ../src/ghex-window.c:405
+#: ../src/ghex-window.c:407
 msgid "_About"
 msgstr "_О програму"
 
-#: ../src/ghex-window.c:406
+#: ../src/ghex-window.c:408
 msgid "About this application"
 msgstr "О програму"
 
 #. Edit menu
-#: ../src/ghex-window.c:413
+#: ../src/ghex-window.c:415
 msgid "_Insert Mode"
 msgstr "_Директан унос"
 
-#: ../src/ghex-window.c:414
+#: ../src/ghex-window.c:416
 msgid "Insert/overwrite data"
 msgstr "Директно унесите податак"
 
 #. Windows menu
-#: ../src/ghex-window.c:418
+#: ../src/ghex-window.c:420
 msgid "Character _Table"
 msgstr "Табела _знакова"
 
-#: ../src/ghex-window.c:419
+#: ../src/ghex-window.c:421
 msgid "Show the character table"
 msgstr "Прикажи табелу знакова"
 
-#: ../src/ghex-window.c:421
+#: ../src/ghex-window.c:423
 msgid "_Base Converter"
 msgstr "_Основни претварач"
 
-#: ../src/ghex-window.c:422
+#: ../src/ghex-window.c:424
 msgid "Open base conversion dialog"
 msgstr "Отвори прозорче за основно претварање"
 
-#: ../src/ghex-window.c:424
+#: ../src/ghex-window.c:426
 msgid "Type Conversion _Dialog"
 msgstr "Прозорче _врсте конверзије"
 
-#: ../src/ghex-window.c:425
+#: ../src/ghex-window.c:427
 msgid "Show the type conversion dialog in the edit window"
 msgstr "Прикажи прозорче врсте конверзије у прозору уређивача"
 
-#: ../src/ghex-window.c:431 ../src/ui.c:48
+#: ../src/ghex-window.c:433 ../src/ui.c:48
 msgid "_Bytes"
 msgstr "Ба_јте (1 бајт)"
 
-#: ../src/ghex-window.c:432
+#: ../src/ghex-window.c:434
 msgid "Group data by 8 bits"
 msgstr "Групиши податке у 8 бита"
 
-#: ../src/ghex-window.c:433 ../src/ui.c:49
+#: ../src/ghex-window.c:435 ../src/ui.c:49
 msgid "_Words"
 msgstr "_Речи (2 бајта)"
 
-#: ../src/ghex-window.c:434
+#: ../src/ghex-window.c:436
 msgid "Group data by 16 bits"
 msgstr "Групиши податке у 16 бита"
 
-#: ../src/ghex-window.c:435 ../src/ui.c:50
+#: ../src/ghex-window.c:437 ../src/ui.c:50
 msgid "_Longwords"
 msgstr "_Дуге речи (4 бајта)"
 
-#: ../src/ghex-window.c:436
+#: ../src/ghex-window.c:438
 msgid "Group data by 32 bits"
 msgstr "Групиши податке у 32 бита"
 
-#: ../src/ghex-window.c:770
+#: ../src/ghex-window.c:585
+#, c-format
+msgid "Failed to load UI: %s"
+msgstr "Нисам успео да учитам КС: %s"
+
+#: ../src/ghex-window.c:794
 #, c-format
 msgid "Offset: %s"
 msgstr "Померај: %s"
 
-#: ../src/ghex-window.c:773
+#: ../src/ghex-window.c:797
 #, c-format
 msgid "; %s bytes from %s to %s selected"
 msgstr "; %s бајтова од %s до %s изабраних"
 
-#: ../src/ghex-window.c:1057
+#: ../src/ghex-window.c:1069
 #, c-format
 msgid "Activate file %s"
 msgstr "Активирај датотеку %s"
 
-#: ../src/ghex-window.c:1093
+#: ../src/ghex-window.c:1105
 #, c-format
 msgid "%s - GHex"
 msgstr "%s — Гхекс"
 
-#: ../src/ghex-window.c:1221
+#: ../src/ghex-window.c:1231
 msgid "Select a file to save buffer as"
 msgstr "Изаберите име за датотеку у коју се уписује бафер"
 
-#: ../src/ghex-window.c:1277
+#: ../src/ghex-window.c:1263
 #, c-format
 msgid ""
 "File %s exists.\n"
@@ -664,20 +669,20 @@
 "Датотека %s постоји.\n"
 "Да ли желите да је препишете?"
 
-#: ../src/ghex-window.c:1310 ../src/ui.c:293
+#: ../src/ghex-window.c:1289 ../src/ui.c:300
 #, c-format
 msgid "Saved buffer to file %s"
 msgstr "Бафер је забележен у датотеку %s"
 
-#: ../src/ghex-window.c:1316
+#: ../src/ghex-window.c:1296
 msgid "Error saving file!"
 msgstr "Грешка при снимању датотеке"
 
-#: ../src/ghex-window.c:1322
+#: ../src/ghex-window.c:1302
 msgid "Can't open file for writing!"
 msgstr "Не могу отворити датотеку за писање"
 
-#: ../src/ghex-window.c:1367
+#: ../src/ghex-window.c:1347
 #, c-format
 msgid ""
 "File %s has changed since last save.\n"
@@ -686,15 +691,15 @@
 "Датотека %s је промењена од последњег уписа.\n"
 "Да ли желите да сачувате промене?"
 
-#: ../src/ghex-window.c:1371
+#: ../src/ghex-window.c:1351
 msgid "Do_n't save"
 msgstr "Не сним_ај"
 
-#: ../src/ghex-window.c:1391 ../src/ui.c:281
+#: ../src/ghex-window.c:1371 ../src/ui.c:288
 msgid "You don't have the permissions to save the file!"
 msgstr "Немате права да снимите датотеку!"
 
-#: ../src/ghex-window.c:1395 ../src/ui.c:286
+#: ../src/ghex-window.c:1375 ../src/ui.c:293
 msgid "An error occurred while saving file!"
 msgstr "Дошло је до грешке приликом чувања датотеке!"
 
@@ -723,12 +728,12 @@
 msgstr "Неозначено 32‑битно:"
 
 #: ../src/hex-dialog.c:64
-msgid "32 bit float:"
-msgstr "32-битни покретни:"
+msgid "Float 32 bit:"
+msgstr "Покретно 32‑битно:"
 
 #: ../src/hex-dialog.c:65
-msgid "64 bit float:"
-msgstr "64-битни покретни:"
+msgid "Float 64 bit:"
+msgstr "Покретно 64‑битно:"
 
 #: ../src/hex-dialog.c:66
 msgid "Hexadecimal:"
@@ -742,19 +747,19 @@
 msgid "Binary:"
 msgstr "Бинарно:"
 
-#: ../src/hex-dialog.c:197
+#: ../src/hex-dialog.c:204
 msgid "Show little endian decoding"
 msgstr "Прикажи декодирање у малом поретку"
 
-#: ../src/hex-dialog.c:204
+#: ../src/hex-dialog.c:211
 msgid "Show unsigned and float as hexadecimal"
 msgstr "Прикажи неозначене и покретне као хексадецималне"
 
-#: ../src/hex-dialog.c:210
+#: ../src/hex-dialog.c:217
 msgid "Stream Length:"
 msgstr "Дужина притока:"
 
-#: ../src/hex-dialog.c:232
+#: ../src/hex-dialog.c:239
 msgid "FIXME: no conversion function"
 msgstr "ИСПРАВИМЕ: нема функције за конверзију"
 
@@ -762,26 +767,26 @@
 msgid "New document"
 msgstr "Нови документ"
 
-#: ../src/hex-document.c:790
+#: ../src/hex-document.c:785
 #, c-format
 msgid "Page"
 msgstr "Страница"
 
-#: ../src/hex-document.c:796 ../src/hex-document.c:921
+#: ../src/hex-document.c:791 ../src/hex-document.c:916
 #, c-format
 msgid "Hex dump generated by"
 msgstr "Хексадецимални избачај направљен од стране"
 
-#: ../src/hex-document.c:807
+#: ../src/hex-document.c:802
 msgid "Saving to HTML..."
-msgstr "Бележим датотеку као HTML..."
+msgstr "Чувам као ХТМЛ..."
 
-#: ../src/hex-document.c:844
+#: ../src/hex-document.c:839
 #, c-format
 msgid "Previous page"
 msgstr "Претходна страна"
 
-#: ../src/hex-document.c:859
+#: ../src/hex-document.c:854
 #, c-format
 msgid "Next page"
 msgstr "Следећа страна"
@@ -813,7 +818,7 @@
 "Покрените „%s --help“ да видите потпуну листу доступних опција командне "
 "линије.\n"
 
-#: ../src/main.c:81 ../src/main.c:94
+#: ../src/main.c:80 ../src/main.c:93
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Нетачан геометријски низ знакова „%s“\n"
@@ -824,7 +829,7 @@
 
 #: ../src/preferences.c:101
 msgid "_Maximum number of undo levels:"
-msgstr "_Максимални број поништавања:"
+msgstr "_Највећи број поништавања:"
 
 #: ../src/preferences.c:121
 msgid "Undo levels"
@@ -832,7 +837,7 @@
 
 #: ../src/preferences.c:121
 msgid "Select maximum number of undo levels"
-msgstr "Изаберите максимални број поништавања"
+msgstr "Изаберите највећи број поништавања"
 
 #: ../src/preferences.c:125
 msgid "_Show cursor offset in statusbar as:"
@@ -887,51 +892,51 @@
 msgid "Fonts"
 msgstr "Слова"
 
-#: ../src/preferences.c:239
+#: ../src/preferences.c:245
 msgid "_Data font:"
 msgstr "_Слова за податке:"
 
-#: ../src/preferences.c:255
+#: ../src/preferences.c:259
 msgid "Data font"
 msgstr "Врста слова са којима су приказани подаци"
 
-#: ../src/preferences.c:255
+#: ../src/preferences.c:259
 msgid "Select the data font"
 msgstr "Изаберите слова за податке"
 
-#: ../src/preferences.c:269
+#: ../src/preferences.c:268
 msgid "Header fo_nt:"
 msgstr "Слова за заглавље:"
 
-#: ../src/preferences.c:284
+#: ../src/preferences.c:281
 msgid "Header font"
 msgstr "Слова за заглавље"
 
-#: ../src/preferences.c:284
+#: ../src/preferences.c:281
 msgid "Select the header font"
 msgstr "Изаберите слова за заглавље"
 
-#: ../src/preferences.c:310
+#: ../src/preferences.c:306
 msgid "_Print shaded box over:"
 msgstr "Осенчи сваких других:"
 
-#: ../src/preferences.c:322
+#: ../src/preferences.c:318
 msgid "Box size"
 msgstr "Осенчена област"
 
-#: ../src/preferences.c:322
+#: ../src/preferences.c:318
 msgid "Select size of box (in number of lines)"
 msgstr "Осенчена област (изражена у линијама)"
 
-#: ../src/preferences.c:326
+#: ../src/preferences.c:322
 msgid "lines (0 for no box)"
 msgstr "линија (0 искључује ову могућност)"
 
-#: ../src/preferences.c:333
+#: ../src/preferences.c:329
 msgid "Printing"
 msgstr "Штампање"
 
-#: ../src/preferences.c:451 ../src/ui.c:202
+#: ../src/preferences.c:447 ../src/ui.c:209
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -940,17 +945,17 @@
 "Догодила се грешка при приказу помоћи: \n"
 "%s"
 
-#: ../src/preferences.c:503
+#: ../src/preferences.c:499
 msgid "Can not open desired font!"
 msgstr "Не могу отворити жељено слово!"
 
-#: ../src/preferences.c:564
+#: ../src/preferences.c:560
 msgid ""
 "The offset format string contains invalid format specifier.\n"
 "Only 'x', 'X', 'p', 'P', 'd' and 'o' are allowed."
 msgstr ""
 "Форматни низ знакова помераја садржи нетачан спецификатор.\n"
-"Једино су дозвољена слова 'x', 'X', 'p', 'P', 'd' and 'o'"
+"Дозвољена слова су „x“, „X“, „p“, „P“, „d“ и „o“"
 
 #: ../src/print.c:57
 #, c-format
@@ -963,17 +968,9 @@
 
 #: ../src/ui.c:56
 msgid "ASCII data"
-msgstr "аски(ASCII) податак"
-
-#: ../src/ui.c:144
-msgid ""
-"Copyright © 1998 - 2006 Jaka Močnik\n"
-"Copyright © 2006 - 2010 GHex Contributors"
-msgstr ""
-"Ауторска права © 1998 - 2006 Јака Мочник\n"
-"Ауторска права © 2006 - 2010 Доприносиоци Гхекса"
+msgstr "АСКРИ податак"
 
-#: ../src/ui.c:151
+#: ../src/ui.c:150
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -985,7 +982,7 @@
 "софтвера; било верзије 2 те Лиценце, или (по вашем мишљењу) било које новије "
 "верзије."
 
-#: ../src/ui.c:155
+#: ../src/ui.c:154
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -997,7 +994,7 @@
 "ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ. Погледајте ГНУ Општу јавну лиценцу за више "
 "детаља."
 
-#: ../src/ui.c:159
+#: ../src/ui.c:158
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -1008,15 +1005,21 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  "
 "USA“"
 
-#: ../src/ui.c:171
+#. Translators: these two strings here indicate the copyright time span,
+#. e.g. 1998-2012.
+#: ../src/ui.c:170
+msgid "Copyright © %Id–%Id The GHex authors"
+msgstr "Ауторска права © %Id–%Id Аутори Гхекса"
+
+#: ../src/ui.c:174
 msgid "A binary file editor"
 msgstr "Уређивач бинарних датотека"
 
-#: ../src/ui.c:177
+#: ../src/ui.c:180
 msgid "About GHex"
 msgstr "О Гхексу"
 
-#: ../src/ui.c:178
+#: ../src/ui.c:181
 msgid "translator-credits"
 msgstr ""
 "Слободан Средојевић <ssl@uns.ns.ac.yu>\n"
@@ -1024,53 +1027,66 @@
 "\n"
 "Prevod.org — превод на српски језик."
 
-#: ../src/ui.c:181
+#: ../src/ui.c:184
 msgid "GHex Website"
 msgstr "Веб страница Гхекса"
 
-#: ../src/ui.c:311
+#: ../src/ui.c:318
 msgid "Select a file to open"
 msgstr "Изаберите датотеку"
 
-#: ../src/ui.c:342
+#: ../src/ui.c:349
 #, c-format
 msgid "Loaded file %s"
 msgstr "Учитана датотека %s"
 
-#: ../src/ui.c:350
+#: ../src/ui.c:357
 msgid "Can not open file!"
 msgstr "Не могу отворити датотеку"
 
-#: ../src/ui.c:415
+#: ../src/ui.c:422
 msgid "Select path and file name for the HTML source"
-msgstr "Изаберите путању и име датотеке за изворну HTML датотеку"
+msgstr "Изаберите путању и име датотеке за изворну ХТМЛ датотеку"
 
-#: ../src/ui.c:449
+#: ../src/ui.c:454
 msgid "You need to specify a base name for the HTML files."
-msgstr "Морате задати основно име за HTML датотеке."
+msgstr "Морате задати основно име за ХТМЛ датотеке."
 
-#: ../src/ui.c:460 ../src/ui.c:484
+#: ../src/ui.c:465 ../src/ui.c:491
 msgid "You don't have the permission to write to the selected path.\n"
 msgstr "Немате дозволу уписа за наведену путању.\n"
 
-#: ../src/ui.c:471
+#: ../src/ui.c:477
 msgid ""
 "Saving to HTML will overwrite some files.\n"
 "Do you want to proceed?"
 msgstr ""
-"Снимањем HTML датотеке неке датотеке ће бити преписане.\n"
+"Снимањем ХТМЛ датотеке неке датотеке ће бити преписане.\n"
 "Да ли желите да наставите?"
 
-#: ../src/ui.c:736
+#: ../src/ui.c:745
 #, c-format
 msgid "Really revert file %s?"
 msgstr "Заиста желите да поново учитате датотеку %s?"
 
-#: ../src/ui.c:750
+#: ../src/ui.c:759
 #, c-format
 msgid "Reverted buffer from file %s"
 msgstr "Бафер је враћен из датотеке %s"
 
+#~ msgid "32 bit float:"
+#~ msgstr "32-битни покретни:"
+
+#~ msgid "64 bit float:"
+#~ msgstr "64-битни покретни:"
+
+#~ msgid ""
+#~ "Copyright © 1998 - 2006 Jaka Močnik\n"
+#~ "Copyright © 2006 - 2010 GHex Contributors"
+#~ msgstr ""
+#~ "Ауторска права © 1998 - 2006 Јака Мочник\n"
+#~ "Ауторска права © 2006 - 2010 Доприносиоци Гхекса"
+
 #~| msgid "GNOME Hexadecimal Editor"
 #~ msgid "Hexadecimal Editor"
 #~ msgstr "Хексадецимални уређивач"
diff -Nru ghex-3.3.90/po/sv.po ghex-3.3.91/po/sv.po
--- ghex-3.3.90/po/sv.po	2011-07-31 09:02:00.000000000 +0000
+++ ghex-3.3.91/po/sv.po	2012-03-02 09:42:11.000000000 +0000
@@ -1,16 +1,16 @@
 # Swedish messages for ghex.
-# Copyright (C) 1999-2010 Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 # Tomas Ögren <stric@ing.umu.se>, 1999.
 # Andreas Hyden <a.hyden@cyberpoint.se>, 2000.
 # Christian Rose <menthos@menthos.com>, 2001, 2002, 2003, 2004.
-# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2010.
+# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2010, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ghex\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-29 14:40+0100\n"
-"PO-Revision-Date: 2010-12-29 18:52+0100\n"
+"POT-Creation-Date: 2012-02-28 09:06+0100\n"
+"PO-Revision-Date: 2012-02-28 09:08+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -19,763 +19,671 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../ghex.desktop.in.h:1
-#: ../src/ghex-window.c:497
-#: ../src/ghex-window.c:945
+#: ../data/ghex.desktop.in.h:1
+#: ../src/ghex-window.c:675
+#: ../src/ghex-window.c:1109
 msgid "GHex"
 msgstr "GHex"
 
-#: ../ghex.desktop.in.h:2
-msgid "Hexadecimal Editor"
+#: ../data/ghex.desktop.in.h:2
+msgid "Hex Editor"
 msgstr "Hexadecimalredigerare"
 
-#: ../ghex.desktop.in.h:3
-msgid "Inspect and edit the contents of files"
-msgstr "Inspektera och redigera innehållet i filer"
+#: ../data/ghex.desktop.in.h:3
+msgid "Inspect and edit binary files"
+msgstr "Inspektera och redigera binärfiler"
 
-#: ../src/chartable.c:144
+#: ../src/chartable.c:147
 msgid "ASCII"
 msgstr "ASCII"
 
-#: ../src/chartable.c:144
+#: ../src/chartable.c:147
 msgid "Hex"
 msgstr "Hexadecimalt"
 
-#: ../src/chartable.c:144
-#: ../src/preferences.c:145
+#: ../src/chartable.c:147
+#: ../src/preferences.c:142
 msgid "Decimal"
 msgstr "Decimalt"
 
-#: ../src/chartable.c:145
+#: ../src/chartable.c:148
 msgid "Octal"
 msgstr "Oktalt"
 
-#: ../src/chartable.c:145
+#: ../src/chartable.c:148
 msgid "Binary"
 msgstr "Binärt"
 
-#: ../src/chartable.c:161
+#: ../src/chartable.c:164
 msgid "Character table"
 msgstr "Teckentabell"
 
-#: ../src/converter.c:229
+#: ../src/converter.c:232
 msgid "Base Converter"
 msgstr "Baskonverterare"
 
 #. entries
-#: ../src/converter.c:250
+#: ../src/converter.c:253
 msgid "_Binary:"
 msgstr "_Binärt:"
 
-#: ../src/converter.c:252
+#: ../src/converter.c:255
 msgid "_Octal:"
 msgstr "_Oktalt:"
 
-#: ../src/converter.c:254
+#: ../src/converter.c:257
 msgid "_Decimal:"
 msgstr "_Decimalt:"
 
-#: ../src/converter.c:256
+#: ../src/converter.c:259
 msgid "_Hex:"
 msgstr "_Hexadecimalt:"
 
-#: ../src/converter.c:258
+#: ../src/converter.c:261
 msgid "_ASCII:"
 msgstr "_ASCII:"
 
 #. get cursor button
-#: ../src/converter.c:262
+#: ../src/converter.c:265
 msgid "_Get cursor value"
 msgstr "Hämta värde vid _markör"
 
-#: ../src/converter.c:276
+#: ../src/converter.c:279
 msgid "Get cursor value"
 msgstr "Hämta värde vid markör"
 
-#: ../src/converter.c:276
+#: ../src/converter.c:279
 msgid "Gets the value at cursor in binary, octal, decimal, hex and ASCII"
 msgstr "Hämtar värdet vid markören i binärt, oktalt, decimalt, hexadecimalt och ASCII-format"
 
-#: ../src/converter.c:416
+#: ../src/converter.c:419
 msgid "ERROR"
 msgstr "FEL"
 
-#: ../src/findreplace.c:96
-#: ../src/findreplace.c:220
-#: ../src/ui.c:966
+#: ../src/findreplace.c:97
+#: ../src/findreplace.c:221
+#: ../src/ui.c:873
 #, c-format
 msgid "GHex (%s): Find Data"
 msgstr "GHex (%s): Sök data"
 
-#: ../src/findreplace.c:100
-#: ../src/findreplace.c:160
-#: ../src/findreplace.c:356
+#: ../src/findreplace.c:101
+#: ../src/findreplace.c:161
+#: ../src/findreplace.c:359
 msgid "Find String"
 msgstr "Hitta sträng"
 
-#: ../src/findreplace.c:107
-#: ../src/findreplace.c:257
+#: ../src/findreplace.c:108
+#: ../src/findreplace.c:258
 msgid "Find _Next"
 msgstr "Sök _nästa"
 
-#: ../src/findreplace.c:114
-#: ../src/findreplace.c:266
+#: ../src/findreplace.c:115
+#: ../src/findreplace.c:267
 msgid "Find _Previous"
 msgstr "Sök _föregående"
 
-#: ../src/findreplace.c:137
-#: ../src/findreplace.c:410
+#: ../src/findreplace.c:138
+#: ../src/findreplace.c:413
 msgid "Find Data"
 msgstr "Sök data"
 
-#: ../src/findreplace.c:137
-#: ../src/findreplace.c:410
+#: ../src/findreplace.c:138
+#: ../src/findreplace.c:413
 msgid "Enter the hex data or ASCII data to search for"
 msgstr "Ange den hexadecimala data eller ASCII-data som ska sökas efter"
 
-#: ../src/findreplace.c:138
+#: ../src/findreplace.c:139
 msgid "Find Next"
 msgstr "Sök nästa"
 
-#: ../src/findreplace.c:138
-#: ../src/findreplace.c:412
+#: ../src/findreplace.c:139
+#: ../src/findreplace.c:415
 msgid "Finds the next occurrence of the search string"
 msgstr "Söker nästa förekomst av söksträngen"
 
-#: ../src/findreplace.c:139
+#: ../src/findreplace.c:140
 msgid "Find previous"
 msgstr "Sök föregående"
 
-#: ../src/findreplace.c:139
+#: ../src/findreplace.c:140
 msgid "Finds the previous occurrence of the search string "
 msgstr "Söker föregående förekomst av söksträngen"
 
-#: ../src/findreplace.c:140
-#: ../src/findreplace.c:415
-#: ../src/findreplace.c:463
+#: ../src/findreplace.c:141
+#: ../src/findreplace.c:418
+#: ../src/findreplace.c:466
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../src/findreplace.c:140
+#: ../src/findreplace.c:141
 msgid "Closes find data window"
 msgstr "Stänger datasökningsfönstret"
 
-#: ../src/findreplace.c:156
+#: ../src/findreplace.c:157
 #, c-format
 msgid "GHex (%s): Find Data: Add search"
 msgstr "GHex (%s): Sök data: Lägg till sökning"
 
-#: ../src/findreplace.c:178
+#: ../src/findreplace.c:179
 msgid "Add"
 msgstr "Lägg till"
 
-#: ../src/findreplace.c:234
+#: ../src/findreplace.c:235
 msgid "Search String"
 msgstr "Söksträng"
 
-#: ../src/findreplace.c:242
+#: ../src/findreplace.c:243
 msgid "Highlight Colour"
 msgstr "Färgmarkeringsfärg"
 
-#: ../src/findreplace.c:279
+#: ../src/findreplace.c:280
 msgid "_Add New"
 msgstr "_Lägg till ny"
 
-#: ../src/findreplace.c:288
+#: ../src/findreplace.c:289
 msgid "_Remove Selected"
 msgstr "_Ta bort markerad"
 
-#: ../src/findreplace.c:308
-#: ../src/ghex-ui.xml.h:8
+#: ../src/findreplace.c:309
 msgid "Close"
 msgstr "Stäng"
 
-#: ../src/findreplace.c:308
+#: ../src/findreplace.c:309
 msgid "Closes advanced find window"
 msgstr "Stänger det avancerade sökningsfönstret"
 
-#: ../src/findreplace.c:352
-#: ../src/ui.c:964
+#: ../src/findreplace.c:355
+#: ../src/ui.c:871
 #, c-format
 msgid "GHex (%s): Find & Replace Data"
 msgstr "GHex (%s): Sök och ersätt data"
 
-#: ../src/findreplace.c:365
+#: ../src/findreplace.c:368
 msgid "Replace With"
 msgstr "Ersätt med"
 
-#: ../src/findreplace.c:372
+#: ../src/findreplace.c:375
 msgid "Find _next"
 msgstr "Sök _nästa"
 
-#: ../src/findreplace.c:380
+#: ../src/findreplace.c:383
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: ../src/findreplace.c:388
+#: ../src/findreplace.c:391
 msgid "Replace _All"
 msgstr "Ersätt _alla"
 
-#: ../src/findreplace.c:411
+#: ../src/findreplace.c:414
 msgid "Replace Data"
 msgstr "Ersätt data"
 
-#: ../src/findreplace.c:411
+#: ../src/findreplace.c:414
 msgid "Enter the hex data or ASCII data to replace with"
 msgstr "Ange den hexadecimala data eller ASCII-data som ska ersättas med"
 
-#: ../src/findreplace.c:412
+#: ../src/findreplace.c:415
 msgid "Find next"
 msgstr "Sök nästa"
 
-#: ../src/findreplace.c:413
-#: ../src/ghex-ui.xml.h:51
+#: ../src/findreplace.c:416
 msgid "Replace"
 msgstr "Ersätt"
 
-#: ../src/findreplace.c:413
+#: ../src/findreplace.c:416
 msgid "Replaces the search string with the replace string"
 msgstr "Ersätter söksträngen med ersättningssträngen"
 
-#: ../src/findreplace.c:414
+#: ../src/findreplace.c:417
 msgid "Replace All"
 msgstr "Ersätt alla"
 
-#: ../src/findreplace.c:414
+#: ../src/findreplace.c:417
 msgid "Replaces all occurrences of the search string with the replace string"
 msgstr "Ersätter alla förekomster av söksträngen med ersättningssträngen"
 
-#: ../src/findreplace.c:415
+#: ../src/findreplace.c:418
 msgid "Closes find and replace data window"
 msgstr "Stänger datasöknings- och dataersättningsfönstret"
 
-#: ../src/findreplace.c:431
-#: ../src/ui.c:962
+#: ../src/findreplace.c:434
+#: ../src/ui.c:869
 #, c-format
 msgid "GHex (%s): Jump To Byte"
 msgstr "GHex (%s): Hoppa till byte"
 
-#: ../src/findreplace.c:461
+#: ../src/findreplace.c:464
 msgid "Jump to byte"
 msgstr "Hoppa till byte"
 
-#: ../src/findreplace.c:461
+#: ../src/findreplace.c:464
 msgid "Enter the byte to jump to"
 msgstr "Ange den byte som ska hoppas till"
 
-#: ../src/findreplace.c:462
+#: ../src/findreplace.c:465
 msgid "OK"
 msgstr "OK"
 
-#: ../src/findreplace.c:462
+#: ../src/findreplace.c:465
 msgid "Jumps to the specified byte"
 msgstr "Hoppar till den angivna byten"
 
-#: ../src/findreplace.c:463
+#: ../src/findreplace.c:466
 msgid "Closes jump to byte window"
 msgstr "Stänger bytehoppsfönstret"
 
-#: ../src/findreplace.c:526
-#: ../src/findreplace.c:560
-#: ../src/findreplace.c:644
+#: ../src/findreplace.c:529
+#: ../src/findreplace.c:563
+#: ../src/findreplace.c:670
 msgid "There is no active document to search!"
 msgstr "Det finns inget aktivt dokument att söka i!"
 
-#: ../src/findreplace.c:533
-#: ../src/findreplace.c:567
-#: ../src/findreplace.c:651
-#: ../src/findreplace.c:685
-#: ../src/findreplace.c:730
+#: ../src/findreplace.c:536
+#: ../src/findreplace.c:570
+#: ../src/findreplace.c:677
+#: ../src/findreplace.c:711
+#: ../src/findreplace.c:756
 msgid "There is no string to search for!"
 msgstr "Det finns ingen sträng att söka efter!"
 
-#: ../src/findreplace.c:545
-#: ../src/findreplace.c:660
-#: ../src/findreplace.c:851
+#: ../src/findreplace.c:548
+#: ../src/findreplace.c:686
+#: ../src/findreplace.c:876
 msgid "End Of File reached"
 msgstr "Nådde slutet på filen"
 
-#: ../src/findreplace.c:546
-#: ../src/findreplace.c:579
-#: ../src/findreplace.c:659
-#: ../src/findreplace.c:852
-#: ../src/findreplace.c:875
+#: ../src/findreplace.c:549
+#: ../src/findreplace.c:582
+#: ../src/findreplace.c:685
+#: ../src/findreplace.c:877
+#: ../src/findreplace.c:900
 msgid "String was not found!\n"
 msgstr "Strängen hittades inte!\n"
 
-#: ../src/findreplace.c:578
-#: ../src/findreplace.c:874
+#: ../src/findreplace.c:581
+#: ../src/findreplace.c:899
 msgid "Beginning Of File reached"
 msgstr "Nådde början på filen"
 
-#: ../src/findreplace.c:594
+#: ../src/findreplace.c:598
 msgid "There is no active document to move the cursor in!"
 msgstr "Det finns inget aktivt dokument att flytta markören i!"
 
-#: ../src/findreplace.c:600
+#: ../src/findreplace.c:616
 msgid "No offset has been specified!"
 msgstr "Inget avstånd har angivits!"
 
-#: ../src/findreplace.c:624
+#: ../src/findreplace.c:641
+msgid "The specified offset is beyond the  file boundaries!"
+msgstr "Angivet avstånd är utanför filgränserna!"
+
+#: ../src/findreplace.c:649
 msgid "Can not position cursor beyond the End Of File!"
 msgstr "Kan inte placera markören efter filslutet!"
 
-#: ../src/findreplace.c:631
+#: ../src/findreplace.c:656
 msgid ""
 "You may only give the offset as:\n"
 "  - a positive decimal number, or\n"
-"  - a hex number, beginning with '0x'"
+"  - a hex number, beginning with '0x', or\n"
+"  - a '+' or '-' sign, followed by a relative offset"
 msgstr ""
 "Du kan endast ange avståndet som:\n"
 "  - ett positivt decimalnummer, eller\n"
-"  - ett hexadecimalt nummer, som börjar med \"0x\""
+"  - ett hexadecimalt nummer, som börjar med \"0x\" eller\n"
+"  - ett \"+\" eller \"-\"-tecken, följt av ett relativt avstånd"
 
-#: ../src/findreplace.c:676
+#: ../src/findreplace.c:702
 msgid "There is no active buffer to replace data in!"
 msgstr "Det finns ingen aktiv buffer att ersätta data i!"
 
-#: ../src/findreplace.c:701
-#: ../src/findreplace.c:702
+#: ../src/findreplace.c:727
+#: ../src/findreplace.c:728
 msgid "End Of File reached!"
 msgstr "Nådde slutet på filen!"
 
-#: ../src/findreplace.c:721
+#: ../src/findreplace.c:747
 msgid "There is no active document to replace data in!"
 msgstr "Det finns inget aktivt dokument att ersätta data i!"
 
-#: ../src/findreplace.c:751
+#: ../src/findreplace.c:777
 msgid "No occurrences were found."
 msgstr "Inga förekomster hittades."
 
-#: ../src/findreplace.c:754
+#: ../src/findreplace.c:780
 #, c-format
 msgid "Replaced %d occurrence."
 msgid_plural "Replaced %d occurrences."
 msgstr[0] "Ersatte %d förekomst."
 msgstr[1] "Ersatte %d förekomster."
 
-#: ../src/findreplace.c:794
+#: ../src/findreplace.c:820
 msgid "No string to search for!"
 msgstr "Ingen sträng att söka efter!"
 
-#: ../src/ghex-ui.xml.h:1
-msgid "About this application"
-msgstr "Om detta program"
-
-#: ../src/ghex-ui.xml.h:2
-msgid "Add View"
-msgstr "Lägg till vy"
+#: ../src/ghex-window.c:75
+#, c-format
+msgid ""
+"Can not open URI:\n"
+"%s"
+msgstr ""
+"Kan inte öppna URI:\n"
+"%s"
 
-#: ../src/ghex-ui.xml.h:3
-msgid "Add a new view to the buffer"
-msgstr "Lägg till en ny vy till bufferten"
+#: ../src/ghex-window.c:96
+#, c-format
+msgid ""
+"Can not open file:\n"
+"%s"
+msgstr ""
+"Kan inte öppna fil:\n"
+"%s"
 
-#: ../src/ghex-ui.xml.h:4
-msgid "Advanced Find"
-msgstr "Avancerad sökning"
+#: ../src/ghex-window.c:327
+msgid "_File"
+msgstr "_Arkiv"
 
-#: ../src/ghex-ui.xml.h:5
-msgid "Bytes"
-msgstr "Byte"
-
-#: ../src/ghex-ui.xml.h:6
-msgid "Character Table..."
-msgstr "Teckentabell..."
+#: ../src/ghex-window.c:328
+msgid "_Edit"
+msgstr "_Redigera"
 
-#: ../src/ghex-ui.xml.h:7
-msgid "Character _Table"
-msgstr "_Teckentabell"
+#: ../src/ghex-window.c:329
+msgid "_View"
+msgstr "_Visa"
 
-#: ../src/ghex-ui.xml.h:9
-msgid "Close the current file"
-msgstr "Stäng den aktuella filen"
+#: ../src/ghex-window.c:330
+msgid "_Group Data As"
+msgstr "_Gruppera data som"
 
-#: ../src/ghex-ui.xml.h:10
-msgid "Configure the application"
-msgstr "Konfigurera programmet"
+#. View submenu
+#: ../src/ghex-window.c:331
+msgid "_Windows"
+msgstr "_Fönster"
 
-#: ../src/ghex-ui.xml.h:11
-msgid "Contents"
-msgstr "Innehåll"
-
-#: ../src/ghex-ui.xml.h:12
-msgid "Converter..."
-msgstr "Konverterare..."
-
-#: ../src/ghex-ui.xml.h:13
-msgid "Copy"
-msgstr "Kopiera"
+#: ../src/ghex-window.c:332
+msgid "_Help"
+msgstr "_Hjälp"
 
-#: ../src/ghex-ui.xml.h:14
-msgid "Copy selection to clipboard"
-msgstr "Kopiera markering till urklipp"
+#. File menu
+#: ../src/ghex-window.c:335
+msgid "_Open..."
+msgstr "_Öppna..."
 
-#: ../src/ghex-ui.xml.h:15
-msgid "Cu_t"
-msgstr "Klipp _ut"
+#: ../src/ghex-window.c:336
+msgid "Open a file"
+msgstr "Öppna en fil"
 
-#: ../src/ghex-ui.xml.h:16
-msgid "Cut"
-msgstr "Klipp ut"
+#: ../src/ghex-window.c:338
+msgid "_Save"
+msgstr "_Spara"
 
-#: ../src/ghex-ui.xml.h:17
-msgid "Cut selection"
-msgstr "Klipp ut markering"
+#: ../src/ghex-window.c:339
+msgid "Save the current file"
+msgstr "Spara den aktuella filen"
 
-#: ../src/ghex-ui.xml.h:18
-msgid "E_xit"
-msgstr "_Avsluta"
+#: ../src/ghex-window.c:341
+msgid "Save _As..."
+msgstr "Spara so_m..."
 
-#: ../src/ghex-ui.xml.h:19
-msgid "Exit"
-msgstr "Avsluta"
+#: ../src/ghex-window.c:342
+msgid "Save the current file with a different name"
+msgstr "Spara den aktuella filen med ett annat namn"
 
-#: ../src/ghex-ui.xml.h:20
-msgid "Exit the program"
-msgstr "Avsluta programmet"
+#: ../src/ghex-window.c:344
+msgid "Save As _HTML..."
+msgstr "Spara som _HTML..."
 
-#: ../src/ghex-ui.xml.h:21
+#: ../src/ghex-window.c:345
 msgid "Export data to HTML source"
 msgstr "Exportera data till HTML-kod"
 
-#: ../src/ghex-ui.xml.h:22
-msgid "Export to HTML..."
-msgstr "Exportera till HTML..."
-
-#: ../src/ghex-ui.xml.h:23
-msgid "Find"
-msgstr "Sök"
-
-#: ../src/ghex-ui.xml.h:24
-msgid "Goto Byte"
-msgstr "Gå till byte"
-
-#: ../src/ghex-ui.xml.h:25
-msgid "Group data by 16 bits"
-msgstr "Gruppera data i grupper om 16 bitar"
-
-#: ../src/ghex-ui.xml.h:26
-msgid "Group data by 32 bits"
-msgstr "Gruppera data i grupper om 32 bitar"
-
-#: ../src/ghex-ui.xml.h:27
-msgid "Group data by 8 bits"
-msgstr "Gruppera data i grupper om 8 bitar"
-
-#: ../src/ghex-ui.xml.h:28
-msgid "Help Chat"
-msgstr "Hjälpchatt"
-
-#: ../src/ghex-ui.xml.h:29
-msgid "Help on this application"
-msgstr "Hjälp för detta program"
-
-#: ../src/ghex-ui.xml.h:30
-msgid "Insert Mode"
-msgstr "Inskrivningsläge"
-
-#: ../src/ghex-ui.xml.h:31
-msgid "Insert/overwrite data"
-msgstr "Skriv in/över data"
-
-#: ../src/ghex-ui.xml.h:32
-msgid "Jump to a certain position"
-msgstr "Hoppa till en speciell position"
-
-#: ../src/ghex-ui.xml.h:33
-msgid "Longwords"
-msgstr "Långord"
-
-#: ../src/ghex-ui.xml.h:34
-msgid "Open"
-msgstr "Öppna"
-
-#: ../src/ghex-ui.xml.h:35
-msgid "Open a file"
-msgstr "Öppna en fil"
-
-#: ../src/ghex-ui.xml.h:36
-msgid "Open base conversion dialog"
-msgstr "Öppna baskonverteringsfönstret"
+#: ../src/ghex-window.c:347
+msgid "_Revert"
+msgstr "_Återgå"
 
-#: ../src/ghex-ui.xml.h:37
-msgid "Pa_ste"
-msgstr "Klistra _in"
+#: ../src/ghex-window.c:348
+msgid "Revert to a saved version of the file"
+msgstr "Återgå till en sparad version av filen"
 
-#: ../src/ghex-ui.xml.h:38
-msgid "Paste"
-msgstr "Klistra in"
+#: ../src/ghex-window.c:350
+msgid "_Print"
+msgstr "Skriv _ut"
 
-#: ../src/ghex-ui.xml.h:39
-msgid "Paste data from clipboard"
-msgstr "Klistra in data från urklipp"
+#: ../src/ghex-window.c:351
+msgid "Print the current file"
+msgstr "Skriv ut aktuell fil"
 
-#: ../src/ghex-ui.xml.h:40
-msgid "Preferences"
-msgstr "Inställningar"
+#: ../src/ghex-window.c:353
+msgid "Print Previe_w..."
+msgstr "_Förhandsgranska..."
 
-#: ../src/ghex-ui.xml.h:41
+#: ../src/ghex-window.c:354
 msgid "Preview printed data"
 msgstr "Förhandsgranska utskrift"
 
-#: ../src/ghex-ui.xml.h:42
-msgid "Print"
-msgstr "Skriv ut"
+#: ../src/ghex-window.c:356
+msgid "_Close"
+msgstr "S_täng"
 
-#: ../src/ghex-ui.xml.h:43
-msgid "Print Previe_w..."
-msgstr "_Förhandsgranska..."
+#: ../src/ghex-window.c:357
+msgid "Close the current file"
+msgstr "Stäng den aktuella filen"
 
-#: ../src/ghex-ui.xml.h:44
-msgid "Print Preview..."
-msgstr "Förhandsgranska..."
+#: ../src/ghex-window.c:359
+msgid "E_xit"
+msgstr "_Avsluta"
 
-#: ../src/ghex-ui.xml.h:45
-msgid "Print the current file"
-msgstr "Skriv ut aktuell fil"
+#: ../src/ghex-window.c:360
+msgid "Exit the program"
+msgstr "Avsluta programmet"
 
-#: ../src/ghex-ui.xml.h:46
-msgid "R_eplace"
-msgstr "_Ersätt"
+#. Edit menu
+#: ../src/ghex-window.c:364
+msgid "_Undo"
+msgstr "_Ångra"
 
-#: ../src/ghex-ui.xml.h:47
-msgid "Redo"
-msgstr "Gör om"
+#: ../src/ghex-window.c:365
+msgid "Undo the last action"
+msgstr "Ångra den senaste åtgärden"
+
+#: ../src/ghex-window.c:367
+msgid "_Redo"
+msgstr "_Gör om"
 
-#: ../src/ghex-ui.xml.h:48
+#: ../src/ghex-window.c:368
 msgid "Redo the undone action"
 msgstr "Gör om den ångrade åtgärden"
 
-#: ../src/ghex-ui.xml.h:49
-msgid "Remove View"
-msgstr "Ta bort vy"
-
-#: ../src/ghex-ui.xml.h:50
-msgid "Remove the current view of the buffer"
-msgstr "Ta bort nuvarande vy av bufferten"
-
-#: ../src/ghex-ui.xml.h:52
-msgid "Replace a string"
-msgstr "Ersätt en sträng"
-
-#: ../src/ghex-ui.xml.h:53
-msgid "Revert"
-msgstr "Återgå"
+#: ../src/ghex-window.c:370
+msgid "_Copy"
+msgstr "_Kopiera"
 
-#: ../src/ghex-ui.xml.h:54
-msgid "Revert to a saved version of the file"
-msgstr "Återgå till en sparad version av filen"
+#: ../src/ghex-window.c:371
+msgid "Copy selection to clipboard"
+msgstr "Kopiera markering till urklipp"
 
-#: ../src/ghex-ui.xml.h:55
-msgid "Save"
-msgstr "Spara"
-
-#: ../src/ghex-ui.xml.h:56
-msgid "Save As"
-msgstr "Spara som"
+#: ../src/ghex-window.c:373
+msgid "Cu_t"
+msgstr "Klipp _ut"
 
-#: ../src/ghex-ui.xml.h:57
-msgid "Save As _HTML..."
-msgstr "Spara som _HTML..."
+#: ../src/ghex-window.c:374
+msgid "Cut selection"
+msgstr "Klipp ut markering"
 
-#: ../src/ghex-ui.xml.h:58
-msgid "Save _As..."
-msgstr "Spara so_m..."
+#: ../src/ghex-window.c:376
+msgid "Pa_ste"
+msgstr "Klistra _in"
 
-#: ../src/ghex-ui.xml.h:59
-msgid "Save the current file"
-msgstr "Spara den aktuella filen"
+#: ../src/ghex-window.c:377
+msgid "Paste data from clipboard"
+msgstr "Klistra in data från urklipp"
 
-#: ../src/ghex-ui.xml.h:60
-msgid "Save the current file with a different name"
-msgstr "Spara den aktuella filen med ett annat namn"
+#: ../src/ghex-window.c:379
+msgid "_Find"
+msgstr "_Sök"
 
-#: ../src/ghex-ui.xml.h:61
+#: ../src/ghex-window.c:380
 msgid "Search for a string"
 msgstr "Sök efter en sträng"
 
-#: ../src/ghex-ui.xml.h:62
-msgid "Show the character table"
-msgstr "Visa teckentabellen"
+#: ../src/ghex-window.c:382
+msgid "_Advanced Find"
+msgstr "_Avancerad sökning"
 
-#: ../src/ghex-ui.xml.h:63
-msgid "Show the type conversion dialog in the edit window"
-msgstr "Visa typkonverteringsdialogen i redigeringsfönstret"
+#: ../src/ghex-window.c:383
+msgid "Advanced Find"
+msgstr "Avancerad sökning"
 
-#: ../src/ghex-ui.xml.h:64
-msgid "Type Conversion Dialog..."
-msgstr "Typkonverteringsdialogen..."
+#: ../src/ghex-window.c:385
+msgid "R_eplace"
+msgstr "_Ersätt"
 
-#: ../src/ghex-ui.xml.h:65
-msgid "Type Conversion _Dialog"
-msgstr "Typkonverterings_dialogen"
+#: ../src/ghex-window.c:386
+msgid "Replace a string"
+msgstr "Ersätt en sträng"
 
-#: ../src/ghex-ui.xml.h:66
-msgid "Undo"
-msgstr "Ångra"
+#: ../src/ghex-window.c:388
+msgid "_Goto Byte..."
+msgstr "_Gå till byte..."
 
-#: ../src/ghex-ui.xml.h:67
-msgid "Undo the last action"
-msgstr "Ångra den senaste åtgärden"
+#: ../src/ghex-window.c:389
+msgid "Jump to a certain position"
+msgstr "Hoppa till en speciell position"
 
-#: ../src/ghex-ui.xml.h:68
-msgid "Words"
-msgstr "Ord"
+#: ../src/ghex-window.c:391
+msgid "_Preferences"
+msgstr "_Inställningar"
 
-#: ../src/ghex-ui.xml.h:69
-msgid "_About"
-msgstr "_Om"
+#: ../src/ghex-window.c:392
+msgid "Configure the application"
+msgstr "Konfigurera programmet"
 
-#: ../src/ghex-ui.xml.h:70
+#. View menu
+#: ../src/ghex-window.c:396
 msgid "_Add View"
 msgstr "_Lägg till vy"
 
-#: ../src/ghex-ui.xml.h:71
-msgid "_Advanced Find"
-msgstr "_Avancerad sökning"
-
-#: ../src/ghex-ui.xml.h:72
-msgid "_Base Converter"
-msgstr "_Baskonverterare"
+#: ../src/ghex-window.c:397
+msgid "Add a new view to the buffer"
+msgstr "Lägg till en ny vy till bufferten"
 
-#: ../src/ghex-ui.xml.h:73
-#: ../src/ui.c:87
-msgid "_Bytes"
-msgstr "_Byte"
+#: ../src/ghex-window.c:399
+msgid "_Remove View"
+msgstr "_Ta bort vy"
 
-#: ../src/ghex-ui.xml.h:74
-msgid "_Close"
-msgstr "S_täng"
+#: ../src/ghex-window.c:400
+msgid "Remove the current view of the buffer"
+msgstr "Ta bort nuvarande vy av bufferten"
 
-#: ../src/ghex-ui.xml.h:75
+#. Help menu
+#: ../src/ghex-window.c:404
 msgid "_Contents"
 msgstr "_Innehåll"
 
-#: ../src/ghex-ui.xml.h:76
-msgid "_Copy"
-msgstr "_Kopiera"
-
-#: ../src/ghex-ui.xml.h:77
-msgid "_Edit"
-msgstr "_Redigera"
-
-#: ../src/ghex-ui.xml.h:78
-msgid "_File"
-msgstr "_Arkiv"
-
-#: ../src/ghex-ui.xml.h:79
-msgid "_Find"
-msgstr "_Sök"
-
-#: ../src/ghex-ui.xml.h:80
-msgid "_Goto Byte..."
-msgstr "_Gå till byte..."
+#: ../src/ghex-window.c:405
+msgid "Help on this application"
+msgstr "Hjälp för detta program"
 
-#: ../src/ghex-ui.xml.h:81
-msgid "_Group Data As"
-msgstr "_Gruppera data som"
+#: ../src/ghex-window.c:407
+msgid "_About"
+msgstr "_Om"
 
-#: ../src/ghex-ui.xml.h:82
-msgid "_Help"
-msgstr "_Hjälp"
+#: ../src/ghex-window.c:408
+msgid "About this application"
+msgstr "Om detta program"
 
-#: ../src/ghex-ui.xml.h:83
+#. Edit menu
+#: ../src/ghex-window.c:415
 msgid "_Insert Mode"
 msgstr "_Inskrivningsläge"
 
-#: ../src/ghex-ui.xml.h:84
-#: ../src/ui.c:89
-msgid "_Longwords"
-msgstr "_Långord"
-
-#: ../src/ghex-ui.xml.h:85
-msgid "_Open..."
-msgstr "_Öppna..."
-
-#: ../src/ghex-ui.xml.h:86
-msgid "_Preferences"
-msgstr "_Inställningar"
+#: ../src/ghex-window.c:416
+msgid "Insert/overwrite data"
+msgstr "Skriv in/över data"
 
-#: ../src/ghex-ui.xml.h:87
-msgid "_Print"
-msgstr "Skriv _ut"
+#. Windows menu
+#: ../src/ghex-window.c:420
+msgid "Character _Table"
+msgstr "_Teckentabell"
 
-#: ../src/ghex-ui.xml.h:88
-msgid "_Redo"
-msgstr "_Gör om"
+#: ../src/ghex-window.c:421
+msgid "Show the character table"
+msgstr "Visa teckentabellen"
 
-#: ../src/ghex-ui.xml.h:89
-msgid "_Remove View"
-msgstr "_Ta bort vy"
+#: ../src/ghex-window.c:423
+msgid "_Base Converter"
+msgstr "_Baskonverterare"
 
-#: ../src/ghex-ui.xml.h:90
-msgid "_Revert"
-msgstr "_Återgå"
+#: ../src/ghex-window.c:424
+msgid "Open base conversion dialog"
+msgstr "Öppna baskonverteringsfönstret"
 
-#: ../src/ghex-ui.xml.h:91
-msgid "_Save"
-msgstr "_Spara"
+#: ../src/ghex-window.c:426
+msgid "Type Conversion _Dialog"
+msgstr "Typkonverterings_dialogen"
 
-#: ../src/ghex-ui.xml.h:92
-msgid "_Undo"
-msgstr "_Ångra"
+#: ../src/ghex-window.c:427
+msgid "Show the type conversion dialog in the edit window"
+msgstr "Visa typkonverteringsdialogen i redigeringsfönstret"
 
-#: ../src/ghex-ui.xml.h:93
-msgid "_View"
-msgstr "_Visa"
+#: ../src/ghex-window.c:433
+#: ../src/ui.c:48
+msgid "_Bytes"
+msgstr "_Byte"
 
-#: ../src/ghex-ui.xml.h:94
-msgid "_Windows"
-msgstr "_Fönster"
+#: ../src/ghex-window.c:434
+msgid "Group data by 8 bits"
+msgstr "Gruppera data i grupper om 8 bitar"
 
-#: ../src/ghex-ui.xml.h:95
-#: ../src/ui.c:88
+#: ../src/ghex-window.c:435
+#: ../src/ui.c:49
 msgid "_Words"
 msgstr "_Ord"
 
-#: ../src/ghex-window.c:91
-#, c-format
-msgid ""
-"Can not open URI:\n"
-"%s"
-msgstr ""
-"Kan inte öppna URI:\n"
-"%s"
+#: ../src/ghex-window.c:436
+msgid "Group data by 16 bits"
+msgstr "Gruppera data i grupper om 16 bitar"
+
+#: ../src/ghex-window.c:437
+#: ../src/ui.c:50
+msgid "_Longwords"
+msgstr "_Långord"
+
+#: ../src/ghex-window.c:438
+msgid "Group data by 32 bits"
+msgstr "Gruppera data i grupper om 32 bitar"
 
-#: ../src/ghex-window.c:110
+#: ../src/ghex-window.c:585
 #, c-format
-msgid ""
-"Can not open file:\n"
-"%s"
-msgstr ""
-"Kan inte öppna fil:\n"
-"%s"
+msgid "Failed to load UI: %s"
+msgstr "Misslyckades med att läsa in användargränssnitt: %s"
 
-#: ../src/ghex-window.c:644
+#: ../src/ghex-window.c:794
 #, c-format
 msgid "Offset: %s"
 msgstr "Avstånd: %s"
 
-#: ../src/ghex-window.c:647
+#: ../src/ghex-window.c:797
 #, c-format
 msgid "; %s bytes from %s to %s selected"
 msgstr "; %s byte från  %s till %s markerat"
 
-#: ../src/ghex-window.c:899
+#: ../src/ghex-window.c:1069
 #, c-format
 msgid "Activate file %s"
 msgstr "Aktivera filen %s"
 
-#: ../src/ghex-window.c:941
+#: ../src/ghex-window.c:1105
 #, c-format
 msgid "%s - GHex"
 msgstr "%s - GHex"
 
-#: ../src/ghex-window.c:1070
+#: ../src/ghex-window.c:1231
 msgid "Select a file to save buffer as"
 msgstr "Välj en fil att spara bufferten som"
 
-#: ../src/ghex-window.c:1126
+#: ../src/ghex-window.c:1263
 #, c-format
 msgid ""
 "File %s exists.\n"
@@ -784,21 +692,21 @@
 "Filen %s finns.\n"
 "Vill du skriva över den?"
 
-#: ../src/ghex-window.c:1159
-#: ../src/ui.c:381
+#: ../src/ghex-window.c:1289
+#: ../src/ui.c:300
 #, c-format
 msgid "Saved buffer to file %s"
 msgstr "Sparade bufferten till filen %s"
 
-#: ../src/ghex-window.c:1165
+#: ../src/ghex-window.c:1296
 msgid "Error saving file!"
 msgstr "Fel vid sparande av fil!"
 
-#: ../src/ghex-window.c:1171
+#: ../src/ghex-window.c:1302
 msgid "Can't open file for writing!"
 msgstr "Kan inte öppna filen för skrivning!"
 
-#: ../src/ghex-window.c:1216
+#: ../src/ghex-window.c:1347
 #, c-format
 msgid ""
 "File %s has changed since last save.\n"
@@ -807,107 +715,20 @@
 "Filen %s har ändrats sedan den senast sparades.\n"
 "Vill du spara ändringarna?"
 
-#: ../src/ghex-window.c:1220
+#: ../src/ghex-window.c:1351
 msgid "Do_n't save"
 msgstr "Spara _inte"
 
-#: ../src/ghex-window.c:1240
-#: ../src/ui.c:369
+#: ../src/ghex-window.c:1371
+#: ../src/ui.c:288
 msgid "You don't have the permissions to save the file!"
 msgstr "Du har inte rättigheterna att spara filen!"
 
-#: ../src/ghex-window.c:1244
-#: ../src/ui.c:374
+#: ../src/ghex-window.c:1375
+#: ../src/ui.c:293
 msgid "An error occurred while saving file!"
 msgstr "Ett fel inträffade vid sparande av filen!"
 
-#: ../src/gnome-print-font-dialog.c:102
-msgid "_Insert a new preview phrase."
-msgstr "_Infoga en ny förhandsgranskningsfras."
-
-#: ../src/gnome-print-font-dialog.c:108
-msgid "Modify preview phrase..."
-msgstr "Ändra förhandsgranskningsfras..."
-
-#: ../src/gnome-print-font-dialog.c:162
-msgid "Preview"
-msgstr "Förhandsgranskning"
-
-#: ../src/gnome-print-font-dialog.c:175
-msgid "_Modify preview phrase..."
-msgstr "_Ändra förhandsgranskningsfras..."
-
-#: ../src/gnome-print-font-dialog.c:238
-msgid "Font Selection"
-msgstr "Typsnittsval"
-
-#: ../src/gnome-print-font-picker.c:76
-msgid "Sans Regular 12"
-msgstr "Sans Regular 12"
-
-# W ingår inte i det svenska alfabetet
-#: ../src/gnome-print-font-picker.c:77
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvXxYyZzÅåÄäÖö"
-
-#: ../src/gnome-print-font-picker.c:78
-msgid "Pick a Font"
-msgstr "Välj ett typsnitt"
-
-#: ../src/gnome-print-font-picker.c:162
-msgid "Title"
-msgstr "Titel"
-
-#: ../src/gnome-print-font-picker.c:163
-msgid "The title of the selection dialog box"
-msgstr "Titel på valdialogrutan"
-
-#: ../src/gnome-print-font-picker.c:183
-msgid "Font name"
-msgstr "Typsnittsnamn"
-
-#: ../src/gnome-print-font-picker.c:184
-msgid "Name of the selected font"
-msgstr "Namn på det valda typsnittet"
-
-#: ../src/gnome-print-font-picker.c:192
-msgid "Preview text"
-msgstr "Förhandsgranskningstext"
-
-#: ../src/gnome-print-font-picker.c:193
-msgid "Preview text shown in the dialog"
-msgstr "Förhandsgranskningstext som visas i dialogfönstret"
-
-#: ../src/gnome-print-font-picker.c:201
-msgid "Use font in label"
-msgstr "Använd typsnitt i etikett"
-
-#: ../src/gnome-print-font-picker.c:202
-msgid "Use font in the label in font info mode"
-msgstr "Använd typsnitt i etikett i typsnittsinformationsläge"
-
-#: ../src/gnome-print-font-picker.c:210
-msgid "Font size for label"
-msgstr "Typsnittsstorlek för etikett"
-
-#: ../src/gnome-print-font-picker.c:211
-msgid "Font size for label in font info mode"
-msgstr "Typsnittsstorlek för etikett i typsnittsinformationsläge"
-
-#: ../src/gnome-print-font-picker.c:221
-msgid "Show size"
-msgstr "Visa storlek"
-
-#: ../src/gnome-print-font-picker.c:222
-msgid "Show size in font info mode"
-msgstr "Visa storlek i typsnittsinformationsläge"
-
-#. display font
-#: ../src/gnome-print-font-picker.c:1003
-#: ../src/preferences.c:183
-msgid "Font"
-msgstr "Typsnitt"
-
 #: ../src/hex-dialog.c:58
 msgid "Signed 8 bit:"
 msgstr "8-bitars med tecken:"
@@ -933,12 +754,12 @@
 msgstr "Teckenlöst 32-bitars:"
 
 #: ../src/hex-dialog.c:64
-msgid "32 bit float:"
-msgstr "32-bitars flyttal:"
+msgid "Float 32 bit:"
+msgstr "Flytande 32 bitar:"
 
 #: ../src/hex-dialog.c:65
-msgid "64 bit float:"
-msgstr "64-bitars flyttal:"
+msgid "Float 64 bit:"
+msgstr "Flytande 64 bitar:"
 
 #: ../src/hex-dialog.c:66
 msgid "Hexadecimal:"
@@ -952,20 +773,20 @@
 msgid "Binary:"
 msgstr "Binärt:"
 
-#: ../src/hex-dialog.c:197
+#: ../src/hex-dialog.c:204
 msgid "Show little endian decoding"
 msgstr "Visa little endian-avkodning"
 
 # Osäker.
-#: ../src/hex-dialog.c:204
+#: ../src/hex-dialog.c:211
 msgid "Show unsigned and float as hexadecimal"
 msgstr "Visa teckenlösa och flyttal hexadecimalt"
 
-#: ../src/hex-dialog.c:210
+#: ../src/hex-dialog.c:217
 msgid "Stream Length:"
 msgstr "Flödeslängd:"
 
-#: ../src/hex-dialog.c:232
+#: ../src/hex-dialog.c:239
 msgid "FIXME: no conversion function"
 msgstr "FIXAMIG: ingen konverteringsfunktion"
 
@@ -973,48 +794,48 @@
 msgid "New document"
 msgstr "Nytt dokument"
 
-#: ../src/hex-document.c:790
+#: ../src/hex-document.c:785
 #, c-format
 msgid "Page"
 msgstr "Sida"
 
-#: ../src/hex-document.c:796
-#: ../src/hex-document.c:921
+#: ../src/hex-document.c:791
+#: ../src/hex-document.c:916
 #, c-format
 msgid "Hex dump generated by"
 msgstr "Hexdump genererad av"
 
-#: ../src/hex-document.c:807
+#: ../src/hex-document.c:802
 msgid "Saving to HTML..."
 msgstr "Sparar som HTML..."
 
-#: ../src/hex-document.c:844
+#: ../src/hex-document.c:839
 #, c-format
 msgid "Previous page"
 msgstr "Föregående sida"
 
-#: ../src/hex-document.c:859
+#: ../src/hex-document.c:854
 #, c-format
 msgid "Next page"
 msgstr "Nästa sida"
 
-#: ../src/main.c:35
+#: ../src/main.c:36
 msgid "X geometry specification (see \"X\" man page)."
 msgstr "X-geometrispecifikation (se manualsidan för \"X\")."
 
-#: ../src/main.c:35
+#: ../src/main.c:36
 msgid "GEOMETRY"
 msgstr "GEOMETRI"
 
-#: ../src/main.c:36
+#: ../src/main.c:37
 msgid "FILES"
 msgstr "FILER"
 
-#: ../src/main.c:52
+#: ../src/main.c:53
 msgid "- GTK+ binary editor"
 msgstr "- Binärfilsredigerare för GTK+"
 
-#: ../src/main.c:56
+#: ../src/main.c:57
 #, c-format
 msgid ""
 "%s\n"
@@ -1023,126 +844,127 @@
 "%s\n"
 "Kör \"%s --help\" för att få en komplett lista över tillgängliga kommandoradsflaggor.\n"
 
-#: ../src/main.c:73
-msgid "Could not initialize Bonobo!\n"
-msgstr "Kunde inte initiera Bonobo!\n"
-
-#: ../src/main.c:83
-#: ../src/main.c:96
+#: ../src/main.c:80
+#: ../src/main.c:93
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Ogiltig geometristräng \"%s\"\n"
 
-#: ../src/preferences.c:72
+#: ../src/preferences.c:69
 msgid "GHex Preferences"
 msgstr "Inställningar för GHex"
 
-#: ../src/preferences.c:104
+#: ../src/preferences.c:101
 msgid "_Maximum number of undo levels:"
 msgstr "_Maximalt antal ångrasteg"
 
-#: ../src/preferences.c:124
+#: ../src/preferences.c:121
 msgid "Undo levels"
 msgstr "Ångrasteg"
 
-#: ../src/preferences.c:124
+#: ../src/preferences.c:121
 msgid "Select maximum number of undo levels"
 msgstr "Välj maximalt antal ångrasteg"
 
-#: ../src/preferences.c:128
+#: ../src/preferences.c:125
 msgid "_Show cursor offset in statusbar as:"
 msgstr "_Visa markörpositionen i statusraden som:"
 
-#: ../src/preferences.c:147
+#: ../src/preferences.c:144
 msgid "Hexadecimal"
 msgstr "Hexadecimalt"
 
-#: ../src/preferences.c:149
+#: ../src/preferences.c:146
 msgid "Custom"
 msgstr "Anpassad"
 
-#: ../src/preferences.c:158
+#: ../src/preferences.c:155
 msgid "Enter the cursor offset format"
 msgstr "Ange markörpositionsformatet"
 
-#: ../src/preferences.c:159
+#: ../src/preferences.c:156
 msgid "Select the cursor offset format"
 msgstr "Välj markörpositionsformatet"
 
 #. show offsets check button
-#: ../src/preferences.c:169
+#: ../src/preferences.c:166
 msgid "Sh_ow offsets column"
 msgstr "Vis_a avståndskolumn"
 
-#: ../src/preferences.c:174
+#: ../src/preferences.c:171
 msgid "Editing"
 msgstr "Redigerar"
 
+#. display font
+#: ../src/preferences.c:180
+msgid "Font"
+msgstr "Typsnitt"
+
 #. default group type
-#: ../src/preferences.c:206
+#: ../src/preferences.c:203
 msgid "Default Group Type"
 msgstr "Standardgrupptyp"
 
-#: ../src/preferences.c:222
+#: ../src/preferences.c:219
 msgid "Display"
 msgstr "Utseende"
 
 #. paper selection
-#: ../src/preferences.c:231
+#: ../src/preferences.c:228
 msgid "Paper size"
 msgstr "Pappersstorlek"
 
 #. data & header font selection
-#: ../src/preferences.c:236
+#: ../src/preferences.c:233
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: ../src/preferences.c:242
+#: ../src/preferences.c:245
 msgid "_Data font:"
 msgstr "_Datatypsnitt:"
 
-#: ../src/preferences.c:261
+#: ../src/preferences.c:259
 msgid "Data font"
 msgstr "Datatypsnitt"
 
-#: ../src/preferences.c:261
+#: ../src/preferences.c:259
 msgid "Select the data font"
 msgstr "Välj datatypsnittet"
 
-#: ../src/preferences.c:275
+#: ../src/preferences.c:268
 msgid "Header fo_nt:"
 msgstr "_Rubriktypsnitt:"
 
-#: ../src/preferences.c:293
+#: ../src/preferences.c:281
 msgid "Header font"
 msgstr "Rubriktypsnitt"
 
-#: ../src/preferences.c:293
+#: ../src/preferences.c:281
 msgid "Select the header font"
 msgstr "Välj rubriktypsnittet"
 
-#: ../src/preferences.c:319
+#: ../src/preferences.c:306
 msgid "_Print shaded box over:"
 msgstr "_Skriv skuggad ruta över:"
 
-#: ../src/preferences.c:331
+#: ../src/preferences.c:318
 msgid "Box size"
 msgstr "Rutstorlek"
 
-#: ../src/preferences.c:331
+#: ../src/preferences.c:318
 msgid "Select size of box (in number of lines)"
 msgstr "Välj storleken på rutan (i antal rader)"
 
-#: ../src/preferences.c:335
+#: ../src/preferences.c:322
 msgid "lines (0 for no box)"
 msgstr "rader (0 för ingen ruta)"
 
-#: ../src/preferences.c:342
+#: ../src/preferences.c:329
 msgid "Printing"
 msgstr "Skriver ut"
 
-#: ../src/preferences.c:464
-#: ../src/ui.c:295
+#: ../src/preferences.c:447
+#: ../src/ui.c:209
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -1151,11 +973,11 @@
 "Det inträffade ett fel vid visande av hjälp:\n"
 "%s"
 
-#: ../src/preferences.c:517
+#: ../src/preferences.c:499
 msgid "Can not open desired font!"
 msgstr "Kan inte öppna det önskade typsnittet!"
 
-#: ../src/preferences.c:580
+#: ../src/preferences.c:560
 msgid ""
 "The offset format string contains invalid format specifier.\n"
 "Only 'x', 'X', 'p', 'P', 'd' and 'o' are allowed."
@@ -1163,58 +985,46 @@
 "Avståndsformateringssträngen innehåller ogiltiga formatspecificerare.\n"
 "Endast \"x\", \"X\", \"p\", \"P\", \"d\" och \"o\" är tillåtna."
 
-#: ../src/print.c:67
+#: ../src/print.c:57
 #, c-format
 msgid "Page: %i/%i"
 msgstr "Sida: %i/%i"
 
-#: ../src/print.c:223
-#: ../src/print.c:239
-#, c-format
-msgid ""
-"GHex could not find the font \"%s\".\n"
-"GHex is unable to print without this font installed."
-msgstr ""
-"GHex kunde inte hitta typsnittet \"%s\".\n"
-"GHex kan inte skriva ut om inte detta typsnitt är installerat."
-
-#: ../src/ui.c:94
+#: ../src/ui.c:55
 msgid "hex data"
 msgstr "hex-data"
 
-#: ../src/ui.c:95
+#: ../src/ui.c:56
 msgid "ASCII data"
 msgstr "ASCII-data"
 
-#: ../src/ui.c:238
-msgid ""
-"Copyright © 1998 - 2006 Jaka Močnik\n"
-"Copyright © 2006 - 2010 GHex Contributors"
-msgstr ""
-"Copyright © 1998 - 2006 Jaka Močnik\n"
-"Copyright © 2006 - 2010 GHex bidragsgivare"
-
-#: ../src/ui.c:245
+#: ../src/ui.c:150
 msgid "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
 msgstr "Detta program är fri programvara. Du kan distribuera det och/eller modifiera det under villkoren i GNU General Public License, publicerad av Free Software Foundation, antingen version 2 eller (om du så vill) någon senare version."
 
-#: ../src/ui.c:249
+#: ../src/ui.c:154
 msgid "This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
 msgstr "Detta program distribueras i hopp om att det ska vara användbart, men UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för ytterligare information."
 
-#: ../src/ui.c:253
+#: ../src/ui.c:158
 msgid "You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
 msgstr "Du bör ha fått en kopia av GNU General Public License tillsammans med Brasero. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
 
-#: ../src/ui.c:265
+#. Translators: these two strings here indicate the copyright time span,
+#. e.g. 1998-2012.
+#: ../src/ui.c:170
+msgid "Copyright © %Id–%Id The GHex authors"
+msgstr "Copyright © %Id–%Id The GHex authors"
+
+#: ../src/ui.c:174
 msgid "A binary file editor"
 msgstr "En binärfilsredigerare"
 
-#: ../src/ui.c:271
+#: ../src/ui.c:180
 msgid "About GHex"
 msgstr "Om GHex"
 
-#: ../src/ui.c:272
+#: ../src/ui.c:181
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po@danielnylander.se>\n"
@@ -1225,37 +1035,37 @@
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv@listor.tp-sv.se>."
 
-#: ../src/ui.c:275
+#: ../src/ui.c:184
 msgid "GHex Website"
 msgstr "Webbplatsen för GHex"
 
-#: ../src/ui.c:398
+#: ../src/ui.c:318
 msgid "Select a file to open"
 msgstr "Välj en fil att öppna"
 
-#: ../src/ui.c:429
+#: ../src/ui.c:349
 #, c-format
 msgid "Loaded file %s"
 msgstr "Läste in filen %s"
 
-#: ../src/ui.c:437
+#: ../src/ui.c:357
 msgid "Can not open file!"
 msgstr "Kan inte öppna filen!"
 
-#: ../src/ui.c:498
+#: ../src/ui.c:422
 msgid "Select path and file name for the HTML source"
 msgstr "Ange sökväg och filnamn för HTML-koden"
 
-#: ../src/ui.c:532
+#: ../src/ui.c:454
 msgid "You need to specify a base name for the HTML files."
 msgstr "Du måste ange ett basnamn för HTML-filerna."
 
-#: ../src/ui.c:543
-#: ../src/ui.c:567
+#: ../src/ui.c:465
+#: ../src/ui.c:491
 msgid "You don't have the permission to write to the selected path.\n"
 msgstr "Du har inte de rättigheter som krävs för att skriva till den valda sökvägen.\n"
 
-#: ../src/ui.c:554
+#: ../src/ui.c:477
 msgid ""
 "Saving to HTML will overwrite some files.\n"
 "Do you want to proceed?"
@@ -1263,147 +1073,114 @@
 "Att spara till HTML kommer att skriva över en del filer.\n"
 "Vill du fortsätta?"
 
-#: ../src/ui.c:707
+#: ../src/ui.c:745
 #, c-format
 msgid "Really revert file %s?"
 msgstr "Vill du verkligen återställa filen %s?"
 
-#: ../src/ui.c:721
+#: ../src/ui.c:759
 #, c-format
 msgid "Reverted buffer from file %s"
 msgstr "Återställde buffert från filen %s"
 
-#: ../src/ui.c:805
-msgid "Printing file..."
-msgstr "Skriv ut fil..."
+#~ msgid "Hexadecimal Editor"
+#~ msgstr "Hexadecimalredigerare"
+
+#~ msgid "Add View"
+#~ msgstr "Lägg till vy"
 
-#: ../src/ui.c:865
-msgid "Print Hex Document"
-msgstr "Skriv ut hexadecimalt dokument"
+#~ msgid "Bytes"
+#~ msgstr "Byte"
 
-#: ../src/ui.c:877
-msgid "Pages"
-msgstr "Sidor"
+#~ msgid "Character Table..."
+#~ msgstr "Teckentabell..."
 
-#: ../src/ui.c:902
-#, c-format
-msgid "GHex (%s): Print Preview"
-msgstr "GHex (%s): Förhandsgranskning"
+#~ msgid "Contents"
+#~ msgstr "Innehåll"
 
-#~ msgid "Hex Editor"
-#~ msgstr "Hexadecimalredigerare"
-#~ msgid "The gnome binary editor"
-#~ msgstr "GNOME:s binärfilsredigerare"
-#~ msgid "Released under the terms of GNU Public License"
-#~ msgstr "Släppt under villkoren i GNU Public License"
-#~ msgid "C_ut"
-#~ msgstr "Klipp _ut"
-#~ msgid "_Paste"
-#~ msgstr "Klistra _in"
-#~ msgid "Search for %s"
-#~ msgstr "Sök efter %s"
-#~ msgid "Replace %s"
-#~ msgstr "Ersätt %s"
-#~ msgid "The string is not appropriate for the selected data type!"
-#~ msgstr "Strängen är inte lämplig för den valda datatypen!"
-#~ msgid "The offset must be a positive integer value!"
-#~ msgstr "Avståndet måste vara ett positivt heltal!"
-#~ msgid "Strings are not appropriate for the selected data type!"
-#~ msgstr "Strängar är inte lämpliga för den valda datatypen!"
-#~ msgid "GHex - %s"
-#~ msgstr "GHex - %s"
-#~ msgid "Advanced find"
-#~ msgstr "Avancerad sökning"
-#~ msgid "Signed 8 bit"
-#~ msgstr "8-bitars med tecken"
-#~ msgid "Unsigned 8 bit"
-#~ msgstr "Teckenlöst 8-bitars"
-#~ msgid "Signed 16 bit"
-#~ msgstr "16-bitars med tecken"
-#~ msgid "Unsigned 16 bit"
-#~ msgstr "Teckenlöst 16-bitars"
-#~ msgid "Signed 32 bit"
-#~ msgstr "32-bitars med tecken"
-#~ msgid "Unsigned 32 bit"
-#~ msgstr "Teckenlöst 32-bitars"
-#~ msgid "32 bit float"
-#~ msgstr "32-bitars flyttal"
-#~ msgid "64 bit float"
-#~ msgstr "64-bitars flyttal"
-#~ msgid "Highlight Color"
-#~ msgstr "Färgmarkeringsfärg"
-#~ msgid "_Insert a new preview phrase"
-#~ msgstr "_Infoga en ny förhandsgranskningsfras"
-#~ msgid "Preview..."
+#~ msgid "Converter..."
+#~ msgstr "Konverterare..."
+
+#~ msgid "Copy"
+#~ msgstr "Kopiera"
+
+#~ msgid "Cut"
+#~ msgstr "Klipp ut"
+
+#~ msgid "Exit"
+#~ msgstr "Avsluta"
+
+#~ msgid "Export to HTML..."
+#~ msgstr "Exportera till HTML..."
+
+#~ msgid "Find"
+#~ msgstr "Sök"
+
+#~ msgid "Goto Byte"
+#~ msgstr "Gå till byte"
+
+#~ msgid "Help Chat"
+#~ msgstr "Hjälpchatt"
+
+#~ msgid "Insert Mode"
+#~ msgstr "Inskrivningsläge"
+
+#~ msgid "Longwords"
+#~ msgstr "Långord"
+
+#~ msgid "Open"
+#~ msgstr "Öppna"
+
+#~ msgid "Paste"
+#~ msgstr "Klistra in"
+
+#~ msgid "Preferences"
+#~ msgstr "Inställningar"
+
+#~ msgid "Print"
+#~ msgstr "Skriv ut"
+
+#~ msgid "Print Preview..."
 #~ msgstr "Förhandsgranska..."
-#~ msgid "String was not found!"
-#~ msgstr "Strängen hittades inte!"
-#~ msgid "String was not found."
-#~ msgstr "Strängen hittades inte."
-#~ msgid "_About..."
-#~ msgstr "_Om..."
-#~ msgid "Find Previous"
-#~ msgstr "Sök föregående"
-#~ msgid "About..."
-#~ msgstr "Om..."
-#~ msgid "Strange find or replace string!"
-#~ msgstr "Konstig sök- eller ersättningssträng!"
-#~ msgid "Fi_les"
-#~ msgstr "Fi_ler"
-#~ msgid "_Tools"
-#~ msgstr "_Verktyg"
-#~ msgid "Select font"
-#~ msgstr "Välj typsnitt"
-#~ msgid "Browse..."
-#~ msgstr "Bläddra..."
-#~ msgid ""
-#~ "Do you want to save the changes you made to the document ``%s''? \n"
-#~ "\n"
-#~ "Your changes will be lost if you don't save them."
-#~ msgstr ""
-#~ "Vill du spara ändringarna du gjorde i dokumentet \"%s\"?\n"
-#~ "\n"
-#~ "Dina ändringar kommer att gå förlorade om du inte sparar dem."
-#~ msgid "_Don't save"
-#~ msgstr "Spara _inte"
-#~ msgid "(modified)"
-#~ msgstr "(modifierad)"
-#~ msgid "(readonly)"
-#~ msgstr "(skrivskyddad)"
-#~ msgid "Default"
-#~ msgstr "Standard"
-#~ msgid "Notebook"
-#~ msgstr "Flikhäfte"
-#~ msgid "Toplevel"
-#~ msgstr "Toppnivå"
-#~ msgid "Modal"
-#~ msgstr "Modal"
-#~ msgid "format_entry"
-#~ msgstr "format_post"
-#~ msgid "format_optionmenu"
-#~ msgstr "format_alternativmeny"
-#~ msgid "MDI Mode"
-#~ msgstr "MDI-läge"
-#~ msgid "MDI"
-#~ msgstr "MDI"
-#~ msgid "Export to _HTML..."
-#~ msgstr "Exportera till _HTML..."
-#~ msgid "Print pre_view..."
-#~ msgstr "_Förhandsgranska..."
-#~ msgid "Con_verter..."
-#~ msgstr "_Konverterare..."
-#~ msgid "GHex: Character table"
-#~ msgstr "GHex: Teckentabell"
-#~ msgid "Con_verter"
-#~ msgstr "Kon_verterare"
-#~ msgid "Help"
-#~ msgstr "Hjälp"
-#~ msgid "_Settings"
-#~ msgstr "_Inställningar"
-#~ msgid "_Insert mode"
-#~ msgstr "_Inskrivningsläge"
-#~ msgid "Add a new view of the buffer"
-#~ msgstr "Lägg till en ny vy av bufferten"
-#~ msgid "_Remove view"
-#~ msgstr "_Ta bort vy"
 
+#~ msgid "Redo"
+#~ msgstr "Gör om"
+
+#~ msgid "Remove View"
+#~ msgstr "Ta bort vy"
+
+#~ msgid "Revert"
+#~ msgstr "Återgå"
+
+#~ msgid "Save"
+#~ msgstr "Spara"
+
+#~ msgid "Save As"
+#~ msgstr "Spara som"
+
+#~ msgid "Type Conversion Dialog..."
+#~ msgstr "Typkonverteringsdialogen..."
+
+#~ msgid "Undo"
+#~ msgstr "Ångra"
+
+#~ msgid "Words"
+#~ msgstr "Ord"
+
+#~ msgid "_Insert a new preview phrase."
+#~ msgstr "_Infoga en ny förhandsgranskningsfras."
+
+#~ msgid "Modify preview phrase..."
+#~ msgstr "Ändra förhandsgranskningsfras..."
+
+#~ msgid "Preview"
+#~ msgstr "Förhandsgranskning"
+
+#~ msgid "_Modify preview phrase..."
+#~ msgstr "_Ändra förhandsgranskningsfras..."
+
+#~ msgid "Font Selection"
+#~ msgstr "Typsnittsval"
+
+#~ msgid "Sans Regular 12"
+#~ msgstr "Sans Regular 12"
diff -Nru ghex-3.3.90/src/converter.c ghex-3.3.91/src/converter.c
--- ghex-3.3.90/src/converter.c	2012-02-21 01:13:58.000000000 +0000
+++ ghex-3.3.91/src/converter.c	2012-03-02 09:42:11.000000000 +0000
@@ -313,8 +313,8 @@
 	}
 }
 
-static guchar *
-clean(guchar *ptr)
+static gchar *
+clean(gchar *ptr)
 {
 	while(*ptr == '0')
 		ptr++;
@@ -326,7 +326,7 @@
 static void
 set_values(Converter *conv, gulong val)
 {
-	guchar buffer[CONV_BUFFER_LEN + 1];
+	gchar buffer[CONV_BUFFER_LEN + 1];
 	gint i, nhex, nbytes;
 	gulong tmp = val;
 
@@ -376,7 +376,7 @@
 static void
 conv_entry_cb(GtkEntry *entry, gint base)
 {
-	guchar buffer[33];
+	gchar buffer[33];
 	const gchar *text;
 	gchar *endptr;
 	gulong val = converter->value;
diff -Nru ghex-3.3.90/src/findreplace.c ghex-3.3.91/src/findreplace.c
--- ghex-3.3.90/src/findreplace.c	2012-02-21 01:13:58.000000000 +0000
+++ ghex-3.3.91/src/findreplace.c	2012-03-02 09:42:11.000000000 +0000
@@ -436,6 +436,9 @@
 	dialog->int_entry = gtk_entry_new();
 	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog->window))), dialog->int_entry,
 					   TRUE, TRUE, 0);
+	g_signal_connect_swapped (G_OBJECT (dialog->int_entry),
+	                          "activate", G_CALLBACK(gtk_window_activate_default),
+	                          GTK_WINDOW (dialog->window));
 	gtk_widget_show(dialog->int_entry);
 
 	dialog->ok = gtk_button_new_from_stock (GTK_STOCK_OK);
diff -Nru ghex-3.3.90/src/ghex.gresource.xml ghex-3.3.91/src/ghex.gresource.xml
--- ghex-3.3.90/src/ghex.gresource.xml	1970-01-01 00:00:00.000000000 +0000
+++ ghex-3.3.91/src/ghex.gresource.xml	2012-03-02 09:42:11.000000000 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/ghex">
+    <file preprocess="xml-stripblanks">ghex-ui.xml</file>
+  </gresource>
+</gresources>
diff -Nru ghex-3.3.90/src/ghex-marshal.c ghex-3.3.91/src/ghex-marshal.c
--- ghex-3.3.90/src/ghex-marshal.c	2012-02-21 06:09:28.000000000 +0000
+++ ghex-3.3.91/src/ghex-marshal.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,132 +0,0 @@
-#include "ghex-marshal.h"
-
-#include	<glib-object.h>
-
-
-#ifdef G_ENABLE_DEBUG
-#define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
-#define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
-#define g_marshal_value_peek_int(v)      g_value_get_int (v)
-#define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
-#define g_marshal_value_peek_long(v)     g_value_get_long (v)
-#define g_marshal_value_peek_ulong(v)    g_value_get_ulong (v)
-#define g_marshal_value_peek_int64(v)    g_value_get_int64 (v)
-#define g_marshal_value_peek_uint64(v)   g_value_get_uint64 (v)
-#define g_marshal_value_peek_enum(v)     g_value_get_enum (v)
-#define g_marshal_value_peek_flags(v)    g_value_get_flags (v)
-#define g_marshal_value_peek_float(v)    g_value_get_float (v)
-#define g_marshal_value_peek_double(v)   g_value_get_double (v)
-#define g_marshal_value_peek_string(v)   (char*) g_value_get_string (v)
-#define g_marshal_value_peek_param(v)    g_value_get_param (v)
-#define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
-#define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
-#define g_marshal_value_peek_object(v)   g_value_get_object (v)
-#define g_marshal_value_peek_variant(v)  g_value_get_variant (v)
-#else /* !G_ENABLE_DEBUG */
-/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
- *          Do not access GValues directly in your code. Instead, use the
- *          g_value_get_*() functions
- */
-#define g_marshal_value_peek_boolean(v)  (v)->data[0].v_int
-#define g_marshal_value_peek_char(v)     (v)->data[0].v_int
-#define g_marshal_value_peek_uchar(v)    (v)->data[0].v_uint
-#define g_marshal_value_peek_int(v)      (v)->data[0].v_int
-#define g_marshal_value_peek_uint(v)     (v)->data[0].v_uint
-#define g_marshal_value_peek_long(v)     (v)->data[0].v_long
-#define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
-#define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
-#define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
-#define g_marshal_value_peek_enum(v)     (v)->data[0].v_long
-#define g_marshal_value_peek_flags(v)    (v)->data[0].v_ulong
-#define g_marshal_value_peek_float(v)    (v)->data[0].v_float
-#define g_marshal_value_peek_double(v)   (v)->data[0].v_double
-#define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
-#define g_marshal_value_peek_param(v)    (v)->data[0].v_pointer
-#define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
-#define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
-#define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
-#define g_marshal_value_peek_variant(v)  (v)->data[0].v_pointer
-#endif /* !G_ENABLE_DEBUG */
-
-
-/* BOOLEAN:OBJECT (ghex-marshal.list:1) */
-void
-ghex_marshal_BOOLEAN__OBJECT (GClosure     *closure,
-                              GValue       *return_value G_GNUC_UNUSED,
-                              guint         n_param_values,
-                              const GValue *param_values,
-                              gpointer      invocation_hint G_GNUC_UNUSED,
-                              gpointer      marshal_data)
-{
-  typedef gboolean (*GMarshalFunc_BOOLEAN__OBJECT) (gpointer     data1,
-                                                    gpointer     arg_1,
-                                                    gpointer     data2);
-  register GMarshalFunc_BOOLEAN__OBJECT callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-  gboolean v_return;
-
-  g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 2);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_BOOLEAN__OBJECT) (marshal_data ? marshal_data : cc->callback);
-
-  v_return = callback (data1,
-                       g_marshal_value_peek_object (param_values + 1),
-                       data2);
-
-  g_value_set_boolean (return_value, v_return);
-}
-
-/* VOID:POINTER (ghex-marshal.list:2) */
-
-/* VOID:POINTER,BOOLEAN (ghex-marshal.list:3) */
-void
-ghex_marshal_VOID__POINTER_BOOLEAN (GClosure     *closure,
-                                    GValue       *return_value G_GNUC_UNUSED,
-                                    guint         n_param_values,
-                                    const GValue *param_values,
-                                    gpointer      invocation_hint G_GNUC_UNUSED,
-                                    gpointer      marshal_data)
-{
-  typedef void (*GMarshalFunc_VOID__POINTER_BOOLEAN) (gpointer     data1,
-                                                      gpointer     arg_1,
-                                                      gboolean     arg_2,
-                                                      gpointer     data2);
-  register GMarshalFunc_VOID__POINTER_BOOLEAN callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-
-  g_return_if_fail (n_param_values == 3);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_VOID__POINTER_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
-
-  callback (data1,
-            g_marshal_value_peek_pointer (param_values + 1),
-            g_marshal_value_peek_boolean (param_values + 2),
-            data2);
-}
-
-/* VOID:VOID (ghex-marshal.list:4) */
-
diff -Nru ghex-3.3.90/src/ghex-marshal.h ghex-3.3.91/src/ghex-marshal.h
--- ghex-3.3.90/src/ghex-marshal.h	2012-02-21 06:09:28.000000000 +0000
+++ ghex-3.3.91/src/ghex-marshal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-
-#ifndef __ghex_marshal_MARSHAL_H__
-#define __ghex_marshal_MARSHAL_H__
-
-#include	<glib-object.h>
-
-G_BEGIN_DECLS
-
-/* BOOLEAN:OBJECT (ghex-marshal.list:1) */
-extern void ghex_marshal_BOOLEAN__OBJECT (GClosure     *closure,
-                                          GValue       *return_value,
-                                          guint         n_param_values,
-                                          const GValue *param_values,
-                                          gpointer      invocation_hint,
-                                          gpointer      marshal_data);
-
-/* VOID:POINTER (ghex-marshal.list:2) */
-#define ghex_marshal_VOID__POINTER	g_cclosure_marshal_VOID__POINTER
-
-/* VOID:POINTER,BOOLEAN (ghex-marshal.list:3) */
-extern void ghex_marshal_VOID__POINTER_BOOLEAN (GClosure     *closure,
-                                                GValue       *return_value,
-                                                guint         n_param_values,
-                                                const GValue *param_values,
-                                                gpointer      invocation_hint,
-                                                gpointer      marshal_data);
-
-/* VOID:VOID (ghex-marshal.list:4) */
-#define ghex_marshal_VOID__VOID	g_cclosure_marshal_VOID__VOID
-
-G_END_DECLS
-
-#endif /* __ghex_marshal_MARSHAL_H__ */
-
diff -Nru ghex-3.3.90/src/ghex-marshal.list ghex-3.3.91/src/ghex-marshal.list
--- ghex-3.3.90/src/ghex-marshal.list	2011-08-17 12:07:03.000000000 +0000
+++ ghex-3.3.91/src/ghex-marshal.list	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-BOOLEAN:OBJECT
-VOID:POINTER
-VOID:POINTER,BOOLEAN
-VOID:VOID
diff -Nru ghex-3.3.90/src/ghex-resources.c ghex-3.3.91/src/ghex-resources.c
--- ghex-3.3.90/src/ghex-resources.c	1970-01-01 00:00:00.000000000 +0000
+++ ghex-3.3.91/src/ghex-resources.c	2012-03-05 17:30:42.000000000 +0000
@@ -0,0 +1,331 @@
+#include <gio/gio.h>
+
+#if defined (__ELF__) && ( __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6))
+# define SECTION __attribute__ ((section (".gresource.ghex"), aligned (8)))
+#else
+# define SECTION
+#endif
+
+static const SECTION union { const guint8 data[1584]; const double alignment; void * const ptr;}  ghex_resource_data = { {
+  0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x18, 0x00, 0x00, 0x00, 0xac, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x28, 0x05, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
+  0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+  0x04, 0x00, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, 
+  0xff, 0xff, 0xff, 0xff, 0xac, 0x00, 0x00, 0x00, 
+  0x01, 0x00, 0x4c, 0x00, 0xb0, 0x00, 0x00, 0x00, 
+  0xb4, 0x00, 0x00, 0x00, 0x4b, 0x50, 0x90, 0x0b, 
+  0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 
+  0x04, 0x00, 0x4c, 0x00, 0xb8, 0x00, 0x00, 0x00, 
+  0xbc, 0x00, 0x00, 0x00, 0xa1, 0x15, 0x72, 0x1f, 
+  0x04, 0x00, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x00, 
+  0x0b, 0x00, 0x76, 0x00, 0xc8, 0x00, 0x00, 0x00, 
+  0x18, 0x06, 0x00, 0x00, 0xb0, 0xb7, 0x24, 0x30, 
+  0x01, 0x00, 0x00, 0x00, 0x18, 0x06, 0x00, 0x00, 
+  0x06, 0x00, 0x4c, 0x00, 0x20, 0x06, 0x00, 0x00, 
+  0x24, 0x06, 0x00, 0x00, 0x4b, 0xa6, 0xbd, 0x68, 
+  0x03, 0x00, 0x00, 0x00, 0x24, 0x06, 0x00, 0x00, 
+  0x05, 0x00, 0x4c, 0x00, 0x2c, 0x06, 0x00, 0x00, 
+  0x30, 0x06, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, 
+  0x01, 0x00, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2f, 
+  0x03, 0x00, 0x00, 0x00, 0x67, 0x68, 0x65, 0x78, 
+  0x2d, 0x75, 0x69, 0x2e, 0x78, 0x6d, 0x6c, 0x00, 
+  0x40, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 
+  0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 
+  0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x75, 
+  0x69, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x62, 
+  0x61, 0x72, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x4d, 0x61, 0x69, 0x6e, 0x4d, 0x65, 0x6e, 
+  0x75, 0x22, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 
+  0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 
+  0x22, 0x46, 0x69, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 
+  0x22, 0x46, 0x69, 0x6c, 0x65, 0x4f, 0x70, 0x65, 
+  0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x65, 0x70, 
+  0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x3e, 
+  0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
+  0x3d, 0x22, 0x46, 0x69, 0x6c, 0x65, 0x53, 0x61, 
+  0x76, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 
+  0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x46, 
+  0x69, 0x6c, 0x65, 0x53, 0x61, 0x76, 0x65, 0x41, 
+  0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 
+  0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x46, 0x69, 
+  0x6c, 0x65, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 
+  0x54, 0x6f, 0x48, 0x54, 0x4d, 0x4c, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 
+  0x74, 0x6f, 0x72, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 
+  0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x46, 
+  0x69, 0x6c, 0x65, 0x52, 0x65, 0x76, 0x65, 0x72, 
+  0x74, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x65, 0x70, 
+  0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x3e, 
+  0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
+  0x3d, 0x22, 0x46, 0x69, 0x6c, 0x65, 0x50, 0x72, 
+  0x69, 0x6e, 0x74, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 
+  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 
+  0x46, 0x69, 0x6c, 0x65, 0x50, 0x72, 0x69, 0x6e, 
+  0x74, 0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x65, 0x70, 0x61, 
+  0x72, 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x3e, 0x3c, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 
+  0x22, 0x46, 0x69, 0x6c, 0x65, 0x43, 0x6c, 0x6f, 
+  0x73, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 
+  0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x46, 
+  0x69, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x74, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x61, 
+  0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x45, 
+  0x64, 0x69, 0x74, 0x22, 0x3e, 0x3c, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 
+  0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x45, 
+  0x64, 0x69, 0x74, 0x55, 0x6e, 0x64, 0x6f, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 
+  0x6f, 0x6e, 0x3d, 0x22, 0x45, 0x64, 0x69, 0x74, 
+  0x52, 0x65, 0x64, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 
+  0x72, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, 
+  0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x45, 0x64, 0x69, 
+  0x74, 0x43, 0x6f, 0x70, 0x79, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
+  0x3d, 0x22, 0x45, 0x64, 0x69, 0x74, 0x43, 0x75, 
+  0x74, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 
+  0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x45, 0x64, 
+  0x69, 0x74, 0x50, 0x61, 0x73, 0x74, 0x65, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x73, 0x65, 0x70, 0x61, 0x72, 
+  0x61, 0x74, 0x6f, 0x72, 0x2f, 0x3e, 0x3c, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 
+  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 
+  0x45, 0x64, 0x69, 0x74, 0x46, 0x69, 0x6e, 0x64, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, 
+  0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x45, 0x64, 0x69, 
+  0x74, 0x41, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 
+  0x64, 0x46, 0x69, 0x6e, 0x64, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
+  0x3d, 0x22, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 
+  0x70, 0x6c, 0x61, 0x63, 0x65, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 
+  0x6f, 0x72, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 
+  0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x45, 0x64, 
+  0x69, 0x74, 0x47, 0x6f, 0x74, 0x6f, 0x42, 0x79, 
+  0x74, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x65, 
+  0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2f, 
+  0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 
+  0x6e, 0x3d, 0x22, 0x45, 0x64, 0x69, 0x74, 0x49, 
+  0x6e, 0x73, 0x65, 0x72, 0x74, 0x4d, 0x6f, 0x64, 
+  0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x65, 0x70, 
+  0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x3e, 
+  0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
+  0x3d, 0x22, 0x45, 0x64, 0x69, 0x74, 0x50, 0x72, 
+  0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 
+  0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 
+  0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 
+  0x22, 0x56, 0x69, 0x65, 0x77, 0x22, 0x3e, 0x3c, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 
+  0x22, 0x56, 0x69, 0x65, 0x77, 0x41, 0x64, 0x64, 
+  0x56, 0x69, 0x65, 0x77, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 
+  0x22, 0x56, 0x69, 0x65, 0x77, 0x52, 0x65, 0x6d, 
+  0x6f, 0x76, 0x65, 0x56, 0x69, 0x65, 0x77, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x73, 0x65, 0x70, 0x61, 0x72, 
+  0x61, 0x74, 0x6f, 0x72, 0x2f, 0x3e, 0x3c, 0x6d, 
+  0x65, 0x6e, 0x75, 0x20, 0x61, 0x63, 0x74, 0x69, 
+  0x6f, 0x6e, 0x3d, 0x22, 0x47, 0x72, 0x6f, 0x75, 
+  0x70, 0x44, 0x61, 0x74, 0x61, 0x41, 0x73, 0x22, 
+  0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 
+  0x6e, 0x3d, 0x22, 0x42, 0x79, 0x74, 0x65, 0x73, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, 
+  0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x57, 0x6f, 0x72, 
+  0x64, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 
+  0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x4c, 
+  0x6f, 0x6e, 0x67, 0x77, 0x6f, 0x72, 0x64, 0x73, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x3e, 0x3c, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x61, 
+  0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x57, 
+  0x69, 0x6e, 0x64, 0x6f, 0x77, 0x73, 0x22, 0x3e, 
+  0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 
+  0x6c, 0x64, 0x65, 0x72, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x4f, 0x70, 0x65, 0x6e, 0x44, 
+  0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x65, 0x70, 0x61, 
+  0x72, 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x3e, 0x3c, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 
+  0x22, 0x43, 0x68, 0x61, 0x72, 0x61, 0x63, 0x74, 
+  0x65, 0x72, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 
+  0x6f, 0x6e, 0x3d, 0x22, 0x43, 0x6f, 0x6e, 0x76, 
+  0x65, 0x72, 0x74, 0x65, 0x72, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
+  0x3d, 0x22, 0x54, 0x79, 0x70, 0x65, 0x44, 0x69, 
+  0x61, 0x6c, 0x6f, 0x67, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x3e, 0x3c, 0x6d, 
+  0x65, 0x6e, 0x75, 0x20, 0x61, 0x63, 0x74, 0x69, 
+  0x6f, 0x6e, 0x3d, 0x22, 0x48, 0x65, 0x6c, 0x70, 
+  0x22, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 
+  0x6f, 0x6e, 0x3d, 0x22, 0x48, 0x65, 0x6c, 0x70, 
+  0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, 
+  0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x48, 0x65, 0x6c, 
+  0x70, 0x41, 0x62, 0x6f, 0x75, 0x74, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x3e, 
+  0x3c, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x62, 0x61, 
+  0x72, 0x3e, 0x3c, 0x2f, 0x75, 0x69, 0x3e, 0x0a, 
+  0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 
+  0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, 
+  0x04, 0x00, 0x00, 0x00, 0x67, 0x68, 0x65, 0x78, 
+  0x2f, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
+} };
+
+static GStaticResource static_resource = { ghex_resource_data.data, sizeof (ghex_resource_data.data) };
+extern GResource *ghex_get_resource (void);
+GResource *ghex_get_resource (void)
+{
+  return g_static_resource_get_resource (&static_resource);
+}
+/*
+  If G_HAS_CONSTRUCTORS is true then the compiler support *both* constructors and
+  destructors, in a sane way, including e.g. on library unload. If not you're on
+  your own.
+
+  Some compilers need #pragma to handle this, which does not work with macros,
+  so the way you need to use this is (for constructors):
+
+  #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
+  #pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(my_constructor)
+  #endif
+  G_DEFINE_CONSTRUCTOR(my_constructor)
+  static void my_constructor(void) {
+   ...
+  }
+
+*/
+
+#if  __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+
+#define G_HAS_CONSTRUCTORS 1
+
+#define G_DEFINE_CONSTRUCTOR(_func) static void __attribute__((constructor)) _func (void);
+#define G_DEFINE_DESTRUCTOR(_func) static void __attribute__((destructor)) _func (void);
+
+#elif defined (_MSC_VER) && (_MSC_VER >= 1500)
+/* Visual studio 2008 and later has _Pragma */
+
+#define G_HAS_CONSTRUCTORS 1
+
+#define G_DEFINE_CONSTRUCTOR(_func) \
+  static void _func(void); \
+  static int _func ## _wrapper(void) { _func(); return 0; } \
+  __pragma(section(".CRT$XCU",read)) \
+  __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _wrapper;
+
+#define G_DEFINE_DESTRUCTOR(_func) \
+  static void _func(void); \
+  static int _func ## _constructor(void) { atexit (_func); return 0; } \
+  __pragma(section(".CRT$XCU",read)) \
+  __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor;
+
+#elif defined (_MSC_VER)
+
+#define G_HAS_CONSTRUCTORS 1
+
+/* Pre Visual studio 2008 must use #pragma section */
+#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1
+#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1
+
+#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \
+  section(".CRT$XCU",read)
+#define G_DEFINE_CONSTRUCTOR(_func) \
+  static void _func(void); \
+  static int _func ## _wrapper(void) { _func(); return 0; } \
+  __declspec(allocate(".CRT$XCU")) static int (*p)(void) = _func ## _wrapper;
+
+#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \
+  section(".CRT$XCU",read)
+#define G_DEFINE_DESTRUCTOR(_func) \
+  static void _func(void); \
+  static int _func ## _constructor(void) { atexit (_func); return 0; } \
+  __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor;
+
+#elif defined(__SUNPRO_C)
+
+/* This is not tested, but i believe it should work, based on:
+ * http://opensource.apple.com/source/OpenSSL098/OpenSSL098-35/src/fips/fips_premain.c
+ */
+
+#define G_HAS_CONSTRUCTORS 1
+
+#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1
+#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1
+
+#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \
+  init(_func)
+#define G_DEFINE_CONSTRUCTOR(_func) \
+  static void _func(void);
+
+#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \
+  fini(_func)
+#define G_DEFINE_DESTRUCTOR(_func) \
+  static void _func(void);
+
+#else
+
+/* constructors not supported for this compiler */
+
+#endif
+
+
+#ifdef G_HAS_CONSTRUCTORS
+
+#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
+#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(resource_constructor)
+#endif
+G_DEFINE_CONSTRUCTOR(resource_constructor)
+#ifdef G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA
+#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(resource_destructor)
+#endif
+G_DEFINE_DESTRUCTOR(resource_destructor)
+
+#else
+#warning "Constructor not supported on this compiler, linking in resources will not work"
+#endif
+
+static void resource_constructor (void)
+{
+  g_static_resource_init (&static_resource);
+}
+
+static void resource_destructor (void)
+{
+  g_static_resource_fini (&static_resource);
+}
diff -Nru ghex-3.3.90/src/ghex-resources.h ghex-3.3.91/src/ghex-resources.h
--- ghex-3.3.90/src/ghex-resources.h	1970-01-01 00:00:00.000000000 +0000
+++ ghex-3.3.91/src/ghex-resources.h	2012-03-05 17:30:42.000000000 +0000
@@ -0,0 +1,7 @@
+#ifndef __RESOURCE_ghex_H__
+#define __RESOURCE_ghex_H__
+
+#include <gio/gio.h>
+
+extern GResource *ghex_get_resource (void);
+#endif
diff -Nru ghex-3.3.90/src/ghex-window.c ghex-3.3.91/src/ghex-window.c
--- ghex-3.3.90/src/ghex-window.c	2012-02-21 01:21:58.000000000 +0000
+++ ghex-3.3.91/src/ghex-window.c	2012-03-02 09:42:11.000000000 +0000
@@ -512,23 +512,6 @@
     win->contents = NULL;
 }
 
-static gchar *
-ghex_datadir (void)
-{
-    gchar *datadir;
-#ifdef G_OS_WIN32
-    gchar *dir;
-
-    dir = g_win32_get_package_installation_directory_of_module (NULL);
-    datadir = g_build_filename (dir, "share", "ghex", NULL);
-    g_free (dir);
-#else
-    datadir = g_strdup (GHEXDATADIR);
-#endif
-
-    return datadir;
-}
-
 static GObject *
 ghex_window_constructor (GType                  type,
                          guint                  n_construct_properties,
@@ -538,8 +521,6 @@
     GHexWindow *window;
     GtkWidget  *menubar;
     GError     *error = NULL;
-    gchar      *datadir;
-    gchar      *ui_path;
 
     object = G_OBJECT_CLASS (ghex_window_parent_class)->constructor (type,
                              n_construct_properties,
@@ -578,17 +559,11 @@
     gtk_ui_manager_insert_action_group (window->ui_manager,
                                         window->doc_list_action_group, 0);
 
-    /* Load menu description from file */
-    datadir = ghex_datadir ();
-    ui_path = g_build_filename (datadir, "ghex-ui.xml", NULL);
-    if (!gtk_ui_manager_add_ui_from_file (window->ui_manager, ui_path, &error)) {
-        gchar *msg = g_strdup_printf (_("Failed to load UI: %s"), error->message);
+    /* Load menu description from resources framework */
+    if (!gtk_ui_manager_add_ui_from_resource (window->ui_manager, "/org/gnome/ghex/ghex-ui.xml", &error)) {
+        g_warning ("Failed to load ui: %s", error->message);
         g_error_free (error);
-        display_error_dialog (window, msg);
-        g_free (msg);
     }
-    g_free (ui_path);
-    g_free (datadir);
 
     window->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
diff -Nru ghex-3.3.90/src/gtkhex.c ghex-3.3.91/src/gtkhex.c
--- ghex-3.3.90/src/gtkhex.c	2012-02-21 04:44:59.000000000 +0000
+++ ghex-3.3.91/src/gtkhex.c	2012-03-02 09:42:11.000000000 +0000
@@ -32,7 +32,6 @@
 #include "hex-document.h"
 #include "gtkhex.h"
 #include "gtkhex-private.h"
-#include "ghex-marshal.h"
 
 #define DISPLAY_BORDER 4
 
@@ -2054,16 +2053,14 @@
 					  G_TYPE_FROM_CLASS (widget_class),
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (GtkHexClass, cursor_moved),
-					  NULL, NULL,
-					  g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+					  NULL, NULL, NULL, G_TYPE_NONE, 0);
 
 	gtkhex_signals[DATA_CHANGED_SIGNAL] = 
 		g_signal_new ("data_changed",
 					  G_TYPE_FROM_CLASS (widget_class),
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (GtkHexClass, data_changed),
-					  NULL, NULL,
-					  g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1,
+					  NULL, NULL, NULL, G_TYPE_NONE, 1,
 					  G_TYPE_POINTER);
 
 	gtkhex_signals[CUT_CLIPBOARD_SIGNAL] = 
@@ -2071,16 +2068,14 @@
 					  G_TYPE_FROM_CLASS (widget_class),
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (GtkHexClass, cut_clipboard),
-					  NULL, NULL,
-					  g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+					  NULL, NULL, NULL, G_TYPE_NONE, 0);
 
 	gtkhex_signals[COPY_CLIPBOARD_SIGNAL] = 
 		g_signal_new ("copy_clipboard",
 					  G_TYPE_FROM_CLASS (widget_class),
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (GtkHexClass, copy_clipboard),
-					  NULL, NULL,
-					  g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+					  NULL, NULL, NULL, G_TYPE_NONE, 0);
 
 
 	gtkhex_signals[PASTE_CLIPBOARD_SIGNAL] = 
@@ -2088,8 +2083,7 @@
 					  G_TYPE_FROM_CLASS (widget_class),
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (GtkHexClass, paste_clipboard),
-					  NULL, NULL,
-					  g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+					  NULL, NULL, NULL, G_TYPE_NONE, 0);
 	
 	klass->cursor_moved = NULL;
 	klass->data_changed = gtk_hex_real_data_changed;
diff -Nru ghex-3.3.90/src/hex-document.c ghex-3.3.91/src/hex-document.c
--- ghex-3.3.90/src/hex-document.c	2012-02-18 17:48:11.000000000 +0000
+++ ghex-3.3.91/src/hex-document.c	2012-03-02 09:42:11.000000000 +0000
@@ -26,7 +26,6 @@
 #include <glib/gi18n.h>
 
 #include <gtkhex.h>
-#include <ghex-marshal.h>
 
 #include <stdio.h>
 #include <unistd.h>
@@ -340,7 +339,7 @@
 					  G_STRUCT_OFFSET (HexDocumentClass, document_changed),
 					  NULL,
 					  NULL,
-					  ghex_marshal_VOID__POINTER_BOOLEAN,
+					  NULL,
 					  G_TYPE_NONE,
 					  2, G_TYPE_POINTER, G_TYPE_BOOLEAN);
 	hex_signals[UNDO] = 
@@ -350,7 +349,7 @@
 					  G_STRUCT_OFFSET (HexDocumentClass, undo),
 					  NULL,
 					  NULL,
-					  ghex_marshal_VOID__VOID,
+					  NULL,
 					  G_TYPE_NONE, 0);
 	hex_signals[REDO] = 
 		g_signal_new ("redo",
@@ -359,7 +358,7 @@
 					  G_STRUCT_OFFSET (HexDocumentClass, redo),
 					  NULL,
 					  NULL,
-					  ghex_marshal_VOID__VOID,
+					  NULL,
 					  G_TYPE_NONE, 0);
 	hex_signals[UNDO_STACK_FORGET] = 
 		g_signal_new ("undo_stack_forget",
@@ -368,7 +367,7 @@
 					  G_STRUCT_OFFSET (HexDocumentClass, undo_stack_forget),
 					  NULL,
 					  NULL,
-					  ghex_marshal_VOID__VOID,
+					  NULL,
 					  G_TYPE_NONE, 0);
 }
 
diff -Nru ghex-3.3.90/src/hex-document-ui.c ghex-3.3.91/src/hex-document-ui.c
--- ghex-3.3.90/src/hex-document-ui.c	2012-02-09 00:02:51.000000000 +0000
+++ ghex-3.3.91/src/hex-document-ui.c	2012-03-02 09:42:11.000000000 +0000
@@ -118,6 +118,7 @@
 		gtk_window_set_position (GTK_WINDOW(jump_dialog->window), GTK_WIN_POS_MOUSE);
 		gtk_window_set_default(GTK_WINDOW(jump_dialog->window), jump_dialog->ok);
 		gtk_widget_show(jump_dialog->window);
+		gtk_widget_grab_focus(jump_dialog->int_entry);
 	}
 	raise_and_focus_widget(jump_dialog->window);
 }
diff -Nru ghex-3.3.90/src/Makefile.am ghex-3.3.91/src/Makefile.am
--- ghex-3.3.90/src/Makefile.am	2012-02-18 18:02:03.000000000 +0000
+++ ghex-3.3.91/src/Makefile.am	2012-03-05 17:14:25.000000000 +0000
@@ -10,9 +10,16 @@
 	$(WARN_CFLAGS)						\
 	$(DISABLE_DEPRECATED)
 
+ghex-resources.c: ghex.gresource.xml ghex-ui.xml
+	glib-compile-resources --target=$@ --generate-source --c-name ghex --sourcedir=$(srcdir) $<
+
+ghex-resources.h: ghex.gresource.xml
+	glib-compile-resources --target=$@ --generate-header --c-name ghex --sourcedir=$(srcdir) $<
+
 BUILT_SOURCES = \
-	ghex-marshal.c	\
-	ghex-marshal.h
+	ghex-resources.c	\
+	ghex-resources.h	\
+	$(NULL)
 
 bin_PROGRAMS = ghex
 
@@ -20,8 +27,6 @@
 
 gtkhexincludedir = $(includedir)/gtkhex-3/
 
-uidir = $(pkgdatadir)
-
 libgtkhex_3_la_SOURCES = \
 	hex-document.c			\
 	gtkhex.c			\
@@ -50,17 +55,9 @@
 	configuration.h preferences.h findreplace.h print.h		\
 	converter.h chartable.h ui.h
 
-ghex-marshal.h: ghex-marshal.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) $< --header --prefix=ghex_marshal > $@
-ghex-marshal.c: ghex-marshal.list $(GLIB_GENMARSHAL)
-	echo "#include \"ghex-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) $< --body --prefix=ghex_marshal >> $@
-
-ui_DATA = ghex-ui.xml
-
 EXTRA_DIST = \
-	$(ui_DATA)		\
-	ghex-marshal.list
+	ghex-ui.xml \
+	ghex.gresource.xml
 
 LDADD =	\
 	libgtkhex-3.la	\
diff -Nru ghex-3.3.90/src/Makefile.in ghex-3.3.91/src/Makefile.in
--- ghex-3.3.90/src/Makefile.in	2012-02-21 06:09:20.000000000 +0000
+++ ghex-3.3.91/src/Makefile.in	2012-03-05 17:30:36.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -17,7 +17,6 @@
 
 
 
-
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -78,19 +77,25 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(uidir)" "$(DESTDIR)$(gtkhexincludedir)"
+	"$(DESTDIR)$(gtkhexincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libgtkhex_3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-am__objects_1 = libgtkhex_3_la-ghex-marshal.lo
+am__objects_1 = libgtkhex_3_la-ghex-resources.lo
 am_libgtkhex_3_la_OBJECTS = libgtkhex_3_la-hex-document.lo \
 	libgtkhex_3_la-gtkhex.lo libgtkhex_3_la-accessiblegtkhex.lo \
 	libgtkhex_3_la-accessiblegtkhexfactory.lo $(am__objects_1)
 libgtkhex_3_la_OBJECTS = $(am_libgtkhex_3_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 libgtkhex_3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -115,25 +120,24 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libgtkhex_3_la_SOURCES) $(ghex_SOURCES)
 DIST_SOURCES = $(libgtkhex_3_la_SOURCES) $(ghex_SOURCES)
-DATA = $(ui_DATA)
 HEADERS = $(gtkhexinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -174,7 +178,6 @@
 GHEX_CFLAGS = @GHEX_CFLAGS@
 GHEX_LIBS = @GHEX_LIBS@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -307,12 +310,12 @@
 	$(DISABLE_DEPRECATED)
 
 BUILT_SOURCES = \
-	ghex-marshal.c	\
-	ghex-marshal.h
+	ghex-resources.c	\
+	ghex-resources.h	\
+	$(NULL)
 
 lib_LTLIBRARIES = libgtkhex-3.la
 gtkhexincludedir = $(includedir)/gtkhex-3/
-uidir = $(pkgdatadir)
 libgtkhex_3_la_SOURCES = \
 	hex-document.c			\
 	gtkhex.c			\
@@ -340,10 +343,9 @@
 	configuration.h preferences.h findreplace.h print.h		\
 	converter.h chartable.h ui.h
 
-ui_DATA = ghex-ui.xml
 EXTRA_DIST = \
-	$(ui_DATA)		\
-	ghex-marshal.list
+	ghex-ui.xml \
+	ghex.gresource.xml
 
 LDADD = \
 	libgtkhex-3.la	\
@@ -416,7 +418,7 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libgtkhex-3.la: $(libgtkhex_3_la_OBJECTS) $(libgtkhex_3_la_DEPENDENCIES) 
+libgtkhex-3.la: $(libgtkhex_3_la_OBJECTS) $(libgtkhex_3_la_DEPENDENCIES) $(EXTRA_libgtkhex_3_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgtkhex_3_la_LINK) -rpath $(libdir) $(libgtkhex_3_la_OBJECTS) $(libgtkhex_3_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -461,7 +463,7 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-ghex$(EXEEXT): $(ghex_OBJECTS) $(ghex_DEPENDENCIES) 
+ghex$(EXEEXT): $(ghex_OBJECTS) $(ghex_DEPENDENCIES) $(EXTRA_ghex_DEPENDENCIES) 
 	@rm -f ghex$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ghex_OBJECTS) $(ghex_LDADD) $(LIBS)
 
@@ -481,7 +483,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hex-document-ui.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgtkhex_3_la-accessiblegtkhex.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgtkhex_3_la-accessiblegtkhexfactory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgtkhex_3_la-ghex-marshal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgtkhex_3_la-ghex-resources.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgtkhex_3_la-gtkhex.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgtkhex_3_la-hex-document.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
@@ -492,92 +494,64 @@
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 libgtkhex_3_la-hex-document.lo: hex-document.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgtkhex_3_la_CFLAGS) $(CFLAGS) -MT libgtkhex_3_la-hex-document.lo -MD -MP -MF $(DEPDIR)/libgtkhex_3_la-hex-document.Tpo -c -o libgtkhex_3_la-hex-document.lo `test -f 'hex-document.c' || echo '$(srcdir)/'`hex-document.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgtkhex_3_la-hex-document.Tpo $(DEPDIR)/libgtkhex_3_la-hex-document.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hex-document.c' object='libgtkhex_3_la-hex-document.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hex-document.c' object='libgtkhex_3_la-hex-document.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgtkhex_3_la_CFLAGS) $(CFLAGS) -c -o libgtkhex_3_la-hex-document.lo `test -f 'hex-document.c' || echo '$(srcdir)/'`hex-document.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgtkhex_3_la_CFLAGS) $(CFLAGS) -c -o libgtkhex_3_la-hex-document.lo `test -f 'hex-document.c' || echo '$(srcdir)/'`hex-document.c
 
 libgtkhex_3_la-gtkhex.lo: gtkhex.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgtkhex_3_la_CFLAGS) $(CFLAGS) -MT libgtkhex_3_la-gtkhex.lo -MD -MP -MF $(DEPDIR)/libgtkhex_3_la-gtkhex.Tpo -c -o libgtkhex_3_la-gtkhex.lo `test -f 'gtkhex.c' || echo '$(srcdir)/'`gtkhex.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgtkhex_3_la-gtkhex.Tpo $(DEPDIR)/libgtkhex_3_la-gtkhex.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkhex.c' object='libgtkhex_3_la-gtkhex.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gtkhex.c' object='libgtkhex_3_la-gtkhex.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgtkhex_3_la_CFLAGS) $(CFLAGS) -c -o libgtkhex_3_la-gtkhex.lo `test -f 'gtkhex.c' || echo '$(srcdir)/'`gtkhex.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgtkhex_3_la_CFLAGS) $(CFLAGS) -c -o libgtkhex_3_la-gtkhex.lo `test -f 'gtkhex.c' || echo '$(srcdir)/'`gtkhex.c
 
 libgtkhex_3_la-accessiblegtkhex.lo: accessiblegtkhex.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgtkhex_3_la_CFLAGS) $(CFLAGS) -MT libgtkhex_3_la-accessiblegtkhex.lo -MD -MP -MF $(DEPDIR)/libgtkhex_3_la-accessiblegtkhex.Tpo -c -o libgtkhex_3_la-accessiblegtkhex.lo `test -f 'accessiblegtkhex.c' || echo '$(srcdir)/'`accessiblegtkhex.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgtkhex_3_la-accessiblegtkhex.Tpo $(DEPDIR)/libgtkhex_3_la-accessiblegtkhex.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='accessiblegtkhex.c' object='libgtkhex_3_la-accessiblegtkhex.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='accessiblegtkhex.c' object='libgtkhex_3_la-accessiblegtkhex.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgtkhex_3_la_CFLAGS) $(CFLAGS) -c -o libgtkhex_3_la-accessiblegtkhex.lo `test -f 'accessiblegtkhex.c' || echo '$(srcdir)/'`accessiblegtkhex.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgtkhex_3_la_CFLAGS) $(CFLAGS) -c -o libgtkhex_3_la-accessiblegtkhex.lo `test -f 'accessiblegtkhex.c' || echo '$(srcdir)/'`accessiblegtkhex.c
 
 libgtkhex_3_la-accessiblegtkhexfactory.lo: accessiblegtkhexfactory.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgtkhex_3_la_CFLAGS) $(CFLAGS) -MT libgtkhex_3_la-accessiblegtkhexfactory.lo -MD -MP -MF $(DEPDIR)/libgtkhex_3_la-accessiblegtkhexfactory.Tpo -c -o libgtkhex_3_la-accessiblegtkhexfactory.lo `test -f 'accessiblegtkhexfactory.c' || echo '$(srcdir)/'`accessiblegtkhexfactory.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgtkhex_3_la-accessiblegtkhexfactory.Tpo $(DEPDIR)/libgtkhex_3_la-accessiblegtkhexfactory.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='accessiblegtkhexfactory.c' object='libgtkhex_3_la-accessiblegtkhexfactory.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='accessiblegtkhexfactory.c' object='libgtkhex_3_la-accessiblegtkhexfactory.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgtkhex_3_la_CFLAGS) $(CFLAGS) -c -o libgtkhex_3_la-accessiblegtkhexfactory.lo `test -f 'accessiblegtkhexfactory.c' || echo '$(srcdir)/'`accessiblegtkhexfactory.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgtkhex_3_la_CFLAGS) $(CFLAGS) -c -o libgtkhex_3_la-accessiblegtkhexfactory.lo `test -f 'accessiblegtkhexfactory.c' || echo '$(srcdir)/'`accessiblegtkhexfactory.c
 
-libgtkhex_3_la-ghex-marshal.lo: ghex-marshal.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgtkhex_3_la_CFLAGS) $(CFLAGS) -MT libgtkhex_3_la-ghex-marshal.lo -MD -MP -MF $(DEPDIR)/libgtkhex_3_la-ghex-marshal.Tpo -c -o libgtkhex_3_la-ghex-marshal.lo `test -f 'ghex-marshal.c' || echo '$(srcdir)/'`ghex-marshal.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgtkhex_3_la-ghex-marshal.Tpo $(DEPDIR)/libgtkhex_3_la-ghex-marshal.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ghex-marshal.c' object='libgtkhex_3_la-ghex-marshal.lo' libtool=yes @AMDEPBACKSLASH@
+libgtkhex_3_la-ghex-resources.lo: ghex-resources.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgtkhex_3_la_CFLAGS) $(CFLAGS) -MT libgtkhex_3_la-ghex-resources.lo -MD -MP -MF $(DEPDIR)/libgtkhex_3_la-ghex-resources.Tpo -c -o libgtkhex_3_la-ghex-resources.lo `test -f 'ghex-resources.c' || echo '$(srcdir)/'`ghex-resources.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgtkhex_3_la-ghex-resources.Tpo $(DEPDIR)/libgtkhex_3_la-ghex-resources.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ghex-resources.c' object='libgtkhex_3_la-ghex-resources.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgtkhex_3_la_CFLAGS) $(CFLAGS) -c -o libgtkhex_3_la-ghex-marshal.lo `test -f 'ghex-marshal.c' || echo '$(srcdir)/'`ghex-marshal.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgtkhex_3_la_CFLAGS) $(CFLAGS) -c -o libgtkhex_3_la-ghex-resources.lo `test -f 'ghex-resources.c' || echo '$(srcdir)/'`ghex-resources.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-uiDATA: $(ui_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
-	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \
-	done
-
-uninstall-uiDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(uidir)" && rm -f $$files
 install-gtkhexincludeHEADERS: $(gtkhexinclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(gtkhexincludedir)" || $(MKDIR_P) "$(DESTDIR)$(gtkhexincludedir)"
@@ -595,9 +569,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(gtkhexinclude_HEADERS)'; test -n "$(gtkhexincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(gtkhexincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(gtkhexincludedir)" && rm -f $$files
+	dir='$(DESTDIR)$(gtkhexincludedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -684,11 +656,11 @@
 check-am: all-am
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
 install-binPROGRAMS: install-libLTLIBRARIES
 
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(gtkhexincludedir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gtkhexincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -702,10 +674,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -741,7 +718,7 @@
 
 info-am:
 
-install-data-am: install-gtkhexincludeHEADERS install-uiDATA
+install-data-am: install-gtkhexincludeHEADERS
 
 install-dvi: install-dvi-am
 
@@ -788,7 +765,7 @@
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-gtkhexincludeHEADERS \
-	uninstall-libLTLIBRARIES uninstall-uiDATA
+	uninstall-libLTLIBRARIES
 
 .MAKE: all check install install-am install-strip
 
@@ -801,20 +778,19 @@
 	install-exec install-exec-am install-gtkhexincludeHEADERS \
 	install-html install-html-am install-info install-info-am \
 	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip install-uiDATA \
-	installcheck installcheck-am installdirs maintainer-clean \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-gtkhexincludeHEADERS uninstall-libLTLIBRARIES \
-	uninstall-uiDATA
+	uninstall-gtkhexincludeHEADERS uninstall-libLTLIBRARIES
+
 
+ghex-resources.c: ghex.gresource.xml ghex-ui.xml
+	glib-compile-resources --target=$@ --generate-source --c-name ghex --sourcedir=$(srcdir) $<
 
-ghex-marshal.h: ghex-marshal.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) $< --header --prefix=ghex_marshal > $@
-ghex-marshal.c: ghex-marshal.list $(GLIB_GENMARSHAL)
-	echo "#include \"ghex-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) $< --body --prefix=ghex_marshal >> $@
+ghex-resources.h: ghex.gresource.xml
+	glib-compile-resources --target=$@ --generate-header --c-name ghex --sourcedir=$(srcdir) $<
 
 -include $(top_srcdir)/git.mk