From 0869fee988c04a6c7bf317fe92410c7a20e5cfeb Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Sun, 2 Nov 2003 00:38:21 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@335 f5e0f49d-192f-0410-a22d-a8d8700d0965
---
 glabels2/barcode-0.98/configure | 3207 +++++++++++++++++++++++--------
 glabels2/po/cs.po               | 1098 ++++++++---
 glabels2/po/de.po               | 1107 ++++++++---
 glabels2/po/es.po               | 1103 ++++++++---
 glabels2/po/fr.po               | 1211 +++++++++---
 glabels2/po/ja.po               |  220 ++-
 glabels2/po/pl.po               | 1103 ++++++++---
 glabels2/po/pt_BR.po            | 1106 ++++++++---
 glabels2/po/ru.po               | 1101 ++++++++---
 glabels2/po/zh_TW.Big5.po       | 1103 ++++++++---
 10 files changed, 9606 insertions(+), 2753 deletions(-)

diff --git a/glabels2/barcode-0.98/configure b/glabels2/barcode-0.98/configure
index bf7e1b82..f0e5d457 100755
--- a/glabels2/barcode-0.98/configure
+++ b/glabels2/barcode-0.98/configure
@@ -1,12 +1,81 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.
+# Generated by GNU Autoconf 2.57.
 #
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
 
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    $as_unset $as_var
+  fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+
+
+# PATH needs CR, and LINENO needs CR and PATH.
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -14,22 +83,113 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
 
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
 
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 
-# Name of the executable.
-as_me=`echo "$0" |sed 's,.*[\\/],,'`
+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  chmod +x $as_me.lineno ||
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
 
 if expr a : '\(a\)' >/dev/null 2>&1; then
   as_expr=expr
@@ -55,24 +215,20 @@ else
 fi
 rm -f conf$$ conf$$.exe conf$$.file
 
-as_executable_p="test -f"
-
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-  as_unset=unset
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
 else
-  as_unset=false
+  as_mkdir_p=false
 fi
 
-# NLS nuisances.
-$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
-$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
-$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
-$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
-$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
-$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
-$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
-$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+as_executable_p="test -f"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+
 
 # IFS
 # We need space, tab and new line, in precisely that order.
@@ -81,7 +237,8 @@ as_nl='
 IFS=" 	$as_nl"
 
 # CDPATH.
-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+$as_unset CDPATH
+
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -94,9 +251,11 @@ exec 6>&1
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_config_libobj_dir=.
 cross_compiling=no
 subdirs=
-MFLAGS= MAKEFLAGS=
+MFLAGS=
+MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Maximum number of lines to put in a shell here document.
@@ -104,7 +263,53 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # only ac_max_sed_lines should be used.
 : ${ac_max_here_lines=38}
 
+# Identity of this package.
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
+
 ac_unique_file="barcode.h"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP GETOPT_O NO_GETOPT NO_LIBPAPER LIBPAPER NO_STRERROR GMAKEDEPEND0 GMAKEDEPEND1 GMAKEDEPEND2 LIBOBJS LTLIBOBJS MAKEINFO REMOVEHTMLTAGS INFOTOHTML'
+ac_subst_files=''
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -144,13 +349,6 @@ oldincludedir='/usr/include'
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
 ac_prev=
 for ac_option
 do
@@ -283,7 +481,7 @@ do
     with_fp=no ;;
 
   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
+  | --no-cr | --no-c | -n)
     no_create=yes ;;
 
   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
@@ -462,7 +660,7 @@ do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -474,18 +672,19 @@ do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
     [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;
   esac
 done
 
 # There might be people who depend on the old broken behavior: `$host'
 # used to hold the argument of --host etc.
+# FIXME: To remove some day.
 build=$build_alias
 host=$host_alias
 target=$target_alias
 
-# FIXME: should be removed in autoconf 3.0.
+# FIXME: To remove some day.
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
@@ -501,13 +700,23 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
 
 test "$silent" = yes && exec 6>/dev/null
 
+
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
+  ac_confdir=`(dirname "$0") 2>/dev/null ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$0" : 'X\(//\)[^/]' \| \
+         X"$0" : 'X\(//\)$' \| \
+         X"$0" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$0" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
   srcdir=$ac_confdir
   if test ! -r $srcdir/$ac_unique_file; then
     srcdir=..
@@ -517,13 +726,16 @@ else
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
    { (exit 1); exit 1; }; }
   else
-    { echo "$as_me: error: cannot find sources in $srcdir" >&2
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
   fi
 fi
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+   { (exit 1); exit 1; }; }
 srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
 ac_env_build_alias_set=${build_alias+set}
 ac_env_build_alias_value=$build_alias
@@ -564,7 +776,7 @@ ac_cv_env_CPP_value=$CPP
 if test "$ac_init_help" = "long"; then
   # 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 <<EOF
+  cat <<_ACEOF
 \`configure' configures this package to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -585,9 +797,9 @@ Configuration:
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
-EOF
+_ACEOF
 
-  cat <<EOF
+  cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
                           [$ac_default_prefix]
@@ -614,15 +826,15 @@ Fine tuning of the installation directories:
   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
   --infodir=DIR          info documentation [PREFIX/info]
   --mandir=DIR           man documentation [PREFIX/man]
-EOF
+_ACEOF
 
-  cat <<\EOF
-EOF
+  cat <<\_ACEOF
+_ACEOF
 fi
 
 if test -n "$ac_init_help"; then
 
-  cat <<\EOF
+  cat <<\_ACEOF
 
 Some influential environment variables:
   CC          C compiler command
@@ -636,40 +848,60 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-EOF
+_ACEOF
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   ac_popdir=`pwd`
-  for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
-    cd $ac_subdir
-    # A "../" for each directory in /$ac_subdir.
-    ac_dots=`echo $ac_subdir |
-             sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
-
-    case $srcdir in
-    .) # No --srcdir option.  We are building in place.
-      ac_sub_srcdir=$srcdir ;;
-    [\\/]* | ?:[\\/]* ) # Absolute path.
-      ac_sub_srcdir=$srcdir/$ac_subdir ;;
-    *) # Relative path.
-      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
-    esac
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d $ac_dir || continue
+    ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
 
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+    cd $ac_dir
     # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_sub_srcdir/configure.gnu; then
+    if test -f $ac_srcdir/configure.gnu; then
       echo
-      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_sub_srcdir/configure; then
+      $SHELL $ac_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_srcdir/configure; then
       echo
-      $SHELL $ac_sub_srcdir/configure  --help=recursive
-    elif test -f $ac_sub_srcdir/configure.ac ||
-           test -f $ac_sub_srcdir/configure.in; then
+      $SHELL $ac_srcdir/configure  --help=recursive
+    elif test -f $ac_srcdir/configure.ac ||
+           test -f $ac_srcdir/configure.in; then
       echo
       $ac_configure --help
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
     cd $ac_popdir
   done
@@ -677,31 +909,31 @@ fi
 
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
-  cat <<\EOF
+  cat <<\_ACEOF
 
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
-EOF
+_ACEOF
   exit 0
 fi
 exec 5>config.log
-cat >&5 <<EOF
+cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.  Invocation command line was
+generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
 
-EOF
+_ACEOF
 {
 cat <<_ASUNAME
-## ---------- ##
-## Platform.  ##
-## ---------- ##
+## --------- ##
+## Platform. ##
+## --------- ##
 
 hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
 uname -m = `(uname -m) 2>/dev/null || echo unknown`
@@ -720,51 +952,96 @@ hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
 
-PATH = $PATH
-
 _ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  echo "PATH: $as_dir"
+done
+
 } >&5
 
-cat >&5 <<EOF
-## ------------ ##
-## Core tests.  ##
-## ------------ ##
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
 
-EOF
 
 # Keep a trace of the command line.
 # Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
 # Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
 ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
 ac_sep=
-for ac_arg
+ac_must_keep_next=false
+for ac_pass in 1 2
 do
-  case $ac_arg in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
-    ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-    ac_sep=" " ;;
-  *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
-     ac_sep=" " ;;
-  esac
-  # Get rid of the leading space.
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    2)
+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+        ac_must_keep_next=false # Got value, back to normal.
+      else
+        case $ac_arg in
+          *=* | --config-cache | -C | -disable-* | --disable-* \
+          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+          | -with-* | --with-* | -without-* | --without-* | --x)
+            case "$ac_configure_args0 " in
+              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+            esac
+            ;;
+          -* ) ac_must_keep_next=true ;;
+        esac
+      fi
+      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+      # Get rid of the leading space.
+      ac_sep=" "
+      ;;
+    esac
+  done
 done
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
+# WARNING: Be sure not to use single quotes in there, as some shells,
+# such as our DU 5.0 friend, will then `close' the trap.
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
-  echo >&5
-  echo "## ----------------- ##" >&5
-  echo "## Cache variables.  ##" >&5
-  echo "## ----------------- ##" >&5
-  echo >&5
-  # The following way of writing the cache mishandles newlines in values,
+  {
+    echo
+
+    cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
 {
   (set) 2>&1 |
     case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
@@ -778,21 +1055,53 @@ trap 'exit_status=$?
         "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
       ;;
     esac;
-} >&5
-  sed "/^$/d" confdefs.h >conftest.log
-  if test -s conftest.log; then
-    echo >&5
-    echo "## ------------ ##" >&5
-    echo "## confdefs.h.  ##" >&5
-    echo "## ------------ ##" >&5
-    echo >&5
-    cat conftest.log >&5
-  fi
-  (echo; echo) >&5
-  test "$ac_signal" != 0 &&
-    echo "$as_me: caught signal $ac_signal" >&5
-  echo "$as_me: exit $exit_status" >&5
-  rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
+}
+    echo
+
+    cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=$`echo $ac_var`
+      echo "$ac_var='"'"'$ac_val'"'"'"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+## ------------- ##
+## Output files. ##
+## ------------- ##
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=$`echo $ac_var`
+        echo "$ac_var='"'"'$ac_val'"'"'"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+      echo
+      sed "/^$/d" confdefs.h | sort
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      echo "$as_me: caught signal $ac_signal"
+    echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core core.* *.core &&
+  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
      ' 0
 for ac_signal in 1 2 13 15; do
@@ -805,6 +1114,33 @@ rm -rf conftest* confdefs.h
 # AIX cpp loses on an empty file, so make sure it contains at least a newline.
 echo >confdefs.h
 
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+
 # Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
@@ -816,9 +1152,9 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:819: loading site script $ac_site_file" >&5
+    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
-    cat "$ac_site_file" >&5
+    sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
 done
@@ -827,7 +1163,7 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:830: loading cache $cache_file" >&5
+    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -835,7 +1171,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:838: creating cache $cache_file" >&5
+  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -851,42 +1187,42 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:854: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:858: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:864: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:866:   former value:  $ac_old_val" >&5
+        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:868:   current value: $ac_new_val" >&5
+        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
   esac
-  # Pass precious variables to config.status.  It doesn't matter if
-  # we pass some twice (in addition to the command line arguments).
+  # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
     *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val"
-       ;;
+      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:887: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:889: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -897,26 +1233,25 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-echo "#! $SHELL" >conftest.sh
-echo  "exit 0"   >>conftest.sh
-chmod +x conftest.sh
-if { (echo "$as_me:909: PATH=\".;.\"; conftest.sh") >&5
-  (PATH=".;."; conftest.sh) 2>&5
-  ac_status=$?
-  echo "$as_me:912: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  ac_path_separator=';'
-else
-  ac_path_separator=:
-fi
-PATH_SEPARATOR="$ac_path_separator"
-rm -f conftest.sh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -926,7 +1261,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:929: checking for $ac_word" >&5
+echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -934,25 +1269,28 @@ else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:944: found $ac_dir/$ac_word" >&5
-break
+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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
 done
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:952: result: $CC" >&5
+  echo "$as_me:$LINENO: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:955: result: no" >&5
+  echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -961,7 +1299,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:964: checking for $ac_word" >&5
+echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -969,25 +1307,28 @@ else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:979: found $ac_dir/$ac_word" >&5
-break
+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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
 done
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:987: result: $ac_ct_CC" >&5
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:990: result: no" >&5
+  echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1000,7 +1341,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1003: checking for $ac_word" >&5
+echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1008,25 +1349,28 @@ else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1018: found $ac_dir/$ac_word" >&5
-break
+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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
 done
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1026: result: $CC" >&5
+  echo "$as_me:$LINENO: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1029: result: no" >&5
+  echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1035,7 +1379,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1038: checking for $ac_word" >&5
+echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1043,25 +1387,28 @@ else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1053: found $ac_dir/$ac_word" >&5
-break
+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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
 done
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1061: result: $ac_ct_CC" >&5
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1064: result: no" >&5
+  echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1074,7 +1421,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1077: checking for $ac_word" >&5
+echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1083,19 +1430,22 @@ else
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
   ac_prog_rejected=no
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-  ac_prog_rejected=yes
-  continue
-fi
-ac_cv_prog_CC="cc"
-echo "$as_me:1097: found $ac_dir/$ac_word" >&5
-break
+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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
 done
 
 if test $ac_prog_rejected = yes; then
@@ -1107,19 +1457,17 @@ if test $ac_prog_rejected = yes; then
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    set dummy "$ac_dir/$ac_word" ${1+"$@"}
-    shift
-    ac_cv_prog_CC="$@"
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
   fi
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1119: result: $CC" >&5
+  echo "$as_me:$LINENO: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1122: result: no" >&5
+  echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1130,7 +1478,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1133: checking for $ac_word" >&5
+echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1138,25 +1486,28 @@ else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1148: found $ac_dir/$ac_word" >&5
-break
+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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
 done
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1156: result: $CC" >&5
+  echo "$as_me:$LINENO: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1159: result: no" >&5
+  echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1169,7 +1520,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1172: checking for $ac_word" >&5
+echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1177,25 +1528,28 @@ else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1187: found $ac_dir/$ac_word" >&5
-break
+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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
 done
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1195: result: $ac_ct_CC" >&5
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1198: result: no" >&5
+  echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1207,33 +1561,40 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1210: error: no acceptable cc found in \$PATH" >&5
-echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:1215:" \
+echo "$as_me:$LINENO:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1218: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1221: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1223: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1226: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1228: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1231: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1235 "configure"
-#include "confdefs.h"
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
 int
 main ()
@@ -1244,100 +1605,120 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe"
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1251: checking for C compiler default output" >&5
+echo "$as_me:$LINENO: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1254: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1257: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
 # resort.
-for ac_file in `ls a.exe conftest.exe 2>/dev/null;
-                ls a.out conftest 2>/dev/null;
-                ls a.* conftest.* 2>/dev/null`; do
+
+# Be careful to initialize this variable, since it used to be cached.
+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+ac_cv_exeext=
+# b.out is created by i960 compilers.
+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+do
+  test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
-    a.out ) # We found the default executable, but exeext='' is most
-            # certainly right.
-            break;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
-          export ac_cv_exeext
-          break;;
-    * ) break;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+        ;;
+    conftest.$ac_ext )
+        # This is the source file.
+        ;;
+    [ab].out )
+        # We found the default executable, but exeext='' is most
+        # certainly right.
+        break;;
+    *.* )
+        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+        # FIXME: I believe we export ac_cv_exeext for Libtool,
+        # but it would be cool to find out if it's true.  Does anybody
+        # maintain Libtool? --akim.
+        export ac_cv_exeext
+        break;;
+    * )
+        break;;
   esac
 done
 else
   echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-{ { echo "$as_me:1280: error: C compiler cannot create executables" >&5
-echo "$as_me: error: C compiler cannot create executables" >&2;}
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+See \`config.log' for more details." >&5
+echo "$as_me: error: C compiler cannot create executables
+See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1286: result: $ac_file" >&5
+echo "$as_me:$LINENO: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1291: checking whether the C compiler works" >&5
+echo "$as_me:$LINENO: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1300: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1307: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'." >&5
+	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
 echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'." >&2;}
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
     fi
   fi
 fi
-echo "$as_me:1315: result: yes" >&5
+echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-rm -f a.out a.exe conftest$ac_cv_exeext
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1322: checking whether we are cross compiling" >&5
+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1324: result: $cross_compiling" >&5
+echo "$as_me:$LINENO: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1327: checking for executable suffix" >&5
-echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1329: \"$ac_link\"") >&5
+echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1332: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
 # `rm'.
-for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
           export ac_cv_exeext
           break;;
@@ -1345,26 +1726,32 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1348: error: cannot compute EXEEXT: cannot compile and link" >&5
-echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:1354: result: $ac_cv_exeext" >&5
+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1360: checking for object suffix" >&5
-echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1366 "configure"
-#include "confdefs.h"
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
 int
 main ()
@@ -1375,40 +1762,47 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1378: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1381: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
   echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-{ { echo "$as_me:1393: error: cannot compute OBJEXT: cannot compile" >&5
-echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:1400: result: $ac_cv_objext" >&5
+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1404: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1410 "configure"
-#include "confdefs.h"
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
 int
 main ()
@@ -1422,41 +1816,46 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1425: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1428: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1434: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 ac_compiler_gnu=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1446: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:1452: checking whether $CC accepts -g" >&5
+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1458 "configure"
-#include "confdefs.h"
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
 int
 main ()
@@ -1467,26 +1866,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1473: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1479: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1489: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -1503,7 +1903,103 @@ else
     CFLAGS=
   fi
 fi
-# Some people use a C++ compiler to compile C.  Since we use `exit',
+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_prog_cc_stdc=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX			-qlanglvl=ansi
+# Ultrix and OSF/1	-std1
+# HP-UX 10.20 and later	-Ae
+# HP-UX older versions	-Aa -D_HPUX_SOURCE
+# SVR4			-Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_stdc=$ac_arg
+break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext
+done
+rm -f conftest.$ac_ext conftest.$ac_objext
+CC=$ac_save_CC
+
+fi
+
+case "x$ac_cv_prog_cc_stdc" in
+  x|xno)
+    echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+  *)
+    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+    CC="$CC $ac_cv_prog_cc_stdc" ;;
+esac
+
+# Some people use a C++ compiler to compile C.  Since we use `exit',
 # in C++ we need to declare it.  In case someone uses the same compiler
 # for both compiling C and C++ we need to have the C++ compiler decide
 # the declaration of exit, since it's the most demanding environment.
@@ -1513,16 +2009,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1516: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1519: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1522: \"$ac_try\"") >&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1525: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -1534,8 +2030,12 @@ if { (eval echo "$as_me:1516: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1537 "configure"
-#include "confdefs.h"
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 #include <stdlib.h>
 $ac_declaration
 int
@@ -1547,27 +2047,32 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1550: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1553: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1559: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1569 "configure"
-#include "confdefs.h"
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 $ac_declaration
 int
 main ()
@@ -1578,21 +2083,22 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1581: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1584: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1590: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
   echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 done
@@ -1605,7 +2111,8 @@ fi
 
 else
   echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
@@ -1617,7 +2124,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:1620: checking for $ac_word" >&5
+echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1625,25 +2132,28 @@ else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:1635: found $ac_dir/$ac_word" >&5
-break
+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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
 done
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:1643: result: $RANLIB" >&5
+  echo "$as_me:$LINENO: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:1646: result: no" >&5
+  echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1652,7 +2162,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:1655: checking for $ac_word" >&5
+echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1660,15 +2170,18 @@ else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:1670: found $ac_dir/$ac_word" >&5
-break
+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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
 done
 
   test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
@@ -1676,10 +2189,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:1679: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:1682: result: no" >&5
+  echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1705,7 +2218,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1708: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1725,43 +2238,48 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:1728: checking for a BSD compatible install" >&5
-echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-    ac_save_IFS=$IFS; IFS=$ac_path_separator
-  for ac_dir in $PATH; do
-    IFS=$ac_save_IFS
-    # Account for people who put trailing slashes in PATH elements.
-    case $ac_dir/ in
-    / | ./ | .// | /cC/* \
-    | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
-    | /usr/ucb/* ) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if $as_executable_p "$ac_dir/$ac_prog"; then
-	  if test $ac_prog = install &&
-            grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /cC/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+          if test $ac_prog = install &&
+            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # AIX install.  It has an incompatible calling convention.
+            :
+          elif test $ac_prog = install &&
+            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # program-specific install script used by HP pwplus--don't use.
+            :
+          else
+            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+            break 3
+          fi
+        fi
       done
-      ;;
-    esac
-  done
+    done
+    ;;
+esac
+done
+
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -1774,7 +2292,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:1777: result: $INSTALL" >&5
+echo "$as_me:$LINENO: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -1785,16 +2303,19 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
+
 if test x$GCC = xyes; then
 	CFLAGS="$CFLAGS -Wall"
 fi
 
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:1797: checking how to run the C preprocessor" >&5
+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -1812,21 +2333,31 @@ for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1818 "configure"
-#include "confdefs.h"
-#include <assert.h>
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:1823: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:1829: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1840,7 +2371,8 @@ if test -z "$ac_cpp_err"; then
   :
 else
   echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Broken: fails on valid input.
 continue
 fi
@@ -1849,17 +2381,21 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1852 "configure"
-#include "confdefs.h"
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:1856: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:1862: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1874,7 +2410,8 @@ if test -z "$ac_cpp_err"; then
 continue
 else
   echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -1896,28 +2433,38 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:1899: result: $CPP" >&5
+echo "$as_me:$LINENO: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1909 "configure"
-#include "confdefs.h"
-#include <assert.h>
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:1914: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:1920: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1931,7 +2478,8 @@ if test -z "$ac_cpp_err"; then
   :
 else
   echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Broken: fails on valid input.
 continue
 fi
@@ -1940,17 +2488,21 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1943 "configure"
-#include "confdefs.h"
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:1947: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:1953: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1965,7 +2517,8 @@ if test -z "$ac_cpp_err"; then
 continue
 else
   echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -1978,8 +2531,10 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:1981: error: C preprocessor \"$CPP\" fails sanity check" >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1989,23 +2544,309 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-echo "$as_me:1992: checking for getopt.h" >&5
+
+echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+if test "${ac_cv_prog_egrep+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
+    fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ EGREP=$ac_cv_prog_egrep
+
+
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+if test "${ac_cv_header_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_header_stdc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_header_stdc=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then
+  :
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+                   (('a' <= (c) && (c) <= 'i') \
+                     || ('j' <= (c) && (c) <= 'r') \
+                     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+        || toupper (i) != TOUPPER (i))
+      exit(2);
+  exit (0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+                  inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+if test "${ac_cv_header_getopt_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for getopt.h" >&5
 echo $ECHO_N "checking for getopt.h... $ECHO_C" >&6
 if test "${ac_cv_header_getopt_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_getopt_h" >&5
+echo "${ECHO_T}$ac_cv_header_getopt_h" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 1998 "configure"
-#include "confdefs.h"
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking getopt.h usability" >&5
+echo $ECHO_N "checking getopt.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <getopt.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking getopt.h presence" >&5
+echo $ECHO_N "checking getopt.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 #include <getopt.h>
 _ACEOF
-if { (eval echo "$as_me:2002: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2008: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2016,39 +2857,132 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  ac_cv_header_getopt_h=yes
+  ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_header_getopt_h=no
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
 fi
 rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: getopt.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: getopt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: getopt.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: getopt.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: getopt.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: getopt.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: getopt.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: getopt.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: getopt.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: getopt.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for getopt.h" >&5
+echo $ECHO_N "checking for getopt.h... $ECHO_C" >&6
+if test "${ac_cv_header_getopt_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_getopt_h=$ac_header_preproc
 fi
-echo "$as_me:2027: result: $ac_cv_header_getopt_h" >&5
+echo "$as_me:$LINENO: result: $ac_cv_header_getopt_h" >&5
 echo "${ECHO_T}$ac_cv_header_getopt_h" >&6
+
+fi
 if test $ac_cv_header_getopt_h = yes; then
   :
 else
   NO_GETOPT=-DNO_GETOPT;GETOPT_O=compat/getopt.o
 fi
 
-echo "$as_me:2035: checking for paper.h" >&5
+
+if test "${ac_cv_header_paper_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for paper.h" >&5
 echo $ECHO_N "checking for paper.h... $ECHO_C" >&6
 if test "${ac_cv_header_paper_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_paper_h" >&5
+echo "${ECHO_T}$ac_cv_header_paper_h" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 2041 "configure"
-#include "confdefs.h"
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking paper.h usability" >&5
+echo $ECHO_N "checking paper.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <paper.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking paper.h presence" >&5
+echo $ECHO_N "checking paper.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 #include <paper.h>
 _ACEOF
-if { (eval echo "$as_me:2045: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2051: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2059,42 +2993,136 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  ac_cv_header_paper_h=yes
+  ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_header_paper_h=no
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
 fi
 rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: paper.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: paper.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: paper.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: paper.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: paper.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: paper.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: paper.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: paper.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: paper.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: paper.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for paper.h" >&5
+echo $ECHO_N "checking for paper.h... $ECHO_C" >&6
+if test "${ac_cv_header_paper_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_paper_h=$ac_header_preproc
 fi
-echo "$as_me:2070: result: $ac_cv_header_paper_h" >&5
+echo "$as_me:$LINENO: result: $ac_cv_header_paper_h" >&5
 echo "${ECHO_T}$ac_cv_header_paper_h" >&6
+
+fi
 if test $ac_cv_header_paper_h = yes; then
   LIBPAPER=-lpaper
 else
   NO_LIBPAPER=-DNO_LIBPAPER
 fi
 
+
+
 for ac_header in unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:2081: checking for $ac_header" >&5
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 2087 "configure"
-#include "confdefs.h"
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:2091: \"$ac_cpp conftest.$ac_ext\"") >&5
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2097: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2105,81 +3133,142 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$as_ac_Header=yes"
+  ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  eval "$as_ac_Header=no"
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
 fi
 rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"
 fi
-echo "$as_me:2116: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<EOF
+  cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-EOF
+_ACEOF
 
 fi
+
 done
 
-echo "$as_me:2126: checking for strerror" >&5
+
+echo "$as_me:$LINENO: checking for strerror" >&5
 echo $ECHO_N "checking for strerror... $ECHO_C" >&6
 if test "${ac_cv_func_strerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2132 "configure"
-#include "confdefs.h"
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char strerror (); below.  */
-#include <assert.h>
+    which can conflict with char strerror (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
+{
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
 char strerror ();
-char (*f) ();
-
-int
-main ()
-{
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_strerror) || defined (__stub___strerror)
 choke me
 #else
-f = strerror;
+char (*f) () = strerror;
+#endif
+#ifdef __cplusplus
+}
 #endif
 
+int
+main ()
+{
+return f != strerror;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2163: \"$ac_link\"") >&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2166: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2172: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_strerror=yes
 else
   echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 ac_cv_func_strerror=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:2182: result: $ac_cv_func_strerror" >&5
+echo "$as_me:$LINENO: result: $ac_cv_func_strerror" >&5
 echo "${ECHO_T}$ac_cv_func_strerror" >&6
 if test $ac_cv_func_strerror = yes; then
   :
@@ -2187,80 +3276,96 @@ else
   NO_STRERROR=-DNO_STRERROR
 fi
 
+
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:2193: checking for $ac_func" >&5
+echo "$as_me:$LINENO: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2199 "configure"
-#include "confdefs.h"
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
+{
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
 char $ac_func ();
-char (*f) ();
-
-int
-main ()
-{
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-f = $ac_func;
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
 #endif
 
+int
+main ()
+{
+return f != $ac_func;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2230: \"$ac_link\"") >&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2233: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2239: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:2249: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<EOF
+  cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-EOF
+_ACEOF
 
 fi
 done
 
-echo "$as_me:2259: checking \"for gmake\"" >&5
+
+echo "$as_me:$LINENO: checking \"for gmake\"" >&5
 echo $ECHO_N "checking \"for gmake\"... $ECHO_C" >&6
 GMAKE=no
 ${MAKE=make} --version 2> /dev/null | grep GNU > /dev/null && GMAKE=yes
-echo "$as_me:2263: result: $GMAKE" >&5
+echo "$as_me:$LINENO: result: $GMAKE" >&5
 echo "${ECHO_T}$GMAKE" >&6
 if test "$GMAKE" = "yes"; then
 	GMAKEDEPEND0='ifeq (.depend,$(wildcard .depend))'
@@ -2268,11 +3373,11 @@ if test "$GMAKE" = "yes"; then
 	GMAKEDEPEND2='endif'
 fi
 
-echo "$as_me:2271: checking \"if makeinfo can output html\"" >&5
+echo "$as_me:$LINENO: checking \"if makeinfo can output html\"" >&5
 echo $ECHO_N "checking \"if makeinfo can output html\"... $ECHO_C" >&6
 MAKEINFOHTML=no
 ${MAKEINFO=makeinfo} --help | grep .--html > /dev/null && MAKEINFOHTML=yes
-echo "$as_me:2275: result: $MAKEINFOHTML" >&5
+echo "$as_me:$LINENO: result: $MAKEINFOHTML" >&5
 echo "${ECHO_T}$MAKEINFOHTML" >&6
 if test "$MAKEINFOHTML" = "yes"; then
    REMOVEHTMLTAGS="cat"
@@ -2282,7 +3387,17 @@ else
    INFOTOHTML="perl texi2html -monolithic"
 fi
 
-ac_config_files="$ac_config_files Makefile"
+
+
+
+
+
+
+
+
+
+
+          ac_config_files="$ac_config_files Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -2293,7 +3408,7 @@ cat >confcache <<\_ACEOF
 # config.status only pays attention to the cache file if you give it
 # the --recheck option to rerun configure.
 #
-# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
 # loading this file, other *unset* `ac_cv_foo' will be assigned the
 # following values.
 
@@ -2328,7 +3443,7 @@ _ACEOF
      t end
      /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
      : end' >>confcache
-if cmp -s $cache_file confcache; then :; else
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
   if test -w $cache_file; then
     test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
     cat confcache >$cache_file
@@ -2364,7 +3479,7 @@ fi
 # If the first sed substitution is executed (which looks for macros that
 # take arguments), then we branch to the quote section.  Otherwise,
 # look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\EOF
+cat >confdef2opt.sed <<\_ACEOF
 t clear
 : clear
 s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
@@ -2378,7 +3493,7 @@ s,\[,\\&,g
 s,\],\\&,g
 s,\$,$$,g
 p
-EOF
+_ACEOF
 # We use echo to avoid assuming a particular line-breaking character.
 # The extra dot is to prevent the shell from consuming trailing
 # line-breaks from the sub-command output.  A line-break within
@@ -2389,35 +3504,228 @@ ac_LF_and_DOT=`echo; echo .`
 DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
 rm -f confdef2opt.sed
 
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_i=`echo "$ac_i" |
+         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+  # 2. Add them.
+  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:2395: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
-# Generated automatically by configure.
+# Generated by $as_me.
 # Run this file to recreate the current configuration.
 # Compiler output produced by configure, useful for debugging
 # configure, is in config.log if it exists.
 
 debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
-ac_cs_invocation="\$0 \$@"
-
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
 
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    $as_unset $as_var
+  fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
 # Name of the executable.
-as_me=`echo "$0" |sed 's,.*[\\/],,'`
+as_me=`$as_basename "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+
+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  chmod +x $as_me.lineno ||
+    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
 
 if expr a : '\(a\)' >/dev/null 2>&1; then
   as_expr=expr
@@ -2443,24 +3751,20 @@ else
 fi
 rm -f conf$$ conf$$.exe conf$$.file
 
-as_executable_p="test -f"
-
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-  as_unset=unset
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
 else
-  as_unset=false
+  as_mkdir_p=false
 fi
 
-# NLS nuisances.
-$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
-$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
-$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
-$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
-$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
-$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
-$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
-$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+as_executable_p="test -f"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+
 
 # IFS
 # We need space, tab and new line, in precisely that order.
@@ -2469,10 +3773,34 @@ as_nl='
 IFS=" 	$as_nl"
 
 # CDPATH.
-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+$as_unset CDPATH
 
 exec 6>&1
 
+# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.  Logging --version etc. is OK.
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+} >&5
+cat >&5 <<_CSEOF
+
+This file was extended by $as_me, which was
+generated by GNU Autoconf 2.57.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+_CSEOF
+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+echo >&5
 _ACEOF
 
 # Files that config.status was made for.
@@ -2492,7 +3820,7 @@ if test -n "$ac_config_commands"; then
   echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
 fi
 
-cat >>$CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<\_ACEOF
 
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
@@ -2502,6 +3830,7 @@ Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number, then exit
+  -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
@@ -2511,12 +3840,12 @@ Configuration files:
 $config_files
 
 Report bugs to <bug-autoconf@gnu.org>."
-EOF
+_ACEOF
 
-cat >>$CONFIG_STATUS <<EOF
+cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52,
+configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -2525,9 +3854,9 @@ This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 srcdir=$srcdir
 INSTALL="$INSTALL"
-EOF
+_ACEOF
 
-cat >>$CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<\_ACEOF
 # If no file are specified by the user, then we need to provide default
 # value.  By we need to know if files were specified by the user.
 ac_need_defaults=:
@@ -2537,30 +3866,30 @@ do
   --*=*)
     ac_option=`expr "x$1" : 'x\([^=]*\)='`
     ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    shift
-    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
-    shift
+    ac_shift=:
+    ;;
+  -*)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
     ;;
-  -*);;
   *) # This is not an option, so the user has probably given explicit
      # arguments.
+     ac_option=$1
      ac_need_defaults=false;;
   esac
 
-  case $1 in
+  case $ac_option in
   # Handling of the options.
-EOF
-cat >>$CONFIG_STATUS <<EOF
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
-    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
-EOF
-cat >>$CONFIG_STATUS <<\EOF
+    ac_cs_recheck=: ;;
   --version | --vers* | -V )
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:2563: error: ambiguous option: $1
+    { { echo "$as_me:$LINENO: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -2570,16 +3899,19 @@ Try \`$0 --help' for more information." >&2;}
   --debug | --d* | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
-    shift
-    CONFIG_FILES="$CONFIG_FILES $1"
+    $ac_shift
+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
-    shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $1"
+    $ac_shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
     ac_need_defaults=false;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { { echo "$as_me:2582: error: unrecognized option: $1
+  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -2591,31 +3923,33 @@ Try \`$0 --help' for more information." >&2;}
   shift
 done
 
-exec 5>>config.log
-cat >&5 << _ACEOF
+ac_configure_extra_args=
 
-## ----------------------- ##
-## Running config.status.  ##
-## ----------------------- ##
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
 
-This file was extended by $as_me 2.52, executed with
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  > $ac_cs_invocation
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+if \$ac_cs_recheck; then
+  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+fi
 
 _ACEOF
-EOF
 
-cat >>$CONFIG_STATUS <<\EOF
+
+
+
+
+cat >>$CONFIG_STATUS <<\_ACEOF
 for ac_config_target in $ac_config_targets
 do
   case "$ac_config_target" in
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  *) { { echo "$as_me:2618: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -2629,6 +3963,9 @@ if $ac_need_defaults; then
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
 fi
 
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason to put it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
 # Create a temporary directory, and hook for its removal unless debugging.
 $debug ||
 {
@@ -2637,23 +3974,23 @@ $debug ||
 }
 
 # Create a (secure) tmp directory for tmp files.
-: ${TMPDIR=/tmp}
+
 {
-  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
+  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=$TMPDIR/cs$$-$RANDOM
+  tmp=./confstat$$-$RANDOM
   (umask 077 && mkdir $tmp)
 } ||
 {
-   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+   echo "$me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-EOF
+_ACEOF
 
-cat >>$CONFIG_STATUS <<EOF
+cat >>$CONFIG_STATUS <<_ACEOF
 
 #
 # CONFIG_FILES section.
@@ -2666,6 +4003,12 @@ if test -n "\$CONFIG_FILES"; then
   sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
    s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
 s,@SHELL@,$SHELL,;t t
+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
 s,@exec_prefix@,$exec_prefix,;t t
 s,@prefix@,$prefix,;t t
 s,@program_transform_name@,$program_transform_name,;t t
@@ -2681,19 +4024,13 @@ s,@includedir@,$includedir,;t t
 s,@oldincludedir@,$oldincludedir,;t t
 s,@infodir@,$infodir,;t t
 s,@mandir@,$mandir,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
 s,@build_alias@,$build_alias,;t t
 s,@host_alias@,$host_alias,;t t
 s,@target_alias@,$target_alias,;t t
+s,@DEFS@,$DEFS,;t t
 s,@ECHO_C@,$ECHO_C,;t t
 s,@ECHO_N@,$ECHO_N,;t t
 s,@ECHO_T@,$ECHO_T,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@DEFS@,$DEFS,;t t
 s,@LIBS@,$LIBS,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
@@ -2708,6 +4045,7 @@ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
 s,@CPP@,$CPP,;t t
+s,@EGREP@,$EGREP,;t t
 s,@GETOPT_O@,$GETOPT_O,;t t
 s,@NO_GETOPT@,$NO_GETOPT,;t t
 s,@NO_LIBPAPER@,$NO_LIBPAPER,;t t
@@ -2716,11 +4054,13 @@ s,@NO_STRERROR@,$NO_STRERROR,;t t
 s,@GMAKEDEPEND0@,$GMAKEDEPEND0,;t t
 s,@GMAKEDEPEND1@,$GMAKEDEPEND1,;t t
 s,@GMAKEDEPEND2@,$GMAKEDEPEND2,;t t
+s,@LIBOBJS@,$LIBOBJS,;t t
+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
 
-EOF
+_ACEOF
 
-  cat >>$CONFIG_STATUS <<\EOF
+  cat >>$CONFIG_STATUS <<\_ACEOF
   # Split the substitutions into bite-sized pieces for seds with
   # small command number limits, like on Digital OSF/1 and HP-UX.
   ac_max_sed_lines=48
@@ -2759,8 +4099,8 @@ EOF
   fi
 fi # test -n "$CONFIG_FILES"
 
-EOF
-cat >>$CONFIG_STATUS <<\EOF
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
 for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case $ac_file in
@@ -2774,7 +4114,8 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   esac
 
   # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
          X"$ac_file" : 'X\(//\)[^/]' \| \
          X"$ac_file" : 'X\(//\)$' \| \
          X"$ac_file" : 'X\(/\)' \| \
@@ -2785,60 +4126,84 @@ echo X"$ac_file" |
   	  /^X\(\/\/\)$/{ s//\1/; q; }
   	  /^X\(\/\).*/{ s//\1/; q; }
   	  s/.*/./; q'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    { case "$ac_dir" in
-  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
-  *)                      as_incr_dir=.;;
-esac
-as_dummy="$ac_dir"
-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
-  case $as_mkdir_dir in
-    # Skip DOS drivespec
-    ?:) as_incr_dir=$as_mkdir_dir ;;
-    *)
-      as_incr_dir=$as_incr_dir/$as_mkdir_dir
-      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
-    ;;
-  esac
-done; }
-
-    ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
+  { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
   else
-    ac_dir_suffix= ac_dots=
-  fi
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
 
-  case $srcdir in
-  .)  ac_srcdir=.
-      if test -z "$ac_dots"; then
-         ac_top_srcdir=.
-      else
-         ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
-      fi ;;
-  [\\/]* | ?:[\\/]* )
-      ac_srcdir=$srcdir$ac_dir_suffix;
-      ac_top_srcdir=$srcdir ;;
+  ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
   *) # Relative path.
-    ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_dots$srcdir ;;
-  esac
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
 
   case $INSTALL in
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_dots$INSTALL ;;
+  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:2833: creating $ac_file" >&5
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated automatically by config.status.  */
-  configure_input="Generated automatically from `echo $ac_file_in |
-                                                 sed 's,.*/,,'` by configure."
+  #    /* config.h.  Generated by config.status.  */
+  if test x"$ac_file" = x-; then
+    configure_input=
+  else
+    configure_input="$ac_file.  "
+  fi
+  configure_input=$configure_input"Generated from `echo $ac_file_in |
+                                     sed 's,.*/,,'` by configure."
 
   # First look for the input files in the build tree, otherwise in the
   # src tree.
@@ -2848,7 +4213,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:2851: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -2861,23 +4226,29 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:2864: error: cannot find input file: $f" >&5
+           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
       esac
     done` || { (exit 1); exit 1; }
-EOF
-cat >>$CONFIG_STATUS <<EOF
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
 $extrasub
-EOF
-cat >>$CONFIG_STATUS <<\EOF
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s,@configure_input@,$configure_input,;t t
 s,@srcdir@,$ac_srcdir,;t t
+s,@abs_srcdir@,$ac_abs_srcdir,;t t
 s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+s,@builddir@,$ac_builddir,;t t
+s,@abs_builddir@,$ac_abs_builddir,;t t
+s,@top_builddir@,$ac_top_builddir,;t t
+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
 s,@INSTALL@,$ac_INSTALL,;t t
 " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
   rm -f $tmp/stdin
@@ -2889,15 +4260,16 @@ s,@INSTALL@,$ac_INSTALL,;t t
   fi
 
 done
-EOF
+_ACEOF
 
-cat >>$CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<\_ACEOF
 
 { (exit 0); exit 0; }
-EOF
+_ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
 # Unfortunately, on DOS this fails, as config.log is still kept open
@@ -2908,15 +4280,23 @@ ac_clean_files=$ac_clean_files_save
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
   exec 5>/dev/null
-  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 
-ac_config_files="$ac_config_files doc/Makefile"
+
+
+
+
+
+          ac_config_files="$ac_config_files doc/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -2927,7 +4307,7 @@ cat >confcache <<\_ACEOF
 # config.status only pays attention to the cache file if you give it
 # the --recheck option to rerun configure.
 #
-# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
 # loading this file, other *unset* `ac_cv_foo' will be assigned the
 # following values.
 
@@ -2962,7 +4342,7 @@ _ACEOF
      t end
      /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
      : end' >>confcache
-if cmp -s $cache_file confcache; then :; else
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
   if test -w $cache_file; then
     test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
     cat confcache >$cache_file
@@ -2998,7 +4378,7 @@ fi
 # If the first sed substitution is executed (which looks for macros that
 # take arguments), then we branch to the quote section.  Otherwise,
 # look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\EOF
+cat >confdef2opt.sed <<\_ACEOF
 t clear
 : clear
 s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
@@ -3012,7 +4392,7 @@ s,\[,\\&,g
 s,\],\\&,g
 s,\$,$$,g
 p
-EOF
+_ACEOF
 # We use echo to avoid assuming a particular line-breaking character.
 # The extra dot is to prevent the shell from consuming trailing
 # line-breaks from the sub-command output.  A line-break within
@@ -3023,35 +4403,228 @@ ac_LF_and_DOT=`echo; echo .`
 DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
 rm -f confdef2opt.sed
 
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_i=`echo "$ac_i" |
+         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+  # 2. Add them.
+  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:3029: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
-# Generated automatically by configure.
+# Generated by $as_me.
 # Run this file to recreate the current configuration.
 # Compiler output produced by configure, useful for debugging
 # configure, is in config.log if it exists.
 
 debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
-ac_cs_invocation="\$0 \$@"
-
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
 
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    $as_unset $as_var
+  fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
 # Name of the executable.
-as_me=`echo "$0" |sed 's,.*[\\/],,'`
+as_me=`$as_basename "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+
+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  chmod +x $as_me.lineno ||
+    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
 
 if expr a : '\(a\)' >/dev/null 2>&1; then
   as_expr=expr
@@ -3077,24 +4650,20 @@ else
 fi
 rm -f conf$$ conf$$.exe conf$$.file
 
-as_executable_p="test -f"
-
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-  as_unset=unset
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
 else
-  as_unset=false
+  as_mkdir_p=false
 fi
 
-# NLS nuisances.
-$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
-$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
-$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
-$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
-$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
-$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
-$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
-$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+as_executable_p="test -f"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+
 
 # IFS
 # We need space, tab and new line, in precisely that order.
@@ -3103,10 +4672,34 @@ as_nl='
 IFS=" 	$as_nl"
 
 # CDPATH.
-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+$as_unset CDPATH
 
 exec 6>&1
 
+# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.  Logging --version etc. is OK.
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+} >&5
+cat >&5 <<_CSEOF
+
+This file was extended by $as_me, which was
+generated by GNU Autoconf 2.57.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+_CSEOF
+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+echo >&5
 _ACEOF
 
 # Files that config.status was made for.
@@ -3126,7 +4719,7 @@ if test -n "$ac_config_commands"; then
   echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
 fi
 
-cat >>$CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<\_ACEOF
 
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
@@ -3136,6 +4729,7 @@ Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number, then exit
+  -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
@@ -3145,12 +4739,12 @@ Configuration files:
 $config_files
 
 Report bugs to <bug-autoconf@gnu.org>."
-EOF
+_ACEOF
 
-cat >>$CONFIG_STATUS <<EOF
+cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52,
+configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -3159,9 +4753,9 @@ This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 srcdir=$srcdir
 INSTALL="$INSTALL"
-EOF
+_ACEOF
 
-cat >>$CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<\_ACEOF
 # If no file are specified by the user, then we need to provide default
 # value.  By we need to know if files were specified by the user.
 ac_need_defaults=:
@@ -3171,30 +4765,30 @@ do
   --*=*)
     ac_option=`expr "x$1" : 'x\([^=]*\)='`
     ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    shift
-    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
-    shift
+    ac_shift=:
+    ;;
+  -*)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
     ;;
-  -*);;
   *) # This is not an option, so the user has probably given explicit
      # arguments.
+     ac_option=$1
      ac_need_defaults=false;;
   esac
 
-  case $1 in
+  case $ac_option in
   # Handling of the options.
-EOF
-cat >>$CONFIG_STATUS <<EOF
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
-    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
-EOF
-cat >>$CONFIG_STATUS <<\EOF
+    ac_cs_recheck=: ;;
   --version | --vers* | -V )
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:3197: error: ambiguous option: $1
+    { { echo "$as_me:$LINENO: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -3204,16 +4798,19 @@ Try \`$0 --help' for more information." >&2;}
   --debug | --d* | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
-    shift
-    CONFIG_FILES="$CONFIG_FILES $1"
+    $ac_shift
+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
-    shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $1"
+    $ac_shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
     ac_need_defaults=false;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { { echo "$as_me:3216: error: unrecognized option: $1
+  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -3225,32 +4822,34 @@ Try \`$0 --help' for more information." >&2;}
   shift
 done
 
-exec 5>>config.log
-cat >&5 << _ACEOF
+ac_configure_extra_args=
 
-## ----------------------- ##
-## Running config.status.  ##
-## ----------------------- ##
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
 
-This file was extended by $as_me 2.52, executed with
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  > $ac_cs_invocation
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+if \$ac_cs_recheck; then
+  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+fi
 
 _ACEOF
-EOF
 
-cat >>$CONFIG_STATUS <<\EOF
+
+
+
+
+cat >>$CONFIG_STATUS <<\_ACEOF
 for ac_config_target in $ac_config_targets
 do
   case "$ac_config_target" in
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-  *) { { echo "$as_me:3253: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -3264,6 +4863,9 @@ if $ac_need_defaults; then
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
 fi
 
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason to put it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
 # Create a temporary directory, and hook for its removal unless debugging.
 $debug ||
 {
@@ -3272,23 +4874,23 @@ $debug ||
 }
 
 # Create a (secure) tmp directory for tmp files.
-: ${TMPDIR=/tmp}
+
 {
-  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
+  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=$TMPDIR/cs$$-$RANDOM
+  tmp=./confstat$$-$RANDOM
   (umask 077 && mkdir $tmp)
 } ||
 {
-   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+   echo "$me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-EOF
+_ACEOF
 
-cat >>$CONFIG_STATUS <<EOF
+cat >>$CONFIG_STATUS <<_ACEOF
 
 #
 # CONFIG_FILES section.
@@ -3301,6 +4903,12 @@ if test -n "\$CONFIG_FILES"; then
   sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
    s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
 s,@SHELL@,$SHELL,;t t
+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
 s,@exec_prefix@,$exec_prefix,;t t
 s,@prefix@,$prefix,;t t
 s,@program_transform_name@,$program_transform_name,;t t
@@ -3316,19 +4924,13 @@ s,@includedir@,$includedir,;t t
 s,@oldincludedir@,$oldincludedir,;t t
 s,@infodir@,$infodir,;t t
 s,@mandir@,$mandir,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
 s,@build_alias@,$build_alias,;t t
 s,@host_alias@,$host_alias,;t t
 s,@target_alias@,$target_alias,;t t
+s,@DEFS@,$DEFS,;t t
 s,@ECHO_C@,$ECHO_C,;t t
 s,@ECHO_N@,$ECHO_N,;t t
 s,@ECHO_T@,$ECHO_T,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@DEFS@,$DEFS,;t t
 s,@LIBS@,$LIBS,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
@@ -3343,6 +4945,7 @@ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
 s,@CPP@,$CPP,;t t
+s,@EGREP@,$EGREP,;t t
 s,@GETOPT_O@,$GETOPT_O,;t t
 s,@NO_GETOPT@,$NO_GETOPT,;t t
 s,@NO_LIBPAPER@,$NO_LIBPAPER,;t t
@@ -3351,14 +4954,16 @@ s,@NO_STRERROR@,$NO_STRERROR,;t t
 s,@GMAKEDEPEND0@,$GMAKEDEPEND0,;t t
 s,@GMAKEDEPEND1@,$GMAKEDEPEND1,;t t
 s,@GMAKEDEPEND2@,$GMAKEDEPEND2,;t t
+s,@LIBOBJS@,$LIBOBJS,;t t
+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 s,@MAKEINFO@,$MAKEINFO,;t t
 s,@REMOVEHTMLTAGS@,$REMOVEHTMLTAGS,;t t
 s,@INFOTOHTML@,$INFOTOHTML,;t t
 CEOF
 
-EOF
+_ACEOF
 
-  cat >>$CONFIG_STATUS <<\EOF
+  cat >>$CONFIG_STATUS <<\_ACEOF
   # Split the substitutions into bite-sized pieces for seds with
   # small command number limits, like on Digital OSF/1 and HP-UX.
   ac_max_sed_lines=48
@@ -3397,8 +5002,8 @@ EOF
   fi
 fi # test -n "$CONFIG_FILES"
 
-EOF
-cat >>$CONFIG_STATUS <<\EOF
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
 for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case $ac_file in
@@ -3412,7 +5017,8 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   esac
 
   # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
          X"$ac_file" : 'X\(//\)[^/]' \| \
          X"$ac_file" : 'X\(//\)$' \| \
          X"$ac_file" : 'X\(/\)' \| \
@@ -3423,60 +5029,84 @@ echo X"$ac_file" |
   	  /^X\(\/\/\)$/{ s//\1/; q; }
   	  /^X\(\/\).*/{ s//\1/; q; }
   	  s/.*/./; q'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    { case "$ac_dir" in
-  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
-  *)                      as_incr_dir=.;;
-esac
-as_dummy="$ac_dir"
-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
-  case $as_mkdir_dir in
-    # Skip DOS drivespec
-    ?:) as_incr_dir=$as_mkdir_dir ;;
-    *)
-      as_incr_dir=$as_incr_dir/$as_mkdir_dir
-      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
-    ;;
-  esac
-done; }
-
-    ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
+  { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
   else
-    ac_dir_suffix= ac_dots=
-  fi
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
 
-  case $srcdir in
-  .)  ac_srcdir=.
-      if test -z "$ac_dots"; then
-         ac_top_srcdir=.
-      else
-         ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
-      fi ;;
-  [\\/]* | ?:[\\/]* )
-      ac_srcdir=$srcdir$ac_dir_suffix;
-      ac_top_srcdir=$srcdir ;;
+  ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
   *) # Relative path.
-    ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_dots$srcdir ;;
-  esac
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
 
   case $INSTALL in
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_dots$INSTALL ;;
+  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:3471: creating $ac_file" >&5
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated automatically by config.status.  */
-  configure_input="Generated automatically from `echo $ac_file_in |
-                                                 sed 's,.*/,,'` by configure."
+  #    /* config.h.  Generated by config.status.  */
+  if test x"$ac_file" = x-; then
+    configure_input=
+  else
+    configure_input="$ac_file.  "
+  fi
+  configure_input=$configure_input"Generated from `echo $ac_file_in |
+                                     sed 's,.*/,,'` by configure."
 
   # First look for the input files in the build tree, otherwise in the
   # src tree.
@@ -3486,7 +5116,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:3489: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -3499,23 +5129,29 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:3502: error: cannot find input file: $f" >&5
+           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
       esac
     done` || { (exit 1); exit 1; }
-EOF
-cat >>$CONFIG_STATUS <<EOF
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
 $extrasub
-EOF
-cat >>$CONFIG_STATUS <<\EOF
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s,@configure_input@,$configure_input,;t t
 s,@srcdir@,$ac_srcdir,;t t
+s,@abs_srcdir@,$ac_abs_srcdir,;t t
 s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+s,@builddir@,$ac_builddir,;t t
+s,@abs_builddir@,$ac_abs_builddir,;t t
+s,@top_builddir@,$ac_top_builddir,;t t
+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
 s,@INSTALL@,$ac_INSTALL,;t t
 " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
   rm -f $tmp/stdin
@@ -3527,15 +5163,16 @@ s,@INSTALL@,$ac_INSTALL,;t t
   fi
 
 done
-EOF
+_ACEOF
 
-cat >>$CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<\_ACEOF
 
 { (exit 0); exit 0; }
-EOF
+_ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
 # Unfortunately, on DOS this fails, as config.log is still kept open
@@ -3546,11 +5183,15 @@ ac_clean_files=$ac_clean_files_save
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
   exec 5>/dev/null
-  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 
+
diff --git a/glabels2/po/cs.po b/glabels2/po/cs.po
index 4afff126..f11f85df 100644
--- a/glabels2/po/cs.po
+++ b/glabels2/po/cs.po
@@ -3,11 +3,10 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/commands.c:361
 msgid ""
 msgstr ""
 "Project-Id-Version: Glabels\n"
-"POT-Creation-Date: 2003-06-22 01:12-0400\n"
+"POT-Creation-Date: 2003-11-01 19:24-0500\n"
 "PO-Revision-Date: 2003-04-04 17:21--100\n"
 "Last-Translator: David Makovský (Yakeen) <yakeen@sannyas-on.net>\n"
 "Language-Team: cs <cs@li.org>\n"
@@ -59,534 +58,610 @@ msgstr "Zarovnat objekty svisle na střed"
 msgid "Bar_code"
 msgstr "Čárový _kód"
 
-#: src/glabels-ui.xml.h:12 src/stock.c:70
+#: src/glabels-ui.xml.h:12
+msgid "Bold"
+msgstr ""
+
+#: src/glabels-ui.xml.h:13 src/stock.c:70
 msgid "Bring to _Front"
 msgstr "Vynést dopředu"
 
-#: src/glabels-ui.xml.h:13
+#: src/glabels-ui.xml.h:14
+#, fuzzy
+msgid "Center align"
+msgstr "Nastřed"
+
+#: src/glabels-ui.xml.h:15
 msgid "Center objects to horizontal label center"
 msgstr "Vycentrovat objekty vodorovně na střed etikety"
 
-#: src/glabels-ui.xml.h:14
+#: src/glabels-ui.xml.h:16
 msgid "Center objects to vertical label center"
 msgstr "Vycentrovat objekty svisle na střed etikety"
 
-#: src/glabels-ui.xml.h:15
+#: src/glabels-ui.xml.h:17
 msgid "Change the visibility of markup lines in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:16
+#: src/glabels-ui.xml.h:18
 msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:17
+#: src/glabels-ui.xml.h:19
 msgid "Change the visibility of the grid in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:18
+#: src/glabels-ui.xml.h:20
 msgid "Change the visibility of the main toolbar in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:19
+#: src/glabels-ui.xml.h:21
 msgid "Close"
 msgstr "Zavřít"
 
-#: src/glabels-ui.xml.h:20
+#: src/glabels-ui.xml.h:22
 msgid "Close the current file"
 msgstr "Zavřít tento soubor"
 
-#: src/glabels-ui.xml.h:21
+#: src/glabels-ui.xml.h:23
 msgid "Configure the application"
 msgstr "Konfigurace aplikace"
 
-#: src/glabels-ui.xml.h:22
+#: src/glabels-ui.xml.h:24
 msgid "Contents"
 msgstr "Obsah"
 
-#: src/glabels-ui.xml.h:23
+#: src/glabels-ui.xml.h:25
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: src/glabels-ui.xml.h:24
+#: src/glabels-ui.xml.h:26
 msgid "Copy the selection"
 msgstr "Kopírovat vybrané"
 
-#: src/glabels-ui.xml.h:25
+#: src/glabels-ui.xml.h:27
 msgid "Create a new document"
 msgstr "Vytvořit nový dokument"
 
-#: src/glabels-ui.xml.h:26
+#: src/glabels-ui.xml.h:28
 msgid "Create barcode object"
 msgstr "Vložit čárový kód"
 
-#: src/glabels-ui.xml.h:27
+#: src/glabels-ui.xml.h:29
 msgid "Create box/rectangle object"
 msgstr "Vytvořit čtverec/obdélník"
 
-#: src/glabels-ui.xml.h:28
+#: src/glabels-ui.xml.h:30
 msgid "Create ellipse/circle object"
 msgstr "Vytvořit elipsu/kruh"
 
-#: src/glabels-ui.xml.h:29
+#: src/glabels-ui.xml.h:31
 msgid "Create image object"
 msgstr "Vložit obrázek"
 
-#: src/glabels-ui.xml.h:30
+#: src/glabels-ui.xml.h:32
 msgid "Create line object"
 msgstr "Vložit čáru"
 
-#: src/glabels-ui.xml.h:31
+#: src/glabels-ui.xml.h:33
 msgid "Create text object"
 msgstr "Vložit text"
 
-#: src/glabels-ui.xml.h:32
+#: src/glabels-ui.xml.h:34
 msgid "Cu_t"
 msgstr "Vyjmout"
 
-#: src/glabels-ui.xml.h:33
+#: src/glabels-ui.xml.h:35
 msgid "Customize"
 msgstr "Přizpůsobit"
 
-#: src/glabels-ui.xml.h:34
+#: src/glabels-ui.xml.h:36
 msgid "Customize Drawing Toolbar"
 msgstr "Přizpůsobit panel kreslení"
 
-#: src/glabels-ui.xml.h:35
+#: src/glabels-ui.xml.h:37
 msgid "Customize Main Toolbar"
 msgstr "Přizpůsobit hlavní panel"
 
-#: src/glabels-ui.xml.h:36
+#: src/glabels-ui.xml.h:38
 msgid "Customize toolbars"
 msgstr "Přizpůsobit panely"
 
-#: src/glabels-ui.xml.h:37
+#: src/glabels-ui.xml.h:39
 msgid "Cut"
 msgstr "Vyjmout"
 
-#: src/glabels-ui.xml.h:38
+#: src/glabels-ui.xml.h:40
 msgid "Cut the selection"
 msgstr "Vyjmout označené"
 
-#: src/glabels-ui.xml.h:39
+#: src/glabels-ui.xml.h:41
 msgid "Decrease magnification"
 msgstr "Snížit zvětšení"
 
-#: src/glabels-ui.xml.h:40
+#: src/glabels-ui.xml.h:42
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/glabels-ui.xml.h:41
+#: src/glabels-ui.xml.h:43
 msgid "Delete the selected objects"
 msgstr "Smazat vybrané objekty"
 
-#: src/glabels-ui.xml.h:42
+#: src/glabels-ui.xml.h:44
 msgid "Drawing toolbar"
 msgstr "Panl kreslení"
 
-#: src/glabels-ui.xml.h:43
+#: src/glabels-ui.xml.h:45
 msgid "Dump XML"
 msgstr "Vypsat XML"
 
-#: src/glabels-ui.xml.h:44
+#: src/glabels-ui.xml.h:46
 msgid "Dump the UI Xml description"
 msgstr "Vypsat popis UI v XML"
 
-#: src/glabels-ui.xml.h:45
+#: src/glabels-ui.xml.h:47
 msgid "Edit merge properties"
 msgstr "Editace nastavení sloučení"
 
-#: src/glabels-ui.xml.h:46
+#: src/glabels-ui.xml.h:48
 msgid "Edit object properties"
 msgstr "Editace nastavení sloučení"
 
-#: src/glabels-ui.xml.h:47 src/stock.c:74
+#: src/glabels-ui.xml.h:49 src/stock.c:84
+msgid "Fill color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:50 src/stock.c:74
 msgid "Flip _Horizontally"
 msgstr "Převrátit _vodorovně"
 
-#: src/glabels-ui.xml.h:48 src/stock.c:75
+#: src/glabels-ui.xml.h:51 src/stock.c:75
 msgid "Flip _Vertically"
 msgstr "Převrátit _svisle"
 
-#: src/glabels-ui.xml.h:49
+#: src/glabels-ui.xml.h:52
 msgid "Flip object horizontally"
 msgstr "Převrátit objekt vodorovně"
 
-#: src/glabels-ui.xml.h:50
+#: src/glabels-ui.xml.h:53
 msgid "Flip object vertically"
 msgstr "Převrátit objekt svisle"
 
-#: src/glabels-ui.xml.h:51
+#: src/glabels-ui.xml.h:54
+msgid "Font name"
+msgstr ""
+
+#: src/glabels-ui.xml.h:55
+#, fuzzy
+msgid "Font selector"
+msgstr "Kopírovat vybrané"
+
+#: src/glabels-ui.xml.h:56
+msgid "Font size"
+msgstr ""
+
+#: src/glabels-ui.xml.h:57
 msgid "Icon and _Text"
 msgstr "Ikony a text"
 
-#: src/glabels-ui.xml.h:52
+#: src/glabels-ui.xml.h:58
 msgid "Increase magnification"
 msgstr "Zvýšit zvětšení"
 
-#: src/glabels-ui.xml.h:53 src/stock.c:82 src/stock.c:83
+#: src/glabels-ui.xml.h:59
+msgid "Italic"
+msgstr ""
+
+#: src/glabels-ui.xml.h:60 src/stock.c:82 src/stock.c:83
 msgid "Label Ce_nter"
 msgstr "Střed etikety"
 
-#: src/glabels-ui.xml.h:54
+#: src/glabels-ui.xml.h:61
+msgid "Left align"
+msgstr ""
+
+#: src/glabels-ui.xml.h:62 src/stock.c:85
+msgid "Line color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:63
+msgid "Line width"
+msgstr ""
+
+#: src/glabels-ui.xml.h:64
 msgid "Lower object to bottom"
 msgstr "Poslat objekt dozadu"
 
-#: src/glabels-ui.xml.h:55
+#: src/glabels-ui.xml.h:65
 msgid "M_arkup"
 msgstr "Ohraničení"
 
-#: src/glabels-ui.xml.h:56
+#: src/glabels-ui.xml.h:66
 msgid "Main toolbar"
 msgstr "Hlavní panel"
 
-#: src/glabels-ui.xml.h:57
+#: src/glabels-ui.xml.h:67
 msgid "Markup"
 msgstr "Ohraničení"
 
-#: src/glabels-ui.xml.h:58
+#: src/glabels-ui.xml.h:68
 msgid "New"
 msgstr "Nový"
 
-#: src/glabels-ui.xml.h:59
+#: src/glabels-ui.xml.h:69
 msgid "Object _Properties..."
 msgstr "Možnosti objektu"
 
-#: src/glabels-ui.xml.h:60
+#: src/glabels-ui.xml.h:70
 msgid "Only show icons in the drawing toolbar"
 msgstr "Zobrazv panelu kreslení jen ikony "
 
-#: src/glabels-ui.xml.h:61
+#: src/glabels-ui.xml.h:71
 msgid "Only show icons in the main toolbar"
 msgstr "Zobraz v hlavním panelu jen ikony"
 
-#: src/glabels-ui.xml.h:62 src/file.c:246
+#: src/glabels-ui.xml.h:72 src/file.c:421
 msgid "Open"
 msgstr "_Otevřít"
 
-#: src/glabels-ui.xml.h:63
+#: src/glabels-ui.xml.h:73
 msgid "Open a file"
 msgstr "Otevřít soubor"
 
-#: src/glabels-ui.xml.h:64
+#: src/glabels-ui.xml.h:74
 msgid "Open the glabels manual"
 msgstr "Otevřít mauál programu"
 
-#: src/glabels-ui.xml.h:65
+#: src/glabels-ui.xml.h:75
 msgid "Paste"
 msgstr "Vložit"
 
-#: src/glabels-ui.xml.h:66
+#: src/glabels-ui.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Vložit ze schránky"
 
-#: src/glabels-ui.xml.h:67
+#: src/glabels-ui.xml.h:77
 msgid "Pr_eferences..."
 msgstr "_Nastavení"
 
-#: src/glabels-ui.xml.h:68
+#: src/glabels-ui.xml.h:78
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: src/glabels-ui.xml.h:69 src/print-dialog.c:104
+#: src/glabels-ui.xml.h:79 src/print-dialog.c:114
 msgid "Print"
 msgstr "Tisk"
 
-#: src/glabels-ui.xml.h:70
+#: src/glabels-ui.xml.h:80
 msgid "Print the current file"
 msgstr "Tisk tohoto souboru"
 
-#: src/glabels-ui.xml.h:71
+#: src/glabels-ui.xml.h:81
+#, fuzzy
+msgid "Proper_ties"
+msgstr "Nastavení"
+
+#. ---------------------------
+#. Text Properties section
+#. ---------------------------
+#: src/glabels-ui.xml.h:82 src/view-text.c:330 src/view-barcode.c:305
+msgid "Properties"
+msgstr "Nastavení"
+
+#: src/glabels-ui.xml.h:83
+msgid "Property toolbar"
+msgstr ""
+
+#: src/glabels-ui.xml.h:84
 msgid "Quit"
 msgstr "Konec"
 
-#: src/glabels-ui.xml.h:72
+#: src/glabels-ui.xml.h:85
 msgid "Quit the program"
 msgstr "Ukončit program"
 
-#: src/glabels-ui.xml.h:73
+#: src/glabels-ui.xml.h:86
 msgid "Raise object to top"
 msgstr "Vynést objekt dopředu"
 
-#: src/glabels-ui.xml.h:74
+#: src/glabels-ui.xml.h:87
 msgid "Recent _Files"
 msgstr "Otevřít nedávné"
 
-#: src/glabels-ui.xml.h:75
+#: src/glabels-ui.xml.h:88
 msgid "Redo"
 msgstr "Znovu"
 
-#: src/glabels-ui.xml.h:76
+#: src/glabels-ui.xml.h:89
 msgid "Redo the undone action"
 msgstr "Provést znovu vrácenou akci"
 
-#: src/glabels-ui.xml.h:77
+#: src/glabels-ui.xml.h:90
 msgid "Remove all selections"
 msgstr "Odstranit všechna označení"
 
-#: src/glabels-ui.xml.h:79
+#: src/glabels-ui.xml.h:92
 #, no-c-format
 msgid "Restore scale to 100%"
 msgstr "Vrátit měřítko na 100%"
 
-#: src/glabels-ui.xml.h:80 src/stock.c:72
+#: src/glabels-ui.xml.h:93
+msgid "Right align"
+msgstr ""
+
+#: src/glabels-ui.xml.h:94 src/stock.c:72
 msgid "Rotate _Left"
 msgstr "Otočit do_leva"
 
-#: src/glabels-ui.xml.h:81 src/stock.c:73
+#: src/glabels-ui.xml.h:95 src/stock.c:73
 msgid "Rotate _Right"
 msgstr "Otočit do_prava"
 
-#: src/glabels-ui.xml.h:82
+#: src/glabels-ui.xml.h:96
 msgid "Rotate object 90 clockwise"
 msgstr "Otočit objekt o 90° po směru hodinových ručiček"
 
-#: src/glabels-ui.xml.h:83
+#: src/glabels-ui.xml.h:97
 msgid "Rotate object 90 counter-clockwise"
 msgstr "Otočit objekt o 90° proti směru hodinových ručiček"
 
-#: src/glabels-ui.xml.h:84
+#: src/glabels-ui.xml.h:98
 msgid "Save"
 msgstr "_Uložit"
 
-#: src/glabels-ui.xml.h:85
+#: src/glabels-ui.xml.h:99
 msgid "Save As"
 msgstr "Uložit jako"
 
-#: src/glabels-ui.xml.h:86
+#: src/glabels-ui.xml.h:100
 msgid "Save _As..."
 msgstr "Uložit _jako..."
 
-#: src/glabels-ui.xml.h:87
+#: src/glabels-ui.xml.h:101
 msgid "Save the current file"
 msgstr "Uložit tento soubor"
 
-#: src/glabels-ui.xml.h:88
+#: src/glabels-ui.xml.h:102
 msgid "Save the current file with a different name"
 msgstr "Uložit tento soubor s jiným jménem"
 
-#: src/glabels-ui.xml.h:89
+#: src/glabels-ui.xml.h:103
 msgid "Select All"
 msgstr "Vybrat vše"
 
-#: src/glabels-ui.xml.h:90
+#: src/glabels-ui.xml.h:104
 msgid "Select _All"
 msgstr "Vybrat _vše"
 
-#: src/glabels-ui.xml.h:91
+#: src/glabels-ui.xml.h:105
 msgid "Select all objects"
 msgstr "Vybrat všechny objekty"
 
-#: src/glabels-ui.xml.h:92
+#: src/glabels-ui.xml.h:106
 msgid "Select, move and modify objects"
 msgstr "Označení, posun a změna objektů"
 
-#: src/glabels-ui.xml.h:93 src/stock.c:71
+#: src/glabels-ui.xml.h:107 src/stock.c:71
 msgid "Send to _Back"
 msgstr "Poslat _dozadu"
 
-#: src/glabels-ui.xml.h:94
+#: src/glabels-ui.xml.h:108
 msgid "Set drawing toolbar button style according to desktop default"
 msgstr ""
 "Nastavit tlačítka na panelu kreslení stejně jako je základní nastavení "
 "prostředí"
 
-#: src/glabels-ui.xml.h:95
+#: src/glabels-ui.xml.h:109
 msgid "Set main toolbar button style according to desktop default"
 msgstr ""
 "Nastavit tlačítka na hlavním panelu stejně jako je základní nastavení "
 "prostředí"
 
-#: src/glabels-ui.xml.h:96
+#: src/glabels-ui.xml.h:110
 msgid "Show _Tooltips"
 msgstr "Ukaziovat tipy"
 
-#: src/glabels-ui.xml.h:97
+#: src/glabels-ui.xml.h:111
+#, fuzzy
+msgid "Show both icons and texts in the drawing toolbar"
+msgstr "Ukazovat tipy v panelu kreslení"
+
+#: src/glabels-ui.xml.h:112
+#, fuzzy
+msgid "Show both icons and texts in the main toolbar"
+msgstr "Ukazovat tipy v hlavním panelu"
+
+#: src/glabels-ui.xml.h:113
 msgid "Show tooltips in the drawing toolbar"
 msgstr "Ukazovat tipy v panelu kreslení"
 
-#: src/glabels-ui.xml.h:98
+#: src/glabels-ui.xml.h:114
 msgid "Show tooltips in the main toolbar"
 msgstr "Ukazovat tipy v hlavním panelu"
 
-#: src/glabels-ui.xml.h:99
+#: src/glabels-ui.xml.h:115
+msgid "Text color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:116
 msgid "U_n-select All"
 msgstr "Odznačit vše"
 
-#: src/glabels-ui.xml.h:100
+#: src/glabels-ui.xml.h:117
 msgid "Un-select All"
 msgstr "Odznačit vše"
 
-#: src/glabels-ui.xml.h:101
+#: src/glabels-ui.xml.h:118
 msgid "Undo"
 msgstr "Zpět"
 
-#: src/glabels-ui.xml.h:102
+#: src/glabels-ui.xml.h:119
 msgid "Undo the last action"
 msgstr "Vrátit o akci zpět"
 
-#: src/glabels-ui.xml.h:103
+#: src/glabels-ui.xml.h:120
 msgid "Zoom _1:1"
 msgstr "Zvětšení 1:1"
 
-#: src/glabels-ui.xml.h:104
+#: src/glabels-ui.xml.h:121
 msgid "Zoom _In"
 msgstr "Zvětšit"
 
-#: src/glabels-ui.xml.h:105
+#: src/glabels-ui.xml.h:122
 msgid "Zoom _Out"
 msgstr "Zmenšit"
 
-#: src/glabels-ui.xml.h:106
+#: src/glabels-ui.xml.h:123
 msgid "_About..."
 msgstr "_O programu..."
 
-#: src/glabels-ui.xml.h:107
+#: src/glabels-ui.xml.h:124
 msgid "_Bottoms"
 msgstr "Naspod"
 
-#: src/glabels-ui.xml.h:108 src/stock.c:64
+#: src/glabels-ui.xml.h:125 src/stock.c:64
 msgid "_Box"
 msgstr "Obdélník"
 
-#: src/glabels-ui.xml.h:109 src/stock.c:78
+#: src/glabels-ui.xml.h:126 src/stock.c:78
 msgid "_Centers"
 msgstr "Nastřed"
 
-#: src/glabels-ui.xml.h:110
+#: src/glabels-ui.xml.h:127
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: src/glabels-ui.xml.h:111
+#: src/glabels-ui.xml.h:128
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: src/glabels-ui.xml.h:112
+#: src/glabels-ui.xml.h:129
 msgid "_Copy"
 msgstr "_Kopírovat"
 
-#: src/glabels-ui.xml.h:113
+#: src/glabels-ui.xml.h:130
 msgid "_Create Object"
 msgstr "_Vytvořit objekt"
 
-#: src/glabels-ui.xml.h:114
+#: src/glabels-ui.xml.h:131
 msgid "_Debug"
 msgstr "Debugování"
 
-#: src/glabels-ui.xml.h:115 src/view.c:3078
+#: src/glabels-ui.xml.h:132 src/view.c:3526
 msgid "_Delete"
 msgstr "_Smazat"
 
-#: src/glabels-ui.xml.h:116
+#: src/glabels-ui.xml.h:133
 msgid "_Desktop Default"
 msgstr "Přednastavení prostředí"
 
-#: src/glabels-ui.xml.h:117
+#: src/glabels-ui.xml.h:134
 msgid "_Drawing Toolbar"
 msgstr "_Panel kreslení"
 
-#: src/glabels-ui.xml.h:118
+#: src/glabels-ui.xml.h:135
 msgid "_Edit"
 msgstr "_Editovat"
 
-#: src/glabels-ui.xml.h:119 src/stock.c:65
+#: src/glabels-ui.xml.h:136 src/stock.c:65
 msgid "_Ellipse"
 msgstr "_Elipsa"
 
-#: src/glabels-ui.xml.h:120
+#: src/glabels-ui.xml.h:137
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/glabels-ui.xml.h:121
+#: src/glabels-ui.xml.h:138
 msgid "_Grid"
 msgstr "_Mřížka"
 
-#: src/glabels-ui.xml.h:122
+#: src/glabels-ui.xml.h:139
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: src/glabels-ui.xml.h:123
+#: src/glabels-ui.xml.h:140
 msgid "_Icon"
 msgstr "_Ikona"
 
-#: src/glabels-ui.xml.h:124 src/stock.c:66
+#: src/glabels-ui.xml.h:141 src/stock.c:66
 msgid "_Image"
 msgstr "Obrá_zek"
 
-#: src/glabels-ui.xml.h:125 src/stock.c:76
+#: src/glabels-ui.xml.h:142 src/stock.c:76
 msgid "_Lefts"
 msgstr "Nalevo"
 
-#: src/glabels-ui.xml.h:126 src/stock.c:63
+#: src/glabels-ui.xml.h:143 src/stock.c:63
 msgid "_Line"
 msgstr "Čára"
 
-#: src/glabels-ui.xml.h:127
+#: src/glabels-ui.xml.h:144
 msgid "_Main Toolbar"
 msgstr "_Hlavní panel"
 
-#: src/glabels-ui.xml.h:128
+#: src/glabels-ui.xml.h:145
 msgid "_Merge Properties..."
 msgstr "Nastavení sloučení"
 
-#: src/glabels-ui.xml.h:129
+#: src/glabels-ui.xml.h:146
 msgid "_New"
 msgstr "_Nový"
 
-#: src/glabels-ui.xml.h:130
+#: src/glabels-ui.xml.h:147
 msgid "_Objects"
 msgstr "_Objekty"
 
-#: src/glabels-ui.xml.h:131
+#: src/glabels-ui.xml.h:148
 msgid "_Open..."
 msgstr "_Otevřít"
 
 #.
 #. * Submenu: Order
 #.
-#: src/glabels-ui.xml.h:132 src/view.c:2924
+#: src/glabels-ui.xml.h:149 src/view.c:3372
 msgid "_Order"
 msgstr "_Třídit"
 
-#: src/glabels-ui.xml.h:133
+#: src/glabels-ui.xml.h:150
 msgid "_Paste"
 msgstr "_Vložit"
 
-#: src/glabels-ui.xml.h:134
+#: src/glabels-ui.xml.h:151
 msgid "_Print..."
 msgstr "_Tisk..."
 
-#: src/glabels-ui.xml.h:135
+#: src/glabels-ui.xml.h:152
 msgid "_Quit"
 msgstr "_Konec"
 
-#: src/glabels-ui.xml.h:136 src/stock.c:77
+#: src/glabels-ui.xml.h:153 src/stock.c:77
 msgid "_Rights"
 msgstr "Napravo"
 
 #.
 #. * Submenu: Rotate/Flip
 #.
-#: src/glabels-ui.xml.h:137 src/view.c:2945
+#: src/glabels-ui.xml.h:154 src/view.c:3393
 msgid "_Rotate/Flip"
 msgstr "_Rotace/Převrácení"
 
-#: src/glabels-ui.xml.h:138
+#: src/glabels-ui.xml.h:155
 msgid "_Save"
 msgstr "_Uložit"
 
-#: src/glabels-ui.xml.h:139 src/stock.c:61
+#: src/glabels-ui.xml.h:156 src/stock.c:61
 msgid "_Select Mode"
 msgstr "Mód výběru"
 
-#: src/glabels-ui.xml.h:140 src/stock.c:62
+#: src/glabels-ui.xml.h:157 src/stock.c:62
 msgid "_Text"
 msgstr "_Text"
 
-#: src/glabels-ui.xml.h:141 src/stock.c:79
+#: src/glabels-ui.xml.h:158 src/stock.c:79
 msgid "_Tops"
 msgstr "Nahoru"
 
-#: src/glabels-ui.xml.h:142
+#: src/glabels-ui.xml.h:159
 msgid "_View"
 msgstr "Pohled"
 
@@ -651,26 +726,30 @@ msgid "Show ui debugging messages."
 msgstr ""
 
 #: src/glabels.c:97
-msgid "Show media select widget debugging messages."
+msgid "Show property_bar debugging messages."
 msgstr ""
 
 #: src/glabels.c:100
-msgid "Show mini preview widget debugging messages."
+msgid "Show media select widget debugging messages."
 msgstr ""
 
 #: src/glabels.c:103
-msgid "Show pixbuf cache debugging messages."
+msgid "Show mini preview widget debugging messages."
 msgstr ""
 
 #: src/glabels.c:106
-msgid "Show widget debugging messages."
+msgid "Show pixbuf cache debugging messages."
 msgstr ""
 
 #: src/glabels.c:109
+msgid "Show widget debugging messages."
+msgstr ""
+
+#: src/glabels.c:112
 msgid "Turn on all debugging messages."
 msgstr ""
 
-#: src/glabels.c:180
+#: src/glabels.c:184
 msgid "Could not initialize Bonobo!\n"
 msgstr "Nepodařila se inicializace Bonobo serveru!\n"
 
@@ -706,32 +785,32 @@ msgstr "počet kopií (standartní nastavení = 1)"
 msgid "copies"
 msgstr "kopie"
 
-#: src/glabels-batch.c:58 src/print-dialog.c:200
+#: src/glabels-batch.c:58 src/print-dialog.c:210
 msgid "print outlines (to test printer alignment)"
 msgstr "tisk okrajů (test zarovnávání tiskárny)"
 
-#: src/glabels-batch.c:60 src/print-dialog.c:209
+#: src/glabels-batch.c:60 src/print-dialog.c:219
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "obrácený tisk (např. převrácený obrázek)"
 
-#: src/glabels-batch.c:95
+#: src/glabels-batch.c:96
 msgid "[OPTION...] GLABELS_FILE..."
 msgstr ""
 
-#: src/glabels-batch.c:114
+#: src/glabels-batch.c:116
 msgid "missing glabels file\n"
 msgstr "chybí soubor programu glabels\n"
 
-#: src/glabels-batch.c:141
+#: src/glabels-batch.c:157
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "nepodařilo se otevřít soubor programu glabels %s\n"
 
-#: src/window.c:234
+#: src/window.c:242
 msgid "(none) - gLabels"
 msgstr "(žádný) - gLabels"
 
-#: src/window.c:399
+#: src/window.c:409
 msgid "(modified)"
 msgstr "(modifikováno)"
 
@@ -751,7 +830,21 @@ msgstr "Naspod"
 msgid "Centers"
 msgstr "Nastřed"
 
-#: src/commands.c:337
+#: src/ui-property-bar.c:346 src/wdgt-text-props.c:241 src/wdgt-bc-props.c:174
+#, fuzzy
+msgid "Default"
+msgstr "Smazat"
+
+#: src/ui-property-bar.c:361 src/wdgt-fill.c:175
+msgid "No fill"
+msgstr ""
+
+#: src/ui-property-bar.c:376 src/wdgt-line.c:201
+#, fuzzy
+msgid "No line"
+msgstr "Žádný"
+
+#: src/commands.c:352
 msgid ""
 "A label and business card creation program for GNOME.\n"
 " \n"
@@ -774,97 +867,107 @@ msgstr ""
 "ručení záruky, tak jak je uvedeno v GPL Licenci verze 2. Pro další detaily "
 "si přečtěte tuto licenci.\n"
 
-#: src/commands.c:351
+#: src/commands.c:366
 msgid "See the file AUTHORS for additional credits,"
 msgstr "Prohlédněte se soubor AUTHORS pro dodatečné informace,"
 
-#: src/commands.c:352
-msgid "or visit http://snaught.com/glabels"
+#: src/commands.c:367
+#, fuzzy
+msgid "or visit http://glabels.sourceforge.net/"
 msgstr "nebo navštivte http://snaught.com/glabels"
 
 #: src/commands.c:376
+msgid " "
+msgstr ""
+
+#: src/commands.c:391
 msgid "glabels"
 msgstr "glabels"
 
-#: src/file.c:82
+#: src/file.c:91
 msgid "New Label or Card"
 msgstr "Nová etiketa či vizitka"
 
-#: src/file.c:112
+#: src/file.c:121 src/file.c:291
 msgid "Media Type"
 msgstr "Typ média"
 
-#: src/file.c:118
+#: src/file.c:127 src/file.c:297
 msgid "Label orientation"
 msgstr "Orientace etikety"
 
-#: src/file.c:248
+#: src/file.c:258
+#, fuzzy
+msgid "Label properties"
+msgstr "Nastavení objektu"
+
+#: src/file.c:423
 msgid "Open label"
 msgstr "Otevřít etiketu"
 
-#: src/file.c:296 src/file.c:594
+#: src/file.c:475 src/file.c:784
 msgid "Empty file name selection"
 msgstr "Prázdné pole jména souboru"
 
-#: src/file.c:297 src/file.c:311
+#: src/file.c:476 src/file.c:490
 msgid "Please select a file or supply a valid file name"
 msgstr "Prosím označte nebo vypište platné jméno souboru"
 
-#: src/file.c:310
+#: src/file.c:489
 msgid "File does not exist"
 msgstr "Soubor neexistuje"
 
-#: src/file.c:372
+#: src/file.c:564
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr "nepodařilo se otevřít soubor \"%s\""
 
-#: src/file.c:380
+#: src/file.c:572
 msgid "Not a supported file format"
 msgstr "Formát tohoto souboru není podporován"
 
-#: src/file.c:462 src/file.c:636
+#: src/file.c:653 src/file.c:828
 #, c-format
 msgid "Could not save file \"%s\""
 msgstr "Nepodařilo se uložit soubor \"%s\""
 
-#: src/file.c:470 src/file.c:644
+#: src/file.c:661 src/file.c:836
 msgid "Error encountered during save.  The file is still not saved."
 msgstr "Při ukládání se vyskytla chyba. Soubor nebyl uložen."
 
-#: src/file.c:512
+#: src/file.c:702
 #, c-format
 msgid "Save \"%s\" as"
 msgstr "Uložit \"%s\" jako"
 
-#: src/file.c:595
+#: src/file.c:785
 msgid "Please supply a valid file name"
 msgstr "Prosím vepište platné jméno souboru"
 
-#: src/file.c:609
+#: src/file.c:801
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr "Přepsat soubor \"%s\"?"
 
-#: src/file.c:617
+#: src/file.c:809
 msgid "File already exists."
 msgstr "Soubor již existuje."
 
-#: src/file.c:732
+#: src/file.c:924
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr "Uložit před zavřením změny dokumentu \"%s\"?"
 
-#: src/file.c:740
+#: src/file.c:932
 msgid "Your changes will be lost if you don't save them."
 msgstr "Vaše změny budou ztraceny pokud je neuložíte."
 
-#: src/file.c:743
+#: src/file.c:935
 msgid "Close without saving"
 msgstr "Zavřít bez uložení"
 
 #. Should not happen
-#: src/prefs.c:664 src/prefs.c:671 src/wdgt-line.c:180
+#: src/prefs.c:664 src/prefs.c:671 src/wdgt-line.c:185
 msgid "points"
 msgstr "body"
 
@@ -914,11 +1017,11 @@ msgstr "Milimetry"
 msgid "Default page size"
 msgstr "Standartní velikost stránky"
 
-#: src/prefs-dialog.c:309
+#: src/prefs-dialog.c:309 data/paper-sizes.xml.h:25
 msgid "US Letter"
 msgstr ""
 
-#: src/prefs-dialog.c:317
+#: src/prefs-dialog.c:317 data/paper-sizes.xml.h:6
 msgid "A4"
 msgstr ""
 
@@ -927,67 +1030,67 @@ msgid "Select default properties for new objects."
 msgstr "Vyberte výchozí nastavení pro nové objekty"
 
 #. ------ text props entry ------
-#: src/prefs-dialog.c:359 src/view-text.c:314 src/view-text.c:634
+#: src/prefs-dialog.c:359 src/view-text.c:313 src/view-text.c:636
 #: src/wdgt-bc-style.c:184
 msgid "Text"
 msgstr "Text"
 
 #. ------ Line box ------
-#: src/prefs-dialog.c:368 src/view-line.c:304
+#: src/prefs-dialog.c:368 src/view-line.c:303
 msgid "Line"
 msgstr "Čára"
 
 #. ------ Fill box ------
-#: src/prefs-dialog.c:377 src/view-box.c:323 src/view-ellipse.c:323
+#: src/prefs-dialog.c:377 src/view-box.c:322 src/view-ellipse.c:322
 msgid "Fill"
 msgstr "Výplň"
 
 #.
 #. * Submenu: Align Horizontally
 #.
-#: src/view.c:2978
+#: src/view.c:3426
 msgid "Align _Horizontally"
 msgstr "Zarovnat _vodorovně"
 
 #.
 #. * Submenu: Align Vertically
 #.
-#: src/view.c:3017
+#: src/view.c:3465
 msgid "Align _Vertically"
 msgstr "Zarovnat _Svisle"
 
-#: src/view-box.c:291
+#: src/view-box.c:290
 msgid "Edit box object properties"
 msgstr "Editace nastavení objektu obdélníku"
 
 #. ---------------------------
 #. Outline section
 #. ---------------------------
-#: src/view-box.c:307 src/view-ellipse.c:307
+#: src/view-box.c:306 src/view-ellipse.c:306
 msgid "Outline"
 msgstr "Obrys"
 
 #. ---------------------------
 #. Position section
 #. ---------------------------
-#: src/view-box.c:339 src/view-ellipse.c:339 src/view-line.c:320
-#: src/view-image.c:314 src/view-text.c:349 src/view-barcode.c:338
+#: src/view-box.c:338 src/view-ellipse.c:338 src/view-line.c:319
+#: src/view-image.c:314 src/view-text.c:348 src/view-barcode.c:337
 msgid "Position"
 msgstr "Pozice"
 
 #. ---------------------------
 #. Size section
 #. ---------------------------
-#: src/view-box.c:354 src/view-ellipse.c:354 src/view-line.c:338
+#: src/view-box.c:353 src/view-ellipse.c:353 src/view-line.c:337
 #: src/view-image.c:331
 msgid "Size"
 msgstr "Velikost"
 
-#: src/view-ellipse.c:291
+#: src/view-ellipse.c:290
 msgid "Edit ellipse object properties"
 msgstr "Editace nastavení objektu elipsy"
 
-#: src/view-line.c:289
+#: src/view-line.c:288
 msgid "Edit line object properties"
 msgstr "Editace nastavení objektu řádky"
 
@@ -1007,29 +1110,22 @@ msgstr "Obrázek"
 msgid "Reset image size"
 msgstr "Anulovat velikost obrázku"
 
-#: src/view-text.c:299
+#: src/view-text.c:298
 msgid "Edit text object properties"
 msgstr "Editace nastavení objektu text"
 
-#. ---------------------------
-#. Text Properties section
-#. ---------------------------
-#: src/view-text.c:331 src/view-barcode.c:306
-msgid "Properties"
-msgstr "Nastavení"
-
-#: src/view-barcode.c:271
+#: src/view-barcode.c:270
 msgid "Edit barcode object properties"
 msgstr "Editace nastavení objektu čárového kódu"
 
 #. ---------------------------
 #. Data section
 #. ---------------------------
-#: src/view-barcode.c:286 src/merge-properties-dialog.c:343
+#: src/view-barcode.c:285 src/merge-properties-dialog.c:343
 msgid "Data"
 msgstr "Data"
 
-#: src/view-barcode.c:802 src/print.c:912
+#: src/view-barcode.c:803 src/print.c:1021
 msgid "Invalid barcode"
 msgstr "Neplatný čárový kód"
 
@@ -1072,72 +1168,76 @@ msgstr "Výběr"
 msgid "Record/Field"
 msgstr "Záznam/Pole"
 
-#: src/print-dialog.c:128
+#: src/print-dialog.c:138
 msgid "_Job"
 msgstr "Úloha"
 
-#: src/print-dialog.c:133
+#: src/print-dialog.c:143
 msgid "P_rinter"
 msgstr "_Tiskárna"
 
 #. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:163
+#: src/print-dialog.c:173
 msgid "Copies"
 msgstr "Kopie"
 
 #. ------- Otherwise add merge control widget ------------
-#: src/print-dialog.c:177
+#: src/print-dialog.c:187
 msgid "Document merge control"
 msgstr "Kontrola sloučení dokumentu"
 
 #. ----------- Add custom print options area ------------
-#: src/print-dialog.c:194
+#: src/print-dialog.c:204
 msgid "Options"
 msgstr "Nastavení"
 
-#: src/print-dialog.c:336 src/print-dialog.c:374
+#: src/print-dialog.c:227
+msgid "print crop marks"
+msgstr ""
+
+#: src/print-dialog.c:364 src/print-dialog.c:403
 msgid "Print preview"
 msgstr "Náhled tisku"
 
-#: src/label.c:542
+#: src/label.c:563
 msgid "Untitled"
 msgstr "Nepojmenovaný"
 
-#: src/template.c:296
+#: src/template.c:318
 #, c-format
 msgid "Generic %s full page"
 msgstr ""
 
-#: src/template.c:338
+#: src/template.c:362
 msgid "No template files found!"
 msgstr "Nenalezeny Å¡ablony!"
 
-#: src/template.c:435
+#: src/template.c:461
 #, c-format
 msgid "%s x %s %s"
 msgstr "%s x %s %s"
 
-#: src/template.c:440
+#: src/template.c:466
 #, c-format
 msgid "%.5g x %.5g %s"
 msgstr "%.5g x %.5g %s"
 
-#: src/template.c:451 src/template.c:465
+#: src/template.c:477 src/template.c:491
 #, c-format
 msgid "%s %s diameter"
 msgstr "%s %s průměr"
 
-#: src/template.c:455 src/template.c:469
+#: src/template.c:481 src/template.c:495
 #, c-format
 msgid "%.5g %s diameter"
 msgstr "%.5g %s průměr"
 
-#: src/template.c:607
+#: src/template.c:633
 #, c-format
 msgid "%d x %d  (%d per sheet)"
 msgstr "%d x %d  (%d na stránku)"
 
-#: src/template.c:611
+#: src/template.c:637
 #, c-format
 msgid "%d per sheet"
 msgstr "%d na stránku"
@@ -1147,53 +1247,69 @@ msgstr "%d na stránku"
 msgid "No paper files found!"
 msgstr "Nenalezeny Å¡ablony!"
 
-#: src/xml-label.c:171 src/xml-label.c:204
+#: src/xml-label.c:177 src/xml-label.c:214
 msgid "xmlParseFile error"
 msgstr "chyba (xmlParseFile)"
 
-#: src/xml-label.c:241
+#: src/xml-label.c:251
 msgid "No document root"
 msgstr ""
 
-#: src/xml-label.c:253
+#: src/xml-label.c:263
 msgid "Importing from glabels 0.1 format"
 msgstr "Importuji formát glabels verze 0.1"
 
-#: src/xml-label.c:261
+#: src/xml-label.c:271
 msgid "Importing from glabels 0.4 format"
 msgstr "Importuji formát glabels verze 0.4"
 
-#: src/xml-label.c:264
+#: src/xml-label.c:278
+#, fuzzy
+msgid "Importing from glabels 1.91 format"
+msgstr "Importuji formát glabels verze 0.1"
+
+#: src/xml-label.c:281
 msgid "bad document, unknown glabels Namespace"
 msgstr ""
 
-#: src/xml-label.c:292 src/xml-label-04.c:75
+#: src/xml-label.c:310 src/xml-label-04.c:75 src/xml-label-191.c:131
 #, c-format
 msgid "Bad root node = \"%s\""
 msgstr ""
 
-#: src/xml-label.c:325
+#: src/xml-label.c:345 src/xml-label-191.c:164
 #, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr ""
 
-#: src/xml-label.c:357 src/xml-label-04.c:123
+#: src/xml-label.c:387 src/xml-label-04.c:123 src/xml-label-191.c:196
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr ""
 
-#: src/xml-label.c:763
+#: src/xml-label.c:783 src/xml-label-191.c:602
 #, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr ""
 
-#: src/xml-label.c:831
+#: src/xml-label.c:944
+msgid "Utf8 conversion error."
+msgstr ""
+
+#: src/xml-label.c:951
 msgid "Problem saving xml file."
 msgstr "Problém s ukládáním dat do xml."
 
-#: src/xml-template.c:157
+#. This should always be an id, but just in case a name
+#. slips by!
+#: src/xml-label-191.c:680 src/xml-template.c:169
+#, fuzzy, c-format
+msgid "Unknown page size id \"%s\", trying as name"
+msgstr "Neznámá velikost stránky \"%s\""
+
+#: src/xml-label-191.c:690 src/xml-template.c:179
 #, fuzzy, c-format
-msgid "Unknown page size id \"%s\""
+msgid "Unknown page size id or name \"%s\""
 msgstr "Neznámá velikost stránky \"%s\""
 
 #: src/merge.c:172 src/merge.c:213 src/merge.c:398 src/merge.c:401
@@ -1213,18 +1329,18 @@ msgid "Text file with tab delimeters"
 msgstr "Text s tabulátory jako oddělovači sloupců"
 
 #. Font label
-#: src/wdgt-text-props.c:181
+#: src/wdgt-text-props.c:185
 msgid "Font:"
 msgstr "Font:"
 
 #. Text Color Label
-#: src/wdgt-text-props.c:230 src/wdgt-line.c:189 src/wdgt-fill.c:164
-#: src/wdgt-bc-props.c:164
+#: src/wdgt-text-props.c:234 src/wdgt-line.c:194 src/wdgt-fill.c:168
+#: src/wdgt-bc-props.c:167
 msgid "Color:"
 msgstr "Barva:"
 
 #. Alignment label
-#: src/wdgt-text-props.c:246
+#: src/wdgt-text-props.c:255
 msgid "Alignment:"
 msgstr "Zarovnání:"
 
@@ -1254,7 +1370,7 @@ msgid "Y:"
 msgstr "Y:"
 
 #. W Label
-#: src/wdgt-size.c:187 src/wdgt-line.c:166
+#: src/wdgt-size.c:187 src/wdgt-line.c:171
 msgid "Width:"
 msgstr "Šířka:"
 
@@ -1351,7 +1467,533 @@ msgstr "Rozložení:"
 msgid "Rotate"
 msgstr "Rotovat"
 
-#: src/gnome-recent-view-bonobo.c:189
-#, c-format
-msgid "Open %s"
-msgstr "Otevřít %s"
+#. This is the default custom color
+#: src/mygal/color-palette.c:396
+#, fuzzy
+msgid "custom"
+msgstr "Přizpůsobit"
+
+#. "Custom" color - we'll pop up a GnomeColorPicker
+#: src/mygal/color-palette.c:438
+#, fuzzy
+msgid "Custom Color:"
+msgstr "Přizpůsobit panely"
+
+#: src/mygal/color-palette.c:446
+msgid "Choose Custom Color"
+msgstr ""
+
+#: src/mygal/color-palette.c:579
+msgid "black"
+msgstr ""
+
+#: src/mygal/color-palette.c:580
+msgid "light brown"
+msgstr ""
+
+#: src/mygal/color-palette.c:581
+msgid "brown gold"
+msgstr ""
+
+#: src/mygal/color-palette.c:582
+msgid "dark green #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:583
+msgid "navy"
+msgstr ""
+
+#: src/mygal/color-palette.c:584 src/mygal/color-palette.c:640
+msgid "dark blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:585
+msgid "purple #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:586
+msgid "very dark gray"
+msgstr ""
+
+#: src/mygal/color-palette.c:589 src/mygal/color-palette.c:645
+msgid "dark red"
+msgstr ""
+
+#: src/mygal/color-palette.c:590
+msgid "red-orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:591
+msgid "gold"
+msgstr ""
+
+#: src/mygal/color-palette.c:592
+msgid "dark green"
+msgstr ""
+
+#: src/mygal/color-palette.c:593 src/mygal/color-palette.c:646
+msgid "dull blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:594 src/mygal/color-palette.c:647
+msgid "blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:595
+msgid "dull purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:596
+msgid "dark grey"
+msgstr ""
+
+#: src/mygal/color-palette.c:599
+msgid "red"
+msgstr ""
+
+#: src/mygal/color-palette.c:600
+msgid "orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:601
+msgid "lime"
+msgstr ""
+
+#: src/mygal/color-palette.c:602
+msgid "dull green"
+msgstr ""
+
+#: src/mygal/color-palette.c:603
+msgid "dull blue #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:604
+msgid "sky blue #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:605 src/mygal/color-palette.c:644
+msgid "purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:606
+msgid "gray"
+msgstr ""
+
+#: src/mygal/color-palette.c:609 src/mygal/color-palette.c:641
+#, fuzzy
+msgid "magenta"
+msgstr "Obrázek"
+
+#: src/mygal/color-palette.c:610
+msgid "bright orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:611 src/mygal/color-palette.c:642
+msgid "yellow"
+msgstr ""
+
+#: src/mygal/color-palette.c:612
+#, fuzzy
+msgid "green"
+msgstr "stupně"
+
+#: src/mygal/color-palette.c:613 src/mygal/color-palette.c:643
+msgid "cyan"
+msgstr ""
+
+#: src/mygal/color-palette.c:614
+msgid "bright blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:615 src/mygal/color-palette.c:632
+msgid "red purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:616
+msgid "light grey"
+msgstr ""
+
+#: src/mygal/color-palette.c:619 src/mygal/color-palette.c:636
+msgid "pink"
+msgstr ""
+
+#: src/mygal/color-palette.c:620
+msgid "light orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:621 src/mygal/color-palette.c:633
+msgid "light yellow"
+msgstr ""
+
+#: src/mygal/color-palette.c:622
+msgid "light green"
+msgstr ""
+
+#: src/mygal/color-palette.c:623
+msgid "light cyan"
+msgstr ""
+
+#: src/mygal/color-palette.c:624 src/mygal/color-palette.c:634
+msgid "light blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:625 src/mygal/color-palette.c:638
+msgid "light purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:626
+msgid "white"
+msgstr ""
+
+#: src/mygal/color-palette.c:631
+msgid "purplish blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:635
+msgid "dark purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:637
+msgid "sky blue"
+msgstr ""
+
+#: data/paper-sizes.xml.h:1
+msgid "A0"
+msgstr ""
+
+#: data/paper-sizes.xml.h:2
+msgid "A1"
+msgstr ""
+
+#: data/paper-sizes.xml.h:3
+msgid "A10"
+msgstr ""
+
+#: data/paper-sizes.xml.h:4
+msgid "A2"
+msgstr ""
+
+#: data/paper-sizes.xml.h:5
+msgid "A3"
+msgstr ""
+
+#: data/paper-sizes.xml.h:7
+msgid "A5"
+msgstr ""
+
+#: data/paper-sizes.xml.h:8
+msgid "A6"
+msgstr ""
+
+#: data/paper-sizes.xml.h:9
+msgid "A7"
+msgstr ""
+
+#: data/paper-sizes.xml.h:10
+msgid "A8"
+msgstr ""
+
+#: data/paper-sizes.xml.h:11
+msgid "A9"
+msgstr ""
+
+#: data/paper-sizes.xml.h:12
+msgid "B0"
+msgstr ""
+
+#: data/paper-sizes.xml.h:13
+msgid "B1"
+msgstr ""
+
+#: data/paper-sizes.xml.h:14
+msgid "B10"
+msgstr ""
+
+#: data/paper-sizes.xml.h:15
+msgid "B2"
+msgstr ""
+
+#: data/paper-sizes.xml.h:16
+msgid "B3"
+msgstr ""
+
+#: data/paper-sizes.xml.h:17
+msgid "B4"
+msgstr ""
+
+#: data/paper-sizes.xml.h:18
+msgid "B5"
+msgstr ""
+
+#: data/paper-sizes.xml.h:19
+msgid "B6"
+msgstr ""
+
+#: data/paper-sizes.xml.h:20
+msgid "B7"
+msgstr ""
+
+#: data/paper-sizes.xml.h:21
+msgid "B8"
+msgstr ""
+
+#: data/paper-sizes.xml.h:22
+msgid "B9"
+msgstr ""
+
+#: data/paper-sizes.xml.h:23
+msgid "US Executive"
+msgstr ""
+
+#: data/paper-sizes.xml.h:24
+msgid "US Legal"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:1
+msgid "Address Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:2 data/avery-iso-templates.xml.h:3
+#: data/zweckform-iso-templates.xml.h:2 data/misc-us-templates.xml.h:2
+#: data/misc-iso-templates.xml.h:9
+msgid "Business Cards"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:3
+msgid "CD/DVD Labels (Disc Labels)"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:4
+msgid "Diskette Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:5
+#, fuzzy
+msgid "Filing Labels"
+msgstr "Etikety"
+
+#: data/avery-us-templates.xml.h:6
+msgid "Full Sheet Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:7
+#, fuzzy
+msgid "Large Round Labels"
+msgstr "Začít na etiketě"
+
+#: data/avery-us-templates.xml.h:8
+msgid "Name Badge Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:9
+msgid "Return Address Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:10
+msgid "Shipping Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:11
+#, fuzzy
+msgid "Small Round Labels"
+msgstr "Začít na etiketě"
+
+#: data/avery-us-templates.xml.h:12
+#, fuzzy
+msgid "Square Labels"
+msgstr "Etikety"
+
+#: data/avery-us-templates.xml.h:13
+msgid "Video Tape Face Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:14
+msgid "Video Tape Spine Labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:1
+msgid "3.5'' Diskette labels (face only)"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:2
+msgid "Address labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:4 data/zweckform-iso-templates.xml.h:4
+#: data/misc-us-templates.xml.h:4 data/misc-iso-templates.xml.h:10
+#, fuzzy
+msgid "CD/DVD Labels"
+msgstr "Etikety"
+
+#: data/avery-iso-templates.xml.h:5 data/misc-iso-templates.xml.h:16
+msgid "Mailing Labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:6
+#, fuzzy
+msgid "Mailing labels"
+msgstr "glabels"
+
+#: data/avery-iso-templates.xml.h:7
+msgid "Mini Address"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:8
+#, fuzzy
+msgid "Shipping labels"
+msgstr "Otevřít etiketu"
+
+#: data/zweckform-iso-templates.xml.h:1
+#, fuzzy
+msgid "Allround Labels"
+msgstr "O programu glabels"
+
+#: data/zweckform-iso-templates.xml.h:3
+#, fuzzy
+msgid "CD Labels"
+msgstr "Etikety"
+
+#: data/zweckform-iso-templates.xml.h:5
+msgid "Correction and Cover-up Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:6
+msgid "Lever Arch File Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:7
+msgid "Mailing Labels -- 12"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:8
+msgid "QSL-Karten Etiketten 70mm x 50,8mm"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:9
+msgid "Rectangular Copier Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:10 data/misc-iso-templates.xml.h:20
+msgid "Rectangular Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:11
+msgid "Video Labels (back)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:1
+msgid "Business Card CD"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:3
+msgid "CD Template Rectangles"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:5
+msgid "CD/DVD Labels (Face Only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:6 data/misc-iso-templates.xml.h:11
+msgid "CD/DVD Labels (face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:7
+#, fuzzy
+msgid "DLT Labels"
+msgstr "Etikety"
+
+#: data/misc-us-templates.xml.h:8
+#, fuzzy
+msgid "Microtube labels"
+msgstr "O programu glabels"
+
+#: data/misc-us-templates.xml.h:9
+msgid "Mini-CD Labels"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:10
+msgid "PRO CD Labels 2-up (CD spine only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:11
+msgid "PRO CD Labels 2-up (Face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:12
+msgid "PRO CD Labels 2-up (face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:13
+msgid "Slimline CD Case (rightside up)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:14
+msgid "Slimline CD Case (upside down)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:1
+msgid "Agipa 119488: Business Cards"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:2
+msgid "Allround Labels --24"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:3
+msgid "Allround Labels --44"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:4
+msgid "Allround Labels --64"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:5
+msgid "Allround Labels --65"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:6
+msgid "Arch File Labels"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:7
+msgid "Arch File Labels (large)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:8
+msgid "Arch File Labels (small)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:12
+msgid "CD/DVD Labels Standard Format (face only)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:13
+msgid "Diskette Labels (face only)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:14
+msgid "EPSON Photo Stickers 16"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:15
+msgid "Etiketten"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:17
+msgid "Mailing Labels --14"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:18
+msgid "Mailing Labels-2 columns"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:19
+msgid "Mailing Labels-3 columns"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:21
+msgid "Video Labels (face only)"
+msgstr ""
+
+#~ msgid "Open %s"
+#~ msgstr "Otevřít %s"
diff --git a/glabels2/po/de.po b/glabels2/po/de.po
index 8fdac945..97217e8b 100644
--- a/glabels2/po/de.po
+++ b/glabels2/po/de.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2001 Jim Evins <evins@snaught.com>
 # Marcus Bauer <m@7n7.de>, 2001.
 # 
-#: src/commands.c:361
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels HEAD\n"
-"POT-Creation-Date: 2003-06-22 01:12-0400\n"
+"POT-Creation-Date: 2003-11-01 19:24-0500\n"
 "PO-Revision-Date: 2002-08-29 11:41+0100\n"
 "Last-Translator: Christian Neumair <christian-neumair@web.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -60,571 +59,650 @@ msgstr ""
 msgid "Bar_code"
 msgstr "Barcode"
 
-#: src/glabels-ui.xml.h:12 src/stock.c:70
+#: src/glabels-ui.xml.h:12
+msgid "Bold"
+msgstr ""
+
+#: src/glabels-ui.xml.h:13 src/stock.c:70
 #, fuzzy
 msgid "Bring to _Front"
 msgstr "Ganz nach vorne"
 
-#: src/glabels-ui.xml.h:13
+#: src/glabels-ui.xml.h:14
+#, fuzzy
+msgid "Center align"
+msgstr "Inhalt"
+
+#: src/glabels-ui.xml.h:15
 msgid "Center objects to horizontal label center"
 msgstr ""
 
-#: src/glabels-ui.xml.h:14
+#: src/glabels-ui.xml.h:16
 msgid "Center objects to vertical label center"
 msgstr ""
 
-#: src/glabels-ui.xml.h:15
+#: src/glabels-ui.xml.h:17
 #, fuzzy
 msgid "Change the visibility of markup lines in the current window"
 msgstr "Die Sichtbarkeit der Werkzeugleiste im aktuellen Fenster ändern"
 
-#: src/glabels-ui.xml.h:16
+#: src/glabels-ui.xml.h:18
 #, fuzzy
 msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr "Die Sichtbarkeit der Werkzeugleiste im aktuellen Fenster ändern"
 
-#: src/glabels-ui.xml.h:17
+#: src/glabels-ui.xml.h:19
 #, fuzzy
 msgid "Change the visibility of the grid in the current window"
 msgstr "Die Sichtbarkeit der Werkzeugleiste im aktuellen Fenster ändern"
 
-#: src/glabels-ui.xml.h:18
+#: src/glabels-ui.xml.h:20
 #, fuzzy
 msgid "Change the visibility of the main toolbar in the current window"
 msgstr "Die Sichtbarkeit der Werkzeugleiste im aktuellen Fenster ändern"
 
-#: src/glabels-ui.xml.h:19
+#: src/glabels-ui.xml.h:21
 msgid "Close"
 msgstr "Schließen"
 
-#: src/glabels-ui.xml.h:20
+#: src/glabels-ui.xml.h:22
 msgid "Close the current file"
 msgstr "Die aktuelle Datei schließen"
 
-#: src/glabels-ui.xml.h:21
+#: src/glabels-ui.xml.h:23
 msgid "Configure the application"
 msgstr "Die Anwendung konfigurieren"
 
-#: src/glabels-ui.xml.h:22
+#: src/glabels-ui.xml.h:24
 msgid "Contents"
 msgstr "Inhalt"
 
-#: src/glabels-ui.xml.h:23
+#: src/glabels-ui.xml.h:25
 msgid "Copy"
 msgstr "Kopieren"
 
-#: src/glabels-ui.xml.h:24
+#: src/glabels-ui.xml.h:26
 msgid "Copy the selection"
 msgstr "Die Markierung kopieren"
 
-#: src/glabels-ui.xml.h:25
+#: src/glabels-ui.xml.h:27
 msgid "Create a new document"
 msgstr "Ein neues Dokument erstellen"
 
-#: src/glabels-ui.xml.h:26
+#: src/glabels-ui.xml.h:28
 msgid "Create barcode object"
 msgstr "Barcodeobjekt erzeugen"
 
-#: src/glabels-ui.xml.h:27
+#: src/glabels-ui.xml.h:29
 msgid "Create box/rectangle object"
 msgstr "Rechteck-Objekt erzeugen"
 
-#: src/glabels-ui.xml.h:28
+#: src/glabels-ui.xml.h:30
 msgid "Create ellipse/circle object"
 msgstr "Ellipsenobjekt erzeugen"
 
-#: src/glabels-ui.xml.h:29
+#: src/glabels-ui.xml.h:31
 msgid "Create image object"
 msgstr "Bildobjekt erzeugen"
 
-#: src/glabels-ui.xml.h:30
+#: src/glabels-ui.xml.h:32
 msgid "Create line object"
 msgstr "Linienobjekt erzeugen"
 
-#: src/glabels-ui.xml.h:31
+#: src/glabels-ui.xml.h:33
 msgid "Create text object"
 msgstr "Textobjekt erzeugen"
 
-#: src/glabels-ui.xml.h:32
+#: src/glabels-ui.xml.h:34
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
-#: src/glabels-ui.xml.h:33
+#: src/glabels-ui.xml.h:35
 msgid "Customize"
 msgstr "Anpassen"
 
-#: src/glabels-ui.xml.h:34
+#: src/glabels-ui.xml.h:36
 #, fuzzy
 msgid "Customize Drawing Toolbar"
 msgstr "Werkzeugleiste _anpassen"
 
-#: src/glabels-ui.xml.h:35
+#: src/glabels-ui.xml.h:37
 #, fuzzy
 msgid "Customize Main Toolbar"
 msgstr "Werkzeugleiste _anpassen"
 
-#: src/glabels-ui.xml.h:36
+#: src/glabels-ui.xml.h:38
 msgid "Customize toolbars"
 msgstr "Werkzeugleisten anpassen"
 
-#: src/glabels-ui.xml.h:37
+#: src/glabels-ui.xml.h:39
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: src/glabels-ui.xml.h:38
+#: src/glabels-ui.xml.h:40
 msgid "Cut the selection"
 msgstr "Die Markierung ausschneiden"
 
-#: src/glabels-ui.xml.h:39
+#: src/glabels-ui.xml.h:41
 msgid "Decrease magnification"
 msgstr ""
 
-#: src/glabels-ui.xml.h:40
+#: src/glabels-ui.xml.h:42
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/glabels-ui.xml.h:41
+#: src/glabels-ui.xml.h:43
 msgid "Delete the selected objects"
 msgstr "Die markierten Objekte löschen"
 
-#: src/glabels-ui.xml.h:42
+#: src/glabels-ui.xml.h:44
 #, fuzzy
 msgid "Drawing toolbar"
 msgstr "Haupt-Werkzeugleiste"
 
-#: src/glabels-ui.xml.h:43
+#: src/glabels-ui.xml.h:45
 msgid "Dump XML"
 msgstr "XML in Rohform ausgeben"
 
-#: src/glabels-ui.xml.h:44
+#: src/glabels-ui.xml.h:46
 msgid "Dump the UI Xml description"
 msgstr "Die XML-Benutzeroberflächenbeschreibung in Rohform ausgeben"
 
-#: src/glabels-ui.xml.h:45
+#: src/glabels-ui.xml.h:47
 msgid "Edit merge properties"
 msgstr ""
 
-#: src/glabels-ui.xml.h:46
+#: src/glabels-ui.xml.h:48
 #, fuzzy
 msgid "Edit object properties"
 msgstr "Rechteck bearbeiten..."
 
-#: src/glabels-ui.xml.h:47 src/stock.c:74
+#: src/glabels-ui.xml.h:49 src/stock.c:84
+msgid "Fill color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:50 src/stock.c:74
 msgid "Flip _Horizontally"
 msgstr ""
 
-#: src/glabels-ui.xml.h:48 src/stock.c:75
+#: src/glabels-ui.xml.h:51 src/stock.c:75
 msgid "Flip _Vertically"
 msgstr ""
 
-#: src/glabels-ui.xml.h:49
+#: src/glabels-ui.xml.h:52
 msgid "Flip object horizontally"
 msgstr ""
 
-#: src/glabels-ui.xml.h:50
+#: src/glabels-ui.xml.h:53
 msgid "Flip object vertically"
 msgstr ""
 
-#: src/glabels-ui.xml.h:51
+#: src/glabels-ui.xml.h:54
+msgid "Font name"
+msgstr ""
+
+#: src/glabels-ui.xml.h:55
+#, fuzzy
+msgid "Font selector"
+msgstr "Die Markierung kopieren"
+
+#: src/glabels-ui.xml.h:56
+msgid "Font size"
+msgstr ""
+
+#: src/glabels-ui.xml.h:57
 msgid "Icon and _Text"
 msgstr "Icons und _Text"
 
-#: src/glabels-ui.xml.h:52
+#: src/glabels-ui.xml.h:58
 msgid "Increase magnification"
 msgstr ""
 
-#: src/glabels-ui.xml.h:53 src/stock.c:82 src/stock.c:83
+#: src/glabels-ui.xml.h:59
+msgid "Italic"
+msgstr ""
+
+#: src/glabels-ui.xml.h:60 src/stock.c:82 src/stock.c:83
 msgid "Label Ce_nter"
 msgstr ""
 
-#: src/glabels-ui.xml.h:54
+#: src/glabels-ui.xml.h:61
+msgid "Left align"
+msgstr ""
+
+#: src/glabels-ui.xml.h:62 src/stock.c:85
+msgid "Line color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:63
+msgid "Line width"
+msgstr ""
+
+#: src/glabels-ui.xml.h:64
 msgid "Lower object to bottom"
 msgstr ""
 
-#: src/glabels-ui.xml.h:55
+#: src/glabels-ui.xml.h:65
 msgid "M_arkup"
 msgstr ""
 
-#: src/glabels-ui.xml.h:56
+#: src/glabels-ui.xml.h:66
 msgid "Main toolbar"
 msgstr "Haupt-Werkzeugleiste"
 
-#: src/glabels-ui.xml.h:57
+#: src/glabels-ui.xml.h:67
 msgid "Markup"
 msgstr ""
 
-#: src/glabels-ui.xml.h:58
+#: src/glabels-ui.xml.h:68
 msgid "New"
 msgstr "Neu"
 
-#: src/glabels-ui.xml.h:59
+#: src/glabels-ui.xml.h:69
 #, fuzzy
 msgid "Object _Properties..."
 msgstr "Einstellungen bearbeiten..."
 
-#: src/glabels-ui.xml.h:60
+#: src/glabels-ui.xml.h:70
 #, fuzzy
 msgid "Only show icons in the drawing toolbar"
 msgstr "Nur Icons in der Werkzeugleiste anzeigen"
 
-#: src/glabels-ui.xml.h:61
+#: src/glabels-ui.xml.h:71
 #, fuzzy
 msgid "Only show icons in the main toolbar"
 msgstr "Nur Icons in der Werkzeugleiste anzeigen"
 
-#: src/glabels-ui.xml.h:62 src/file.c:246
+#: src/glabels-ui.xml.h:72 src/file.c:421
 msgid "Open"
 msgstr "Öffnen"
 
-#: src/glabels-ui.xml.h:63
+#: src/glabels-ui.xml.h:73
 msgid "Open a file"
 msgstr "Eine Datei öffnen"
 
-#: src/glabels-ui.xml.h:64
+#: src/glabels-ui.xml.h:74
 #, fuzzy
 msgid "Open the glabels manual"
 msgstr "Das gedit-Handbuch öffnen"
 
-#: src/glabels-ui.xml.h:65
+#: src/glabels-ui.xml.h:75
 msgid "Paste"
 msgstr "Einfügen"
 
-#: src/glabels-ui.xml.h:66
+#: src/glabels-ui.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Inhalt der Zwischenablage einfügen"
 
-#: src/glabels-ui.xml.h:67
+#: src/glabels-ui.xml.h:77
 msgid "Pr_eferences..."
 msgstr "_Einstellungen..."
 
-#: src/glabels-ui.xml.h:68
+#: src/glabels-ui.xml.h:78
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: src/glabels-ui.xml.h:69 src/print-dialog.c:104
+#: src/glabels-ui.xml.h:79 src/print-dialog.c:114
 msgid "Print"
 msgstr "Drucken"
 
-#: src/glabels-ui.xml.h:70
+#: src/glabels-ui.xml.h:80
 msgid "Print the current file"
 msgstr "Die aktuelle Datei drucken"
 
-#: src/glabels-ui.xml.h:71
+#: src/glabels-ui.xml.h:81
+#, fuzzy
+msgid "Proper_ties"
+msgstr "Barcode-Einstellungen"
+
+#. ---------------------------
+#. Text Properties section
+#. ---------------------------
+#: src/glabels-ui.xml.h:82 src/view-text.c:330 src/view-barcode.c:305
+#, fuzzy
+msgid "Properties"
+msgstr "Barcode-Einstellungen"
+
+# CHECK
+#: src/glabels-ui.xml.h:83
+#, fuzzy
+msgid "Property toolbar"
+msgstr "Werkzeugleisten-Werkzeuge"
+
+#: src/glabels-ui.xml.h:84
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/glabels-ui.xml.h:72
+#: src/glabels-ui.xml.h:85
 msgid "Quit the program"
 msgstr "Das Programm beenden"
 
-#: src/glabels-ui.xml.h:73
+#: src/glabels-ui.xml.h:86
 msgid "Raise object to top"
 msgstr ""
 
-#: src/glabels-ui.xml.h:74
+#: src/glabels-ui.xml.h:87
 msgid "Recent _Files"
 msgstr "_Zuletzt geöffnete Dateien"
 
-#: src/glabels-ui.xml.h:75
+#: src/glabels-ui.xml.h:88
 msgid "Redo"
 msgstr "Wiederherstellen"
 
-#: src/glabels-ui.xml.h:76
+#: src/glabels-ui.xml.h:89
 msgid "Redo the undone action"
 msgstr "Die rückgängig gemachte Aktion wiederherstellen"
 
-#: src/glabels-ui.xml.h:77
+#: src/glabels-ui.xml.h:90
 msgid "Remove all selections"
 msgstr "Alle Auswahlen aufheben"
 
-#: src/glabels-ui.xml.h:79
+#: src/glabels-ui.xml.h:92
 #, fuzzy, no-c-format
 msgid "Restore scale to 100%"
 msgstr "Skalierung auf 100% wiederherstellen"
 
-#: src/glabels-ui.xml.h:80 src/stock.c:72
+#: src/glabels-ui.xml.h:93
+msgid "Right align"
+msgstr ""
+
+#: src/glabels-ui.xml.h:94 src/stock.c:72
 #, fuzzy
 msgid "Rotate _Left"
 msgstr "Rotieren"
 
-#: src/glabels-ui.xml.h:81 src/stock.c:73
+#: src/glabels-ui.xml.h:95 src/stock.c:73
 #, fuzzy
 msgid "Rotate _Right"
 msgstr "Rotieren"
 
-#: src/glabels-ui.xml.h:82
+#: src/glabels-ui.xml.h:96
 msgid "Rotate object 90 clockwise"
 msgstr ""
 
-#: src/glabels-ui.xml.h:83
+#: src/glabels-ui.xml.h:97
 msgid "Rotate object 90 counter-clockwise"
 msgstr ""
 
-#: src/glabels-ui.xml.h:84
+#: src/glabels-ui.xml.h:98
 msgid "Save"
 msgstr "Speichern"
 
-#: src/glabels-ui.xml.h:85
+#: src/glabels-ui.xml.h:99
 msgid "Save As"
 msgstr "Speichern unter..."
 
-#: src/glabels-ui.xml.h:86
+#: src/glabels-ui.xml.h:100
 msgid "Save _As..."
 msgstr "Speichern _unter..."
 
-#: src/glabels-ui.xml.h:87
+#: src/glabels-ui.xml.h:101
 msgid "Save the current file"
 msgstr "Die aktuelle Datei speichern"
 
-#: src/glabels-ui.xml.h:88
+#: src/glabels-ui.xml.h:102
 msgid "Save the current file with a different name"
 msgstr "Die aktuelle Datei unter einem anderen Dateinamen speichern"
 
-#: src/glabels-ui.xml.h:89
+#: src/glabels-ui.xml.h:103
 msgid "Select All"
 msgstr "Alles markieren"
 
-#: src/glabels-ui.xml.h:90
+#: src/glabels-ui.xml.h:104
 msgid "Select _All"
 msgstr "_Alles markieren"
 
-#: src/glabels-ui.xml.h:91
+#: src/glabels-ui.xml.h:105
 msgid "Select all objects"
 msgstr "Alle Objekte markieren"
 
-#: src/glabels-ui.xml.h:92
+#: src/glabels-ui.xml.h:106
 msgid "Select, move and modify objects"
 msgstr "Objekte auswählen, bewegen, ändern"
 
-#: src/glabels-ui.xml.h:93 src/stock.c:71
+#: src/glabels-ui.xml.h:107 src/stock.c:71
 #, fuzzy
 msgid "Send to _Back"
 msgstr "Ganz nach hinten"
 
 # CHECK
-#: src/glabels-ui.xml.h:94
+#: src/glabels-ui.xml.h:108
 #, fuzzy
 msgid "Set drawing toolbar button style according to desktop default"
 msgstr ""
 "Den Knopfstil der Werkzeugleiste der Desktop-Vorgabe entsprechend einstellen"
 
 # CHECK
-#: src/glabels-ui.xml.h:95
+#: src/glabels-ui.xml.h:109
 #, fuzzy
 msgid "Set main toolbar button style according to desktop default"
 msgstr ""
 "Den Knopfstil der Werkzeugleiste der Desktop-Vorgabe entsprechend einstellen"
 
-#: src/glabels-ui.xml.h:96
+#: src/glabels-ui.xml.h:110
 msgid "Show _Tooltips"
 msgstr "Miniaturhilfen _zeigen"
 
-#: src/glabels-ui.xml.h:97
+#: src/glabels-ui.xml.h:111
+#, fuzzy
+msgid "Show both icons and texts in the drawing toolbar"
+msgstr "Miniaturhilfen in der Werkzeugleiste zeigen"
+
+#: src/glabels-ui.xml.h:112
+#, fuzzy
+msgid "Show both icons and texts in the main toolbar"
+msgstr "Miniaturhilfen in der Werkzeugleiste zeigen"
+
+#: src/glabels-ui.xml.h:113
 #, fuzzy
 msgid "Show tooltips in the drawing toolbar"
 msgstr "Miniaturhilfen in der Werkzeugleiste zeigen"
 
-#: src/glabels-ui.xml.h:98
+#: src/glabels-ui.xml.h:114
 #, fuzzy
 msgid "Show tooltips in the main toolbar"
 msgstr "Miniaturhilfen in der Werkzeugleiste zeigen"
 
-#: src/glabels-ui.xml.h:99
+#: src/glabels-ui.xml.h:115
+msgid "Text color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:116
 msgid "U_n-select All"
 msgstr "_Markierung aufheben"
 
-#: src/glabels-ui.xml.h:100
+#: src/glabels-ui.xml.h:117
 msgid "Un-select All"
 msgstr "Markierung aufheben"
 
-#: src/glabels-ui.xml.h:101
+#: src/glabels-ui.xml.h:118
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: src/glabels-ui.xml.h:102
+#: src/glabels-ui.xml.h:119
 msgid "Undo the last action"
 msgstr "Die letzte Aktion rückgängig machen"
 
-#: src/glabels-ui.xml.h:103
+#: src/glabels-ui.xml.h:120
 #, fuzzy
 msgid "Zoom _1:1"
 msgstr "Zoom 1:1"
 
-#: src/glabels-ui.xml.h:104
+#: src/glabels-ui.xml.h:121
 #, fuzzy
 msgid "Zoom _In"
 msgstr "Vergrößern"
 
-#: src/glabels-ui.xml.h:105
+#: src/glabels-ui.xml.h:122
 #, fuzzy
 msgid "Zoom _Out"
 msgstr "Verkleinern"
 
-#: src/glabels-ui.xml.h:106
+#: src/glabels-ui.xml.h:123
 msgid "_About..."
 msgstr "_Info..."
 
-#: src/glabels-ui.xml.h:107
+#: src/glabels-ui.xml.h:124
 msgid "_Bottoms"
 msgstr ""
 
-#: src/glabels-ui.xml.h:108 src/stock.c:64
+#: src/glabels-ui.xml.h:125 src/stock.c:64
 #, fuzzy
 msgid "_Box"
 msgstr "Rechteck"
 
-#: src/glabels-ui.xml.h:109 src/stock.c:78
+#: src/glabels-ui.xml.h:126 src/stock.c:78
 #, fuzzy
 msgid "_Centers"
 msgstr "I_nhalt"
 
-#: src/glabels-ui.xml.h:110
+#: src/glabels-ui.xml.h:127
 msgid "_Close"
 msgstr "S_chließen"
 
-#: src/glabels-ui.xml.h:111
+#: src/glabels-ui.xml.h:128
 msgid "_Contents"
 msgstr "I_nhalt"
 
-#: src/glabels-ui.xml.h:112
+#: src/glabels-ui.xml.h:129
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: src/glabels-ui.xml.h:113
+#: src/glabels-ui.xml.h:130
 #, fuzzy
 msgid "_Create Object"
 msgstr "Linienobjekt erzeugen"
 
-#: src/glabels-ui.xml.h:114
+#: src/glabels-ui.xml.h:131
 msgid "_Debug"
 msgstr "_Fehlerdiagnose"
 
-#: src/glabels-ui.xml.h:115 src/view.c:3078
+#: src/glabels-ui.xml.h:132 src/view.c:3526
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: src/glabels-ui.xml.h:116
+#: src/glabels-ui.xml.h:133
 msgid "_Desktop Default"
 msgstr "_Desktop-Vorgabe"
 
-#: src/glabels-ui.xml.h:117
+#: src/glabels-ui.xml.h:134
 #, fuzzy
 msgid "_Drawing Toolbar"
 msgstr "Haupt-Werkzeugleiste"
 
-#: src/glabels-ui.xml.h:118
+#: src/glabels-ui.xml.h:135
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: src/glabels-ui.xml.h:119 src/stock.c:65
+#: src/glabels-ui.xml.h:136 src/stock.c:65
 #, fuzzy
 msgid "_Ellipse"
 msgstr "Ellipse"
 
-#: src/glabels-ui.xml.h:120
+#: src/glabels-ui.xml.h:137
 msgid "_File"
 msgstr "_Datei"
 
-#: src/glabels-ui.xml.h:121
+#: src/glabels-ui.xml.h:138
 msgid "_Grid"
 msgstr ""
 
-#: src/glabels-ui.xml.h:122
+#: src/glabels-ui.xml.h:139
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: src/glabels-ui.xml.h:123
+#: src/glabels-ui.xml.h:140
 msgid "_Icon"
 msgstr "_Icon"
 
-#: src/glabels-ui.xml.h:124 src/stock.c:66
+#: src/glabels-ui.xml.h:141 src/stock.c:66
 #, fuzzy
 msgid "_Image"
 msgstr "Bild"
 
-#: src/glabels-ui.xml.h:125 src/stock.c:76
+#: src/glabels-ui.xml.h:142 src/stock.c:76
 msgid "_Lefts"
 msgstr ""
 
-#: src/glabels-ui.xml.h:126 src/stock.c:63
+#: src/glabels-ui.xml.h:143 src/stock.c:63
 #, fuzzy
 msgid "_Line"
 msgstr "Linie"
 
-#: src/glabels-ui.xml.h:127
+#: src/glabels-ui.xml.h:144
 #, fuzzy
 msgid "_Main Toolbar"
 msgstr "Haupt-Werkzeugleiste"
 
-#: src/glabels-ui.xml.h:128
+#: src/glabels-ui.xml.h:145
 #, fuzzy
 msgid "_Merge Properties..."
 msgstr "Einstellungen bearbeiten..."
 
-#: src/glabels-ui.xml.h:129
+#: src/glabels-ui.xml.h:146
 msgid "_New"
 msgstr "_Neu"
 
-#: src/glabels-ui.xml.h:130
+#: src/glabels-ui.xml.h:147
 #, fuzzy
 msgid "_Objects"
 msgstr "Objekt-Vorgaben"
 
-#: src/glabels-ui.xml.h:131
+#: src/glabels-ui.xml.h:148
 msgid "_Open..."
 msgstr "Ö_ffnen..."
 
 #.
 #. * Submenu: Order
 #.
-#: src/glabels-ui.xml.h:132 src/view.c:2924
+#: src/glabels-ui.xml.h:149 src/view.c:3372
 msgid "_Order"
 msgstr ""
 
-#: src/glabels-ui.xml.h:133
+#: src/glabels-ui.xml.h:150
 msgid "_Paste"
 msgstr "_Einfügen"
 
-#: src/glabels-ui.xml.h:134
+#: src/glabels-ui.xml.h:151
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: src/glabels-ui.xml.h:135
+#: src/glabels-ui.xml.h:152
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: src/glabels-ui.xml.h:136 src/stock.c:77
+#: src/glabels-ui.xml.h:153 src/stock.c:77
 msgid "_Rights"
 msgstr ""
 
 #.
 #. * Submenu: Rotate/Flip
 #.
-#: src/glabels-ui.xml.h:137 src/view.c:2945
+#: src/glabels-ui.xml.h:154 src/view.c:3393
 #, fuzzy
 msgid "_Rotate/Flip"
 msgstr "Rotieren"
 
-#: src/glabels-ui.xml.h:138
+#: src/glabels-ui.xml.h:155
 msgid "_Save"
 msgstr "_Speichern"
 
-#: src/glabels-ui.xml.h:139 src/stock.c:61
+#: src/glabels-ui.xml.h:156 src/stock.c:61
 #, fuzzy
 msgid "_Select Mode"
 msgstr "Markieren"
 
-#: src/glabels-ui.xml.h:140 src/stock.c:62
+#: src/glabels-ui.xml.h:157 src/stock.c:62
 #, fuzzy
 msgid "_Text"
 msgstr "Text"
 
-#: src/glabels-ui.xml.h:141 src/stock.c:79
+#: src/glabels-ui.xml.h:158 src/stock.c:79
 #, fuzzy
 msgid "_Tops"
 msgstr "_Werkzeuge"
 
-#: src/glabels-ui.xml.h:142
+#: src/glabels-ui.xml.h:159
 msgid "_View"
 msgstr "_Ansicht"
 
@@ -692,27 +770,32 @@ msgid "Show ui debugging messages."
 msgstr "MDI Fehlerdiagnose-Ausgabe aktivieren."
 
 #: src/glabels.c:97
+#, fuzzy
+msgid "Show property_bar debugging messages."
+msgstr "Einstellungen-Fehlerdiagnose-Ausgabe aktivieren."
+
+#: src/glabels.c:100
 msgid "Show media select widget debugging messages."
 msgstr "Medienwahl Fehlerdiagnose-Ausgabe aktivieren."
 
-#: src/glabels.c:100
+#: src/glabels.c:103
 msgid "Show mini preview widget debugging messages."
 msgstr "Miniaturvorschau-Widget Fehlerdiagnose-Ausgabe aktivieren."
 
-#: src/glabels.c:103
+#: src/glabels.c:106
 #, fuzzy
 msgid "Show pixbuf cache debugging messages."
 msgstr "Ansichts-Fehlerdiagnose-Ausgabe aktivieren."
 
-#: src/glabels.c:106
+#: src/glabels.c:109
 msgid "Show widget debugging messages."
 msgstr "Widget-Fehlerdiagnose-Ausgabe aktivieren."
 
-#: src/glabels.c:109
+#: src/glabels.c:112
 msgid "Turn on all debugging messages."
 msgstr "Die gesamte Fehlerdiagnose-Ausgabe aktivieren."
 
-#: src/glabels.c:180
+#: src/glabels.c:184
 msgid "Could not initialize Bonobo!\n"
 msgstr ""
 
@@ -748,32 +831,32 @@ msgstr "Anzahl der Kopien (Vorgabe: 1)"
 msgid "copies"
 msgstr "Kopien"
 
-#: src/glabels-batch.c:58 src/print-dialog.c:200
+#: src/glabels-batch.c:58 src/print-dialog.c:210
 msgid "print outlines (to test printer alignment)"
 msgstr "Begrenzungen drucken (um Druckausrichtung zu testen)"
 
-#: src/glabels-batch.c:60 src/print-dialog.c:209
+#: src/glabels-batch.c:60 src/print-dialog.c:219
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "Spiegelbildlich drucken"
 
-#: src/glabels-batch.c:95
+#: src/glabels-batch.c:96
 msgid "[OPTION...] GLABELS_FILE..."
 msgstr "[OPTION...] GLABELS_DATEI..."
 
-#: src/glabels-batch.c:114
+#: src/glabels-batch.c:116
 msgid "missing glabels file\n"
 msgstr "fehlende glabels-Datei\n"
 
-#: src/glabels-batch.c:141
+#: src/glabels-batch.c:157
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "glabels-Datei %s kann nicht geöffnet werden\n"
 
-#: src/window.c:234
+#: src/window.c:242
 msgid "(none) - gLabels"
 msgstr ""
 
-#: src/window.c:399
+#: src/window.c:409
 msgid "(modified)"
 msgstr "(geändert)"
 
@@ -796,7 +879,21 @@ msgstr ""
 msgid "Centers"
 msgstr "Inhalt"
 
-#: src/commands.c:337
+#: src/ui-property-bar.c:346 src/wdgt-text-props.c:241 src/wdgt-bc-props.c:174
+#, fuzzy
+msgid "Default"
+msgstr "Löschen"
+
+#: src/ui-property-bar.c:361 src/wdgt-fill.c:175
+msgid "No fill"
+msgstr ""
+
+#: src/ui-property-bar.c:376 src/wdgt-line.c:201
+#, fuzzy
+msgid "No line"
+msgstr "Keine"
+
+#: src/commands.c:352
 msgid ""
 "A label and business card creation program for GNOME.\n"
 " \n"
@@ -820,91 +917,101 @@ msgstr ""
 "Dieses Programm wird verteilt in der Hoffnung, dass es nützlich ist, aber "
 "OHNE JEDE GARANTIE; Weitere Details in der GNU General Public License.\n"
 
-#: src/commands.c:351
+#: src/commands.c:366
 #, fuzzy
 msgid "See the file AUTHORS for additional credits,"
 msgstr "Lesen die Datei AUTHORS für zusätzliche Danksagungen,"
 
-#: src/commands.c:352
-msgid "or visit http://snaught.com/glabels"
+#: src/commands.c:367
+#, fuzzy
+msgid "or visit http://glabels.sourceforge.net/"
 msgstr "oder besuchen Sie http://snaught.com/glabels"
 
 #: src/commands.c:376
+msgid " "
+msgstr ""
+
+#: src/commands.c:391
 msgid "glabels"
 msgstr "glabels"
 
-#: src/file.c:82
+#: src/file.c:91
 msgid "New Label or Card"
 msgstr "Neues Etikett oder neue Karte"
 
-#: src/file.c:112
+#: src/file.c:121 src/file.c:291
 msgid "Media Type"
 msgstr "Medientyp"
 
-#: src/file.c:118
+#: src/file.c:127 src/file.c:297
 msgid "Label orientation"
 msgstr "Ausrichtung des Etiketts"
 
-#: src/file.c:248
+#: src/file.c:258
+#, fuzzy
+msgid "Label properties"
+msgstr "Rechteck bearbeiten..."
+
+#: src/file.c:423
 msgid "Open label"
 msgstr "Öffnen Etikett"
 
-#: src/file.c:296 src/file.c:594
+#: src/file.c:475 src/file.c:784
 #, fuzzy
 msgid "Empty file name selection"
 msgstr "Die Markierung kopieren"
 
-#: src/file.c:297 src/file.c:311
+#: src/file.c:476 src/file.c:490
 msgid "Please select a file or supply a valid file name"
 msgstr ""
 
-#: src/file.c:310
+#: src/file.c:489
 msgid "File does not exist"
 msgstr ""
 
-#: src/file.c:372
+#: src/file.c:564
 #, fuzzy, c-format
 msgid "Could not open file \"%s\""
 msgstr "Datei »%s« konnte nicht geöffnet werden"
 
-#: src/file.c:380
+#: src/file.c:572
 msgid "Not a supported file format"
 msgstr ""
 
-#: src/file.c:462 src/file.c:636
+#: src/file.c:653 src/file.c:828
 #, fuzzy, c-format
 msgid "Could not save file \"%s\""
 msgstr "Datei »%s« konnte nicht geöffnet werden"
 
-#: src/file.c:470 src/file.c:644
+#: src/file.c:661 src/file.c:836
 msgid "Error encountered during save.  The file is still not saved."
 msgstr ""
 
-#: src/file.c:512
+#: src/file.c:702
 #, fuzzy, c-format
 msgid "Save \"%s\" as"
 msgstr "Datei speichern unter"
 
-#: src/file.c:595
+#: src/file.c:785
 #, fuzzy
 msgid "Please supply a valid file name"
 msgstr "Dateinamen angeben"
 
-#: src/file.c:609
+#: src/file.c:801
 #, fuzzy, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr "Fehler beim Schreiben in Datei »%s«"
 
-#: src/file.c:617
+#: src/file.c:809
 msgid "File already exists."
 msgstr ""
 
-#: src/file.c:732
+#: src/file.c:924
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr ""
 
-#: src/file.c:740
+#: src/file.c:932
 #, fuzzy
 msgid "Your changes will be lost if you don't save them."
 msgstr ""
@@ -912,12 +1019,12 @@ msgstr ""
 "\n"
 "Nicht gespeicherte Änderungen gehen verloren."
 
-#: src/file.c:743
+#: src/file.c:935
 msgid "Close without saving"
 msgstr ""
 
 #. Should not happen
-#: src/prefs.c:664 src/prefs.c:671 src/wdgt-line.c:180
+#: src/prefs.c:664 src/prefs.c:671 src/wdgt-line.c:185
 msgid "points"
 msgstr "Punkte"
 
@@ -968,11 +1075,11 @@ msgstr "Millimeter"
 msgid "Default page size"
 msgstr "Standard Papierformat"
 
-#: src/prefs-dialog.c:309
+#: src/prefs-dialog.c:309 data/paper-sizes.xml.h:25
 msgid "US Letter"
 msgstr ""
 
-#: src/prefs-dialog.c:317
+#: src/prefs-dialog.c:317 data/paper-sizes.xml.h:6
 msgid "A4"
 msgstr ""
 
@@ -981,67 +1088,67 @@ msgid "Select default properties for new objects."
 msgstr "Wählen Sie die vorgegebenen Eigenschaften für neue Objekte."
 
 #. ------ text props entry ------
-#: src/prefs-dialog.c:359 src/view-text.c:314 src/view-text.c:634
+#: src/prefs-dialog.c:359 src/view-text.c:313 src/view-text.c:636
 #: src/wdgt-bc-style.c:184
 msgid "Text"
 msgstr "Text"
 
 #. ------ Line box ------
-#: src/prefs-dialog.c:368 src/view-line.c:304
+#: src/prefs-dialog.c:368 src/view-line.c:303
 msgid "Line"
 msgstr "Linie"
 
 #. ------ Fill box ------
-#: src/prefs-dialog.c:377 src/view-box.c:323 src/view-ellipse.c:323
+#: src/prefs-dialog.c:377 src/view-box.c:322 src/view-ellipse.c:322
 msgid "Fill"
 msgstr "Füllen"
 
 #.
 #. * Submenu: Align Horizontally
 #.
-#: src/view.c:2978
+#: src/view.c:3426
 msgid "Align _Horizontally"
 msgstr ""
 
 #.
 #. * Submenu: Align Vertically
 #.
-#: src/view.c:3017
+#: src/view.c:3465
 msgid "Align _Vertically"
 msgstr ""
 
-#: src/view-box.c:291
+#: src/view-box.c:290
 msgid "Edit box object properties"
 msgstr "Rechteck bearbeiten..."
 
 #. ---------------------------
 #. Outline section
 #. ---------------------------
-#: src/view-box.c:307 src/view-ellipse.c:307
+#: src/view-box.c:306 src/view-ellipse.c:306
 msgid "Outline"
 msgstr "Outline"
 
 #. ---------------------------
 #. Position section
 #. ---------------------------
-#: src/view-box.c:339 src/view-ellipse.c:339 src/view-line.c:320
-#: src/view-image.c:314 src/view-text.c:349 src/view-barcode.c:338
+#: src/view-box.c:338 src/view-ellipse.c:338 src/view-line.c:319
+#: src/view-image.c:314 src/view-text.c:348 src/view-barcode.c:337
 msgid "Position"
 msgstr "Position"
 
 #. ---------------------------
 #. Size section
 #. ---------------------------
-#: src/view-box.c:354 src/view-ellipse.c:354 src/view-line.c:338
+#: src/view-box.c:353 src/view-ellipse.c:353 src/view-line.c:337
 #: src/view-image.c:331
 msgid "Size"
 msgstr "Breite"
 
-#: src/view-ellipse.c:291
+#: src/view-ellipse.c:290
 msgid "Edit ellipse object properties"
 msgstr "Ellipse bearbeiten..."
 
-#: src/view-line.c:289
+#: src/view-line.c:288
 msgid "Edit line object properties"
 msgstr "Linienobjekt bearbeiten..."
 
@@ -1061,30 +1168,22 @@ msgstr "Bild"
 msgid "Reset image size"
 msgstr "Reset Bildgröße"
 
-#: src/view-text.c:299
+#: src/view-text.c:298
 msgid "Edit text object properties"
 msgstr "Text Objekt bearbeiten"
 
-#. ---------------------------
-#. Text Properties section
-#. ---------------------------
-#: src/view-text.c:331 src/view-barcode.c:306
-#, fuzzy
-msgid "Properties"
-msgstr "Barcode-Einstellungen"
-
-#: src/view-barcode.c:271
+#: src/view-barcode.c:270
 msgid "Edit barcode object properties"
 msgstr "Barcode bearbeiten..."
 
 #. ---------------------------
 #. Data section
 #. ---------------------------
-#: src/view-barcode.c:286 src/merge-properties-dialog.c:343
+#: src/view-barcode.c:285 src/merge-properties-dialog.c:343
 msgid "Data"
 msgstr "Wert"
 
-#: src/view-barcode.c:802 src/print.c:912
+#: src/view-barcode.c:803 src/print.c:1021
 msgid "Invalid barcode"
 msgstr "Ungültiger Barcode-Wert"
 
@@ -1127,72 +1226,76 @@ msgstr "Markieren"
 msgid "Record/Field"
 msgstr ""
 
-#: src/print-dialog.c:128
+#: src/print-dialog.c:138
 msgid "_Job"
 msgstr "_Auftrag"
 
-#: src/print-dialog.c:133
+#: src/print-dialog.c:143
 msgid "P_rinter"
 msgstr "_Drucker"
 
 #. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:163
+#: src/print-dialog.c:173
 msgid "Copies"
 msgstr "Kopien"
 
 #. ------- Otherwise add merge control widget ------------
-#: src/print-dialog.c:177
+#: src/print-dialog.c:187
 msgid "Document merge control"
 msgstr "Kontrolle der Mischung mit Datenquelle (Serienfunktion)"
 
 #. ----------- Add custom print options area ------------
-#: src/print-dialog.c:194
+#: src/print-dialog.c:204
 msgid "Options"
 msgstr "Optionen"
 
-#: src/print-dialog.c:336 src/print-dialog.c:374
+#: src/print-dialog.c:227
+msgid "print crop marks"
+msgstr ""
+
+#: src/print-dialog.c:364 src/print-dialog.c:403
 msgid "Print preview"
 msgstr "Druckvorschau"
 
-#: src/label.c:542
+#: src/label.c:563
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: src/template.c:296
+#: src/template.c:318
 #, c-format
 msgid "Generic %s full page"
 msgstr ""
 
-#: src/template.c:338
+#: src/template.c:362
 msgid "No template files found!"
 msgstr "Keine Vorlagedateien gefunden!"
 
-#: src/template.c:435
+#: src/template.c:461
 #, c-format
 msgid "%s x %s %s"
 msgstr "%s x %s %s"
 
-#: src/template.c:440
+#: src/template.c:466
 #, c-format
 msgid "%.5g x %.5g %s"
 msgstr "%.5g x %.5g %s"
 
-#: src/template.c:451 src/template.c:465
+#: src/template.c:477 src/template.c:491
 #, c-format
 msgid "%s %s diameter"
 msgstr ""
 
-#: src/template.c:455 src/template.c:469
+#: src/template.c:481 src/template.c:495
 #, c-format
 msgid "%.5g %s diameter"
 msgstr ""
 
-#: src/template.c:607
+#: src/template.c:633
 #, c-format
 msgid "%d x %d  (%d per sheet)"
 msgstr "%d x %d  (%d pro Seite)"
 
-#: src/template.c:611
+#: src/template.c:637
 #, fuzzy, c-format
 msgid "%d per sheet"
 msgstr "%d x %d  (%d pro Seite)"
@@ -1202,53 +1305,69 @@ msgstr "%d x %d  (%d pro Seite)"
 msgid "No paper files found!"
 msgstr "Keine Vorlagedateien gefunden!"
 
-#: src/xml-label.c:171 src/xml-label.c:204
+#: src/xml-label.c:177 src/xml-label.c:214
 msgid "xmlParseFile error"
 msgstr "Fehler: xmlParseFile error"
 
-#: src/xml-label.c:241
+#: src/xml-label.c:251
 msgid "No document root"
 msgstr "Kein document root"
 
-#: src/xml-label.c:253
+#: src/xml-label.c:263
 msgid "Importing from glabels 0.1 format"
 msgstr "Aus dem glabels 0.1-Format wird importiert"
 
-#: src/xml-label.c:261
+#: src/xml-label.c:271
 msgid "Importing from glabels 0.4 format"
 msgstr "Aus dem glabels 0.4-Format wird importiert"
 
-#: src/xml-label.c:264
+#: src/xml-label.c:278
+#, fuzzy
+msgid "Importing from glabels 1.91 format"
+msgstr "Aus dem glabels 0.1-Format wird importiert"
+
+#: src/xml-label.c:281
 msgid "bad document, unknown glabels Namespace"
 msgstr "Fehlerhaftes Dokument, unbekannter glabels Namespace"
 
-#: src/xml-label.c:292 src/xml-label-04.c:75
+#: src/xml-label.c:310 src/xml-label-04.c:75 src/xml-label-191.c:131
 #, c-format
 msgid "Bad root node = \"%s\""
 msgstr "Fehlerhafter root node = \"%s\""
 
-#: src/xml-label.c:325
+#: src/xml-label.c:345 src/xml-label-191.c:164
 #, fuzzy, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "Fehlerhafter root node = \"%s\""
 
-#: src/xml-label.c:357 src/xml-label-04.c:123
+#: src/xml-label.c:387 src/xml-label-04.c:123 src/xml-label-191.c:196
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr "fehlerhafter node =  \"%s\""
 
-#: src/xml-label.c:763
+#: src/xml-label.c:783 src/xml-label-191.c:602
 #, fuzzy, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "fehlerhafter node =  \"%s\""
 
-#: src/xml-label.c:831
+#: src/xml-label.c:944
+msgid "Utf8 conversion error."
+msgstr ""
+
+#: src/xml-label.c:951
 msgid "Problem saving xml file."
 msgstr "Problem beim Speichern der xml-Datei."
 
-#: src/xml-template.c:157
+#. This should always be an id, but just in case a name
+#. slips by!
+#: src/xml-label-191.c:680 src/xml-template.c:169
 #, c-format
-msgid "Unknown page size id \"%s\""
+msgid "Unknown page size id \"%s\", trying as name"
+msgstr ""
+
+#: src/xml-label-191.c:690 src/xml-template.c:179
+#, c-format
+msgid "Unknown page size id or name \"%s\""
 msgstr ""
 
 #: src/merge.c:172 src/merge.c:213 src/merge.c:398 src/merge.c:401
@@ -1271,18 +1390,18 @@ msgid "Text file with tab delimeters"
 msgstr "Text mit Tabulatoren als Trennern"
 
 #. Font label
-#: src/wdgt-text-props.c:181
+#: src/wdgt-text-props.c:185
 msgid "Font:"
 msgstr "Schrift:"
 
 #. Text Color Label
-#: src/wdgt-text-props.c:230 src/wdgt-line.c:189 src/wdgt-fill.c:164
-#: src/wdgt-bc-props.c:164
+#: src/wdgt-text-props.c:234 src/wdgt-line.c:194 src/wdgt-fill.c:168
+#: src/wdgt-bc-props.c:167
 msgid "Color:"
 msgstr "Farbe:"
 
 #. Alignment label
-#: src/wdgt-text-props.c:246
+#: src/wdgt-text-props.c:255
 msgid "Alignment:"
 msgstr "Ausrichtung:"
 
@@ -1312,7 +1431,7 @@ msgid "Y:"
 msgstr "Y:"
 
 #. W Label
-#: src/wdgt-size.c:187 src/wdgt-line.c:166
+#: src/wdgt-size.c:187 src/wdgt-line.c:171
 msgid "Width:"
 msgstr "Breite:"
 
@@ -1411,10 +1530,536 @@ msgstr "Layout:"
 msgid "Rotate"
 msgstr "Rotieren"
 
-#: src/gnome-recent-view-bonobo.c:189
-#, c-format
-msgid "Open %s"
-msgstr "%s öffnen"
+#. This is the default custom color
+#: src/mygal/color-palette.c:396
+#, fuzzy
+msgid "custom"
+msgstr "Anpassen"
+
+#. "Custom" color - we'll pop up a GnomeColorPicker
+#: src/mygal/color-palette.c:438
+#, fuzzy
+msgid "Custom Color:"
+msgstr "Werkzeugleisten anpassen"
+
+#: src/mygal/color-palette.c:446
+msgid "Choose Custom Color"
+msgstr ""
+
+#: src/mygal/color-palette.c:579
+msgid "black"
+msgstr ""
+
+#: src/mygal/color-palette.c:580
+msgid "light brown"
+msgstr ""
+
+#: src/mygal/color-palette.c:581
+msgid "brown gold"
+msgstr ""
+
+#: src/mygal/color-palette.c:582
+msgid "dark green #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:583
+msgid "navy"
+msgstr ""
+
+#: src/mygal/color-palette.c:584 src/mygal/color-palette.c:640
+msgid "dark blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:585
+msgid "purple #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:586
+msgid "very dark gray"
+msgstr ""
+
+#: src/mygal/color-palette.c:589 src/mygal/color-palette.c:645
+msgid "dark red"
+msgstr ""
+
+#: src/mygal/color-palette.c:590
+msgid "red-orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:591
+msgid "gold"
+msgstr ""
+
+#: src/mygal/color-palette.c:592
+msgid "dark green"
+msgstr ""
+
+#: src/mygal/color-palette.c:593 src/mygal/color-palette.c:646
+msgid "dull blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:594 src/mygal/color-palette.c:647
+msgid "blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:595
+msgid "dull purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:596
+msgid "dark grey"
+msgstr ""
+
+#: src/mygal/color-palette.c:599
+msgid "red"
+msgstr ""
+
+#: src/mygal/color-palette.c:600
+msgid "orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:601
+msgid "lime"
+msgstr ""
+
+#: src/mygal/color-palette.c:602
+msgid "dull green"
+msgstr ""
+
+#: src/mygal/color-palette.c:603
+msgid "dull blue #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:604
+msgid "sky blue #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:605 src/mygal/color-palette.c:644
+msgid "purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:606
+msgid "gray"
+msgstr ""
+
+#: src/mygal/color-palette.c:609 src/mygal/color-palette.c:641
+#, fuzzy
+msgid "magenta"
+msgstr "Bild"
+
+#: src/mygal/color-palette.c:610
+msgid "bright orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:611 src/mygal/color-palette.c:642
+msgid "yellow"
+msgstr ""
+
+#: src/mygal/color-palette.c:612
+#, fuzzy
+msgid "green"
+msgstr "Grad"
+
+#: src/mygal/color-palette.c:613 src/mygal/color-palette.c:643
+msgid "cyan"
+msgstr ""
+
+#: src/mygal/color-palette.c:614
+msgid "bright blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:615 src/mygal/color-palette.c:632
+msgid "red purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:616
+msgid "light grey"
+msgstr ""
+
+#: src/mygal/color-palette.c:619 src/mygal/color-palette.c:636
+msgid "pink"
+msgstr ""
+
+#: src/mygal/color-palette.c:620
+msgid "light orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:621 src/mygal/color-palette.c:633
+msgid "light yellow"
+msgstr ""
+
+#: src/mygal/color-palette.c:622
+msgid "light green"
+msgstr ""
+
+#: src/mygal/color-palette.c:623
+msgid "light cyan"
+msgstr ""
+
+#: src/mygal/color-palette.c:624 src/mygal/color-palette.c:634
+msgid "light blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:625 src/mygal/color-palette.c:638
+msgid "light purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:626
+msgid "white"
+msgstr ""
+
+#: src/mygal/color-palette.c:631
+msgid "purplish blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:635
+msgid "dark purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:637
+msgid "sky blue"
+msgstr ""
+
+#: data/paper-sizes.xml.h:1
+msgid "A0"
+msgstr ""
+
+#: data/paper-sizes.xml.h:2
+msgid "A1"
+msgstr ""
+
+#: data/paper-sizes.xml.h:3
+msgid "A10"
+msgstr ""
+
+#: data/paper-sizes.xml.h:4
+msgid "A2"
+msgstr ""
+
+#: data/paper-sizes.xml.h:5
+msgid "A3"
+msgstr ""
+
+#: data/paper-sizes.xml.h:7
+msgid "A5"
+msgstr ""
+
+#: data/paper-sizes.xml.h:8
+msgid "A6"
+msgstr ""
+
+#: data/paper-sizes.xml.h:9
+msgid "A7"
+msgstr ""
+
+#: data/paper-sizes.xml.h:10
+msgid "A8"
+msgstr ""
+
+#: data/paper-sizes.xml.h:11
+msgid "A9"
+msgstr ""
+
+#: data/paper-sizes.xml.h:12
+msgid "B0"
+msgstr ""
+
+#: data/paper-sizes.xml.h:13
+msgid "B1"
+msgstr ""
+
+#: data/paper-sizes.xml.h:14
+msgid "B10"
+msgstr ""
+
+#: data/paper-sizes.xml.h:15
+msgid "B2"
+msgstr ""
+
+#: data/paper-sizes.xml.h:16
+msgid "B3"
+msgstr ""
+
+#: data/paper-sizes.xml.h:17
+msgid "B4"
+msgstr ""
+
+#: data/paper-sizes.xml.h:18
+msgid "B5"
+msgstr ""
+
+#: data/paper-sizes.xml.h:19
+msgid "B6"
+msgstr ""
+
+#: data/paper-sizes.xml.h:20
+msgid "B7"
+msgstr ""
+
+#: data/paper-sizes.xml.h:21
+msgid "B8"
+msgstr ""
+
+#: data/paper-sizes.xml.h:22
+msgid "B9"
+msgstr ""
+
+#: data/paper-sizes.xml.h:23
+msgid "US Executive"
+msgstr ""
+
+#: data/paper-sizes.xml.h:24
+msgid "US Legal"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:1
+msgid "Address Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:2 data/avery-iso-templates.xml.h:3
+#: data/zweckform-iso-templates.xml.h:2 data/misc-us-templates.xml.h:2
+#: data/misc-iso-templates.xml.h:9
+msgid "Business Cards"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:3
+msgid "CD/DVD Labels (Disc Labels)"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:4
+msgid "Diskette Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:5
+#, fuzzy
+msgid "Filing Labels"
+msgstr "Labels"
+
+#: data/avery-us-templates.xml.h:6
+msgid "Full Sheet Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:7
+#, fuzzy
+msgid "Large Round Labels"
+msgstr "Start bei Etikett"
+
+#: data/avery-us-templates.xml.h:8
+msgid "Name Badge Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:9
+msgid "Return Address Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:10
+msgid "Shipping Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:11
+#, fuzzy
+msgid "Small Round Labels"
+msgstr "Start bei Etikett"
+
+#: data/avery-us-templates.xml.h:12
+#, fuzzy
+msgid "Square Labels"
+msgstr "Labels"
+
+#: data/avery-us-templates.xml.h:13
+msgid "Video Tape Face Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:14
+msgid "Video Tape Spine Labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:1
+msgid "3.5'' Diskette labels (face only)"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:2
+msgid "Address labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:4 data/zweckform-iso-templates.xml.h:4
+#: data/misc-us-templates.xml.h:4 data/misc-iso-templates.xml.h:10
+#, fuzzy
+msgid "CD/DVD Labels"
+msgstr "Labels"
+
+#: data/avery-iso-templates.xml.h:5 data/misc-iso-templates.xml.h:16
+msgid "Mailing Labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:6
+#, fuzzy
+msgid "Mailing labels"
+msgstr "glabels"
+
+#: data/avery-iso-templates.xml.h:7
+msgid "Mini Address"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:8
+#, fuzzy
+msgid "Shipping labels"
+msgstr "Öffnen Etikett"
+
+#: data/zweckform-iso-templates.xml.h:1
+#, fuzzy
+msgid "Allround Labels"
+msgstr "glabels"
+
+#: data/zweckform-iso-templates.xml.h:3
+#, fuzzy
+msgid "CD Labels"
+msgstr "Labels"
+
+#: data/zweckform-iso-templates.xml.h:5
+msgid "Correction and Cover-up Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:6
+msgid "Lever Arch File Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:7
+msgid "Mailing Labels -- 12"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:8
+msgid "QSL-Karten Etiketten 70mm x 50,8mm"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:9
+msgid "Rectangular Copier Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:10 data/misc-iso-templates.xml.h:20
+msgid "Rectangular Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:11
+msgid "Video Labels (back)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:1
+msgid "Business Card CD"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:3
+msgid "CD Template Rectangles"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:5
+msgid "CD/DVD Labels (Face Only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:6 data/misc-iso-templates.xml.h:11
+msgid "CD/DVD Labels (face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:7
+#, fuzzy
+msgid "DLT Labels"
+msgstr "Labels"
+
+#: data/misc-us-templates.xml.h:8
+#, fuzzy
+msgid "Microtube labels"
+msgstr "glabels"
+
+#: data/misc-us-templates.xml.h:9
+msgid "Mini-CD Labels"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:10
+msgid "PRO CD Labels 2-up (CD spine only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:11
+msgid "PRO CD Labels 2-up (Face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:12
+msgid "PRO CD Labels 2-up (face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:13
+msgid "Slimline CD Case (rightside up)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:14
+msgid "Slimline CD Case (upside down)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:1
+msgid "Agipa 119488: Business Cards"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:2
+msgid "Allround Labels --24"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:3
+msgid "Allround Labels --44"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:4
+msgid "Allround Labels --64"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:5
+msgid "Allround Labels --65"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:6
+msgid "Arch File Labels"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:7
+msgid "Arch File Labels (large)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:8
+msgid "Arch File Labels (small)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:12
+msgid "CD/DVD Labels Standard Format (face only)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:13
+msgid "Diskette Labels (face only)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:14
+msgid "EPSON Photo Stickers 16"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:15
+msgid "Etiketten"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:17
+msgid "Mailing Labels --14"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:18
+msgid "Mailing Labels-2 columns"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:19
+msgid "Mailing Labels-3 columns"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:21
+msgid "Video Labels (face only)"
+msgstr ""
+
+#~ msgid "Open %s"
+#~ msgstr "%s öffnen"
 
 #~ msgid "About this application"
 #~ msgstr "Info zu dieser Anwendung"
@@ -1428,10 +2073,6 @@ msgstr "%s öffnen"
 #~ msgid "Close all open files"
 #~ msgstr "Alle geöffneten Dateien schließen"
 
-# CHECK
-#~ msgid "Tools toolbar"
-#~ msgstr "Werkzeugleisten-Werkzeuge"
-
 #~ msgid "_Documents"
 #~ msgstr "_Dokumente"
 
diff --git a/glabels2/po/es.po b/glabels2/po/es.po
index c6ffe62c..ee24fed0 100644
--- a/glabels2/po/es.po
+++ b/glabels2/po/es.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # victor <victor@pasmao.net>, 2002.
 # 
-#: src/commands.c:361
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels 0.2.0\n"
-"POT-Creation-Date: 2003-06-22 01:12-0400\n"
+"POT-Creation-Date: 2003-11-01 19:24-0500\n"
 "PO-Revision-Date: 2002-04-16 12:19+0200\n"
 "Last-Translator: victor <victor@pasmao.net>\n"
 "Language-Team: Spanish/Spain <es@li.org>\n"
@@ -59,515 +58,592 @@ msgstr ""
 msgid "Bar_code"
 msgstr "Código de barras"
 
-#: src/glabels-ui.xml.h:12 src/stock.c:70
+#: src/glabels-ui.xml.h:12
+msgid "Bold"
+msgstr ""
+
+#: src/glabels-ui.xml.h:13 src/stock.c:70
 #, fuzzy
 msgid "Bring to _Front"
 msgstr "Traer al frente"
 
-#: src/glabels-ui.xml.h:13
+#: src/glabels-ui.xml.h:14
+#, fuzzy
+msgid "Center align"
+msgstr "General"
+
+#: src/glabels-ui.xml.h:15
 msgid "Center objects to horizontal label center"
 msgstr ""
 
-#: src/glabels-ui.xml.h:14
+#: src/glabels-ui.xml.h:16
 msgid "Center objects to vertical label center"
 msgstr ""
 
-#: src/glabels-ui.xml.h:15
+#: src/glabels-ui.xml.h:17
 msgid "Change the visibility of markup lines in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:16
+#: src/glabels-ui.xml.h:18
 msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:17
+#: src/glabels-ui.xml.h:19
 msgid "Change the visibility of the grid in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:18
+#: src/glabels-ui.xml.h:20
 msgid "Change the visibility of the main toolbar in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:19
+#: src/glabels-ui.xml.h:21
 msgid "Close"
 msgstr ""
 
-#: src/glabels-ui.xml.h:20
+#: src/glabels-ui.xml.h:22
 #, fuzzy
 msgid "Close the current file"
 msgstr "Guardar el archivo en uso"
 
-#: src/glabels-ui.xml.h:21
+#: src/glabels-ui.xml.h:23
 msgid "Configure the application"
 msgstr ""
 
-#: src/glabels-ui.xml.h:22
+#: src/glabels-ui.xml.h:24
 msgid "Contents"
 msgstr ""
 
-#: src/glabels-ui.xml.h:23
+#: src/glabels-ui.xml.h:25
 msgid "Copy"
 msgstr ""
 
-#: src/glabels-ui.xml.h:24
+#: src/glabels-ui.xml.h:26
 #, fuzzy
 msgid "Copy the selection"
 msgstr "Eliminar todas las selecciones"
 
-#: src/glabels-ui.xml.h:25
+#: src/glabels-ui.xml.h:27
 #, fuzzy
 msgid "Create a new document"
 msgstr "Crear un objeto línea"
 
-#: src/glabels-ui.xml.h:26
+#: src/glabels-ui.xml.h:28
 msgid "Create barcode object"
 msgstr "Crear un objeto código de barras"
 
-#: src/glabels-ui.xml.h:27
+#: src/glabels-ui.xml.h:29
 msgid "Create box/rectangle object"
 msgstr "Crear un objeto tipo caja/rectángulo"
 
-#: src/glabels-ui.xml.h:28
+#: src/glabels-ui.xml.h:30
 msgid "Create ellipse/circle object"
 msgstr "Crear un objeto circular/elíptico"
 
-#: src/glabels-ui.xml.h:29
+#: src/glabels-ui.xml.h:31
 msgid "Create image object"
 msgstr "Crear un objeto imagen"
 
-#: src/glabels-ui.xml.h:30
+#: src/glabels-ui.xml.h:32
 msgid "Create line object"
 msgstr "Crear un objeto línea"
 
-#: src/glabels-ui.xml.h:31
+#: src/glabels-ui.xml.h:33
 msgid "Create text object"
 msgstr "Crear un objeto de texto"
 
-#: src/glabels-ui.xml.h:32
+#: src/glabels-ui.xml.h:34
 msgid "Cu_t"
 msgstr ""
 
-#: src/glabels-ui.xml.h:33
+#: src/glabels-ui.xml.h:35
 #, fuzzy
 msgid "Customize"
 msgstr "Campo clave personalizable"
 
-#: src/glabels-ui.xml.h:34
+#: src/glabels-ui.xml.h:36
 msgid "Customize Drawing Toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:35
+#: src/glabels-ui.xml.h:37
 msgid "Customize Main Toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:36
+#: src/glabels-ui.xml.h:38
 msgid "Customize toolbars"
 msgstr ""
 
-#: src/glabels-ui.xml.h:37
+#: src/glabels-ui.xml.h:39
 msgid "Cut"
 msgstr ""
 
-#: src/glabels-ui.xml.h:38
+#: src/glabels-ui.xml.h:40
 msgid "Cut the selection"
 msgstr ""
 
-#: src/glabels-ui.xml.h:39
+#: src/glabels-ui.xml.h:41
 msgid "Decrease magnification"
 msgstr ""
 
-#: src/glabels-ui.xml.h:40
+#: src/glabels-ui.xml.h:42
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/glabels-ui.xml.h:41
+#: src/glabels-ui.xml.h:43
 #, fuzzy
 msgid "Delete the selected objects"
 msgstr "Crear un objeto de texto"
 
-#: src/glabels-ui.xml.h:42
+#: src/glabels-ui.xml.h:44
 msgid "Drawing toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:43
+#: src/glabels-ui.xml.h:45
 msgid "Dump XML"
 msgstr ""
 
-#: src/glabels-ui.xml.h:44
+#: src/glabels-ui.xml.h:46
 msgid "Dump the UI Xml description"
 msgstr ""
 
-#: src/glabels-ui.xml.h:45
+#: src/glabels-ui.xml.h:47
 msgid "Edit merge properties"
 msgstr "Modificar propiedades de fusión de datos"
 
-#: src/glabels-ui.xml.h:46
+#: src/glabels-ui.xml.h:48
 #, fuzzy
 msgid "Edit object properties"
 msgstr "Modificar propiedades del objeto caja"
 
-#: src/glabels-ui.xml.h:47 src/stock.c:74
+#: src/glabels-ui.xml.h:49 src/stock.c:84
+msgid "Fill color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:50 src/stock.c:74
 msgid "Flip _Horizontally"
 msgstr ""
 
-#: src/glabels-ui.xml.h:48 src/stock.c:75
+#: src/glabels-ui.xml.h:51 src/stock.c:75
 msgid "Flip _Vertically"
 msgstr ""
 
-#: src/glabels-ui.xml.h:49
+#: src/glabels-ui.xml.h:52
 msgid "Flip object horizontally"
 msgstr ""
 
-#: src/glabels-ui.xml.h:50
+#: src/glabels-ui.xml.h:53
 msgid "Flip object vertically"
 msgstr ""
 
-#: src/glabels-ui.xml.h:51
+#: src/glabels-ui.xml.h:54
+#, fuzzy
+msgid "Font name"
+msgstr "No salvar"
+
+#: src/glabels-ui.xml.h:55
+#, fuzzy
+msgid "Font selector"
+msgstr "Eliminar todas las selecciones"
+
+#: src/glabels-ui.xml.h:56
+#, fuzzy
+msgid "Font size"
+msgstr "No salvar"
+
+#: src/glabels-ui.xml.h:57
 msgid "Icon and _Text"
 msgstr ""
 
-#: src/glabels-ui.xml.h:52
+#: src/glabels-ui.xml.h:58
 msgid "Increase magnification"
 msgstr ""
 
-#: src/glabels-ui.xml.h:53 src/stock.c:82 src/stock.c:83
+#: src/glabels-ui.xml.h:59
+msgid "Italic"
+msgstr ""
+
+#: src/glabels-ui.xml.h:60 src/stock.c:82 src/stock.c:83
 msgid "Label Ce_nter"
 msgstr ""
 
-#: src/glabels-ui.xml.h:54
+#: src/glabels-ui.xml.h:61
+msgid "Left align"
+msgstr ""
+
+#: src/glabels-ui.xml.h:62 src/stock.c:85
+msgid "Line color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:63
+msgid "Line width"
+msgstr ""
+
+#: src/glabels-ui.xml.h:64
 msgid "Lower object to bottom"
 msgstr ""
 
-#: src/glabels-ui.xml.h:55
+#: src/glabels-ui.xml.h:65
 msgid "M_arkup"
 msgstr ""
 
-#: src/glabels-ui.xml.h:56
+#: src/glabels-ui.xml.h:66
 msgid "Main toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:57
+#: src/glabels-ui.xml.h:67
 msgid "Markup"
 msgstr ""
 
-#: src/glabels-ui.xml.h:58
+#: src/glabels-ui.xml.h:68
 #, fuzzy
 msgid "New"
 msgstr "_Nuevo"
 
-#: src/glabels-ui.xml.h:59
+#: src/glabels-ui.xml.h:69
 #, fuzzy
 msgid "Object _Properties..."
 msgstr "Propiedades del texto"
 
-#: src/glabels-ui.xml.h:60
+#: src/glabels-ui.xml.h:70
 msgid "Only show icons in the drawing toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:61
+#: src/glabels-ui.xml.h:71
 msgid "Only show icons in the main toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:62 src/file.c:246
+#: src/glabels-ui.xml.h:72 src/file.c:421
 msgid "Open"
 msgstr "Abrir"
 
-#: src/glabels-ui.xml.h:63
+#: src/glabels-ui.xml.h:73
 msgid "Open a file"
 msgstr "Abrir un archivo"
 
-#: src/glabels-ui.xml.h:64
+#: src/glabels-ui.xml.h:74
 #, fuzzy
 msgid "Open the glabels manual"
 msgstr "Abrir etiqueta"
 
-#: src/glabels-ui.xml.h:65
+#: src/glabels-ui.xml.h:75
 msgid "Paste"
 msgstr ""
 
-#: src/glabels-ui.xml.h:66
+#: src/glabels-ui.xml.h:76
 msgid "Paste the clipboard"
 msgstr ""
 
-#: src/glabels-ui.xml.h:67
+#: src/glabels-ui.xml.h:77
 #, fuzzy
 msgid "Pr_eferences..."
 msgstr "Glabels: Preferencias"
 
-#: src/glabels-ui.xml.h:68
+#: src/glabels-ui.xml.h:78
 #, fuzzy
 msgid "Preferences"
 msgstr "Glabels: Preferencias"
 
-#: src/glabels-ui.xml.h:69 src/print-dialog.c:104
+#: src/glabels-ui.xml.h:79 src/print-dialog.c:114
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/glabels-ui.xml.h:70
+#: src/glabels-ui.xml.h:80
 #, fuzzy
 msgid "Print the current file"
 msgstr "Imprimir el archivo en uso"
 
-#: src/glabels-ui.xml.h:71
+#: src/glabels-ui.xml.h:81
+#, fuzzy
+msgid "Proper_ties"
+msgstr "Propiedades del texto"
+
+#. ---------------------------
+#. Text Properties section
+#. ---------------------------
+#: src/glabels-ui.xml.h:82 src/view-text.c:330 src/view-barcode.c:305
+#, fuzzy
+msgid "Properties"
+msgstr "Propiedades del texto"
+
+#: src/glabels-ui.xml.h:83
+msgid "Property toolbar"
+msgstr ""
+
+#: src/glabels-ui.xml.h:84
 msgid "Quit"
 msgstr ""
 
-#: src/glabels-ui.xml.h:72
+#: src/glabels-ui.xml.h:85
 msgid "Quit the program"
 msgstr ""
 
-#: src/glabels-ui.xml.h:73
+#: src/glabels-ui.xml.h:86
 msgid "Raise object to top"
 msgstr ""
 
-#: src/glabels-ui.xml.h:74
+#: src/glabels-ui.xml.h:87
 msgid "Recent _Files"
 msgstr ""
 
-#: src/glabels-ui.xml.h:75
+#: src/glabels-ui.xml.h:88
 msgid "Redo"
 msgstr ""
 
-#: src/glabels-ui.xml.h:76
+#: src/glabels-ui.xml.h:89
 msgid "Redo the undone action"
 msgstr ""
 
-#: src/glabels-ui.xml.h:77
+#: src/glabels-ui.xml.h:90
 msgid "Remove all selections"
 msgstr "Eliminar todas las selecciones"
 
-#: src/glabels-ui.xml.h:79
+#: src/glabels-ui.xml.h:92
 #, no-c-format
 msgid "Restore scale to 100%"
 msgstr ""
 
-#: src/glabels-ui.xml.h:80 src/stock.c:72
+#: src/glabels-ui.xml.h:93
+msgid "Right align"
+msgstr ""
+
+#: src/glabels-ui.xml.h:94 src/stock.c:72
 #, fuzzy
 msgid "Rotate _Left"
 msgstr "Rotar"
 
-#: src/glabels-ui.xml.h:81 src/stock.c:73
+#: src/glabels-ui.xml.h:95 src/stock.c:73
 #, fuzzy
 msgid "Rotate _Right"
 msgstr "Rotar"
 
-#: src/glabels-ui.xml.h:82
+#: src/glabels-ui.xml.h:96
 msgid "Rotate object 90 clockwise"
 msgstr ""
 
-#: src/glabels-ui.xml.h:83
+#: src/glabels-ui.xml.h:97
 msgid "Rotate object 90 counter-clockwise"
 msgstr ""
 
-#: src/glabels-ui.xml.h:84
+#: src/glabels-ui.xml.h:98
 #, fuzzy
 msgid "Save"
 msgstr "Salva como"
 
-#: src/glabels-ui.xml.h:85
+#: src/glabels-ui.xml.h:99
 msgid "Save As"
 msgstr "Salva como"
 
-#: src/glabels-ui.xml.h:86
+#: src/glabels-ui.xml.h:100
 #, fuzzy
 msgid "Save _As..."
 msgstr "Salva como"
 
-#: src/glabels-ui.xml.h:87
+#: src/glabels-ui.xml.h:101
 #, fuzzy
 msgid "Save the current file"
 msgstr "Guardar el archivo en uso"
 
-#: src/glabels-ui.xml.h:88
+#: src/glabels-ui.xml.h:102
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: src/glabels-ui.xml.h:89
+#: src/glabels-ui.xml.h:103
 #, fuzzy
 msgid "Select All"
 msgstr "_Deseleccionar todo"
 
-#: src/glabels-ui.xml.h:90
+#: src/glabels-ui.xml.h:104
 #, fuzzy
 msgid "Select _All"
 msgstr "_Deseleccionar todo"
 
-#: src/glabels-ui.xml.h:91
+#: src/glabels-ui.xml.h:105
 #, fuzzy
 msgid "Select all objects"
 msgstr "Seleccionar, mover y modificar objetos"
 
-#: src/glabels-ui.xml.h:92
+#: src/glabels-ui.xml.h:106
 msgid "Select, move and modify objects"
 msgstr "Seleccionar, mover y modificar objetos"
 
-#: src/glabels-ui.xml.h:93 src/stock.c:71
+#: src/glabels-ui.xml.h:107 src/stock.c:71
 #, fuzzy
 msgid "Send to _Back"
 msgstr "Enviar al fondo"
 
-#: src/glabels-ui.xml.h:94
+#: src/glabels-ui.xml.h:108
 msgid "Set drawing toolbar button style according to desktop default"
 msgstr ""
 
-#: src/glabels-ui.xml.h:95
+#: src/glabels-ui.xml.h:109
 msgid "Set main toolbar button style according to desktop default"
 msgstr ""
 
-#: src/glabels-ui.xml.h:96
+#: src/glabels-ui.xml.h:110
 msgid "Show _Tooltips"
 msgstr ""
 
-#: src/glabels-ui.xml.h:97
+#: src/glabels-ui.xml.h:111
+msgid "Show both icons and texts in the drawing toolbar"
+msgstr ""
+
+#: src/glabels-ui.xml.h:112
+msgid "Show both icons and texts in the main toolbar"
+msgstr ""
+
+#: src/glabels-ui.xml.h:113
 msgid "Show tooltips in the drawing toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:98
+#: src/glabels-ui.xml.h:114
 msgid "Show tooltips in the main toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:99
+#: src/glabels-ui.xml.h:115
+msgid "Text color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:116
 #, fuzzy
 msgid "U_n-select All"
 msgstr "_Deseleccionar todo"
 
-#: src/glabels-ui.xml.h:100
+#: src/glabels-ui.xml.h:117
 #, fuzzy
 msgid "Un-select All"
 msgstr "_Deseleccionar todo"
 
-#: src/glabels-ui.xml.h:101
+#: src/glabels-ui.xml.h:118
 msgid "Undo"
 msgstr ""
 
-#: src/glabels-ui.xml.h:102
+#: src/glabels-ui.xml.h:119
 msgid "Undo the last action"
 msgstr ""
 
-#: src/glabels-ui.xml.h:103
+#: src/glabels-ui.xml.h:120
 #, fuzzy
 msgid "Zoom _1:1"
 msgstr "Vista 1:1"
 
-#: src/glabels-ui.xml.h:104
+#: src/glabels-ui.xml.h:121
 #, fuzzy
 msgid "Zoom _In"
 msgstr "Agrandar "
 
-#: src/glabels-ui.xml.h:105
+#: src/glabels-ui.xml.h:122
 #, fuzzy
 msgid "Zoom _Out"
 msgstr "Reducir"
 
-#: src/glabels-ui.xml.h:106
+#: src/glabels-ui.xml.h:123
 msgid "_About..."
 msgstr ""
 
-#: src/glabels-ui.xml.h:107
+#: src/glabels-ui.xml.h:124
 msgid "_Bottoms"
 msgstr ""
 
-#: src/glabels-ui.xml.h:108 src/stock.c:64
+#: src/glabels-ui.xml.h:125 src/stock.c:64
 #, fuzzy
 msgid "_Box"
 msgstr "Caja"
 
-#: src/glabels-ui.xml.h:109 src/stock.c:78
+#: src/glabels-ui.xml.h:126 src/stock.c:78
 msgid "_Centers"
 msgstr ""
 
-#: src/glabels-ui.xml.h:110
+#: src/glabels-ui.xml.h:127
 msgid "_Close"
 msgstr ""
 
-#: src/glabels-ui.xml.h:111
+#: src/glabels-ui.xml.h:128
 msgid "_Contents"
 msgstr ""
 
-#: src/glabels-ui.xml.h:112
+#: src/glabels-ui.xml.h:129
 msgid "_Copy"
 msgstr ""
 
-#: src/glabels-ui.xml.h:113
+#: src/glabels-ui.xml.h:130
 #, fuzzy
 msgid "_Create Object"
 msgstr "Crear un objeto de texto"
 
-#: src/glabels-ui.xml.h:114
+#: src/glabels-ui.xml.h:131
 msgid "_Debug"
 msgstr ""
 
-#: src/glabels-ui.xml.h:115 src/view.c:3078
+#: src/glabels-ui.xml.h:132 src/view.c:3526
 #, fuzzy
 msgid "_Delete"
 msgstr "Borrar"
 
-#: src/glabels-ui.xml.h:116
+#: src/glabels-ui.xml.h:133
 msgid "_Desktop Default"
 msgstr ""
 
-#: src/glabels-ui.xml.h:117
+#: src/glabels-ui.xml.h:134
 msgid "_Drawing Toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:118
+#: src/glabels-ui.xml.h:135
 msgid "_Edit"
 msgstr ""
 
-#: src/glabels-ui.xml.h:119 src/stock.c:65
+#: src/glabels-ui.xml.h:136 src/stock.c:65
 #, fuzzy
 msgid "_Ellipse"
 msgstr "Elipse"
 
-#: src/glabels-ui.xml.h:120
+#: src/glabels-ui.xml.h:137
 #, fuzzy
 msgid "_File"
 msgstr "Relleno"
 
-#: src/glabels-ui.xml.h:121
+#: src/glabels-ui.xml.h:138
 msgid "_Grid"
 msgstr ""
 
-#: src/glabels-ui.xml.h:122
+#: src/glabels-ui.xml.h:139
 msgid "_Help"
 msgstr ""
 
-#: src/glabels-ui.xml.h:123
+#: src/glabels-ui.xml.h:140
 msgid "_Icon"
 msgstr ""
 
-#: src/glabels-ui.xml.h:124 src/stock.c:66
+#: src/glabels-ui.xml.h:141 src/stock.c:66
 #, fuzzy
 msgid "_Image"
 msgstr "Imagen"
 
-#: src/glabels-ui.xml.h:125 src/stock.c:76
+#: src/glabels-ui.xml.h:142 src/stock.c:76
 msgid "_Lefts"
 msgstr ""
 
-#: src/glabels-ui.xml.h:126 src/stock.c:63
+#: src/glabels-ui.xml.h:143 src/stock.c:63
 #, fuzzy
 msgid "_Line"
 msgstr "Línea"
 
-#: src/glabels-ui.xml.h:127
+#: src/glabels-ui.xml.h:144
 msgid "_Main Toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:128
+#: src/glabels-ui.xml.h:145
 #, fuzzy
 msgid "_Merge Properties..."
 msgstr "Propiedades de fusión de datos"
 
-#: src/glabels-ui.xml.h:129
+#: src/glabels-ui.xml.h:146
 msgid "_New"
 msgstr "_Nuevo"
 
-#: src/glabels-ui.xml.h:130
+#: src/glabels-ui.xml.h:147
 msgid "_Objects"
 msgstr ""
 
-#: src/glabels-ui.xml.h:131
+#: src/glabels-ui.xml.h:148
 #, fuzzy
 msgid "_Open..."
 msgstr "Abrir"
@@ -575,56 +651,56 @@ msgstr "Abrir"
 #.
 #. * Submenu: Order
 #.
-#: src/glabels-ui.xml.h:132 src/view.c:2924
+#: src/glabels-ui.xml.h:149 src/view.c:3372
 msgid "_Order"
 msgstr ""
 
-#: src/glabels-ui.xml.h:133
+#: src/glabels-ui.xml.h:150
 msgid "_Paste"
 msgstr ""
 
-#: src/glabels-ui.xml.h:134
+#: src/glabels-ui.xml.h:151
 #, fuzzy
 msgid "_Print..."
 msgstr "Imprimir"
 
-#: src/glabels-ui.xml.h:135
+#: src/glabels-ui.xml.h:152
 msgid "_Quit"
 msgstr ""
 
-#: src/glabels-ui.xml.h:136 src/stock.c:77
+#: src/glabels-ui.xml.h:153 src/stock.c:77
 msgid "_Rights"
 msgstr ""
 
 #.
 #. * Submenu: Rotate/Flip
 #.
-#: src/glabels-ui.xml.h:137 src/view.c:2945
+#: src/glabels-ui.xml.h:154 src/view.c:3393
 #, fuzzy
 msgid "_Rotate/Flip"
 msgstr "Rotar"
 
-#: src/glabels-ui.xml.h:138
+#: src/glabels-ui.xml.h:155
 #, fuzzy
 msgid "_Save"
 msgstr "Salva como"
 
-#: src/glabels-ui.xml.h:139 src/stock.c:61
+#: src/glabels-ui.xml.h:156 src/stock.c:61
 #, fuzzy
 msgid "_Select Mode"
 msgstr "Seleccionar"
 
-#: src/glabels-ui.xml.h:140 src/stock.c:62
+#: src/glabels-ui.xml.h:157 src/stock.c:62
 #, fuzzy
 msgid "_Text"
 msgstr "Texto"
 
-#: src/glabels-ui.xml.h:141 src/stock.c:79
+#: src/glabels-ui.xml.h:158 src/stock.c:79
 #, fuzzy
 msgid "_Tops"
 msgstr "_Herramientas"
 
-#: src/glabels-ui.xml.h:142
+#: src/glabels-ui.xml.h:159
 #, fuzzy
 msgid "_View"
 msgstr "_Nuevo"
@@ -690,26 +766,30 @@ msgid "Show ui debugging messages."
 msgstr ""
 
 #: src/glabels.c:97
-msgid "Show media select widget debugging messages."
+msgid "Show property_bar debugging messages."
 msgstr ""
 
 #: src/glabels.c:100
-msgid "Show mini preview widget debugging messages."
+msgid "Show media select widget debugging messages."
 msgstr ""
 
 #: src/glabels.c:103
-msgid "Show pixbuf cache debugging messages."
+msgid "Show mini preview widget debugging messages."
 msgstr ""
 
 #: src/glabels.c:106
-msgid "Show widget debugging messages."
+msgid "Show pixbuf cache debugging messages."
 msgstr ""
 
 #: src/glabels.c:109
+msgid "Show widget debugging messages."
+msgstr ""
+
+#: src/glabels.c:112
 msgid "Turn on all debugging messages."
 msgstr ""
 
-#: src/glabels.c:180
+#: src/glabels.c:184
 msgid "Could not initialize Bonobo!\n"
 msgstr ""
 
@@ -747,32 +827,32 @@ msgstr ""
 msgid "copies"
 msgstr "Copias"
 
-#: src/glabels-batch.c:58 src/print-dialog.c:200
+#: src/glabels-batch.c:58 src/print-dialog.c:210
 msgid "print outlines (to test printer alignment)"
 msgstr "Imprimir un esbozo (para verificar la alineación de la impresora)"
 
-#: src/glabels-batch.c:60 src/print-dialog.c:209
+#: src/glabels-batch.c:60 src/print-dialog.c:219
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "Impresión invertida (imagen espejo)"
 
-#: src/glabels-batch.c:95
+#: src/glabels-batch.c:96
 msgid "[OPTION...] GLABELS_FILE..."
 msgstr ""
 
-#: src/glabels-batch.c:114
+#: src/glabels-batch.c:116
 msgid "missing glabels file\n"
 msgstr ""
 
-#: src/glabels-batch.c:141
+#: src/glabels-batch.c:157
 #, fuzzy, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "No puedo abrir el archivo"
 
-#: src/window.c:234
+#: src/window.c:242
 msgid "(none) - gLabels"
 msgstr ""
 
-#: src/window.c:399
+#: src/window.c:409
 msgid "(modified)"
 msgstr ""
 
@@ -794,7 +874,21 @@ msgstr ""
 msgid "Centers"
 msgstr ""
 
-#: src/commands.c:337
+#: src/ui-property-bar.c:346 src/wdgt-text-props.c:241 src/wdgt-bc-props.c:174
+#, fuzzy
+msgid "Default"
+msgstr "Borrar"
+
+#: src/ui-property-bar.c:361 src/wdgt-fill.c:175
+msgid "No fill"
+msgstr ""
+
+#: src/ui-property-bar.c:376 src/wdgt-line.c:201
+#, fuzzy
+msgid "No line"
+msgstr "Ninguno"
+
+#: src/commands.c:352
 msgid ""
 "A label and business card creation program for GNOME.\n"
 " \n"
@@ -809,100 +903,109 @@ msgid ""
 "more details.\n"
 msgstr ""
 
-#: src/commands.c:351
+#: src/commands.c:366
 msgid "See the file AUTHORS for additional credits,"
 msgstr ""
 
-#: src/commands.c:352
-msgid "or visit http://snaught.com/glabels"
+#: src/commands.c:367
+msgid "or visit http://glabels.sourceforge.net/"
 msgstr ""
 
 #: src/commands.c:376
+msgid " "
+msgstr ""
+
+#: src/commands.c:391
 #, fuzzy
 msgid "glabels"
 msgstr "Etiquetas"
 
-#: src/file.c:82
+#: src/file.c:91
 msgid "New Label or Card"
 msgstr "Nueva etiqueta o tarjeta"
 
-#: src/file.c:112
+#: src/file.c:121 src/file.c:291
 msgid "Media Type"
 msgstr "Tipo de papel"
 
-#: src/file.c:118
+#: src/file.c:127 src/file.c:297
 msgid "Label orientation"
 msgstr "Orientación de la etiqueta"
 
-#: src/file.c:248
+#: src/file.c:258
+#, fuzzy
+msgid "Label properties"
+msgstr "Propiedades del texto"
+
+#: src/file.c:423
 msgid "Open label"
 msgstr "Abrir etiqueta"
 
-#: src/file.c:296 src/file.c:594
+#: src/file.c:475 src/file.c:784
 #, fuzzy
 msgid "Empty file name selection"
 msgstr "Eliminar todas las selecciones"
 
-#: src/file.c:297 src/file.c:311
+#: src/file.c:476 src/file.c:490
 msgid "Please select a file or supply a valid file name"
 msgstr ""
 
-#: src/file.c:310
+#: src/file.c:489
 msgid "File does not exist"
 msgstr ""
 
-#: src/file.c:372
+#: src/file.c:564
 #, fuzzy, c-format
 msgid "Could not open file \"%s\""
 msgstr "No puedo abrir el archivo"
 
-#: src/file.c:380
+#: src/file.c:572
 msgid "Not a supported file format"
 msgstr ""
 
-#: src/file.c:462 src/file.c:636
+#: src/file.c:653 src/file.c:828
 #, fuzzy, c-format
 msgid "Could not save file \"%s\""
 msgstr "No puedo salvar el archivo"
 
-#: src/file.c:470 src/file.c:644
+#: src/file.c:661 src/file.c:836
 msgid "Error encountered during save.  The file is still not saved."
 msgstr ""
 
-#: src/file.c:512
+#: src/file.c:702
 #, fuzzy, c-format
 msgid "Save \"%s\" as"
 msgstr "Guardar la etiqueta como"
 
-#: src/file.c:595
+#: src/file.c:785
 #, fuzzy
 msgid "Please supply a valid file name"
 msgstr "Debe proporcionar un nombre de archivo"
 
-#: src/file.c:609
+#: src/file.c:801
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr ""
 
-#: src/file.c:617
+#: src/file.c:809
 msgid "File already exists."
 msgstr ""
 
-#: src/file.c:732
+#: src/file.c:924
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr ""
 
-#: src/file.c:740
+#: src/file.c:932
 msgid "Your changes will be lost if you don't save them."
 msgstr ""
 
-#: src/file.c:743
+#: src/file.c:935
 msgid "Close without saving"
 msgstr ""
 
 #. Should not happen
-#: src/prefs.c:664 src/prefs.c:671 src/wdgt-line.c:180
+#: src/prefs.c:664 src/prefs.c:671 src/wdgt-line.c:185
 msgid "points"
 msgstr "puntos"
 
@@ -954,11 +1057,11 @@ msgstr "Mil
 msgid "Default page size"
 msgstr "Tamaño de página por omisión"
 
-#: src/prefs-dialog.c:309
+#: src/prefs-dialog.c:309 data/paper-sizes.xml.h:25
 msgid "US Letter"
 msgstr ""
 
-#: src/prefs-dialog.c:317
+#: src/prefs-dialog.c:317 data/paper-sizes.xml.h:6
 msgid "A4"
 msgstr ""
 
@@ -967,67 +1070,67 @@ msgid "Select default properties for new objects."
 msgstr ""
 
 #. ------ text props entry ------
-#: src/prefs-dialog.c:359 src/view-text.c:314 src/view-text.c:634
+#: src/prefs-dialog.c:359 src/view-text.c:313 src/view-text.c:636
 #: src/wdgt-bc-style.c:184
 msgid "Text"
 msgstr "Texto"
 
 #. ------ Line box ------
-#: src/prefs-dialog.c:368 src/view-line.c:304
+#: src/prefs-dialog.c:368 src/view-line.c:303
 msgid "Line"
 msgstr "Línea"
 
 #. ------ Fill box ------
-#: src/prefs-dialog.c:377 src/view-box.c:323 src/view-ellipse.c:323
+#: src/prefs-dialog.c:377 src/view-box.c:322 src/view-ellipse.c:322
 msgid "Fill"
 msgstr "Relleno"
 
 #.
 #. * Submenu: Align Horizontally
 #.
-#: src/view.c:2978
+#: src/view.c:3426
 msgid "Align _Horizontally"
 msgstr ""
 
 #.
 #. * Submenu: Align Vertically
 #.
-#: src/view.c:3017
+#: src/view.c:3465
 msgid "Align _Vertically"
 msgstr ""
 
-#: src/view-box.c:291
+#: src/view-box.c:290
 msgid "Edit box object properties"
 msgstr "Modificar propiedades del objeto caja"
 
 #. ---------------------------
 #. Outline section
 #. ---------------------------
-#: src/view-box.c:307 src/view-ellipse.c:307
+#: src/view-box.c:306 src/view-ellipse.c:306
 msgid "Outline"
 msgstr "Contorno"
 
 #. ---------------------------
 #. Position section
 #. ---------------------------
-#: src/view-box.c:339 src/view-ellipse.c:339 src/view-line.c:320
-#: src/view-image.c:314 src/view-text.c:349 src/view-barcode.c:338
+#: src/view-box.c:338 src/view-ellipse.c:338 src/view-line.c:319
+#: src/view-image.c:314 src/view-text.c:348 src/view-barcode.c:337
 msgid "Position"
 msgstr "Posición"
 
 #. ---------------------------
 #. Size section
 #. ---------------------------
-#: src/view-box.c:354 src/view-ellipse.c:354 src/view-line.c:338
+#: src/view-box.c:353 src/view-ellipse.c:353 src/view-line.c:337
 #: src/view-image.c:331
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/view-ellipse.c:291
+#: src/view-ellipse.c:290
 msgid "Edit ellipse object properties"
 msgstr "Modificar las propiedades del objeto elipse"
 
-#: src/view-line.c:289
+#: src/view-line.c:288
 msgid "Edit line object properties"
 msgstr "Modificar las propiedades del objeto línea"
 
@@ -1047,30 +1150,22 @@ msgstr "Imagen"
 msgid "Reset image size"
 msgstr "Restablecer el tamaño de la imagen"
 
-#: src/view-text.c:299
+#: src/view-text.c:298
 msgid "Edit text object properties"
 msgstr "Modificar las propiedades del objeto texto"
 
-#. ---------------------------
-#. Text Properties section
-#. ---------------------------
-#: src/view-text.c:331 src/view-barcode.c:306
-#, fuzzy
-msgid "Properties"
-msgstr "Propiedades del texto"
-
-#: src/view-barcode.c:271
+#: src/view-barcode.c:270
 msgid "Edit barcode object properties"
 msgstr "Modificar las propiedades del objeto código de barras"
 
 #. ---------------------------
 #. Data section
 #. ---------------------------
-#: src/view-barcode.c:286 src/merge-properties-dialog.c:343
+#: src/view-barcode.c:285 src/merge-properties-dialog.c:343
 msgid "Data"
 msgstr "Datos"
 
-#: src/view-barcode.c:802 src/print.c:912
+#: src/view-barcode.c:803 src/print.c:1021
 msgid "Invalid barcode"
 msgstr "Código de barras no válido"
 
@@ -1114,73 +1209,77 @@ msgstr "Seleccionar"
 msgid "Record/Field"
 msgstr ""
 
-#: src/print-dialog.c:128
+#: src/print-dialog.c:138
 msgid "_Job"
 msgstr ""
 
-#: src/print-dialog.c:133
+#: src/print-dialog.c:143
 #, fuzzy
 msgid "P_rinter"
 msgstr "Imprimir"
 
 #. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:163
+#: src/print-dialog.c:173
 msgid "Copies"
 msgstr "Copias"
 
 #. ------- Otherwise add merge control widget ------------
-#: src/print-dialog.c:177
+#: src/print-dialog.c:187
 msgid "Document merge control"
 msgstr "Control de la fusión de documentos"
 
 #. ----------- Add custom print options area ------------
-#: src/print-dialog.c:194
+#: src/print-dialog.c:204
 msgid "Options"
 msgstr "Opciones"
 
-#: src/print-dialog.c:336 src/print-dialog.c:374
+#: src/print-dialog.c:227
+msgid "print crop marks"
+msgstr ""
+
+#: src/print-dialog.c:364 src/print-dialog.c:403
 msgid "Print preview"
 msgstr "Previsualizar la impresión"
 
-#: src/label.c:542
+#: src/label.c:563
 msgid "Untitled"
 msgstr ""
 
-#: src/template.c:296
+#: src/template.c:318
 #, c-format
 msgid "Generic %s full page"
 msgstr ""
 
-#: src/template.c:338
+#: src/template.c:362
 msgid "No template files found!"
 msgstr "No he encontrado archivos de plantilla"
 
-#: src/template.c:435
+#: src/template.c:461
 #, c-format
 msgid "%s x %s %s"
 msgstr "%s x %s %s"
 
-#: src/template.c:440
+#: src/template.c:466
 #, c-format
 msgid "%.5g x %.5g %s"
 msgstr "%.5g x %.5g %s"
 
-#: src/template.c:451 src/template.c:465
+#: src/template.c:477 src/template.c:491
 #, c-format
 msgid "%s %s diameter"
 msgstr ""
 
-#: src/template.c:455 src/template.c:469
+#: src/template.c:481 src/template.c:495
 #, c-format
 msgid "%.5g %s diameter"
 msgstr ""
 
-#: src/template.c:607
+#: src/template.c:633
 #, c-format
 msgid "%d x %d  (%d per sheet)"
 msgstr "%d x %d  (%d por hoja)"
 
-#: src/template.c:611
+#: src/template.c:637
 #, fuzzy, c-format
 msgid "%d per sheet"
 msgstr "%d x %d  (%d por hoja)"
@@ -1190,54 +1289,69 @@ msgstr "%d x %d  (%d por hoja)"
 msgid "No paper files found!"
 msgstr "No he encontrado archivos de plantilla"
 
-#: src/xml-label.c:171 src/xml-label.c:204
+#: src/xml-label.c:177 src/xml-label.c:214
 msgid "xmlParseFile error"
 msgstr "error xmlParseFile"
 
-#: src/xml-label.c:241
+#: src/xml-label.c:251
 msgid "No document root"
 msgstr "No hay documento raíz"
 
-#: src/xml-label.c:253
+#: src/xml-label.c:263
 msgid "Importing from glabels 0.1 format"
 msgstr ""
 
-#: src/xml-label.c:261
+#: src/xml-label.c:271
 msgid "Importing from glabels 0.4 format"
 msgstr ""
 
-#: src/xml-label.c:264
+#: src/xml-label.c:278
+msgid "Importing from glabels 1.91 format"
+msgstr ""
+
+#: src/xml-label.c:281
 #, fuzzy
 msgid "bad document, unknown glabels Namespace"
 msgstr "documento de tipo erróneo, glabels Espacio de nombres no encontrado"
 
-#: src/xml-label.c:292 src/xml-label-04.c:75
+#: src/xml-label.c:310 src/xml-label-04.c:75 src/xml-label-191.c:131
 #, c-format
 msgid "Bad root node = \"%s\""
 msgstr "Nodo raíz erróneo = \"%s\""
 
-#: src/xml-label.c:325
+#: src/xml-label.c:345 src/xml-label-191.c:164
 #, fuzzy, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "Nodo raíz erróneo = \"%s\""
 
-#: src/xml-label.c:357 src/xml-label-04.c:123
+#: src/xml-label.c:387 src/xml-label-04.c:123 src/xml-label-191.c:196
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr "Nodo erróneo =  \"%s\""
 
-#: src/xml-label.c:763
+#: src/xml-label.c:783 src/xml-label-191.c:602
 #, fuzzy, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "Nodo erróneo =  \"%s\""
 
-#: src/xml-label.c:831
+#: src/xml-label.c:944
+msgid "Utf8 conversion error."
+msgstr ""
+
+#: src/xml-label.c:951
 msgid "Problem saving xml file."
 msgstr "Problemas salvando archivo xml"
 
-#: src/xml-template.c:157
+#. This should always be an id, but just in case a name
+#. slips by!
+#: src/xml-label-191.c:680 src/xml-template.c:169
 #, c-format
-msgid "Unknown page size id \"%s\""
+msgid "Unknown page size id \"%s\", trying as name"
+msgstr ""
+
+#: src/xml-label-191.c:690 src/xml-template.c:179
+#, c-format
+msgid "Unknown page size id or name \"%s\""
 msgstr ""
 
 #: src/merge.c:172 src/merge.c:213 src/merge.c:398 src/merge.c:401
@@ -1260,18 +1374,18 @@ msgid "Text file with tab delimeters"
 msgstr "Texto separado con tabuladores"
 
 #. Font label
-#: src/wdgt-text-props.c:181
+#: src/wdgt-text-props.c:185
 msgid "Font:"
 msgstr "Fuente:"
 
 #. Text Color Label
-#: src/wdgt-text-props.c:230 src/wdgt-line.c:189 src/wdgt-fill.c:164
-#: src/wdgt-bc-props.c:164
+#: src/wdgt-text-props.c:234 src/wdgt-line.c:194 src/wdgt-fill.c:168
+#: src/wdgt-bc-props.c:167
 msgid "Color:"
 msgstr "Color"
 
 #. Alignment label
-#: src/wdgt-text-props.c:246
+#: src/wdgt-text-props.c:255
 msgid "Alignment:"
 msgstr "Alineación:"
 
@@ -1301,7 +1415,7 @@ msgid "Y:"
 msgstr "Y:"
 
 #. W Label
-#: src/wdgt-size.c:187 src/wdgt-line.c:166
+#: src/wdgt-size.c:187 src/wdgt-line.c:171
 msgid "Width:"
 msgstr "Ancho"
 
@@ -1400,10 +1514,535 @@ msgstr "Disposici
 msgid "Rotate"
 msgstr "Rotar"
 
-#: src/gnome-recent-view-bonobo.c:189
-#, fuzzy, c-format
-msgid "Open %s"
-msgstr "Abrir"
+#. This is the default custom color
+#: src/mygal/color-palette.c:396
+#, fuzzy
+msgid "custom"
+msgstr "Campo clave personalizable"
+
+#. "Custom" color - we'll pop up a GnomeColorPicker
+#: src/mygal/color-palette.c:438
+#, fuzzy
+msgid "Custom Color:"
+msgstr "Color"
+
+#: src/mygal/color-palette.c:446
+msgid "Choose Custom Color"
+msgstr ""
+
+#: src/mygal/color-palette.c:579
+msgid "black"
+msgstr ""
+
+#: src/mygal/color-palette.c:580
+msgid "light brown"
+msgstr ""
+
+#: src/mygal/color-palette.c:581
+msgid "brown gold"
+msgstr ""
+
+#: src/mygal/color-palette.c:582
+msgid "dark green #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:583
+msgid "navy"
+msgstr ""
+
+#: src/mygal/color-palette.c:584 src/mygal/color-palette.c:640
+msgid "dark blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:585
+msgid "purple #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:586
+msgid "very dark gray"
+msgstr ""
+
+#: src/mygal/color-palette.c:589 src/mygal/color-palette.c:645
+msgid "dark red"
+msgstr ""
+
+#: src/mygal/color-palette.c:590
+msgid "red-orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:591
+msgid "gold"
+msgstr ""
+
+#: src/mygal/color-palette.c:592
+msgid "dark green"
+msgstr ""
+
+#: src/mygal/color-palette.c:593 src/mygal/color-palette.c:646
+msgid "dull blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:594 src/mygal/color-palette.c:647
+msgid "blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:595
+msgid "dull purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:596
+msgid "dark grey"
+msgstr ""
+
+#: src/mygal/color-palette.c:599
+msgid "red"
+msgstr ""
+
+#: src/mygal/color-palette.c:600
+msgid "orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:601
+msgid "lime"
+msgstr ""
+
+#: src/mygal/color-palette.c:602
+msgid "dull green"
+msgstr ""
+
+#: src/mygal/color-palette.c:603
+msgid "dull blue #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:604
+msgid "sky blue #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:605 src/mygal/color-palette.c:644
+msgid "purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:606
+msgid "gray"
+msgstr ""
+
+#: src/mygal/color-palette.c:609 src/mygal/color-palette.c:641
+#, fuzzy
+msgid "magenta"
+msgstr "Imagen"
+
+#: src/mygal/color-palette.c:610
+msgid "bright orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:611 src/mygal/color-palette.c:642
+msgid "yellow"
+msgstr ""
+
+#: src/mygal/color-palette.c:612
+#, fuzzy
+msgid "green"
+msgstr "grados"
+
+#: src/mygal/color-palette.c:613 src/mygal/color-palette.c:643
+msgid "cyan"
+msgstr ""
+
+#: src/mygal/color-palette.c:614
+msgid "bright blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:615 src/mygal/color-palette.c:632
+msgid "red purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:616
+msgid "light grey"
+msgstr ""
+
+#: src/mygal/color-palette.c:619 src/mygal/color-palette.c:636
+msgid "pink"
+msgstr ""
+
+#: src/mygal/color-palette.c:620
+msgid "light orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:621 src/mygal/color-palette.c:633
+msgid "light yellow"
+msgstr ""
+
+#: src/mygal/color-palette.c:622
+msgid "light green"
+msgstr ""
+
+#: src/mygal/color-palette.c:623
+msgid "light cyan"
+msgstr ""
+
+#: src/mygal/color-palette.c:624 src/mygal/color-palette.c:634
+msgid "light blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:625 src/mygal/color-palette.c:638
+msgid "light purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:626
+msgid "white"
+msgstr ""
+
+#: src/mygal/color-palette.c:631
+msgid "purplish blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:635
+msgid "dark purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:637
+msgid "sky blue"
+msgstr ""
+
+#: data/paper-sizes.xml.h:1
+msgid "A0"
+msgstr ""
+
+#: data/paper-sizes.xml.h:2
+msgid "A1"
+msgstr ""
+
+#: data/paper-sizes.xml.h:3
+msgid "A10"
+msgstr ""
+
+#: data/paper-sizes.xml.h:4
+msgid "A2"
+msgstr ""
+
+#: data/paper-sizes.xml.h:5
+msgid "A3"
+msgstr ""
+
+#: data/paper-sizes.xml.h:7
+msgid "A5"
+msgstr ""
+
+#: data/paper-sizes.xml.h:8
+msgid "A6"
+msgstr ""
+
+#: data/paper-sizes.xml.h:9
+msgid "A7"
+msgstr ""
+
+#: data/paper-sizes.xml.h:10
+msgid "A8"
+msgstr ""
+
+#: data/paper-sizes.xml.h:11
+msgid "A9"
+msgstr ""
+
+#: data/paper-sizes.xml.h:12
+msgid "B0"
+msgstr ""
+
+#: data/paper-sizes.xml.h:13
+msgid "B1"
+msgstr ""
+
+#: data/paper-sizes.xml.h:14
+msgid "B10"
+msgstr ""
+
+#: data/paper-sizes.xml.h:15
+msgid "B2"
+msgstr ""
+
+#: data/paper-sizes.xml.h:16
+msgid "B3"
+msgstr ""
+
+#: data/paper-sizes.xml.h:17
+msgid "B4"
+msgstr ""
+
+#: data/paper-sizes.xml.h:18
+msgid "B5"
+msgstr ""
+
+#: data/paper-sizes.xml.h:19
+msgid "B6"
+msgstr ""
+
+#: data/paper-sizes.xml.h:20
+msgid "B7"
+msgstr ""
+
+#: data/paper-sizes.xml.h:21
+msgid "B8"
+msgstr ""
+
+#: data/paper-sizes.xml.h:22
+msgid "B9"
+msgstr ""
+
+#: data/paper-sizes.xml.h:23
+msgid "US Executive"
+msgstr ""
+
+#: data/paper-sizes.xml.h:24
+msgid "US Legal"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:1
+msgid "Address Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:2 data/avery-iso-templates.xml.h:3
+#: data/zweckform-iso-templates.xml.h:2 data/misc-us-templates.xml.h:2
+#: data/misc-iso-templates.xml.h:9
+msgid "Business Cards"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:3
+msgid "CD/DVD Labels (Disc Labels)"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:4
+msgid "Diskette Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:5
+#, fuzzy
+msgid "Filing Labels"
+msgstr "Etiquetas"
+
+#: data/avery-us-templates.xml.h:6
+msgid "Full Sheet Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:7
+#, fuzzy
+msgid "Large Round Labels"
+msgstr "Comenzar en la etiqueta"
+
+#: data/avery-us-templates.xml.h:8
+msgid "Name Badge Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:9
+msgid "Return Address Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:10
+msgid "Shipping Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:11
+#, fuzzy
+msgid "Small Round Labels"
+msgstr "Comenzar en la etiqueta"
+
+#: data/avery-us-templates.xml.h:12
+#, fuzzy
+msgid "Square Labels"
+msgstr "Etiquetas"
+
+#: data/avery-us-templates.xml.h:13
+msgid "Video Tape Face Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:14
+msgid "Video Tape Spine Labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:1
+msgid "3.5'' Diskette labels (face only)"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:2
+msgid "Address labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:4 data/zweckform-iso-templates.xml.h:4
+#: data/misc-us-templates.xml.h:4 data/misc-iso-templates.xml.h:10
+#, fuzzy
+msgid "CD/DVD Labels"
+msgstr "Etiquetas"
+
+#: data/avery-iso-templates.xml.h:5 data/misc-iso-templates.xml.h:16
+msgid "Mailing Labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:6
+#, fuzzy
+msgid "Mailing labels"
+msgstr "Etiquetas"
+
+#: data/avery-iso-templates.xml.h:7
+msgid "Mini Address"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:8
+#, fuzzy
+msgid "Shipping labels"
+msgstr "Abrir etiqueta"
+
+#: data/zweckform-iso-templates.xml.h:1
+msgid "Allround Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:3
+#, fuzzy
+msgid "CD Labels"
+msgstr "Etiquetas"
+
+#: data/zweckform-iso-templates.xml.h:5
+msgid "Correction and Cover-up Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:6
+msgid "Lever Arch File Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:7
+msgid "Mailing Labels -- 12"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:8
+msgid "QSL-Karten Etiketten 70mm x 50,8mm"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:9
+msgid "Rectangular Copier Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:10 data/misc-iso-templates.xml.h:20
+msgid "Rectangular Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:11
+msgid "Video Labels (back)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:1
+msgid "Business Card CD"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:3
+msgid "CD Template Rectangles"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:5
+msgid "CD/DVD Labels (Face Only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:6 data/misc-iso-templates.xml.h:11
+msgid "CD/DVD Labels (face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:7
+#, fuzzy
+msgid "DLT Labels"
+msgstr "Etiquetas"
+
+#: data/misc-us-templates.xml.h:8
+msgid "Microtube labels"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:9
+msgid "Mini-CD Labels"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:10
+msgid "PRO CD Labels 2-up (CD spine only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:11
+msgid "PRO CD Labels 2-up (Face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:12
+msgid "PRO CD Labels 2-up (face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:13
+msgid "Slimline CD Case (rightside up)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:14
+msgid "Slimline CD Case (upside down)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:1
+msgid "Agipa 119488: Business Cards"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:2
+msgid "Allround Labels --24"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:3
+msgid "Allround Labels --44"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:4
+msgid "Allround Labels --64"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:5
+msgid "Allround Labels --65"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:6
+msgid "Arch File Labels"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:7
+msgid "Arch File Labels (large)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:8
+msgid "Arch File Labels (small)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:12
+msgid "CD/DVD Labels Standard Format (face only)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:13
+msgid "Diskette Labels (face only)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:14
+msgid "EPSON Photo Stickers 16"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:15
+msgid "Etiketten"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:17
+msgid "Mailing Labels --14"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:18
+msgid "Mailing Labels-2 columns"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:19
+msgid "Mailing Labels-3 columns"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:21
+msgid "Video Labels (face only)"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Open %s"
+#~ msgstr "Abrir"
 
 #~ msgid "Revert to saved copy of %s?"
 #~ msgstr "¿ Recuperar la copia salvada de %s ?"
@@ -1420,9 +2059,6 @@ msgstr "Abrir"
 #~ "\n"
 #~ "¿ Desea salvarlo ?"
 
-#~ msgid "Don't save"
-#~ msgstr "No salvar"
-
 #~ msgid "Close / Save label as"
 #~ msgstr "Cerrar / Salvar etiqueta como"
 
@@ -1447,9 +2083,6 @@ msgstr "Abrir"
 #~ msgid "Barcode data"
 #~ msgstr "Datos del código de barras"
 
-#~ msgid "General"
-#~ msgstr "General"
-
 #~ msgid "%"
 #~ msgstr "%"
 
diff --git a/glabels2/po/fr.po b/glabels2/po/fr.po
index f286611c..5e736ac3 100644
--- a/glabels2/po/fr.po
+++ b/glabels2/po/fr.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2001 Jim Evins <evins@snaught.com>
 # Olivier Berger <oberger@gnu.org>, 2001.
 # 
-#: src/commands.c:361
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels 0.4.4\n"
-"POT-Creation-Date: 2003-06-22 01:12-0400\n"
+"POT-Creation-Date: 2003-11-01 19:24-0500\n"
 "PO-Revision-Date: 2001-10-15 15:31+0200\n"
 "Last-Translator: Olivier Berger <oberger@gnu.org>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -63,40 +62,53 @@ msgstr ""
 msgid "Bar_code"
 msgstr "Code-barre"
 
+#: src/glabels-ui.xml.h:12
+msgid "Bold"
+msgstr ""
+
 # src/display.c:1167 src/display.c:1215
 # src/display.c:1170 src/display.c:1218
 # src/display.c:1181 src/display.c:1229
 # src/display.c:1196 src/display.c:1244
-#: src/glabels-ui.xml.h:12 src/stock.c:70
+#: src/glabels-ui.xml.h:13 src/stock.c:70
 #, fuzzy
 msgid "Bring to _Front"
 msgstr "Avancer au premier plan"
 
-#: src/glabels-ui.xml.h:13
+# src/item_barcode.c:337
+# src/item_barcode.c:343 src/prefs.c:243
+# src/item_barcode.c:320 src/prefs.c:221
+# src/item_barcode.c:320 src/prefs.c:215
+#: src/glabels-ui.xml.h:14
+#, fuzzy
+msgid "Center align"
+msgstr "Général"
+
+#: src/glabels-ui.xml.h:15
 msgid "Center objects to horizontal label center"
 msgstr ""
 
-#: src/glabels-ui.xml.h:14
+#: src/glabels-ui.xml.h:16
 msgid "Center objects to vertical label center"
 msgstr ""
 
-#: src/glabels-ui.xml.h:15
+#: src/glabels-ui.xml.h:17
 msgid "Change the visibility of markup lines in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:16
+#: src/glabels-ui.xml.h:18
 msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:17
+#: src/glabels-ui.xml.h:19
 msgid "Change the visibility of the grid in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:18
+#: src/glabels-ui.xml.h:20
 msgid "Change the visibility of the main toolbar in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:19
+#: src/glabels-ui.xml.h:21
 msgid "Close"
 msgstr ""
 
@@ -104,20 +116,20 @@ msgstr ""
 # src/menu.c:142
 # src/menu.c:172
 # src/menu.c:172
-#: src/glabels-ui.xml.h:20
+#: src/glabels-ui.xml.h:22
 #, fuzzy
 msgid "Close the current file"
 msgstr "Sauvegarder le fichier en cours"
 
-#: src/glabels-ui.xml.h:21
+#: src/glabels-ui.xml.h:23
 msgid "Configure the application"
 msgstr ""
 
-#: src/glabels-ui.xml.h:22
+#: src/glabels-ui.xml.h:24
 msgid "Contents"
 msgstr ""
 
-#: src/glabels-ui.xml.h:23
+#: src/glabels-ui.xml.h:25
 msgid "Copy"
 msgstr ""
 
@@ -125,7 +137,7 @@ msgstr ""
 # src/menu.c:86
 # src/menu.c:86
 # src/menu.c:86
-#: src/glabels-ui.xml.h:24
+#: src/glabels-ui.xml.h:26
 #, fuzzy
 msgid "Copy the selection"
 msgstr "Supprime toutes les sélections"
@@ -134,7 +146,7 @@ msgstr "Supprime toutes les s
 # src/tools.c:70
 # src/menu.c:106 src/menu.c:197
 # src/menu.c:106 src/menu.c:197
-#: src/glabels-ui.xml.h:25
+#: src/glabels-ui.xml.h:27
 #, fuzzy
 msgid "Create a new document"
 msgstr "Créer un objet ligne"
@@ -143,7 +155,7 @@ msgstr "Cr
 # src/tools.c:79
 # src/menu.c:116 src/menu.c:206
 # src/menu.c:116 src/menu.c:206
-#: src/glabels-ui.xml.h:26
+#: src/glabels-ui.xml.h:28
 msgid "Create barcode object"
 msgstr "Créer un objet code-barre"
 
@@ -151,7 +163,7 @@ msgstr "Cr
 # src/tools.c:67
 # src/menu.c:103 src/menu.c:194
 # src/menu.c:103 src/menu.c:194
-#: src/glabels-ui.xml.h:27
+#: src/glabels-ui.xml.h:29
 msgid "Create box/rectangle object"
 msgstr "Créer un objet boîte/rectangle"
 
@@ -159,7 +171,7 @@ msgstr "Cr
 # src/tools.c:73
 # src/menu.c:110 src/menu.c:200
 # src/menu.c:110 src/menu.c:200
-#: src/glabels-ui.xml.h:28
+#: src/glabels-ui.xml.h:30
 msgid "Create ellipse/circle object"
 msgstr "Créer un objet ellipse/cercle"
 
@@ -167,7 +179,7 @@ msgstr "Cr
 # src/tools.c:76
 # src/menu.c:113 src/menu.c:203
 # src/menu.c:113 src/menu.c:203
-#: src/glabels-ui.xml.h:29
+#: src/glabels-ui.xml.h:31
 msgid "Create image object"
 msgstr "Créer un objet image"
 
@@ -175,7 +187,7 @@ msgstr "Cr
 # src/tools.c:70
 # src/menu.c:106 src/menu.c:197
 # src/menu.c:106 src/menu.c:197
-#: src/glabels-ui.xml.h:30
+#: src/glabels-ui.xml.h:32
 msgid "Create line object"
 msgstr "Créer un objet ligne"
 
@@ -183,42 +195,42 @@ msgstr "Cr
 # src/tools.c:64
 # src/menu.c:100 src/menu.c:191
 # src/menu.c:100 src/menu.c:191
-#: src/glabels-ui.xml.h:31
+#: src/glabels-ui.xml.h:33
 msgid "Create text object"
 msgstr "Créer un objet texte"
 
-#: src/glabels-ui.xml.h:32
+#: src/glabels-ui.xml.h:34
 msgid "Cu_t"
 msgstr ""
 
 # src/merge_ui_text.c:334
 # src/merge_ui_text.c:334
-#: src/glabels-ui.xml.h:33
+#: src/glabels-ui.xml.h:35
 #, fuzzy
 msgid "Customize"
 msgstr "Clé de champ spécifique"
 
-#: src/glabels-ui.xml.h:34
+#: src/glabels-ui.xml.h:36
 msgid "Customize Drawing Toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:35
+#: src/glabels-ui.xml.h:37
 msgid "Customize Main Toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:36
+#: src/glabels-ui.xml.h:38
 msgid "Customize toolbars"
 msgstr ""
 
-#: src/glabels-ui.xml.h:37
+#: src/glabels-ui.xml.h:39
 msgid "Cut"
 msgstr ""
 
-#: src/glabels-ui.xml.h:38
+#: src/glabels-ui.xml.h:40
 msgid "Cut the selection"
 msgstr ""
 
-#: src/glabels-ui.xml.h:39
+#: src/glabels-ui.xml.h:41
 msgid "Decrease magnification"
 msgstr ""
 
@@ -226,7 +238,7 @@ msgstr ""
 # src/display.c:1160 src/display.c:1208
 # src/display.c:1171 src/display.c:1219
 # src/display.c:1186 src/display.c:1234
-#: src/glabels-ui.xml.h:40
+#: src/glabels-ui.xml.h:42
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -234,20 +246,20 @@ msgstr "Supprimer"
 # src/tools.c:64
 # src/menu.c:100 src/menu.c:191
 # src/menu.c:100 src/menu.c:191
-#: src/glabels-ui.xml.h:41
+#: src/glabels-ui.xml.h:43
 #, fuzzy
 msgid "Delete the selected objects"
 msgstr "Créer un objet texte"
 
-#: src/glabels-ui.xml.h:42
+#: src/glabels-ui.xml.h:44
 msgid "Drawing toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:43
+#: src/glabels-ui.xml.h:45
 msgid "Dump XML"
 msgstr ""
 
-#: src/glabels-ui.xml.h:44
+#: src/glabels-ui.xml.h:46
 msgid "Dump the UI Xml description"
 msgstr ""
 
@@ -255,7 +267,7 @@ msgstr ""
 # src/item_image.c:272
 # src/menu.c:133
 # src/menu.c:133
-#: src/glabels-ui.xml.h:45
+#: src/glabels-ui.xml.h:47
 msgid "Edit merge properties"
 msgstr "Editer les propriétés de fusion"
 
@@ -263,53 +275,102 @@ msgstr "Editer les propri
 # src/item_box.c:251
 # src/item_box.c:235
 # src/item_box.c:235
-#: src/glabels-ui.xml.h:46
+#: src/glabels-ui.xml.h:48
 #, fuzzy
 msgid "Edit object properties"
 msgstr "Editer les propriétés de l'objet boîte..."
 
-#: src/glabels-ui.xml.h:47 src/stock.c:74
+#: src/glabels-ui.xml.h:49 src/stock.c:84
+#, fuzzy
+msgid "Fill color"
+msgstr "Couleur de remplissage"
+
+#: src/glabels-ui.xml.h:50 src/stock.c:74
 msgid "Flip _Horizontally"
 msgstr ""
 
-#: src/glabels-ui.xml.h:48 src/stock.c:75
+#: src/glabels-ui.xml.h:51 src/stock.c:75
 msgid "Flip _Vertically"
 msgstr ""
 
-#: src/glabels-ui.xml.h:49
+#: src/glabels-ui.xml.h:52
 msgid "Flip object horizontally"
 msgstr ""
 
-#: src/glabels-ui.xml.h:50
+#: src/glabels-ui.xml.h:53
 msgid "Flip object vertically"
 msgstr ""
 
-#: src/glabels-ui.xml.h:51
+# src/mdi.c:482
+# src/mdi.c:488
+# src/mdi.c:459
+# src/mdi.c:459
+#: src/glabels-ui.xml.h:54
+#, fuzzy
+msgid "Font name"
+msgstr "Ne pas sauver"
+
+# src/menu.c:86
+# src/menu.c:86
+# src/menu.c:86
+# src/menu.c:86
+#: src/glabels-ui.xml.h:55
+#, fuzzy
+msgid "Font selector"
+msgstr "Supprime toutes les sélections"
+
+# src/mdi.c:482
+# src/mdi.c:488
+# src/mdi.c:459
+# src/mdi.c:459
+#: src/glabels-ui.xml.h:56
+#, fuzzy
+msgid "Font size"
+msgstr "Ne pas sauver"
+
+#: src/glabels-ui.xml.h:57
 msgid "Icon and _Text"
 msgstr ""
 
-#: src/glabels-ui.xml.h:52
+#: src/glabels-ui.xml.h:58
 msgid "Increase magnification"
 msgstr ""
 
-#: src/glabels-ui.xml.h:53 src/stock.c:82 src/stock.c:83
+#: src/glabels-ui.xml.h:59
+msgid "Italic"
+msgstr ""
+
+#: src/glabels-ui.xml.h:60 src/stock.c:82 src/stock.c:83
 msgid "Label Ce_nter"
 msgstr ""
 
-#: src/glabels-ui.xml.h:54
+#: src/glabels-ui.xml.h:61
+msgid "Left align"
+msgstr ""
+
+#: src/glabels-ui.xml.h:62 src/stock.c:85
+#, fuzzy
+msgid "Line color"
+msgstr "Couleur de ligne"
+
+#: src/glabels-ui.xml.h:63
+msgid "Line width"
+msgstr ""
+
+#: src/glabels-ui.xml.h:64
 msgid "Lower object to bottom"
 msgstr ""
 
-#: src/glabels-ui.xml.h:55
+#: src/glabels-ui.xml.h:65
 msgid "M_arkup"
 msgstr ""
 
-#: src/glabels-ui.xml.h:56
+#: src/glabels-ui.xml.h:66
 msgid "Main toolbar"
 msgstr ""
 
 # src/preferences.c:213
-#: src/glabels-ui.xml.h:57
+#: src/glabels-ui.xml.h:67
 #, fuzzy
 msgid "Markup"
 msgstr "Démarrage"
@@ -318,7 +379,7 @@ msgstr "D
 # src/menu.c:50
 # src/menu.c:50
 # src/menu.c:50
-#: src/glabels-ui.xml.h:58
+#: src/glabels-ui.xml.h:68
 #, fuzzy
 msgid "New"
 msgstr "_Nouveau"
@@ -327,16 +388,16 @@ msgstr "_Nouveau"
 # src/item_text.c:467
 # src/item_text.c:482
 # src/item_text.c:482
-#: src/glabels-ui.xml.h:59
+#: src/glabels-ui.xml.h:69
 #, fuzzy
 msgid "Object _Properties..."
 msgstr "Propriétés du texte"
 
-#: src/glabels-ui.xml.h:60
+#: src/glabels-ui.xml.h:70
 msgid "Only show icons in the drawing toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:61
+#: src/glabels-ui.xml.h:71
 msgid "Only show icons in the main toolbar"
 msgstr ""
 
@@ -344,7 +405,7 @@ msgstr ""
 # src/file.c:178
 # src/file.c:211
 # src/file.c:211
-#: src/glabels-ui.xml.h:62 src/file.c:246
+#: src/glabels-ui.xml.h:72 src/file.c:421
 msgid "Open"
 msgstr "Ouvrir"
 
@@ -352,7 +413,7 @@ msgstr "Ouvrir"
 # src/menu.c:140
 # src/menu.c:170
 # src/menu.c:170
-#: src/glabels-ui.xml.h:63
+#: src/glabels-ui.xml.h:73
 msgid "Open a file"
 msgstr "Ouvrir un fichier"
 
@@ -360,16 +421,16 @@ msgstr "Ouvrir un fichier"
 # src/file.c:183
 # src/file.c:213
 # src/file.c:213
-#: src/glabels-ui.xml.h:64
+#: src/glabels-ui.xml.h:74
 #, fuzzy
 msgid "Open the glabels manual"
 msgstr "Ouvrir une étiquette"
 
-#: src/glabels-ui.xml.h:65
+#: src/glabels-ui.xml.h:75
 msgid "Paste"
 msgstr ""
 
-#: src/glabels-ui.xml.h:66
+#: src/glabels-ui.xml.h:76
 msgid "Paste the clipboard"
 msgstr ""
 
@@ -377,7 +438,7 @@ msgstr ""
 # src/prefs.c:101
 # src/prefs.c:92
 # src/prefs.c:86
-#: src/glabels-ui.xml.h:67
+#: src/glabels-ui.xml.h:77
 #, fuzzy
 msgid "Pr_eferences..."
 msgstr "Glabels : Préférences"
@@ -386,7 +447,7 @@ msgstr "Glabels : Pr
 # src/prefs.c:101
 # src/prefs.c:92
 # src/prefs.c:86
-#: src/glabels-ui.xml.h:68
+#: src/glabels-ui.xml.h:78
 #, fuzzy
 msgid "Preferences"
 msgstr "Glabels : Préférences"
@@ -395,7 +456,7 @@ msgstr "Glabels : Pr
 # src/print.c:149
 # src/print.c:141
 # src/print_dialog.c:99
-#: src/glabels-ui.xml.h:69 src/print-dialog.c:104
+#: src/glabels-ui.xml.h:79 src/print-dialog.c:114
 msgid "Print"
 msgstr "Imprimer"
 
@@ -403,32 +464,57 @@ msgstr "Imprimer"
 # src/menu.c:145
 # src/menu.c:175
 # src/menu.c:175
-#: src/glabels-ui.xml.h:70
+#: src/glabels-ui.xml.h:80
 #, fuzzy
 msgid "Print the current file"
 msgstr "Imprimer le fichier en cours"
 
-#: src/glabels-ui.xml.h:71
+# src/item_text.c:467
+# src/item_text.c:467
+# src/item_text.c:482
+# src/item_text.c:482
+#: src/glabels-ui.xml.h:81
+#, fuzzy
+msgid "Proper_ties"
+msgstr "Propriétés du texte"
+
+# src/item_text.c:467
+# src/item_text.c:467
+# src/item_text.c:482
+# src/item_text.c:482
+#. ---------------------------
+#. Text Properties section
+#. ---------------------------
+#: src/glabels-ui.xml.h:82 src/view-text.c:330 src/view-barcode.c:305
+#, fuzzy
+msgid "Properties"
+msgstr "Propriétés du texte"
+
+#: src/glabels-ui.xml.h:83
+msgid "Property toolbar"
+msgstr ""
+
+#: src/glabels-ui.xml.h:84
 msgid "Quit"
 msgstr ""
 
-#: src/glabels-ui.xml.h:72
+#: src/glabels-ui.xml.h:85
 msgid "Quit the program"
 msgstr ""
 
-#: src/glabels-ui.xml.h:73
+#: src/glabels-ui.xml.h:86
 msgid "Raise object to top"
 msgstr ""
 
-#: src/glabels-ui.xml.h:74
+#: src/glabels-ui.xml.h:87
 msgid "Recent _Files"
 msgstr ""
 
-#: src/glabels-ui.xml.h:75
+#: src/glabels-ui.xml.h:88
 msgid "Redo"
 msgstr ""
 
-#: src/glabels-ui.xml.h:76
+#: src/glabels-ui.xml.h:89
 msgid "Redo the undone action"
 msgstr ""
 
@@ -436,20 +522,24 @@ msgstr ""
 # src/menu.c:86
 # src/menu.c:86
 # src/menu.c:86
-#: src/glabels-ui.xml.h:77
+#: src/glabels-ui.xml.h:90
 msgid "Remove all selections"
 msgstr "Supprime toutes les sélections"
 
-#: src/glabels-ui.xml.h:79
+#: src/glabels-ui.xml.h:92
 #, no-c-format
 msgid "Restore scale to 100%"
 msgstr ""
 
+#: src/glabels-ui.xml.h:93
+msgid "Right align"
+msgstr ""
+
 # src/rotate_select.c:187
 # src/rotate_select.c:187
 # src/rotate_select.c:167
 # src/rotate_select.c:169
-#: src/glabels-ui.xml.h:80 src/stock.c:72
+#: src/glabels-ui.xml.h:94 src/stock.c:72
 #, fuzzy
 msgid "Rotate _Left"
 msgstr "Rotation"
@@ -458,16 +548,16 @@ msgstr "Rotation"
 # src/rotate_select.c:187
 # src/rotate_select.c:167
 # src/rotate_select.c:169
-#: src/glabels-ui.xml.h:81 src/stock.c:73
+#: src/glabels-ui.xml.h:95 src/stock.c:73
 #, fuzzy
 msgid "Rotate _Right"
 msgstr "Rotation"
 
-#: src/glabels-ui.xml.h:82
+#: src/glabels-ui.xml.h:96
 msgid "Rotate object 90 clockwise"
 msgstr ""
 
-#: src/glabels-ui.xml.h:83
+#: src/glabels-ui.xml.h:97
 msgid "Rotate object 90 counter-clockwise"
 msgstr ""
 
@@ -475,7 +565,7 @@ msgstr ""
 # src/file.c:271 src/mdi.c:666
 # src/file.c:311 src/mdi.c:623
 # src/file.c:311 src/mdi.c:623
-#: src/glabels-ui.xml.h:84
+#: src/glabels-ui.xml.h:98
 #, fuzzy
 msgid "Save"
 msgstr "Enregistrer sous"
@@ -484,7 +574,7 @@ msgstr "Enregistrer sous"
 # src/file.c:271 src/mdi.c:666
 # src/file.c:311 src/mdi.c:623
 # src/file.c:311 src/mdi.c:623
-#: src/glabels-ui.xml.h:85
+#: src/glabels-ui.xml.h:99
 msgid "Save As"
 msgstr "Enregistrer sous"
 
@@ -492,7 +582,7 @@ msgstr "Enregistrer sous"
 # src/file.c:271 src/mdi.c:666
 # src/file.c:311 src/mdi.c:623
 # src/file.c:311 src/mdi.c:623
-#: src/glabels-ui.xml.h:86
+#: src/glabels-ui.xml.h:100
 #, fuzzy
 msgid "Save _As..."
 msgstr "Enregistrer sous"
@@ -501,12 +591,12 @@ msgstr "Enregistrer sous"
 # src/menu.c:142
 # src/menu.c:172
 # src/menu.c:172
-#: src/glabels-ui.xml.h:87
+#: src/glabels-ui.xml.h:101
 #, fuzzy
 msgid "Save the current file"
 msgstr "Sauvegarder le fichier en cours"
 
-#: src/glabels-ui.xml.h:88
+#: src/glabels-ui.xml.h:102
 msgid "Save the current file with a different name"
 msgstr ""
 
@@ -514,7 +604,7 @@ msgstr ""
 # src/menu.c:86
 # src/menu.c:85
 # src/menu.c:85
-#: src/glabels-ui.xml.h:89
+#: src/glabels-ui.xml.h:103
 #, fuzzy
 msgid "Select All"
 msgstr "_Désélectionne tout"
@@ -523,7 +613,7 @@ msgstr "_D
 # src/menu.c:86
 # src/menu.c:85
 # src/menu.c:85
-#: src/glabels-ui.xml.h:90
+#: src/glabels-ui.xml.h:104
 #, fuzzy
 msgid "Select _All"
 msgstr "_Désélectionne tout"
@@ -532,7 +622,7 @@ msgstr "_D
 # src/tools.c:59
 # src/menu.c:95 src/menu.c:186
 # src/menu.c:95 src/menu.c:186
-#: src/glabels-ui.xml.h:91
+#: src/glabels-ui.xml.h:105
 #, fuzzy
 msgid "Select all objects"
 msgstr "Sélectionner, déplacer et modifier les objets"
@@ -541,7 +631,7 @@ msgstr "S
 # src/tools.c:59
 # src/menu.c:95 src/menu.c:186
 # src/menu.c:95 src/menu.c:186
-#: src/glabels-ui.xml.h:92
+#: src/glabels-ui.xml.h:106
 msgid "Select, move and modify objects"
 msgstr "Sélectionner, déplacer et modifier les objets"
 
@@ -549,36 +639,48 @@ msgstr "S
 # src/display.c:1176 src/display.c:1224
 # src/display.c:1187 src/display.c:1235
 # src/display.c:1202 src/display.c:1250
-#: src/glabels-ui.xml.h:93 src/stock.c:71
+#: src/glabels-ui.xml.h:107 src/stock.c:71
 #, fuzzy
 msgid "Send to _Back"
 msgstr "Reculer à l'arrière-plan"
 
-#: src/glabels-ui.xml.h:94
+#: src/glabels-ui.xml.h:108
 msgid "Set drawing toolbar button style according to desktop default"
 msgstr ""
 
-#: src/glabels-ui.xml.h:95
+#: src/glabels-ui.xml.h:109
 msgid "Set main toolbar button style according to desktop default"
 msgstr ""
 
-#: src/glabels-ui.xml.h:96
+#: src/glabels-ui.xml.h:110
 msgid "Show _Tooltips"
 msgstr ""
 
-#: src/glabels-ui.xml.h:97
+#: src/glabels-ui.xml.h:111
+msgid "Show both icons and texts in the drawing toolbar"
+msgstr ""
+
+#: src/glabels-ui.xml.h:112
+msgid "Show both icons and texts in the main toolbar"
+msgstr ""
+
+#: src/glabels-ui.xml.h:113
 msgid "Show tooltips in the drawing toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:98
+#: src/glabels-ui.xml.h:114
 msgid "Show tooltips in the main toolbar"
 msgstr ""
 
+#: src/glabels-ui.xml.h:115
+msgid "Text color"
+msgstr "Couleur du texte"
+
 # src/menu.c:86
 # src/menu.c:86
 # src/menu.c:85
 # src/menu.c:85
-#: src/glabels-ui.xml.h:99
+#: src/glabels-ui.xml.h:116
 #, fuzzy
 msgid "U_n-select All"
 msgstr "_Désélectionne tout"
@@ -587,17 +689,17 @@ msgstr "_D
 # src/menu.c:86
 # src/menu.c:85
 # src/menu.c:85
-#: src/glabels-ui.xml.h:100
+#: src/glabels-ui.xml.h:117
 #, fuzzy
 msgid "Un-select All"
 msgstr "_Désélectionne tout"
 
-#: src/glabels-ui.xml.h:101
+#: src/glabels-ui.xml.h:118
 msgid "Undo"
 msgstr ""
 
 # src/preferences.c:215
-#: src/glabels-ui.xml.h:102
+#: src/glabels-ui.xml.h:119
 #, fuzzy
 msgid "Undo the last action"
 msgstr "En construction"
@@ -606,7 +708,7 @@ msgstr "En construction"
 # src/tools.c:90
 # src/menu.c:127
 # src/menu.c:127
-#: src/glabels-ui.xml.h:103
+#: src/glabels-ui.xml.h:120
 #, fuzzy
 msgid "Zoom _1:1"
 msgstr "Zoom 1:1"
@@ -615,7 +717,7 @@ msgstr "Zoom 1:1"
 # src/tools.c:84
 # src/menu.c:121 src/menu.c:211
 # src/menu.c:121 src/menu.c:211
-#: src/glabels-ui.xml.h:104
+#: src/glabels-ui.xml.h:121
 #, fuzzy
 msgid "Zoom _In"
 msgstr "Zoom supérieur"
@@ -624,39 +726,39 @@ msgstr "Zoom sup
 # src/tools.c:87
 # src/menu.c:124 src/menu.c:214
 # src/menu.c:124 src/menu.c:214
-#: src/glabels-ui.xml.h:105
+#: src/glabels-ui.xml.h:122
 #, fuzzy
 msgid "Zoom _Out"
 msgstr "Zoom inférieur"
 
-#: src/glabels-ui.xml.h:106
+#: src/glabels-ui.xml.h:123
 msgid "_About..."
 msgstr ""
 
-#: src/glabels-ui.xml.h:107
+#: src/glabels-ui.xml.h:124
 msgid "_Bottoms"
 msgstr ""
 
 # src/menu.c:103
 # src/menu.c:103
-#: src/glabels-ui.xml.h:108 src/stock.c:64
+#: src/glabels-ui.xml.h:125 src/stock.c:64
 #, fuzzy
 msgid "_Box"
 msgstr "Boîte"
 
-#: src/glabels-ui.xml.h:109 src/stock.c:78
+#: src/glabels-ui.xml.h:126 src/stock.c:78
 msgid "_Centers"
 msgstr ""
 
-#: src/glabels-ui.xml.h:110
+#: src/glabels-ui.xml.h:127
 msgid "_Close"
 msgstr ""
 
-#: src/glabels-ui.xml.h:111
+#: src/glabels-ui.xml.h:128
 msgid "_Contents"
 msgstr ""
 
-#: src/glabels-ui.xml.h:112
+#: src/glabels-ui.xml.h:129
 msgid "_Copy"
 msgstr ""
 
@@ -664,12 +766,12 @@ msgstr ""
 # src/tools.c:64
 # src/menu.c:100 src/menu.c:191
 # src/menu.c:100 src/menu.c:191
-#: src/glabels-ui.xml.h:113
+#: src/glabels-ui.xml.h:130
 #, fuzzy
 msgid "_Create Object"
 msgstr "Créer un objet texte"
 
-#: src/glabels-ui.xml.h:114
+#: src/glabels-ui.xml.h:131
 msgid "_Debug"
 msgstr ""
 
@@ -677,26 +779,26 @@ msgstr ""
 # src/display.c:1160 src/display.c:1208
 # src/display.c:1171 src/display.c:1219
 # src/display.c:1186 src/display.c:1234
-#: src/glabels-ui.xml.h:115 src/view.c:3078
+#: src/glabels-ui.xml.h:132 src/view.c:3526
 #, fuzzy
 msgid "_Delete"
 msgstr "Supprimer"
 
-#: src/glabels-ui.xml.h:116
+#: src/glabels-ui.xml.h:133
 msgid "_Desktop Default"
 msgstr ""
 
-#: src/glabels-ui.xml.h:117
+#: src/glabels-ui.xml.h:134
 msgid "_Drawing Toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:118
+#: src/glabels-ui.xml.h:135
 msgid "_Edit"
 msgstr ""
 
 # src/menu.c:109
 # src/menu.c:109
-#: src/glabels-ui.xml.h:119 src/stock.c:65
+#: src/glabels-ui.xml.h:136 src/stock.c:65
 #, fuzzy
 msgid "_Ellipse"
 msgstr "Ellipse"
@@ -705,20 +807,20 @@ msgstr "Ellipse"
 # src/item_box.c:274 src/item_ellipse.c:279
 # src/item_box.c:258 src/item_ellipse.c:260
 # src/item_box.c:258 src/item_ellipse.c:260
-#: src/glabels-ui.xml.h:120
+#: src/glabels-ui.xml.h:137
 #, fuzzy
 msgid "_File"
 msgstr "Remplissage"
 
-#: src/glabels-ui.xml.h:121
+#: src/glabels-ui.xml.h:138
 msgid "_Grid"
 msgstr ""
 
-#: src/glabels-ui.xml.h:122
+#: src/glabels-ui.xml.h:139
 msgid "_Help"
 msgstr ""
 
-#: src/glabels-ui.xml.h:123
+#: src/glabels-ui.xml.h:140
 msgid "_Icon"
 msgstr ""
 
@@ -726,12 +828,12 @@ msgstr ""
 # src/item_image.c:283
 # src/item_image.c:268 src/menu.c:113
 # src/item_image.c:268 src/menu.c:113
-#: src/glabels-ui.xml.h:124 src/stock.c:66
+#: src/glabels-ui.xml.h:141 src/stock.c:66
 #, fuzzy
 msgid "_Image"
 msgstr "Image"
 
-#: src/glabels-ui.xml.h:125 src/stock.c:76
+#: src/glabels-ui.xml.h:142 src/stock.c:76
 msgid "_Lefts"
 msgstr ""
 
@@ -739,12 +841,12 @@ msgstr ""
 # src/item_line.c:271
 # src/item_line.c:256 src/menu.c:106
 # src/item_line.c:256 src/menu.c:106
-#: src/glabels-ui.xml.h:126 src/stock.c:63
+#: src/glabels-ui.xml.h:143 src/stock.c:63
 #, fuzzy
 msgid "_Line"
 msgstr "Ligne"
 
-#: src/glabels-ui.xml.h:127
+#: src/glabels-ui.xml.h:144
 msgid "_Main Toolbar"
 msgstr ""
 
@@ -752,7 +854,7 @@ msgstr ""
 # src/item_text.c:467
 # src/menu.c:132 src/menu.c:223
 # src/menu.c:132 src/menu.c:223
-#: src/glabels-ui.xml.h:128
+#: src/glabels-ui.xml.h:145
 #, fuzzy
 msgid "_Merge Properties..."
 msgstr "Propriétés de fusion"
@@ -761,11 +863,11 @@ msgstr "Propri
 # src/menu.c:50
 # src/menu.c:50
 # src/menu.c:50
-#: src/glabels-ui.xml.h:129
+#: src/glabels-ui.xml.h:146
 msgid "_New"
 msgstr "_Nouveau"
 
-#: src/glabels-ui.xml.h:130
+#: src/glabels-ui.xml.h:147
 msgid "_Objects"
 msgstr ""
 
@@ -773,7 +875,7 @@ msgstr ""
 # src/file.c:178
 # src/file.c:211
 # src/file.c:211
-#: src/glabels-ui.xml.h:131
+#: src/glabels-ui.xml.h:148
 #, fuzzy
 msgid "_Open..."
 msgstr "Ouvrir"
@@ -781,11 +883,11 @@ msgstr "Ouvrir"
 #.
 #. * Submenu: Order
 #.
-#: src/glabels-ui.xml.h:132 src/view.c:2924
+#: src/glabels-ui.xml.h:149 src/view.c:3372
 msgid "_Order"
 msgstr ""
 
-#: src/glabels-ui.xml.h:133
+#: src/glabels-ui.xml.h:150
 msgid "_Paste"
 msgstr ""
 
@@ -793,16 +895,16 @@ msgstr ""
 # src/print.c:149
 # src/print.c:141
 # src/print_dialog.c:99
-#: src/glabels-ui.xml.h:134
+#: src/glabels-ui.xml.h:151
 #, fuzzy
 msgid "_Print..."
 msgstr "Imprimer"
 
-#: src/glabels-ui.xml.h:135
+#: src/glabels-ui.xml.h:152
 msgid "_Quit"
 msgstr ""
 
-#: src/glabels-ui.xml.h:136 src/stock.c:77
+#: src/glabels-ui.xml.h:153 src/stock.c:77
 msgid "_Rights"
 msgstr ""
 
@@ -813,7 +915,7 @@ msgstr ""
 #.
 #. * Submenu: Rotate/Flip
 #.
-#: src/glabels-ui.xml.h:137 src/view.c:2945
+#: src/glabels-ui.xml.h:154 src/view.c:3393
 #, fuzzy
 msgid "_Rotate/Flip"
 msgstr "Rotation"
@@ -822,7 +924,7 @@ msgstr "Rotation"
 # src/file.c:271 src/mdi.c:666
 # src/file.c:311 src/mdi.c:623
 # src/file.c:311 src/mdi.c:623
-#: src/glabels-ui.xml.h:138
+#: src/glabels-ui.xml.h:155
 #, fuzzy
 msgid "_Save"
 msgstr "Enregistrer sous"
@@ -831,7 +933,7 @@ msgstr "Enregistrer sous"
 # src/display.c:1160 src/display.c:1208
 # src/menu.c:94
 # src/menu.c:94
-#: src/glabels-ui.xml.h:139 src/stock.c:61
+#: src/glabels-ui.xml.h:156 src/stock.c:61
 #, fuzzy
 msgid "_Select Mode"
 msgstr "Sélectionner"
@@ -840,14 +942,14 @@ msgstr "S
 # src/item_text.c:442 src/item_text.c:627
 # src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100
 # src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100
-#: src/glabels-ui.xml.h:140 src/stock.c:62
+#: src/glabels-ui.xml.h:157 src/stock.c:62
 #, fuzzy
 msgid "_Text"
 msgstr "Texte"
 
 # src/menu.c:157
 # src/menu.c:157
-#: src/glabels-ui.xml.h:141 src/stock.c:79
+#: src/glabels-ui.xml.h:158 src/stock.c:79
 #, fuzzy
 msgid "_Tops"
 msgstr "_Outils"
@@ -856,7 +958,7 @@ msgstr "_Outils"
 # src/menu.c:50
 # src/menu.c:50
 # src/menu.c:50
-#: src/glabels-ui.xml.h:142
+#: src/glabels-ui.xml.h:159
 #, fuzzy
 msgid "_View"
 msgstr "_Nouveau"
@@ -922,26 +1024,30 @@ msgid "Show ui debugging messages."
 msgstr ""
 
 #: src/glabels.c:97
-msgid "Show media select widget debugging messages."
+msgid "Show property_bar debugging messages."
 msgstr ""
 
 #: src/glabels.c:100
-msgid "Show mini preview widget debugging messages."
+msgid "Show media select widget debugging messages."
 msgstr ""
 
 #: src/glabels.c:103
-msgid "Show pixbuf cache debugging messages."
+msgid "Show mini preview widget debugging messages."
 msgstr ""
 
 #: src/glabels.c:106
-msgid "Show widget debugging messages."
+msgid "Show pixbuf cache debugging messages."
 msgstr ""
 
 #: src/glabels.c:109
+msgid "Show widget debugging messages."
+msgstr ""
+
+#: src/glabels.c:112
 msgid "Turn on all debugging messages."
 msgstr ""
 
-#: src/glabels.c:180
+#: src/glabels.c:184
 msgid "Could not initialize Bonobo!\n"
 msgstr ""
 
@@ -989,20 +1095,20 @@ msgstr "copies"
 # src/print.c:180
 # src/print.c:196
 # src/print_dialog.c:152
-#: src/glabels-batch.c:58 src/print-dialog.c:200
+#: src/glabels-batch.c:58 src/print-dialog.c:210
 msgid "print outlines (to test printer alignment)"
 msgstr "imprimer des bordures (pour tester l'alignement de l'imprimante)"
 
 # src/print_dialog.c:160
-#: src/glabels-batch.c:60 src/print-dialog.c:209
+#: src/glabels-batch.c:60 src/print-dialog.c:219
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "imprimer à l'envers (i.e. une image miroir)"
 
-#: src/glabels-batch.c:95
+#: src/glabels-batch.c:96
 msgid "[OPTION...] GLABELS_FILE..."
 msgstr "[OPTION...] FICHIER_GLABELS..."
 
-#: src/glabels-batch.c:114
+#: src/glabels-batch.c:116
 msgid "missing glabels file\n"
 msgstr "fichier glabels manquant\n"
 
@@ -1010,16 +1116,16 @@ msgstr "fichier glabels manquant\n"
 # src/file.c:214
 # src/file.c:249
 # src/file.c:249
-#: src/glabels-batch.c:141
+#: src/glabels-batch.c:157
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "impossible d'ouvrir le fichier glabels %s\n"
 
-#: src/window.c:234
+#: src/window.c:242
 msgid "(none) - gLabels"
 msgstr ""
 
-#: src/window.c:399
+#: src/window.c:409
 msgid "(modified)"
 msgstr ""
 
@@ -1049,11 +1155,31 @@ msgstr ""
 msgid "Centers"
 msgstr ""
 
+# src/display.c:1157 src/display.c:1205
+# src/display.c:1160 src/display.c:1208
+# src/display.c:1171 src/display.c:1219
+# src/display.c:1186 src/display.c:1234
+#: src/ui-property-bar.c:346 src/wdgt-text-props.c:241 src/wdgt-bc-props.c:174
+#, fuzzy
+msgid "Default"
+msgstr "Supprimer"
+
+#: src/ui-property-bar.c:361 src/wdgt-fill.c:175
+msgid "No fill"
+msgstr ""
+
+# src/merge.c:80
+# src/merge.c:78
+#: src/ui-property-bar.c:376 src/wdgt-line.c:201
+#, fuzzy
+msgid "No line"
+msgstr "Aucun"
+
 # src/menu.c:185
 # src/menu.c:185
 # src/menu.c:290
 # src/menu.c:290
-#: src/commands.c:337
+#: src/commands.c:352
 msgid ""
 "A label and business card creation program for GNOME.\n"
 " \n"
@@ -1079,19 +1205,23 @@ msgstr ""
 "D'ADAPTATION A UN OBJET PARTICULIER. Pour plus de détail, voir la Licence "
 "Publique Générale GNU.\n"
 
-#: src/commands.c:351
+#: src/commands.c:366
 msgid "See the file AUTHORS for additional credits,"
 msgstr ""
 
-#: src/commands.c:352
-msgid "or visit http://snaught.com/glabels"
+#: src/commands.c:367
+msgid "or visit http://glabels.sourceforge.net/"
+msgstr ""
+
+#: src/commands.c:376
+msgid " "
 msgstr ""
 
 # src/print_copies.c:210
 # src/print_copies.c:210
 # src/print_copies.c:188
 # src/print_copies.c:187
-#: src/commands.c:376
+#: src/commands.c:391
 #, fuzzy
 msgid "glabels"
 msgstr "Etiquettes"
@@ -1100,7 +1230,7 @@ msgstr "Etiquettes"
 # src/file.c:59
 # src/file.c:72
 # src/file.c:72
-#: src/file.c:82
+#: src/file.c:91
 msgid "New Label or Card"
 msgstr "Nouvelle étiquette ou carte"
 
@@ -1108,7 +1238,7 @@ msgstr "Nouvelle 
 # src/file.c:87
 # src/file.c:98
 # src/file.c:98
-#: src/file.c:112
+#: src/file.c:121 src/file.c:291
 msgid "Media Type"
 msgstr "Type de média"
 
@@ -1116,15 +1246,24 @@ msgstr "Type de m
 # src/file.c:98
 # src/file.c:109
 # src/file.c:109
-#: src/file.c:118
+#: src/file.c:127 src/file.c:297
 msgid "Label orientation"
 msgstr "Orientation de l'étiquette"
 
+# src/item_text.c:467
+# src/item_text.c:467
+# src/item_text.c:482
+# src/item_text.c:482
+#: src/file.c:258
+#, fuzzy
+msgid "Label properties"
+msgstr "Propriétés du texte"
+
 # src/file.c:183
 # src/file.c:183
 # src/file.c:213
 # src/file.c:213
-#: src/file.c:248
+#: src/file.c:423
 msgid "Open label"
 msgstr "Ouvrir une étiquette"
 
@@ -1132,16 +1271,16 @@ msgstr "Ouvrir une 
 # src/menu.c:86
 # src/menu.c:86
 # src/menu.c:86
-#: src/file.c:296 src/file.c:594
+#: src/file.c:475 src/file.c:784
 #, fuzzy
 msgid "Empty file name selection"
 msgstr "Supprime toutes les sélections"
 
-#: src/file.c:297 src/file.c:311
+#: src/file.c:476 src/file.c:490
 msgid "Please select a file or supply a valid file name"
 msgstr ""
 
-#: src/file.c:310
+#: src/file.c:489
 msgid "File does not exist"
 msgstr ""
 
@@ -1149,12 +1288,12 @@ msgstr ""
 # src/file.c:214
 # src/file.c:249
 # src/file.c:249
-#: src/file.c:372
+#: src/file.c:564
 #, fuzzy, c-format
 msgid "Could not open file \"%s\""
 msgstr "Impossible d'ouvrir le fichier"
 
-#: src/file.c:380
+#: src/file.c:572
 msgid "Not a supported file format"
 msgstr ""
 
@@ -1162,12 +1301,12 @@ msgstr ""
 # src/file.c:248 src/mdi.c:641
 # src/file.c:288 src/mdi.c:601
 # src/file.c:288 src/mdi.c:601
-#: src/file.c:462 src/file.c:636
+#: src/file.c:653 src/file.c:828
 #, fuzzy, c-format
 msgid "Could not save file \"%s\""
 msgstr "Impossible d'enregistrer le fichier"
 
-#: src/file.c:470 src/file.c:644
+#: src/file.c:661 src/file.c:836
 msgid "Error encountered during save.  The file is still not saved."
 msgstr ""
 
@@ -1175,7 +1314,7 @@ msgstr ""
 # src/file.c:278
 # src/file.c:316
 # src/file.c:316
-#: src/file.c:512
+#: src/file.c:702
 #, fuzzy, c-format
 msgid "Save \"%s\" as"
 msgstr "Enregistrer l'étiquette sous"
@@ -1184,30 +1323,30 @@ msgstr "Enregistrer l'
 # src/file.c:319 src/mdi.c:735
 # src/file.c:362 src/mdi.c:693
 # src/file.c:362 src/mdi.c:693
-#: src/file.c:595
+#: src/file.c:785
 #, fuzzy
 msgid "Please supply a valid file name"
 msgstr "Vous devez donner un nom de fichier"
 
-#: src/file.c:609
+#: src/file.c:801
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr ""
 
-#: src/file.c:617
+#: src/file.c:809
 msgid "File already exists."
 msgstr ""
 
-#: src/file.c:732
+#: src/file.c:924
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr ""
 
-#: src/file.c:740
+#: src/file.c:932
 msgid "Your changes will be lost if you don't save them."
 msgstr ""
 
-#: src/file.c:743
+#: src/file.c:935
 msgid "Close without saving"
 msgstr ""
 
@@ -1216,7 +1355,7 @@ msgstr ""
 # src/prefs.c:445 src/prefs.c:452 src/prop_line.c:183
 # src/prefs.c:448 src/prefs.c:455 src/prop_line.c:183
 #. Should not happen
-#: src/prefs.c:664 src/prefs.c:671 src/wdgt-line.c:180
+#: src/prefs.c:664 src/prefs.c:671 src/wdgt-line.c:185
 msgid "points"
 msgstr "points"
 
@@ -1300,11 +1439,11 @@ msgstr "Milim
 msgid "Default page size"
 msgstr "Taille de page par défaut"
 
-#: src/prefs-dialog.c:309
+#: src/prefs-dialog.c:309 data/paper-sizes.xml.h:25
 msgid "US Letter"
 msgstr ""
 
-#: src/prefs-dialog.c:317
+#: src/prefs-dialog.c:317 data/paper-sizes.xml.h:6
 msgid "A4"
 msgstr ""
 
@@ -1317,7 +1456,7 @@ msgstr ""
 # src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100
 # src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100
 #. ------ text props entry ------
-#: src/prefs-dialog.c:359 src/view-text.c:314 src/view-text.c:634
+#: src/prefs-dialog.c:359 src/view-text.c:313 src/view-text.c:636
 #: src/wdgt-bc-style.c:184
 msgid "Text"
 msgstr "Texte"
@@ -1327,7 +1466,7 @@ msgstr "Texte"
 # src/item_line.c:256 src/menu.c:106
 # src/item_line.c:256 src/menu.c:106
 #. ------ Line box ------
-#: src/prefs-dialog.c:368 src/view-line.c:304
+#: src/prefs-dialog.c:368 src/view-line.c:303
 msgid "Line"
 msgstr "Ligne"
 
@@ -1336,21 +1475,21 @@ msgstr "Ligne"
 # src/item_box.c:258 src/item_ellipse.c:260
 # src/item_box.c:258 src/item_ellipse.c:260
 #. ------ Fill box ------
-#: src/prefs-dialog.c:377 src/view-box.c:323 src/view-ellipse.c:323
+#: src/prefs-dialog.c:377 src/view-box.c:322 src/view-ellipse.c:322
 msgid "Fill"
 msgstr "Remplissage"
 
 #.
 #. * Submenu: Align Horizontally
 #.
-#: src/view.c:2978
+#: src/view.c:3426
 msgid "Align _Horizontally"
 msgstr ""
 
 #.
 #. * Submenu: Align Vertically
 #.
-#: src/view.c:3017
+#: src/view.c:3465
 msgid "Align _Vertically"
 msgstr ""
 
@@ -1358,7 +1497,7 @@ msgstr ""
 # src/item_box.c:251
 # src/item_box.c:235
 # src/item_box.c:235
-#: src/view-box.c:291
+#: src/view-box.c:290
 msgid "Edit box object properties"
 msgstr "Editer les propriétés de l'objet boîte..."
 
@@ -1369,7 +1508,7 @@ msgstr "Editer les propri
 #. ---------------------------
 #. Outline section
 #. ---------------------------
-#: src/view-box.c:307 src/view-ellipse.c:307
+#: src/view-box.c:306 src/view-ellipse.c:306
 msgid "Outline"
 msgstr "Bordure"
 
@@ -1388,8 +1527,8 @@ msgstr "Bordure"
 #. ---------------------------
 #. Position section
 #. ---------------------------
-#: src/view-box.c:339 src/view-ellipse.c:339 src/view-line.c:320
-#: src/view-image.c:314 src/view-text.c:349 src/view-barcode.c:338
+#: src/view-box.c:338 src/view-ellipse.c:338 src/view-line.c:319
+#: src/view-image.c:314 src/view-text.c:348 src/view-barcode.c:337
 msgid "Position"
 msgstr "Position"
 
@@ -1404,7 +1543,7 @@ msgstr "Position"
 #. ---------------------------
 #. Size section
 #. ---------------------------
-#: src/view-box.c:354 src/view-ellipse.c:354 src/view-line.c:338
+#: src/view-box.c:353 src/view-ellipse.c:353 src/view-line.c:337
 #: src/view-image.c:331
 msgid "Size"
 msgstr "Taille"
@@ -1413,7 +1552,7 @@ msgstr "Taille"
 # src/item_ellipse.c:256
 # src/item_ellipse.c:237
 # src/item_ellipse.c:237
-#: src/view-ellipse.c:291
+#: src/view-ellipse.c:290
 msgid "Edit ellipse object properties"
 msgstr "Editer les propriétés de l'objet ellipse..."
 
@@ -1421,7 +1560,7 @@ msgstr "Editer les propri
 # src/item_line.c:258
 # src/item_line.c:243
 # src/item_line.c:243
-#: src/view-line.c:289
+#: src/view-line.c:288
 msgid "Edit line object properties"
 msgstr "Editer les propriétés de l'objet ligne..."
 
@@ -1457,27 +1596,15 @@ msgstr "Restaurer la taille d'image"
 # src/item_text.c:432
 # src/item_text.c:450
 # src/item_text.c:450
-#: src/view-text.c:299
+#: src/view-text.c:298
 msgid "Edit text object properties"
 msgstr "Editer les propriétés de l'objet texte..."
 
-# src/item_text.c:467
-# src/item_text.c:467
-# src/item_text.c:482
-# src/item_text.c:482
-#. ---------------------------
-#. Text Properties section
-#. ---------------------------
-#: src/view-text.c:331 src/view-barcode.c:306
-#, fuzzy
-msgid "Properties"
-msgstr "Propriétés du texte"
-
 # src/item_barcode.c:299
 # src/item_barcode.c:299
 # src/item_barcode.c:287
 # src/item_barcode.c:287
-#: src/view-barcode.c:271
+#: src/view-barcode.c:270
 msgid "Edit barcode object properties"
 msgstr "Editer les propriétés de l'objet code-barre..."
 
@@ -1488,7 +1615,7 @@ msgstr "Editer les propri
 #. ---------------------------
 #. Data section
 #. ---------------------------
-#: src/view-barcode.c:286 src/merge-properties-dialog.c:343
+#: src/view-barcode.c:285 src/merge-properties-dialog.c:343
 msgid "Data"
 msgstr "Données"
 
@@ -1496,7 +1623,7 @@ msgstr "Donn
 # src/item_barcode.c:570 src/item_barcode.c:594 src/print.c:641
 # src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:799
 # src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:600
-#: src/view-barcode.c:802 src/print.c:912
+#: src/view-barcode.c:803 src/print.c:1021
 msgid "Invalid barcode"
 msgstr "Code-barre invalide"
 
@@ -1560,7 +1687,7 @@ msgstr "S
 msgid "Record/Field"
 msgstr ""
 
-#: src/print-dialog.c:128
+#: src/print-dialog.c:138
 msgid "_Job"
 msgstr ""
 
@@ -1568,7 +1695,7 @@ msgstr ""
 # src/print.c:149
 # src/print.c:141
 # src/print_dialog.c:99
-#: src/print-dialog.c:133
+#: src/print-dialog.c:143
 #, fuzzy
 msgid "P_rinter"
 msgstr "Imprimer"
@@ -1578,14 +1705,14 @@ msgstr "Imprimer"
 # src/print.c:146
 # src/print_dialog.c:104
 #. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:163
+#: src/print-dialog.c:173
 msgid "Copies"
 msgstr "Copies"
 
 # src/print.c:164
 # src/print_dialog.c:121
 #. ------- Otherwise add merge control widget ------------
-#: src/print-dialog.c:177
+#: src/print-dialog.c:187
 msgid "Document merge control"
 msgstr "Contrôle de la fusion de document"
 
@@ -1594,23 +1721,27 @@ msgstr "Contr
 # src/print.c:186
 # src/print_dialog.c:141
 #. ----------- Add custom print options area ------------
-#: src/print-dialog.c:194
+#: src/print-dialog.c:204
 msgid "Options"
 msgstr "Options"
 
+#: src/print-dialog.c:227
+msgid "print crop marks"
+msgstr ""
+
 # src/print.c:235
 # src/print.c:235
 # src/print.c:283 src/print.c:348
 # src/print_dialog.c:241 src/print_dialog.c:280
-#: src/print-dialog.c:336 src/print-dialog.c:374
+#: src/print-dialog.c:364 src/print-dialog.c:403
 msgid "Print preview"
 msgstr "Aperçu avant impression"
 
-#: src/label.c:542
+#: src/label.c:563
 msgid "Untitled"
 msgstr ""
 
-#: src/template.c:296
+#: src/template.c:318
 #, c-format
 msgid "Generic %s full page"
 msgstr ""
@@ -1618,14 +1749,14 @@ msgstr ""
 # src/template.c:179
 # src/template.c:178
 # src/template.c:223
-#: src/template.c:338
+#: src/template.c:362
 msgid "No template files found!"
 msgstr "Aucun fichier de patron trouvé !"
 
 # src/media_select.c:522
 # src/media_select.c:488
 # src/media_select.c:367
-#: src/template.c:435
+#: src/template.c:461
 #, c-format
 msgid "%s x %s %s"
 msgstr "%s x %s %s"
@@ -1633,17 +1764,17 @@ msgstr "%s x %s %s"
 # src/media_select.c:522
 # src/media_select.c:488
 # src/media_select.c:372
-#: src/template.c:440
+#: src/template.c:466
 #, c-format
 msgid "%.5g x %.5g %s"
 msgstr "%.5g x %.5g %s"
 
-#: src/template.c:451 src/template.c:465
+#: src/template.c:477 src/template.c:491
 #, c-format
 msgid "%s %s diameter"
 msgstr ""
 
-#: src/template.c:455 src/template.c:469
+#: src/template.c:481 src/template.c:495
 #, c-format
 msgid "%.5g %s diameter"
 msgstr ""
@@ -1651,7 +1782,7 @@ msgstr ""
 # src/media_select.c:515
 # src/media_select.c:481
 # src/media_select.c:353
-#: src/template.c:607
+#: src/template.c:633
 #, c-format
 msgid "%d x %d  (%d per sheet)"
 msgstr "%d x %d  (%d par feuille)"
@@ -1659,7 +1790,7 @@ msgstr "%d x %d  (%d par feuille)"
 # src/media_select.c:515
 # src/media_select.c:481
 # src/media_select.c:353
-#: src/template.c:611
+#: src/template.c:637
 #, fuzzy, c-format
 msgid "%d per sheet"
 msgstr "%d x %d  (%d par feuille)"
@@ -1676,7 +1807,7 @@ msgstr "Aucun fichier de patron trouv
 # src/label.c:186 src/label.c:211
 # src/label.c:170 src/label.c:194
 # src/label.c:168 src/label.c:192
-#: src/xml-label.c:171 src/xml-label.c:204
+#: src/xml-label.c:177 src/xml-label.c:214
 msgid "xmlParseFile error"
 msgstr "erreur xmlParseFile"
 
@@ -1684,23 +1815,27 @@ msgstr "erreur xmlParseFile"
 # src/label.c:244
 # src/label.c:225
 # src/label.c:223
-#: src/xml-label.c:241
+#: src/xml-label.c:251
 msgid "No document root"
 msgstr "Pas de racine de document"
 
-#: src/xml-label.c:253
+#: src/xml-label.c:263
 msgid "Importing from glabels 0.1 format"
 msgstr ""
 
-#: src/xml-label.c:261
+#: src/xml-label.c:271
 msgid "Importing from glabels 0.4 format"
 msgstr ""
 
+#: src/xml-label.c:278
+msgid "Importing from glabels 1.91 format"
+msgstr ""
+
 # src/label.c:248
 # src/label.c:249
 # src/label.c:236
 # src/label.c:234
-#: src/xml-label.c:264
+#: src/xml-label.c:281
 #, fuzzy
 msgid "bad document, unknown glabels Namespace"
 msgstr "document de type erroné, aucun espace de noms glabels trouvé"
@@ -1709,7 +1844,7 @@ msgstr "document de type erron
 # src/label.c:254
 # src/label.c:241
 # src/label.c:239
-#: src/xml-label.c:292 src/xml-label-04.c:75
+#: src/xml-label.c:310 src/xml-label-04.c:75 src/xml-label-191.c:131
 #, c-format
 msgid "Bad root node = \"%s\""
 msgstr "Mauvais noeud racine = \"%s\""
@@ -1718,7 +1853,7 @@ msgstr "Mauvais noeud racine = \"%s\""
 # src/label.c:254
 # src/label.c:241
 # src/label.c:239
-#: src/xml-label.c:325
+#: src/xml-label.c:345 src/xml-label-191.c:164
 #, fuzzy, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "Mauvais noeud racine = \"%s\""
@@ -1727,7 +1862,7 @@ msgstr "Mauvais noeud racine = \"%s\""
 # src/label.c:301
 # src/label.c:294
 # src/label.c:290
-#: src/xml-label.c:357 src/xml-label-04.c:123
+#: src/xml-label.c:387 src/xml-label-04.c:123 src/xml-label-191.c:196
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr "mauvais noeud =  \"%s\""
@@ -1736,22 +1871,33 @@ msgstr "mauvais noeud =  \"%s\""
 # src/label.c:301
 # src/label.c:294
 # src/label.c:290
-#: src/xml-label.c:763
+#: src/xml-label.c:783 src/xml-label-191.c:602
 #, fuzzy, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "mauvais noeud =  \"%s\""
 
+#: src/xml-label.c:944
+msgid "Utf8 conversion error."
+msgstr ""
+
 # src/label.c:487
 # src/label.c:493
 # src/label.c:589
 # src/label.c:587
-#: src/xml-label.c:831
+#: src/xml-label.c:951
 msgid "Problem saving xml file."
 msgstr "Problème de sauvegarde du fichier xml."
 
-#: src/xml-template.c:157
+#. This should always be an id, but just in case a name
+#. slips by!
+#: src/xml-label-191.c:680 src/xml-template.c:169
+#, c-format
+msgid "Unknown page size id \"%s\", trying as name"
+msgstr ""
+
+#: src/xml-label-191.c:690 src/xml-template.c:179
 #, c-format
-msgid "Unknown page size id \"%s\""
+msgid "Unknown page size id or name \"%s\""
 msgstr ""
 
 # src/merge.c:80
@@ -1786,7 +1932,7 @@ msgstr "Texte avec s
 # src/prop_text.c:181
 # src/prop_text.c:181
 #. Font label
-#: src/wdgt-text-props.c:181
+#: src/wdgt-text-props.c:185
 msgid "Font:"
 msgstr "Police :"
 
@@ -1799,8 +1945,8 @@ msgstr "Police :"
 # src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189
 # src/prop_text.c:234
 #. Text Color Label
-#: src/wdgt-text-props.c:230 src/wdgt-line.c:189 src/wdgt-fill.c:164
-#: src/wdgt-bc-props.c:164
+#: src/wdgt-text-props.c:234 src/wdgt-line.c:194 src/wdgt-fill.c:168
+#: src/wdgt-bc-props.c:167
 msgid "Color:"
 msgstr "Couleur :"
 
@@ -1809,7 +1955,7 @@ msgstr "Couleur :"
 # src/prop_text.c:248
 # src/prop_text.c:248
 #. Alignment label
-#: src/wdgt-text-props.c:246
+#: src/wdgt-text-props.c:255
 msgid "Alignment:"
 msgstr "Alignement :"
 
@@ -1853,7 +1999,7 @@ msgstr "Y :"
 # src/prop_line.c:169 src/prop_size.c:182
 # src/prop_line.c:169 src/prop_size.c:182
 #. W Label
-#: src/wdgt-size.c:187 src/wdgt-line.c:166
+#: src/wdgt-size.c:187 src/wdgt-line.c:171
 msgid "Width:"
 msgstr "Largeur :"
 
@@ -2028,14 +2174,588 @@ msgstr "Disposition :"
 msgid "Rotate"
 msgstr "Rotation"
 
+# src/merge_ui_text.c:334
+# src/merge_ui_text.c:334
+#. This is the default custom color
+#: src/mygal/color-palette.c:396
+#, fuzzy
+msgid "custom"
+msgstr "Clé de champ spécifique"
+
+# src/prop_bc.c:204 src/prop_fill.c:186 src/prop_line.c:203
+# src/prop_text.c:263
+# src/prop_bc.c:210 src/prop_fill.c:184 src/prop_line.c:209
+# src/prop_text.c:247
+# src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189
+# src/prop_text.c:234
+# src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189
+# src/prop_text.c:234
+#. "Custom" color - we'll pop up a GnomeColorPicker
+#: src/mygal/color-palette.c:438
+#, fuzzy
+msgid "Custom Color:"
+msgstr "Couleur :"
+
+#: src/mygal/color-palette.c:446
+msgid "Choose Custom Color"
+msgstr ""
+
+#: src/mygal/color-palette.c:579
+msgid "black"
+msgstr ""
+
+#: src/mygal/color-palette.c:580
+msgid "light brown"
+msgstr ""
+
+#: src/mygal/color-palette.c:581
+msgid "brown gold"
+msgstr ""
+
+#: src/mygal/color-palette.c:582
+msgid "dark green #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:583
+msgid "navy"
+msgstr ""
+
+#: src/mygal/color-palette.c:584 src/mygal/color-palette.c:640
+msgid "dark blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:585
+msgid "purple #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:586
+msgid "very dark gray"
+msgstr ""
+
+#: src/mygal/color-palette.c:589 src/mygal/color-palette.c:645
+msgid "dark red"
+msgstr ""
+
+#: src/mygal/color-palette.c:590
+msgid "red-orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:591
+msgid "gold"
+msgstr ""
+
+#: src/mygal/color-palette.c:592
+msgid "dark green"
+msgstr ""
+
+#: src/mygal/color-palette.c:593 src/mygal/color-palette.c:646
+msgid "dull blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:594 src/mygal/color-palette.c:647
+msgid "blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:595
+msgid "dull purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:596
+msgid "dark grey"
+msgstr ""
+
+#: src/mygal/color-palette.c:599
+msgid "red"
+msgstr ""
+
+#: src/mygal/color-palette.c:600
+msgid "orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:601
+msgid "lime"
+msgstr ""
+
+#: src/mygal/color-palette.c:602
+msgid "dull green"
+msgstr ""
+
+#: src/mygal/color-palette.c:603
+msgid "dull blue #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:604
+msgid "sky blue #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:605 src/mygal/color-palette.c:644
+msgid "purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:606
+msgid "gray"
+msgstr ""
+
+# src/item_image.c:283
+# src/item_image.c:283
+# src/item_image.c:268 src/menu.c:113
+# src/item_image.c:268 src/menu.c:113
+#: src/mygal/color-palette.c:609 src/mygal/color-palette.c:641
+#, fuzzy
+msgid "magenta"
+msgstr "Image"
+
+#: src/mygal/color-palette.c:610
+msgid "bright orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:611 src/mygal/color-palette.c:642
+msgid "yellow"
+msgstr ""
+
+# src/prop_vector.c:245
+# src/prop_vector.c:224
+# src/prop_vector.c:224
+#: src/mygal/color-palette.c:612
+#, fuzzy
+msgid "green"
+msgstr "degrés"
+
+#: src/mygal/color-palette.c:613 src/mygal/color-palette.c:643
+msgid "cyan"
+msgstr ""
+
+#: src/mygal/color-palette.c:614
+msgid "bright blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:615 src/mygal/color-palette.c:632
+msgid "red purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:616
+msgid "light grey"
+msgstr ""
+
+#: src/mygal/color-palette.c:619 src/mygal/color-palette.c:636
+msgid "pink"
+msgstr ""
+
+#: src/mygal/color-palette.c:620
+msgid "light orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:621 src/mygal/color-palette.c:633
+msgid "light yellow"
+msgstr ""
+
+#: src/mygal/color-palette.c:622
+msgid "light green"
+msgstr ""
+
+#: src/mygal/color-palette.c:623
+msgid "light cyan"
+msgstr ""
+
+#: src/mygal/color-palette.c:624 src/mygal/color-palette.c:634
+msgid "light blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:625 src/mygal/color-palette.c:638
+msgid "light purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:626
+msgid "white"
+msgstr ""
+
+#: src/mygal/color-palette.c:631
+msgid "purplish blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:635
+msgid "dark purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:637
+msgid "sky blue"
+msgstr ""
+
+#: data/paper-sizes.xml.h:1
+msgid "A0"
+msgstr ""
+
+#: data/paper-sizes.xml.h:2
+msgid "A1"
+msgstr ""
+
+#: data/paper-sizes.xml.h:3
+msgid "A10"
+msgstr ""
+
+#: data/paper-sizes.xml.h:4
+msgid "A2"
+msgstr ""
+
+#: data/paper-sizes.xml.h:5
+msgid "A3"
+msgstr ""
+
+#: data/paper-sizes.xml.h:7
+msgid "A5"
+msgstr ""
+
+#: data/paper-sizes.xml.h:8
+msgid "A6"
+msgstr ""
+
+#: data/paper-sizes.xml.h:9
+msgid "A7"
+msgstr ""
+
+#: data/paper-sizes.xml.h:10
+msgid "A8"
+msgstr ""
+
+#: data/paper-sizes.xml.h:11
+msgid "A9"
+msgstr ""
+
+#: data/paper-sizes.xml.h:12
+msgid "B0"
+msgstr ""
+
+#: data/paper-sizes.xml.h:13
+msgid "B1"
+msgstr ""
+
+#: data/paper-sizes.xml.h:14
+msgid "B10"
+msgstr ""
+
+#: data/paper-sizes.xml.h:15
+msgid "B2"
+msgstr ""
+
+#: data/paper-sizes.xml.h:16
+msgid "B3"
+msgstr ""
+
+#: data/paper-sizes.xml.h:17
+msgid "B4"
+msgstr ""
+
+#: data/paper-sizes.xml.h:18
+msgid "B5"
+msgstr ""
+
+#: data/paper-sizes.xml.h:19
+msgid "B6"
+msgstr ""
+
+#: data/paper-sizes.xml.h:20
+msgid "B7"
+msgstr ""
+
+#: data/paper-sizes.xml.h:21
+msgid "B8"
+msgstr ""
+
+#: data/paper-sizes.xml.h:22
+msgid "B9"
+msgstr ""
+
+#: data/paper-sizes.xml.h:23
+msgid "US Executive"
+msgstr ""
+
+#: data/paper-sizes.xml.h:24
+msgid "US Legal"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:1
+msgid "Address Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:2 data/avery-iso-templates.xml.h:3
+#: data/zweckform-iso-templates.xml.h:2 data/misc-us-templates.xml.h:2
+#: data/misc-iso-templates.xml.h:9
+msgid "Business Cards"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:3
+msgid "CD/DVD Labels (Disc Labels)"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:4
+msgid "Diskette Labels"
+msgstr ""
+
+# src/print_copies.c:210
+# src/print_copies.c:210
+# src/print_copies.c:188
+# src/print_copies.c:187
+#: data/avery-us-templates.xml.h:5
+#, fuzzy
+msgid "Filing Labels"
+msgstr "Etiquettes"
+
+#: data/avery-us-templates.xml.h:6
+msgid "Full Sheet Labels"
+msgstr ""
+
+# src/print_copies_merge.c:197
+# src/print_merge.c:170
+#: data/avery-us-templates.xml.h:7
+#, fuzzy
+msgid "Large Round Labels"
+msgstr "Commencer par l'étiquette"
+
+#: data/avery-us-templates.xml.h:8
+msgid "Name Badge Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:9
+msgid "Return Address Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:10
+msgid "Shipping Labels"
+msgstr ""
+
+# src/print_copies_merge.c:197
+# src/print_merge.c:170
+#: data/avery-us-templates.xml.h:11
+#, fuzzy
+msgid "Small Round Labels"
+msgstr "Commencer par l'étiquette"
+
+# src/print_copies.c:210
+# src/print_copies.c:210
+# src/print_copies.c:188
+# src/print_copies.c:187
+#: data/avery-us-templates.xml.h:12
+#, fuzzy
+msgid "Square Labels"
+msgstr "Etiquettes"
+
+#: data/avery-us-templates.xml.h:13
+msgid "Video Tape Face Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:14
+msgid "Video Tape Spine Labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:1
+msgid "3.5'' Diskette labels (face only)"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:2
+msgid "Address labels"
+msgstr ""
+
+# src/print_copies.c:210
+# src/print_copies.c:210
+# src/print_copies.c:188
+# src/print_copies.c:187
+#: data/avery-iso-templates.xml.h:4 data/zweckform-iso-templates.xml.h:4
+#: data/misc-us-templates.xml.h:4 data/misc-iso-templates.xml.h:10
+#, fuzzy
+msgid "CD/DVD Labels"
+msgstr "Etiquettes"
+
+#: data/avery-iso-templates.xml.h:5 data/misc-iso-templates.xml.h:16
+msgid "Mailing Labels"
+msgstr ""
+
+# src/print_copies.c:210
+# src/print_copies.c:210
+# src/print_copies.c:188
+# src/print_copies.c:187
+#: data/avery-iso-templates.xml.h:6
+#, fuzzy
+msgid "Mailing labels"
+msgstr "Etiquettes"
+
+#: data/avery-iso-templates.xml.h:7
+msgid "Mini Address"
+msgstr ""
+
+# src/file.c:183
+# src/file.c:183
+# src/file.c:213
+# src/file.c:213
+#: data/avery-iso-templates.xml.h:8
+#, fuzzy
+msgid "Shipping labels"
+msgstr "Ouvrir une étiquette"
+
+#: data/zweckform-iso-templates.xml.h:1
+msgid "Allround Labels"
+msgstr ""
+
+# src/print_copies.c:210
+# src/print_copies.c:210
+# src/print_copies.c:188
+# src/print_copies.c:187
+#: data/zweckform-iso-templates.xml.h:3
+#, fuzzy
+msgid "CD Labels"
+msgstr "Etiquettes"
+
+#: data/zweckform-iso-templates.xml.h:5
+msgid "Correction and Cover-up Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:6
+msgid "Lever Arch File Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:7
+msgid "Mailing Labels -- 12"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:8
+msgid "QSL-Karten Etiketten 70mm x 50,8mm"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:9
+msgid "Rectangular Copier Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:10 data/misc-iso-templates.xml.h:20
+msgid "Rectangular Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:11
+msgid "Video Labels (back)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:1
+msgid "Business Card CD"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:3
+msgid "CD Template Rectangles"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:5
+msgid "CD/DVD Labels (Face Only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:6 data/misc-iso-templates.xml.h:11
+msgid "CD/DVD Labels (face only)"
+msgstr ""
+
+# src/print_copies.c:210
+# src/print_copies.c:210
+# src/print_copies.c:188
+# src/print_copies.c:187
+#: data/misc-us-templates.xml.h:7
+#, fuzzy
+msgid "DLT Labels"
+msgstr "Etiquettes"
+
+#: data/misc-us-templates.xml.h:8
+msgid "Microtube labels"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:9
+msgid "Mini-CD Labels"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:10
+msgid "PRO CD Labels 2-up (CD spine only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:11
+msgid "PRO CD Labels 2-up (Face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:12
+msgid "PRO CD Labels 2-up (face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:13
+msgid "Slimline CD Case (rightside up)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:14
+msgid "Slimline CD Case (upside down)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:1
+msgid "Agipa 119488: Business Cards"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:2
+msgid "Allround Labels --24"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:3
+msgid "Allround Labels --44"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:4
+msgid "Allround Labels --64"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:5
+msgid "Allround Labels --65"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:6
+msgid "Arch File Labels"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:7
+msgid "Arch File Labels (large)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:8
+msgid "Arch File Labels (small)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:12
+msgid "CD/DVD Labels Standard Format (face only)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:13
+msgid "Diskette Labels (face only)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:14
+msgid "EPSON Photo Stickers 16"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:15
+msgid "Etiketten"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:17
+msgid "Mailing Labels --14"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:18
+msgid "Mailing Labels-2 columns"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:19
+msgid "Mailing Labels-3 columns"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:21
+msgid "Video Labels (face only)"
+msgstr ""
+
 # src/file.c:178
 # src/file.c:178
 # src/file.c:211
 # src/file.c:211
-#: src/gnome-recent-view-bonobo.c:189
-#, fuzzy, c-format
-msgid "Open %s"
-msgstr "Ouvrir"
+#, fuzzy
+#~ msgid "Open %s"
+#~ msgstr "Ouvrir"
 
 # src/mdi.c:190
 # src/mdi.c:189
@@ -2063,13 +2783,6 @@ msgstr "Ouvrir"
 #~ "\n"
 #~ "Voulez-vous l'enregistrer ?"
 
-# src/mdi.c:482
-# src/mdi.c:488
-# src/mdi.c:459
-# src/mdi.c:459
-#~ msgid "Don't save"
-#~ msgstr "Ne pas sauver"
-
 # src/mdi.c:663
 # src/mdi.c:669
 # src/mdi.c:626
@@ -2134,13 +2847,6 @@ msgstr "Ouvrir"
 #~ msgid "Barcode data"
 #~ msgstr "Données de code-barre"
 
-# src/item_barcode.c:337
-# src/item_barcode.c:343 src/prefs.c:243
-# src/item_barcode.c:320 src/prefs.c:221
-# src/item_barcode.c:320 src/prefs.c:215
-#~ msgid "General"
-#~ msgstr "Général"
-
 # src/prop_bc.c:202
 # src/prop_bc.c:182
 # src/prop_bc.c:182
@@ -2262,12 +2968,3 @@ msgstr "Ouvrir"
 #, fuzzy
 #~ msgid "Maintain original aspect ratio"
 #~ msgstr "Conserver le rapport d'échelle d'origine"
-
-#~ msgid "Text color"
-#~ msgstr "Couleur du texte"
-
-#~ msgid "Line Color"
-#~ msgstr "Couleur de ligne"
-
-#~ msgid "Fill Color"
-#~ msgstr "Couleur de remplissage"
diff --git a/glabels2/po/ja.po b/glabels2/po/ja.po
index c9f8f5ee..5dda84fd 100644
--- a/glabels2/po/ja.po
+++ b/glabels2/po/ja.po
@@ -2,18 +2,17 @@
 # Copyright (C) 2001-2003 Free Software Foundation, Inc.
 # Takeshi Aihana <aihana@gnome.gr.jp>, 2001-2003.
 #
-#: src/commands.c:376
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels 0.92\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-07 18:01+0900\n"
+"POT-Creation-Date: 2003-11-01 19:24-0500\n"
 "PO-Revision-Date: 2003-09-07 17:59+0900\n"
 "Last-Translator: Takeshi Aihana <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: src/glabels-ui.xml.h:1
 msgid "About glabels"
@@ -327,7 +326,7 @@ msgstr "設定(_E)..."
 msgid "Preferences"
 msgstr "gLabel の設定"
 
-#: src/glabels-ui.xml.h:79 src/print-dialog.c:104
+#: src/glabels-ui.xml.h:79 src/print-dialog.c:114
 msgid "Print"
 msgstr "印刷"
 
@@ -741,7 +740,7 @@ msgstr "ウィジットのデバッグ・メッセージを表示する"
 msgid "Turn on all debugging messages."
 msgstr "全てのデバッグ・メッセージを表示する"
 
-#: src/glabels.c:183
+#: src/glabels.c:184
 msgid "Could not initialize Bonobo!\n"
 msgstr "Bonobo を初期化することができませんでした！\n"
 
@@ -777,32 +776,32 @@ msgstr "コピーの数 (デフォルト = 1)"
 msgid "copies"
 msgstr "コピーの数"
 
-#: src/glabels-batch.c:58 src/print-dialog.c:200
+#: src/glabels-batch.c:58 src/print-dialog.c:210
 msgid "print outlines (to test printer alignment)"
 msgstr "アウトラインを印刷する (印刷時の配置を確認するため)"
 
-#: src/glabels-batch.c:60 src/print-dialog.c:209
+#: src/glabels-batch.c:60 src/print-dialog.c:219
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "(画像をミラーするように) 反転して印刷する"
 
-#: src/glabels-batch.c:95
+#: src/glabels-batch.c:96
 msgid "[OPTION...] GLABELS_FILE..."
 msgstr "[オプション...] ファイル名..."
 
-#: src/glabels-batch.c:114
+#: src/glabels-batch.c:116
 msgid "missing glabels file\n"
 msgstr "gLabel で使用するファイルがありません\n"
 
-#: src/glabels-batch.c:141
+#: src/glabels-batch.c:157
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "gLabel で使用するファイル %s が開けません\n"
 
-#: src/window.c:237
+#: src/window.c:242
 msgid "(none) - gLabels"
 msgstr "(なし) - gLabels"
 
-#: src/window.c:404
+#: src/window.c:409
 msgid "(modified)"
 msgstr "(変更済み)"
 
@@ -863,9 +862,14 @@ msgid "See the file AUTHORS for additional credits,"
 msgstr "補足のクレジットについては AUTHORS ファイルをご覧になるか、"
 
 #: src/commands.c:367
-msgid "or visit http://snaught.com/glabels"
+#, fuzzy
+msgid "or visit http://glabels.sourceforge.net/"
 msgstr "http://snaught.com/glabels を訪れてみて下さい。"
 
+#: src/commands.c:376
+msgid " "
+msgstr ""
+
 #: src/commands.c:391
 msgid "glabels"
 msgstr "gLabels"
@@ -890,64 +894,64 @@ msgstr "ラベルのプロパティ"
 msgid "Open label"
 msgstr "ラベルを開きます"
 
-#: src/file.c:471 src/file.c:769
+#: src/file.c:475 src/file.c:784
 msgid "Empty file name selection"
 msgstr "ファイル名の入力欄が空です"
 
-#: src/file.c:472 src/file.c:486
+#: src/file.c:476 src/file.c:490
 msgid "Please select a file or supply a valid file name"
 msgstr "既存のファイルを選択するか、または正しいファイル名を指定して下さい。"
 
-#: src/file.c:485
+#: src/file.c:489
 msgid "File does not exist"
 msgstr "ファイルがありません。"
 
-#: src/file.c:547
+#: src/file.c:564
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr "ファイル \"%s\" が開けませんでした"
 
-#: src/file.c:555
+#: src/file.c:572
 msgid "Not a supported file format"
 msgstr "サポートしていないファイル形式です。"
 
-#: src/file.c:637 src/file.c:811
+#: src/file.c:653 src/file.c:828
 #, c-format
 msgid "Could not save file \"%s\""
 msgstr "ファイル \"%s\" を保存できませんでした"
 
-#: src/file.c:645 src/file.c:819
+#: src/file.c:661 src/file.c:836
 msgid "Error encountered during save.  The file is still not saved."
 msgstr "データ保存中にエラーが発生しました。データはまだ保存されていません。"
 
-#: src/file.c:687
+#: src/file.c:702
 #, c-format
 msgid "Save \"%s\" as"
 msgstr "\"%s\" に名前を付けて保存"
 
-#: src/file.c:770
+#: src/file.c:785
 msgid "Please supply a valid file name"
 msgstr "正しいファイル名を指定して下さい"
 
-#: src/file.c:784
+#: src/file.c:801
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr "ファイル \"%s\" に上書きしますか？"
 
-#: src/file.c:792
+#: src/file.c:809
 msgid "File already exists."
 msgstr "ファイルが既に存在します。"
 
-#: src/file.c:907
+#: src/file.c:924
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr "終了する前にドキュメント \"%s\" に対する変更を保存しますか？"
 
-#: src/file.c:915
+#: src/file.c:932
 msgid "Your changes will be lost if you don't save them."
 msgstr "保存しないと変更したデータを失うことになります。"
 
-#: src/file.c:918
+#: src/file.c:935
 msgid "Close without saving"
 msgstr "保存せずに閉じる"
 
@@ -1110,7 +1114,7 @@ msgstr "バーコードの編集"
 msgid "Data"
 msgstr "データ"
 
-#: src/view-barcode.c:803 src/print.c:902
+#: src/view-barcode.c:803 src/print.c:1021
 msgid "Invalid barcode"
 msgstr "おかしなバーコード"
 
@@ -1153,30 +1157,34 @@ msgstr "選択"
 msgid "Record/Field"
 msgstr "レコード/フィールド"
 
-#: src/print-dialog.c:128
+#: src/print-dialog.c:138
 msgid "_Job"
 msgstr "ジョブ(_J)"
 
-#: src/print-dialog.c:133
+#: src/print-dialog.c:143
 msgid "P_rinter"
 msgstr "プリンタ(_R)"
 
 #. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:163
+#: src/print-dialog.c:173
 msgid "Copies"
 msgstr "コピー"
 
 #. ------- Otherwise add merge control widget ------------
-#: src/print-dialog.c:177
+#: src/print-dialog.c:187
 msgid "Document merge control"
 msgstr "ドキュメントをコントロールにマージする"
 
 #. ----------- Add custom print options area ------------
-#: src/print-dialog.c:194
+#: src/print-dialog.c:204
 msgid "Options"
 msgstr "オプション"
 
-#: src/print-dialog.c:336 src/print-dialog.c:374
+#: src/print-dialog.c:227
+msgid "print crop marks"
+msgstr ""
+
+#: src/print-dialog.c:364 src/print-dialog.c:403
 msgid "Print preview"
 msgstr "印刷プレビュー"
 
@@ -1227,51 +1235,55 @@ msgstr "%d /シート"
 msgid "No paper files found!"
 msgstr "用紙ふぃあるが見つかりません！"
 
-#: src/xml-label.c:173 src/xml-label.c:209
+#: src/xml-label.c:177 src/xml-label.c:214
 msgid "xmlParseFile error"
 msgstr "xmlParseFile エラー"
 
-#: src/xml-label.c:246
+#: src/xml-label.c:251
 msgid "No document root"
 msgstr "root ドキュメントではありません"
 
-#: src/xml-label.c:258
+#: src/xml-label.c:263
 msgid "Importing from glabels 0.1 format"
 msgstr "gLabels 0.1 形式からインポートする"
 
-#: src/xml-label.c:266
+#: src/xml-label.c:271
 msgid "Importing from glabels 0.4 format"
 msgstr "gLabels 0.4 形式からインポートする"
 
-#: src/xml-label.c:273
+#: src/xml-label.c:278
 msgid "Importing from glabels 1.91 format"
 msgstr "gLabels 1.91 形式からインポートする"
 
-#: src/xml-label.c:276
+#: src/xml-label.c:281
 msgid "bad document, unknown glabels Namespace"
 msgstr "ドキュメントの種類が間違っています。Glabels 名前空間が見つかりません。"
 
-#: src/xml-label.c:305 src/xml-label-04.c:75 src/xml-label-191.c:131
+#: src/xml-label.c:310 src/xml-label-04.c:75 src/xml-label-191.c:131
 #, c-format
 msgid "Bad root node = \"%s\""
 msgstr "おかしな root のノード = \"%s\""
 
-#: src/xml-label.c:340 src/xml-label-191.c:164
+#: src/xml-label.c:345 src/xml-label-191.c:164
 #, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "Document ノードにおかしな root のノード = \"%s\""
 
-#: src/xml-label.c:382 src/xml-label-04.c:123 src/xml-label-191.c:196
+#: src/xml-label.c:387 src/xml-label-04.c:123 src/xml-label-191.c:196
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr "おかしなノード = \"%s\""
 
-#: src/xml-label.c:778 src/xml-label-191.c:602
+#: src/xml-label.c:783 src/xml-label-191.c:602
 #, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "Data ノードにおかしなノード = \"%s\""
 
-#: src/xml-label.c:935
+#: src/xml-label.c:944
+msgid "Utf8 conversion error."
+msgstr ""
+
+#: src/xml-label.c:951
 msgid "Problem saving xml file."
 msgstr "XML ファイルの保存で問題があります"
 
@@ -1442,11 +1454,6 @@ msgstr "レイアウト:"
 msgid "Rotate"
 msgstr "回転させる"
 
-#: src/gnome-recent-view-bonobo.c:189
-#, c-format
-msgid "Open %s"
-msgstr "%s を開く"
-
 #. This is the default custom color
 #: src/mygal/color-palette.c:396
 msgid "custom"
@@ -1725,83 +1732,105 @@ msgstr "US エグゼクティブ"
 msgid "US Legal"
 msgstr "US リーガル"
 
-#: data/avery-us-templates.xml.h:1 data/avery-iso-templates.xml.h:2
-msgid "Address labels"
+#: data/avery-us-templates.xml.h:1
+#, fuzzy
+msgid "Address Labels"
 msgstr "宛名のラベル"
 
-#: data/avery-us-templates.xml.h:2
-msgid "Big Round Stickers"
-msgstr "大きく丸いステッカー"
-
-#: data/avery-us-templates.xml.h:3 data/avery-iso-templates.xml.h:3
+#: data/avery-us-templates.xml.h:2 data/avery-iso-templates.xml.h:3
 #: data/zweckform-iso-templates.xml.h:2 data/misc-us-templates.xml.h:2
 #: data/misc-iso-templates.xml.h:9
 msgid "Business Cards"
 msgstr "名刺"
 
-#: data/avery-us-templates.xml.h:4 data/misc-us-templates.xml.h:6
-#: data/misc-iso-templates.xml.h:11
-msgid "CD/DVD Labels (face only)"
+#: data/avery-us-templates.xml.h:3
+#, fuzzy
+msgid "CD/DVD Labels (Disc Labels)"
 msgstr "CD/DVD のラベル (外側のみ)"
 
-#: data/avery-us-templates.xml.h:5
-msgid "Diskette labels"
+#: data/avery-us-templates.xml.h:4
+#, fuzzy
+msgid "Diskette Labels"
 msgstr "フロッピーのラベル"
 
+#: data/avery-us-templates.xml.h:5
+#, fuzzy
+msgid "Filing Labels"
+msgstr "封筒のラベル"
+
 #: data/avery-us-templates.xml.h:6
-msgid "File Folder Labels"
+#, fuzzy
+msgid "Full Sheet Labels"
 msgstr "ファイル・バインダーのラベル"
 
 #: data/avery-us-templates.xml.h:7
-msgid "Full-page"
-msgstr "ページ大"
-
-#: data/avery-us-templates.xml.h:8 data/avery-iso-templates.xml.h:5
-#: data/misc-iso-templates.xml.h:16
-msgid "Mailing Labels"
-msgstr "封筒のラベル"
-
-#: data/avery-us-templates.xml.h:9 data/avery-iso-templates.xml.h:6
-msgid "Mailing labels"
-msgstr "封筒のラベル"
+#, fuzzy
+msgid "Large Round Labels"
+msgstr "汎用的なラベル"
 
-#: data/avery-us-templates.xml.h:10
+#: data/avery-us-templates.xml.h:8
 msgid "Name Badge Labels"
 msgstr "名前つきバッジのラベル"
 
-#: data/avery-us-templates.xml.h:11 data/avery-iso-templates.xml.h:8
-msgid "Shipping labels"
+#: data/avery-us-templates.xml.h:9
+#, fuzzy
+msgid "Return Address Labels"
+msgstr "宛名のラベル"
+
+#: data/avery-us-templates.xml.h:10
+#, fuzzy
+msgid "Shipping Labels"
 msgstr "出荷ラベル"
 
+#: data/avery-us-templates.xml.h:11
+#, fuzzy
+msgid "Small Round Labels"
+msgstr "汎用的なラベル"
+
 #: data/avery-us-templates.xml.h:12
-msgid "Small Round Stickers"
-msgstr "小さく丸いステッカー"
+#, fuzzy
+msgid "Square Labels"
+msgstr "長方形のラベル"
 
 #: data/avery-us-templates.xml.h:13
-msgid "Square Stickers"
-msgstr "四角いステッカー"
-
-#: data/avery-us-templates.xml.h:14
-msgid "VCR Face Labels"
+#, fuzzy
+msgid "Video Tape Face Labels"
 msgstr "VCR 外側のラベル"
 
-#: data/avery-us-templates.xml.h:15
-msgid "VCR Spine Labels"
+#: data/avery-us-templates.xml.h:14
+#, fuzzy
+msgid "Video Tape Spine Labels"
 msgstr "VC 格納ケースのラベル"
 
 #: data/avery-iso-templates.xml.h:1
 msgid "3.5'' Diskette labels (face only)"
 msgstr "3.5'' フロッピーのラベル (外側のみ)"
 
+#: data/avery-iso-templates.xml.h:2
+msgid "Address labels"
+msgstr "宛名のラベル"
+
 #: data/avery-iso-templates.xml.h:4 data/zweckform-iso-templates.xml.h:4
 #: data/misc-us-templates.xml.h:4 data/misc-iso-templates.xml.h:10
 msgid "CD/DVD Labels"
 msgstr "CD/DVD のラベル"
 
+#: data/avery-iso-templates.xml.h:5 data/misc-iso-templates.xml.h:16
+msgid "Mailing Labels"
+msgstr "封筒のラベル"
+
+#: data/avery-iso-templates.xml.h:6
+msgid "Mailing labels"
+msgstr "封筒のラベル"
+
 #: data/avery-iso-templates.xml.h:7
 msgid "Mini Address"
 msgstr "ミニ宛名"
 
+#: data/avery-iso-templates.xml.h:8
+msgid "Shipping labels"
+msgstr "出荷ラベル"
+
 #: data/zweckform-iso-templates.xml.h:1
 msgid "Allround Labels"
 msgstr "汎用的なラベル"
@@ -1850,6 +1879,10 @@ msgstr "CD テンプレート (長方形)"
 msgid "CD/DVD Labels (Face Only)"
 msgstr "CD/DVD のラベル (外側のみ)"
 
+#: data/misc-us-templates.xml.h:6 data/misc-iso-templates.xml.h:11
+msgid "CD/DVD Labels (face only)"
+msgstr "CD/DVD のラベル (外側のみ)"
+
 #: data/misc-us-templates.xml.h:7
 msgid "DLT Labels"
 msgstr "DLT のラベル"
@@ -1945,3 +1978,18 @@ msgstr "封筒のラベル (三列)"
 #: data/misc-iso-templates.xml.h:21
 msgid "Video Labels (face only)"
 msgstr "ビデオのラベル (外側のみ)"
+
+#~ msgid "Open %s"
+#~ msgstr "%s を開く"
+
+#~ msgid "Big Round Stickers"
+#~ msgstr "大きく丸いステッカー"
+
+#~ msgid "Full-page"
+#~ msgstr "ページ大"
+
+#~ msgid "Small Round Stickers"
+#~ msgstr "小さく丸いステッカー"
+
+#~ msgid "Square Stickers"
+#~ msgstr "四角いステッカー"
diff --git a/glabels2/po/pl.po b/glabels2/po/pl.po
index 9ef8ceeb..a9080dbf 100644
--- a/glabels2/po/pl.po
+++ b/glabels2/po/pl.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>, 2002.
 #
-#: src/commands.c:361
 msgid ""
 msgstr ""
 "Project-Id-Version: gLabels\n"
-"POT-Creation-Date: 2003-06-22 01:12-0400\n"
+"POT-Creation-Date: 2003-11-01 19:24-0500\n"
 "PO-Revision-Date: 2002-07-23 11:43+0100\n"
 "Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -59,515 +58,592 @@ msgstr ""
 msgid "Bar_code"
 msgstr "Kod paskowy"
 
-#: src/glabels-ui.xml.h:12 src/stock.c:70
+#: src/glabels-ui.xml.h:12
+msgid "Bold"
+msgstr ""
+
+#: src/glabels-ui.xml.h:13 src/stock.c:70
 #, fuzzy
 msgid "Bring to _Front"
 msgstr "Przesun na wierzch"
 
-#: src/glabels-ui.xml.h:13
+#: src/glabels-ui.xml.h:14
+#, fuzzy
+msgid "Center align"
+msgstr "Ogólne"
+
+#: src/glabels-ui.xml.h:15
 msgid "Center objects to horizontal label center"
 msgstr ""
 
-#: src/glabels-ui.xml.h:14
+#: src/glabels-ui.xml.h:16
 msgid "Center objects to vertical label center"
 msgstr ""
 
-#: src/glabels-ui.xml.h:15
+#: src/glabels-ui.xml.h:17
 msgid "Change the visibility of markup lines in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:16
+#: src/glabels-ui.xml.h:18
 msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:17
+#: src/glabels-ui.xml.h:19
 msgid "Change the visibility of the grid in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:18
+#: src/glabels-ui.xml.h:20
 msgid "Change the visibility of the main toolbar in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:19
+#: src/glabels-ui.xml.h:21
 msgid "Close"
 msgstr ""
 
-#: src/glabels-ui.xml.h:20
+#: src/glabels-ui.xml.h:22
 #, fuzzy
 msgid "Close the current file"
 msgstr "Zapisuje bie¿±cy plik"
 
-#: src/glabels-ui.xml.h:21
+#: src/glabels-ui.xml.h:23
 msgid "Configure the application"
 msgstr ""
 
-#: src/glabels-ui.xml.h:22
+#: src/glabels-ui.xml.h:24
 msgid "Contents"
 msgstr ""
 
-#: src/glabels-ui.xml.h:23
+#: src/glabels-ui.xml.h:25
 msgid "Copy"
 msgstr ""
 
-#: src/glabels-ui.xml.h:24
+#: src/glabels-ui.xml.h:26
 #, fuzzy
 msgid "Copy the selection"
 msgstr "Usuwa wszelkie zaznaczenia"
 
-#: src/glabels-ui.xml.h:25
+#: src/glabels-ui.xml.h:27
 #, fuzzy
 msgid "Create a new document"
 msgstr "Tworzy liniê"
 
-#: src/glabels-ui.xml.h:26
+#: src/glabels-ui.xml.h:28
 msgid "Create barcode object"
 msgstr "Tworzy kod paskowy"
 
-#: src/glabels-ui.xml.h:27
+#: src/glabels-ui.xml.h:29
 msgid "Create box/rectangle object"
 msgstr "Tworzy skrzynkê/prostok±t"
 
-#: src/glabels-ui.xml.h:28
+#: src/glabels-ui.xml.h:30
 msgid "Create ellipse/circle object"
 msgstr "Tworzy elipsê/okr±g"
 
-#: src/glabels-ui.xml.h:29
+#: src/glabels-ui.xml.h:31
 msgid "Create image object"
 msgstr "Tworzy obraz"
 
-#: src/glabels-ui.xml.h:30
+#: src/glabels-ui.xml.h:32
 msgid "Create line object"
 msgstr "Tworzy liniê"
 
-#: src/glabels-ui.xml.h:31
+#: src/glabels-ui.xml.h:33
 msgid "Create text object"
 msgstr "Tworzy obiekt tekstowy"
 
-#: src/glabels-ui.xml.h:32
+#: src/glabels-ui.xml.h:34
 msgid "Cu_t"
 msgstr ""
 
-#: src/glabels-ui.xml.h:33
+#: src/glabels-ui.xml.h:35
 #, fuzzy
 msgid "Customize"
 msgstr "W³asny klucz pola"
 
-#: src/glabels-ui.xml.h:34
+#: src/glabels-ui.xml.h:36
 msgid "Customize Drawing Toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:35
+#: src/glabels-ui.xml.h:37
 msgid "Customize Main Toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:36
+#: src/glabels-ui.xml.h:38
 msgid "Customize toolbars"
 msgstr ""
 
-#: src/glabels-ui.xml.h:37
+#: src/glabels-ui.xml.h:39
 msgid "Cut"
 msgstr ""
 
-#: src/glabels-ui.xml.h:38
+#: src/glabels-ui.xml.h:40
 msgid "Cut the selection"
 msgstr ""
 
-#: src/glabels-ui.xml.h:39
+#: src/glabels-ui.xml.h:41
 msgid "Decrease magnification"
 msgstr ""
 
-#: src/glabels-ui.xml.h:40
+#: src/glabels-ui.xml.h:42
 msgid "Delete"
 msgstr "Usuñ"
 
-#: src/glabels-ui.xml.h:41
+#: src/glabels-ui.xml.h:43
 #, fuzzy
 msgid "Delete the selected objects"
 msgstr "Tworzy obiekt tekstowy"
 
-#: src/glabels-ui.xml.h:42
+#: src/glabels-ui.xml.h:44
 msgid "Drawing toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:43
+#: src/glabels-ui.xml.h:45
 msgid "Dump XML"
 msgstr ""
 
-#: src/glabels-ui.xml.h:44
+#: src/glabels-ui.xml.h:46
 msgid "Dump the UI Xml description"
 msgstr ""
 
-#: src/glabels-ui.xml.h:45
+#: src/glabels-ui.xml.h:47
 msgid "Edit merge properties"
 msgstr "Modyfikuje w³a¶ciwo¶ci z³±czania"
 
-#: src/glabels-ui.xml.h:46
+#: src/glabels-ui.xml.h:48
 #, fuzzy
 msgid "Edit object properties"
 msgstr "Modyfikacja w³a¶ciwo¶ci skrzynki"
 
-#: src/glabels-ui.xml.h:47 src/stock.c:74
+#: src/glabels-ui.xml.h:49 src/stock.c:84
+msgid "Fill color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:50 src/stock.c:74
 msgid "Flip _Horizontally"
 msgstr ""
 
-#: src/glabels-ui.xml.h:48 src/stock.c:75
+#: src/glabels-ui.xml.h:51 src/stock.c:75
 msgid "Flip _Vertically"
 msgstr ""
 
-#: src/glabels-ui.xml.h:49
+#: src/glabels-ui.xml.h:52
 msgid "Flip object horizontally"
 msgstr ""
 
-#: src/glabels-ui.xml.h:50
+#: src/glabels-ui.xml.h:53
 msgid "Flip object vertically"
 msgstr ""
 
-#: src/glabels-ui.xml.h:51
+#: src/glabels-ui.xml.h:54
+#, fuzzy
+msgid "Font name"
+msgstr "Nie zapisuj"
+
+#: src/glabels-ui.xml.h:55
+#, fuzzy
+msgid "Font selector"
+msgstr "Usuwa wszelkie zaznaczenia"
+
+#: src/glabels-ui.xml.h:56
+#, fuzzy
+msgid "Font size"
+msgstr "Nie zapisuj"
+
+#: src/glabels-ui.xml.h:57
 msgid "Icon and _Text"
 msgstr ""
 
-#: src/glabels-ui.xml.h:52
+#: src/glabels-ui.xml.h:58
 msgid "Increase magnification"
 msgstr ""
 
-#: src/glabels-ui.xml.h:53 src/stock.c:82 src/stock.c:83
+#: src/glabels-ui.xml.h:59
+msgid "Italic"
+msgstr ""
+
+#: src/glabels-ui.xml.h:60 src/stock.c:82 src/stock.c:83
 msgid "Label Ce_nter"
 msgstr ""
 
-#: src/glabels-ui.xml.h:54
+#: src/glabels-ui.xml.h:61
+msgid "Left align"
+msgstr ""
+
+#: src/glabels-ui.xml.h:62 src/stock.c:85
+msgid "Line color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:63
+msgid "Line width"
+msgstr ""
+
+#: src/glabels-ui.xml.h:64
 msgid "Lower object to bottom"
 msgstr ""
 
-#: src/glabels-ui.xml.h:55
+#: src/glabels-ui.xml.h:65
 msgid "M_arkup"
 msgstr ""
 
-#: src/glabels-ui.xml.h:56
+#: src/glabels-ui.xml.h:66
 msgid "Main toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:57
+#: src/glabels-ui.xml.h:67
 msgid "Markup"
 msgstr ""
 
-#: src/glabels-ui.xml.h:58
+#: src/glabels-ui.xml.h:68
 #, fuzzy
 msgid "New"
 msgstr "_Nowa"
 
-#: src/glabels-ui.xml.h:59
+#: src/glabels-ui.xml.h:69
 #, fuzzy
 msgid "Object _Properties..."
 msgstr "W³a¶ciwo¶ci tekstu"
 
-#: src/glabels-ui.xml.h:60
+#: src/glabels-ui.xml.h:70
 msgid "Only show icons in the drawing toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:61
+#: src/glabels-ui.xml.h:71
 msgid "Only show icons in the main toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:62 src/file.c:246
+#: src/glabels-ui.xml.h:72 src/file.c:421
 msgid "Open"
 msgstr "Otwórz"
 
-#: src/glabels-ui.xml.h:63
+#: src/glabels-ui.xml.h:73
 msgid "Open a file"
 msgstr "Otwiera plik"
 
-#: src/glabels-ui.xml.h:64
+#: src/glabels-ui.xml.h:74
 #, fuzzy
 msgid "Open the glabels manual"
 msgstr "Otwórz etykietê"
 
-#: src/glabels-ui.xml.h:65
+#: src/glabels-ui.xml.h:75
 msgid "Paste"
 msgstr ""
 
-#: src/glabels-ui.xml.h:66
+#: src/glabels-ui.xml.h:76
 msgid "Paste the clipboard"
 msgstr ""
 
-#: src/glabels-ui.xml.h:67
+#: src/glabels-ui.xml.h:77
 #, fuzzy
 msgid "Pr_eferences..."
 msgstr "Glabels: Preferencje"
 
-#: src/glabels-ui.xml.h:68
+#: src/glabels-ui.xml.h:78
 #, fuzzy
 msgid "Preferences"
 msgstr "Glabels: Preferencje"
 
-#: src/glabels-ui.xml.h:69 src/print-dialog.c:104
+#: src/glabels-ui.xml.h:79 src/print-dialog.c:114
 msgid "Print"
 msgstr "Wydrukuj"
 
-#: src/glabels-ui.xml.h:70
+#: src/glabels-ui.xml.h:80
 #, fuzzy
 msgid "Print the current file"
 msgstr "Drukuje bie¿±cy plik"
 
-#: src/glabels-ui.xml.h:71
+#: src/glabels-ui.xml.h:81
+#, fuzzy
+msgid "Proper_ties"
+msgstr "W³a¶ciwo¶ci tekstu"
+
+#. ---------------------------
+#. Text Properties section
+#. ---------------------------
+#: src/glabels-ui.xml.h:82 src/view-text.c:330 src/view-barcode.c:305
+#, fuzzy
+msgid "Properties"
+msgstr "W³a¶ciwo¶ci tekstu"
+
+#: src/glabels-ui.xml.h:83
+msgid "Property toolbar"
+msgstr ""
+
+#: src/glabels-ui.xml.h:84
 msgid "Quit"
 msgstr ""
 
-#: src/glabels-ui.xml.h:72
+#: src/glabels-ui.xml.h:85
 msgid "Quit the program"
 msgstr ""
 
-#: src/glabels-ui.xml.h:73
+#: src/glabels-ui.xml.h:86
 msgid "Raise object to top"
 msgstr ""
 
-#: src/glabels-ui.xml.h:74
+#: src/glabels-ui.xml.h:87
 msgid "Recent _Files"
 msgstr ""
 
-#: src/glabels-ui.xml.h:75
+#: src/glabels-ui.xml.h:88
 msgid "Redo"
 msgstr ""
 
-#: src/glabels-ui.xml.h:76
+#: src/glabels-ui.xml.h:89
 msgid "Redo the undone action"
 msgstr ""
 
-#: src/glabels-ui.xml.h:77
+#: src/glabels-ui.xml.h:90
 msgid "Remove all selections"
 msgstr "Usuwa wszelkie zaznaczenia"
 
-#: src/glabels-ui.xml.h:79
+#: src/glabels-ui.xml.h:92
 #, no-c-format
 msgid "Restore scale to 100%"
 msgstr ""
 
-#: src/glabels-ui.xml.h:80 src/stock.c:72
+#: src/glabels-ui.xml.h:93
+msgid "Right align"
+msgstr ""
+
+#: src/glabels-ui.xml.h:94 src/stock.c:72
 #, fuzzy
 msgid "Rotate _Left"
 msgstr "Obróæ"
 
-#: src/glabels-ui.xml.h:81 src/stock.c:73
+#: src/glabels-ui.xml.h:95 src/stock.c:73
 #, fuzzy
 msgid "Rotate _Right"
 msgstr "Obróæ"
 
-#: src/glabels-ui.xml.h:82
+#: src/glabels-ui.xml.h:96
 msgid "Rotate object 90 clockwise"
 msgstr ""
 
-#: src/glabels-ui.xml.h:83
+#: src/glabels-ui.xml.h:97
 msgid "Rotate object 90 counter-clockwise"
 msgstr ""
 
-#: src/glabels-ui.xml.h:84
+#: src/glabels-ui.xml.h:98
 #, fuzzy
 msgid "Save"
 msgstr "Zapisz jako"
 
-#: src/glabels-ui.xml.h:85
+#: src/glabels-ui.xml.h:99
 msgid "Save As"
 msgstr "Zapisz jako"
 
-#: src/glabels-ui.xml.h:86
+#: src/glabels-ui.xml.h:100
 #, fuzzy
 msgid "Save _As..."
 msgstr "Zapisz jako"
 
-#: src/glabels-ui.xml.h:87
+#: src/glabels-ui.xml.h:101
 #, fuzzy
 msgid "Save the current file"
 msgstr "Zapisuje bie¿±cy plik"
 
-#: src/glabels-ui.xml.h:88
+#: src/glabels-ui.xml.h:102
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: src/glabels-ui.xml.h:89
+#: src/glabels-ui.xml.h:103
 #, fuzzy
 msgid "Select All"
 msgstr "O_dznacz wszystko"
 
-#: src/glabels-ui.xml.h:90
+#: src/glabels-ui.xml.h:104
 #, fuzzy
 msgid "Select _All"
 msgstr "O_dznacz wszystko"
 
-#: src/glabels-ui.xml.h:91
+#: src/glabels-ui.xml.h:105
 #, fuzzy
 msgid "Select all objects"
 msgstr "Wybierz, przeno¶ i modyfikuj obiekty"
 
-#: src/glabels-ui.xml.h:92
+#: src/glabels-ui.xml.h:106
 msgid "Select, move and modify objects"
 msgstr "Wybierz, przeno¶ i modyfikuj obiekty"
 
-#: src/glabels-ui.xml.h:93 src/stock.c:71
+#: src/glabels-ui.xml.h:107 src/stock.c:71
 #, fuzzy
 msgid "Send to _Back"
 msgstr "Przesuñ w dó³"
 
-#: src/glabels-ui.xml.h:94
+#: src/glabels-ui.xml.h:108
 msgid "Set drawing toolbar button style according to desktop default"
 msgstr ""
 
-#: src/glabels-ui.xml.h:95
+#: src/glabels-ui.xml.h:109
 msgid "Set main toolbar button style according to desktop default"
 msgstr ""
 
-#: src/glabels-ui.xml.h:96
+#: src/glabels-ui.xml.h:110
 msgid "Show _Tooltips"
 msgstr ""
 
-#: src/glabels-ui.xml.h:97
+#: src/glabels-ui.xml.h:111
+msgid "Show both icons and texts in the drawing toolbar"
+msgstr ""
+
+#: src/glabels-ui.xml.h:112
+msgid "Show both icons and texts in the main toolbar"
+msgstr ""
+
+#: src/glabels-ui.xml.h:113
 msgid "Show tooltips in the drawing toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:98
+#: src/glabels-ui.xml.h:114
 msgid "Show tooltips in the main toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:99
+#: src/glabels-ui.xml.h:115
+msgid "Text color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:116
 #, fuzzy
 msgid "U_n-select All"
 msgstr "O_dznacz wszystko"
 
-#: src/glabels-ui.xml.h:100
+#: src/glabels-ui.xml.h:117
 #, fuzzy
 msgid "Un-select All"
 msgstr "O_dznacz wszystko"
 
-#: src/glabels-ui.xml.h:101
+#: src/glabels-ui.xml.h:118
 msgid "Undo"
 msgstr ""
 
-#: src/glabels-ui.xml.h:102
+#: src/glabels-ui.xml.h:119
 msgid "Undo the last action"
 msgstr ""
 
-#: src/glabels-ui.xml.h:103
+#: src/glabels-ui.xml.h:120
 #, fuzzy
 msgid "Zoom _1:1"
 msgstr "Powiêkszenie 1:1"
 
-#: src/glabels-ui.xml.h:104
+#: src/glabels-ui.xml.h:121
 #, fuzzy
 msgid "Zoom _In"
 msgstr "Powiêksz"
 
-#: src/glabels-ui.xml.h:105
+#: src/glabels-ui.xml.h:122
 #, fuzzy
 msgid "Zoom _Out"
 msgstr "Pomniejsz"
 
-#: src/glabels-ui.xml.h:106
+#: src/glabels-ui.xml.h:123
 msgid "_About..."
 msgstr ""
 
-#: src/glabels-ui.xml.h:107
+#: src/glabels-ui.xml.h:124
 msgid "_Bottoms"
 msgstr ""
 
-#: src/glabels-ui.xml.h:108 src/stock.c:64
+#: src/glabels-ui.xml.h:125 src/stock.c:64
 #, fuzzy
 msgid "_Box"
 msgstr "Skrzynka"
 
-#: src/glabels-ui.xml.h:109 src/stock.c:78
+#: src/glabels-ui.xml.h:126 src/stock.c:78
 msgid "_Centers"
 msgstr ""
 
-#: src/glabels-ui.xml.h:110
+#: src/glabels-ui.xml.h:127
 msgid "_Close"
 msgstr ""
 
-#: src/glabels-ui.xml.h:111
+#: src/glabels-ui.xml.h:128
 msgid "_Contents"
 msgstr ""
 
-#: src/glabels-ui.xml.h:112
+#: src/glabels-ui.xml.h:129
 msgid "_Copy"
 msgstr ""
 
-#: src/glabels-ui.xml.h:113
+#: src/glabels-ui.xml.h:130
 #, fuzzy
 msgid "_Create Object"
 msgstr "Tworzy obiekt tekstowy"
 
-#: src/glabels-ui.xml.h:114
+#: src/glabels-ui.xml.h:131
 msgid "_Debug"
 msgstr ""
 
-#: src/glabels-ui.xml.h:115 src/view.c:3078
+#: src/glabels-ui.xml.h:132 src/view.c:3526
 #, fuzzy
 msgid "_Delete"
 msgstr "Usuñ"
 
-#: src/glabels-ui.xml.h:116
+#: src/glabels-ui.xml.h:133
 msgid "_Desktop Default"
 msgstr ""
 
-#: src/glabels-ui.xml.h:117
+#: src/glabels-ui.xml.h:134
 msgid "_Drawing Toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:118
+#: src/glabels-ui.xml.h:135
 msgid "_Edit"
 msgstr ""
 
-#: src/glabels-ui.xml.h:119 src/stock.c:65
+#: src/glabels-ui.xml.h:136 src/stock.c:65
 #, fuzzy
 msgid "_Ellipse"
 msgstr "Elipsa"
 
-#: src/glabels-ui.xml.h:120
+#: src/glabels-ui.xml.h:137
 #, fuzzy
 msgid "_File"
 msgstr "Wype³nienie"
 
-#: src/glabels-ui.xml.h:121
+#: src/glabels-ui.xml.h:138
 msgid "_Grid"
 msgstr ""
 
-#: src/glabels-ui.xml.h:122
+#: src/glabels-ui.xml.h:139
 msgid "_Help"
 msgstr ""
 
-#: src/glabels-ui.xml.h:123
+#: src/glabels-ui.xml.h:140
 msgid "_Icon"
 msgstr ""
 
-#: src/glabels-ui.xml.h:124 src/stock.c:66
+#: src/glabels-ui.xml.h:141 src/stock.c:66
 #, fuzzy
 msgid "_Image"
 msgstr "Obraz"
 
-#: src/glabels-ui.xml.h:125 src/stock.c:76
+#: src/glabels-ui.xml.h:142 src/stock.c:76
 msgid "_Lefts"
 msgstr ""
 
-#: src/glabels-ui.xml.h:126 src/stock.c:63
+#: src/glabels-ui.xml.h:143 src/stock.c:63
 #, fuzzy
 msgid "_Line"
 msgstr "Linia"
 
-#: src/glabels-ui.xml.h:127
+#: src/glabels-ui.xml.h:144
 msgid "_Main Toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:128
+#: src/glabels-ui.xml.h:145
 #, fuzzy
 msgid "_Merge Properties..."
 msgstr "W³a¶ciwo¶ci z³±czania"
 
-#: src/glabels-ui.xml.h:129
+#: src/glabels-ui.xml.h:146
 msgid "_New"
 msgstr "_Nowa"
 
-#: src/glabels-ui.xml.h:130
+#: src/glabels-ui.xml.h:147
 msgid "_Objects"
 msgstr ""
 
-#: src/glabels-ui.xml.h:131
+#: src/glabels-ui.xml.h:148
 #, fuzzy
 msgid "_Open..."
 msgstr "Otwórz"
@@ -575,56 +651,56 @@ msgstr "Otw
 #.
 #. * Submenu: Order
 #.
-#: src/glabels-ui.xml.h:132 src/view.c:2924
+#: src/glabels-ui.xml.h:149 src/view.c:3372
 msgid "_Order"
 msgstr ""
 
-#: src/glabels-ui.xml.h:133
+#: src/glabels-ui.xml.h:150
 msgid "_Paste"
 msgstr ""
 
-#: src/glabels-ui.xml.h:134
+#: src/glabels-ui.xml.h:151
 #, fuzzy
 msgid "_Print..."
 msgstr "Wydrukuj"
 
-#: src/glabels-ui.xml.h:135
+#: src/glabels-ui.xml.h:152
 msgid "_Quit"
 msgstr ""
 
-#: src/glabels-ui.xml.h:136 src/stock.c:77
+#: src/glabels-ui.xml.h:153 src/stock.c:77
 msgid "_Rights"
 msgstr ""
 
 #.
 #. * Submenu: Rotate/Flip
 #.
-#: src/glabels-ui.xml.h:137 src/view.c:2945
+#: src/glabels-ui.xml.h:154 src/view.c:3393
 #, fuzzy
 msgid "_Rotate/Flip"
 msgstr "Obróæ"
 
-#: src/glabels-ui.xml.h:138
+#: src/glabels-ui.xml.h:155
 #, fuzzy
 msgid "_Save"
 msgstr "Zapisz jako"
 
-#: src/glabels-ui.xml.h:139 src/stock.c:61
+#: src/glabels-ui.xml.h:156 src/stock.c:61
 #, fuzzy
 msgid "_Select Mode"
 msgstr "Wybierz"
 
-#: src/glabels-ui.xml.h:140 src/stock.c:62
+#: src/glabels-ui.xml.h:157 src/stock.c:62
 #, fuzzy
 msgid "_Text"
 msgstr "Tekst"
 
-#: src/glabels-ui.xml.h:141 src/stock.c:79
+#: src/glabels-ui.xml.h:158 src/stock.c:79
 #, fuzzy
 msgid "_Tops"
 msgstr "_Narzêdzia"
 
-#: src/glabels-ui.xml.h:142
+#: src/glabels-ui.xml.h:159
 #, fuzzy
 msgid "_View"
 msgstr "_Nowa"
@@ -690,26 +766,30 @@ msgid "Show ui debugging messages."
 msgstr ""
 
 #: src/glabels.c:97
-msgid "Show media select widget debugging messages."
+msgid "Show property_bar debugging messages."
 msgstr ""
 
 #: src/glabels.c:100
-msgid "Show mini preview widget debugging messages."
+msgid "Show media select widget debugging messages."
 msgstr ""
 
 #: src/glabels.c:103
-msgid "Show pixbuf cache debugging messages."
+msgid "Show mini preview widget debugging messages."
 msgstr ""
 
 #: src/glabels.c:106
-msgid "Show widget debugging messages."
+msgid "Show pixbuf cache debugging messages."
 msgstr ""
 
 #: src/glabels.c:109
+msgid "Show widget debugging messages."
+msgstr ""
+
+#: src/glabels.c:112
 msgid "Turn on all debugging messages."
 msgstr ""
 
-#: src/glabels.c:180
+#: src/glabels.c:184
 msgid "Could not initialize Bonobo!\n"
 msgstr ""
 
@@ -745,32 +825,32 @@ msgstr "liczba kopii (domy
 msgid "copies"
 msgstr "kopi(a/e/i)"
 
-#: src/glabels-batch.c:58 src/print-dialog.c:200
+#: src/glabels-batch.c:58 src/print-dialog.c:210
 msgid "print outlines (to test printer alignment)"
 msgstr "drukowanie ramek (w celu przetestowania wyrównania)"
 
-#: src/glabels-batch.c:60 src/print-dialog.c:209
+#: src/glabels-batch.c:60 src/print-dialog.c:219
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "drukowanie odwrócone (np. odbicie zwierciadlane)"
 
-#: src/glabels-batch.c:95
+#: src/glabels-batch.c:96
 msgid "[OPTION...] GLABELS_FILE..."
 msgstr "[OPCJA...] PLIK_GLABELS..."
 
-#: src/glabels-batch.c:114
+#: src/glabels-batch.c:116
 msgid "missing glabels file\n"
 msgstr "brak pliku glabels\n"
 
-#: src/glabels-batch.c:141
+#: src/glabels-batch.c:157
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "nie mo¿na otworzyæ pliku glabels o nazwie %s\n"
 
-#: src/window.c:234
+#: src/window.c:242
 msgid "(none) - gLabels"
 msgstr ""
 
-#: src/window.c:399
+#: src/window.c:409
 msgid "(modified)"
 msgstr ""
 
@@ -792,7 +872,21 @@ msgstr ""
 msgid "Centers"
 msgstr ""
 
-#: src/commands.c:337
+#: src/ui-property-bar.c:346 src/wdgt-text-props.c:241 src/wdgt-bc-props.c:174
+#, fuzzy
+msgid "Default"
+msgstr "Usuñ"
+
+#: src/ui-property-bar.c:361 src/wdgt-fill.c:175
+msgid "No fill"
+msgstr ""
+
+#: src/ui-property-bar.c:376 src/wdgt-line.c:201
+#, fuzzy
+msgid "No line"
+msgstr "Brak"
+
+#: src/commands.c:352
 msgid ""
 "A label and business card creation program for GNOME.\n"
 " \n"
@@ -817,100 +911,109 @@ msgstr ""
 "GWARANCJI; nawet wynikaj±cej z RÊKOJMI lub U¯YWANIA W OKRE¦LONYM CELU. "
 "Zajrzyj do Licencji Publicznej GNU aby uzyskaæ wiêcej szczegó³ów.\n"
 
-#: src/commands.c:351
+#: src/commands.c:366
 msgid "See the file AUTHORS for additional credits,"
 msgstr ""
 
-#: src/commands.c:352
-msgid "or visit http://snaught.com/glabels"
+#: src/commands.c:367
+msgid "or visit http://glabels.sourceforge.net/"
 msgstr ""
 
 #: src/commands.c:376
+msgid " "
+msgstr ""
+
+#: src/commands.c:391
 #, fuzzy
 msgid "glabels"
 msgstr "Etykiety"
 
-#: src/file.c:82
+#: src/file.c:91
 msgid "New Label or Card"
 msgstr "Nowa etykieta lub karta"
 
-#: src/file.c:112
+#: src/file.c:121 src/file.c:291
 msgid "Media Type"
 msgstr "Typ no¶nika"
 
-#: src/file.c:118
+#: src/file.c:127 src/file.c:297
 msgid "Label orientation"
 msgstr "U³o¿enie etykiety"
 
-#: src/file.c:248
+#: src/file.c:258
+#, fuzzy
+msgid "Label properties"
+msgstr "W³a¶ciwo¶ci tekstu"
+
+#: src/file.c:423
 msgid "Open label"
 msgstr "Otwórz etykietê"
 
-#: src/file.c:296 src/file.c:594
+#: src/file.c:475 src/file.c:784
 #, fuzzy
 msgid "Empty file name selection"
 msgstr "Usuwa wszelkie zaznaczenia"
 
-#: src/file.c:297 src/file.c:311
+#: src/file.c:476 src/file.c:490
 msgid "Please select a file or supply a valid file name"
 msgstr ""
 
-#: src/file.c:310
+#: src/file.c:489
 msgid "File does not exist"
 msgstr ""
 
-#: src/file.c:372
+#: src/file.c:564
 #, fuzzy, c-format
 msgid "Could not open file \"%s\""
 msgstr "Nie mo¿na otworzyæ pliku"
 
-#: src/file.c:380
+#: src/file.c:572
 msgid "Not a supported file format"
 msgstr ""
 
-#: src/file.c:462 src/file.c:636
+#: src/file.c:653 src/file.c:828
 #, fuzzy, c-format
 msgid "Could not save file \"%s\""
 msgstr "Nie mo¿na zapisaæ pliku"
 
-#: src/file.c:470 src/file.c:644
+#: src/file.c:661 src/file.c:836
 msgid "Error encountered during save.  The file is still not saved."
 msgstr ""
 
-#: src/file.c:512
+#: src/file.c:702
 #, fuzzy, c-format
 msgid "Save \"%s\" as"
 msgstr "Zapisz etykietê jako"
 
-#: src/file.c:595
+#: src/file.c:785
 #, fuzzy
 msgid "Please supply a valid file name"
 msgstr "Nale¿y podaæ nazwê pliku"
 
-#: src/file.c:609
+#: src/file.c:801
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr ""
 
-#: src/file.c:617
+#: src/file.c:809
 msgid "File already exists."
 msgstr ""
 
-#: src/file.c:732
+#: src/file.c:924
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr ""
 
-#: src/file.c:740
+#: src/file.c:932
 msgid "Your changes will be lost if you don't save them."
 msgstr ""
 
-#: src/file.c:743
+#: src/file.c:935
 msgid "Close without saving"
 msgstr ""
 
 #. Should not happen
-#: src/prefs.c:664 src/prefs.c:671 src/wdgt-line.c:180
+#: src/prefs.c:664 src/prefs.c:671 src/wdgt-line.c:185
 msgid "points"
 msgstr "punkty(-ów)"
 
@@ -962,11 +1065,11 @@ msgstr "Milimetry"
 msgid "Default page size"
 msgstr "Domy¶lny rozmiar strony"
 
-#: src/prefs-dialog.c:309
+#: src/prefs-dialog.c:309 data/paper-sizes.xml.h:25
 msgid "US Letter"
 msgstr ""
 
-#: src/prefs-dialog.c:317
+#: src/prefs-dialog.c:317 data/paper-sizes.xml.h:6
 msgid "A4"
 msgstr ""
 
@@ -975,67 +1078,67 @@ msgid "Select default properties for new objects."
 msgstr ""
 
 #. ------ text props entry ------
-#: src/prefs-dialog.c:359 src/view-text.c:314 src/view-text.c:634
+#: src/prefs-dialog.c:359 src/view-text.c:313 src/view-text.c:636
 #: src/wdgt-bc-style.c:184
 msgid "Text"
 msgstr "Tekst"
 
 #. ------ Line box ------
-#: src/prefs-dialog.c:368 src/view-line.c:304
+#: src/prefs-dialog.c:368 src/view-line.c:303
 msgid "Line"
 msgstr "Linia"
 
 #. ------ Fill box ------
-#: src/prefs-dialog.c:377 src/view-box.c:323 src/view-ellipse.c:323
+#: src/prefs-dialog.c:377 src/view-box.c:322 src/view-ellipse.c:322
 msgid "Fill"
 msgstr "Wype³nienie"
 
 #.
 #. * Submenu: Align Horizontally
 #.
-#: src/view.c:2978
+#: src/view.c:3426
 msgid "Align _Horizontally"
 msgstr ""
 
 #.
 #. * Submenu: Align Vertically
 #.
-#: src/view.c:3017
+#: src/view.c:3465
 msgid "Align _Vertically"
 msgstr ""
 
-#: src/view-box.c:291
+#: src/view-box.c:290
 msgid "Edit box object properties"
 msgstr "Modyfikacja w³a¶ciwo¶ci skrzynki"
 
 #. ---------------------------
 #. Outline section
 #. ---------------------------
-#: src/view-box.c:307 src/view-ellipse.c:307
+#: src/view-box.c:306 src/view-ellipse.c:306
 msgid "Outline"
 msgstr "Ramka"
 
 #. ---------------------------
 #. Position section
 #. ---------------------------
-#: src/view-box.c:339 src/view-ellipse.c:339 src/view-line.c:320
-#: src/view-image.c:314 src/view-text.c:349 src/view-barcode.c:338
+#: src/view-box.c:338 src/view-ellipse.c:338 src/view-line.c:319
+#: src/view-image.c:314 src/view-text.c:348 src/view-barcode.c:337
 msgid "Position"
 msgstr "Pozycja"
 
 #. ---------------------------
 #. Size section
 #. ---------------------------
-#: src/view-box.c:354 src/view-ellipse.c:354 src/view-line.c:338
+#: src/view-box.c:353 src/view-ellipse.c:353 src/view-line.c:337
 #: src/view-image.c:331
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/view-ellipse.c:291
+#: src/view-ellipse.c:290
 msgid "Edit ellipse object properties"
 msgstr "Modyfikacja w³a¶ciwo¶ci elipsy"
 
-#: src/view-line.c:289
+#: src/view-line.c:288
 msgid "Edit line object properties"
 msgstr "Modyfikacja w³a¶ciwo¶ci linii"
 
@@ -1055,30 +1158,22 @@ msgstr "Obraz"
 msgid "Reset image size"
 msgstr "Wyzeruj rozmiar obrazu"
 
-#: src/view-text.c:299
+#: src/view-text.c:298
 msgid "Edit text object properties"
 msgstr "Modyfikacja w³a¶ciowo¶ci tekstu"
 
-#. ---------------------------
-#. Text Properties section
-#. ---------------------------
-#: src/view-text.c:331 src/view-barcode.c:306
-#, fuzzy
-msgid "Properties"
-msgstr "W³a¶ciwo¶ci tekstu"
-
-#: src/view-barcode.c:271
+#: src/view-barcode.c:270
 msgid "Edit barcode object properties"
 msgstr "Modyfikacja w³a¶ciwo¶ci kodu paskowego"
 
 #. ---------------------------
 #. Data section
 #. ---------------------------
-#: src/view-barcode.c:286 src/merge-properties-dialog.c:343
+#: src/view-barcode.c:285 src/merge-properties-dialog.c:343
 msgid "Data"
 msgstr "Dane"
 
-#: src/view-barcode.c:802 src/print.c:912
+#: src/view-barcode.c:803 src/print.c:1021
 msgid "Invalid barcode"
 msgstr "Niepoprawny kod paskowy"
 
@@ -1122,73 +1217,77 @@ msgstr "Wybierz"
 msgid "Record/Field"
 msgstr ""
 
-#: src/print-dialog.c:128
+#: src/print-dialog.c:138
 msgid "_Job"
 msgstr ""
 
-#: src/print-dialog.c:133
+#: src/print-dialog.c:143
 #, fuzzy
 msgid "P_rinter"
 msgstr "Wydrukuj"
 
 #. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:163
+#: src/print-dialog.c:173
 msgid "Copies"
 msgstr "Kopie"
 
 #. ------- Otherwise add merge control widget ------------
-#: src/print-dialog.c:177
+#: src/print-dialog.c:187
 msgid "Document merge control"
 msgstr "Kontrola z³±czania dokumentów"
 
 #. ----------- Add custom print options area ------------
-#: src/print-dialog.c:194
+#: src/print-dialog.c:204
 msgid "Options"
 msgstr "Opcje"
 
-#: src/print-dialog.c:336 src/print-dialog.c:374
+#: src/print-dialog.c:227
+msgid "print crop marks"
+msgstr ""
+
+#: src/print-dialog.c:364 src/print-dialog.c:403
 msgid "Print preview"
 msgstr "Podgl±d wydruku"
 
-#: src/label.c:542
+#: src/label.c:563
 msgid "Untitled"
 msgstr ""
 
-#: src/template.c:296
+#: src/template.c:318
 #, c-format
 msgid "Generic %s full page"
 msgstr ""
 
-#: src/template.c:338
+#: src/template.c:362
 msgid "No template files found!"
 msgstr "Nie znaleziono pliku szablonu!"
 
-#: src/template.c:435
+#: src/template.c:461
 #, c-format
 msgid "%s x %s %s"
 msgstr "%s x %s %s"
 
-#: src/template.c:440
+#: src/template.c:466
 #, c-format
 msgid "%.5g x %.5g %s"
 msgstr "%.5g x %.5g %s"
 
-#: src/template.c:451 src/template.c:465
+#: src/template.c:477 src/template.c:491
 #, c-format
 msgid "%s %s diameter"
 msgstr ""
 
-#: src/template.c:455 src/template.c:469
+#: src/template.c:481 src/template.c:495
 #, c-format
 msgid "%.5g %s diameter"
 msgstr ""
 
-#: src/template.c:607
+#: src/template.c:633
 #, c-format
 msgid "%d x %d  (%d per sheet)"
 msgstr "%d x %d (%d na arkusz)"
 
-#: src/template.c:611
+#: src/template.c:637
 #, fuzzy, c-format
 msgid "%d per sheet"
 msgstr "%d x %d (%d na arkusz)"
@@ -1198,55 +1297,70 @@ msgstr "%d x %d (%d na arkusz)"
 msgid "No paper files found!"
 msgstr "Nie znaleziono pliku szablonu!"
 
-#: src/xml-label.c:171 src/xml-label.c:204
+#: src/xml-label.c:177 src/xml-label.c:214
 msgid "xmlParseFile error"
 msgstr "b³±d przetwarzania pliku xml"
 
-#: src/xml-label.c:241
+#: src/xml-label.c:251
 msgid "No document root"
 msgstr "Brak g³ównego dokumentu"
 
-#: src/xml-label.c:253
+#: src/xml-label.c:263
 msgid "Importing from glabels 0.1 format"
 msgstr ""
 
-#: src/xml-label.c:261
+#: src/xml-label.c:271
 msgid "Importing from glabels 0.4 format"
 msgstr ""
 
-#: src/xml-label.c:264
+#: src/xml-label.c:278
+msgid "Importing from glabels 1.91 format"
+msgstr ""
+
+#: src/xml-label.c:281
 #, fuzzy
 msgid "bad document, unknown glabels Namespace"
 msgstr ""
 "dokument jest niepoprawnego typu, nie odnaleziono przestrzeni nazw glabels"
 
-#: src/xml-label.c:292 src/xml-label-04.c:75
+#: src/xml-label.c:310 src/xml-label-04.c:75 src/xml-label-191.c:131
 #, c-format
 msgid "Bad root node = \"%s\""
 msgstr "Niepoprawny wêze³ g³ówny = \"%s\""
 
-#: src/xml-label.c:325
+#: src/xml-label.c:345 src/xml-label-191.c:164
 #, fuzzy, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "Niepoprawny wêze³ g³ówny = \"%s\""
 
-#: src/xml-label.c:357 src/xml-label-04.c:123
+#: src/xml-label.c:387 src/xml-label-04.c:123 src/xml-label-191.c:196
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr "niepoprawny wêze³ = \"%s\""
 
-#: src/xml-label.c:763
+#: src/xml-label.c:783 src/xml-label-191.c:602
 #, fuzzy, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "niepoprawny wêze³ = \"%s\""
 
-#: src/xml-label.c:831
+#: src/xml-label.c:944
+msgid "Utf8 conversion error."
+msgstr ""
+
+#: src/xml-label.c:951
 msgid "Problem saving xml file."
 msgstr "Problem podczas zapisu pliku xml."
 
-#: src/xml-template.c:157
+#. This should always be an id, but just in case a name
+#. slips by!
+#: src/xml-label-191.c:680 src/xml-template.c:169
 #, c-format
-msgid "Unknown page size id \"%s\""
+msgid "Unknown page size id \"%s\", trying as name"
+msgstr ""
+
+#: src/xml-label-191.c:690 src/xml-template.c:179
+#, c-format
+msgid "Unknown page size id or name \"%s\""
 msgstr ""
 
 #: src/merge.c:172 src/merge.c:213 src/merge.c:398 src/merge.c:401
@@ -1269,18 +1383,18 @@ msgid "Text file with tab delimeters"
 msgstr "Tekst oddzielony tabulacjami"
 
 #. Font label
-#: src/wdgt-text-props.c:181
+#: src/wdgt-text-props.c:185
 msgid "Font:"
 msgstr "Czcionka:"
 
 #. Text Color Label
-#: src/wdgt-text-props.c:230 src/wdgt-line.c:189 src/wdgt-fill.c:164
-#: src/wdgt-bc-props.c:164
+#: src/wdgt-text-props.c:234 src/wdgt-line.c:194 src/wdgt-fill.c:168
+#: src/wdgt-bc-props.c:167
 msgid "Color:"
 msgstr "Kolor:"
 
 #. Alignment label
-#: src/wdgt-text-props.c:246
+#: src/wdgt-text-props.c:255
 msgid "Alignment:"
 msgstr "Wyrównanie:"
 
@@ -1310,7 +1424,7 @@ msgid "Y:"
 msgstr "Y:"
 
 #. W Label
-#: src/wdgt-size.c:187 src/wdgt-line.c:166
+#: src/wdgt-size.c:187 src/wdgt-line.c:171
 msgid "Width:"
 msgstr "Szeroko¶æ:"
 
@@ -1409,10 +1523,535 @@ msgstr "Wygl
 msgid "Rotate"
 msgstr "Obróæ"
 
-#: src/gnome-recent-view-bonobo.c:189
-#, fuzzy, c-format
-msgid "Open %s"
-msgstr "Otwórz"
+#. This is the default custom color
+#: src/mygal/color-palette.c:396
+#, fuzzy
+msgid "custom"
+msgstr "W³asny klucz pola"
+
+#. "Custom" color - we'll pop up a GnomeColorPicker
+#: src/mygal/color-palette.c:438
+#, fuzzy
+msgid "Custom Color:"
+msgstr "Kolor:"
+
+#: src/mygal/color-palette.c:446
+msgid "Choose Custom Color"
+msgstr ""
+
+#: src/mygal/color-palette.c:579
+msgid "black"
+msgstr ""
+
+#: src/mygal/color-palette.c:580
+msgid "light brown"
+msgstr ""
+
+#: src/mygal/color-palette.c:581
+msgid "brown gold"
+msgstr ""
+
+#: src/mygal/color-palette.c:582
+msgid "dark green #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:583
+msgid "navy"
+msgstr ""
+
+#: src/mygal/color-palette.c:584 src/mygal/color-palette.c:640
+msgid "dark blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:585
+msgid "purple #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:586
+msgid "very dark gray"
+msgstr ""
+
+#: src/mygal/color-palette.c:589 src/mygal/color-palette.c:645
+msgid "dark red"
+msgstr ""
+
+#: src/mygal/color-palette.c:590
+msgid "red-orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:591
+msgid "gold"
+msgstr ""
+
+#: src/mygal/color-palette.c:592
+msgid "dark green"
+msgstr ""
+
+#: src/mygal/color-palette.c:593 src/mygal/color-palette.c:646
+msgid "dull blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:594 src/mygal/color-palette.c:647
+msgid "blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:595
+msgid "dull purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:596
+msgid "dark grey"
+msgstr ""
+
+#: src/mygal/color-palette.c:599
+msgid "red"
+msgstr ""
+
+#: src/mygal/color-palette.c:600
+msgid "orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:601
+msgid "lime"
+msgstr ""
+
+#: src/mygal/color-palette.c:602
+msgid "dull green"
+msgstr ""
+
+#: src/mygal/color-palette.c:603
+msgid "dull blue #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:604
+msgid "sky blue #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:605 src/mygal/color-palette.c:644
+msgid "purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:606
+msgid "gray"
+msgstr ""
+
+#: src/mygal/color-palette.c:609 src/mygal/color-palette.c:641
+#, fuzzy
+msgid "magenta"
+msgstr "Obraz"
+
+#: src/mygal/color-palette.c:610
+msgid "bright orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:611 src/mygal/color-palette.c:642
+msgid "yellow"
+msgstr ""
+
+#: src/mygal/color-palette.c:612
+#, fuzzy
+msgid "green"
+msgstr "stopni(e)"
+
+#: src/mygal/color-palette.c:613 src/mygal/color-palette.c:643
+msgid "cyan"
+msgstr ""
+
+#: src/mygal/color-palette.c:614
+msgid "bright blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:615 src/mygal/color-palette.c:632
+msgid "red purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:616
+msgid "light grey"
+msgstr ""
+
+#: src/mygal/color-palette.c:619 src/mygal/color-palette.c:636
+msgid "pink"
+msgstr ""
+
+#: src/mygal/color-palette.c:620
+msgid "light orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:621 src/mygal/color-palette.c:633
+msgid "light yellow"
+msgstr ""
+
+#: src/mygal/color-palette.c:622
+msgid "light green"
+msgstr ""
+
+#: src/mygal/color-palette.c:623
+msgid "light cyan"
+msgstr ""
+
+#: src/mygal/color-palette.c:624 src/mygal/color-palette.c:634
+msgid "light blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:625 src/mygal/color-palette.c:638
+msgid "light purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:626
+msgid "white"
+msgstr ""
+
+#: src/mygal/color-palette.c:631
+msgid "purplish blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:635
+msgid "dark purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:637
+msgid "sky blue"
+msgstr ""
+
+#: data/paper-sizes.xml.h:1
+msgid "A0"
+msgstr ""
+
+#: data/paper-sizes.xml.h:2
+msgid "A1"
+msgstr ""
+
+#: data/paper-sizes.xml.h:3
+msgid "A10"
+msgstr ""
+
+#: data/paper-sizes.xml.h:4
+msgid "A2"
+msgstr ""
+
+#: data/paper-sizes.xml.h:5
+msgid "A3"
+msgstr ""
+
+#: data/paper-sizes.xml.h:7
+msgid "A5"
+msgstr ""
+
+#: data/paper-sizes.xml.h:8
+msgid "A6"
+msgstr ""
+
+#: data/paper-sizes.xml.h:9
+msgid "A7"
+msgstr ""
+
+#: data/paper-sizes.xml.h:10
+msgid "A8"
+msgstr ""
+
+#: data/paper-sizes.xml.h:11
+msgid "A9"
+msgstr ""
+
+#: data/paper-sizes.xml.h:12
+msgid "B0"
+msgstr ""
+
+#: data/paper-sizes.xml.h:13
+msgid "B1"
+msgstr ""
+
+#: data/paper-sizes.xml.h:14
+msgid "B10"
+msgstr ""
+
+#: data/paper-sizes.xml.h:15
+msgid "B2"
+msgstr ""
+
+#: data/paper-sizes.xml.h:16
+msgid "B3"
+msgstr ""
+
+#: data/paper-sizes.xml.h:17
+msgid "B4"
+msgstr ""
+
+#: data/paper-sizes.xml.h:18
+msgid "B5"
+msgstr ""
+
+#: data/paper-sizes.xml.h:19
+msgid "B6"
+msgstr ""
+
+#: data/paper-sizes.xml.h:20
+msgid "B7"
+msgstr ""
+
+#: data/paper-sizes.xml.h:21
+msgid "B8"
+msgstr ""
+
+#: data/paper-sizes.xml.h:22
+msgid "B9"
+msgstr ""
+
+#: data/paper-sizes.xml.h:23
+msgid "US Executive"
+msgstr ""
+
+#: data/paper-sizes.xml.h:24
+msgid "US Legal"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:1
+msgid "Address Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:2 data/avery-iso-templates.xml.h:3
+#: data/zweckform-iso-templates.xml.h:2 data/misc-us-templates.xml.h:2
+#: data/misc-iso-templates.xml.h:9
+msgid "Business Cards"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:3
+msgid "CD/DVD Labels (Disc Labels)"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:4
+msgid "Diskette Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:5
+#, fuzzy
+msgid "Filing Labels"
+msgstr "Etykiety"
+
+#: data/avery-us-templates.xml.h:6
+msgid "Full Sheet Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:7
+#, fuzzy
+msgid "Large Round Labels"
+msgstr "Rozpocznij od etykiety"
+
+#: data/avery-us-templates.xml.h:8
+msgid "Name Badge Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:9
+msgid "Return Address Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:10
+msgid "Shipping Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:11
+#, fuzzy
+msgid "Small Round Labels"
+msgstr "Rozpocznij od etykiety"
+
+#: data/avery-us-templates.xml.h:12
+#, fuzzy
+msgid "Square Labels"
+msgstr "Etykiety"
+
+#: data/avery-us-templates.xml.h:13
+msgid "Video Tape Face Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:14
+msgid "Video Tape Spine Labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:1
+msgid "3.5'' Diskette labels (face only)"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:2
+msgid "Address labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:4 data/zweckform-iso-templates.xml.h:4
+#: data/misc-us-templates.xml.h:4 data/misc-iso-templates.xml.h:10
+#, fuzzy
+msgid "CD/DVD Labels"
+msgstr "Etykiety"
+
+#: data/avery-iso-templates.xml.h:5 data/misc-iso-templates.xml.h:16
+msgid "Mailing Labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:6
+#, fuzzy
+msgid "Mailing labels"
+msgstr "Etykiety"
+
+#: data/avery-iso-templates.xml.h:7
+msgid "Mini Address"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:8
+#, fuzzy
+msgid "Shipping labels"
+msgstr "Otwórz etykietê"
+
+#: data/zweckform-iso-templates.xml.h:1
+msgid "Allround Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:3
+#, fuzzy
+msgid "CD Labels"
+msgstr "Etykiety"
+
+#: data/zweckform-iso-templates.xml.h:5
+msgid "Correction and Cover-up Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:6
+msgid "Lever Arch File Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:7
+msgid "Mailing Labels -- 12"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:8
+msgid "QSL-Karten Etiketten 70mm x 50,8mm"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:9
+msgid "Rectangular Copier Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:10 data/misc-iso-templates.xml.h:20
+msgid "Rectangular Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:11
+msgid "Video Labels (back)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:1
+msgid "Business Card CD"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:3
+msgid "CD Template Rectangles"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:5
+msgid "CD/DVD Labels (Face Only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:6 data/misc-iso-templates.xml.h:11
+msgid "CD/DVD Labels (face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:7
+#, fuzzy
+msgid "DLT Labels"
+msgstr "Etykiety"
+
+#: data/misc-us-templates.xml.h:8
+msgid "Microtube labels"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:9
+msgid "Mini-CD Labels"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:10
+msgid "PRO CD Labels 2-up (CD spine only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:11
+msgid "PRO CD Labels 2-up (Face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:12
+msgid "PRO CD Labels 2-up (face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:13
+msgid "Slimline CD Case (rightside up)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:14
+msgid "Slimline CD Case (upside down)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:1
+msgid "Agipa 119488: Business Cards"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:2
+msgid "Allround Labels --24"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:3
+msgid "Allround Labels --44"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:4
+msgid "Allround Labels --64"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:5
+msgid "Allround Labels --65"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:6
+msgid "Arch File Labels"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:7
+msgid "Arch File Labels (large)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:8
+msgid "Arch File Labels (small)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:12
+msgid "CD/DVD Labels Standard Format (face only)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:13
+msgid "Diskette Labels (face only)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:14
+msgid "EPSON Photo Stickers 16"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:15
+msgid "Etiketten"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:17
+msgid "Mailing Labels --14"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:18
+msgid "Mailing Labels-2 columns"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:19
+msgid "Mailing Labels-3 columns"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:21
+msgid "Video Labels (face only)"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Open %s"
+#~ msgstr "Otwórz"
 
 #~ msgid "Revert to saved copy of %s?"
 #~ msgstr "Przywróciæ zapisan± kopiê pliku %s?"
@@ -1429,9 +2068,6 @@ msgstr "Otw
 #~ "\n"
 #~ "Czy chcesz go zapisaæ?"
 
-#~ msgid "Don't save"
-#~ msgstr "Nie zapisuj"
-
 #~ msgid "Close / Save label as"
 #~ msgstr "Zamyka / Zapisuje etykietê jako"
 
@@ -1456,9 +2092,6 @@ msgstr "Otw
 #~ msgid "Barcode data"
 #~ msgstr "Dane kodu paskowego"
 
-#~ msgid "General"
-#~ msgstr "Ogólne"
-
 #~ msgid "%"
 #~ msgstr "%"
 
diff --git a/glabels2/po/pt_BR.po b/glabels2/po/pt_BR.po
index f01d7fc0..6e02f4b9 100644
--- a/glabels2/po/pt_BR.po
+++ b/glabels2/po/pt_BR.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2001 Jim Evins <evins@snaught.com>
 # Paulo R. Ormenese <pormenese@uol.com.br>, 2001.
 #
-#: src/commands.c:361
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels 1.91.0\n"
-"POT-Creation-Date: 2003-06-22 01:12-0400\n"
+"POT-Creation-Date: 2003-11-01 19:24-0500\n"
 "PO-Revision-Date: 2003-01-03 23:15-0300\n"
 "Last-Translator: Paulo R. Ormenese <pormenese@uol.com.br>\n"
 "Language-Team: Brazilian portuguese <>\n"
@@ -58,534 +57,612 @@ msgstr "Alinha objetos pelos centros verticais"
 msgid "Bar_code"
 msgstr "_Código barras"
 
-#: src/glabels-ui.xml.h:12 src/stock.c:70
+#: src/glabels-ui.xml.h:12
+msgid "Bold"
+msgstr ""
+
+#: src/glabels-ui.xml.h:13 src/stock.c:70
 msgid "Bring to _Front"
 msgstr "Trazer para _Frente"
 
-#: src/glabels-ui.xml.h:13
+#: src/glabels-ui.xml.h:14
+#, fuzzy
+msgid "Center align"
+msgstr "Centros"
+
+#: src/glabels-ui.xml.h:15
 msgid "Center objects to horizontal label center"
 msgstr "Centra objetos no centro horizontal da etiqueta"
 
-#: src/glabels-ui.xml.h:14
+#: src/glabels-ui.xml.h:16
 msgid "Center objects to vertical label center"
 msgstr "Centra objetos no centro vertical da etiqueta"
 
-#: src/glabels-ui.xml.h:15
+#: src/glabels-ui.xml.h:17
 msgid "Change the visibility of markup lines in the current window"
 msgstr "Muda a visibilidade das linhas de marcação na janela atual"
 
-#: src/glabels-ui.xml.h:16
+#: src/glabels-ui.xml.h:18
 msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr "Muda a visibilidade da barra de ferramentas de desenho na janela atual"
 
-#: src/glabels-ui.xml.h:17
+#: src/glabels-ui.xml.h:19
 msgid "Change the visibility of the grid in the current window"
 msgstr "Muda a visibilidade da grade na janela atual"
 
-#: src/glabels-ui.xml.h:18
+#: src/glabels-ui.xml.h:20
 msgid "Change the visibility of the main toolbar in the current window"
 msgstr "Muda a visibilidade da barra de ferramentas principal na janela atual"
 
-#: src/glabels-ui.xml.h:19
+#: src/glabels-ui.xml.h:21
 msgid "Close"
 msgstr "Fechar"
 
-#: src/glabels-ui.xml.h:20
+#: src/glabels-ui.xml.h:22
 msgid "Close the current file"
 msgstr "Fechar o arquivo atual"
 
-#: src/glabels-ui.xml.h:21
+#: src/glabels-ui.xml.h:23
 msgid "Configure the application"
 msgstr "Configurar a aplicação"
 
-#: src/glabels-ui.xml.h:22
+#: src/glabels-ui.xml.h:24
 msgid "Contents"
 msgstr "Conteúdo"
 
-#: src/glabels-ui.xml.h:23
+#: src/glabels-ui.xml.h:25
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/glabels-ui.xml.h:24
+#: src/glabels-ui.xml.h:26
 msgid "Copy the selection"
 msgstr "Copia a seleção"
 
-#: src/glabels-ui.xml.h:25
+#: src/glabels-ui.xml.h:27
 msgid "Create a new document"
 msgstr "Cria um novo documento"
 
-#: src/glabels-ui.xml.h:26
+#: src/glabels-ui.xml.h:28
 msgid "Create barcode object"
 msgstr "Criar objeto código de barras"
 
-#: src/glabels-ui.xml.h:27
+#: src/glabels-ui.xml.h:29
 msgid "Create box/rectangle object"
 msgstr "Criar objeto caixa/retângulo"
 
-#: src/glabels-ui.xml.h:28
+#: src/glabels-ui.xml.h:30
 msgid "Create ellipse/circle object"
 msgstr "Criar objeto elipse/círculo"
 
-#: src/glabels-ui.xml.h:29
+#: src/glabels-ui.xml.h:31
 msgid "Create image object"
 msgstr "Criar objeto imagem"
 
-#: src/glabels-ui.xml.h:30
+#: src/glabels-ui.xml.h:32
 msgid "Create line object"
 msgstr "Criar objeto linha"
 
-#: src/glabels-ui.xml.h:31
+#: src/glabels-ui.xml.h:33
 msgid "Create text object"
 msgstr "Criar objeto texto"
 
-#: src/glabels-ui.xml.h:32
+#: src/glabels-ui.xml.h:34
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/glabels-ui.xml.h:33
+#: src/glabels-ui.xml.h:35
 msgid "Customize"
 msgstr "Personalizar"
 
-#: src/glabels-ui.xml.h:34
+#: src/glabels-ui.xml.h:36
 msgid "Customize Drawing Toolbar"
 msgstr "Personaliza barra de ferramentas de desenho"
 
-#: src/glabels-ui.xml.h:35
+#: src/glabels-ui.xml.h:37
 msgid "Customize Main Toolbar"
 msgstr "Personaliza barra de ferramentas principal"
 
-#: src/glabels-ui.xml.h:36
+#: src/glabels-ui.xml.h:38
 msgid "Customize toolbars"
 msgstr "Personaliza barras de ferramentas"
 
-#: src/glabels-ui.xml.h:37
+#: src/glabels-ui.xml.h:39
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/glabels-ui.xml.h:38
+#: src/glabels-ui.xml.h:40
 msgid "Cut the selection"
 msgstr "Corta a seleção"
 
-#: src/glabels-ui.xml.h:39
+#: src/glabels-ui.xml.h:41
 msgid "Decrease magnification"
 msgstr "Diminuir aumento"
 
-#: src/glabels-ui.xml.h:40
+#: src/glabels-ui.xml.h:42
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/glabels-ui.xml.h:41
+#: src/glabels-ui.xml.h:43
 msgid "Delete the selected objects"
 msgstr "Apaga os objetos selecionados"
 
-#: src/glabels-ui.xml.h:42
+#: src/glabels-ui.xml.h:44
 msgid "Drawing toolbar"
 msgstr "Barra de ferramentas de desenho"
 
-#: src/glabels-ui.xml.h:43
+#: src/glabels-ui.xml.h:45
 msgid "Dump XML"
 msgstr "Descarregar XML"
 
-#: src/glabels-ui.xml.h:44
+#: src/glabels-ui.xml.h:46
 msgid "Dump the UI Xml description"
 msgstr "Descarrega a descrição da UI Xml"
 
-#: src/glabels-ui.xml.h:45
+#: src/glabels-ui.xml.h:47
 msgid "Edit merge properties"
 msgstr "Editar propriedades de fusão"
 
-#: src/glabels-ui.xml.h:46
+#: src/glabels-ui.xml.h:48
 msgid "Edit object properties"
 msgstr "Edita propriedades do objeto"
 
-#: src/glabels-ui.xml.h:47 src/stock.c:74
+#: src/glabels-ui.xml.h:49 src/stock.c:84
+msgid "Fill color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:50 src/stock.c:74
 msgid "Flip _Horizontally"
 msgstr "Refletir _Horizontalmente"
 
-#: src/glabels-ui.xml.h:48 src/stock.c:75
+#: src/glabels-ui.xml.h:51 src/stock.c:75
 msgid "Flip _Vertically"
 msgstr "Refletir _Verticalmente"
 
-#: src/glabels-ui.xml.h:49
+#: src/glabels-ui.xml.h:52
 msgid "Flip object horizontally"
 msgstr "Reflete objeto horizontalmente"
 
-#: src/glabels-ui.xml.h:50
+#: src/glabels-ui.xml.h:53
 msgid "Flip object vertically"
 msgstr "Reflete objeto verticalmente"
 
-#: src/glabels-ui.xml.h:51
+#: src/glabels-ui.xml.h:54
+#, fuzzy
+msgid "Font name"
+msgstr "Não salve"
+
+#: src/glabels-ui.xml.h:55
+#, fuzzy
+msgid "Font selector"
+msgstr "Copia a seleção"
+
+#: src/glabels-ui.xml.h:56
+#, fuzzy
+msgid "Font size"
+msgstr "Não salve"
+
+#: src/glabels-ui.xml.h:57
 msgid "Icon and _Text"
 msgstr "Ícone e _Texto"
 
-#: src/glabels-ui.xml.h:52
+#: src/glabels-ui.xml.h:58
 msgid "Increase magnification"
 msgstr "Aumentar aumento"
 
-#: src/glabels-ui.xml.h:53 src/stock.c:82 src/stock.c:83
+#: src/glabels-ui.xml.h:59
+msgid "Italic"
+msgstr ""
+
+#: src/glabels-ui.xml.h:60 src/stock.c:82 src/stock.c:83
 msgid "Label Ce_nter"
 msgstr "Ce_ntro Etiqueta"
 
-#: src/glabels-ui.xml.h:54
+#: src/glabels-ui.xml.h:61
+msgid "Left align"
+msgstr ""
+
+#: src/glabels-ui.xml.h:62 src/stock.c:85
+msgid "Line color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:63
+msgid "Line width"
+msgstr ""
+
+#: src/glabels-ui.xml.h:64
 msgid "Lower object to bottom"
 msgstr "Abaixa objeto à base"
 
-#: src/glabels-ui.xml.h:55
+#: src/glabels-ui.xml.h:65
 msgid "M_arkup"
 msgstr "M_arcação"
 
-#: src/glabels-ui.xml.h:56
+#: src/glabels-ui.xml.h:66
 msgid "Main toolbar"
 msgstr "Barra de ferramentas principal"
 
-#: src/glabels-ui.xml.h:57
+#: src/glabels-ui.xml.h:67
 msgid "Markup"
 msgstr "Marcação"
 
-#: src/glabels-ui.xml.h:58
+#: src/glabels-ui.xml.h:68
 msgid "New"
 msgstr "Novo"
 
-#: src/glabels-ui.xml.h:59
+#: src/glabels-ui.xml.h:69
 msgid "Object _Properties..."
 msgstr "_Propriedades do Objeto..."
 
-#: src/glabels-ui.xml.h:60
+#: src/glabels-ui.xml.h:70
 msgid "Only show icons in the drawing toolbar"
 msgstr "Exibe somente ícones na barra de ferramentas de desenho"
 
-#: src/glabels-ui.xml.h:61
+#: src/glabels-ui.xml.h:71
 msgid "Only show icons in the main toolbar"
 msgstr "Exibe somente ícones na barra de ferramentas principal"
 
-#: src/glabels-ui.xml.h:62 src/file.c:246
+#: src/glabels-ui.xml.h:72 src/file.c:421
 msgid "Open"
 msgstr "Abrir"
 
-#: src/glabels-ui.xml.h:63
+#: src/glabels-ui.xml.h:73
 msgid "Open a file"
 msgstr "Abrir um arquivo"
 
-#: src/glabels-ui.xml.h:64
+#: src/glabels-ui.xml.h:74
 msgid "Open the glabels manual"
 msgstr "Abre o manual do glabels"
 
-#: src/glabels-ui.xml.h:65
+#: src/glabels-ui.xml.h:75
 msgid "Paste"
 msgstr "Colar"
 
-#: src/glabels-ui.xml.h:66
+#: src/glabels-ui.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Cola a área de transferência"
 
-#: src/glabels-ui.xml.h:67
+#: src/glabels-ui.xml.h:77
 msgid "Pr_eferences..."
 msgstr "Pr_eferências..."
 
-#: src/glabels-ui.xml.h:68
+#: src/glabels-ui.xml.h:78
 msgid "Preferences"
 msgstr "Preferências"
 
-#: src/glabels-ui.xml.h:69 src/print-dialog.c:104
+#: src/glabels-ui.xml.h:79 src/print-dialog.c:114
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/glabels-ui.xml.h:70
+#: src/glabels-ui.xml.h:80
 msgid "Print the current file"
 msgstr "Imprime o arquivo atual"
 
-#: src/glabels-ui.xml.h:71
+#: src/glabels-ui.xml.h:81
+#, fuzzy
+msgid "Proper_ties"
+msgstr "Propriedades"
+
+#. ---------------------------
+#. Text Properties section
+#. ---------------------------
+#: src/glabels-ui.xml.h:82 src/view-text.c:330 src/view-barcode.c:305
+msgid "Properties"
+msgstr "Propriedades"
+
+#: src/glabels-ui.xml.h:83
+msgid "Property toolbar"
+msgstr ""
+
+#: src/glabels-ui.xml.h:84
 msgid "Quit"
 msgstr "Sair"
 
-#: src/glabels-ui.xml.h:72
+#: src/glabels-ui.xml.h:85
 msgid "Quit the program"
 msgstr "Sai do programa"
 
-#: src/glabels-ui.xml.h:73
+#: src/glabels-ui.xml.h:86
 msgid "Raise object to top"
 msgstr "Sobe objetos ao topo"
 
-#: src/glabels-ui.xml.h:74
+#: src/glabels-ui.xml.h:87
 msgid "Recent _Files"
 msgstr "_Arquivos recentes"
 
-#: src/glabels-ui.xml.h:75
+#: src/glabels-ui.xml.h:88
 msgid "Redo"
 msgstr "Refazer"
 
-#: src/glabels-ui.xml.h:76
+#: src/glabels-ui.xml.h:89
 msgid "Redo the undone action"
 msgstr "Refaz a ação desfeita"
 
-#: src/glabels-ui.xml.h:77
+#: src/glabels-ui.xml.h:90
 msgid "Remove all selections"
 msgstr "Remover todas as seleções"
 
-#: src/glabels-ui.xml.h:79
+#: src/glabels-ui.xml.h:92
 #, no-c-format
 msgid "Restore scale to 100%"
 msgstr "Restaura escala para 100%"
 
-#: src/glabels-ui.xml.h:80 src/stock.c:72
+#: src/glabels-ui.xml.h:93
+msgid "Right align"
+msgstr ""
+
+#: src/glabels-ui.xml.h:94 src/stock.c:72
 msgid "Rotate _Left"
 msgstr "Girar _Esquerda"
 
-#: src/glabels-ui.xml.h:81 src/stock.c:73
+#: src/glabels-ui.xml.h:95 src/stock.c:73
 msgid "Rotate _Right"
 msgstr "Girar _Direita"
 
-#: src/glabels-ui.xml.h:82
+#: src/glabels-ui.xml.h:96
 msgid "Rotate object 90 clockwise"
 msgstr "Gira objeto 90 sentido horário"
 
-#: src/glabels-ui.xml.h:83
+#: src/glabels-ui.xml.h:97
 msgid "Rotate object 90 counter-clockwise"
 msgstr "Gira objeto 90 sentido anti-horário"
 
-#: src/glabels-ui.xml.h:84
+#: src/glabels-ui.xml.h:98
 msgid "Save"
 msgstr "Salvar"
 
-#: src/glabels-ui.xml.h:85
+#: src/glabels-ui.xml.h:99
 msgid "Save As"
 msgstr "Salvar como"
 
-#: src/glabels-ui.xml.h:86
+#: src/glabels-ui.xml.h:100
 msgid "Save _As..."
 msgstr "Salvar _como..."
 
-#: src/glabels-ui.xml.h:87
+#: src/glabels-ui.xml.h:101
 msgid "Save the current file"
 msgstr "Salva o arquivo atual"
 
-#: src/glabels-ui.xml.h:88
+#: src/glabels-ui.xml.h:102
 msgid "Save the current file with a different name"
 msgstr "Salva o arquivo atual com um nome diferente"
 
-#: src/glabels-ui.xml.h:89
+#: src/glabels-ui.xml.h:103
 msgid "Select All"
 msgstr "Selecionar Tudo"
 
-#: src/glabels-ui.xml.h:90
+#: src/glabels-ui.xml.h:104
 msgid "Select _All"
 msgstr "Selecionar _Tudo"
 
-#: src/glabels-ui.xml.h:91
+#: src/glabels-ui.xml.h:105
 msgid "Select all objects"
 msgstr "Seleciona todos os objetos"
 
-#: src/glabels-ui.xml.h:92
+#: src/glabels-ui.xml.h:106
 msgid "Select, move and modify objects"
 msgstr "Seleciona, movimenta e modifica objetos"
 
-#: src/glabels-ui.xml.h:93 src/stock.c:71
+#: src/glabels-ui.xml.h:107 src/stock.c:71
 msgid "Send to _Back"
 msgstr "Enviar para _trás"
 
-#: src/glabels-ui.xml.h:94
+#: src/glabels-ui.xml.h:108
 msgid "Set drawing toolbar button style according to desktop default"
 msgstr ""
 "Define estilo de botão da barra de ferramentas de desenho de acordo com "
 "padrão do desktop"
 
-#: src/glabels-ui.xml.h:95
+#: src/glabels-ui.xml.h:109
 msgid "Set main toolbar button style according to desktop default"
 msgstr ""
 "Define estilo de botão da barra de ferramentas principal de acordo com "
 "padrão do desktop"
 
-#: src/glabels-ui.xml.h:96
+#: src/glabels-ui.xml.h:110
 msgid "Show _Tooltips"
 msgstr "Exibir _Dicas"
 
-#: src/glabels-ui.xml.h:97
+#: src/glabels-ui.xml.h:111
+#, fuzzy
+msgid "Show both icons and texts in the drawing toolbar"
+msgstr "Exibe dicas na barra de ferramentas de desenho"
+
+#: src/glabels-ui.xml.h:112
+#, fuzzy
+msgid "Show both icons and texts in the main toolbar"
+msgstr "Exibe dicas na barra de ferramentas principal"
+
+#: src/glabels-ui.xml.h:113
 msgid "Show tooltips in the drawing toolbar"
 msgstr "Exibe dicas na barra de ferramentas de desenho"
 
-#: src/glabels-ui.xml.h:98
+#: src/glabels-ui.xml.h:114
 msgid "Show tooltips in the main toolbar"
 msgstr "Exibe dicas na barra de ferramentas principal"
 
-#: src/glabels-ui.xml.h:99
+#: src/glabels-ui.xml.h:115
+msgid "Text color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:116
 msgid "U_n-select All"
 msgstr "D_esmarcar Tudo"
 
-#: src/glabels-ui.xml.h:100
+#: src/glabels-ui.xml.h:117
 msgid "Un-select All"
 msgstr "Desmarcar Tudo"
 
-#: src/glabels-ui.xml.h:101
+#: src/glabels-ui.xml.h:118
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/glabels-ui.xml.h:102
+#: src/glabels-ui.xml.h:119
 msgid "Undo the last action"
 msgstr "Desfaz a última ação"
 
-#: src/glabels-ui.xml.h:103
+#: src/glabels-ui.xml.h:120
 msgid "Zoom _1:1"
 msgstr "Zoom _1:1"
 
-#: src/glabels-ui.xml.h:104
+#: src/glabels-ui.xml.h:121
 msgid "Zoom _In"
 msgstr "M_ais Zoom"
 
-#: src/glabels-ui.xml.h:105
+#: src/glabels-ui.xml.h:122
 msgid "Zoom _Out"
 msgstr "M_enos Zoom"
 
-#: src/glabels-ui.xml.h:106
+#: src/glabels-ui.xml.h:123
 msgid "_About..."
 msgstr "_Sobre..."
 
-#: src/glabels-ui.xml.h:107
+#: src/glabels-ui.xml.h:124
 msgid "_Bottoms"
 msgstr "_Bases"
 
-#: src/glabels-ui.xml.h:108 src/stock.c:64
+#: src/glabels-ui.xml.h:125 src/stock.c:64
 msgid "_Box"
 msgstr "_Caixa"
 
-#: src/glabels-ui.xml.h:109 src/stock.c:78
+#: src/glabels-ui.xml.h:126 src/stock.c:78
 msgid "_Centers"
 msgstr "C_entros"
 
-#: src/glabels-ui.xml.h:110
+#: src/glabels-ui.xml.h:127
 msgid "_Close"
 msgstr "_Fechar"
 
-#: src/glabels-ui.xml.h:111
+#: src/glabels-ui.xml.h:128
 msgid "_Contents"
 msgstr "_Conteúdo"
 
-#: src/glabels-ui.xml.h:112
+#: src/glabels-ui.xml.h:129
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/glabels-ui.xml.h:113
+#: src/glabels-ui.xml.h:130
 msgid "_Create Object"
 msgstr "_Criar Objeto"
 
-#: src/glabels-ui.xml.h:114
+#: src/glabels-ui.xml.h:131
 msgid "_Debug"
 msgstr "_Depurar"
 
-#: src/glabels-ui.xml.h:115 src/view.c:3078
+#: src/glabels-ui.xml.h:132 src/view.c:3526
 msgid "_Delete"
 msgstr "_Apagar"
 
-#: src/glabels-ui.xml.h:116
+#: src/glabels-ui.xml.h:133
 msgid "_Desktop Default"
 msgstr "Padrão _Desktop"
 
-#: src/glabels-ui.xml.h:117
+#: src/glabels-ui.xml.h:134
 msgid "_Drawing Toolbar"
 msgstr "Barra de _Desenho"
 
-#: src/glabels-ui.xml.h:118
+#: src/glabels-ui.xml.h:135
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/glabels-ui.xml.h:119 src/stock.c:65
+#: src/glabels-ui.xml.h:136 src/stock.c:65
 msgid "_Ellipse"
 msgstr "_Elipse"
 
-#: src/glabels-ui.xml.h:120
+#: src/glabels-ui.xml.h:137
 msgid "_File"
 msgstr "_Arquivo"
 
-#: src/glabels-ui.xml.h:121
+#: src/glabels-ui.xml.h:138
 msgid "_Grid"
 msgstr "_Grade"
 
-#: src/glabels-ui.xml.h:122
+#: src/glabels-ui.xml.h:139
 msgid "_Help"
 msgstr "A_juda"
 
-#: src/glabels-ui.xml.h:123
+#: src/glabels-ui.xml.h:140
 msgid "_Icon"
 msgstr "_Ícone"
 
-#: src/glabels-ui.xml.h:124 src/stock.c:66
+#: src/glabels-ui.xml.h:141 src/stock.c:66
 msgid "_Image"
 msgstr "_Imagem"
 
-#: src/glabels-ui.xml.h:125 src/stock.c:76
+#: src/glabels-ui.xml.h:142 src/stock.c:76
 msgid "_Lefts"
 msgstr "_Esquerdas"
 
-#: src/glabels-ui.xml.h:126 src/stock.c:63
+#: src/glabels-ui.xml.h:143 src/stock.c:63
 msgid "_Line"
 msgstr "_Linha"
 
-#: src/glabels-ui.xml.h:127
+#: src/glabels-ui.xml.h:144
 msgid "_Main Toolbar"
 msgstr "Barra _Principal"
 
-#: src/glabels-ui.xml.h:128
+#: src/glabels-ui.xml.h:145
 msgid "_Merge Properties..."
 msgstr "Propriedades de _Fusão..."
 
-#: src/glabels-ui.xml.h:129
+#: src/glabels-ui.xml.h:146
 msgid "_New"
 msgstr "_Novo"
 
-#: src/glabels-ui.xml.h:130
+#: src/glabels-ui.xml.h:147
 msgid "_Objects"
 msgstr "_Objetos"
 
-#: src/glabels-ui.xml.h:131
+#: src/glabels-ui.xml.h:148
 msgid "_Open..."
 msgstr "_Abrir..."
 
 #.
 #. * Submenu: Order
 #.
-#: src/glabels-ui.xml.h:132 src/view.c:2924
+#: src/glabels-ui.xml.h:149 src/view.c:3372
 msgid "_Order"
 msgstr "_Ordenar"
 
-#: src/glabels-ui.xml.h:133
+#: src/glabels-ui.xml.h:150
 msgid "_Paste"
 msgstr "_Colar"
 
-#: src/glabels-ui.xml.h:134
+#: src/glabels-ui.xml.h:151
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: src/glabels-ui.xml.h:135
+#: src/glabels-ui.xml.h:152
 msgid "_Quit"
 msgstr "_Sair"
 
-#: src/glabels-ui.xml.h:136 src/stock.c:77
+#: src/glabels-ui.xml.h:153 src/stock.c:77
 msgid "_Rights"
 msgstr "_Direitas"
 
 #.
 #. * Submenu: Rotate/Flip
 #.
-#: src/glabels-ui.xml.h:137 src/view.c:2945
+#: src/glabels-ui.xml.h:154 src/view.c:3393
 msgid "_Rotate/Flip"
 msgstr "_Girar/Refletir"
 
-#: src/glabels-ui.xml.h:138
+#: src/glabels-ui.xml.h:155
 msgid "_Save"
 msgstr "_Salvar"
 
-#: src/glabels-ui.xml.h:139 src/stock.c:61
+#: src/glabels-ui.xml.h:156 src/stock.c:61
 msgid "_Select Mode"
 msgstr "_Selecionar Modo"
 
-#: src/glabels-ui.xml.h:140 src/stock.c:62
+#: src/glabels-ui.xml.h:157 src/stock.c:62
 msgid "_Text"
 msgstr "_Texto"
 
-#: src/glabels-ui.xml.h:141 src/stock.c:79
+#: src/glabels-ui.xml.h:158 src/stock.c:79
 msgid "_Tops"
 msgstr "_Topos"
 
-#: src/glabels-ui.xml.h:142
+#: src/glabels-ui.xml.h:159
 msgid "_View"
 msgstr "_Visualizar"
 
@@ -651,27 +728,32 @@ msgid "Show ui debugging messages."
 msgstr "Exibe mensagens de depuração de ui."
 
 #: src/glabels.c:97
+#, fuzzy
+msgid "Show property_bar debugging messages."
+msgstr "Exibe mensagens de depuração de preferências."
+
+#: src/glabels.c:100
 msgid "Show media select widget debugging messages."
 msgstr "Exibe mensagens de depuração de widget de seleção de mídia."
 
-#: src/glabels.c:100
+#: src/glabels.c:103
 msgid "Show mini preview widget debugging messages."
 msgstr "Exibe mensagens de depuração de widget de mini previsão."
 
-#: src/glabels.c:103
+#: src/glabels.c:106
 #, fuzzy
 msgid "Show pixbuf cache debugging messages."
 msgstr "Exibe mensagens de depuração de visualização."
 
-#: src/glabels.c:106
+#: src/glabels.c:109
 msgid "Show widget debugging messages."
 msgstr "Exibe mensagens de depuração de widget."
 
-#: src/glabels.c:109
+#: src/glabels.c:112
 msgid "Turn on all debugging messages."
 msgstr "Ativa todas as mensagens de depuração."
 
-#: src/glabels.c:180
+#: src/glabels.c:184
 msgid "Could not initialize Bonobo!\n"
 msgstr "Impossível inicializar Bonobo!\n"
 
@@ -707,32 +789,32 @@ msgstr "n
 msgid "copies"
 msgstr "cópias"
 
-#: src/glabels-batch.c:58 src/print-dialog.c:200
+#: src/glabels-batch.c:58 src/print-dialog.c:210
 msgid "print outlines (to test printer alignment)"
 msgstr "imprimir contornos (testar alinhamento da impressora)"
 
-#: src/glabels-batch.c:60 src/print-dialog.c:209
+#: src/glabels-batch.c:60 src/print-dialog.c:219
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "imprimir ao contrário (como uma imagem de espelho)"
 
-#: src/glabels-batch.c:95
+#: src/glabels-batch.c:96
 msgid "[OPTION...] GLABELS_FILE..."
 msgstr "[OPÇÃO...] ARQUIVO_GLABELS..."
 
-#: src/glabels-batch.c:114
+#: src/glabels-batch.c:116
 msgid "missing glabels file\n"
 msgstr "faltando arquivo glabels\n"
 
-#: src/glabels-batch.c:141
+#: src/glabels-batch.c:157
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "impossível abrir o arquivo glabels %s\n"
 
-#: src/window.c:234
+#: src/window.c:242
 msgid "(none) - gLabels"
 msgstr "(sem nome) - gLabels"
 
-#: src/window.c:399
+#: src/window.c:409
 msgid "(modified)"
 msgstr "(modificado)"
 
@@ -752,7 +834,21 @@ msgstr "Bases"
 msgid "Centers"
 msgstr "Centros"
 
-#: src/commands.c:337
+#: src/ui-property-bar.c:346 src/wdgt-text-props.c:241 src/wdgt-bc-props.c:174
+#, fuzzy
+msgid "Default"
+msgstr "Apagar"
+
+#: src/ui-property-bar.c:361 src/wdgt-fill.c:175
+msgid "No fill"
+msgstr ""
+
+#: src/ui-property-bar.c:376 src/wdgt-line.c:201
+#, fuzzy
+msgid "No line"
+msgstr "Nenhum"
+
+#: src/commands.c:352
 msgid ""
 "A label and business card creation program for GNOME.\n"
 " \n"
@@ -778,97 +874,107 @@ msgstr ""
 "UM PROPÓSITO PARTICULAR. Veja a Licença Pública Geral GNU para mais "
 "detalhes.\n"
 
-#: src/commands.c:351
+#: src/commands.c:366
 msgid "See the file AUTHORS for additional credits,"
 msgstr "Veja o arquivo AUTHORS para ver créditos adicionais,"
 
-#: src/commands.c:352
-msgid "or visit http://snaught.com/glabels"
+#: src/commands.c:367
+#, fuzzy
+msgid "or visit http://glabels.sourceforge.net/"
 msgstr "ou visite http://snaught.com/glabels"
 
 #: src/commands.c:376
-msgid "glabels"
+msgid " "
+msgstr ""
+
+#: src/commands.c:391
+msgid "glabels"
 msgstr "glabels"
 
-#: src/file.c:82
+#: src/file.c:91
 msgid "New Label or Card"
 msgstr "Nova Etiqueta ou Cartão"
 
-#: src/file.c:112
+#: src/file.c:121 src/file.c:291
 msgid "Media Type"
 msgstr "Tipo de mídia"
 
-#: src/file.c:118
+#: src/file.c:127 src/file.c:297
 msgid "Label orientation"
 msgstr "Orientação da etiqueta"
 
-#: src/file.c:248
+#: src/file.c:258
+#, fuzzy
+msgid "Label properties"
+msgstr "_Propriedades de Objeto"
+
+#: src/file.c:423
 msgid "Open label"
 msgstr "Abrir etiqueta"
 
-#: src/file.c:296 src/file.c:594
+#: src/file.c:475 src/file.c:784
 msgid "Empty file name selection"
 msgstr "Seleção de nome de arquivo vazia"
 
-#: src/file.c:297 src/file.c:311
+#: src/file.c:476 src/file.c:490
 msgid "Please select a file or supply a valid file name"
 msgstr "Por favor, selecione um arquivo ou forneça um nome de arquivo válido"
 
-#: src/file.c:310
+#: src/file.c:489
 msgid "File does not exist"
 msgstr "Arquivo inexistente"
 
-#: src/file.c:372
+#: src/file.c:564
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr "Impossível abrir o arquivo \"%s\""
 
-#: src/file.c:380
+#: src/file.c:572
 msgid "Not a supported file format"
 msgstr "Formato de arquivo não suportado"
 
-#: src/file.c:462 src/file.c:636
+#: src/file.c:653 src/file.c:828
 #, c-format
 msgid "Could not save file \"%s\""
 msgstr "Impossível salvar o arquivo \"%s\""
 
-#: src/file.c:470 src/file.c:644
+#: src/file.c:661 src/file.c:836
 msgid "Error encountered during save.  The file is still not saved."
 msgstr "Erro encontrado ao salvar. O arquivo ainda não foi salvo."
 
-#: src/file.c:512
+#: src/file.c:702
 #, c-format
 msgid "Save \"%s\" as"
 msgstr "Salvar \"%s\" como"
 
-#: src/file.c:595
+#: src/file.c:785
 msgid "Please supply a valid file name"
 msgstr "Por favor, forneça um nome de arquivo válido"
 
-#: src/file.c:609
+#: src/file.c:801
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr "Sobrescrever o arquivo \"%s\"?"
 
-#: src/file.c:617
+#: src/file.c:809
 msgid "File already exists."
 msgstr "O arquivo já existe."
 
-#: src/file.c:732
+#: src/file.c:924
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr "Salvar modificações no documento \"%s\" antes de fechar?"
 
-#: src/file.c:740
+#: src/file.c:932
 msgid "Your changes will be lost if you don't save them."
 msgstr "Suas modificações serão perdidas se você não salvá-las."
 
-#: src/file.c:743
+#: src/file.c:935
 msgid "Close without saving"
 msgstr "Fechar sem salvar"
 
 #. Should not happen
-#: src/prefs.c:664 src/prefs.c:671 src/wdgt-line.c:180
+#: src/prefs.c:664 src/prefs.c:671 src/wdgt-line.c:185
 msgid "points"
 msgstr "pontos"
 
@@ -918,11 +1024,11 @@ msgstr "Mil
 msgid "Default page size"
 msgstr "Tamanho de página padrão"
 
-#: src/prefs-dialog.c:309
+#: src/prefs-dialog.c:309 data/paper-sizes.xml.h:25
 msgid "US Letter"
 msgstr ""
 
-#: src/prefs-dialog.c:317
+#: src/prefs-dialog.c:317 data/paper-sizes.xml.h:6
 msgid "A4"
 msgstr ""
 
@@ -931,67 +1037,67 @@ msgid "Select default properties for new objects."
 msgstr "Selecione as propriedades padrões para novos objetos."
 
 #. ------ text props entry ------
-#: src/prefs-dialog.c:359 src/view-text.c:314 src/view-text.c:634
+#: src/prefs-dialog.c:359 src/view-text.c:313 src/view-text.c:636
 #: src/wdgt-bc-style.c:184
 msgid "Text"
 msgstr "Texto"
 
 #. ------ Line box ------
-#: src/prefs-dialog.c:368 src/view-line.c:304
+#: src/prefs-dialog.c:368 src/view-line.c:303
 msgid "Line"
 msgstr "Linha"
 
 #. ------ Fill box ------
-#: src/prefs-dialog.c:377 src/view-box.c:323 src/view-ellipse.c:323
+#: src/prefs-dialog.c:377 src/view-box.c:322 src/view-ellipse.c:322
 msgid "Fill"
 msgstr "Preencher"
 
 #.
 #. * Submenu: Align Horizontally
 #.
-#: src/view.c:2978
+#: src/view.c:3426
 msgid "Align _Horizontally"
 msgstr "Alinhar _Horizontalmente"
 
 #.
 #. * Submenu: Align Vertically
 #.
-#: src/view.c:3017
+#: src/view.c:3465
 msgid "Align _Vertically"
 msgstr "Alinhar _Verticalmente"
 
-#: src/view-box.c:291
+#: src/view-box.c:290
 msgid "Edit box object properties"
 msgstr "Editar propriedades do objeto caixa"
 
 #. ---------------------------
 #. Outline section
 #. ---------------------------
-#: src/view-box.c:307 src/view-ellipse.c:307
+#: src/view-box.c:306 src/view-ellipse.c:306
 msgid "Outline"
 msgstr "Contorno"
 
 #. ---------------------------
 #. Position section
 #. ---------------------------
-#: src/view-box.c:339 src/view-ellipse.c:339 src/view-line.c:320
-#: src/view-image.c:314 src/view-text.c:349 src/view-barcode.c:338
+#: src/view-box.c:338 src/view-ellipse.c:338 src/view-line.c:319
+#: src/view-image.c:314 src/view-text.c:348 src/view-barcode.c:337
 msgid "Position"
 msgstr "Posição"
 
 #. ---------------------------
 #. Size section
 #. ---------------------------
-#: src/view-box.c:354 src/view-ellipse.c:354 src/view-line.c:338
+#: src/view-box.c:353 src/view-ellipse.c:353 src/view-line.c:337
 #: src/view-image.c:331
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/view-ellipse.c:291
+#: src/view-ellipse.c:290
 msgid "Edit ellipse object properties"
 msgstr "Editar propriedades do objeto elipse"
 
-#: src/view-line.c:289
+#: src/view-line.c:288
 msgid "Edit line object properties"
 msgstr "Editar propriedades do objeto linha"
 
@@ -1011,29 +1117,22 @@ msgstr "Imagem"
 msgid "Reset image size"
 msgstr "Redefinir tamanho da imagem"
 
-#: src/view-text.c:299
+#: src/view-text.c:298
 msgid "Edit text object properties"
 msgstr "Editar propriedades do objeto texto"
 
-#. ---------------------------
-#. Text Properties section
-#. ---------------------------
-#: src/view-text.c:331 src/view-barcode.c:306
-msgid "Properties"
-msgstr "Propriedades"
-
-#: src/view-barcode.c:271
+#: src/view-barcode.c:270
 msgid "Edit barcode object properties"
 msgstr "Editar propriedades do objeto código de barras"
 
 #. ---------------------------
 #. Data section
 #. ---------------------------
-#: src/view-barcode.c:286 src/merge-properties-dialog.c:343
+#: src/view-barcode.c:285 src/merge-properties-dialog.c:343
 msgid "Data"
 msgstr "Dado"
 
-#: src/view-barcode.c:802 src/print.c:912
+#: src/view-barcode.c:803 src/print.c:1021
 msgid "Invalid barcode"
 msgstr "Código de barras inválido"
 
@@ -1076,72 +1175,76 @@ msgstr "Selecionar"
 msgid "Record/Field"
 msgstr "Registro/Campo"
 
-#: src/print-dialog.c:128
+#: src/print-dialog.c:138
 msgid "_Job"
 msgstr "_Trabalho"
 
-#: src/print-dialog.c:133
+#: src/print-dialog.c:143
 msgid "P_rinter"
 msgstr "Imp_ressora"
 
 #. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:163
+#: src/print-dialog.c:173
 msgid "Copies"
 msgstr "Cópias"
 
 #. ------- Otherwise add merge control widget ------------
-#: src/print-dialog.c:177
+#: src/print-dialog.c:187
 msgid "Document merge control"
 msgstr "Controle de fusão do documento"
 
 #. ----------- Add custom print options area ------------
-#: src/print-dialog.c:194
+#: src/print-dialog.c:204
 msgid "Options"
 msgstr "Opções"
 
-#: src/print-dialog.c:336 src/print-dialog.c:374
+#: src/print-dialog.c:227
+msgid "print crop marks"
+msgstr ""
+
+#: src/print-dialog.c:364 src/print-dialog.c:403
 msgid "Print preview"
 msgstr "Visualizar impressão"
 
-#: src/label.c:542
+#: src/label.c:563
 msgid "Untitled"
 msgstr "Sem_título"
 
-#: src/template.c:296
+#: src/template.c:318
 #, c-format
 msgid "Generic %s full page"
 msgstr "Página completa %s genérico"
 
-#: src/template.c:338
+#: src/template.c:362
 msgid "No template files found!"
 msgstr "Nenhum arquivo modelo encontrado!"
 
-#: src/template.c:435
+#: src/template.c:461
 #, c-format
 msgid "%s x %s %s"
 msgstr "%s x %s %s"
 
-#: src/template.c:440
+#: src/template.c:466
 #, c-format
 msgid "%.5g x %.5g %s"
 msgstr "%.5g x %.5g %s"
 
-#: src/template.c:451 src/template.c:465
+#: src/template.c:477 src/template.c:491
 #, c-format
 msgid "%s %s diameter"
 msgstr "%s %s diâmetro"
 
-#: src/template.c:455 src/template.c:469
+#: src/template.c:481 src/template.c:495
 #, c-format
 msgid "%.5g %s diameter"
 msgstr "%.5g %s diâmetro"
 
-#: src/template.c:607
+#: src/template.c:633
 #, c-format
 msgid "%d x %d  (%d per sheet)"
 msgstr "%d x %d  (%d por página)"
 
-#: src/template.c:611
+#: src/template.c:637
 #, c-format
 msgid "%d per sheet"
 msgstr "%d por página"
@@ -1151,53 +1254,69 @@ msgstr "%d por p
 msgid "No paper files found!"
 msgstr "Nenhum arquivo modelo encontrado!"
 
-#: src/xml-label.c:171 src/xml-label.c:204
+#: src/xml-label.c:177 src/xml-label.c:214
 msgid "xmlParseFile error"
 msgstr "erro: xmlParseFile"
 
-#: src/xml-label.c:241
+#: src/xml-label.c:251
 msgid "No document root"
 msgstr "Sem raiz do documento"
 
-#: src/xml-label.c:253
+#: src/xml-label.c:263
 msgid "Importing from glabels 0.1 format"
 msgstr "Importando do formato do glabels 0.1"
 
-#: src/xml-label.c:261
+#: src/xml-label.c:271
 msgid "Importing from glabels 0.4 format"
 msgstr "Importando do formato do glabels 0.4"
 
-#: src/xml-label.c:264
+#: src/xml-label.c:278
+#, fuzzy
+msgid "Importing from glabels 1.91 format"
+msgstr "Importando do formato do glabels 0.1"
+
+#: src/xml-label.c:281
 msgid "bad document, unknown glabels Namespace"
 msgstr "documento ruim, espaço de nome glabels não encontrado"
 
-#: src/xml-label.c:292 src/xml-label-04.c:75
+#: src/xml-label.c:310 src/xml-label-04.c:75 src/xml-label-191.c:131
 #, c-format
 msgid "Bad root node = \"%s\""
 msgstr "Nó raiz ruim = \"%s\""
 
-#: src/xml-label.c:325
+#: src/xml-label.c:345 src/xml-label-191.c:164
 #, fuzzy, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "Nó raiz ruim = \"%s\""
 
-#: src/xml-label.c:357 src/xml-label-04.c:123
+#: src/xml-label.c:387 src/xml-label-04.c:123 src/xml-label-191.c:196
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr "nó ruim = \"%s\""
 
-#: src/xml-label.c:763
+#: src/xml-label.c:783 src/xml-label-191.c:602
 #, fuzzy, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "nó ruim = \"%s\""
 
-#: src/xml-label.c:831
+#: src/xml-label.c:944
+msgid "Utf8 conversion error."
+msgstr ""
+
+#: src/xml-label.c:951
 msgid "Problem saving xml file."
 msgstr "Problema salvando arquivo xml."
 
-#: src/xml-template.c:157
+#. This should always be an id, but just in case a name
+#. slips by!
+#: src/xml-label-191.c:680 src/xml-template.c:169
 #, c-format
-msgid "Unknown page size id \"%s\""
+msgid "Unknown page size id \"%s\", trying as name"
+msgstr ""
+
+#: src/xml-label-191.c:690 src/xml-template.c:179
+#, c-format
+msgid "Unknown page size id or name \"%s\""
 msgstr ""
 
 #: src/merge.c:172 src/merge.c:213 src/merge.c:398 src/merge.c:401
@@ -1217,18 +1336,18 @@ msgid "Text file with tab delimeters"
 msgstr "Arquivo texto separado com tab"
 
 #. Font label
-#: src/wdgt-text-props.c:181
+#: src/wdgt-text-props.c:185
 msgid "Font:"
 msgstr "Fonte:"
 
 #. Text Color Label
-#: src/wdgt-text-props.c:230 src/wdgt-line.c:189 src/wdgt-fill.c:164
-#: src/wdgt-bc-props.c:164
+#: src/wdgt-text-props.c:234 src/wdgt-line.c:194 src/wdgt-fill.c:168
+#: src/wdgt-bc-props.c:167
 msgid "Color:"
 msgstr "Cor:"
 
 #. Alignment label
-#: src/wdgt-text-props.c:246
+#: src/wdgt-text-props.c:255
 msgid "Alignment:"
 msgstr "Alinhamento:"
 
@@ -1258,7 +1377,7 @@ msgid "Y:"
 msgstr "Y:"
 
 #. W Label
-#: src/wdgt-size.c:187 src/wdgt-line.c:166
+#: src/wdgt-size.c:187 src/wdgt-line.c:171
 msgid "Width:"
 msgstr "Largura:"
 
@@ -1355,10 +1474,536 @@ msgstr "Disposi
 msgid "Rotate"
 msgstr "Girar"
 
-#: src/gnome-recent-view-bonobo.c:189
-#, c-format
-msgid "Open %s"
-msgstr "Abrir %s"
+#. This is the default custom color
+#: src/mygal/color-palette.c:396
+#, fuzzy
+msgid "custom"
+msgstr "Personalizar"
+
+#. "Custom" color - we'll pop up a GnomeColorPicker
+#: src/mygal/color-palette.c:438
+#, fuzzy
+msgid "Custom Color:"
+msgstr "Personaliza barras de ferramentas"
+
+#: src/mygal/color-palette.c:446
+msgid "Choose Custom Color"
+msgstr ""
+
+#: src/mygal/color-palette.c:579
+msgid "black"
+msgstr ""
+
+#: src/mygal/color-palette.c:580
+msgid "light brown"
+msgstr ""
+
+#: src/mygal/color-palette.c:581
+msgid "brown gold"
+msgstr ""
+
+#: src/mygal/color-palette.c:582
+msgid "dark green #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:583
+msgid "navy"
+msgstr ""
+
+#: src/mygal/color-palette.c:584 src/mygal/color-palette.c:640
+msgid "dark blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:585
+msgid "purple #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:586
+msgid "very dark gray"
+msgstr ""
+
+#: src/mygal/color-palette.c:589 src/mygal/color-palette.c:645
+msgid "dark red"
+msgstr ""
+
+#: src/mygal/color-palette.c:590
+msgid "red-orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:591
+msgid "gold"
+msgstr ""
+
+#: src/mygal/color-palette.c:592
+msgid "dark green"
+msgstr ""
+
+#: src/mygal/color-palette.c:593 src/mygal/color-palette.c:646
+msgid "dull blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:594 src/mygal/color-palette.c:647
+msgid "blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:595
+msgid "dull purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:596
+msgid "dark grey"
+msgstr ""
+
+#: src/mygal/color-palette.c:599
+msgid "red"
+msgstr ""
+
+#: src/mygal/color-palette.c:600
+msgid "orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:601
+msgid "lime"
+msgstr ""
+
+#: src/mygal/color-palette.c:602
+msgid "dull green"
+msgstr ""
+
+#: src/mygal/color-palette.c:603
+msgid "dull blue #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:604
+msgid "sky blue #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:605 src/mygal/color-palette.c:644
+msgid "purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:606
+msgid "gray"
+msgstr ""
+
+#: src/mygal/color-palette.c:609 src/mygal/color-palette.c:641
+#, fuzzy
+msgid "magenta"
+msgstr "Imagem"
+
+#: src/mygal/color-palette.c:610
+msgid "bright orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:611 src/mygal/color-palette.c:642
+msgid "yellow"
+msgstr ""
+
+#: src/mygal/color-palette.c:612
+#, fuzzy
+msgid "green"
+msgstr "graus"
+
+#: src/mygal/color-palette.c:613 src/mygal/color-palette.c:643
+msgid "cyan"
+msgstr ""
+
+#: src/mygal/color-palette.c:614
+msgid "bright blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:615 src/mygal/color-palette.c:632
+msgid "red purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:616
+msgid "light grey"
+msgstr ""
+
+#: src/mygal/color-palette.c:619 src/mygal/color-palette.c:636
+msgid "pink"
+msgstr ""
+
+#: src/mygal/color-palette.c:620
+msgid "light orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:621 src/mygal/color-palette.c:633
+msgid "light yellow"
+msgstr ""
+
+#: src/mygal/color-palette.c:622
+msgid "light green"
+msgstr ""
+
+#: src/mygal/color-palette.c:623
+msgid "light cyan"
+msgstr ""
+
+#: src/mygal/color-palette.c:624 src/mygal/color-palette.c:634
+msgid "light blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:625 src/mygal/color-palette.c:638
+msgid "light purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:626
+msgid "white"
+msgstr ""
+
+#: src/mygal/color-palette.c:631
+msgid "purplish blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:635
+msgid "dark purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:637
+msgid "sky blue"
+msgstr ""
+
+#: data/paper-sizes.xml.h:1
+msgid "A0"
+msgstr ""
+
+#: data/paper-sizes.xml.h:2
+msgid "A1"
+msgstr ""
+
+#: data/paper-sizes.xml.h:3
+msgid "A10"
+msgstr ""
+
+#: data/paper-sizes.xml.h:4
+msgid "A2"
+msgstr ""
+
+#: data/paper-sizes.xml.h:5
+msgid "A3"
+msgstr ""
+
+#: data/paper-sizes.xml.h:7
+msgid "A5"
+msgstr ""
+
+#: data/paper-sizes.xml.h:8
+msgid "A6"
+msgstr ""
+
+#: data/paper-sizes.xml.h:9
+msgid "A7"
+msgstr ""
+
+#: data/paper-sizes.xml.h:10
+msgid "A8"
+msgstr ""
+
+#: data/paper-sizes.xml.h:11
+msgid "A9"
+msgstr ""
+
+#: data/paper-sizes.xml.h:12
+msgid "B0"
+msgstr ""
+
+#: data/paper-sizes.xml.h:13
+msgid "B1"
+msgstr ""
+
+#: data/paper-sizes.xml.h:14
+msgid "B10"
+msgstr ""
+
+#: data/paper-sizes.xml.h:15
+msgid "B2"
+msgstr ""
+
+#: data/paper-sizes.xml.h:16
+msgid "B3"
+msgstr ""
+
+#: data/paper-sizes.xml.h:17
+msgid "B4"
+msgstr ""
+
+#: data/paper-sizes.xml.h:18
+msgid "B5"
+msgstr ""
+
+#: data/paper-sizes.xml.h:19
+msgid "B6"
+msgstr ""
+
+#: data/paper-sizes.xml.h:20
+msgid "B7"
+msgstr ""
+
+#: data/paper-sizes.xml.h:21
+msgid "B8"
+msgstr ""
+
+#: data/paper-sizes.xml.h:22
+msgid "B9"
+msgstr ""
+
+#: data/paper-sizes.xml.h:23
+msgid "US Executive"
+msgstr ""
+
+#: data/paper-sizes.xml.h:24
+msgid "US Legal"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:1
+msgid "Address Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:2 data/avery-iso-templates.xml.h:3
+#: data/zweckform-iso-templates.xml.h:2 data/misc-us-templates.xml.h:2
+#: data/misc-iso-templates.xml.h:9
+msgid "Business Cards"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:3
+msgid "CD/DVD Labels (Disc Labels)"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:4
+msgid "Diskette Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:5
+#, fuzzy
+msgid "Filing Labels"
+msgstr "Etiquetas"
+
+#: data/avery-us-templates.xml.h:6
+msgid "Full Sheet Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:7
+#, fuzzy
+msgid "Large Round Labels"
+msgstr "Iniciar na etiqueta"
+
+#: data/avery-us-templates.xml.h:8
+msgid "Name Badge Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:9
+msgid "Return Address Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:10
+msgid "Shipping Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:11
+#, fuzzy
+msgid "Small Round Labels"
+msgstr "Iniciar na etiqueta"
+
+#: data/avery-us-templates.xml.h:12
+#, fuzzy
+msgid "Square Labels"
+msgstr "Etiquetas"
+
+#: data/avery-us-templates.xml.h:13
+msgid "Video Tape Face Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:14
+msgid "Video Tape Spine Labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:1
+msgid "3.5'' Diskette labels (face only)"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:2
+msgid "Address labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:4 data/zweckform-iso-templates.xml.h:4
+#: data/misc-us-templates.xml.h:4 data/misc-iso-templates.xml.h:10
+#, fuzzy
+msgid "CD/DVD Labels"
+msgstr "Etiquetas"
+
+#: data/avery-iso-templates.xml.h:5 data/misc-iso-templates.xml.h:16
+msgid "Mailing Labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:6
+#, fuzzy
+msgid "Mailing labels"
+msgstr "glabels"
+
+#: data/avery-iso-templates.xml.h:7
+msgid "Mini Address"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:8
+#, fuzzy
+msgid "Shipping labels"
+msgstr "Abrir etiqueta"
+
+#: data/zweckform-iso-templates.xml.h:1
+#, fuzzy
+msgid "Allround Labels"
+msgstr "Sobre glabels"
+
+#: data/zweckform-iso-templates.xml.h:3
+#, fuzzy
+msgid "CD Labels"
+msgstr "Etiquetas"
+
+#: data/zweckform-iso-templates.xml.h:5
+msgid "Correction and Cover-up Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:6
+msgid "Lever Arch File Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:7
+msgid "Mailing Labels -- 12"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:8
+msgid "QSL-Karten Etiketten 70mm x 50,8mm"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:9
+msgid "Rectangular Copier Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:10 data/misc-iso-templates.xml.h:20
+msgid "Rectangular Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:11
+msgid "Video Labels (back)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:1
+msgid "Business Card CD"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:3
+msgid "CD Template Rectangles"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:5
+msgid "CD/DVD Labels (Face Only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:6 data/misc-iso-templates.xml.h:11
+msgid "CD/DVD Labels (face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:7
+#, fuzzy
+msgid "DLT Labels"
+msgstr "Etiquetas"
+
+#: data/misc-us-templates.xml.h:8
+#, fuzzy
+msgid "Microtube labels"
+msgstr "Sobre glabels"
+
+#: data/misc-us-templates.xml.h:9
+msgid "Mini-CD Labels"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:10
+msgid "PRO CD Labels 2-up (CD spine only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:11
+msgid "PRO CD Labels 2-up (Face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:12
+msgid "PRO CD Labels 2-up (face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:13
+msgid "Slimline CD Case (rightside up)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:14
+msgid "Slimline CD Case (upside down)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:1
+msgid "Agipa 119488: Business Cards"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:2
+msgid "Allround Labels --24"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:3
+msgid "Allround Labels --44"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:4
+msgid "Allround Labels --64"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:5
+msgid "Allround Labels --65"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:6
+msgid "Arch File Labels"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:7
+msgid "Arch File Labels (large)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:8
+msgid "Arch File Labels (small)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:12
+msgid "CD/DVD Labels Standard Format (face only)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:13
+msgid "Diskette Labels (face only)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:14
+msgid "EPSON Photo Stickers 16"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:15
+msgid "Etiketten"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:17
+msgid "Mailing Labels --14"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:18
+msgid "Mailing Labels-2 columns"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:19
+msgid "Mailing Labels-3 columns"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:21
+msgid "Video Labels (face only)"
+msgstr ""
+
+#~ msgid "Open %s"
+#~ msgstr "Abrir %s"
 
 #~ msgid "Scale:"
 #~ msgstr "Escala:"
@@ -1402,9 +2047,6 @@ msgstr "Abrir %s"
 #~ "\n"
 #~ "Deseja salvá-lo?"
 
-#~ msgid "Don't save"
-#~ msgstr "Não salve"
-
 #~ msgid "Close / Save label as"
 #~ msgstr "Fechar / Salvar etiqueta como"
 
diff --git a/glabels2/po/ru.po b/glabels2/po/ru.po
index eff96e91..9af9de8a 100644
--- a/glabels2/po/ru.po
+++ b/glabels2/po/ru.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # Vitaly Lipatov <lav@altlinux.ru>, 2002
 #
-#: src/commands.c:361
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels 1.90.0\n"
-"POT-Creation-Date: 2003-06-22 01:12-0400\n"
+"POT-Creation-Date: 2003-11-01 19:24-0500\n"
 "PO-Revision-Date: 2002-10-27 17:07MSK\n"
 "Last-Translator: Vitaly Lipatov <lav@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -63,556 +62,632 @@ msgstr ""
 msgid "Bar_code"
 msgstr "ûÔÒÉÈ-ËÏÄ"
 
-#: src/glabels-ui.xml.h:12 src/stock.c:70
+#: src/glabels-ui.xml.h:12
+msgid "Bold"
+msgstr ""
+
+#: src/glabels-ui.xml.h:13 src/stock.c:70
 #, fuzzy
 msgid "Bring to _Front"
 msgstr "îÁ ÐÅÒÅÄÎÉÊ ÐÌÁÎ"
 
-#: src/glabels-ui.xml.h:13
+#: src/glabels-ui.xml.h:14
+#, fuzzy
+msgid "Center align"
+msgstr "óÏÄÅÒÖÁÎÉÅ ÓÐÒÁ×ËÉ"
+
+#: src/glabels-ui.xml.h:15
 msgid "Center objects to horizontal label center"
 msgstr ""
 
-#: src/glabels-ui.xml.h:14
+#: src/glabels-ui.xml.h:16
 msgid "Center objects to vertical label center"
 msgstr ""
 
-#: src/glabels-ui.xml.h:15
+#: src/glabels-ui.xml.h:17
 #, fuzzy
 msgid "Change the visibility of markup lines in the current window"
 msgstr "éÚÍÅÎÑÅÔ ×ÉÄÉÍÏÓÔØ ÇÌÁ×ÎÏÊ ÐÁÎÅÌÉ ÉÎÓÔÒÕÍÅÎÔÏ× × ÔÅËÕÝÅÍ ÏËÎÅ"
 
-#: src/glabels-ui.xml.h:16
+#: src/glabels-ui.xml.h:18
 msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr "éÚÍÅÎÑÅÔ ×ÉÄÉÍÏÓÔØ ÐÁÎÅÌÉ ÉÎÓÔÒÕÍÅÎÔÏ× ÄÌÑ ÒÉÓÏ×ÁÎÉÑ × ÔÅËÕÝÅÍ ÏËÎÅ"
 
-#: src/glabels-ui.xml.h:17
+#: src/glabels-ui.xml.h:19
 #, fuzzy
 msgid "Change the visibility of the grid in the current window"
 msgstr "éÚÍÅÎÑÅÔ ×ÉÄÉÍÏÓÔØ ÇÌÁ×ÎÏÊ ÐÁÎÅÌÉ ÉÎÓÔÒÕÍÅÎÔÏ× × ÔÅËÕÝÅÍ ÏËÎÅ"
 
-#: src/glabels-ui.xml.h:18
+#: src/glabels-ui.xml.h:20
 msgid "Change the visibility of the main toolbar in the current window"
 msgstr "éÚÍÅÎÑÅÔ ×ÉÄÉÍÏÓÔØ ÇÌÁ×ÎÏÊ ÐÁÎÅÌÉ ÉÎÓÔÒÕÍÅÎÔÏ× × ÔÅËÕÝÅÍ ÏËÎÅ"
 
-#: src/glabels-ui.xml.h:19
+#: src/glabels-ui.xml.h:21
 msgid "Close"
 msgstr "úÁËÒÙÔØ"
 
-#: src/glabels-ui.xml.h:20
+#: src/glabels-ui.xml.h:22
 msgid "Close the current file"
 msgstr "úÁËÒÙÔØ ÔÅËÕÝÉÊ ÆÁÊÌ"
 
-#: src/glabels-ui.xml.h:21
+#: src/glabels-ui.xml.h:23
 msgid "Configure the application"
 msgstr "îÁÓÔÒÏÉÔØ ÐÒÏÇÒÁÍÍÕ"
 
-#: src/glabels-ui.xml.h:22
+#: src/glabels-ui.xml.h:24
 msgid "Contents"
 msgstr "óÏÄÅÒÖÁÎÉÅ ÓÐÒÁ×ËÉ"
 
-#: src/glabels-ui.xml.h:23
+#: src/glabels-ui.xml.h:25
 msgid "Copy"
 msgstr "úÁÐÏÍÎÉÔØ"
 
-#: src/glabels-ui.xml.h:24
+#: src/glabels-ui.xml.h:26
 msgid "Copy the selection"
 msgstr "úÁÐÏÍÎÉÔØ ×ÙÄÅÌÅÎÎÏÅ"
 
-#: src/glabels-ui.xml.h:25
+#: src/glabels-ui.xml.h:27
 msgid "Create a new document"
 msgstr "óÏÚÄÁÔØ ÎÏ×ÙÊ ÄÏËÕÍÅÎÔ"
 
-#: src/glabels-ui.xml.h:26
+#: src/glabels-ui.xml.h:28
 msgid "Create barcode object"
 msgstr "òÁÚÍÅÓÔÉÔØ ÛÔÒÉÈ-ËÏÄ"
 
-#: src/glabels-ui.xml.h:27
+#: src/glabels-ui.xml.h:29
 msgid "Create box/rectangle object"
 msgstr "òÁÚÍÅÓÔÉÔØ ÐÒÑÍÏÕÇÏÌØÎÉË"
 
-#: src/glabels-ui.xml.h:28
+#: src/glabels-ui.xml.h:30
 msgid "Create ellipse/circle object"
 msgstr "òÁÚÍÅÓÔÉÔØ ÜÌÌÉÐÓ/ËÒÕÇ"
 
-#: src/glabels-ui.xml.h:29
+#: src/glabels-ui.xml.h:31
 msgid "Create image object"
 msgstr "òÁÚÍÅÓÔÉÔØ ÒÁÓÔÒÏ×ÏÅ ÉÚÏÂÒÁÖÅÎÉÅ"
 
-#: src/glabels-ui.xml.h:30
+#: src/glabels-ui.xml.h:32
 msgid "Create line object"
 msgstr "òÁÚÍÅÓÔÉÔØ ÌÉÎÉÀ"
 
-#: src/glabels-ui.xml.h:31
+#: src/glabels-ui.xml.h:33
 msgid "Create text object"
 msgstr "òÁÚÍÅÓÔÉÔØ ÔÅËÓÔ"
 
-#: src/glabels-ui.xml.h:32
+#: src/glabels-ui.xml.h:34
 msgid "Cu_t"
 msgstr "_÷ÙÒÅÚÁÔØ"
 
-#: src/glabels-ui.xml.h:33
+#: src/glabels-ui.xml.h:35
 msgid "Customize"
 msgstr "îÁÓÔÒÏÉÔØ"
 
-#: src/glabels-ui.xml.h:34
+#: src/glabels-ui.xml.h:36
 #, fuzzy
 msgid "Customize Drawing Toolbar"
 msgstr "_îÁÓÔÒÏÉÔØ ÐÁÎÅÌØ ÒÉÓÏ×ÁÎÉÑ"
 
-#: src/glabels-ui.xml.h:35
+#: src/glabels-ui.xml.h:37
 #, fuzzy
 msgid "Customize Main Toolbar"
 msgstr "_îÁÓÔÒÏÉÔØ ÐÁÎÅÌØ ÉÎÓÔÒÕÍÅÎÔÏ×"
 
-#: src/glabels-ui.xml.h:36
+#: src/glabels-ui.xml.h:38
 msgid "Customize toolbars"
 msgstr "îÁÓÔÒÏÉÔØ ÐÁÎÅÌØ ÉÎÓÔÒÕÍÅÎÔÏ×"
 
-#: src/glabels-ui.xml.h:37
+#: src/glabels-ui.xml.h:39
 msgid "Cut"
 msgstr "÷ÙÒÅÚÁÔØ"
 
-#: src/glabels-ui.xml.h:38
+#: src/glabels-ui.xml.h:40
 msgid "Cut the selection"
 msgstr "÷ÙÒÅÚÁÔØ ×ÙÄÅÌÅÎÎÏÅ"
 
-#: src/glabels-ui.xml.h:39
+#: src/glabels-ui.xml.h:41
 msgid "Decrease magnification"
 msgstr "õÍÅÎØÛÉÔØ"
 
-#: src/glabels-ui.xml.h:40
+#: src/glabels-ui.xml.h:42
 msgid "Delete"
 msgstr "õÄÁÌÉÔØ"
 
-#: src/glabels-ui.xml.h:41
+#: src/glabels-ui.xml.h:43
 msgid "Delete the selected objects"
 msgstr "õÄÁÌÉÔØ ×ÙÂÒÁÎÎÙÅ ÏÂßÅËÔÙ"
 
-#: src/glabels-ui.xml.h:42
+#: src/glabels-ui.xml.h:44
 msgid "Drawing toolbar"
 msgstr "ðÁÎÅÌØ ÒÉÓÏ×ÁÎÉÑ"
 
-#: src/glabels-ui.xml.h:43
+#: src/glabels-ui.xml.h:45
 msgid "Dump XML"
 msgstr "äÁÍÐ XML"
 
-#: src/glabels-ui.xml.h:44
+#: src/glabels-ui.xml.h:46
 msgid "Dump the UI Xml description"
 msgstr "äÁÍÐ XML-ÏÐÉÓÁÎÉÑ UI"
 
-#: src/glabels-ui.xml.h:45
+#: src/glabels-ui.xml.h:47
 msgid "Edit merge properties"
 msgstr "éÚÍÅÎÉÔØ Ó×ÏÊÓÔ×Á ÏÂßÅÄÉÎÅÎÉÑ"
 
-#: src/glabels-ui.xml.h:46
+#: src/glabels-ui.xml.h:48
 msgid "Edit object properties"
 msgstr "éÚÍÅÎÉÔØ Ó×ÏÊÓÔ×Á ÏÂßÅËÔÁ"
 
-#: src/glabels-ui.xml.h:47 src/stock.c:74
+#: src/glabels-ui.xml.h:49 src/stock.c:84
+msgid "Fill color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:50 src/stock.c:74
 msgid "Flip _Horizontally"
 msgstr ""
 
-#: src/glabels-ui.xml.h:48 src/stock.c:75
+#: src/glabels-ui.xml.h:51 src/stock.c:75
 msgid "Flip _Vertically"
 msgstr ""
 
-#: src/glabels-ui.xml.h:49
+#: src/glabels-ui.xml.h:52
 msgid "Flip object horizontally"
 msgstr ""
 
-#: src/glabels-ui.xml.h:50
+#: src/glabels-ui.xml.h:53
 msgid "Flip object vertically"
 msgstr ""
 
-#: src/glabels-ui.xml.h:51
+#: src/glabels-ui.xml.h:54
+msgid "Font name"
+msgstr ""
+
+#: src/glabels-ui.xml.h:55
+#, fuzzy
+msgid "Font selector"
+msgstr "úÁÐÏÍÎÉÔØ ×ÙÄÅÌÅÎÎÏÅ"
+
+#: src/glabels-ui.xml.h:56
+msgid "Font size"
+msgstr ""
+
+#: src/glabels-ui.xml.h:57
 msgid "Icon and _Text"
 msgstr "ðÉËÔÏÇÒÁÍÍÁ É _ôÅËÓÔ"
 
-#: src/glabels-ui.xml.h:52
+#: src/glabels-ui.xml.h:58
 msgid "Increase magnification"
 msgstr "õ×ÅÌÉÞÉÔØ"
 
-#: src/glabels-ui.xml.h:53 src/stock.c:82 src/stock.c:83
+#: src/glabels-ui.xml.h:59
+msgid "Italic"
+msgstr ""
+
+#: src/glabels-ui.xml.h:60 src/stock.c:82 src/stock.c:83
 msgid "Label Ce_nter"
 msgstr ""
 
-#: src/glabels-ui.xml.h:54
+#: src/glabels-ui.xml.h:61
+msgid "Left align"
+msgstr ""
+
+#: src/glabels-ui.xml.h:62 src/stock.c:85
+msgid "Line color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:63
+msgid "Line width"
+msgstr ""
+
+#: src/glabels-ui.xml.h:64
 msgid "Lower object to bottom"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ ÏÂßÅËÔ ÎÁ ÚÁÄÎÉÊ ÐÌÁÎ"
 
-#: src/glabels-ui.xml.h:55
+#: src/glabels-ui.xml.h:65
 msgid "M_arkup"
 msgstr ""
 
-#: src/glabels-ui.xml.h:56
+#: src/glabels-ui.xml.h:66
 msgid "Main toolbar"
 msgstr "ðÏËÁÚÙ×ÁÔØ ÐÁÎÅÌØ ÉÎÓÔÒÕÍÅÎÔÏ×"
 
-#: src/glabels-ui.xml.h:57
+#: src/glabels-ui.xml.h:67
 msgid "Markup"
 msgstr ""
 
-#: src/glabels-ui.xml.h:58
+#: src/glabels-ui.xml.h:68
 msgid "New"
 msgstr "óÏÚÄÁÔØ"
 
-#: src/glabels-ui.xml.h:59
+#: src/glabels-ui.xml.h:69
 #, fuzzy
 msgid "Object _Properties..."
 msgstr "ó×ÏÊÓÔ×Á ÏÂßÅËÔÁ..."
 
-#: src/glabels-ui.xml.h:60
+#: src/glabels-ui.xml.h:70
 msgid "Only show icons in the drawing toolbar"
 msgstr "ðÏËÁÚÙ×ÁÔØ ÔÏÌØËÏ ËÁÒÔÉÎËÉ × ÐÁÎÅÌÉ ÉÎÓÔÒÕÍÅÎÔÏ× ÄÌÑ ÒÉÓÏ×ÁÎÉÑ"
 
-#: src/glabels-ui.xml.h:61
+#: src/glabels-ui.xml.h:71
 msgid "Only show icons in the main toolbar"
 msgstr "ðÏËÁÚÙ×ÁÔØ ÔÏÌØËÏ ËÁÒÔÉÎËÉ × ÇÌÁ×ÎÏÊ ÐÁÎÅÌÉ ÉÎÓÔÒÕÍÅÎÔÏ×"
 
-#: src/glabels-ui.xml.h:62 src/file.c:246
+#: src/glabels-ui.xml.h:72 src/file.c:421
 msgid "Open"
 msgstr "ïÔËÒÙÔØ"
 
-#: src/glabels-ui.xml.h:63
+#: src/glabels-ui.xml.h:73
 msgid "Open a file"
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ"
 
-#: src/glabels-ui.xml.h:64
+#: src/glabels-ui.xml.h:74
 #, fuzzy
 msgid "Open the glabels manual"
 msgstr "ïÔËÒÙÔØ ÒÕËÏ×ÏÄÓÔ×Ï ÐÏ gedit"
 
-#: src/glabels-ui.xml.h:65
+#: src/glabels-ui.xml.h:75
 msgid "Paste"
 msgstr "÷ÓÔÁ×ÉÔØ"
 
-#: src/glabels-ui.xml.h:66
+#: src/glabels-ui.xml.h:76
 msgid "Paste the clipboard"
 msgstr "÷ÓÔÁ×ÉÔØ ÉÚ ÂÕÆÅÒÁ"
 
-#: src/glabels-ui.xml.h:67
+#: src/glabels-ui.xml.h:77
 msgid "Pr_eferences..."
 msgstr "_îÁÓÔÒÏÉÔØ..."
 
-#: src/glabels-ui.xml.h:68
+#: src/glabels-ui.xml.h:78
 msgid "Preferences"
 msgstr "ðÁÒÁÍÅÔÒÙ"
 
-#: src/glabels-ui.xml.h:69 src/print-dialog.c:104
+#: src/glabels-ui.xml.h:79 src/print-dialog.c:114
 msgid "Print"
 msgstr "îÁÐÅÞÁÔÁÔØ"
 
-#: src/glabels-ui.xml.h:70
+#: src/glabels-ui.xml.h:80
 msgid "Print the current file"
 msgstr "îÁÐÅÞÁÔÁÔØ ÔÅËÕÝÉÊ ÆÁÊÌ"
 
-#: src/glabels-ui.xml.h:71
+#: src/glabels-ui.xml.h:81
+#, fuzzy
+msgid "Proper_ties"
+msgstr "ó×ÏÊÓÔ×Á"
+
+#. ---------------------------
+#. Text Properties section
+#. ---------------------------
+#: src/glabels-ui.xml.h:82 src/view-text.c:330 src/view-barcode.c:305
+msgid "Properties"
+msgstr "ó×ÏÊÓÔ×Á"
+
+#: src/glabels-ui.xml.h:83
+msgid "Property toolbar"
+msgstr ""
+
+#: src/glabels-ui.xml.h:84
 msgid "Quit"
 msgstr "÷ÙÊÔÉ"
 
-#: src/glabels-ui.xml.h:72
+#: src/glabels-ui.xml.h:85
 msgid "Quit the program"
 msgstr "÷ÙÊÔÉ ÉÚ ÐÒÏÇÒÁÍÍÙ"
 
-#: src/glabels-ui.xml.h:73
+#: src/glabels-ui.xml.h:86
 msgid "Raise object to top"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ ÏÂßÅËÔ ÎÁ ÐÅÒÅÄÎÉÊ ÐÌÁÎ"
 
-#: src/glabels-ui.xml.h:74
+#: src/glabels-ui.xml.h:87
 msgid "Recent _Files"
 msgstr "îÅÄÁ×ÎÉÅ _ÆÁÊÌÙ"
 
-#: src/glabels-ui.xml.h:75
+#: src/glabels-ui.xml.h:88
 msgid "Redo"
 msgstr "ðÏ×ÔÏÒÉÔØ"
 
-#: src/glabels-ui.xml.h:76
+#: src/glabels-ui.xml.h:89
 msgid "Redo the undone action"
 msgstr "ðÏ×ÔÏÒÉÔØ ÏÔÍÅΣÎÎÏÅ ÄÅÊÓÔ×ÉÅ"
 
-#: src/glabels-ui.xml.h:77
+#: src/glabels-ui.xml.h:90
 msgid "Remove all selections"
 msgstr "õÄÁÌÉÔØ ×Ó£ ×ÙÄÅÌÅÎÎÏÅ"
 
-#: src/glabels-ui.xml.h:79
+#: src/glabels-ui.xml.h:92
 #, no-c-format
 msgid "Restore scale to 100%"
 msgstr "íÁÓÛÔÁ 1:1"
 
-#: src/glabels-ui.xml.h:80 src/stock.c:72
+#: src/glabels-ui.xml.h:93
+msgid "Right align"
+msgstr ""
+
+#: src/glabels-ui.xml.h:94 src/stock.c:72
 #, fuzzy
 msgid "Rotate _Left"
 msgstr "ðÏ×ÅÒÎÕÔØ"
 
-#: src/glabels-ui.xml.h:81 src/stock.c:73
+#: src/glabels-ui.xml.h:95 src/stock.c:73
 #, fuzzy
 msgid "Rotate _Right"
 msgstr "ðÏ×ÅÒÎÕÔØ"
 
-#: src/glabels-ui.xml.h:82
+#: src/glabels-ui.xml.h:96
 msgid "Rotate object 90 clockwise"
 msgstr ""
 
-#: src/glabels-ui.xml.h:83
+#: src/glabels-ui.xml.h:97
 msgid "Rotate object 90 counter-clockwise"
 msgstr ""
 
-#: src/glabels-ui.xml.h:84
+#: src/glabels-ui.xml.h:98
 msgid "Save"
 msgstr "óÏÈÒÁÎÉÔØ"
 
-#: src/glabels-ui.xml.h:85
+#: src/glabels-ui.xml.h:99
 msgid "Save As"
 msgstr "óÏÈÒÁÎÉÔØ ËÁË"
 
-#: src/glabels-ui.xml.h:86
+#: src/glabels-ui.xml.h:100
 msgid "Save _As..."
 msgstr "óÏÈÒÁÎÉÔØ _ËÁË..."
 
-#: src/glabels-ui.xml.h:87
+#: src/glabels-ui.xml.h:101
 msgid "Save the current file"
 msgstr "óÏÈÒÁÎÉÔØ ÔÅËÕÝÉÊ ÆÁÊÌ"
 
-#: src/glabels-ui.xml.h:88
+#: src/glabels-ui.xml.h:102
 msgid "Save the current file with a different name"
 msgstr "óÏÈÒÁÎÉÔØ ÔÅËÕÝÉÊ ÆÁÊÌ ÐÏÄ ÄÒÕÇÉÍ ÉÍÅÎÅÍ"
 
-#: src/glabels-ui.xml.h:89
+#: src/glabels-ui.xml.h:103
 msgid "Select All"
 msgstr "÷ÙÂÒÁÔØ ×Ó£"
 
-#: src/glabels-ui.xml.h:90
+#: src/glabels-ui.xml.h:104
 msgid "Select _All"
 msgstr "÷ÙÂÒÁÔØ ×Ó_£"
 
-#: src/glabels-ui.xml.h:91
+#: src/glabels-ui.xml.h:105
 msgid "Select all objects"
 msgstr "÷ÙÂÒÁÔØ ×ÓÅ ÏÂßÅËÔÙ"
 
-#: src/glabels-ui.xml.h:92
+#: src/glabels-ui.xml.h:106
 msgid "Select, move and modify objects"
 msgstr "÷ÙÂÒÁÔØ, ÐÅÒÅÍÅÓÔÉÔØ ÉÌÉ ÉÚÍÅÎÉÔØ ÏÂßÅËÔÙ"
 
-#: src/glabels-ui.xml.h:93 src/stock.c:71
+#: src/glabels-ui.xml.h:107 src/stock.c:71
 #, fuzzy
 msgid "Send to _Back"
 msgstr "îÁ ÚÁÄÎÉÊ ÐÌÁÎ"
 
-#: src/glabels-ui.xml.h:94
+#: src/glabels-ui.xml.h:108
 msgid "Set drawing toolbar button style according to desktop default"
 msgstr ""
 "õÓÔÁÎÏ×ÉÔØ ÓÔÉÌØ ËÎÏÐÏË ÐÁÎÅÌÉ ÒÉÓÏ×ÁÎÉÑ ÓÏÇÌÁÓÎÏ ÎÁÓÔÒÏÊËÁÍ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ"
 
-#: src/glabels-ui.xml.h:95
+#: src/glabels-ui.xml.h:109
 msgid "Set main toolbar button style according to desktop default"
 msgstr ""
 "õÓÔÁÎÏ×ÉÔØ ÓÔÉÌØ ËÎÏÐÏË ÇÌÁ×ÎÏÊ ÐÁÎÅÌÉ ÉÎÓÔÒÕÍÅÎÔÏ× ÓÏÇÌÁÓÎÏ ÎÁÓÔÒÏÊËÁÍ "
 "ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ"
 
-#: src/glabels-ui.xml.h:96
+#: src/glabels-ui.xml.h:110
 msgid "Show _Tooltips"
 msgstr "ðÏËÁÚÙ×ÁÔØ _ÐÏÄÓËÁÚËÉ"
 
-#: src/glabels-ui.xml.h:97
+#: src/glabels-ui.xml.h:111
+#, fuzzy
+msgid "Show both icons and texts in the drawing toolbar"
+msgstr "ðÏËÁÚÙ×ÁÔØ ÐÏÄÓËÁÚËÉ × ÐÁÎÅÌÉ ÒÉÓÏ×ÁÎÉÑ"
+
+#: src/glabels-ui.xml.h:112
+#, fuzzy
+msgid "Show both icons and texts in the main toolbar"
+msgstr "ðÏËÁÚÙ×ÁÔØ ÐÏÄÓËÁÚËÉ × ÇÌÁ×ÎÏÊ ÐÁÎÅÌÉ ÉÎÓÔÒÕÍÅÎÔÏ×"
+
+#: src/glabels-ui.xml.h:113
 msgid "Show tooltips in the drawing toolbar"
 msgstr "ðÏËÁÚÙ×ÁÔØ ÐÏÄÓËÁÚËÉ × ÐÁÎÅÌÉ ÒÉÓÏ×ÁÎÉÑ"
 
-#: src/glabels-ui.xml.h:98
+#: src/glabels-ui.xml.h:114
 msgid "Show tooltips in the main toolbar"
 msgstr "ðÏËÁÚÙ×ÁÔØ ÐÏÄÓËÁÚËÉ × ÇÌÁ×ÎÏÊ ÐÁÎÅÌÉ ÉÎÓÔÒÕÍÅÎÔÏ×"
 
-#: src/glabels-ui.xml.h:99
+#: src/glabels-ui.xml.h:115
+msgid "Text color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:116
 msgid "U_n-select All"
 msgstr "_óÎÑÔØ ×ÙÄÅÌÅÎÉÅ ÓÏ ×ÓÅÇÏ"
 
-#: src/glabels-ui.xml.h:100
+#: src/glabels-ui.xml.h:117
 msgid "Un-select All"
 msgstr "_óÎÑÔØ ×ÙÄÅÌÅÎÉÅ ÓÏ ×ÓÅÇÏ"
 
-#: src/glabels-ui.xml.h:101
+#: src/glabels-ui.xml.h:118
 msgid "Undo"
 msgstr "ïÔÍÅÎÉÔØ"
 
-#: src/glabels-ui.xml.h:102
+#: src/glabels-ui.xml.h:119
 msgid "Undo the last action"
 msgstr "ïÔÍÅÎÉÔØ ÐÏÓÌÅÄÎÅÅ ÄÅÊÓÔ×ÉÅ"
 
-#: src/glabels-ui.xml.h:103
+#: src/glabels-ui.xml.h:120
 #, fuzzy
 msgid "Zoom _1:1"
 msgstr "íÁÓÛÔÁ 1:1"
 
-#: src/glabels-ui.xml.h:104
+#: src/glabels-ui.xml.h:121
 #, fuzzy
 msgid "Zoom _In"
 msgstr "õ×ÅÌÉÞÉÔØ"
 
-#: src/glabels-ui.xml.h:105
+#: src/glabels-ui.xml.h:122
 #, fuzzy
 msgid "Zoom _Out"
 msgstr "õÍÅÎØÛÉÔØ"
 
-#: src/glabels-ui.xml.h:106
+#: src/glabels-ui.xml.h:123
 msgid "_About..."
 msgstr "_ï ÐÒÏÇÒÁÍÍÅ..."
 
-#: src/glabels-ui.xml.h:107
+#: src/glabels-ui.xml.h:124
 msgid "_Bottoms"
 msgstr ""
 
-#: src/glabels-ui.xml.h:108 src/stock.c:64
+#: src/glabels-ui.xml.h:125 src/stock.c:64
 #, fuzzy
 msgid "_Box"
 msgstr "ðÒÑÍÏÕÇÏÌØÎÉË"
 
-#: src/glabels-ui.xml.h:109 src/stock.c:78
+#: src/glabels-ui.xml.h:126 src/stock.c:78
 #, fuzzy
 msgid "_Centers"
 msgstr "_óÏÄÅÒÖÁÎÉÅ ÓÐÒÁ×ËÉ"
 
-#: src/glabels-ui.xml.h:110
+#: src/glabels-ui.xml.h:127
 msgid "_Close"
 msgstr "_úÁËÒÙÔØ"
 
-#: src/glabels-ui.xml.h:111
+#: src/glabels-ui.xml.h:128
 msgid "_Contents"
 msgstr "_óÏÄÅÒÖÁÎÉÅ ÓÐÒÁ×ËÉ"
 
-#: src/glabels-ui.xml.h:112
+#: src/glabels-ui.xml.h:129
 msgid "_Copy"
 msgstr "_úÁÐÏÍÎÉÔØ"
 
-#: src/glabels-ui.xml.h:113
+#: src/glabels-ui.xml.h:130
 #, fuzzy
 msgid "_Create Object"
 msgstr "òÁÚÍÅÓÔÉÔØ ÌÉÎÉÀ"
 
-#: src/glabels-ui.xml.h:114
+#: src/glabels-ui.xml.h:131
 msgid "_Debug"
 msgstr "_ïÔÌÁÄËÁ"
 
-#: src/glabels-ui.xml.h:115 src/view.c:3078
+#: src/glabels-ui.xml.h:132 src/view.c:3526
 msgid "_Delete"
 msgstr "õ_ÄÁÌÉÔØ"
 
-#: src/glabels-ui.xml.h:116
+#: src/glabels-ui.xml.h:133
 msgid "_Desktop Default"
 msgstr "_óÏÇÌÁÓÎÏ ÎÁÓÔÒÏÊËÁÍ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ"
 
-#: src/glabels-ui.xml.h:117
+#: src/glabels-ui.xml.h:134
 msgid "_Drawing Toolbar"
 msgstr "ðÏËÁÚÙ×ÁÔØ ÐÁÎÅÌØ _ÒÉÓÏ×ÁÎÉÑ"
 
-#: src/glabels-ui.xml.h:118
+#: src/glabels-ui.xml.h:135
 msgid "_Edit"
 msgstr "_ðÒÁ×ËÁ"
 
-#: src/glabels-ui.xml.h:119 src/stock.c:65
+#: src/glabels-ui.xml.h:136 src/stock.c:65
 #, fuzzy
 msgid "_Ellipse"
 msgstr "üÌÌÉÐÓ"
 
-#: src/glabels-ui.xml.h:120
+#: src/glabels-ui.xml.h:137
 msgid "_File"
 msgstr "_æÁÊÌ"
 
-#: src/glabels-ui.xml.h:121
+#: src/glabels-ui.xml.h:138
 msgid "_Grid"
 msgstr ""
 
-#: src/glabels-ui.xml.h:122
+#: src/glabels-ui.xml.h:139
 msgid "_Help"
 msgstr "_óÐÒÁ×ËÁ"
 
-#: src/glabels-ui.xml.h:123
+#: src/glabels-ui.xml.h:140
 msgid "_Icon"
 msgstr "_ðÉËÔÏÇÒÁÍÍÁ"
 
-#: src/glabels-ui.xml.h:124 src/stock.c:66
+#: src/glabels-ui.xml.h:141 src/stock.c:66
 #, fuzzy
 msgid "_Image"
 msgstr "éÚÏÂÒÁÖÅÎÉÅ"
 
-#: src/glabels-ui.xml.h:125 src/stock.c:76
+#: src/glabels-ui.xml.h:142 src/stock.c:76
 msgid "_Lefts"
 msgstr ""
 
-#: src/glabels-ui.xml.h:126 src/stock.c:63
+#: src/glabels-ui.xml.h:143 src/stock.c:63
 #, fuzzy
 msgid "_Line"
 msgstr "ìÉÎÉÑ"
 
-#: src/glabels-ui.xml.h:127
+#: src/glabels-ui.xml.h:144
 msgid "_Main Toolbar"
 msgstr "ðÏËÁÚÙ×ÁÔØ ÐÁÎÅÌØ _ÉÎÓÔÒÕÍÅÎÔÏ×"
 
-#: src/glabels-ui.xml.h:128
+#: src/glabels-ui.xml.h:145
 #, fuzzy
 msgid "_Merge Properties..."
 msgstr "ó×ÏÊÓÔ×Á ÏÂßÅÄÉÎÅÎÉÑ..."
 
-#: src/glabels-ui.xml.h:129
+#: src/glabels-ui.xml.h:146
 msgid "_New"
 msgstr "_óÏÚÄÁÔØ"
 
-#: src/glabels-ui.xml.h:130
+#: src/glabels-ui.xml.h:147
 msgid "_Objects"
 msgstr "_ïÂßÅËÔÙ"
 
-#: src/glabels-ui.xml.h:131
+#: src/glabels-ui.xml.h:148
 msgid "_Open..."
 msgstr "_ïÔËÒÙÔØ..."
 
 #.
 #. * Submenu: Order
 #.
-#: src/glabels-ui.xml.h:132 src/view.c:2924
+#: src/glabels-ui.xml.h:149 src/view.c:3372
 msgid "_Order"
 msgstr ""
 
-#: src/glabels-ui.xml.h:133
+#: src/glabels-ui.xml.h:150
 msgid "_Paste"
 msgstr "÷ÓÔ_Á×ÉÔØ"
 
-#: src/glabels-ui.xml.h:134
+#: src/glabels-ui.xml.h:151
 msgid "_Print..."
 msgstr "_îÁÐÅÞÁÔÁÔØ..."
 
-#: src/glabels-ui.xml.h:135
+#: src/glabels-ui.xml.h:152
 msgid "_Quit"
 msgstr "÷_ÙÊÔÉ"
 
-#: src/glabels-ui.xml.h:136 src/stock.c:77
+#: src/glabels-ui.xml.h:153 src/stock.c:77
 msgid "_Rights"
 msgstr ""
 
 #.
 #. * Submenu: Rotate/Flip
 #.
-#: src/glabels-ui.xml.h:137 src/view.c:2945
+#: src/glabels-ui.xml.h:154 src/view.c:3393
 #, fuzzy
 msgid "_Rotate/Flip"
 msgstr "ðÏ×ÅÒÎÕÔØ"
 
-#: src/glabels-ui.xml.h:138
+#: src/glabels-ui.xml.h:155
 msgid "_Save"
 msgstr "_óÏÈÒÁÎÉÔØ"
 
-#: src/glabels-ui.xml.h:139 src/stock.c:61
+#: src/glabels-ui.xml.h:156 src/stock.c:61
 #, fuzzy
 msgid "_Select Mode"
 msgstr "òÅÖÉÍ ×ÙÂÏÒÁ"
 
-#: src/glabels-ui.xml.h:140 src/stock.c:62
+#: src/glabels-ui.xml.h:157 src/stock.c:62
 #, fuzzy
 msgid "_Text"
 msgstr "ôÅËÓÔ"
 
-#: src/glabels-ui.xml.h:141 src/stock.c:79
+#: src/glabels-ui.xml.h:158 src/stock.c:79
 msgid "_Tops"
 msgstr ""
 
-#: src/glabels-ui.xml.h:142
+#: src/glabels-ui.xml.h:159
 msgid "_View"
 msgstr "_÷ÉÄ"
 
@@ -678,27 +753,32 @@ msgid "Show ui debugging messages."
 msgstr "ïÔÏÂÒÁÖÁÔØ ÏÔÌÁÄÏÞÎÙÅ ÓÏÏÂÝÅÎÉÑ ÉÎÔÅÒÆÅÊÓÁ Ó ÐÏÌØÚÏ×ÁÔÅÌÅÍ."
 
 #: src/glabels.c:97
+#, fuzzy
+msgid "Show property_bar debugging messages."
+msgstr "ïÔÏÂÒÁÖÁÔØ ÏÔÌÁÄÏÞÎÙÅ ÓÏÏÂÝÅÎÉÑ ÎÁÓÔÒÏÅË."
+
+#: src/glabels.c:100
 msgid "Show media select widget debugging messages."
 msgstr "ïÔÏÂÒÁÖÁÔØ ÏÔÌÁÄÏÞÎÙÅ ÓÏÏÂÝÅÎÉÑ ×ÙÂÏÒÁ ÎÏÓÉÔÅÌÑ."
 
-#: src/glabels.c:100
+#: src/glabels.c:103
 msgid "Show mini preview widget debugging messages."
 msgstr "ïÔÏÂÒÁÖÁÔØ ÏÔÌÁÄÏÞÎÙÅ ÓÏÏÂÝÅÎÉÑ ÍÉÎÉ-ÐÒÏÓÍÏÔÒÁ."
 
-#: src/glabels.c:103
+#: src/glabels.c:106
 #, fuzzy
 msgid "Show pixbuf cache debugging messages."
 msgstr "ïÔÏÂÒÁÖÁÔØ ÏÔÌÁÄÏÞÎÙÅ ÓÏÏÂÝÅÎÉÑ ÐÒÏÓÍÏÔÒÁ."
 
-#: src/glabels.c:106
+#: src/glabels.c:109
 msgid "Show widget debugging messages."
 msgstr "ïÔÏÂÒÁÖÁÔØ ÏÔÌÁÄÏÞÎÙÅ ÓÏÏÂÝÅÎÉÑ ×ÉÄÖÅÔÏ×."
 
-#: src/glabels.c:109
+#: src/glabels.c:112
 msgid "Turn on all debugging messages."
 msgstr "÷ËÌÀÞÉÔØ ×ÓÅ ÏÔÌÁÄÏÞÎÙÅ ÓÏÏÂÝÅÎÉÑ."
 
-#: src/glabels.c:180
+#: src/glabels.c:184
 msgid "Could not initialize Bonobo!\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ Bonobo!\n"
 
@@ -734,33 +814,33 @@ msgstr "
 msgid "copies"
 msgstr "ËÏÐÉÊ"
 
-#: src/glabels-batch.c:58 src/print-dialog.c:200
+#: src/glabels-batch.c:58 src/print-dialog.c:210
 msgid "print outlines (to test printer alignment)"
 msgstr "ÎÁÐÅÞÁÔÁÔØ ËÏÎÔÕÒÙ ÜÔÉËÅÔÏË"
 
-#: src/glabels-batch.c:60 src/print-dialog.c:209
+#: src/glabels-batch.c:60 src/print-dialog.c:219
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "ÎÁÐÅÞÁÔÁÔØ ÚÅÒËÁÌØÎÏ"
 
-#: src/glabels-batch.c:95
+#: src/glabels-batch.c:96
 msgid "[OPTION...] GLABELS_FILE..."
 msgstr "[ðáòáíåôòù...] ÆÁÊÌ_glabels"
 
-#: src/glabels-batch.c:114
+#: src/glabels-batch.c:116
 msgid "missing glabels file\n"
 msgstr "ÎÅ ÕËÁÚÁÎ ÆÁÊÌ glabels\n"
 
-#: src/glabels-batch.c:141
+#: src/glabels-batch.c:157
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s\n"
 
-#: src/window.c:234
+#: src/window.c:242
 #, fuzzy
 msgid "(none) - gLabels"
 msgstr "(ÎÉÞÅÇÏ) - glabels"
 
-#: src/window.c:399
+#: src/window.c:409
 msgid "(modified)"
 msgstr "(ÉÚÍÅÎÅÎÏ)"
 
@@ -783,7 +863,21 @@ msgstr ""
 msgid "Centers"
 msgstr "óÏÄÅÒÖÁÎÉÅ ÓÐÒÁ×ËÉ"
 
-#: src/commands.c:337
+#: src/ui-property-bar.c:346 src/wdgt-text-props.c:241 src/wdgt-bc-props.c:174
+#, fuzzy
+msgid "Default"
+msgstr "õÄÁÌÉÔØ"
+
+#: src/ui-property-bar.c:361 src/wdgt-fill.c:175
+msgid "No fill"
+msgstr ""
+
+#: src/ui-property-bar.c:376 src/wdgt-line.c:201
+#, fuzzy
+msgid "No line"
+msgstr "îÉÞÅÇÏ"
+
+#: src/commands.c:352
 msgid ""
 "A label and business card creation program for GNOME.\n"
 " \n"
@@ -810,97 +904,107 @@ msgstr ""
 "ëïîëòåôîùè ãåìñè. äÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ÏÚÎÁËÏÍØÔÅÓØ ÓÏ "
 "óÔÁÎÄÁÒÔÎÏÊ ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÅÊ GNU.\n"
 
-#: src/commands.c:351
+#: src/commands.c:366
 msgid "See the file AUTHORS for additional credits,"
 msgstr "óÍÏÔÒÉÔÅ × ÆÁÊÌ AUTHORS ÄÌÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ,"
 
-#: src/commands.c:352
-msgid "or visit http://snaught.com/glabels"
+#: src/commands.c:367
+#, fuzzy
+msgid "or visit http://glabels.sourceforge.net/"
 msgstr "ÉÌÉ ÐÏÓÅÔÉÔÅ ÓÁÊÔ http://snaught.com/glabels"
 
 #: src/commands.c:376
-msgid "glabels"
+msgid " "
+msgstr ""
+
+#: src/commands.c:391
+msgid "glabels"
 msgstr "glabels"
 
-#: src/file.c:82
+#: src/file.c:91
 msgid "New Label or Card"
 msgstr "îÏ×ÁÑ ÜÔÉËÅÔËÁ ÉÌÉ ×ÉÚÉÔËÁ"
 
-#: src/file.c:112
+#: src/file.c:121 src/file.c:291
 msgid "Media Type"
 msgstr "ôÉÐ ÎÏÓÉÔÅÌÑ"
 
-#: src/file.c:118
+#: src/file.c:127 src/file.c:297
 msgid "Label orientation"
 msgstr "òÁÓÐÏÌÏÖÅÎÉÅ ÜÔÉËÅÔËÉ"
 
-#: src/file.c:248
+#: src/file.c:258
+#, fuzzy
+msgid "Label properties"
+msgstr "ó×ÏÊÓÔ×Á ÏÂßÅËÔÁ..."
+
+#: src/file.c:423
 msgid "Open label"
 msgstr "ïÔËÒÙÔØ ÜÔÉËÅÔËÕ"
 
-#: src/file.c:296 src/file.c:594
+#: src/file.c:475 src/file.c:784
 msgid "Empty file name selection"
 msgstr "ðÕÓÔÏÊ ×ÙÂÏÒ ÆÁÊÌÁ"
 
-#: src/file.c:297 src/file.c:311
+#: src/file.c:476 src/file.c:490
 msgid "Please select a file or supply a valid file name"
 msgstr "÷ÙÂÅÒÉÔÅ ÆÁÊÌ ÉÌÉ ××ÅÄÉÔÅ ËÏÒÒÅËÔÎÏÅ ÎÁÚ×ÁÎÉÅ ÆÁÊÌÁ"
 
-#: src/file.c:310
+#: src/file.c:489
 msgid "File does not exist"
 msgstr "æÁÊÌ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: src/file.c:372
+#: src/file.c:564
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ  \"%s\""
 
-#: src/file.c:380
+#: src/file.c:572
 msgid "Not a supported file format"
 msgstr "æÁÊÌ ÎÅÐÏÄÄÅÒÖÉ×ÁÅÍÏÇÏ ÆÏÒÍÁÔÁ"
 
-#: src/file.c:462 src/file.c:636
+#: src/file.c:653 src/file.c:828
 #, c-format
 msgid "Could not save file \"%s\""
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÈÒÁÎÉÔØ ÆÁÊÌ \"%s\""
 
-#: src/file.c:470 src/file.c:644
+#: src/file.c:661 src/file.c:836
 msgid "Error encountered during save.  The file is still not saved."
 msgstr "ðÒÏÉÚÏÛÌÁ ÏÛÉÂËÁ ÐÒÉ ÓÏÈÒÁÎÅÎÉÉ ÆÁÊÌÁ.  æÁÊÌ ×Ó£ ÅÝ£ ÎÅ ÓÏÈÒÁΣÎ."
 
-#: src/file.c:512
+#: src/file.c:702
 #, fuzzy, c-format
 msgid "Save \"%s\" as"
 msgstr "óÏÈÒÁÎÉÔØ ÜÔÉËÅÔËÕ ËÁË"
 
-#: src/file.c:595
+#: src/file.c:785
 msgid "Please supply a valid file name"
 msgstr "õËÁÖÉÔÅ ËÏÒÒÅËÔÎÏÅ ÎÁÚ×ÁÎÉÅ ÆÁÊÌÁ"
 
-#: src/file.c:609
+#: src/file.c:801
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr "ðÅÒÅÚÁÐÉÓÁÔØ ÆÁÊÌÁ \"%s\"?"
 
-#: src/file.c:617
+#: src/file.c:809
 msgid "File already exists."
 msgstr "æÁÊÌ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ."
 
-#: src/file.c:732
+#: src/file.c:924
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr "óÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ × ÄÏËÕÍÅÎÔÅ \"%s\" ÐÅÒÅÄ ÚÁËÒÙÔÉÅÍ?"
 
-#: src/file.c:740
+#: src/file.c:932
 msgid "Your changes will be lost if you don't save them."
 msgstr "÷ÓÅ ÉÚÍÅÎÅÎÉÑ ÂÕÄÕÔ ÐÏÔÅÒÑÎÙ, ÅÓÌÉ ×Ù ÉÈ ÎÅ ÓÏÈÒÁÎÉÔÅ."
 
-#: src/file.c:743
+#: src/file.c:935
 msgid "Close without saving"
 msgstr "úÁËÒÙÔØ ÂÅÚ ÓÏÈÒÁÎÅÎÉÑ"
 
 #. Should not happen
-#: src/prefs.c:664 src/prefs.c:671 src/wdgt-line.c:180
+#: src/prefs.c:664 src/prefs.c:671 src/wdgt-line.c:185
 msgid "points"
 msgstr "ÔÏÞÅË"
 
@@ -951,11 +1055,11 @@ msgstr "
 msgid "Default page size"
 msgstr "òÁÚÍÅÒ ÂÕÍÁÇÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: src/prefs-dialog.c:309
+#: src/prefs-dialog.c:309 data/paper-sizes.xml.h:25
 msgid "US Letter"
 msgstr ""
 
-#: src/prefs-dialog.c:317
+#: src/prefs-dialog.c:317 data/paper-sizes.xml.h:6
 msgid "A4"
 msgstr ""
 
@@ -964,67 +1068,67 @@ msgid "Select default properties for new objects."
 msgstr "õËÁÖÉÔÅ Ó×ÏÊÓÔ×Á ÎÏ×ÙÈ ÏÂßÅËÔÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ."
 
 #. ------ text props entry ------
-#: src/prefs-dialog.c:359 src/view-text.c:314 src/view-text.c:634
+#: src/prefs-dialog.c:359 src/view-text.c:313 src/view-text.c:636
 #: src/wdgt-bc-style.c:184
 msgid "Text"
 msgstr "ôÅËÓÔ"
 
 #. ------ Line box ------
-#: src/prefs-dialog.c:368 src/view-line.c:304
+#: src/prefs-dialog.c:368 src/view-line.c:303
 msgid "Line"
 msgstr "ìÉÎÉÑ"
 
 #. ------ Fill box ------
-#: src/prefs-dialog.c:377 src/view-box.c:323 src/view-ellipse.c:323
+#: src/prefs-dialog.c:377 src/view-box.c:322 src/view-ellipse.c:322
 msgid "Fill"
 msgstr "úÁÐÏÌÎÅÎÉÅ"
 
 #.
 #. * Submenu: Align Horizontally
 #.
-#: src/view.c:2978
+#: src/view.c:3426
 msgid "Align _Horizontally"
 msgstr ""
 
 #.
 #. * Submenu: Align Vertically
 #.
-#: src/view.c:3017
+#: src/view.c:3465
 msgid "Align _Vertically"
 msgstr ""
 
-#: src/view-box.c:291
+#: src/view-box.c:290
 msgid "Edit box object properties"
 msgstr "éÚÍÅÎÉÔØ Ó×ÏÊÓÔ×Á ÏÂßÅËÔÁ ÔÉÐÁ ÐÒÑÍÏÕÇÏÌØÎÉË"
 
 #. ---------------------------
 #. Outline section
 #. ---------------------------
-#: src/view-box.c:307 src/view-ellipse.c:307
+#: src/view-box.c:306 src/view-ellipse.c:306
 msgid "Outline"
 msgstr "ëÏÎÔÕÒ"
 
 #. ---------------------------
 #. Position section
 #. ---------------------------
-#: src/view-box.c:339 src/view-ellipse.c:339 src/view-line.c:320
-#: src/view-image.c:314 src/view-text.c:349 src/view-barcode.c:338
+#: src/view-box.c:338 src/view-ellipse.c:338 src/view-line.c:319
+#: src/view-image.c:314 src/view-text.c:348 src/view-barcode.c:337
 msgid "Position"
 msgstr "òÁÓÐÏÌÏÖÅÎÉÅ"
 
 #. ---------------------------
 #. Size section
 #. ---------------------------
-#: src/view-box.c:354 src/view-ellipse.c:354 src/view-line.c:338
+#: src/view-box.c:353 src/view-ellipse.c:353 src/view-line.c:337
 #: src/view-image.c:331
 msgid "Size"
 msgstr "òÁÚÍÅÒ"
 
-#: src/view-ellipse.c:291
+#: src/view-ellipse.c:290
 msgid "Edit ellipse object properties"
 msgstr "éÓÐÒÁ×ÉÔØ Ó×ÏÊÓÔ×Á ÏÂßÅËÔÁ ÔÉÐÁ ÜÌÌÉÐÓ"
 
-#: src/view-line.c:289
+#: src/view-line.c:288
 msgid "Edit line object properties"
 msgstr "éÚÍÅÎÉÔØ Ó×ÏÊÓÔ×Á ÏÂßÅËÔÁ ÔÉÐÁ ÌÉÎÉÑ"
 
@@ -1044,29 +1148,22 @@ msgstr "
 msgid "Reset image size"
 msgstr "õÓÔÁÎÏ×ÉÔØ ÒÁÚÍÅÒ ÉÚÏÂÒÁÖÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: src/view-text.c:299
+#: src/view-text.c:298
 msgid "Edit text object properties"
 msgstr "éÚÍÅÎÉÔØ Ó×ÏÊÓÔ×Á ÏÂßÅËÔÁ ÔÉÐÁ ÔÅËÓÔ"
 
-#. ---------------------------
-#. Text Properties section
-#. ---------------------------
-#: src/view-text.c:331 src/view-barcode.c:306
-msgid "Properties"
-msgstr "ó×ÏÊÓÔ×Á"
-
-#: src/view-barcode.c:271
+#: src/view-barcode.c:270
 msgid "Edit barcode object properties"
 msgstr "éÚÍÅÎÉÔØ Ó×ÏÊÓÔ×Á ÏÂßÅËÔÁ ÔÉÐÁ ÛÔÒÉÈ-ËÏÄ"
 
 #. ---------------------------
 #. Data section
 #. ---------------------------
-#: src/view-barcode.c:286 src/merge-properties-dialog.c:343
+#: src/view-barcode.c:285 src/merge-properties-dialog.c:343
 msgid "Data"
 msgstr "äÁÎÎÙÅ"
 
-#: src/view-barcode.c:802 src/print.c:912
+#: src/view-barcode.c:803 src/print.c:1021
 msgid "Invalid barcode"
 msgstr "îÅ×ÅÒÎÙÊ ÛÔÒÉÈ-ËÏÄ"
 
@@ -1111,72 +1208,76 @@ msgstr "
 msgid "Record/Field"
 msgstr ""
 
-#: src/print-dialog.c:128
+#: src/print-dialog.c:138
 msgid "_Job"
 msgstr "_úÁÄÁÎÉÅ"
 
-#: src/print-dialog.c:133
+#: src/print-dialog.c:143
 msgid "P_rinter"
 msgstr "ð_ÒÉÎÔÅÒ"
 
 #. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:163
+#: src/print-dialog.c:173
 msgid "Copies"
 msgstr "ëÏÐÉÊ"
 
 #. ------- Otherwise add merge control widget ------------
-#: src/print-dialog.c:177
+#: src/print-dialog.c:187
 msgid "Document merge control"
 msgstr "õÐÒÁ×ÌÅÎÉÅ ÏÂßÅÄÉÎÅÎÉÅÍ"
 
 #. ----------- Add custom print options area ------------
-#: src/print-dialog.c:194
+#: src/print-dialog.c:204
 msgid "Options"
 msgstr "ðÁÒÁÍÅÔÒÙ"
 
-#: src/print-dialog.c:336 src/print-dialog.c:374
+#: src/print-dialog.c:227
+msgid "print crop marks"
+msgstr ""
+
+#: src/print-dialog.c:364 src/print-dialog.c:403
 msgid "Print preview"
 msgstr "ðÒÏÓÍÏÔÒÅÔØ"
 
-#: src/label.c:542
+#: src/label.c:563
 msgid "Untitled"
 msgstr "âÅÚ ÎÁÚ×ÁÎÉÑ"
 
-#: src/template.c:296
+#: src/template.c:318
 #, c-format
 msgid "Generic %s full page"
 msgstr "ïÓÎÏ×ÎÁÑ %s ÐÏÌÎÁÑ ÓÔÒÁÎÉÃÁ"
 
-#: src/template.c:338
+#: src/template.c:362
 msgid "No template files found!"
 msgstr "îÅ ÎÁÊÄÅÎÙ ÆÁÊÌÙ ÛÁÂÌÏÎÁ!"
 
-#: src/template.c:435
+#: src/template.c:461
 #, c-format
 msgid "%s x %s %s"
 msgstr "%s x %s %s"
 
-#: src/template.c:440
+#: src/template.c:466
 #, c-format
 msgid "%.5g x %.5g %s"
 msgstr "%.5g x %.5g %s"
 
-#: src/template.c:451 src/template.c:465
+#: src/template.c:477 src/template.c:491
 #, c-format
 msgid "%s %s diameter"
 msgstr "%s %s ÄÉÁÍÅÔÒ"
 
-#: src/template.c:455 src/template.c:469
+#: src/template.c:481 src/template.c:495
 #, c-format
 msgid "%.5g %s diameter"
 msgstr "%.5g %s ÄÉÁÍÅÔÒ"
 
-#: src/template.c:607
+#: src/template.c:633
 #, c-format
 msgid "%d x %d  (%d per sheet)"
 msgstr "%d x %d (%d ÎÁ ÌÉÓÔ)"
 
-#: src/template.c:611
+#: src/template.c:637
 #, c-format
 msgid "%d per sheet"
 msgstr "%d ÎÁ ÌÉÓÔ"
@@ -1186,53 +1287,69 @@ msgstr "%d 
 msgid "No paper files found!"
 msgstr "îÅ ÎÁÊÄÅÎÙ ÆÁÊÌÙ ÛÁÂÌÏÎÁ!"
 
-#: src/xml-label.c:171 src/xml-label.c:204
+#: src/xml-label.c:177 src/xml-label.c:214
 msgid "xmlParseFile error"
 msgstr "ïÛÉÂËÁ ÐÒÉ ÒÁÚÂÏÒÅ ÆÁÊÌÁ XML"
 
-#: src/xml-label.c:241
+#: src/xml-label.c:251
 msgid "No document root"
 msgstr "îÅÔ ËÏÒÎÑ ÄÏËÕÍÅÎÔÁ"
 
-#: src/xml-label.c:253
+#: src/xml-label.c:263
 msgid "Importing from glabels 0.1 format"
 msgstr "éÍÐÏÒÔÉÒÕÅÍ ÉÚ ÆÁÊÌÁ glabels ×ÅÒÓÉÉ 0.1"
 
-#: src/xml-label.c:261
+#: src/xml-label.c:271
 msgid "Importing from glabels 0.4 format"
 msgstr "éÍÐÏÒÔÉÒÕÅÍ ÉÚ ÆÁÊÌÁ glabels ×ÅÒÓÉÉ 0.4"
 
-#: src/xml-label.c:264
+#: src/xml-label.c:278
+#, fuzzy
+msgid "Importing from glabels 1.91 format"
+msgstr "éÍÐÏÒÔÉÒÕÅÍ ÉÚ ÆÁÊÌÁ glabels ×ÅÒÓÉÉ 0.1"
+
+#: src/xml-label.c:281
 msgid "bad document, unknown glabels Namespace"
 msgstr "ÄÏËÕÍÅÎÔ ÎÅ×ÅÒÎÏÇÏ ÔÉÐÁ, ÎÅÉÚ×ÅÓÔÎÏÅ ÐÒÏÓÔÒÁÎÓÔ×Ï ÉͣΠglabels"
 
-#: src/xml-label.c:292 src/xml-label-04.c:75
+#: src/xml-label.c:310 src/xml-label-04.c:75 src/xml-label-191.c:131
 #, c-format
 msgid "Bad root node = \"%s\""
 msgstr "îÅ×ÅÒÎÙÊ ËÏÒÎÅ×ÏÊ ÕÚÅÌ = \"%s\""
 
-#: src/xml-label.c:325
+#: src/xml-label.c:345 src/xml-label-191.c:164
 #, fuzzy, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "îÅ×ÅÒÎÙÊ ËÏÒÎÅ×ÏÊ ÕÚÅÌ = \"%s\""
 
-#: src/xml-label.c:357 src/xml-label-04.c:123
+#: src/xml-label.c:387 src/xml-label-04.c:123 src/xml-label-191.c:196
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr "ÎÅ×ÅÒÎÙÊ ÕÚÅÌ =  \"%s\""
 
-#: src/xml-label.c:763
+#: src/xml-label.c:783 src/xml-label-191.c:602
 #, fuzzy, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "ÎÅ×ÅÒÎÙÊ ÕÚÅÌ =  \"%s\""
 
-#: src/xml-label.c:831
+#: src/xml-label.c:944
+msgid "Utf8 conversion error."
+msgstr ""
+
+#: src/xml-label.c:951
 msgid "Problem saving xml file."
 msgstr "ðÒÏÂÌÅÍÙ ÐÒÉ ÓÏÈÒÁÎÅÎÉÉ ÆÁÊÌÁ XML"
 
-#: src/xml-template.c:157
+#. This should always be an id, but just in case a name
+#. slips by!
+#: src/xml-label-191.c:680 src/xml-template.c:169
 #, c-format
-msgid "Unknown page size id \"%s\""
+msgid "Unknown page size id \"%s\", trying as name"
+msgstr ""
+
+#: src/xml-label-191.c:690 src/xml-template.c:179
+#, c-format
+msgid "Unknown page size id or name \"%s\""
 msgstr ""
 
 #: src/merge.c:172 src/merge.c:213 src/merge.c:398 src/merge.c:401
@@ -1255,18 +1372,18 @@ msgid "Text file with tab delimeters"
 msgstr "ôÅËÓÔ Ó ÓÉÍ×ÏÌÁÍÉ ÔÁÂÕÌÑÃÉÉ × ËÁÞÅÓÔ×Å ÒÁÚÄÅÌÉÔÅÌÑ"
 
 #. Font label
-#: src/wdgt-text-props.c:181
+#: src/wdgt-text-props.c:185
 msgid "Font:"
 msgstr "ûÒÉÆÔ:"
 
 #. Text Color Label
-#: src/wdgt-text-props.c:230 src/wdgt-line.c:189 src/wdgt-fill.c:164
-#: src/wdgt-bc-props.c:164
+#: src/wdgt-text-props.c:234 src/wdgt-line.c:194 src/wdgt-fill.c:168
+#: src/wdgt-bc-props.c:167
 msgid "Color:"
 msgstr "ã×ÅÔ:"
 
 #. Alignment label
-#: src/wdgt-text-props.c:246
+#: src/wdgt-text-props.c:255
 msgid "Alignment:"
 msgstr "÷ÙÒÁ×ÎÉ×ÁÎÉÅ:"
 
@@ -1296,7 +1413,7 @@ msgid "Y:"
 msgstr "Y:"
 
 #. W Label
-#: src/wdgt-size.c:187 src/wdgt-line.c:166
+#: src/wdgt-size.c:187 src/wdgt-line.c:171
 msgid "Width:"
 msgstr "ûÉÒÉÎÁ:"
 
@@ -1394,10 +1511,536 @@ msgstr "
 msgid "Rotate"
 msgstr "ðÏ×ÅÒÎÕÔØ"
 
-#: src/gnome-recent-view-bonobo.c:189
-#, c-format
-msgid "Open %s"
-msgstr "ïÔËÒÙÔØ %s"
+#. This is the default custom color
+#: src/mygal/color-palette.c:396
+#, fuzzy
+msgid "custom"
+msgstr "îÁÓÔÒÏÉÔØ"
+
+#. "Custom" color - we'll pop up a GnomeColorPicker
+#: src/mygal/color-palette.c:438
+#, fuzzy
+msgid "Custom Color:"
+msgstr "îÁÓÔÒÏÉÔØ ÐÁÎÅÌØ ÉÎÓÔÒÕÍÅÎÔÏ×"
+
+#: src/mygal/color-palette.c:446
+msgid "Choose Custom Color"
+msgstr ""
+
+#: src/mygal/color-palette.c:579
+msgid "black"
+msgstr ""
+
+#: src/mygal/color-palette.c:580
+msgid "light brown"
+msgstr ""
+
+#: src/mygal/color-palette.c:581
+msgid "brown gold"
+msgstr ""
+
+#: src/mygal/color-palette.c:582
+msgid "dark green #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:583
+msgid "navy"
+msgstr ""
+
+#: src/mygal/color-palette.c:584 src/mygal/color-palette.c:640
+msgid "dark blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:585
+msgid "purple #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:586
+msgid "very dark gray"
+msgstr ""
+
+#: src/mygal/color-palette.c:589 src/mygal/color-palette.c:645
+msgid "dark red"
+msgstr ""
+
+#: src/mygal/color-palette.c:590
+msgid "red-orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:591
+msgid "gold"
+msgstr ""
+
+#: src/mygal/color-palette.c:592
+msgid "dark green"
+msgstr ""
+
+#: src/mygal/color-palette.c:593 src/mygal/color-palette.c:646
+msgid "dull blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:594 src/mygal/color-palette.c:647
+msgid "blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:595
+msgid "dull purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:596
+msgid "dark grey"
+msgstr ""
+
+#: src/mygal/color-palette.c:599
+msgid "red"
+msgstr ""
+
+#: src/mygal/color-palette.c:600
+msgid "orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:601
+msgid "lime"
+msgstr ""
+
+#: src/mygal/color-palette.c:602
+msgid "dull green"
+msgstr ""
+
+#: src/mygal/color-palette.c:603
+msgid "dull blue #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:604
+msgid "sky blue #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:605 src/mygal/color-palette.c:644
+msgid "purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:606
+msgid "gray"
+msgstr ""
+
+#: src/mygal/color-palette.c:609 src/mygal/color-palette.c:641
+#, fuzzy
+msgid "magenta"
+msgstr "éÚÏÂÒÁÖÅÎÉÅ"
+
+#: src/mygal/color-palette.c:610
+msgid "bright orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:611 src/mygal/color-palette.c:642
+msgid "yellow"
+msgstr ""
+
+#: src/mygal/color-palette.c:612
+#, fuzzy
+msgid "green"
+msgstr "ÇÒÁÄÕÓÏ×"
+
+#: src/mygal/color-palette.c:613 src/mygal/color-palette.c:643
+msgid "cyan"
+msgstr ""
+
+#: src/mygal/color-palette.c:614
+msgid "bright blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:615 src/mygal/color-palette.c:632
+msgid "red purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:616
+msgid "light grey"
+msgstr ""
+
+#: src/mygal/color-palette.c:619 src/mygal/color-palette.c:636
+msgid "pink"
+msgstr ""
+
+#: src/mygal/color-palette.c:620
+msgid "light orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:621 src/mygal/color-palette.c:633
+msgid "light yellow"
+msgstr ""
+
+#: src/mygal/color-palette.c:622
+msgid "light green"
+msgstr ""
+
+#: src/mygal/color-palette.c:623
+msgid "light cyan"
+msgstr ""
+
+#: src/mygal/color-palette.c:624 src/mygal/color-palette.c:634
+msgid "light blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:625 src/mygal/color-palette.c:638
+msgid "light purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:626
+msgid "white"
+msgstr ""
+
+#: src/mygal/color-palette.c:631
+msgid "purplish blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:635
+msgid "dark purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:637
+msgid "sky blue"
+msgstr ""
+
+#: data/paper-sizes.xml.h:1
+msgid "A0"
+msgstr ""
+
+#: data/paper-sizes.xml.h:2
+msgid "A1"
+msgstr ""
+
+#: data/paper-sizes.xml.h:3
+msgid "A10"
+msgstr ""
+
+#: data/paper-sizes.xml.h:4
+msgid "A2"
+msgstr ""
+
+#: data/paper-sizes.xml.h:5
+msgid "A3"
+msgstr ""
+
+#: data/paper-sizes.xml.h:7
+msgid "A5"
+msgstr ""
+
+#: data/paper-sizes.xml.h:8
+msgid "A6"
+msgstr ""
+
+#: data/paper-sizes.xml.h:9
+msgid "A7"
+msgstr ""
+
+#: data/paper-sizes.xml.h:10
+msgid "A8"
+msgstr ""
+
+#: data/paper-sizes.xml.h:11
+msgid "A9"
+msgstr ""
+
+#: data/paper-sizes.xml.h:12
+msgid "B0"
+msgstr ""
+
+#: data/paper-sizes.xml.h:13
+msgid "B1"
+msgstr ""
+
+#: data/paper-sizes.xml.h:14
+msgid "B10"
+msgstr ""
+
+#: data/paper-sizes.xml.h:15
+msgid "B2"
+msgstr ""
+
+#: data/paper-sizes.xml.h:16
+msgid "B3"
+msgstr ""
+
+#: data/paper-sizes.xml.h:17
+msgid "B4"
+msgstr ""
+
+#: data/paper-sizes.xml.h:18
+msgid "B5"
+msgstr ""
+
+#: data/paper-sizes.xml.h:19
+msgid "B6"
+msgstr ""
+
+#: data/paper-sizes.xml.h:20
+msgid "B7"
+msgstr ""
+
+#: data/paper-sizes.xml.h:21
+msgid "B8"
+msgstr ""
+
+#: data/paper-sizes.xml.h:22
+msgid "B9"
+msgstr ""
+
+#: data/paper-sizes.xml.h:23
+msgid "US Executive"
+msgstr ""
+
+#: data/paper-sizes.xml.h:24
+msgid "US Legal"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:1
+msgid "Address Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:2 data/avery-iso-templates.xml.h:3
+#: data/zweckform-iso-templates.xml.h:2 data/misc-us-templates.xml.h:2
+#: data/misc-iso-templates.xml.h:9
+msgid "Business Cards"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:3
+msgid "CD/DVD Labels (Disc Labels)"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:4
+msgid "Diskette Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:5
+#, fuzzy
+msgid "Filing Labels"
+msgstr "üÔÉËÅÔËÉ"
+
+#: data/avery-us-templates.xml.h:6
+msgid "Full Sheet Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:7
+#, fuzzy
+msgid "Large Round Labels"
+msgstr "îÁÞÁÔØ Ó ÜÔÉËÅÔËÉ"
+
+#: data/avery-us-templates.xml.h:8
+msgid "Name Badge Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:9
+msgid "Return Address Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:10
+msgid "Shipping Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:11
+#, fuzzy
+msgid "Small Round Labels"
+msgstr "îÁÞÁÔØ Ó ÜÔÉËÅÔËÉ"
+
+#: data/avery-us-templates.xml.h:12
+#, fuzzy
+msgid "Square Labels"
+msgstr "üÔÉËÅÔËÉ"
+
+#: data/avery-us-templates.xml.h:13
+msgid "Video Tape Face Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:14
+msgid "Video Tape Spine Labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:1
+msgid "3.5'' Diskette labels (face only)"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:2
+msgid "Address labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:4 data/zweckform-iso-templates.xml.h:4
+#: data/misc-us-templates.xml.h:4 data/misc-iso-templates.xml.h:10
+#, fuzzy
+msgid "CD/DVD Labels"
+msgstr "üÔÉËÅÔËÉ"
+
+#: data/avery-iso-templates.xml.h:5 data/misc-iso-templates.xml.h:16
+msgid "Mailing Labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:6
+#, fuzzy
+msgid "Mailing labels"
+msgstr "glabels"
+
+#: data/avery-iso-templates.xml.h:7
+msgid "Mini Address"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:8
+#, fuzzy
+msgid "Shipping labels"
+msgstr "ïÔËÒÙÔØ ÜÔÉËÅÔËÕ"
+
+#: data/zweckform-iso-templates.xml.h:1
+#, fuzzy
+msgid "Allround Labels"
+msgstr "glabels"
+
+#: data/zweckform-iso-templates.xml.h:3
+#, fuzzy
+msgid "CD Labels"
+msgstr "üÔÉËÅÔËÉ"
+
+#: data/zweckform-iso-templates.xml.h:5
+msgid "Correction and Cover-up Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:6
+msgid "Lever Arch File Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:7
+msgid "Mailing Labels -- 12"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:8
+msgid "QSL-Karten Etiketten 70mm x 50,8mm"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:9
+msgid "Rectangular Copier Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:10 data/misc-iso-templates.xml.h:20
+msgid "Rectangular Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:11
+msgid "Video Labels (back)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:1
+msgid "Business Card CD"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:3
+msgid "CD Template Rectangles"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:5
+msgid "CD/DVD Labels (Face Only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:6 data/misc-iso-templates.xml.h:11
+msgid "CD/DVD Labels (face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:7
+#, fuzzy
+msgid "DLT Labels"
+msgstr "üÔÉËÅÔËÉ"
+
+#: data/misc-us-templates.xml.h:8
+#, fuzzy
+msgid "Microtube labels"
+msgstr "glabels"
+
+#: data/misc-us-templates.xml.h:9
+msgid "Mini-CD Labels"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:10
+msgid "PRO CD Labels 2-up (CD spine only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:11
+msgid "PRO CD Labels 2-up (Face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:12
+msgid "PRO CD Labels 2-up (face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:13
+msgid "Slimline CD Case (rightside up)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:14
+msgid "Slimline CD Case (upside down)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:1
+msgid "Agipa 119488: Business Cards"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:2
+msgid "Allround Labels --24"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:3
+msgid "Allround Labels --44"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:4
+msgid "Allround Labels --64"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:5
+msgid "Allround Labels --65"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:6
+msgid "Arch File Labels"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:7
+msgid "Arch File Labels (large)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:8
+msgid "Arch File Labels (small)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:12
+msgid "CD/DVD Labels Standard Format (face only)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:13
+msgid "Diskette Labels (face only)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:14
+msgid "EPSON Photo Stickers 16"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:15
+msgid "Etiketten"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:17
+msgid "Mailing Labels --14"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:18
+msgid "Mailing Labels-2 columns"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:19
+msgid "Mailing Labels-3 columns"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:21
+msgid "Video Labels (face only)"
+msgstr ""
+
+#~ msgid "Open %s"
+#~ msgstr "ïÔËÒÙÔØ %s"
 
 #~ msgid "About this application"
 #~ msgstr "ï ÜÔÏÊ  ÐÒÏÇÒÁÍÍÅ"
diff --git a/glabels2/po/zh_TW.Big5.po b/glabels2/po/zh_TW.Big5.po
index cfd39d64..814baf30 100644
--- a/glabels2/po/zh_TW.Big5.po
+++ b/glabels2/po/zh_TW.Big5.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # Shell Hung <shell@debian.org>, 2002
 #
-#: src/commands.c:361
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels 0.4.4\n"
-"POT-Creation-Date: 2003-06-22 01:12-0400\n"
+"POT-Creation-Date: 2003-11-01 19:24-0500\n"
 "PO-Revision-Date: 2002-07-14 18:30+0800\n"
 "Last-Translator: Shell Hung <shell@debian.org>\n"
 "Language-Team: zh-l10n <zh-l10n@linux.org.tw>\n"
@@ -59,515 +58,592 @@ msgstr ""
 msgid "Bar_code"
 msgstr "¼Æ½X±ø"
 
-#: src/glabels-ui.xml.h:12 src/stock.c:70
+#: src/glabels-ui.xml.h:12
+msgid "Bold"
+msgstr ""
+
+#: src/glabels-ui.xml.h:13 src/stock.c:70
 #, fuzzy
 msgid "Bring to _Front"
 msgstr "±a¥X¨ì«e­±"
 
-#: src/glabels-ui.xml.h:13
+#: src/glabels-ui.xml.h:14
+#, fuzzy
+msgid "Center align"
+msgstr "¤@¯ë"
+
+#: src/glabels-ui.xml.h:15
 msgid "Center objects to horizontal label center"
 msgstr ""
 
-#: src/glabels-ui.xml.h:14
+#: src/glabels-ui.xml.h:16
 msgid "Center objects to vertical label center"
 msgstr ""
 
-#: src/glabels-ui.xml.h:15
+#: src/glabels-ui.xml.h:17
 msgid "Change the visibility of markup lines in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:16
+#: src/glabels-ui.xml.h:18
 msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:17
+#: src/glabels-ui.xml.h:19
 msgid "Change the visibility of the grid in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:18
+#: src/glabels-ui.xml.h:20
 msgid "Change the visibility of the main toolbar in the current window"
 msgstr ""
 
-#: src/glabels-ui.xml.h:19
+#: src/glabels-ui.xml.h:21
 msgid "Close"
 msgstr ""
 
-#: src/glabels-ui.xml.h:20
+#: src/glabels-ui.xml.h:22
 #, fuzzy
 msgid "Close the current file"
 msgstr "Àx¦s²{¦bÀÉ®×"
 
-#: src/glabels-ui.xml.h:21
+#: src/glabels-ui.xml.h:23
 msgid "Configure the application"
 msgstr ""
 
-#: src/glabels-ui.xml.h:22
+#: src/glabels-ui.xml.h:24
 msgid "Contents"
 msgstr ""
 
-#: src/glabels-ui.xml.h:23
+#: src/glabels-ui.xml.h:25
 msgid "Copy"
 msgstr ""
 
-#: src/glabels-ui.xml.h:24
+#: src/glabels-ui.xml.h:26
 #, fuzzy
 msgid "Copy the selection"
 msgstr "²¾°£©Ò¦³¿ï¾Ü¶µ"
 
-#: src/glabels-ui.xml.h:25
+#: src/glabels-ui.xml.h:27
 #, fuzzy
 msgid "Create a new document"
 msgstr "µe½uª«¥ó"
 
-#: src/glabels-ui.xml.h:26
+#: src/glabels-ui.xml.h:28
 msgid "Create barcode object"
 msgstr "«Ø¥ß¼Æ½X±ø"
 
-#: src/glabels-ui.xml.h:27
+#: src/glabels-ui.xml.h:29
 msgid "Create box/rectangle object"
 msgstr "«Ø¥ß·sªº²°¤l/¤è§Îª«¥ó"
 
-#: src/glabels-ui.xml.h:28
+#: src/glabels-ui.xml.h:30
 msgid "Create ellipse/circle object"
 msgstr "«Ø¥ß¾ò¶ê§Î/¹Ï§Îª«¥ó"
 
-#: src/glabels-ui.xml.h:29
+#: src/glabels-ui.xml.h:31
 msgid "Create image object"
 msgstr "«Ø¥ß¼v¹³ª«¥ó"
 
-#: src/glabels-ui.xml.h:30
+#: src/glabels-ui.xml.h:32
 msgid "Create line object"
 msgstr "µe½uª«¥ó"
 
-#: src/glabels-ui.xml.h:31
+#: src/glabels-ui.xml.h:33
 msgid "Create text object"
 msgstr "«Ø¥ß·sªº¤å¦rª«¥ó"
 
-#: src/glabels-ui.xml.h:32
+#: src/glabels-ui.xml.h:34
 msgid "Cu_t"
 msgstr ""
 
-#: src/glabels-ui.xml.h:33
+#: src/glabels-ui.xml.h:35
 #, fuzzy
 msgid "Customize"
 msgstr "¦Û­qÄæ¦ìÆ_"
 
-#: src/glabels-ui.xml.h:34
+#: src/glabels-ui.xml.h:36
 msgid "Customize Drawing Toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:35
+#: src/glabels-ui.xml.h:37
 msgid "Customize Main Toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:36
+#: src/glabels-ui.xml.h:38
 msgid "Customize toolbars"
 msgstr ""
 
-#: src/glabels-ui.xml.h:37
+#: src/glabels-ui.xml.h:39
 msgid "Cut"
 msgstr ""
 
-#: src/glabels-ui.xml.h:38
+#: src/glabels-ui.xml.h:40
 msgid "Cut the selection"
 msgstr ""
 
-#: src/glabels-ui.xml.h:39
+#: src/glabels-ui.xml.h:41
 msgid "Decrease magnification"
 msgstr ""
 
-#: src/glabels-ui.xml.h:40
+#: src/glabels-ui.xml.h:42
 msgid "Delete"
 msgstr "§R°£"
 
-#: src/glabels-ui.xml.h:41
+#: src/glabels-ui.xml.h:43
 #, fuzzy
 msgid "Delete the selected objects"
 msgstr "«Ø¥ß·sªº¤å¦rª«¥ó"
 
-#: src/glabels-ui.xml.h:42
+#: src/glabels-ui.xml.h:44
 msgid "Drawing toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:43
+#: src/glabels-ui.xml.h:45
 msgid "Dump XML"
 msgstr ""
 
-#: src/glabels-ui.xml.h:44
+#: src/glabels-ui.xml.h:46
 msgid "Dump the UI Xml description"
 msgstr ""
 
-#: src/glabels-ui.xml.h:45
+#: src/glabels-ui.xml.h:47
 msgid "Edit merge properties"
 msgstr "­×§ï¦X¨Ö³]©w"
 
-#: src/glabels-ui.xml.h:46
+#: src/glabels-ui.xml.h:48
 #, fuzzy
 msgid "Edit object properties"
 msgstr "­×§ï¤è¶ôª«¥ó³]©w"
 
-#: src/glabels-ui.xml.h:47 src/stock.c:74
+#: src/glabels-ui.xml.h:49 src/stock.c:84
+msgid "Fill color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:50 src/stock.c:74
 msgid "Flip _Horizontally"
 msgstr ""
 
-#: src/glabels-ui.xml.h:48 src/stock.c:75
+#: src/glabels-ui.xml.h:51 src/stock.c:75
 msgid "Flip _Vertically"
 msgstr ""
 
-#: src/glabels-ui.xml.h:49
+#: src/glabels-ui.xml.h:52
 msgid "Flip object horizontally"
 msgstr ""
 
-#: src/glabels-ui.xml.h:50
+#: src/glabels-ui.xml.h:53
 msgid "Flip object vertically"
 msgstr ""
 
-#: src/glabels-ui.xml.h:51
+#: src/glabels-ui.xml.h:54
+#, fuzzy
+msgid "Font name"
+msgstr "¤£­nÀx¦s"
+
+#: src/glabels-ui.xml.h:55
+#, fuzzy
+msgid "Font selector"
+msgstr "²¾°£©Ò¦³¿ï¾Ü¶µ"
+
+#: src/glabels-ui.xml.h:56
+#, fuzzy
+msgid "Font size"
+msgstr "¤£­nÀx¦s"
+
+#: src/glabels-ui.xml.h:57
 msgid "Icon and _Text"
 msgstr ""
 
-#: src/glabels-ui.xml.h:52
+#: src/glabels-ui.xml.h:58
 msgid "Increase magnification"
 msgstr ""
 
-#: src/glabels-ui.xml.h:53 src/stock.c:82 src/stock.c:83
+#: src/glabels-ui.xml.h:59
+msgid "Italic"
+msgstr ""
+
+#: src/glabels-ui.xml.h:60 src/stock.c:82 src/stock.c:83
 msgid "Label Ce_nter"
 msgstr ""
 
-#: src/glabels-ui.xml.h:54
+#: src/glabels-ui.xml.h:61
+msgid "Left align"
+msgstr ""
+
+#: src/glabels-ui.xml.h:62 src/stock.c:85
+msgid "Line color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:63
+msgid "Line width"
+msgstr ""
+
+#: src/glabels-ui.xml.h:64
 msgid "Lower object to bottom"
 msgstr ""
 
-#: src/glabels-ui.xml.h:55
+#: src/glabels-ui.xml.h:65
 msgid "M_arkup"
 msgstr ""
 
-#: src/glabels-ui.xml.h:56
+#: src/glabels-ui.xml.h:66
 msgid "Main toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:57
+#: src/glabels-ui.xml.h:67
 msgid "Markup"
 msgstr ""
 
-#: src/glabels-ui.xml.h:58
+#: src/glabels-ui.xml.h:68
 #, fuzzy
 msgid "New"
 msgstr "·s¼W (&_N)"
 
-#: src/glabels-ui.xml.h:59
+#: src/glabels-ui.xml.h:69
 #, fuzzy
 msgid "Object _Properties..."
 msgstr "¤å¦r¼Ë»ª"
 
-#: src/glabels-ui.xml.h:60
+#: src/glabels-ui.xml.h:70
 msgid "Only show icons in the drawing toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:61
+#: src/glabels-ui.xml.h:71
 msgid "Only show icons in the main toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:62 src/file.c:246
+#: src/glabels-ui.xml.h:72 src/file.c:421
 msgid "Open"
 msgstr "¶}±Ò"
 
-#: src/glabels-ui.xml.h:63
+#: src/glabels-ui.xml.h:73
 msgid "Open a file"
 msgstr "¶}±ÒÀÉ®×"
 
-#: src/glabels-ui.xml.h:64
+#: src/glabels-ui.xml.h:74
 #, fuzzy
 msgid "Open the glabels manual"
 msgstr "¶}±Ò¼Ðñ"
 
-#: src/glabels-ui.xml.h:65
+#: src/glabels-ui.xml.h:75
 msgid "Paste"
 msgstr ""
 
-#: src/glabels-ui.xml.h:66
+#: src/glabels-ui.xml.h:76
 msgid "Paste the clipboard"
 msgstr ""
 
-#: src/glabels-ui.xml.h:67
+#: src/glabels-ui.xml.h:77
 #, fuzzy
 msgid "Pr_eferences..."
 msgstr "Glabels: ³]©w­È"
 
-#: src/glabels-ui.xml.h:68
+#: src/glabels-ui.xml.h:78
 #, fuzzy
 msgid "Preferences"
 msgstr "Glabels: ³]©w­È"
 
-#: src/glabels-ui.xml.h:69 src/print-dialog.c:104
+#: src/glabels-ui.xml.h:79 src/print-dialog.c:114
 msgid "Print"
 msgstr "¦C¦L"
 
-#: src/glabels-ui.xml.h:70
+#: src/glabels-ui.xml.h:80
 #, fuzzy
 msgid "Print the current file"
 msgstr "¦C¦L²{¦³ÀÉ®×"
 
-#: src/glabels-ui.xml.h:71
+#: src/glabels-ui.xml.h:81
+#, fuzzy
+msgid "Proper_ties"
+msgstr "¤å¦r¼Ë»ª"
+
+#. ---------------------------
+#. Text Properties section
+#. ---------------------------
+#: src/glabels-ui.xml.h:82 src/view-text.c:330 src/view-barcode.c:305
+#, fuzzy
+msgid "Properties"
+msgstr "¤å¦r¼Ë»ª"
+
+#: src/glabels-ui.xml.h:83
+msgid "Property toolbar"
+msgstr ""
+
+#: src/glabels-ui.xml.h:84
 msgid "Quit"
 msgstr ""
 
-#: src/glabels-ui.xml.h:72
+#: src/glabels-ui.xml.h:85
 msgid "Quit the program"
 msgstr ""
 
-#: src/glabels-ui.xml.h:73
+#: src/glabels-ui.xml.h:86
 msgid "Raise object to top"
 msgstr ""
 
-#: src/glabels-ui.xml.h:74
+#: src/glabels-ui.xml.h:87
 msgid "Recent _Files"
 msgstr ""
 
-#: src/glabels-ui.xml.h:75
+#: src/glabels-ui.xml.h:88
 msgid "Redo"
 msgstr ""
 
-#: src/glabels-ui.xml.h:76
+#: src/glabels-ui.xml.h:89
 msgid "Redo the undone action"
 msgstr ""
 
-#: src/glabels-ui.xml.h:77
+#: src/glabels-ui.xml.h:90
 msgid "Remove all selections"
 msgstr "²¾°£©Ò¦³¿ï¾Ü¶µ"
 
-#: src/glabels-ui.xml.h:79
+#: src/glabels-ui.xml.h:92
 #, no-c-format
 msgid "Restore scale to 100%"
 msgstr ""
 
-#: src/glabels-ui.xml.h:80 src/stock.c:72
+#: src/glabels-ui.xml.h:93
+msgid "Right align"
+msgstr ""
+
+#: src/glabels-ui.xml.h:94 src/stock.c:72
 #, fuzzy
 msgid "Rotate _Left"
 msgstr "±ÛÂà"
 
-#: src/glabels-ui.xml.h:81 src/stock.c:73
+#: src/glabels-ui.xml.h:95 src/stock.c:73
 #, fuzzy
 msgid "Rotate _Right"
 msgstr "±ÛÂà"
 
-#: src/glabels-ui.xml.h:82
+#: src/glabels-ui.xml.h:96
 msgid "Rotate object 90 clockwise"
 msgstr ""
 
-#: src/glabels-ui.xml.h:83
+#: src/glabels-ui.xml.h:97
 msgid "Rotate object 90 counter-clockwise"
 msgstr ""
 
-#: src/glabels-ui.xml.h:84
+#: src/glabels-ui.xml.h:98
 #, fuzzy
 msgid "Save"
 msgstr "¥t¦s¬°..."
 
-#: src/glabels-ui.xml.h:85
+#: src/glabels-ui.xml.h:99
 msgid "Save As"
 msgstr "¥t¦s¬°..."
 
-#: src/glabels-ui.xml.h:86
+#: src/glabels-ui.xml.h:100
 #, fuzzy
 msgid "Save _As..."
 msgstr "¥t¦s¬°..."
 
-#: src/glabels-ui.xml.h:87
+#: src/glabels-ui.xml.h:101
 #, fuzzy
 msgid "Save the current file"
 msgstr "Àx¦s²{¦bÀÉ®×"
 
-#: src/glabels-ui.xml.h:88
+#: src/glabels-ui.xml.h:102
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: src/glabels-ui.xml.h:89
+#: src/glabels-ui.xml.h:103
 #, fuzzy
 msgid "Select All"
 msgstr "¤Ï¿ï¾Ü¥þ³¡ (&_N)"
 
-#: src/glabels-ui.xml.h:90
+#: src/glabels-ui.xml.h:104
 #, fuzzy
 msgid "Select _All"
 msgstr "¤Ï¿ï¾Ü¥þ³¡ (&_N)"
 
-#: src/glabels-ui.xml.h:91
+#: src/glabels-ui.xml.h:105
 #, fuzzy
 msgid "Select all objects"
 msgstr "¿ï¾Ü, ²¾°Ê¤Î­×§ïª«¥ó"
 
-#: src/glabels-ui.xml.h:92
+#: src/glabels-ui.xml.h:106
 msgid "Select, move and modify objects"
 msgstr "¿ï¾Ü, ²¾°Ê¤Î­×§ïª«¥ó"
 
-#: src/glabels-ui.xml.h:93 src/stock.c:71
+#: src/glabels-ui.xml.h:107 src/stock.c:71
 #, fuzzy
 msgid "Send to _Back"
 msgstr "©ñ¦b³Ì©³"
 
-#: src/glabels-ui.xml.h:94
+#: src/glabels-ui.xml.h:108
 msgid "Set drawing toolbar button style according to desktop default"
 msgstr ""
 
-#: src/glabels-ui.xml.h:95
+#: src/glabels-ui.xml.h:109
 msgid "Set main toolbar button style according to desktop default"
 msgstr ""
 
-#: src/glabels-ui.xml.h:96
+#: src/glabels-ui.xml.h:110
 msgid "Show _Tooltips"
 msgstr ""
 
-#: src/glabels-ui.xml.h:97
+#: src/glabels-ui.xml.h:111
+msgid "Show both icons and texts in the drawing toolbar"
+msgstr ""
+
+#: src/glabels-ui.xml.h:112
+msgid "Show both icons and texts in the main toolbar"
+msgstr ""
+
+#: src/glabels-ui.xml.h:113
 msgid "Show tooltips in the drawing toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:98
+#: src/glabels-ui.xml.h:114
 msgid "Show tooltips in the main toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:99
+#: src/glabels-ui.xml.h:115
+msgid "Text color"
+msgstr ""
+
+#: src/glabels-ui.xml.h:116
 #, fuzzy
 msgid "U_n-select All"
 msgstr "¤Ï¿ï¾Ü¥þ³¡ (&_N)"
 
-#: src/glabels-ui.xml.h:100
+#: src/glabels-ui.xml.h:117
 #, fuzzy
 msgid "Un-select All"
 msgstr "¤Ï¿ï¾Ü¥þ³¡ (&_N)"
 
-#: src/glabels-ui.xml.h:101
+#: src/glabels-ui.xml.h:118
 msgid "Undo"
 msgstr ""
 
-#: src/glabels-ui.xml.h:102
+#: src/glabels-ui.xml.h:119
 msgid "Undo the last action"
 msgstr ""
 
-#: src/glabels-ui.xml.h:103
+#: src/glabels-ui.xml.h:120
 #, fuzzy
 msgid "Zoom _1:1"
 msgstr "1:1 Åã¥Ü"
 
-#: src/glabels-ui.xml.h:104
+#: src/glabels-ui.xml.h:121
 #, fuzzy
 msgid "Zoom _In"
 msgstr "©ñ¤j"
 
-#: src/glabels-ui.xml.h:105
+#: src/glabels-ui.xml.h:122
 #, fuzzy
 msgid "Zoom _Out"
 msgstr "ÁY¤p"
 
-#: src/glabels-ui.xml.h:106
+#: src/glabels-ui.xml.h:123
 msgid "_About..."
 msgstr ""
 
-#: src/glabels-ui.xml.h:107
+#: src/glabels-ui.xml.h:124
 msgid "_Bottoms"
 msgstr ""
 
-#: src/glabels-ui.xml.h:108 src/stock.c:64
+#: src/glabels-ui.xml.h:125 src/stock.c:64
 #, fuzzy
 msgid "_Box"
 msgstr "²°¤l"
 
-#: src/glabels-ui.xml.h:109 src/stock.c:78
+#: src/glabels-ui.xml.h:126 src/stock.c:78
 msgid "_Centers"
 msgstr ""
 
-#: src/glabels-ui.xml.h:110
+#: src/glabels-ui.xml.h:127
 msgid "_Close"
 msgstr ""
 
-#: src/glabels-ui.xml.h:111
+#: src/glabels-ui.xml.h:128
 msgid "_Contents"
 msgstr ""
 
-#: src/glabels-ui.xml.h:112
+#: src/glabels-ui.xml.h:129
 msgid "_Copy"
 msgstr ""
 
-#: src/glabels-ui.xml.h:113
+#: src/glabels-ui.xml.h:130
 #, fuzzy
 msgid "_Create Object"
 msgstr "«Ø¥ß·sªº¤å¦rª«¥ó"
 
-#: src/glabels-ui.xml.h:114
+#: src/glabels-ui.xml.h:131
 msgid "_Debug"
 msgstr ""
 
-#: src/glabels-ui.xml.h:115 src/view.c:3078
+#: src/glabels-ui.xml.h:132 src/view.c:3526
 #, fuzzy
 msgid "_Delete"
 msgstr "§R°£"
 
-#: src/glabels-ui.xml.h:116
+#: src/glabels-ui.xml.h:133
 msgid "_Desktop Default"
 msgstr ""
 
-#: src/glabels-ui.xml.h:117
+#: src/glabels-ui.xml.h:134
 msgid "_Drawing Toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:118
+#: src/glabels-ui.xml.h:135
 msgid "_Edit"
 msgstr ""
 
-#: src/glabels-ui.xml.h:119 src/stock.c:65
+#: src/glabels-ui.xml.h:136 src/stock.c:65
 #, fuzzy
 msgid "_Ellipse"
 msgstr "¾ò¶ê§Î"
 
-#: src/glabels-ui.xml.h:120
+#: src/glabels-ui.xml.h:137
 #, fuzzy
 msgid "_File"
 msgstr "¶ñº¡"
 
-#: src/glabels-ui.xml.h:121
+#: src/glabels-ui.xml.h:138
 msgid "_Grid"
 msgstr ""
 
-#: src/glabels-ui.xml.h:122
+#: src/glabels-ui.xml.h:139
 msgid "_Help"
 msgstr ""
 
-#: src/glabels-ui.xml.h:123
+#: src/glabels-ui.xml.h:140
 msgid "_Icon"
 msgstr ""
 
-#: src/glabels-ui.xml.h:124 src/stock.c:66
+#: src/glabels-ui.xml.h:141 src/stock.c:66
 #, fuzzy
 msgid "_Image"
 msgstr "¹Ï¹³"
 
-#: src/glabels-ui.xml.h:125 src/stock.c:76
+#: src/glabels-ui.xml.h:142 src/stock.c:76
 msgid "_Lefts"
 msgstr ""
 
-#: src/glabels-ui.xml.h:126 src/stock.c:63
+#: src/glabels-ui.xml.h:143 src/stock.c:63
 #, fuzzy
 msgid "_Line"
 msgstr "½u"
 
-#: src/glabels-ui.xml.h:127
+#: src/glabels-ui.xml.h:144
 msgid "_Main Toolbar"
 msgstr ""
 
-#: src/glabels-ui.xml.h:128
+#: src/glabels-ui.xml.h:145
 #, fuzzy
 msgid "_Merge Properties..."
 msgstr "¦X¨Ö³]©w"
 
-#: src/glabels-ui.xml.h:129
+#: src/glabels-ui.xml.h:146
 msgid "_New"
 msgstr "·s¼W (&_N)"
 
-#: src/glabels-ui.xml.h:130
+#: src/glabels-ui.xml.h:147
 msgid "_Objects"
 msgstr ""
 
-#: src/glabels-ui.xml.h:131
+#: src/glabels-ui.xml.h:148
 #, fuzzy
 msgid "_Open..."
 msgstr "¶}±Ò"
@@ -575,56 +651,56 @@ msgstr "
 #.
 #. * Submenu: Order
 #.
-#: src/glabels-ui.xml.h:132 src/view.c:2924
+#: src/glabels-ui.xml.h:149 src/view.c:3372
 msgid "_Order"
 msgstr ""
 
-#: src/glabels-ui.xml.h:133
+#: src/glabels-ui.xml.h:150
 msgid "_Paste"
 msgstr ""
 
-#: src/glabels-ui.xml.h:134
+#: src/glabels-ui.xml.h:151
 #, fuzzy
 msgid "_Print..."
 msgstr "¦C¦L"
 
-#: src/glabels-ui.xml.h:135
+#: src/glabels-ui.xml.h:152
 msgid "_Quit"
 msgstr ""
 
-#: src/glabels-ui.xml.h:136 src/stock.c:77
+#: src/glabels-ui.xml.h:153 src/stock.c:77
 msgid "_Rights"
 msgstr ""
 
 #.
 #. * Submenu: Rotate/Flip
 #.
-#: src/glabels-ui.xml.h:137 src/view.c:2945
+#: src/glabels-ui.xml.h:154 src/view.c:3393
 #, fuzzy
 msgid "_Rotate/Flip"
 msgstr "±ÛÂà"
 
-#: src/glabels-ui.xml.h:138
+#: src/glabels-ui.xml.h:155
 #, fuzzy
 msgid "_Save"
 msgstr "¥t¦s¬°..."
 
-#: src/glabels-ui.xml.h:139 src/stock.c:61
+#: src/glabels-ui.xml.h:156 src/stock.c:61
 #, fuzzy
 msgid "_Select Mode"
 msgstr "¿ï¾Ü"
 
-#: src/glabels-ui.xml.h:140 src/stock.c:62
+#: src/glabels-ui.xml.h:157 src/stock.c:62
 #, fuzzy
 msgid "_Text"
 msgstr "¤å¦r"
 
-#: src/glabels-ui.xml.h:141 src/stock.c:79
+#: src/glabels-ui.xml.h:158 src/stock.c:79
 #, fuzzy
 msgid "_Tops"
 msgstr "¤u¨ã (&_T)"
 
-#: src/glabels-ui.xml.h:142
+#: src/glabels-ui.xml.h:159
 #, fuzzy
 msgid "_View"
 msgstr "·s¼W (&_N)"
@@ -690,26 +766,30 @@ msgid "Show ui debugging messages."
 msgstr ""
 
 #: src/glabels.c:97
-msgid "Show media select widget debugging messages."
+msgid "Show property_bar debugging messages."
 msgstr ""
 
 #: src/glabels.c:100
-msgid "Show mini preview widget debugging messages."
+msgid "Show media select widget debugging messages."
 msgstr ""
 
 #: src/glabels.c:103
-msgid "Show pixbuf cache debugging messages."
+msgid "Show mini preview widget debugging messages."
 msgstr ""
 
 #: src/glabels.c:106
-msgid "Show widget debugging messages."
+msgid "Show pixbuf cache debugging messages."
 msgstr ""
 
 #: src/glabels.c:109
+msgid "Show widget debugging messages."
+msgstr ""
+
+#: src/glabels.c:112
 msgid "Turn on all debugging messages."
 msgstr ""
 
-#: src/glabels.c:180
+#: src/glabels.c:184
 msgid "Could not initialize Bonobo!\n"
 msgstr ""
 
@@ -745,32 +825,32 @@ msgstr "
 msgid "copies"
 msgstr "¥÷¼Æ"
 
-#: src/glabels-batch.c:58 src/print-dialog.c:200
+#: src/glabels-batch.c:58 src/print-dialog.c:210
 msgid "print outlines (to test printer alignment)"
 msgstr "¦L¥X¥~Ãä (´ú¸Õ¥´¦L¾÷°Ñ¼Æ)"
 
-#: src/glabels-batch.c:60 src/print-dialog.c:209
+#: src/glabels-batch.c:60 src/print-dialog.c:219
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "¤Ï¤è¦V¦C¦L (¦p­Ë¦V¼v¹³)"
 
-#: src/glabels-batch.c:95
+#: src/glabels-batch.c:96
 msgid "[OPTION...] GLABELS_FILE..."
 msgstr "[¿ï¶µ...] GLABELS_FILE..."
 
-#: src/glabels-batch.c:114
+#: src/glabels-batch.c:116
 msgid "missing glabels file\n"
 msgstr "¨S¦³¿é¤J glabels ªºÀÉ®×\n"
 
-#: src/glabels-batch.c:141
+#: src/glabels-batch.c:157
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "¶}±ÒÀÉ®×¥¢±Ñ %s\n"
 
-#: src/window.c:234
+#: src/window.c:242
 msgid "(none) - gLabels"
 msgstr ""
 
-#: src/window.c:399
+#: src/window.c:409
 msgid "(modified)"
 msgstr ""
 
@@ -792,7 +872,21 @@ msgstr ""
 msgid "Centers"
 msgstr ""
 
-#: src/commands.c:337
+#: src/ui-property-bar.c:346 src/wdgt-text-props.c:241 src/wdgt-bc-props.c:174
+#, fuzzy
+msgid "Default"
+msgstr "§R°£"
+
+#: src/ui-property-bar.c:361 src/wdgt-fill.c:175
+msgid "No fill"
+msgstr ""
+
+#: src/ui-property-bar.c:376 src/wdgt-line.c:201
+#, fuzzy
+msgid "No line"
+msgstr "¨S¦³"
+
+#: src/commands.c:352
 msgid ""
 "A label and business card creation program for GNOME.\n"
 " \n"
@@ -818,100 +912,109 @@ msgstr ""
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
 "more details.\n"
 
-#: src/commands.c:351
+#: src/commands.c:366
 msgid "See the file AUTHORS for additional credits,"
 msgstr ""
 
-#: src/commands.c:352
-msgid "or visit http://snaught.com/glabels"
+#: src/commands.c:367
+msgid "or visit http://glabels.sourceforge.net/"
 msgstr ""
 
 #: src/commands.c:376
+msgid " "
+msgstr ""
+
+#: src/commands.c:391
 #, fuzzy
 msgid "glabels"
 msgstr "¼Ðñ"
 
-#: src/file.c:82
+#: src/file.c:91
 msgid "New Label or Card"
 msgstr "·s¼W¼Ðñ©Î¥d"
 
-#: src/file.c:112
+#: src/file.c:121 src/file.c:291
 msgid "Media Type"
 msgstr "´CÅéºØÃþ"
 
-#: src/file.c:118
+#: src/file.c:127 src/file.c:297
 msgid "Label orientation"
 msgstr "¼Ðñ¤è¦V"
 
-#: src/file.c:248
+#: src/file.c:258
+#, fuzzy
+msgid "Label properties"
+msgstr "¤å¦r¼Ë»ª"
+
+#: src/file.c:423
 msgid "Open label"
 msgstr "¶}±Ò¼Ðñ"
 
-#: src/file.c:296 src/file.c:594
+#: src/file.c:475 src/file.c:784
 #, fuzzy
 msgid "Empty file name selection"
 msgstr "²¾°£©Ò¦³¿ï¾Ü¶µ"
 
-#: src/file.c:297 src/file.c:311
+#: src/file.c:476 src/file.c:490
 msgid "Please select a file or supply a valid file name"
 msgstr ""
 
-#: src/file.c:310
+#: src/file.c:489
 msgid "File does not exist"
 msgstr ""
 
-#: src/file.c:372
+#: src/file.c:564
 #, fuzzy, c-format
 msgid "Could not open file \"%s\""
 msgstr "¶}±ÒÀÉ®×¥¢±Ñ"
 
-#: src/file.c:380
+#: src/file.c:572
 msgid "Not a supported file format"
 msgstr ""
 
-#: src/file.c:462 src/file.c:636
+#: src/file.c:653 src/file.c:828
 #, fuzzy, c-format
 msgid "Could not save file \"%s\""
 msgstr "¤£¯àÀx¦sÀÉ®×"
 
-#: src/file.c:470 src/file.c:644
+#: src/file.c:661 src/file.c:836
 msgid "Error encountered during save.  The file is still not saved."
 msgstr ""
 
-#: src/file.c:512
+#: src/file.c:702
 #, fuzzy, c-format
 msgid "Save \"%s\" as"
 msgstr "Àx¦s¼Ðñ¬°..."
 
-#: src/file.c:595
+#: src/file.c:785
 #, fuzzy
 msgid "Please supply a valid file name"
 msgstr "½Ð¥²»Ý¿é¤JÀɮצWºÙ"
 
-#: src/file.c:609
+#: src/file.c:801
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr ""
 
-#: src/file.c:617
+#: src/file.c:809
 msgid "File already exists."
 msgstr ""
 
-#: src/file.c:732
+#: src/file.c:924
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr ""
 
-#: src/file.c:740
+#: src/file.c:932
 msgid "Your changes will be lost if you don't save them."
 msgstr ""
 
-#: src/file.c:743
+#: src/file.c:935
 msgid "Close without saving"
 msgstr ""
 
 #. Should not happen
-#: src/prefs.c:664 src/prefs.c:671 src/wdgt-line.c:180
+#: src/prefs.c:664 src/prefs.c:671 src/wdgt-line.c:185
 msgid "points"
 msgstr "ÂI"
 
@@ -963,11 +1066,11 @@ msgstr "
 msgid "Default page size"
 msgstr "¹w³]¯È±i¤j¤p"
 
-#: src/prefs-dialog.c:309
+#: src/prefs-dialog.c:309 data/paper-sizes.xml.h:25
 msgid "US Letter"
 msgstr ""
 
-#: src/prefs-dialog.c:317
+#: src/prefs-dialog.c:317 data/paper-sizes.xml.h:6
 msgid "A4"
 msgstr ""
 
@@ -976,67 +1079,67 @@ msgid "Select default properties for new objects."
 msgstr ""
 
 #. ------ text props entry ------
-#: src/prefs-dialog.c:359 src/view-text.c:314 src/view-text.c:634
+#: src/prefs-dialog.c:359 src/view-text.c:313 src/view-text.c:636
 #: src/wdgt-bc-style.c:184
 msgid "Text"
 msgstr "¤å¦r"
 
 #. ------ Line box ------
-#: src/prefs-dialog.c:368 src/view-line.c:304
+#: src/prefs-dialog.c:368 src/view-line.c:303
 msgid "Line"
 msgstr "½u"
 
 #. ------ Fill box ------
-#: src/prefs-dialog.c:377 src/view-box.c:323 src/view-ellipse.c:323
+#: src/prefs-dialog.c:377 src/view-box.c:322 src/view-ellipse.c:322
 msgid "Fill"
 msgstr "¶ñº¡"
 
 #.
 #. * Submenu: Align Horizontally
 #.
-#: src/view.c:2978
+#: src/view.c:3426
 msgid "Align _Horizontally"
 msgstr ""
 
 #.
 #. * Submenu: Align Vertically
 #.
-#: src/view.c:3017
+#: src/view.c:3465
 msgid "Align _Vertically"
 msgstr ""
 
-#: src/view-box.c:291
+#: src/view-box.c:290
 msgid "Edit box object properties"
 msgstr "­×§ï¤è¶ôª«¥ó³]©w"
 
 #. ---------------------------
 #. Outline section
 #. ---------------------------
-#: src/view-box.c:307 src/view-ellipse.c:307
+#: src/view-box.c:306 src/view-ellipse.c:306
 msgid "Outline"
 msgstr "¥~Ãä"
 
 #. ---------------------------
 #. Position section
 #. ---------------------------
-#: src/view-box.c:339 src/view-ellipse.c:339 src/view-line.c:320
-#: src/view-image.c:314 src/view-text.c:349 src/view-barcode.c:338
+#: src/view-box.c:338 src/view-ellipse.c:338 src/view-line.c:319
+#: src/view-image.c:314 src/view-text.c:348 src/view-barcode.c:337
 msgid "Position"
 msgstr "¦ì¸m"
 
 #. ---------------------------
 #. Size section
 #. ---------------------------
-#: src/view-box.c:354 src/view-ellipse.c:354 src/view-line.c:338
+#: src/view-box.c:353 src/view-ellipse.c:353 src/view-line.c:337
 #: src/view-image.c:331
 msgid "Size"
 msgstr "¤j¤p"
 
-#: src/view-ellipse.c:291
+#: src/view-ellipse.c:290
 msgid "Edit ellipse object properties"
 msgstr "­×§ï¾ò¶êª«¥ó³]©w"
 
-#: src/view-line.c:289
+#: src/view-line.c:288
 msgid "Edit line object properties"
 msgstr "­×§ï½uª«¥óªº³]©w"
 
@@ -1056,30 +1159,22 @@ msgstr "
 msgid "Reset image size"
 msgstr "­«³]¹Ï¹³¤j¤p"
 
-#: src/view-text.c:299
+#: src/view-text.c:298
 msgid "Edit text object properties"
 msgstr "­×§ï¤å¦rª«¥óªº³]©w"
 
-#. ---------------------------
-#. Text Properties section
-#. ---------------------------
-#: src/view-text.c:331 src/view-barcode.c:306
-#, fuzzy
-msgid "Properties"
-msgstr "¤å¦r¼Ë»ª"
-
-#: src/view-barcode.c:271
+#: src/view-barcode.c:270
 msgid "Edit barcode object properties"
 msgstr "­×§ï¼Æ½X±øª«¥ó³]©w"
 
 #. ---------------------------
 #. Data section
 #. ---------------------------
-#: src/view-barcode.c:286 src/merge-properties-dialog.c:343
+#: src/view-barcode.c:285 src/merge-properties-dialog.c:343
 msgid "Data"
 msgstr "¸ê®Æ"
 
-#: src/view-barcode.c:802 src/print.c:912
+#: src/view-barcode.c:803 src/print.c:1021
 msgid "Invalid barcode"
 msgstr "¤£¥¿½Tªº¼Æ½X±ø"
 
@@ -1123,73 +1218,77 @@ msgstr "
 msgid "Record/Field"
 msgstr ""
 
-#: src/print-dialog.c:128
+#: src/print-dialog.c:138
 msgid "_Job"
 msgstr ""
 
-#: src/print-dialog.c:133
+#: src/print-dialog.c:143
 #, fuzzy
 msgid "P_rinter"
 msgstr "¦C¦L"
 
 #. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:163
+#: src/print-dialog.c:173
 msgid "Copies"
 msgstr "¥÷¼Æ"
 
 #. ------- Otherwise add merge control widget ------------
-#: src/print-dialog.c:177
+#: src/print-dialog.c:187
 msgid "Document merge control"
 msgstr "¤å¥ó¦X¨Ö±±¨î"
 
 #. ----------- Add custom print options area ------------
-#: src/print-dialog.c:194
+#: src/print-dialog.c:204
 msgid "Options"
 msgstr "³]©w"
 
-#: src/print-dialog.c:336 src/print-dialog.c:374
+#: src/print-dialog.c:227
+msgid "print crop marks"
+msgstr ""
+
+#: src/print-dialog.c:364 src/print-dialog.c:403
 msgid "Print preview"
 msgstr "¹wÄý¦C¦L"
 
-#: src/label.c:542
+#: src/label.c:563
 msgid "Untitled"
 msgstr ""
 
-#: src/template.c:296
+#: src/template.c:318
 #, c-format
 msgid "Generic %s full page"
 msgstr ""
 
-#: src/template.c:338
+#: src/template.c:362
 msgid "No template files found!"
 msgstr "§ä¤£¨ì¼Ëª©ÀÉ®× !"
 
-#: src/template.c:435
+#: src/template.c:461
 #, c-format
 msgid "%s x %s %s"
 msgstr "%s x %s %s"
 
-#: src/template.c:440
+#: src/template.c:466
 #, c-format
 msgid "%.5g x %.5g %s"
 msgstr "%.5g x %.5g %s"
 
-#: src/template.c:451 src/template.c:465
+#: src/template.c:477 src/template.c:491
 #, c-format
 msgid "%s %s diameter"
 msgstr ""
 
-#: src/template.c:455 src/template.c:469
+#: src/template.c:481 src/template.c:495
 #, c-format
 msgid "%.5g %s diameter"
 msgstr ""
 
-#: src/template.c:607
+#: src/template.c:633
 #, c-format
 msgid "%d x %d  (%d per sheet)"
 msgstr "%d x %d (¨C­¶ %d)"
 
-#: src/template.c:611
+#: src/template.c:637
 #, fuzzy, c-format
 msgid "%d per sheet"
 msgstr "%d x %d (¨C­¶ %d)"
@@ -1199,54 +1298,69 @@ msgstr "%d x %d (
 msgid "No paper files found!"
 msgstr "§ä¤£¨ì¼Ëª©ÀÉ®× !"
 
-#: src/xml-label.c:171 src/xml-label.c:204
+#: src/xml-label.c:177 src/xml-label.c:214
 msgid "xmlParseFile error"
 msgstr "xmlParseFile ¿ù»~"
 
-#: src/xml-label.c:241
+#: src/xml-label.c:251
 msgid "No document root"
 msgstr "¨S¦³¤å¥ó©lºÝ"
 
-#: src/xml-label.c:253
+#: src/xml-label.c:263
 msgid "Importing from glabels 0.1 format"
 msgstr ""
 
-#: src/xml-label.c:261
+#: src/xml-label.c:271
 msgid "Importing from glabels 0.4 format"
 msgstr ""
 
-#: src/xml-label.c:264
+#: src/xml-label.c:278
+msgid "Importing from glabels 1.91 format"
+msgstr ""
+
+#: src/xml-label.c:281
 #, fuzzy
 msgid "bad document, unknown glabels Namespace"
 msgstr "¤£¥¿½Tªº¤å¥óºØÃþ, §ä¤£¨ì glabels ®æ¦¡"
 
-#: src/xml-label.c:292 src/xml-label-04.c:75
+#: src/xml-label.c:310 src/xml-label-04.c:75 src/xml-label-191.c:131
 #, c-format
 msgid "Bad root node = \"%s\""
 msgstr "¿ù»~ªº°ò½X = \"%s\""
 
-#: src/xml-label.c:325
+#: src/xml-label.c:345 src/xml-label-191.c:164
 #, fuzzy, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "¿ù»~ªº°ò½X = \"%s\""
 
-#: src/xml-label.c:357 src/xml-label-04.c:123
+#: src/xml-label.c:387 src/xml-label-04.c:123 src/xml-label-191.c:196
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr "¿ù»~ªº¸`ÂI = \"%s\""
 
-#: src/xml-label.c:763
+#: src/xml-label.c:783 src/xml-label-191.c:602
 #, fuzzy, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "¿ù»~ªº¸`ÂI = \"%s\""
 
-#: src/xml-label.c:831
+#: src/xml-label.c:944
+msgid "Utf8 conversion error."
+msgstr ""
+
+#: src/xml-label.c:951
 msgid "Problem saving xml file."
 msgstr "Àx¦s XML Àɮ׮ɵo¥Í¿ù»~."
 
-#: src/xml-template.c:157
+#. This should always be an id, but just in case a name
+#. slips by!
+#: src/xml-label-191.c:680 src/xml-template.c:169
 #, c-format
-msgid "Unknown page size id \"%s\""
+msgid "Unknown page size id \"%s\", trying as name"
+msgstr ""
+
+#: src/xml-label-191.c:690 src/xml-template.c:179
+#, c-format
+msgid "Unknown page size id or name \"%s\""
 msgstr ""
 
 #: src/merge.c:172 src/merge.c:213 src/merge.c:398 src/merge.c:401
@@ -1269,18 +1383,18 @@ msgid "Text file with tab delimeters"
 msgstr "¥H [TAB] ¬°¤À®æ"
 
 #. Font label
-#: src/wdgt-text-props.c:181
+#: src/wdgt-text-props.c:185
 msgid "Font:"
 msgstr "¦r«¬:"
 
 #. Text Color Label
-#: src/wdgt-text-props.c:230 src/wdgt-line.c:189 src/wdgt-fill.c:164
-#: src/wdgt-bc-props.c:164
+#: src/wdgt-text-props.c:234 src/wdgt-line.c:194 src/wdgt-fill.c:168
+#: src/wdgt-bc-props.c:167
 msgid "Color:"
 msgstr "ÃC¦â:"
 
 #. Alignment label
-#: src/wdgt-text-props.c:246
+#: src/wdgt-text-props.c:255
 msgid "Alignment:"
 msgstr "¹ï¸m:"
 
@@ -1310,7 +1424,7 @@ msgid "Y:"
 msgstr "Y:"
 
 #. W Label
-#: src/wdgt-size.c:187 src/wdgt-line.c:166
+#: src/wdgt-size.c:187 src/wdgt-line.c:171
 msgid "Width:"
 msgstr "Áï«×:"
 
@@ -1409,10 +1523,535 @@ msgstr "
 msgid "Rotate"
 msgstr "±ÛÂà"
 
-#: src/gnome-recent-view-bonobo.c:189
-#, fuzzy, c-format
-msgid "Open %s"
-msgstr "¶}±Ò"
+#. This is the default custom color
+#: src/mygal/color-palette.c:396
+#, fuzzy
+msgid "custom"
+msgstr "¦Û­qÄæ¦ìÆ_"
+
+#. "Custom" color - we'll pop up a GnomeColorPicker
+#: src/mygal/color-palette.c:438
+#, fuzzy
+msgid "Custom Color:"
+msgstr "ÃC¦â:"
+
+#: src/mygal/color-palette.c:446
+msgid "Choose Custom Color"
+msgstr ""
+
+#: src/mygal/color-palette.c:579
+msgid "black"
+msgstr ""
+
+#: src/mygal/color-palette.c:580
+msgid "light brown"
+msgstr ""
+
+#: src/mygal/color-palette.c:581
+msgid "brown gold"
+msgstr ""
+
+#: src/mygal/color-palette.c:582
+msgid "dark green #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:583
+msgid "navy"
+msgstr ""
+
+#: src/mygal/color-palette.c:584 src/mygal/color-palette.c:640
+msgid "dark blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:585
+msgid "purple #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:586
+msgid "very dark gray"
+msgstr ""
+
+#: src/mygal/color-palette.c:589 src/mygal/color-palette.c:645
+msgid "dark red"
+msgstr ""
+
+#: src/mygal/color-palette.c:590
+msgid "red-orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:591
+msgid "gold"
+msgstr ""
+
+#: src/mygal/color-palette.c:592
+msgid "dark green"
+msgstr ""
+
+#: src/mygal/color-palette.c:593 src/mygal/color-palette.c:646
+msgid "dull blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:594 src/mygal/color-palette.c:647
+msgid "blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:595
+msgid "dull purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:596
+msgid "dark grey"
+msgstr ""
+
+#: src/mygal/color-palette.c:599
+msgid "red"
+msgstr ""
+
+#: src/mygal/color-palette.c:600
+msgid "orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:601
+msgid "lime"
+msgstr ""
+
+#: src/mygal/color-palette.c:602
+msgid "dull green"
+msgstr ""
+
+#: src/mygal/color-palette.c:603
+msgid "dull blue #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:604
+msgid "sky blue #2"
+msgstr ""
+
+#: src/mygal/color-palette.c:605 src/mygal/color-palette.c:644
+msgid "purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:606
+msgid "gray"
+msgstr ""
+
+#: src/mygal/color-palette.c:609 src/mygal/color-palette.c:641
+#, fuzzy
+msgid "magenta"
+msgstr "¹Ï¹³"
+
+#: src/mygal/color-palette.c:610
+msgid "bright orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:611 src/mygal/color-palette.c:642
+msgid "yellow"
+msgstr ""
+
+#: src/mygal/color-palette.c:612
+#, fuzzy
+msgid "green"
+msgstr "«×¼Æ"
+
+#: src/mygal/color-palette.c:613 src/mygal/color-palette.c:643
+msgid "cyan"
+msgstr ""
+
+#: src/mygal/color-palette.c:614
+msgid "bright blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:615 src/mygal/color-palette.c:632
+msgid "red purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:616
+msgid "light grey"
+msgstr ""
+
+#: src/mygal/color-palette.c:619 src/mygal/color-palette.c:636
+msgid "pink"
+msgstr ""
+
+#: src/mygal/color-palette.c:620
+msgid "light orange"
+msgstr ""
+
+#: src/mygal/color-palette.c:621 src/mygal/color-palette.c:633
+msgid "light yellow"
+msgstr ""
+
+#: src/mygal/color-palette.c:622
+msgid "light green"
+msgstr ""
+
+#: src/mygal/color-palette.c:623
+msgid "light cyan"
+msgstr ""
+
+#: src/mygal/color-palette.c:624 src/mygal/color-palette.c:634
+msgid "light blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:625 src/mygal/color-palette.c:638
+msgid "light purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:626
+msgid "white"
+msgstr ""
+
+#: src/mygal/color-palette.c:631
+msgid "purplish blue"
+msgstr ""
+
+#: src/mygal/color-palette.c:635
+msgid "dark purple"
+msgstr ""
+
+#: src/mygal/color-palette.c:637
+msgid "sky blue"
+msgstr ""
+
+#: data/paper-sizes.xml.h:1
+msgid "A0"
+msgstr ""
+
+#: data/paper-sizes.xml.h:2
+msgid "A1"
+msgstr ""
+
+#: data/paper-sizes.xml.h:3
+msgid "A10"
+msgstr ""
+
+#: data/paper-sizes.xml.h:4
+msgid "A2"
+msgstr ""
+
+#: data/paper-sizes.xml.h:5
+msgid "A3"
+msgstr ""
+
+#: data/paper-sizes.xml.h:7
+msgid "A5"
+msgstr ""
+
+#: data/paper-sizes.xml.h:8
+msgid "A6"
+msgstr ""
+
+#: data/paper-sizes.xml.h:9
+msgid "A7"
+msgstr ""
+
+#: data/paper-sizes.xml.h:10
+msgid "A8"
+msgstr ""
+
+#: data/paper-sizes.xml.h:11
+msgid "A9"
+msgstr ""
+
+#: data/paper-sizes.xml.h:12
+msgid "B0"
+msgstr ""
+
+#: data/paper-sizes.xml.h:13
+msgid "B1"
+msgstr ""
+
+#: data/paper-sizes.xml.h:14
+msgid "B10"
+msgstr ""
+
+#: data/paper-sizes.xml.h:15
+msgid "B2"
+msgstr ""
+
+#: data/paper-sizes.xml.h:16
+msgid "B3"
+msgstr ""
+
+#: data/paper-sizes.xml.h:17
+msgid "B4"
+msgstr ""
+
+#: data/paper-sizes.xml.h:18
+msgid "B5"
+msgstr ""
+
+#: data/paper-sizes.xml.h:19
+msgid "B6"
+msgstr ""
+
+#: data/paper-sizes.xml.h:20
+msgid "B7"
+msgstr ""
+
+#: data/paper-sizes.xml.h:21
+msgid "B8"
+msgstr ""
+
+#: data/paper-sizes.xml.h:22
+msgid "B9"
+msgstr ""
+
+#: data/paper-sizes.xml.h:23
+msgid "US Executive"
+msgstr ""
+
+#: data/paper-sizes.xml.h:24
+msgid "US Legal"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:1
+msgid "Address Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:2 data/avery-iso-templates.xml.h:3
+#: data/zweckform-iso-templates.xml.h:2 data/misc-us-templates.xml.h:2
+#: data/misc-iso-templates.xml.h:9
+msgid "Business Cards"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:3
+msgid "CD/DVD Labels (Disc Labels)"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:4
+msgid "Diskette Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:5
+#, fuzzy
+msgid "Filing Labels"
+msgstr "¼Ðñ"
+
+#: data/avery-us-templates.xml.h:6
+msgid "Full Sheet Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:7
+#, fuzzy
+msgid "Large Round Labels"
+msgstr "¥Ñ¸Tñ¶}¯Å"
+
+#: data/avery-us-templates.xml.h:8
+msgid "Name Badge Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:9
+msgid "Return Address Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:10
+msgid "Shipping Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:11
+#, fuzzy
+msgid "Small Round Labels"
+msgstr "¥Ñ¸Tñ¶}¯Å"
+
+#: data/avery-us-templates.xml.h:12
+#, fuzzy
+msgid "Square Labels"
+msgstr "¼Ðñ"
+
+#: data/avery-us-templates.xml.h:13
+msgid "Video Tape Face Labels"
+msgstr ""
+
+#: data/avery-us-templates.xml.h:14
+msgid "Video Tape Spine Labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:1
+msgid "3.5'' Diskette labels (face only)"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:2
+msgid "Address labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:4 data/zweckform-iso-templates.xml.h:4
+#: data/misc-us-templates.xml.h:4 data/misc-iso-templates.xml.h:10
+#, fuzzy
+msgid "CD/DVD Labels"
+msgstr "¼Ðñ"
+
+#: data/avery-iso-templates.xml.h:5 data/misc-iso-templates.xml.h:16
+msgid "Mailing Labels"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:6
+#, fuzzy
+msgid "Mailing labels"
+msgstr "¼Ðñ"
+
+#: data/avery-iso-templates.xml.h:7
+msgid "Mini Address"
+msgstr ""
+
+#: data/avery-iso-templates.xml.h:8
+#, fuzzy
+msgid "Shipping labels"
+msgstr "¶}±Ò¼Ðñ"
+
+#: data/zweckform-iso-templates.xml.h:1
+msgid "Allround Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:3
+#, fuzzy
+msgid "CD Labels"
+msgstr "¼Ðñ"
+
+#: data/zweckform-iso-templates.xml.h:5
+msgid "Correction and Cover-up Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:6
+msgid "Lever Arch File Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:7
+msgid "Mailing Labels -- 12"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:8
+msgid "QSL-Karten Etiketten 70mm x 50,8mm"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:9
+msgid "Rectangular Copier Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:10 data/misc-iso-templates.xml.h:20
+msgid "Rectangular Labels"
+msgstr ""
+
+#: data/zweckform-iso-templates.xml.h:11
+msgid "Video Labels (back)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:1
+msgid "Business Card CD"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:3
+msgid "CD Template Rectangles"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:5
+msgid "CD/DVD Labels (Face Only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:6 data/misc-iso-templates.xml.h:11
+msgid "CD/DVD Labels (face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:7
+#, fuzzy
+msgid "DLT Labels"
+msgstr "¼Ðñ"
+
+#: data/misc-us-templates.xml.h:8
+msgid "Microtube labels"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:9
+msgid "Mini-CD Labels"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:10
+msgid "PRO CD Labels 2-up (CD spine only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:11
+msgid "PRO CD Labels 2-up (Face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:12
+msgid "PRO CD Labels 2-up (face only)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:13
+msgid "Slimline CD Case (rightside up)"
+msgstr ""
+
+#: data/misc-us-templates.xml.h:14
+msgid "Slimline CD Case (upside down)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:1
+msgid "Agipa 119488: Business Cards"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:2
+msgid "Allround Labels --24"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:3
+msgid "Allround Labels --44"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:4
+msgid "Allround Labels --64"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:5
+msgid "Allround Labels --65"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:6
+msgid "Arch File Labels"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:7
+msgid "Arch File Labels (large)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:8
+msgid "Arch File Labels (small)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:12
+msgid "CD/DVD Labels Standard Format (face only)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:13
+msgid "Diskette Labels (face only)"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:14
+msgid "EPSON Photo Stickers 16"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:15
+msgid "Etiketten"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:17
+msgid "Mailing Labels --14"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:18
+msgid "Mailing Labels-2 columns"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:19
+msgid "Mailing Labels-3 columns"
+msgstr ""
+
+#: data/misc-iso-templates.xml.h:21
+msgid "Video Labels (face only)"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Open %s"
+#~ msgstr "¶}±Ò"
 
 #~ msgid "Revert to saved copy of %s?"
 #~ msgstr "­n¸ü¤J¤wÀx¦sªº³Æ¥÷ %s ?"
@@ -1429,9 +2068,6 @@ msgstr "
 #~ "\n"
 #~ "­n²{¦bÀx¦s¶Ü ?"
 
-#~ msgid "Don't save"
-#~ msgstr "¤£­nÀx¦s"
-
 #~ msgid "Close / Save label as"
 #~ msgstr "Ãö³¬ / Àx¦s¼Ðñ¬°..."
 
@@ -1456,9 +2092,6 @@ msgstr "
 #~ msgid "Barcode data"
 #~ msgstr "¼Æ½X±ø¸ê®Æ"
 
-#~ msgid "General"
-#~ msgstr "¤@¯ë"
-
 #~ msgid "%"
 #~ msgstr "%"
 
-- 
2.39.5