[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

gEDA-cvs: gaf.git: branch: master updated (1.5.2-20090328-88-gf9818bd)



The branch, master has been updated
       via  f9818bd0ae94837c801924edea504a050e8df4e5 (commit)
       via  c222a10cd99cfcc53e991c40f8595ac946a0184d (commit)
       via  9f6ddf9126a312fb0fdd25ba8da3c4f9944b78a8 (commit)
       via  97e51ad1c88349adc4e826de4b0da25d39cdd86d (commit)
      from  9626ff1a94e81c1da8738f21d8f88c2f1e1cbd16 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 README                          |    4 +-
 gattrib/.gitignore              |    8 +-
 gattrib/Makefile.am             |   19 +-
 gattrib/autogen.sh              |   18 +-
 gattrib/configure.ac            |   13 +-
 gattrib/data/Makefile.am        |    5 +-
 gattrib/desktop-i18n            |  538 +++++++++++++++++
 gattrib/m4/.gitignore           |   31 +
 gattrib/m4/geda-desktop-i18n.m4 |   78 +++
 gattrib/po/.gitignore           |    2 +-
 {gschem => gattrib}/po/Makevars |    4 +-
 gattrib/po/de.po                |   14 +-
 gattrib/po/es.po                |   14 +-
 gattrib/po/nl.po                |   14 +-
 gschem/.gitignore               |    8 +-
 gschem/Makefile.am              |   14 +-
 gschem/autogen.sh               |   18 +-
 gschem/configure.ac.in          |   12 +-
 gschem/data/Makefile.am         |    5 +-
 gschem/desktop-i18n             |  538 +++++++++++++++++
 gschem/m4/.gitignore            |   30 +
 gschem/m4/geda-desktop-i18n.m4  |   78 +++
 gschem/po/.gitignore            |    2 +-
 gschem/po/Makevars              |    4 +-
 gschem/po/af.po                 | 1200 +++++++++++++++++++--------------------
 gschem/po/de.po                 | 1204 +++++++++++++++++++--------------------
 gschem/po/en_GB.po              | 1200 +++++++++++++++++++--------------------
 gschem/po/es.po                 | 1200 +++++++++++++++++++--------------------
 gschem/po/fr.po                 | 1204 +++++++++++++++++++--------------------
 gschem/po/it.po                 | 1200 +++++++++++++++++++--------------------
 gschem/po/ja.po                 | 1200 +++++++++++++++++++--------------------
 gschem/po/nl.po                 | 1200 +++++++++++++++++++--------------------
 gschem/po/pt_BR.po              | 1204 +++++++++++++++++++--------------------
 gschem/po/ru.po                 | 1204 +++++++++++++++++++--------------------
 libgeda/.gitignore              |    7 +-
 libgeda/Makefile.am             |   16 +-
 libgeda/autogen.sh              |   18 +-
 libgeda/configure.ac.in         |    7 +-
 libgeda/data/Makefile.am        |   10 +-
 libgeda/desktop-i18n            |  538 +++++++++++++++++
 libgeda/m4/.gitignore           |   36 ++-
 libgeda/m4/geda-desktop-i18n.m4 |   78 +++
 libgeda/po/.gitignore           |    3 +-
 {gschem => libgeda}/po/Makevars |   13 +-
 libgeda/po/de.po                |  306 +++++------
 libgeda/po/domain.mak.in        |    3 +
 libgeda/po/en_GB.po             |  306 +++++------
 libgeda/po/es.po                |  306 +++++------
 libgeda/po/nl.po                |  306 +++++------
 49 files changed, 8543 insertions(+), 6897 deletions(-)
 create mode 100755 gattrib/desktop-i18n
 create mode 100644 gattrib/m4/.gitignore
 create mode 100644 gattrib/m4/geda-desktop-i18n.m4
 copy {gschem => gattrib}/po/Makevars (96%)
 create mode 100755 gschem/desktop-i18n
 create mode 100644 gschem/m4/.gitignore
 create mode 100644 gschem/m4/geda-desktop-i18n.m4
 create mode 100755 libgeda/desktop-i18n
 create mode 100644 libgeda/m4/geda-desktop-i18n.m4
 copy {gschem => libgeda}/po/Makevars (78%)
 create mode 100644 libgeda/po/domain.mak.in


=================
 Commit Messages
=================

commit f9818bd0ae94837c801924edea504a050e8df4e5
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Remove intltool from list of dependencies.

:100644 100644 3bd10d2... 6cb43dc... M	README

commit c222a10cd99cfcc53e991c40f8595ac946a0184d
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gattrib: Don't use intltool.

:100644 100644 55a41ec... 017310f... M	gattrib/.gitignore
:100644 100644 96d7886... bef959f... M	gattrib/Makefile.am
:100755 100755 d5f6367... ec247af... M	gattrib/autogen.sh
:100644 100644 168390d... 39c66a6... M	gattrib/configure.ac
:100644 100644 1d2428b... 183ce4d... M	gattrib/data/Makefile.am
:000000 100755 0000000... 6fab9b8... A	gattrib/desktop-i18n
:000000 100644 0000000... 4fa5430... A	gattrib/m4/.gitignore
:000000 100644 0000000... 5b8af4e... A	gattrib/m4/geda-desktop-i18n.m4
:100644 100644 e700667... 30a4ac9... M	gattrib/po/.gitignore
:000000 100644 0000000... 9b27ec1... A	gattrib/po/Makevars
:100644 100644 e3c2f97... d984cf1... M	gattrib/po/de.po
:100644 100644 59e926f... 2620cb4... M	gattrib/po/es.po
:100644 100644 3127914... a4d2ddc... M	gattrib/po/nl.po

commit 9f6ddf9126a312fb0fdd25ba8da3c4f9944b78a8
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gschem: Don't use intltool.

:100644 100644 ce4fdd3... db9fe06... M	gschem/.gitignore
:100644 100644 5a0ebc8... 5dfd2cc... M	gschem/Makefile.am
:100755 100755 80f01da... b222a1f... M	gschem/autogen.sh
:100644 100644 56bffe9... 70bcbb9... M	gschem/configure.ac.in
:100644 100644 5a56aae... d05fc30... M	gschem/data/Makefile.am
:000000 100755 0000000... 6fab9b8... A	gschem/desktop-i18n
:000000 100644 0000000... 9b2675b... A	gschem/m4/.gitignore
:000000 100644 0000000... 5b8af4e... A	gschem/m4/geda-desktop-i18n.m4
:100644 100644 16a5215... 993ed45... M	gschem/po/.gitignore
:100644 100644 32692ab... 9b27ec1... M	gschem/po/Makevars
:100644 100644 33fdfae... 89324cd... M	gschem/po/af.po
:100644 100644 4452e44... 646ad13... M	gschem/po/de.po
:100644 100644 1f10e3d... e99646c... M	gschem/po/en_GB.po
:100644 100644 b2ca73d... cf4d5c4... M	gschem/po/es.po
:100644 100644 e1979d8... cd1b3b6... M	gschem/po/fr.po
:100644 100644 805159f... 995da26... M	gschem/po/it.po
:100644 100644 f6f3c43... fcfe716... M	gschem/po/ja.po
:100644 100644 de049c6... 6c0ecf7... M	gschem/po/nl.po
:100644 100644 ac3adda... 65075d6... M	gschem/po/pt_BR.po
:100644 100644 8b9b556... d08a7ae... M	gschem/po/ru.po

commit 97e51ad1c88349adc4e826de4b0da25d39cdd86d
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: Don't use intltool.
    
    intltool causes a number of problems at the moment. It's not
    tremendously portable, it hammers the gettext infrastructure heavily,
    and it has large incompatibilities between versions.
    
    Instead I've created a tool called desktop-i18n which does all of the
    things we currently use intltool for, without any dependencies except
    for a working shell & make. It's not as featureful as intltool, but it
    appears to do everything that is required.
    
    Thanks to Dan McMahill for testing and portability suggestions.

:100644 100644 6de2ed7... a040e48... M	libgeda/.gitignore
:100644 100644 3a0edf6... 7b2bef1... M	libgeda/Makefile.am
:100755 100755 80f01da... b222a1f... M	libgeda/autogen.sh
:100644 100644 1bacfe7... 386bf05... M	libgeda/configure.ac.in
:100644 100644 b4e75dc... a3671bc... M	libgeda/data/Makefile.am
:000000 100755 0000000... 6fab9b8... A	libgeda/desktop-i18n
:100644 100644 28cb5f7... d5d05f6... M	libgeda/m4/.gitignore
:000000 100644 0000000... 5b8af4e... A	libgeda/m4/geda-desktop-i18n.m4
:100644 100644 9400023... 178434a... M	libgeda/po/.gitignore
:000000 100644 0000000... e9e8470... A	libgeda/po/Makevars
:100644 100644 9504077... f46030e... M	libgeda/po/de.po
:000000 100644 0000000... 0e45d8b... A	libgeda/po/domain.mak.in
:100644 100644 8f585d2... ca09e90... M	libgeda/po/en_GB.po
:100644 100644 c660bce... 0f881f8... M	libgeda/po/es.po
:100644 100644 b2d5ccf... 28d9139... M	libgeda/po/nl.po

=========
 Changes
=========

commit f9818bd0ae94837c801924edea504a050e8df4e5
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Remove intltool from list of dependencies.

diff --git a/README b/README
index 3bd10d2..6cb43dc 100644
--- a/README
+++ b/README
@@ -13,8 +13,8 @@ README for gEDA/gaf
         - If you are building the repository version, then you will
     	  need the following packages installed as well: 
 
-          	autoconf, automake, libtool, gettext, intltool, 
-	        cvs, flex, groff, transfig
+          	autoconf, automake, libtool, gettext, cvs, flex,
+	        groff, transfig
 
 	- Download all source packages and the toplevel Makefile. 
 	- Untar all packages in a directory and place toplevel Makefile 

commit c222a10cd99cfcc53e991c40f8595ac946a0184d
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gattrib: Don't use intltool.

diff --git a/gattrib/.gitignore b/gattrib/.gitignore
index 55a41ec..017310f 100644
--- a/gattrib/.gitignore
+++ b/gattrib/.gitignore
@@ -16,10 +16,6 @@ install-sh
 missing
 mkinstalldirs
 ABOUT-NLS
-intltool-extract
-intltool-extract.in
-intltool-merge
-intltool-merge.in
-intltool-update
-intltool-update.in
+intl
+.desktop-i18n
 *~
diff --git a/gattrib/Makefile.am b/gattrib/Makefile.am
index 96d7886..bef959f 100644
--- a/gattrib/Makefile.am
+++ b/gattrib/Makefile.am
@@ -1,15 +1,11 @@
 
 AM_CFLAGS = -g -O2 
 
-SUBDIRS = src include lib design docs data po
-
-INTLTOOL_FILES = intltool-extract.in \
-                 intltool-merge.in \
-                 intltool-update.in
+SUBDIRS = po src include lib design docs data
 
 EXTRA_DIST = BUGS NOTES README ChangeLog ChangeLog-1.0 AUTHORS \
 	COPYING INSTALL autogen.sh ToDos \
-	icon-theme-installer $(INTLTOOL_FILES)
+	icon-theme-installer desktop-i18n
 
 distclean-local:
 	-rm -rf autom4te*.cache
@@ -19,13 +15,10 @@ maintainer-clean-local:
 
 MOSTLYCLEANFILES = *.log core FILE *~ #*#
 CLEANFILES = *.log core FILE *~ #*#
-DISTCLEANFILES = *.log core FILE *~ prototype.bak \
-                 intltool-extract \
-                 intltool-merge \
-                 intltool-update \
-                 po/.intltool-merge-cache
+DISTCLEANFILES = *.log core FILE *~ prototype.bak
 MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in configure \
-                       config.status aclocal.m4 \
-                       $(INTLTOOL_FILES) #*#
+                       config.status aclocal.m4 #*#
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-update-desktop-database
+
+ACLOCAL_AMFLAGS = -I m4
diff --git a/gattrib/autogen.sh b/gattrib/autogen.sh
index d5f6367..ec247af 100755
--- a/gattrib/autogen.sh
+++ b/gattrib/autogen.sh
@@ -43,6 +43,16 @@ DIE=0
   }
 }
 
+(grep "^AX_DESKTOP_I18N" $srcdir/$configure_script >/dev/null) && {
+  (test -x $srcdir/desktop-i18n) || {
+    echo
+    echo
+    echo "**Error**: The desktop-i18n program is missing."
+    echo "Ensure that your tarballs are intact or that your git"
+    echo "checkout is up-to-date."
+  }
+}
+
 (automake --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`automake' installed."
@@ -87,7 +97,7 @@ do
     echo processing $dr
     ( cd $dr
 
-      aclocalinclude="$ACLOCAL_FLAGS"
+      aclocalinclude="$ACLOCAL_FLAGS -I m4"
 
       if grep "^AM_GNU_GETTEXT" $configure_script >/dev/null; then
 	echo "autogen.sh running: autopoint ..." 
@@ -95,9 +105,9 @@ do
 	#echo "Creating $dr/po/Makevars ..."
         #mv -f $dr/po/Makevars.template $dr/po/Makevars
       fi
-      if grep "^IT_PROG_INTLTOOL" $configure_script >/dev/null; then
-	echo "autogen.sh running: intltoolize ..."
-	echo "no" | intltoolize --force --copy --automake
+      if grep "^AX_DESKTOP_I18N" $configure_script >/dev/null; then
+        echo "autogen.sh running: desktop-i18n ..."
+        ./desktop-i18n --setup
       fi
       if grep "^AM_PROG_LIBTOOL" $configure_script >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
diff --git a/gattrib/configure.ac b/gattrib/configure.ac
index 168390d..39c66a6 100644
--- a/gattrib/configure.ac
+++ b/gattrib/configure.ac
@@ -37,7 +37,6 @@ AC_PROG_CC
 AM_CONDITIONAL(CCISGCC, test "$GCC" = "yes")	
 AC_PROG_MAKE_SET
 AC_PATH_PROGS(AWK, nawk gawk mawk awk, )
-IT_PROG_INTLTOOL(0.35.0)
 
 ############################################################################
 # Update desktop database utility start
@@ -62,16 +61,10 @@ fi
 # Update desktop database utility end
 ############################################################################
 
-# Set USE_NLS
+# Set up internationalisation
 AM_NLS
-
-# Set package name for translations
-GETTEXT_PACKAGE=$PACKAGE
-AC_SUBST(GETTEXT_PACKAGE)
-
-# Check pre-requsites for the PO dir.
-# (Needed without explicitly initialising gettext)
-AM_PO_SUBDIRS
+AM_GNU_GETTEXT_VERSION([0.16])
+AX_DESKTOP_I18N
 
 #########################################################################
 # 
diff --git a/gattrib/data/Makefile.am b/gattrib/data/Makefile.am
index 1d2428b..183ce4d 100644
--- a/gattrib/data/Makefile.am
+++ b/gattrib/data/Makefile.am
@@ -20,7 +20,10 @@ desktopdir=$(xdgdatadir)/applications
 desktop_in_files = geda-gattrib.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
-@INTLTOOL_DESKTOP_RULE@
+DOMAIN=geda-gattrib
+
+@DESKTOP_I18N_LANGS_RULE@
+@DESKTOP_I18N_DESKTOP_RULE@
 
 install_icon_exec = \
 	$(SHELL) $(top_srcdir)/icon-theme-installer \
diff --git a/gattrib/desktop-i18n b/gattrib/desktop-i18n
new file mode 100755
index 0000000..6fab9b8
--- /dev/null
+++ b/gattrib/desktop-i18n
@@ -0,0 +1,538 @@
+#!/bin/sh
+#                                                   -*-Shell-script-*-
+# Helper script for translating desktop integration data
+# Copyright (C) 2009  Peter Brett <peter@xxxxxxxxxxxxx>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+# usage [EXITSTATUS]
+# ------------------
+# Print a simple help message, then exit with EXITSTATUS
+usage() {
+cat <<EOF
+Carry out translation tasks on desktop integration data.
+
+Usage:
+  desktop-i18n --extract <options> -- <xgettext_options>
+  desktop-i18n --create  <options> INFILE OUTFILE
+  desktop-i18n --setup
+
+  Operating modes:
+      --extract  Extract strings by calling xgettext
+      --create   Substitute translated strings
+      --setup    Setup a source tree to use desktop-i18n
+      --help     Print this message
+
+  Options for --extract mode:
+      --xgettext=XGETTEXT
+                 Specify xgettext executable to use
+
+  Options for --create mode:
+      --gettext=GETTEXT
+                 Specify gettext executable to use
+      --domain=TEXTDOMAIN
+                 Retrieve translated bmessages from TEXTDOMAIN
+      --localedir=TEXTDOMAINDIR
+                 Retrieve message catalog from TEXTDOMAINDIR
+      --lang=LANG  Add a language to translate messages into
+
+In order for this to work, all strings to be matched must be on a
+single line. In a .desktop file, a translatable name-value pair must
+have the desired name prefixed by an underscore. For example:
+
+   _Comment=gEDA Schematic Editor
+
+In a MIME info file, XML tag pairs where the tagname begins with an
+underscore are recognized. Both tags must be on the same line, and
+the tag must be the only XML content on the line. Whitespace at the
+start of the line before the opening tag is preserved. For example:
+
+    <_comment>gEDA circuit schematic</_comment>
+
+Do not include double-quotes (") or slashes (\) in translatable
+strings.
+EOF
+exit $1
+}
+
+# extract_desktop INFILE
+# ----------------------
+# Parse desktop file data from standard input and generate C on
+# standard output. If an error occurs, a message is printed blaming
+# INFILE.
+extract_desktop() {
+  # First argument is name of file being processed
+  echo "/* Generated from $1 by desktop-i18n */"
+  echo
+  # Loop over each line of standard input
+  n=0
+  while read REPLY; do
+    n=`expr $n + 1`
+    regexp='^_\([^=]*\)=\(.*\)$'
+    if ! (echo $REPLY | grep $regexp > /dev/null); then
+      continue
+    fi
+    name=`echo $REPLY | sed -e "s:$regexp:\1:"`
+    msgid=`echo $REPLY | sed -e "s:$regexp:\2:"`
+
+    # Test for bad characters
+    if (echo $msgid | grep '["\\]' > /dev/null); then
+      echo "$1:$n: msgid contains invalid character" >&2
+      exit 2
+    fi
+
+    # Generate output line
+    if test "x$name" != x -a "x$msgid" != x; then
+      echo "_(\"$msgid\");"
+    else
+      echo "$1:$n: name or msgid is empty" >&2
+      exit 2
+    fi
+  done
+}
+
+
+# extract_xml INFILE
+# ------------------
+# Parse XML mimeinfo data from standard input and generate C on
+# standard output. If an error occurs, a message is printed blaming
+# INFILE.
+extract_xml() {
+  echo "/* Generated from $1 by desktop-i18n */"
+  echo
+  # Loop over each line of standard input
+  n=0
+  while read REPLY; do
+    n=`expr $n + 1`
+    regexp='<_\([a-zA-Z][a-zA-Z]*\)>\(.*\)</_\1>'
+    if ! (echo $REPLY | grep $regexp > /dev/null); then
+      continue
+    fi
+    name=`echo $REPLY | sed -e "s:$regexp:\1:"`
+    msgid=`echo $REPLY | sed -e "s:$regexp:\2:"`
+
+    # Test for bad characters
+    if (echo $msgid | grep '["\\]' > /dev/null); then
+      echo "$1:$n: msgid contains invalid character" >&2
+      exit 2
+    fi
+
+    # Generate output line
+    if test "x$name" != x -a "x$msgid" != x; then
+      echo "_(\"$msgid\");"
+    else
+      echo "$1:$n: name or msgid is empty" >&2
+      exit 2
+    fi
+  done
+}
+
+# do_extract [OPTION]... -- [XGETTEXT_OPTION]...
+# ----------------------------------------------
+# A wrapper around xgettext. It identifies the file lists and search
+# directories being used by xgettext, and from them any desktop or
+# mimeinfo files to be processed.
+#
+# It then creates a new private directory, and adds it to the xgettext
+# search path. It creates a new file list and set of preprocessed
+# files in that directory, and then calls xgettext (preserving all
+# other original arguments).
+do_extract() {
+  XGETTEXT=xgettext
+
+  # First we have to process the command-line arguments
+  for arg; do
+    # Split into name=value
+    name=`echo $arg | sed -e's:=.*::'`
+    value=`echo $arg | sed -e's:^[^=]*=*::'`
+
+    if test "X$in_xg_args" = X; then
+      # This is an argument only for this script
+      case $name in
+        --xgettext) XGETTEXT="$value";;
+        --help)     usage;;
+        --)         in_xg_args=1;;
+        *)          usage 1;;
+      esac
+
+    else
+      # This is an argument to xgettext.  Luckily the Makefile only
+      # uses full-length arguments, and we only really care about the
+      # ones from there!
+      case $name in
+        --directory)  search_dirs="$search_dirs $value";;
+        --files-from) file_lists="$file_lists $value";;
+        *)
+          # We just want to pass this arg straight to xgettext, so
+          # stick it back on the end of the positional parameters
+          set x "$@" "$arg"; shift;;
+      esac
+    fi
+
+    # Discard processed arg from positional parameters
+    shift
+  done
+
+  # If our private data directory exists, die. Otherwise, create it.
+  priv_dir=.po-input
+  if test -d $priv_dir; then
+    echo "desktop-i18n: $PWD/$priv_dir already exists"
+    exit 3
+  fi
+  mkdir $priv_dir
+
+  # Process file lists if necessary
+  if test "X$file_lists" != X; then
+    # Extract names of files we need to preprocess
+    desktop_in=`cat $file_lists | grep ".desktop.in$"`
+    xml_in=`cat $file_lists | grep ".xml.in$"`
+
+    # Create a new POTFILES file which uses the postprocessed
+    # filenames instead of the original ones.
+    cat $file_lists | \
+      sed -e "s:.desktop.in$:.desktop.in.h:" -e "s:.xml.in$:.xml.in.h:" \
+        > $priv_dir/POTFILES
+  fi
+
+  # Preprocess .desktop files
+  for f in $desktop_in; do
+    src=`_search_file $f $search_dirs` || { rm -rf $priv_dir; exit 3; }
+    mkdir -p $priv_dir/`dirname $f`
+    extract_desktop $f < $src > $priv_dir/$f.h
+  done
+
+  # Preprocess .xml files
+  for f in $xml_in; do
+    src=`_search_file $f $search_dirs` || { rm -rf $priv_dir; exit 3; }
+    mkdir -p $priv_dir/`dirname $f`
+    extract_xml $f < $src > $priv_dir/$f.h
+  done
+
+  # Call xgettext (recall we saved some args in $@)
+  gen_args="--files-from=$priv_dir/POTFILES --directory=$priv_dir"
+  for d in $search_dirs; do
+    gen_args="$gen_args --directory=$d"
+  done
+  $XGETTEXT $gen_args "$@"
+
+  # Clean up private directory
+  rm -rf $priv_dir
+}
+
+_search_file() {
+  f=$1
+  shift
+  for d in $@; do
+    if test -f "$d/$f"; then echo "$d/$f"; exit; fi
+  done
+  echo "desktop-i18n: Cannot find $f in xgettext search directories"
+}
+
+# create_desktop INFILE
+# ---------------------
+# Parse desktop file data from standard input and generate a
+# translated desktop file on standard output. If an error occurs, a
+# message is printed blaming INFILE.
+create_desktop() {
+  # Loop over each line of standard input
+  n=0
+  while read REPLY; do
+    n=`expr $n + 1`
+    regexp='^_\([^=]*\)=\(.*\)$'
+    if ! (echo $REPLY | grep $regexp > /dev/null); then
+      echo $REPLY
+      continue
+    fi
+    name=`echo $REPLY | sed -e "s:$regexp:\1:"`
+    msgid=`echo $REPLY | sed -e "s:$regexp:\2:"`
+
+    # Test for bad characters
+    if (echo $msgid | grep '["\\]' > /dev/null); then
+      echo "$1:$n: msgid contains invalid character" >&2
+      exit 2
+    fi
+
+    # Generate first output line
+    echo "$name=$msgid"
+
+    # Generate language-specific output lines
+    for lang in $LINGUAS; do
+      msg=`LANGUAGE=$lang $GETTEXT "$msgid"`
+      # If translated message is unmodified, don't write an output
+      # line
+      if test "x$msg" = x -o "$msg" = "$msgid"; then
+        continue;
+      fi
+
+      echo "$name[$lang]=$msg"
+    done
+  done
+}
+
+# create_xml INFILE
+# -----------------
+# Parse XML mimeinfo data from standard input and generate a
+# translated mimeinfo file on standard output. If an error occurs, a
+# message is printed blaming INFILE.
+create_xml() {
+  # Loop over each line of standard input
+  n=0
+  while read REPLY; do
+    n=`expr $n + 1`
+    regexp='<_\([a-zA-Z][a-zA-Z]*\)>\(.*\)</_\1>'
+    if ! (echo $REPLY | grep $regexp > /dev/null); then
+      echo "$REPLY"
+      continue
+    fi
+    name=`echo $REPLY | sed -e "s:$regexp:\1:"`
+    msgid=`echo $REPLY | sed -e "s:$regexp:\2:"`
+    prefix=`echo $REPLY | sed -e "s:^\(.*\)<_$name>.*:\1:"`
+    suffix=`echo $REPLY | sed -e "s:.*</_$name>\(.*\):\1:"`
+
+    # Test for bad characters
+    if (echo $msgid | grep '["\\]' > /dev/null); then
+      echo "$1:$n: msgid contains invalid character" >&2
+      exit 2
+    fi
+
+    # Test for non-empty prefix/suffix
+    if test "x$prefix" != x -o "x$suffix" != x; then
+      echo "$1:$n: translatable tag must be alone on line" >&2
+      exit 2
+    fi
+
+    # Generate first output line
+    echo "$REPLY" | sed -e "s:<_\($name\)>\(.*\)</_\1>:<\1>\2</\1>:"
+
+    # Generate language-specific output lines
+    for lang in $LINGUAS; do
+      msg=`LANGUAGE=$lang $GETTEXT "$msgid"`
+      # If translated message is unmodified, don't write an output
+      # line
+      if test "x$msg" = x -o "$msg" = "$msgid"; then
+        continue;
+      fi
+      echo "$REPLY" | sed -e "s,<_\($name\)>\(.*\)</_\1>,<\1 xml:lang=\"$lang\">$msg</\1>,"
+    done
+  done
+}
+
+# do_create [OPTION]... INFILE OUTFILE
+# ------------------------------------
+# Substitutes translations into .desktop or mimeinfo files.
+do_create() {
+  GETTEXT=gettext
+
+  # First process command-line arguments
+  for arg; do
+    # Split into name=value
+    name=`echo $arg | sed -e's:=.*::'`
+    value=`echo $arg | sed -e's:^[^=]*=*::'`
+
+    case $name in
+      --gettext)   GETTEXT=$value;;
+      --domain)    TEXTDOMAIN=$value;;
+      --localedir) TEXTDOMAINDIR=$value;;
+      --lang)      LINGUAS="$LINGUAS $value";;
+      *)
+        # Arg might be a filename, so save it at the end of the
+        # positional parameters
+        set x "$@" "$arg"; shift
+    esac
+
+    # Discard processed arg from positional parameters
+    shift
+  done
+
+  if test $# != 2; then usage 1; fi # Should only have 2 args left
+  INFILE=$1; OUTFILE=$2
+  if ! test -r $INFILE; then
+    echo "desktop-i18n: Cannot open $INFILE for reading."
+    exit 3
+  fi
+
+  export TEXTDOMAIN
+  export GETTEXT
+  export TEXTDOMAINDIR
+  export LINGUAS
+
+  if (echo "$INFILE" | grep ".desktop.in$" > /dev/null); then
+    create_desktop $INFILE < $INFILE > $OUTFILE
+    exit 0
+  fi
+
+  if (echo "$INFILE" | grep ".xml.in$" > /dev/null); then
+    create_xml $INFILE < $INFILE > $OUTFILE
+    exit 0
+  fi
+
+  echo "desktop-i18n: $INFILE: Unrecognized extension"
+  exit 1
+}
+
+# do_setup [DIR]
+# --------------
+# Try to set up a source tree to use desktop-i18n.
+#
+# This is a nasty bit of hackery. We need to insert some rules into
+# the Makefile.in.in installed by gettextize/autopoint so that make
+# knows how to generate input for xgettext.
+#
+# Unfortunately, there's no nice way to do this, so we do it by
+# appending some rules onto each Makefile.in.in, using the following
+# procedure:
+#
+# 1. Look for configure.ac in DIR, or in cwd if DIR wasn't
+#    specified. If we can't find it, whinge.
+# 2. If configure.ac doesn't have AX_DESKTOP_I18N, quit successfully.
+# 3. Find anywhere where AC_CONFIG_FILES is called. For each
+#    Makefile.in found in the list of files to create:
+#    (a) Check for Makefile.in.in. If it doesn't exist, skip with a warning.
+#    (b) If Makefile.in.in contains the string DESKTOP_I18N_RULES,
+#        skip silently.
+#    (c) Append a chunk of rules onto Makefile.in.in
+#
+# Note that we can't use a po/Rules-* file because substitution is not
+# carried out on these files.
+do_setup() {
+  # Was DIR specified?
+  if test "x$1" = x; then srcdir=.; else srcdir=$1; fi
+
+  # Can we find configure.ac or configure.in?
+  for f in configure.ac configure.in; do
+    if test -r $srcdir/$f; then
+      ac_file=$srcdir/$f
+      break
+    fi
+  done
+  if test "x$ac_file" = x; then
+    echo "Cannot find configure.ac or configure.in!"
+    exit 4
+  fi
+
+  # Check that configure.ac is readable
+  if ! test -r $ac_file; then
+    echo "Cannot open $ac_file for reading."
+    exit 3
+  fi
+
+  # Is the AX_DESKTOP_I18N macro present?
+  if ! grep AX_DESKTOP_I18N $ac_file > /dev/null; then
+    exit
+  fi
+
+  # Now we use a piece of m4 code to try and discover all of the
+  # configuration files. This is UGLY AND BAD, because it only detects
+  # when AC_CONFIG_FILES is called in the main configure script (if
+  # AC_CONFIG_FILES is called by another macro somewhere, it won't be
+  # detected).
+  cat - $ac_file > conftest <<EOF
+changequote([,])dnl
+divert([-1])
+define([AC_CONFIG_FILES], [divert([0])[\$1]divert([-1])])
+EOF
+  conf_files=`m4 conftest`
+  rm conftest
+
+  # Look for any files called Makefile.in.
+  for f in $conf_files; do
+    # Discard any composition rules and prepend srcdir.
+    f=`echo "$f" | sed -e 's,:.*,,'`
+    f="$srcdir/$f"
+
+    # Skip files not called Makefile.in
+    if test `echo "$f" | sed -e 's:.*/::'` != Makefile.in; then
+      continue
+    fi
+
+    # Check that a corresponding Makefile.in.in exists and we can
+    # read/write it
+    if ! test -r $f.in -a -w $f.in; then
+      echo "desktop-i18n: Cannot process $f.in"
+      continue
+    fi
+
+    # Check that we haven't already hacked it
+    if grep DESKTOP_I18N_RULES $f.in > /dev/null; then
+      continue
+    fi
+
+    # Append our rules
+    echo "desktop-i18n: modifying $f.in"
+    cat >> $f.in <<EOF
+
+# DESKTOP_I18N_RULES  (Do not edit or remove this line)
+#####################################################################
+# Makefile rules needed by the desktop-i18n tool.
+# Copyright (C) 2009  Peter Brett <peter@xxxxxxxxxxxxx>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+top_builddir = @top_builddir@
+MKDIR_P = @MKDIR_P@
+
+DESKTOP_I18N_LOCALE_DIR = @DESKTOP_I18N_LOCALE_DIR@
+
+# We need to temporarily install the localisation files somewhere so
+# that desktop-i18n --create can look up messages in them. We recreate
+# the timestamp before *and* after running 'make install' so that the
+# make doesn't go into an infinite loop!
+all: stamp-i18n
+stamp-i18n: \$(DESKTOP_I18N_LOCALE_DIR) stamp-po Makefile
+	@echo timestamp > stamp-i18nT && mv stamp-i18nT stamp-i18n
+	\$(MAKE) prefix=\$(DESKTOP_I18N_LOCALE_DIR) install && \
+	cp \$(srcdir)/LINGUAS \$(DESKTOP_I18N_LOCALE_DIR)/\$(DOMAIN).LINGUAS \
+	|| rm stamp-i18n
+	@echo timestamp > stamp-i18nT && mv stamp-i18nT stamp-i18n
+\$(DESKTOP_I18N_LOCALE_DIR):
+	\$(MKDIR_P) \$(DESKTOP_I18N_LOCALE_DIR)
+
+clean: clean-i18n
+clean-i18n:
+	-rm -rf \$(DESKTOP_I18N_LOCALE_DIR) stamp-i18n
+
+# End of desktop-i18n rules
+#####################################################################
+
+EOF
+  done
+}
+
+
+
+# First argument has to be the mode of operation. Then call the
+# appropriate function to process the rest of the arguments and do the
+# work.
+if test -z $1; then usage 1; fi
+MODE=$1; shift
+case $MODE in
+  --extract) do_extract "$@";;
+  --create) do_create "$@";;
+  --setup) do_setup "$@";;
+  --help) usage;;
+  *) usage 1;;
+esac
diff --git a/gattrib/m4/.gitignore b/gattrib/m4/.gitignore
new file mode 100644
index 0000000..4fa5430
--- /dev/null
+++ b/gattrib/m4/.gitignore
@@ -0,0 +1,31 @@
+codeset.m4
+gettext.m4
+glibc2.m4
+glibc21.m4
+iconv.m4
+intdiv0.m4
+intl.m4
+intldir.m4
+intmax.m4
+inttypes-pri.m4
+inttypes_h.m4
+lcmessage.m4
+lib-ld.m4
+lib-link.m4
+lib-prefix.m4
+lock.m4
+longdouble.m4
+longlong.m4
+nls.m4
+po.m4
+printf-posix.m4
+progtest.m4
+size_max.m4
+stdint_h.m4
+uintmax_t.m4
+ulonglong.m4
+visibility.m4
+wchar_t.m4
+wint_t.m4
+xsize.m4
+*~
diff --git a/gattrib/m4/geda-desktop-i18n.m4 b/gattrib/m4/geda-desktop-i18n.m4
new file mode 100644
index 0000000..5b8af4e
--- /dev/null
+++ b/gattrib/m4/geda-desktop-i18n.m4
@@ -0,0 +1,78 @@
+# geda-desktop-i18n.m4                                  -*-Autoconf-*-
+# serial 1
+
+dnl Carry out configuration tasks needed by desktop-i18n tool
+dnl Copyright (C) 2009  Peter Brett <peter@xxxxxxxxxxxxx>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+AC_DEFUN([AX_DESKTOP_I18N],
+[
+  AC_PREREQ([2.60])dnl
+  AC_REQUIRE([AM_NLS])dnl
+  AC_REQUIRE([AM_PO_SUBDIRS])dnl
+  dnl Complain if desktop-i18n is missing
+  AC_REQUIRE_AUX_FILE([desktop-i18n])
+
+  # We need to check that GNU gettext is available
+  AM_PATH_PROG_WITH_TEST([GETTEXT], [gettext],
+    [$ac_dir/$ac_word --version | grep GNU > /dev/null], :)
+  if test "x$GETTEXT" = x; then
+    AC_MSG_ERROR([The GNU gettext program could not be found. Please ensure that GNU
+gettext is correctly installed, and rerun configure.])
+  fi
+  AC_SUBST([GETTEXT])
+
+  # How should desktop-i18n be run?
+  DESKTOP_I18N_SCRIPT="$am_aux_dir/desktop-i18n"
+  if test "X$GETTEXT" != "Xgettext"; then
+    DESKTOP_I18N="\${SHELL} $DESKTOP_I18N_SCRIPT"
+  else
+    DESKTOP_I18N="GETTEXT=\${GETTEXT} \${SHELL} $DESKTOP_I18N_SCRIPT"
+  fi
+  AC_SUBST([DESKTOP_I18N_SCRIPT])
+  AC_SUBST([DESKTOP_I18N])
+
+  # We have a private directory to temporarily install locale data
+  # into.
+  DESKTOP_I18N_LOCALE_DIR='$(top_builddir)/.desktop-i18n'
+  AC_SUBST([DESKTOP_I18N_LOCALE_DIR])
+
+  # Substitute our own evil, corrupted version of xgettext.
+  # Mwahahahaha!
+  XGETTEXT="$DESKTOP_I18N --extract --xgettext=$XGETTEXT --"
+
+  # Define some rules for substitution into Makefiles
+  DESKTOP_I18N_CREATE='$(DESKTOP_I18N) --create --gettext=$(GETTEXT) --domain=$(DOMAIN) \
+    --localedir=$(DESKTOP_I18N_LOCALE_DIR)/share/locale $(DESKTOP_I18N_LANGS)'
+  DESKTOP_I18N_LANGS_RULE='DESKTOP_I18N_LANGS = $(addprefix --lang=,$(shell cat $(DESKTOP_I18N_LOCALE_DIR)/$(DOMAIN).LINGUAS))'
+  DESKTOP_I18N_DESKTOP_RULE='%.desktop: %.desktop.in ; $(DESKTOP_I18N_CREATE) $< [$]@'
+  DESKTOP_I18N_XML_RULE='%.xml: %.xml.in ; $(DESKTOP_I18N_CREATE) $< [$]@'
+
+  AC_SUBST([DESKTOP_I18N_CREATE])
+  _IT_SUBST([DESKTOP_I18N_LANGS_RULE])
+  _IT_SUBST([DESKTOP_I18N_DESKTOP_RULE])
+  _IT_SUBST([DESKTOP_I18N_XML_RULE])
+])dnl AX_DESKTOP_I18N
+
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+# Stolen from intltool.m4 (GPL v2)
+AC_DEFUN([_IT_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+])dnl _IT_SUBST
diff --git a/gattrib/po/.gitignore b/gattrib/po/.gitignore
index e700667..30a4ac9 100644
--- a/gattrib/po/.gitignore
+++ b/gattrib/po/.gitignore
@@ -12,5 +12,5 @@ Makevars.template
 geda-gattrib.pot
 stamp-po
 stamp-it
-.intltool-merge-cache
+stamp-i18n
 *~
diff --git a/gattrib/po/Makevars b/gattrib/po/Makevars
new file mode 100644
index 0000000..9b27ec1
--- /dev/null
+++ b/gattrib/po/Makevars
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = gEDA Developers
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = geda-bug@xxxxxxxx
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/gattrib/po/de.po b/gattrib/po/de.po
index e3c2f97..d984cf1 100644
--- a/gattrib/po/de.po
+++ b/gattrib/po/de.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: de_DE\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 14:51-0400\n"
+"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
+"POT-Creation-Date: 2009-06-18 11:24+0100\n"
 "PO-Revision-Date: 2008-12-20 14:37+0000\n"
 "Last-Translator: Werner Hoch <werner.ho@xxxxxx>\n"
 "Language-Team: deutsch <de@xxxxxx>\n"
@@ -16,10 +16,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../data/geda-gattrib.desktop.in.h:1
-msgid "Manipulate component attributes with gattrib"
-msgstr "Editieren von Bauteilattributen mit gattrib"
-
-#: ../data/geda-gattrib.desktop.in.h:2
+#: data/geda-gattrib.desktop.in.h:3
 msgid "gEDA Attribute Editor"
 msgstr "gEDA Attributeditor"
+
+#: data/geda-gattrib.desktop.in.h:4
+msgid "Manipulate component attributes with gattrib"
+msgstr "Editieren von Bauteilattributen mit gattrib"
diff --git a/gattrib/po/es.po b/gattrib/po/es.po
index 59e926f..2620cb4 100644
--- a/gattrib/po/es.po
+++ b/gattrib/po/es.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gattrib VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 14:51-0400\n"
+"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
+"POT-Creation-Date: 2009-06-18 11:24+0100\n"
 "PO-Revision-Date: 2008-12-20 14:03+0000\n"
 "Last-Translator: Carlos Nieves Ã?nega <cnieves@xxxxxxxxx>\n"
 "Language-Team: geda-dev <geda-dev@xxxxxxxxxxxxx>Report-Msgid-Bugs-To: MIME-"
@@ -17,10 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/geda-gattrib.desktop.in.h:1
-msgid "Manipulate component attributes with gattrib"
-msgstr "Manejar propiedades de componentes con gattrib"
-
-#: ../data/geda-gattrib.desktop.in.h:2
+#: data/geda-gattrib.desktop.in.h:3
 msgid "gEDA Attribute Editor"
 msgstr "Editor de Propiedades de gEDA"
+
+#: data/geda-gattrib.desktop.in.h:4
+msgid "Manipulate component attributes with gattrib"
+msgstr "Manejar propiedades de componentes con gattrib"
diff --git a/gattrib/po/nl.po b/gattrib/po/nl.po
index 3127914..a4d2ddc 100644
--- a/gattrib/po/nl.po
+++ b/gattrib/po/nl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geda-gattrib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 14:51-0400\n"
+"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
+"POT-Creation-Date: 2009-06-18 11:24+0100\n"
 "PO-Revision-Date: 2008-12-20 14:03+0000\n"
 "Last-Translator: Bert Timmerman <bert.timmerman@xxxxxxxxx>\n"
 "Language-Team: gEDA developers <geda-dev@xxxxxxxxxxxxxx>\n"
@@ -17,10 +17,10 @@ msgstr ""
 "X-Poedit-Language: Dutch\n"
 "X-Poedit-Country: NETHERLANDS\n"
 
-#: ../data/geda-gattrib.desktop.in.h:1
-msgid "Manipulate component attributes with gattrib"
-msgstr "Manipuleer componenten attributen met gattrib"
-
-#: ../data/geda-gattrib.desktop.in.h:2
+#: data/geda-gattrib.desktop.in.h:3
 msgid "gEDA Attribute Editor"
 msgstr "gEDA Attribuut Bewerking"
+
+#: data/geda-gattrib.desktop.in.h:4
+msgid "Manipulate component attributes with gattrib"
+msgstr "Manipuleer componenten attributen met gattrib"

commit 9f6ddf9126a312fb0fdd25ba8da3c4f9944b78a8
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gschem: Don't use intltool.

diff --git a/gschem/.gitignore b/gschem/.gitignore
index ce4fdd3..db9fe06 100644
--- a/gschem/.gitignore
+++ b/gschem/.gitignore
@@ -17,12 +17,6 @@ install-sh
 missing
 mkinstalldirs
 ABOUT-NLS
-intltool-extract.in
-intltool-merge.in
-intltool-update.in
-intltool-extract
-intltool-merge
-intltool-update
 *~
 *#
 TAGS
@@ -32,4 +26,4 @@ GSYMS
 GTAGS
 HTML
 gschem.log
-m4
+.desktop-i18n
diff --git a/gschem/Makefile.am b/gschem/Makefile.am
index 5a0ebc8..5dfd2cc 100644
--- a/gschem/Makefile.am
+++ b/gschem/Makefile.am
@@ -1,12 +1,8 @@
 SUBDIRS = include lib intl src po scheme bitmap scripts examples \
           tests docs data
 
-INTLTOOL_FILES = intltool-extract.in \
-                 intltool-merge.in \
-                 intltool-update.in
-
 EXTRA_DIST = BUGS ChangeLog-1.0 autogen.sh config.rpath configure.ac.in \
-             icon-theme-installer $(INTLTOOL_FILES)
+             icon-theme-installer desktop-i18n
 
 #proto:
 #	(cd src ; ./create_proto)
@@ -31,13 +27,9 @@ ACLOCAL_AMFLAGS = -I m4
 
 MOSTLYCLEANFILES = *.log core FILE *~
 CLEANFILES = *.log core FILE *~
-DISTCLEANFILES = *.log core FILE *~ prototype.bak \
-                 intltool-extract \
-                 intltool-merge \
-                 intltool-update \
-                 po/.intltool-merge-cache
+DISTCLEANFILES = *.log core FILE *~ prototype.bak
 MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in configure config.h.in \
 	               config.status aclocal.m4 config.guess config.rpath \
 		       config.sub depcomp install-sh missing mkinstalldirs \
-		       configure.ac $(INTLTOOL_FILES)
+		       configure.ac
 DISTCHECK_CONFIGURE_FLAGS = --disable-update-desktop-database
diff --git a/gschem/autogen.sh b/gschem/autogen.sh
index 80f01da..b222a1f 100755
--- a/gschem/autogen.sh
+++ b/gschem/autogen.sh
@@ -61,6 +61,16 @@ DIE=0
   }
 }
 
+(grep "^AX_DESKTOP_I18N" $srcdir/$configure_script >/dev/null) && {
+  (test -x $srcdir/desktop-i18n) || {
+    echo
+    echo
+    echo "**Error**: The desktop-i18n program is missing."
+    echo "Ensure that your tarballs are intact or that your git"
+    echo "checkout is up-to-date."
+  }
+}
+
 (automake --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`automake' installed."
@@ -155,10 +165,10 @@ do
 	  echo "autogen.sh running: autopoint ..." 
 	  echo "no" | autopoint --force 
 	fi
-	if grep "^IT_PROG_INTLTOOL" $configure_script >/dev/null; then
-	    echo "autogen.sh running: intltoolize ..."
-	    echo "no" | intltoolize --force --copy --automake
-	fi
+        if grep "^AX_DESKTOP_I18N" $configure_script >/dev/null; then
+          echo "autogen.sh running: desktop-i18n ..."
+          ./desktop-i18n --setup
+        fi
 	if grep "^AM_PROG_LIBTOOL" $configure_script >/dev/null; then
 	    echo "autogen.sh running: libtoolize ..."
 	    $LIBTOOLIZE --force --copy
diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in
index 56bffe9..70bcbb9 100644
--- a/gschem/configure.ac.in
+++ b/gschem/configure.ac.in
@@ -67,7 +67,7 @@ AC_PROG_CC
 AM_CONDITIONAL(CCISGCC, test "$GCC" = "yes")    
 AC_PROG_CPP
 AC_PROG_MAKE_SET
-IT_PROG_INTLTOOL(0.35.0)
+
 
 ############################################################################
 # Update desktop database utility start
@@ -341,10 +341,6 @@ AC_CHECK_HEADER([locale.h],
                   fi
                 ])
 
-# Set package name for translations
-GETTEXT_PACKAGE=$PACKAGE
-AC_SUBST(GETTEXT_PACKAGE)
-
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 
@@ -478,11 +474,7 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package])
 AM_GNU_GETTEXT
 AM_GNU_GETTEXT_VERSION([%INSTALLED_GETTEXT_VERSION%])
 
-#GETTEXT_PACKAGE=$PACKAGE
-#AC_SUBST(GETTEXT_PACKAGE)
-#AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],
-#                   [The domain to use with gettext])
-#AM_GLIB_GNU_GETTEXT
+AX_DESKTOP_I18N
 
 # Finally create the final CFLAGS and LDFLAGS for use in the makefiles
 GSCHEM_CFLAGS="$MINGW_CFLAGS $LIBSTROKE_CFLAGS $LIBGEDA_CFLAGS $GLIB_CFLAGS $GTK_CFLAGS $GTHREAD_CFLAGS $GUILE_CFLAGS"
diff --git a/gschem/data/Makefile.am b/gschem/data/Makefile.am
index 5a56aae..d05fc30 100644
--- a/gschem/data/Makefile.am
+++ b/gschem/data/Makefile.am
@@ -20,7 +20,10 @@ desktopdir=$(xdgdatadir)/applications
 desktop_in_files = geda-gschem.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
-@INTLTOOL_DESKTOP_RULE@
+DOMAIN=geda-gschem
+
+@DESKTOP_I18N_LANGS_RULE@
+@DESKTOP_I18N_DESKTOP_RULE@
 
 install_icon_exec = \
 	$(SHELL) $(top_srcdir)/icon-theme-installer \
diff --git a/gschem/desktop-i18n b/gschem/desktop-i18n
new file mode 100755
index 0000000..6fab9b8
--- /dev/null
+++ b/gschem/desktop-i18n
@@ -0,0 +1,538 @@
+#!/bin/sh
+#                                                   -*-Shell-script-*-
+# Helper script for translating desktop integration data
+# Copyright (C) 2009  Peter Brett <peter@xxxxxxxxxxxxx>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+# usage [EXITSTATUS]
+# ------------------
+# Print a simple help message, then exit with EXITSTATUS
+usage() {
+cat <<EOF
+Carry out translation tasks on desktop integration data.
+
+Usage:
+  desktop-i18n --extract <options> -- <xgettext_options>
+  desktop-i18n --create  <options> INFILE OUTFILE
+  desktop-i18n --setup
+
+  Operating modes:
+      --extract  Extract strings by calling xgettext
+      --create   Substitute translated strings
+      --setup    Setup a source tree to use desktop-i18n
+      --help     Print this message
+
+  Options for --extract mode:
+      --xgettext=XGETTEXT
+                 Specify xgettext executable to use
+
+  Options for --create mode:
+      --gettext=GETTEXT
+                 Specify gettext executable to use
+      --domain=TEXTDOMAIN
+                 Retrieve translated bmessages from TEXTDOMAIN
+      --localedir=TEXTDOMAINDIR
+                 Retrieve message catalog from TEXTDOMAINDIR
+      --lang=LANG  Add a language to translate messages into
+
+In order for this to work, all strings to be matched must be on a
+single line. In a .desktop file, a translatable name-value pair must
+have the desired name prefixed by an underscore. For example:
+
+   _Comment=gEDA Schematic Editor
+
+In a MIME info file, XML tag pairs where the tagname begins with an
+underscore are recognized. Both tags must be on the same line, and
+the tag must be the only XML content on the line. Whitespace at the
+start of the line before the opening tag is preserved. For example:
+
+    <_comment>gEDA circuit schematic</_comment>
+
+Do not include double-quotes (") or slashes (\) in translatable
+strings.
+EOF
+exit $1
+}
+
+# extract_desktop INFILE
+# ----------------------
+# Parse desktop file data from standard input and generate C on
+# standard output. If an error occurs, a message is printed blaming
+# INFILE.
+extract_desktop() {
+  # First argument is name of file being processed
+  echo "/* Generated from $1 by desktop-i18n */"
+  echo
+  # Loop over each line of standard input
+  n=0
+  while read REPLY; do
+    n=`expr $n + 1`
+    regexp='^_\([^=]*\)=\(.*\)$'
+    if ! (echo $REPLY | grep $regexp > /dev/null); then
+      continue
+    fi
+    name=`echo $REPLY | sed -e "s:$regexp:\1:"`
+    msgid=`echo $REPLY | sed -e "s:$regexp:\2:"`
+
+    # Test for bad characters
+    if (echo $msgid | grep '["\\]' > /dev/null); then
+      echo "$1:$n: msgid contains invalid character" >&2
+      exit 2
+    fi
+
+    # Generate output line
+    if test "x$name" != x -a "x$msgid" != x; then
+      echo "_(\"$msgid\");"
+    else
+      echo "$1:$n: name or msgid is empty" >&2
+      exit 2
+    fi
+  done
+}
+
+
+# extract_xml INFILE
+# ------------------
+# Parse XML mimeinfo data from standard input and generate C on
+# standard output. If an error occurs, a message is printed blaming
+# INFILE.
+extract_xml() {
+  echo "/* Generated from $1 by desktop-i18n */"
+  echo
+  # Loop over each line of standard input
+  n=0
+  while read REPLY; do
+    n=`expr $n + 1`
+    regexp='<_\([a-zA-Z][a-zA-Z]*\)>\(.*\)</_\1>'
+    if ! (echo $REPLY | grep $regexp > /dev/null); then
+      continue
+    fi
+    name=`echo $REPLY | sed -e "s:$regexp:\1:"`
+    msgid=`echo $REPLY | sed -e "s:$regexp:\2:"`
+
+    # Test for bad characters
+    if (echo $msgid | grep '["\\]' > /dev/null); then
+      echo "$1:$n: msgid contains invalid character" >&2
+      exit 2
+    fi
+
+    # Generate output line
+    if test "x$name" != x -a "x$msgid" != x; then
+      echo "_(\"$msgid\");"
+    else
+      echo "$1:$n: name or msgid is empty" >&2
+      exit 2
+    fi
+  done
+}
+
+# do_extract [OPTION]... -- [XGETTEXT_OPTION]...
+# ----------------------------------------------
+# A wrapper around xgettext. It identifies the file lists and search
+# directories being used by xgettext, and from them any desktop or
+# mimeinfo files to be processed.
+#
+# It then creates a new private directory, and adds it to the xgettext
+# search path. It creates a new file list and set of preprocessed
+# files in that directory, and then calls xgettext (preserving all
+# other original arguments).
+do_extract() {
+  XGETTEXT=xgettext
+
+  # First we have to process the command-line arguments
+  for arg; do
+    # Split into name=value
+    name=`echo $arg | sed -e's:=.*::'`
+    value=`echo $arg | sed -e's:^[^=]*=*::'`
+
+    if test "X$in_xg_args" = X; then
+      # This is an argument only for this script
+      case $name in
+        --xgettext) XGETTEXT="$value";;
+        --help)     usage;;
+        --)         in_xg_args=1;;
+        *)          usage 1;;
+      esac
+
+    else
+      # This is an argument to xgettext.  Luckily the Makefile only
+      # uses full-length arguments, and we only really care about the
+      # ones from there!
+      case $name in
+        --directory)  search_dirs="$search_dirs $value";;
+        --files-from) file_lists="$file_lists $value";;
+        *)
+          # We just want to pass this arg straight to xgettext, so
+          # stick it back on the end of the positional parameters
+          set x "$@" "$arg"; shift;;
+      esac
+    fi
+
+    # Discard processed arg from positional parameters
+    shift
+  done
+
+  # If our private data directory exists, die. Otherwise, create it.
+  priv_dir=.po-input
+  if test -d $priv_dir; then
+    echo "desktop-i18n: $PWD/$priv_dir already exists"
+    exit 3
+  fi
+  mkdir $priv_dir
+
+  # Process file lists if necessary
+  if test "X$file_lists" != X; then
+    # Extract names of files we need to preprocess
+    desktop_in=`cat $file_lists | grep ".desktop.in$"`
+    xml_in=`cat $file_lists | grep ".xml.in$"`
+
+    # Create a new POTFILES file which uses the postprocessed
+    # filenames instead of the original ones.
+    cat $file_lists | \
+      sed -e "s:.desktop.in$:.desktop.in.h:" -e "s:.xml.in$:.xml.in.h:" \
+        > $priv_dir/POTFILES
+  fi
+
+  # Preprocess .desktop files
+  for f in $desktop_in; do
+    src=`_search_file $f $search_dirs` || { rm -rf $priv_dir; exit 3; }
+    mkdir -p $priv_dir/`dirname $f`
+    extract_desktop $f < $src > $priv_dir/$f.h
+  done
+
+  # Preprocess .xml files
+  for f in $xml_in; do
+    src=`_search_file $f $search_dirs` || { rm -rf $priv_dir; exit 3; }
+    mkdir -p $priv_dir/`dirname $f`
+    extract_xml $f < $src > $priv_dir/$f.h
+  done
+
+  # Call xgettext (recall we saved some args in $@)
+  gen_args="--files-from=$priv_dir/POTFILES --directory=$priv_dir"
+  for d in $search_dirs; do
+    gen_args="$gen_args --directory=$d"
+  done
+  $XGETTEXT $gen_args "$@"
+
+  # Clean up private directory
+  rm -rf $priv_dir
+}
+
+_search_file() {
+  f=$1
+  shift
+  for d in $@; do
+    if test -f "$d/$f"; then echo "$d/$f"; exit; fi
+  done
+  echo "desktop-i18n: Cannot find $f in xgettext search directories"
+}
+
+# create_desktop INFILE
+# ---------------------
+# Parse desktop file data from standard input and generate a
+# translated desktop file on standard output. If an error occurs, a
+# message is printed blaming INFILE.
+create_desktop() {
+  # Loop over each line of standard input
+  n=0
+  while read REPLY; do
+    n=`expr $n + 1`
+    regexp='^_\([^=]*\)=\(.*\)$'
+    if ! (echo $REPLY | grep $regexp > /dev/null); then
+      echo $REPLY
+      continue
+    fi
+    name=`echo $REPLY | sed -e "s:$regexp:\1:"`
+    msgid=`echo $REPLY | sed -e "s:$regexp:\2:"`
+
+    # Test for bad characters
+    if (echo $msgid | grep '["\\]' > /dev/null); then
+      echo "$1:$n: msgid contains invalid character" >&2
+      exit 2
+    fi
+
+    # Generate first output line
+    echo "$name=$msgid"
+
+    # Generate language-specific output lines
+    for lang in $LINGUAS; do
+      msg=`LANGUAGE=$lang $GETTEXT "$msgid"`
+      # If translated message is unmodified, don't write an output
+      # line
+      if test "x$msg" = x -o "$msg" = "$msgid"; then
+        continue;
+      fi
+
+      echo "$name[$lang]=$msg"
+    done
+  done
+}
+
+# create_xml INFILE
+# -----------------
+# Parse XML mimeinfo data from standard input and generate a
+# translated mimeinfo file on standard output. If an error occurs, a
+# message is printed blaming INFILE.
+create_xml() {
+  # Loop over each line of standard input
+  n=0
+  while read REPLY; do
+    n=`expr $n + 1`
+    regexp='<_\([a-zA-Z][a-zA-Z]*\)>\(.*\)</_\1>'
+    if ! (echo $REPLY | grep $regexp > /dev/null); then
+      echo "$REPLY"
+      continue
+    fi
+    name=`echo $REPLY | sed -e "s:$regexp:\1:"`
+    msgid=`echo $REPLY | sed -e "s:$regexp:\2:"`
+    prefix=`echo $REPLY | sed -e "s:^\(.*\)<_$name>.*:\1:"`
+    suffix=`echo $REPLY | sed -e "s:.*</_$name>\(.*\):\1:"`
+
+    # Test for bad characters
+    if (echo $msgid | grep '["\\]' > /dev/null); then
+      echo "$1:$n: msgid contains invalid character" >&2
+      exit 2
+    fi
+
+    # Test for non-empty prefix/suffix
+    if test "x$prefix" != x -o "x$suffix" != x; then
+      echo "$1:$n: translatable tag must be alone on line" >&2
+      exit 2
+    fi
+
+    # Generate first output line
+    echo "$REPLY" | sed -e "s:<_\($name\)>\(.*\)</_\1>:<\1>\2</\1>:"
+
+    # Generate language-specific output lines
+    for lang in $LINGUAS; do
+      msg=`LANGUAGE=$lang $GETTEXT "$msgid"`
+      # If translated message is unmodified, don't write an output
+      # line
+      if test "x$msg" = x -o "$msg" = "$msgid"; then
+        continue;
+      fi
+      echo "$REPLY" | sed -e "s,<_\($name\)>\(.*\)</_\1>,<\1 xml:lang=\"$lang\">$msg</\1>,"
+    done
+  done
+}
+
+# do_create [OPTION]... INFILE OUTFILE
+# ------------------------------------
+# Substitutes translations into .desktop or mimeinfo files.
+do_create() {
+  GETTEXT=gettext
+
+  # First process command-line arguments
+  for arg; do
+    # Split into name=value
+    name=`echo $arg | sed -e's:=.*::'`
+    value=`echo $arg | sed -e's:^[^=]*=*::'`
+
+    case $name in
+      --gettext)   GETTEXT=$value;;
+      --domain)    TEXTDOMAIN=$value;;
+      --localedir) TEXTDOMAINDIR=$value;;
+      --lang)      LINGUAS="$LINGUAS $value";;
+      *)
+        # Arg might be a filename, so save it at the end of the
+        # positional parameters
+        set x "$@" "$arg"; shift
+    esac
+
+    # Discard processed arg from positional parameters
+    shift
+  done
+
+  if test $# != 2; then usage 1; fi # Should only have 2 args left
+  INFILE=$1; OUTFILE=$2
+  if ! test -r $INFILE; then
+    echo "desktop-i18n: Cannot open $INFILE for reading."
+    exit 3
+  fi
+
+  export TEXTDOMAIN
+  export GETTEXT
+  export TEXTDOMAINDIR
+  export LINGUAS
+
+  if (echo "$INFILE" | grep ".desktop.in$" > /dev/null); then
+    create_desktop $INFILE < $INFILE > $OUTFILE
+    exit 0
+  fi
+
+  if (echo "$INFILE" | grep ".xml.in$" > /dev/null); then
+    create_xml $INFILE < $INFILE > $OUTFILE
+    exit 0
+  fi
+
+  echo "desktop-i18n: $INFILE: Unrecognized extension"
+  exit 1
+}
+
+# do_setup [DIR]
+# --------------
+# Try to set up a source tree to use desktop-i18n.
+#
+# This is a nasty bit of hackery. We need to insert some rules into
+# the Makefile.in.in installed by gettextize/autopoint so that make
+# knows how to generate input for xgettext.
+#
+# Unfortunately, there's no nice way to do this, so we do it by
+# appending some rules onto each Makefile.in.in, using the following
+# procedure:
+#
+# 1. Look for configure.ac in DIR, or in cwd if DIR wasn't
+#    specified. If we can't find it, whinge.
+# 2. If configure.ac doesn't have AX_DESKTOP_I18N, quit successfully.
+# 3. Find anywhere where AC_CONFIG_FILES is called. For each
+#    Makefile.in found in the list of files to create:
+#    (a) Check for Makefile.in.in. If it doesn't exist, skip with a warning.
+#    (b) If Makefile.in.in contains the string DESKTOP_I18N_RULES,
+#        skip silently.
+#    (c) Append a chunk of rules onto Makefile.in.in
+#
+# Note that we can't use a po/Rules-* file because substitution is not
+# carried out on these files.
+do_setup() {
+  # Was DIR specified?
+  if test "x$1" = x; then srcdir=.; else srcdir=$1; fi
+
+  # Can we find configure.ac or configure.in?
+  for f in configure.ac configure.in; do
+    if test -r $srcdir/$f; then
+      ac_file=$srcdir/$f
+      break
+    fi
+  done
+  if test "x$ac_file" = x; then
+    echo "Cannot find configure.ac or configure.in!"
+    exit 4
+  fi
+
+  # Check that configure.ac is readable
+  if ! test -r $ac_file; then
+    echo "Cannot open $ac_file for reading."
+    exit 3
+  fi
+
+  # Is the AX_DESKTOP_I18N macro present?
+  if ! grep AX_DESKTOP_I18N $ac_file > /dev/null; then
+    exit
+  fi
+
+  # Now we use a piece of m4 code to try and discover all of the
+  # configuration files. This is UGLY AND BAD, because it only detects
+  # when AC_CONFIG_FILES is called in the main configure script (if
+  # AC_CONFIG_FILES is called by another macro somewhere, it won't be
+  # detected).
+  cat - $ac_file > conftest <<EOF
+changequote([,])dnl
+divert([-1])
+define([AC_CONFIG_FILES], [divert([0])[\$1]divert([-1])])
+EOF
+  conf_files=`m4 conftest`
+  rm conftest
+
+  # Look for any files called Makefile.in.
+  for f in $conf_files; do
+    # Discard any composition rules and prepend srcdir.
+    f=`echo "$f" | sed -e 's,:.*,,'`
+    f="$srcdir/$f"
+
+    # Skip files not called Makefile.in
+    if test `echo "$f" | sed -e 's:.*/::'` != Makefile.in; then
+      continue
+    fi
+
+    # Check that a corresponding Makefile.in.in exists and we can
+    # read/write it
+    if ! test -r $f.in -a -w $f.in; then
+      echo "desktop-i18n: Cannot process $f.in"
+      continue
+    fi
+
+    # Check that we haven't already hacked it
+    if grep DESKTOP_I18N_RULES $f.in > /dev/null; then
+      continue
+    fi
+
+    # Append our rules
+    echo "desktop-i18n: modifying $f.in"
+    cat >> $f.in <<EOF
+
+# DESKTOP_I18N_RULES  (Do not edit or remove this line)
+#####################################################################
+# Makefile rules needed by the desktop-i18n tool.
+# Copyright (C) 2009  Peter Brett <peter@xxxxxxxxxxxxx>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+top_builddir = @top_builddir@
+MKDIR_P = @MKDIR_P@
+
+DESKTOP_I18N_LOCALE_DIR = @DESKTOP_I18N_LOCALE_DIR@
+
+# We need to temporarily install the localisation files somewhere so
+# that desktop-i18n --create can look up messages in them. We recreate
+# the timestamp before *and* after running 'make install' so that the
+# make doesn't go into an infinite loop!
+all: stamp-i18n
+stamp-i18n: \$(DESKTOP_I18N_LOCALE_DIR) stamp-po Makefile
+	@echo timestamp > stamp-i18nT && mv stamp-i18nT stamp-i18n
+	\$(MAKE) prefix=\$(DESKTOP_I18N_LOCALE_DIR) install && \
+	cp \$(srcdir)/LINGUAS \$(DESKTOP_I18N_LOCALE_DIR)/\$(DOMAIN).LINGUAS \
+	|| rm stamp-i18n
+	@echo timestamp > stamp-i18nT && mv stamp-i18nT stamp-i18n
+\$(DESKTOP_I18N_LOCALE_DIR):
+	\$(MKDIR_P) \$(DESKTOP_I18N_LOCALE_DIR)
+
+clean: clean-i18n
+clean-i18n:
+	-rm -rf \$(DESKTOP_I18N_LOCALE_DIR) stamp-i18n
+
+# End of desktop-i18n rules
+#####################################################################
+
+EOF
+  done
+}
+
+
+
+# First argument has to be the mode of operation. Then call the
+# appropriate function to process the rest of the arguments and do the
+# work.
+if test -z $1; then usage 1; fi
+MODE=$1; shift
+case $MODE in
+  --extract) do_extract "$@";;
+  --create) do_create "$@";;
+  --setup) do_setup "$@";;
+  --help) usage;;
+  *) usage 1;;
+esac
diff --git a/gschem/m4/.gitignore b/gschem/m4/.gitignore
new file mode 100644
index 0000000..9b2675b
--- /dev/null
+++ b/gschem/m4/.gitignore
@@ -0,0 +1,30 @@
+*~
+codeset.m4
+gettext.m4
+glibc2.m4
+glibc21.m4
+iconv.m4
+intdiv0.m4
+intl.m4
+intldir.m4
+intlmacosx.m4
+intmax.m4
+inttypes-pri.m4
+inttypes_h.m4
+lcmessage.m4
+lib-ld.m4
+lib-link.m4
+lib-prefix.m4
+lock.m4
+longlong.m4
+nls.m4
+po.m4
+printf-posix.m4
+progtest.m4
+size_max.m4
+stdint_h.m4
+uintmax_t.m4
+visibility.m4
+wchar_t.m4
+wint_t.m4
+xsize.m4
diff --git a/gschem/m4/geda-desktop-i18n.m4 b/gschem/m4/geda-desktop-i18n.m4
new file mode 100644
index 0000000..5b8af4e
--- /dev/null
+++ b/gschem/m4/geda-desktop-i18n.m4
@@ -0,0 +1,78 @@
+# geda-desktop-i18n.m4                                  -*-Autoconf-*-
+# serial 1
+
+dnl Carry out configuration tasks needed by desktop-i18n tool
+dnl Copyright (C) 2009  Peter Brett <peter@xxxxxxxxxxxxx>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+AC_DEFUN([AX_DESKTOP_I18N],
+[
+  AC_PREREQ([2.60])dnl
+  AC_REQUIRE([AM_NLS])dnl
+  AC_REQUIRE([AM_PO_SUBDIRS])dnl
+  dnl Complain if desktop-i18n is missing
+  AC_REQUIRE_AUX_FILE([desktop-i18n])
+
+  # We need to check that GNU gettext is available
+  AM_PATH_PROG_WITH_TEST([GETTEXT], [gettext],
+    [$ac_dir/$ac_word --version | grep GNU > /dev/null], :)
+  if test "x$GETTEXT" = x; then
+    AC_MSG_ERROR([The GNU gettext program could not be found. Please ensure that GNU
+gettext is correctly installed, and rerun configure.])
+  fi
+  AC_SUBST([GETTEXT])
+
+  # How should desktop-i18n be run?
+  DESKTOP_I18N_SCRIPT="$am_aux_dir/desktop-i18n"
+  if test "X$GETTEXT" != "Xgettext"; then
+    DESKTOP_I18N="\${SHELL} $DESKTOP_I18N_SCRIPT"
+  else
+    DESKTOP_I18N="GETTEXT=\${GETTEXT} \${SHELL} $DESKTOP_I18N_SCRIPT"
+  fi
+  AC_SUBST([DESKTOP_I18N_SCRIPT])
+  AC_SUBST([DESKTOP_I18N])
+
+  # We have a private directory to temporarily install locale data
+  # into.
+  DESKTOP_I18N_LOCALE_DIR='$(top_builddir)/.desktop-i18n'
+  AC_SUBST([DESKTOP_I18N_LOCALE_DIR])
+
+  # Substitute our own evil, corrupted version of xgettext.
+  # Mwahahahaha!
+  XGETTEXT="$DESKTOP_I18N --extract --xgettext=$XGETTEXT --"
+
+  # Define some rules for substitution into Makefiles
+  DESKTOP_I18N_CREATE='$(DESKTOP_I18N) --create --gettext=$(GETTEXT) --domain=$(DOMAIN) \
+    --localedir=$(DESKTOP_I18N_LOCALE_DIR)/share/locale $(DESKTOP_I18N_LANGS)'
+  DESKTOP_I18N_LANGS_RULE='DESKTOP_I18N_LANGS = $(addprefix --lang=,$(shell cat $(DESKTOP_I18N_LOCALE_DIR)/$(DOMAIN).LINGUAS))'
+  DESKTOP_I18N_DESKTOP_RULE='%.desktop: %.desktop.in ; $(DESKTOP_I18N_CREATE) $< [$]@'
+  DESKTOP_I18N_XML_RULE='%.xml: %.xml.in ; $(DESKTOP_I18N_CREATE) $< [$]@'
+
+  AC_SUBST([DESKTOP_I18N_CREATE])
+  _IT_SUBST([DESKTOP_I18N_LANGS_RULE])
+  _IT_SUBST([DESKTOP_I18N_DESKTOP_RULE])
+  _IT_SUBST([DESKTOP_I18N_XML_RULE])
+])dnl AX_DESKTOP_I18N
+
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+# Stolen from intltool.m4 (GPL v2)
+AC_DEFUN([_IT_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+])dnl _IT_SUBST
diff --git a/gschem/po/.gitignore b/gschem/po/.gitignore
index 16a5215..993ed45 100644
--- a/gschem/po/.gitignore
+++ b/gschem/po/.gitignore
@@ -12,5 +12,5 @@ Makevars.template
 geda-gschem.pot
 stamp-po
 stamp-it
-.intltool-merge-cache
+stamp-i18n
 *~
diff --git a/gschem/po/Makevars b/gschem/po/Makevars
index 32692ab..9b27ec1 100644
--- a/gschem/po/Makevars
+++ b/gschem/po/Makevars
@@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
 # or entity, or to disclaim their copyright.  The empty string stands for
 # the public domain; in this case the translators are expected to disclaim
 # their copyright.
-COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+COPYRIGHT_HOLDER = gEDA Developers
 
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
@@ -34,7 +34,7 @@ COPYRIGHT_HOLDER = Free Software Foundation, Inc.
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS =
+MSGID_BUGS_ADDRESS = geda-bug@xxxxxxxx
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
diff --git a/gschem/po/af.po b/gschem/po/af.po
index 33fdfae..89324cd 100644
--- a/gschem/po/af.po
+++ b/gschem/po/af.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geda-gschem\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 14:35-0400\n"
+"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
+"POT-Creation-Date: 2009-06-18 11:53+0100\n"
 "PO-Revision-Date: 2008-12-20 14:27+0000\n"
 "Last-Translator: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>\n"
 "Language-Team: <geda-dev@xxxxxxxxxxxxxx>\n"
@@ -14,617 +14,607 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/rcstrings.c:2
+#: src/rcstrings.c:2
 msgid "File"
 msgstr "Lêer"
 
-#: ../src/rcstrings.c:3
+#: src/rcstrings.c:3
 msgid "New Window"
 msgstr "Nuwe Venster"
 
-#: ../src/rcstrings.c:4 ../src/x_pagesel.c:252
+#: src/rcstrings.c:4 src/x_pagesel.c:252
 msgid "New Page"
 msgstr "Nuwe Bladsy"
 
-#: ../src/rcstrings.c:5 ../src/x_pagesel.c:253
+#: src/rcstrings.c:5 src/x_pagesel.c:253
 msgid "Open Page..."
 msgstr "Maak Bladsy Oop..."
 
-#: ../src/rcstrings.c:6 ../src/x_pagesel.c:256
+#: src/rcstrings.c:6 src/x_pagesel.c:256
 msgid "Close Page"
 msgstr "Sluit Bladsy"
 
-#: ../src/rcstrings.c:7
+#: src/rcstrings.c:7
 msgid "Revert Page"
 msgstr "Gaan Bladsy Terug"
 
-#: ../src/rcstrings.c:8 ../src/x_pagesel.c:255
+#: src/rcstrings.c:8 src/x_pagesel.c:255
 msgid "Save Page"
 msgstr "Bewaar Bladsy"
 
-#: ../src/rcstrings.c:9
+#: src/rcstrings.c:9
 msgid "Save Page As..."
 msgstr "Bewaar Bladsy As..."
 
-#: ../src/rcstrings.c:10
+#: src/rcstrings.c:10
 msgid "Save All"
 msgstr "Bewaar Alles"
 
-#. GtkWindow
-#: ../src/rcstrings.c:11 ../src/x_print.c:276
+#: src/rcstrings.c:11 src/x_print.c:276
 msgid "Print..."
 msgstr "Druk..."
 
-#. Create the dialog
-#: ../src/rcstrings.c:12 ../src/x_image.c:495
+#: src/rcstrings.c:12 src/x_image.c:495
 msgid "Write image..."
 msgstr "Skryf afbeelding..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:501
+#: src/rcstrings.c:13
 msgid "Recent files"
 msgstr "Onlangse lêers"
 
-#: ../src/rcstrings.c:14 ../src/x_script.c:47
+#: src/rcstrings.c:14 src/x_script.c:47
 msgid "Execute Script..."
 msgstr "Voer Script Uit..."
 
-#: ../src/rcstrings.c:15
+#: src/rcstrings.c:15
 msgid "Close Window"
 msgstr "Sluit Venster"
 
-#: ../src/rcstrings.c:16
+#: src/rcstrings.c:16
 msgid "Quit"
 msgstr "Sluit"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
+#: src/rcstrings.c:18 src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Bewerk"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:338
+#: src/rcstrings.c:19 src/x_window.c:338
 msgid "Undo"
 msgstr "Maak Ongedaan"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:345
+#: src/rcstrings.c:20 src/x_window.c:345
 msgid "Redo"
 msgstr "Herstel"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
+#: src/rcstrings.c:21 src/i_basic.c:77 src/x_window.c:521
 msgid "Select Mode"
 msgstr "Uitsoekmodus"
 
-#: ../src/rcstrings.c:22
+#: src/rcstrings.c:22
 #, fuzzy
 msgid "Cut"
 msgstr "Sny 1"
 
-#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
-#: ../src/i_callbacks.c:560
+#: src/rcstrings.c:23 src/i_basic.c:135 src/i_callbacks.c:536
+#: src/i_callbacks.c:560
 msgid "Copy"
 msgstr "Kopieer"
 
-#: ../src/rcstrings.c:24
+#: src/rcstrings.c:24
 #, fuzzy
 msgid "Paste"
 msgstr "Plak 1"
 
-#: ../src/rcstrings.c:25
+#: src/rcstrings.c:25
 msgid "Edit..."
 msgstr "Bewerk..."
 
-#: ../src/rcstrings.c:26
+#: src/rcstrings.c:26
 msgid "Edit Text..."
 msgstr "Bewerk Teks..."
 
-#: ../src/rcstrings.c:27 ../src/i_basic.c:84
+#: src/rcstrings.c:27 src/i_basic.c:84
 msgid "Copy Mode"
 msgstr "Kopieermodus"
 
-#: ../src/rcstrings.c:28 ../src/i_basic.c:142
+#: src/rcstrings.c:28 src/i_basic.c:142
 msgid "Multiple Copy Mode"
 msgstr "Meervoudige Kopieermodus"
 
-#: ../src/rcstrings.c:29 ../src/i_basic.c:87
+#: src/rcstrings.c:29 src/i_basic.c:87
 msgid "Move Mode"
 msgstr "Skuifmodus"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
+#: src/rcstrings.c:30 src/i_callbacks.c:670 src/x_multiattrib.c:1496
 msgid "Delete"
 msgstr "Verwyder"
 
-#: ../src/rcstrings.c:31
+#: src/rcstrings.c:31
 msgid "Rotate 90 Mode"
 msgstr "Roteer-90-modus"
 
-#: ../src/rcstrings.c:32 ../src/i_basic.c:91
+#: src/rcstrings.c:32 src/i_basic.c:91
 msgid "Mirror Mode"
 msgstr "Weerkaatsmodus"
 
-#: ../src/rcstrings.c:33
+#: src/rcstrings.c:33
 msgid "Slot..."
 msgstr "Gleuf..."
 
-#: ../src/rcstrings.c:34
+#: src/rcstrings.c:34
 msgid "Color..."
 msgstr "Kleur..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
+#: src/rcstrings.c:35 src/i_callbacks.c:920 src/x_dialog.c:2411
 msgid "Lock"
 msgstr "Sluit"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
+#: src/rcstrings.c:36 src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "Ontsluit"
 
-#: ../src/rcstrings.c:37
+#: src/rcstrings.c:37
 msgid "Line Width & Type..."
 msgstr "Lynwydte en -tipe..."
 
-#: ../src/rcstrings.c:38
+#: src/rcstrings.c:38
 msgid "Fill Type..."
 msgstr "Vultipe"
 
-#: ../src/rcstrings.c:39
+#: src/rcstrings.c:39
 msgid "Symbol Translate..."
 msgstr "Simboolverskuiwing..."
 
-#: ../src/rcstrings.c:40
+#: src/rcstrings.c:40
 msgid "Embed Component/Picture"
 msgstr "Lê Komponent/Afbeelding In"
 
 # FIXME: too klunky!
-#: ../src/rcstrings.c:41
+#: src/rcstrings.c:41
 msgid "Unembed Component/Picture"
 msgstr "Ont-lê Komponent/Afbeelding In"
 
-#: ../src/rcstrings.c:42
+#: src/rcstrings.c:42
 msgid "Update Component"
 msgstr "Vernuwe Komponent"
 
-#: ../src/rcstrings.c:43
+#: src/rcstrings.c:43
 msgid "Show/Hide Inv Text"
 msgstr "Toon/Verberg Onsigbare Teks"
 
-#: ../src/rcstrings.c:44
+#: src/rcstrings.c:44
 msgid "Make Inv Text Vis"
 msgstr "Maak Onsigbare Teks Sigbaar"
 
-#: ../src/rcstrings.c:46
+#: src/rcstrings.c:46
 msgid "Buffer"
 msgstr "Buffer"
 
-#: ../src/rcstrings.c:47
+#: src/rcstrings.c:47
 msgid "Copy into 1"
 msgstr "Kopieer in 1 in"
 
-#: ../src/rcstrings.c:48
+#: src/rcstrings.c:48
 msgid "Copy into 2"
 msgstr "Kopieer in 2 in"
 
-#: ../src/rcstrings.c:49
+#: src/rcstrings.c:49
 msgid "Copy into 3"
 msgstr "Kopieer in 3 in"
 
-#: ../src/rcstrings.c:50
+#: src/rcstrings.c:50
 msgid "Copy into 4"
 msgstr "Kopieer in 4 in"
 
-#: ../src/rcstrings.c:51
+#: src/rcstrings.c:51
 msgid "Copy into 5"
 msgstr "Kopieer in 5 in"
 
-#: ../src/rcstrings.c:52
+#: src/rcstrings.c:52
 msgid "Cut into 1"
 msgstr "Sny in 1 in"
 
-#: ../src/rcstrings.c:53
+#: src/rcstrings.c:53
 msgid "Cut into 2"
 msgstr "Sny in 2 in"
 
-#: ../src/rcstrings.c:54
+#: src/rcstrings.c:54
 msgid "Cut into 3"
 msgstr "Sny in 3 in"
 
-#: ../src/rcstrings.c:55
+#: src/rcstrings.c:55
 msgid "Cut into 4"
 msgstr "Sny in 4 in"
 
-#: ../src/rcstrings.c:56
+#: src/rcstrings.c:56
 msgid "Cut into 5"
 msgstr "Sny in 5 in"
 
-#: ../src/rcstrings.c:57
+#: src/rcstrings.c:57
 msgid "Paste from 1"
 msgstr "Plak vanuit 1"
 
-#: ../src/rcstrings.c:58
+#: src/rcstrings.c:58
 msgid "Paste from 2"
 msgstr "Plak vanuit 2"
 
-#: ../src/rcstrings.c:59
+#: src/rcstrings.c:59
 msgid "Paste from 3"
 msgstr "Plak vanuit 3"
 
-#: ../src/rcstrings.c:60
+#: src/rcstrings.c:60
 msgid "Paste from 4"
 msgstr "Plak vanuit 4"
 
-#: ../src/rcstrings.c:61
+#: src/rcstrings.c:61
 msgid "Paste from 5"
 msgstr "Plak vanuit 5"
 
-#: ../src/rcstrings.c:63
+#: src/rcstrings.c:63
 msgid "View"
 msgstr "Aansig"
 
-#: ../src/rcstrings.c:64
+#: src/rcstrings.c:64
 msgid "Redraw"
 msgstr "Herteken"
 
-#. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
+#: src/rcstrings.c:65 src/i_callbacks.c:1474 src/i_callbacks.c:1546
 msgid "Pan"
 msgstr "Skuif Aansig"
 
-#: ../src/rcstrings.c:66 ../src/i_basic.c:95
+#: src/rcstrings.c:66 src/i_basic.c:95
 msgid "Zoom Box"
 msgstr "Zoem Reghoek"
 
-#: ../src/rcstrings.c:67
+#: src/rcstrings.c:67
 msgid "Zoom Extents"
 msgstr "Zoem Omvang"
 
-#: ../src/rcstrings.c:68
+#: src/rcstrings.c:68
 msgid "Zoom In"
 msgstr "Zoem In"
 
-#: ../src/rcstrings.c:69
+#: src/rcstrings.c:69
 msgid "Zoom Out"
 msgstr "Zoem Uit"
 
-#: ../src/rcstrings.c:70
+#: src/rcstrings.c:70
 msgid "Zoom Full"
 msgstr "Zoem Ten Volle"
 
-#: ../src/rcstrings.c:71
+#: src/rcstrings.c:71
 msgid "Dark color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:72
+#: src/rcstrings.c:72
 msgid "Light color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:74
+#: src/rcstrings.c:74
 msgid "Page"
 msgstr "Bladsy"
 
-#: ../src/rcstrings.c:75
+#: src/rcstrings.c:75
 msgid "Manager..."
 msgstr "Bestuurder..."
 
-#: ../src/rcstrings.c:76
+#: src/rcstrings.c:76
 msgid "Next"
 msgstr "Volgende"
 
-#: ../src/rcstrings.c:77
+#: src/rcstrings.c:77
 msgid "Previous"
 msgstr "Vorige"
 
-#: ../src/rcstrings.c:78 ../src/x_window.c:316
+#: src/rcstrings.c:78 src/x_window.c:316
 msgid "New"
 msgstr "Nuwe"
 
-#: ../src/rcstrings.c:79
+#: src/rcstrings.c:79
 msgid "Revert"
 msgstr "Gaan Terug"
 
-#: ../src/rcstrings.c:80
+#: src/rcstrings.c:80
 msgid "Close"
 msgstr "Sluit Af"
 
-#: ../src/rcstrings.c:81
+#: src/rcstrings.c:81
 msgid "Discard"
 msgstr "Werp Weg"
 
-#: ../src/rcstrings.c:83
+#: src/rcstrings.c:83
 msgid "Add"
 msgstr "Voeg By"
 
-#: ../src/rcstrings.c:84
+#: src/rcstrings.c:84
 msgid "Component..."
 msgstr "Komponent..."
 
-#. need to click
-#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
-#: ../src/x_dialog.c:2376
+#: src/rcstrings.c:85 src/i_callbacks.c:2401 src/i_callbacks.c:2428
+#: src/x_dialog.c:2378
 msgid "Net"
 msgstr "Skakeling"
 
-#. need to click
-#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
-#: ../src/x_dialog.c:2394 ../src/x_window.c:374
+#: src/rcstrings.c:86 src/i_callbacks.c:2472 src/i_callbacks.c:2499
+#: src/x_dialog.c:2396 src/x_window.c:374
 msgid "Bus"
 msgstr "Bus"
 
-#: ../src/rcstrings.c:87
+#: src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "Eienskap..."
 
-#: ../src/rcstrings.c:88
+#: src/rcstrings.c:88
 msgid "Text..."
 msgstr "Teks..."
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
+#: src/rcstrings.c:89 src/i_callbacks.c:2580 src/i_callbacks.c:2603
 msgid "Line"
 msgstr "Lyn"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
+#: src/rcstrings.c:90 src/i_callbacks.c:2625 src/i_callbacks.c:2648
 msgid "Box"
 msgstr "Reghoek"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
+#: src/rcstrings.c:91 src/i_callbacks.c:2704 src/i_callbacks.c:2728
 msgid "Circle"
 msgstr "Sirkel"
 
-#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
+#: src/rcstrings.c:92 src/i_callbacks.c:2750 src/i_callbacks.c:2773
 msgid "Arc"
 msgstr "Boog"
 
-#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
-#: ../src/x_dialog.c:2367
+#: src/rcstrings.c:93 src/i_callbacks.c:2795 src/i_callbacks.c:2818
+#: src/x_dialog.c:2369
 msgid "Pin"
 msgstr "Pen"
 
-#: ../src/rcstrings.c:94
+#: src/rcstrings.c:94
 msgid "Picture..."
 msgstr "Afbeelding"
 
-#: ../src/rcstrings.c:96
+#: src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "Hierargie"
 
-#: ../src/rcstrings.c:97
+#: src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "Stroombaandiagram Af"
 
-#: ../src/rcstrings.c:98
+#: src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "Simbool Af"
 
-#: ../src/rcstrings.c:99
+#: src/rcstrings.c:99
 msgid "Up"
 msgstr "Op"
 
-#: ../src/rcstrings.c:100
+#: src/rcstrings.c:100
 msgid "Documentation"
 msgstr "Dokumentasie"
 
-#. GtkFrame
-#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
-#: ../src/x_multiattrib.c:1543
+#: src/rcstrings.c:102 src/x_compselect.c:1417
 msgid "Attributes"
 msgstr "Eienskappe"
 
-#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
+#: src/rcstrings.c:103 src/i_callbacks.c:3089
 msgid "Attach"
 msgstr "Heg aan"
 
-#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
+#: src/rcstrings.c:104 src/i_callbacks.c:3136
 msgid "Detach"
 msgstr "Heg af"
 
-#: ../src/rcstrings.c:105
+#: src/rcstrings.c:105
 msgid "Show Value"
 msgstr "Toon Waarde"
 
-#: ../src/rcstrings.c:106
+#: src/rcstrings.c:106
 msgid "Show Name"
 msgstr "Toon Naam"
 
-#: ../src/rcstrings.c:107
+#: src/rcstrings.c:107
 msgid "Show Both"
 msgstr "Toon Beide"
 
-#: ../src/rcstrings.c:108
+#: src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "Skakel Sigbaarheid"
 
-#: ../src/rcstrings.c:109
+#: src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "Vind Spesifieke Teks..."
 
-#: ../src/rcstrings.c:110
+#: src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "Verskuil Spesifieke Teks..."
 
-#: ../src/rcstrings.c:111
+#: src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "Toon Spesifieke Teks..."
 
-#: ../src/rcstrings.c:112
+#: src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr "Nommereer Teks Outomaties..."
 
-#: ../src/rcstrings.c:114
+#: src/rcstrings.c:114
 msgid "Options"
 msgstr "Opsies"
 
-#: ../src/rcstrings.c:115
+#: src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "Teksgrootte..."
 
-#: ../src/rcstrings.c:116
+#: src/rcstrings.c:116
 msgid "Cycle grid styles"
 msgstr ""
 
-#: ../src/rcstrings.c:117
+#: src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr ""
 
 # FIXME: Find a better expression for "Snap Grid".
-#: ../src/rcstrings.c:118
+#: src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "Snaproosterspasiëring"
 
-#: ../src/rcstrings.c:119
+#: src/rcstrings.c:119
 msgid "Scale up Grid Spacing"
 msgstr "Vergroot Roosterspasiëring"
 
-#: ../src/rcstrings.c:120
+#: src/rcstrings.c:120
 msgid "Scale down Grid Spacing"
 msgstr "Verklein Roosterspasiëring"
 
-#: ../src/rcstrings.c:121
+#: src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr "Skakel Skets/Omtrekreghoek"
 
-#: ../src/rcstrings.c:122
+#: src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr "Skakel Net Rubberband"
 
-#: ../src/rcstrings.c:123
+#: src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "Wys Aantekeningevenster"
 
-#: ../src/rcstrings.c:124
+#: src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "Wys Koordinatevenster"
 
-#: ../src/rcstrings.c:126
+#: src/rcstrings.c:126
 msgid "Help"
 msgstr "Help"
 
-#: ../src/rcstrings.c:127
+#: src/rcstrings.c:127
 msgid "Manual"
 msgstr "Handleiding"
 
-#: ../src/rcstrings.c:128
+#: src/rcstrings.c:128
 msgid "gEDA Documentation"
 msgstr "gEDA Dokumentasie"
 
-#: ../src/rcstrings.c:129
+#: src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr "gschem FAQ"
 
-#: ../src/rcstrings.c:130
+#: src/rcstrings.c:130
 msgid "Component Documentation"
 msgstr "Komponent Dokumentasie"
 
-#: ../src/rcstrings.c:131
+#: src/rcstrings.c:131
 msgid "About gschem"
 msgstr "Oor gschem"
 
-#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
+#: src/rcstrings.c:132 src/x_dialog.c:2724
 msgid "Hotkeys"
 msgstr ""
 
-#: ../src/a_zoom.c:212
+#: src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Zoem is te klein!  Kan nie verder zoem nie.\n"
 
-#. Fork failed. Still in parent process, so can use the log
-#. * window
-#: ../src/g_funcs.c:339 ../src/i_callbacks.c:68
+#: src/g_funcs.c:339 src/i_callbacks.c:68
 #, c-format
 msgid "Could not fork\n"
 msgstr "Kon nie vertak nie\n"
 
-#. if we return, then nothing happened
-#: ../src/g_funcs.c:355 ../src/i_callbacks.c:78
+#: src/g_funcs.c:355 src/i_callbacks.c:78
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr "Kon nie %s oproep nie\n"
 
-#: ../src/g_funcs.c:361 ../src/i_callbacks.c:82
+#: src/g_funcs.c:361 src/i_callbacks.c:82
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Dokumentasieopdragte werk nie onder MinGW nie.\n"
 
-#: ../src/g_rc.c:292
+#: src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Ongeldige zoemmaat [%d] aan %s gegee\n"
 
-#: ../src/g_rc.c:418
+#: src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Ongeldige grootte [%d] gegee aan text-size\n"
 
-#: ../src/g_rc.c:445
+#: src/g_rc.c:445
 #, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "Ongeldige grootte [%f] aan postscript-font-scale gegee\n"
 
-#: ../src/g_rc.c:488
+#: src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Ongeldige grootte [%d] aan snap-size gegee\n"
 
-#: ../src/g_rc.c:960
+#: src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "Ongeldige getal vlakke [%d] gegee aan undo-levels\n"
 
-#: ../src/g_rc.c:1218
+#: src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "Ongeldige grootte [%d] gegee aan bus-ripper-size\n"
 
-#: ../src/g_rc.c:1293
+#: src/g_rc.c:1293
 #, fuzzy, c-format
 msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr "Ongeldige puntgrootte [%d] gegee aan grid-dot-size\n"
 
-#: ../src/g_rc.c:1334
+#: src/g_rc.c:1334
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 msgstr "Ongeldige puntgrootte [%d] gegee aan grid-dot-size\n"
 
-#: ../src/g_rc.c:1360
+#: src/g_rc.c:1360
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 msgstr "Ongeldige puntgrootte [%d] gegee aan grid-dot-size\n"
 
-#: ../src/g_rc.c:1404
+#: src/g_rc.c:1404
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "Ongeldige verkuiwing [%d] gegee aan add-attribute-offset\n"
 
-#: ../src/g_rc.c:1428
+#: src/g_rc.c:1428
 #, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr "Ongeldige hoeveelheid sekondes [%d] gegee aan auto-save-interval\n"
 
-#: ../src/g_rc.c:1469
+#: src/g_rc.c:1469
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Ongeldige versterking [%d] gegee aan mousepan-gain\n"
 
-#: ../src/g_rc.c:1492
+#: src/g_rc.c:1492
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Ongeldige versterking [%d] gegee aan keyboardpan-gain\n"
 
-#: ../src/g_rc.c:1538
+#: src/g_rc.c:1538
 #, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr ""
 
-#: ../src/g_rc.c:1564
+#: src/g_rc.c:1564
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "Ongeldige versterking [%d] gegee aan mousepan-gain\n"
 
-#: ../src/g_rc.c:1589
+#: src/g_rc.c:1589
 #, fuzzy, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr "Ongeldige hoeveelheid sekondes [%d] gegee aan auto-save-interval\n"
 
-#: ../src/gschem.c:183 ../src/gschem.c:194
+#: src/gschem.c:183 src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem uitgawe %s%s.%s\n"
 
 # FIXME: Best to get a real lawyer to translate this into Afrikaans legalese.
-#: ../src/gschem.c:186 ../src/gschem.c:197
+#: src/gschem.c:186 src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -634,30 +624,30 @@ msgstr ""
 "details.\n"
 
 # FIXME: Track down other projects' translations of the GPL boilerplate.
-#: ../src/gschem.c:188 ../src/gschem.c:199
+#: src/gschem.c:188 src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
 msgstr ""
 
-#: ../src/gschem.c:190 ../src/gschem.c:201
+#: src/gschem.c:190 src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
 "\n"
 msgstr ""
 
-#: ../src/gschem.c:205
+#: src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr ""
 
-#: ../src/gschem.c:209
+#: src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr ""
 
-#: ../src/gschem.c:224
+#: src/gschem.c:224
 msgid ""
 "You must set the GEDADATA environment variable!\n"
 "\n"
@@ -665,369 +655,390 @@ msgid ""
 "environment variable to point to the correct location.\n"
 msgstr ""
 
-#: ../src/gschem.c:251
+#: src/gschem.c:251
 #, fuzzy, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "Het misluk of scm-aanvangslêer [%s] te lees\n"
 
-#: ../src/gschem.c:255
+#: src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Het scm-aanvangslêer [%s] gelees\n"
 
-#. ! \todo These two messages are the same. Should be
-#. * integrated.
-#: ../src/gschem.c:259
+#: src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Het misluk of scm-aanvangslêer [%s] te lees\n"
 
-#: ../src/gschem.c:320
+#: src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Scheme-gids is NIE gestel nie!\n"
 
-#: ../src/gschem.c:327 ../src/x_script.c:66
+#: src/gschem.c:327 src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Voer guile script [%s] uit\n"
 
-#: ../src/gschem_cairo.c:310
+#: src/gschem_accel_label.c:319
+msgid "Accelerator Closure"
+msgstr ""
+
+#: src/gschem_accel_label.c:320
+msgid "The closure to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:326
+msgid "Accelerator Widget"
+msgstr ""
+
+#: src/gschem_accel_label.c:327
+msgid "The widget to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:333
+msgid "Accelerator String"
+msgstr ""
+
+#: src/gschem_accel_label.c:334
+msgid "The accelerator string to be displayed"
+msgstr ""
+
+#: src/gschem_cairo.c:310
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "Onbekende einde vir lyn (%d)\n"
 
-#: ../src/gschem_cairo.c:318
+#: src/gschem_cairo.c:318
 #, fuzzy, c-format
 msgid "Unknown type for stroke (%d) !\n"
 msgstr "Onbekende tipe vir lyn (%d)!\n"
 
-#: ../src/i_basic.c:79
+#: src/i_basic.c:79
 msgid "Component Mode"
 msgstr "Komponentmodus"
 
-#: ../src/i_basic.c:81
+#: src/i_basic.c:81
 msgid "Text Mode"
 msgstr "Teksmodues"
 
-#: ../src/i_basic.c:89
+#: src/i_basic.c:89
 msgid "Rotate Mode"
 msgstr "Roteermodus"
 
-#: ../src/i_basic.c:99
+#: src/i_basic.c:99
 msgid "Pan Mode"
 msgstr "Aansigskuifmodus"
 
-#: ../src/i_basic.c:103
+#: src/i_basic.c:103
 #, c-format
 msgid "Paste %d Mode"
 msgstr "Plak %d Modus"
 
-#: ../src/i_basic.c:109
+#: src/i_basic.c:109
 #, fuzzy
 msgid "Magnetic Net Mode"
 msgstr "Netmodus"
 
-#: ../src/i_basic.c:111
+#: src/i_basic.c:111
 msgid "Net Mode"
 msgstr "Netmodus"
 
-#: ../src/i_basic.c:115
+#: src/i_basic.c:115
 msgid "Bus Mode"
 msgstr "Busmodus"
 
-#: ../src/i_basic.c:118
+#: src/i_basic.c:118
 msgid "Line Mode"
 msgstr "Lynmodus"
 
-#: ../src/i_basic.c:121
+#: src/i_basic.c:121
 msgid "Box Mode"
 msgstr "Reghoekmodus"
 
-#: ../src/i_basic.c:124
+#: src/i_basic.c:124
 msgid "Picture Mode"
 msgstr "Afbeeldingmodus"
 
-#: ../src/i_basic.c:127
+#: src/i_basic.c:127
 msgid "Circle Mode"
 msgstr "Sirkelmodus"
 
-#: ../src/i_basic.c:130
+#: src/i_basic.c:130
 msgid "Arc Mode"
 msgstr "Boogmodus"
 
-#: ../src/i_basic.c:133
+#: src/i_basic.c:133
 msgid "Pin Mode"
 msgstr "Penmodus"
 
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
+#: src/i_basic.c:137 src/i_callbacks.c:626 src/i_callbacks.c:650
 msgid "Move"
 msgstr "Beweeg"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
+#: src/i_basic.c:139 src/i_callbacks.c:581 src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Veelvoudige Kopieer"
 
-#: ../src/i_basic.c:168
+#: src/i_basic.c:168
 msgid "Show Hidden"
 msgstr "Toon Verskuilde"
 
-#: ../src/i_basic.c:171
+#: src/i_basic.c:171
 msgid "Snap Off"
 msgstr ""
 
-#: ../src/i_basic.c:173
+#: src/i_basic.c:173
 msgid "Resnap Active"
 msgstr ""
 
-#: ../src/i_basic.c:254 ../src/x_window.c:495
+#: src/i_basic.c:254 src/x_window.c:495
 msgid "Action"
 msgstr "Handeling"
 
-#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
+#: src/i_basic.c:260 src/x_dialog.c:2408 src/x_window.c:490
 msgid "Stroke"
 msgstr "Wyserslag"
 
-#: ../src/i_basic.c:266 ../src/x_window.c:492
+#: src/i_basic.c:266 src/x_window.c:492
 msgid "none"
 msgstr "geen"
 
-#: ../src/i_basic.c:271
+#: src/i_basic.c:271
 msgid "Repeat/"
 msgstr "Herhaal/"
 
-#: ../src/i_basic.c:549 ../src/i_basic.c:563
+#: src/i_basic.c:549 src/i_basic.c:563
 msgid "OFF"
 msgstr "AF"
 
-#: ../src/i_basic.c:567
+#: src/i_basic.c:567
 msgid "NONE"
 msgstr ""
 
-#: ../src/i_basic.c:572
+#: src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Rooster(%s, %s)"
 
-#: ../src/i_callbacks.c:63
+#: src/i_callbacks.c:63
 #, c-format
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentasie vir [%s,%s,%s,%s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
+#: src/i_callbacks.c:123 src/i_callbacks.c:1705
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Nuwe bladsy geskep [%s]\n"
 
-#: ../src/i_callbacks.c:163
+#: src/i_callbacks.c:163
 #, c-format
 msgid "New Window created [%s]\n"
 msgstr "Nuwe Venster geskep [%s]\n"
 
-#: ../src/i_callbacks.c:281
+#: src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "Misluk om alles te bewaar"
 
-#: ../src/i_callbacks.c:283
+#: src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Alles Bewaar"
 
-#: ../src/i_callbacks.c:373
+#: src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "Sluit Venster\n"
 
-#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
+#: src/i_callbacks.c:541 src/i_callbacks.c:586 src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "Kies eers voorwerpe"
 
-#: ../src/i_callbacks.c:710
+#: src/i_callbacks.c:710
 #, fuzzy
 msgid "Edit pin type"
 msgstr "Bewerk Lyntipe"
 
-#: ../src/i_callbacks.c:729
+#: src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Bewerk Teks"
 
-#: ../src/i_callbacks.c:752
+#: src/i_callbacks.c:752
 msgid "Slot"
 msgstr "Gleuf"
 
-#: ../src/i_callbacks.c:769
+#: src/i_callbacks.c:769
 msgid "Color"
 msgstr "Kleur"
 
-#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
+#: src/i_callbacks.c:806 src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Roteer"
 
-#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
+#: src/i_callbacks.c:874 src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Weerkaats"
 
-#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
+#: src/i_callbacks.c:956 src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Verskuif"
 
-#: ../src/i_callbacks.c:959
+#: src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:960
+#: src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:967
+#: src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:969
+#: src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:1000
+#: src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "Lê In"
 
 # FIXME: too klunky!
-#: ../src/i_callbacks.c:1041
+#: src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "Ont-lê In"
 
-#: ../src/i_callbacks.c:1084
+#: src/i_callbacks.c:1085
 msgid "Update"
 msgstr ""
 
-#: ../src/i_callbacks.c:1141
+#: src/i_callbacks.c:1144
 msgid "ShowHidden"
 msgstr "ToonVerskuil"
 
-#: ../src/i_callbacks.c:1165
+#: src/i_callbacks.c:1168
 msgid "MakeVisible"
 msgstr "MaakSigbaar"
 
-#: ../src/i_callbacks.c:1562
+#: src/i_callbacks.c:1565
 msgid "Update Cues"
 msgstr ""
 
-#: ../src/i_callbacks.c:1746
+#: src/i_callbacks.c:1749
 msgid "Really revert page?"
 msgstr ""
 
-#: ../src/i_callbacks.c:1816
+#: src/i_callbacks.c:1819
 msgid "Copy to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1834
+#: src/i_callbacks.c:1837
 msgid "Cut to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1852
+#: src/i_callbacks.c:1855
 #, fuzzy
 msgid "Paste from clipboard"
 msgstr "Plak vanuit 1"
 
-#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
-#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
-#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+#: src/i_callbacks.c:1867 src/i_callbacks.c:2106 src/i_callbacks.c:2128
+#: src/i_callbacks.c:2150 src/i_callbacks.c:2172 src/i_callbacks.c:2194
 msgid "Empty buffer"
 msgstr "Maak buffer leeg"
 
-#: ../src/i_callbacks.c:1909
+#: src/i_callbacks.c:1912
 msgid "Copy 1"
 msgstr "Kopieer 1"
 
-#: ../src/i_callbacks.c:1928
+#: src/i_callbacks.c:1931
 msgid "Copy 2"
 msgstr "Kopieer 2"
 
-#: ../src/i_callbacks.c:1947
+#: src/i_callbacks.c:1950
 msgid "Copy 3"
 msgstr "Kopieer 3"
 
-#: ../src/i_callbacks.c:1966
+#: src/i_callbacks.c:1969
 msgid "Copy 4"
 msgstr "Kopieer 4"
 
-#: ../src/i_callbacks.c:1985
+#: src/i_callbacks.c:1988
 msgid "Copy 5"
 msgstr "Kopieer 5"
 
-#: ../src/i_callbacks.c:2004
+#: src/i_callbacks.c:2007
 msgid "Cut 1"
 msgstr "Sny 1"
 
-#: ../src/i_callbacks.c:2023
+#: src/i_callbacks.c:2026
 msgid "Cut 2"
 msgstr "Sny 2"
 
-#: ../src/i_callbacks.c:2042
+#: src/i_callbacks.c:2045
 msgid "Cut 3"
 msgstr "Sny 3"
 
-#: ../src/i_callbacks.c:2061
+#: src/i_callbacks.c:2064
 msgid "Cut 4"
 msgstr "Sny 4"
 
-#: ../src/i_callbacks.c:2080
+#: src/i_callbacks.c:2083
 msgid "Cut 5"
 msgstr "Sny 5"
 
-#: ../src/i_callbacks.c:2096
+#: src/i_callbacks.c:2099
 msgid "Paste 1"
 msgstr "Plak 1"
 
-#: ../src/i_callbacks.c:2118
+#: src/i_callbacks.c:2121
 msgid "Paste 2"
 msgstr "Plak 2"
 
-#: ../src/i_callbacks.c:2140
+#: src/i_callbacks.c:2143
 msgid "Paste 3"
 msgstr "Plak 3"
 
-#: ../src/i_callbacks.c:2162
+#: src/i_callbacks.c:2165
 msgid "Paste 4"
 msgstr "Plak 4"
 
-#: ../src/i_callbacks.c:2184
+#: src/i_callbacks.c:2187
 msgid "Paste 5"
 msgstr "Plak 5"
 
-#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
+#: src/i_callbacks.c:2324 src/x_window.c:354
 msgid "Component"
 msgstr "Komponent"
 
-#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
+#: src/i_callbacks.c:2360 src/i_callbacks.c:2379 src/x_dialog.c:2381
 msgid "Attribute"
 msgstr "Eienskap"
 
-#: ../src/i_callbacks.c:2873
+#: src/i_callbacks.c:2877
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Soek vir bron [%s]\n"
 
-#: ../src/i_callbacks.c:2897
+#: src/i_callbacks.c:2901
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Kan nie bron [%s] vind nie\n"
 
-#: ../src/i_callbacks.c:2964
+#: src/i_callbacks.c:2970
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Soek vir simbool [%s]\n"
 
-#: ../src/i_callbacks.c:2970
+#: src/i_callbacks.c:2976
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3001
+#: src/i_callbacks.c:3007
 msgid "Cannot find any schematics above the current one!\n"
 msgstr ""
 
 # FIXME: "aangeduide".
-#: ../src/i_callbacks.c:3064
+#: src/i_callbacks.c:3061
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
@@ -1035,245 +1046,243 @@ msgstr ""
 "Hierdie opdrag haal die komponentdokumentasie van die web, maar daar is geen "
 "aangeduide komponent nie"
 
-#: ../src/i_callbacks.c:3177
+#: src/i_callbacks.c:3171
 msgid "ShowN"
 msgstr "ToonN"
 
-#: ../src/i_callbacks.c:3213
+#: src/i_callbacks.c:3207
 msgid "ShowV"
 msgstr "ToonW"
 
-#: ../src/i_callbacks.c:3249
+#: src/i_callbacks.c:3243
 msgid "ShowB"
 msgstr "ToonB"
 
-#: ../src/i_callbacks.c:3286
+#: src/i_callbacks.c:3280
 msgid "VisToggle"
 msgstr "SigSkakel"
 
-#: ../src/i_callbacks.c:3316
+#: src/i_callbacks.c:3310
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Jammer, maar hierdie opsie werk nie\n"
 
-#: ../src/i_callbacks.c:3406
+#: src/i_callbacks.c:3400
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Handelingsterugvoermodus na SKETS gestel\n"
 
-#: ../src/i_callbacks.c:3409
+#: src/i_callbacks.c:3403
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Handelingsterugvoermodus na OMTREKREGHOEK\n"
 
-#: ../src/i_callbacks.c:3434
+#: src/i_callbacks.c:3428
 msgid "Grid OFF\n"
 msgstr "Rooster AF\n"
 
-#: ../src/i_callbacks.c:3435
+#: src/i_callbacks.c:3429
 msgid "Dot grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3436
+#: src/i_callbacks.c:3430
 msgid "Mesh grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3457
+#: src/i_callbacks.c:3451
 msgid "Snap OFF (CAUTION!)\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3460
+#: src/i_callbacks.c:3454
 msgid "Snap ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3463
+#: src/i_callbacks.c:3457
 msgid "Snap back to the grid (CAUTION!)\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3489
+#: src/i_callbacks.c:3483
 msgid "Rubber band OFF \n"
 msgstr "Rubberband AF\n"
 
-#: ../src/i_callbacks.c:3492
+#: src/i_callbacks.c:3486
 msgid "Rubber band ON\n"
 msgstr "Rubberband AAN\n"
 
-#: ../src/i_callbacks.c:3507
+#: src/i_callbacks.c:3501
 msgid "magnetic net mode: ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3510
+#: src/i_callbacks.c:3504
 msgid "magnetic net mode: OFF\n"
 msgstr ""
 
-#: ../src/o_box.c:160
+#: src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Onbekende tipe vir reghoek (vul)!\n"
 
-#: ../src/o_buffer.c:57
+#: src/o_buffer.c:57
 #, c-format
 msgid "o_buffer_copy: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:72
+#: src/o_buffer.c:72
 #, c-format
 msgid "o_buffer_cut: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:93
+#: src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr "Het 'n ongeldige buffer_number gekry [o_buffer_paste_start]\n"
 
-#: ../src/o_bus.c:135
+#: src/o_bus.c:135
 #, fuzzy, c-format
 msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr "Het 'n ongeldige whichone in o_bus_draw_xor_single gekry\n"
 
-#: ../src/o_circle.c:141
+#: src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Onbekende tipe vir sirkel (vul)!\n"
 
-#: ../src/o_complex.c:250 ../src/o_complex.c:254
+#: src/o_complex.c:250 src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Verskuif stroombaandiagram [%d %d]\n"
 
-#: ../src/o_misc.c:61
+#: src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
 msgstr "Het 'n onverwagte NULL in o_edit gekry\n"
 
-#: ../src/o_misc.c:125
+#: src/o_misc.c:125
 msgid "Object already locked\n"
 msgstr "Voorwerp klaar gesluit\n"
 
-#: ../src/o_misc.c:163
+#: src/o_misc.c:163
 msgid "Object already unlocked\n"
 msgstr "Voorwerp klaar ontsluit\n"
 
-#: ../src/o_misc.c:445
+#: src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "Verskuilde teks is nou sigbaar\n"
 
-#: ../src/o_misc.c:447
+#: src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "Verskuilde teks is nou onsigbaar\n"
 
-#: ../src/o_misc.c:697
+#: src/o_misc.c:700
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 
-#: ../src/o_misc.c:840
+#: src/o_misc.c:847
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr "o_autosave_backups: Kan nie die egte lêernaam van %s kry nie."
 
-#: ../src/o_misc.c:884
+#: src/o_misc.c:891
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr "Kon NIE vorige bestandlêer [%s] lees-skryf stel nie\n"
 
-#: ../src/o_misc.c:902
+#: src/o_misc.c:909
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Kon NIE bestandlêer [%s] lees-slegs stel nie\n"
 
-#: ../src/o_misc.c:907
+#: src/o_misc.c:914
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "Kon NIE bestandlêer [%s] bewaar nie\n"
 
-#: ../src/o_move.c:188
+#: src/o_move.c:188
 #, c-format
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "FOUT: NULL voorwerp in o_move_end!\n"
 
 # Thanks to Frank Shearar for reminding me of BLIKSEM!
-#: ../src/o_move.c:461
+#: src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr ""
 "BLIKSEM!  Het probeer om die whichone te vind, maar kon dit nie kry nie!\n"
 
-#: ../src/o_move.c:482
+#: src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr "Het 'n voorwerp wat nie 'n lyn is nie in o_move_check_endpoint gekry\n"
 
-#: ../src/o_net.c:176
+#: src/o_net.c:176
 #, fuzzy, c-format
 msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr "Het 'n ongeldige whichone in o_net_draw_xor_single gekry\n"
 
-#: ../src/o_net.c:552
+#: src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr ""
 
-#: ../src/o_net.c:614
+#: src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr ""
 
-#. try to exit gracefully
-#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
-#: ../src/o_net.c:1126
+#: src/o_net.c:982 src/o_net.c:1019 src/o_net.c:1090 src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 "Het probeer om meer as twee busrippers bytevoeg.  Interne gschem fout.\n"
 
-#: ../src/o_net.c:1196
+#: src/o_net.c:1196
 #, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "Busrippersimbool [%s] is nie in enige komponentbiblioteek gevind nie\n"
 
-#: ../src/o_path.c:356
+#: src/o_path.c:356
 #, fuzzy, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "Onbekende tipe vir reghoek (vul)!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:557
+#: src/o_picture.c:166 src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Kon nie afbeelding laai nie: %s"
 
-#: ../src/o_picture.c:180
+#: src/o_picture.c:180
 msgid "Picture"
 msgstr "Afbeelding"
 
-#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
+#: src/o_picture.c:465 src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "FOUT: NULL voorwerp!\n"
 
-#: ../src/o_slot.c:110
+#: src/o_slot.c:81
 msgid "Slot attribute malformed\n"
 msgstr "\"slot\" eienskap is misvorm\n"
 
-#: ../src/o_slot.c:128
+#: src/o_slot.c:99
 msgid "numslots attribute missing\n"
 msgstr "\"numslots\" eienskap bestaan nie\n"
 
-#: ../src/o_slot.c:130
+#: src/o_slot.c:100
 msgid "Slotting not allowed for this component\n"
 msgstr "Gleuwe is nie toegelaat vir hierdie komponent nie\n"
 
-#: ../src/o_slot.c:145
+#: src/o_slot.c:115
 msgid "New slot number out of range\n"
 msgstr "Nuwe gleufnommer buite bereik\n"
 
-#: ../src/o_slot.c:200
+#: src/o_slot.c:170
 #, c-format
 msgid "uggg! you tried to slot edit something that doesn't exist!\n"
 msgstr ""
 "uggg!  Jy het probeer om iets as 'n gleuf te bewerk, maar dit bestaan nie!\n"
 
-#: ../src/o_undo.c:300
+#: src/o_undo.c:300
 msgid "Undo/Redo disabled in rc file\n"
 msgstr ""
 
-#: ../src/parsecmd.c:47
+#: src/parsecmd.c:47
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] schematic_filename1 ... schematic_filenameN\n"
@@ -1288,451 +1297,423 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../src/x_attribedit.c:127
+#: src/x_attribedit.c:127
 #, c-format
 msgid "Got invalid show option; defaulting to show both\n"
 msgstr ""
 
-#: ../src/x_attribedit.c:330
+#: src/x_attribedit.c:330
 msgid "Single Attribute Editor"
 msgstr "Enkeleienskap-Bewerker"
 
-#: ../src/x_attribedit.c:359
+#: src/x_attribedit.c:359
 msgid "<b>Edit Attribute</b>"
 msgstr "<b>Bewerk Eienskap</b>"
 
-#: ../src/x_attribedit.c:361
+#: src/x_attribedit.c:361
 msgid "<b>Add Attribute</b>"
 msgstr "<b>Voeg Eienskap By</b>"
 
-#. Name selection
-#. GtkLabel
-#: ../src/x_attribedit.c:377 ../src/x_multiattrib.c:1725
+#: src/x_attribedit.c:377 src/x_multiattrib.c:1921
 msgid "Name:"
 msgstr "Naam:"
 
-#. Value entry
-#. GtkLabel
-#: ../src/x_attribedit.c:393 ../src/x_multiattrib.c:1744
+#: src/x_attribedit.c:393 src/x_multiattrib.c:1940
 msgid "Value:"
 msgstr "Waarde:"
 
-#. Visibility
-#. GtkButton
-#: ../src/x_attribedit.c:409 ../src/x_multiattrib.c:1781
+#: src/x_attribedit.c:409 src/x_multiattrib.c:1983
 msgid "Visible"
 msgstr "Sigbaar"
 
-#: ../src/x_attribedit.c:429
+#: src/x_attribedit.c:429
 msgid "Show Value Only"
 msgstr "Toon Slegs Waarde"
 
-#: ../src/x_attribedit.c:431
+#: src/x_attribedit.c:431
 msgid "Show Name Only"
 msgstr "Toon Slegs Naam"
 
-#: ../src/x_attribedit.c:433 ../src/x_multiattrib.c:1369
+#: src/x_attribedit.c:433 src/x_multiattrib.c:1459
 msgid "Show Name & Value"
 msgstr "Toon Naam & Waarde"
 
-#. gschem specific
-#: ../src/x_attribedit.c:440
+#: src/x_attribedit.c:440
 msgid "<b>Attach Options</b>"
 msgstr "<b>AAnhegopsies</b>"
 
-#: ../src/x_attribedit.c:455
+#: src/x_attribedit.c:455
 msgid "All"
 msgstr "Alles"
 
-#. GtkTreeViewColumn
-#: ../src/x_attribedit.c:463 ../src/x_compselect.c:896
-#: ../src/x_compselect.c:1010
+#: src/x_attribedit.c:463 src/x_compselect.c:895 src/x_compselect.c:1009
 msgid "Components"
 msgstr "Komponente"
 
 # FIXME: "Nette"
-#: ../src/x_attribedit.c:471 ../src/x_window.c:364
+#: src/x_attribedit.c:471 src/x_window.c:364
 msgid "Nets"
 msgstr "Nette"
 
-#: ../src/x_attribedit.c:479
+#: src/x_attribedit.c:479
 msgid "Replace existing attributes"
 msgstr "Vervang bestaande eienskappe"
 
-#: ../src/x_autonumber.c:413
+#: src/x_autonumber.c:415
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
 msgstr ""
 
-#. duplicate slot in used_slots
-#: ../src/x_autonumber.c:428
+#: src/x_autonumber.c:430
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 "duplikaatgleuf mag probleme veroorsaak: [symbolname=%s, number=%d, slot=%d]\n"
 
-#: ../src/x_autonumber.c:696
+#: src/x_autonumber.c:702
 msgid "No searchstring given in autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:748
+#: src/x_autonumber.c:754
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:883
+#: src/x_autonumber.c:889
 msgid "Diagonal"
 msgstr "Diagonaal"
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Top to bottom"
 msgstr "Bo to onder"
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Bottom to top"
 msgstr "Onder tot bo"
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 msgid "Left to right"
 msgstr "Links tot regs"
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 msgid "Right to left"
 msgstr "Regs tot links"
 
-#: ../src/x_autonumber.c:886
+#: src/x_autonumber.c:892
 msgid "File order"
 msgstr "Lêerorde"
 
-#: ../src/x_autonumber.c:1222
+#: src/x_autonumber.c:1228
 msgid "Autonumber text"
 msgstr ""
 
-#. scope section
-#: ../src/x_autonumber.c:1246
+#: src/x_autonumber.c:1252
 msgid "<b>Scope</b>"
 msgstr "<b>Bestek</b>"
 
-#: ../src/x_autonumber.c:1268
+#: src/x_autonumber.c:1274
 msgid "Search for:"
 msgstr "Soek vir:"
 
-#: ../src/x_autonumber.c:1282
+#: src/x_autonumber.c:1288
 msgid "Autonumber text in:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1289
+#: src/x_autonumber.c:1295
 msgid "Skip numbers found in:"
 msgstr "Slaan nommers oor in:"
 
-#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
+#: src/x_autonumber.c:1307 src/x_autonumber.c:1316
 msgid "Selected objects"
 msgstr ""
 
-#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
+#: src/x_autonumber.c:1308 src/x_autonumber.c:1317
 msgid "Current page"
 msgstr "Lopende bladsy"
 
-#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
+#: src/x_autonumber.c:1309 src/x_autonumber.c:1318
 msgid "Whole hierarchy"
 msgstr "Hele hierargie"
 
-#: ../src/x_autonumber.c:1314
+#: src/x_autonumber.c:1320
 msgid "Overwrite existing numbers"
 msgstr "Vervang bestaande nommers"
 
-#. Options section
-#: ../src/x_autonumber.c:1319
+#: src/x_autonumber.c:1325
 msgid "<b>Options</b>"
 msgstr "<b>Opsies</b>"
 
-#: ../src/x_autonumber.c:1341
+#: src/x_autonumber.c:1347
 msgid "Starting number:"
 msgstr "Begin by nommer:"
 
-#: ../src/x_autonumber.c:1348
+#: src/x_autonumber.c:1354
 msgid "Sort order:"
 msgstr "Rangskikkingsorde:"
 
-#: ../src/x_autonumber.c:1369
+#: src/x_autonumber.c:1375
 msgid "Remove numbers"
 msgstr "Verwyder syfers"
 
-#: ../src/x_autonumber.c:1373
+#: src/x_autonumber.c:1379
 msgid "Automatic slotting"
 msgstr "Outomatiese begleuwing"
 
-#: ../src/x_color.c:94 ../src/x_color.c:103
+#: src/x_color.c:94 src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Kon nie aanspraak maak op die kleur %s nie!\n"
 
-#: ../src/x_color.c:94
+#: src/x_color.c:94
 msgid "black"
 msgstr "swart"
 
-#: ../src/x_color.c:103
+#: src/x_color.c:103
 msgid "white"
 msgstr "wit"
 
-#: ../src/x_color.c:125
+#: src/x_color.c:125
 #, fuzzy, c-format
 msgid "Could not allocate display color %i!\n"
 msgstr "Kon nie aanspraak maak op die kleur %s nie!\n"
 
-#: ../src/x_color.c:147
+#: src/x_color.c:147
 #, fuzzy, c-format
 msgid "Could not allocate outline color %i!\n"
 msgstr "Kon nie aanspraak maak op die kleur %s nie!\n"
 
-#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
+#: src/x_color.c:164 src/x_color.c:181 src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Het probeer om 'n ongeldige kleur te kry: %d\n"
 
-#: ../src/x_color.c:214
+#: src/x_color.c:214
 #, fuzzy, c-format
 msgid "Tried to get an invalid outline color: %d\n"
 msgstr "Het probeer om 'n ongeldige kleur te kry: %d\n"
 
-#. GtkLabel
-#: ../src/x_compselect.c:1040
+#: src/x_compselect.c:1039
 msgid "Filter:"
 msgstr "Deursyfer:"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
-#: ../src/x_multiattrib.c:1601
+#: src/x_compselect.c:1142 src/x_dialog.c:3776 src/x_multiattrib.c:1787
 msgid "Name"
 msgstr "Naam"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1152 ../src/x_multiattrib.c:1626
+#: src/x_compselect.c:1151 src/x_multiattrib.c:1811
 msgid "Value"
 msgstr "Waarde"
 
-#: ../src/x_compselect.c:1191
+#: src/x_compselect.c:1190
 msgid "Default behavior - reference component"
 msgstr "Verstekgedrag - verwys na komponent"
 
-#: ../src/x_compselect.c:1194
+#: src/x_compselect.c:1193
 msgid "Embed component in schematic"
 msgstr "Lê komponent in stroombaandiagram in"
 
-#: ../src/x_compselect.c:1197
+#: src/x_compselect.c:1196
 msgid "Include component as individual objects"
 msgstr "Sluit komponent as afsonderlike voorwerpe in"
 
-#. GtkWindow
-#: ../src/x_compselect.c:1354
+#: src/x_compselect.c:1353
 msgid "Select Component..."
 msgstr "Kies Komponent..."
 
-#: ../src/x_compselect.c:1377
+#: src/x_compselect.c:1376
 msgid "In Use"
 msgstr "In Gebruik"
 
-#: ../src/x_compselect.c:1381
+#: src/x_compselect.c:1380
 msgid "Libraries"
 msgstr "Biblioteke"
 
-#. GtkFrame
-#: ../src/x_compselect.c:1390 ../src/x_fileselect.c:122
+#: src/x_compselect.c:1389 src/x_fileselect.c:122
 msgid "Preview"
 msgstr "Voorskou"
 
-#. dialog not created yet
-#: ../src/x_dialog.c:174
+#: src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "Teksaantekening..."
 
-#: ../src/x_dialog.c:205
+#: src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
 "Middle button to rotate while placing."
 msgstr ""
 
-#: ../src/x_dialog.c:294
-#, c-format
+#: src/x_dialog.c:294
 msgid "Lower Left"
 msgstr "Links Onder"
 
-#: ../src/x_dialog.c:305
-#, c-format
+#: src/x_dialog.c:305
 msgid "Middle Left"
 msgstr "Middel Links"
 
-#: ../src/x_dialog.c:316
-#, c-format
+#: src/x_dialog.c:316
 msgid "Upper Left"
 msgstr "Links Bo"
 
-#: ../src/x_dialog.c:327
-#, c-format
+#: src/x_dialog.c:327
 msgid "Lower Middle"
 msgstr "Middel Onder"
 
-#: ../src/x_dialog.c:338
-#, c-format
+#: src/x_dialog.c:338
 msgid "Middle Middle"
 msgstr "Middel Middel"
 
-#: ../src/x_dialog.c:349
-#, c-format
+#: src/x_dialog.c:349
 msgid "Upper Middle"
 msgstr "Middel Bo"
 
-#: ../src/x_dialog.c:360
-#, c-format
+#: src/x_dialog.c:360
 msgid "Lower Right"
 msgstr "Regs Onder"
 
-#: ../src/x_dialog.c:371
-#, c-format
+#: src/x_dialog.c:371
 msgid "Middle Right"
 msgstr "Middel Regs"
 
-#: ../src/x_dialog.c:382
-#, c-format
+#: src/x_dialog.c:382
 msgid "Upper Right"
 msgstr "Regs Bo"
 
-#: ../src/x_dialog.c:496
+#: src/x_dialog.c:496
 msgid "Edit Text Properties"
 msgstr "Bewerk Tekseienskappe"
 
-#: ../src/x_dialog.c:530
+#: src/x_dialog.c:530
 msgid "<b>Text Content</b>"
 msgstr "<b>Teksinhoud</b>"
 
-#: ../src/x_dialog.c:562
+#: src/x_dialog.c:562
 msgid "<b>Text Properties</b>"
 msgstr "<b>Tekseienskappe</b>"
 
-#: ../src/x_dialog.c:577
+#: src/x_dialog.c:577
 msgid "Color:"
 msgstr "Kleur:"
 
-#: ../src/x_dialog.c:584
+#: src/x_dialog.c:584
 msgid "Size:"
 msgstr "Grootte:"
 
-#: ../src/x_dialog.c:593
+#: src/x_dialog.c:593
 msgid "Alignment:"
 msgstr "Sporing:"
 
-#: ../src/x_dialog.c:647
+#: src/x_dialog.c:647
 msgid "Solid"
 msgstr "Solied"
 
-#: ../src/x_dialog.c:648
+#: src/x_dialog.c:648
 msgid "Dotted"
 msgstr "Gestippeld"
 
-#: ../src/x_dialog.c:649
+#: src/x_dialog.c:649
 msgid "Dashed"
 msgstr "Gebroke"
 
-#: ../src/x_dialog.c:650
+#: src/x_dialog.c:650
 msgid "Center"
 msgstr "Sentreer"
 
-#: ../src/x_dialog.c:651
+#: src/x_dialog.c:651
 msgid "Phantom"
 msgstr "Spook"
 
-#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
-#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
-#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
-#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
-#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
-#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
+#: src/x_dialog.c:652 src/x_dialog.c:749 src/x_dialog.c:758 src/x_dialog.c:767
+#: src/x_dialog.c:868 src/x_dialog.c:870 src/x_dialog.c:872
+#: src/x_dialog.c:1100 src/x_dialog.c:1203 src/x_dialog.c:1212
+#: src/x_dialog.c:1221 src/x_dialog.c:1230 src/x_dialog.c:1239
+#: src/x_dialog.c:1352 src/x_dialog.c:1354 src/x_dialog.c:1356
+#: src/x_dialog.c:1358 src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*onveranderd*"
 
-#: ../src/x_dialog.c:978
+#: src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Bewerk Lynwyddte & -styl"
 
-#: ../src/x_dialog.c:1017 ../src/x_print.c:307
+#: src/x_dialog.c:1017 src/x_print.c:307
 msgid "Type:"
 msgstr "Styl:"
 
-#: ../src/x_dialog.c:1021
+#: src/x_dialog.c:1021
 msgid "Width:"
 msgstr "Wydte:"
 
-#: ../src/x_dialog.c:1025
+#: src/x_dialog.c:1025
 msgid "Dash Length:"
 msgstr "Streeplengte"
 
-#: ../src/x_dialog.c:1029
+#: src/x_dialog.c:1029
 msgid "Dash Space:"
 msgstr "Streepspasie"
 
-#: ../src/x_dialog.c:1096
+#: src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Hol"
 
-#: ../src/x_dialog.c:1097
+#: src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Gevul"
 
-#: ../src/x_dialog.c:1098
+#: src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "Rooster"
 
-#: ../src/x_dialog.c:1099
+#: src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "Arseer"
 
-#: ../src/x_dialog.c:1470
+#: src/x_dialog.c:1470
 msgid "Edit Fill Type"
 msgstr "Bewerk Vultipe"
 
-#: ../src/x_dialog.c:1508
+#: src/x_dialog.c:1508
 msgid "Fill Type:"
 msgstr "Vultipe:"
 
-#: ../src/x_dialog.c:1512
+#: src/x_dialog.c:1512
 msgid "Line Width:"
 msgstr "Lynwydte:"
 
-#: ../src/x_dialog.c:1516
+#: src/x_dialog.c:1516
 msgid "Angle 1:"
 msgstr "Hoek 1:"
 
-#: ../src/x_dialog.c:1520
+#: src/x_dialog.c:1520
 msgid "Pitch 1:"
 msgstr "Steek 1:"
 
-#: ../src/x_dialog.c:1524
+#: src/x_dialog.c:1524
 msgid "Angle 2:"
 msgstr "Hoek 2:"
 
-#: ../src/x_dialog.c:1528
+#: src/x_dialog.c:1528
 msgid "Pitch 2:"
 msgstr "Steek 2:"
 
-#: ../src/x_dialog.c:1657
+#: src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "Boogparameters"
 
-#: ../src/x_dialog.c:1697
+#: src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr ""
 
-#: ../src/x_dialog.c:1705
+#: src/x_dialog.c:1705
 msgid "Start Angle:"
 msgstr "Beginhoek:"
 
-#: ../src/x_dialog.c:1713
+#: src/x_dialog.c:1713
 msgid "Degrees of Sweep:"
 msgstr "Grade van Kromming:"
 
-#: ../src/x_dialog.c:1830
+#: src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1740,44 +1721,44 @@ msgstr ""
 "Afwyking om te verskuif?\n"
 "(0 vir oorsprong)"
 
-#: ../src/x_dialog.c:1898
+#: src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "Teksgrootte"
 
-#: ../src/x_dialog.c:1928
+#: src/x_dialog.c:1928
 msgid "Enter new text size:"
 msgstr "Gee nuwe teksgrootte aan:"
 
-#: ../src/x_dialog.c:2004
+#: src/x_dialog.c:2004
 msgid "Snap Size"
 msgstr ""
 
-#: ../src/x_dialog.c:2034
+#: src/x_dialog.c:2034
 msgid "Enter new snap grid spacing:"
 msgstr ""
 
-#: ../src/x_dialog.c:2107
+#: src/x_dialog.c:2110
 msgid "Edit slot number"
 msgstr "Bewerk gleufnommer"
 
-#: ../src/x_dialog.c:2138
+#: src/x_dialog.c:2141
 msgid "Edit slot number:"
 msgstr "Bewerk gleufnommer:"
 
-#: ../src/x_dialog.c:2200
+#: src/x_dialog.c:2202
 msgid "About..."
 msgstr "Omtrent..."
 
-#: ../src/x_dialog.c:2220
+#: src/x_dialog.c:2222
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA: GPL Elektroniese Ontwerp Outomatisering</b>"
 
-#: ../src/x_dialog.c:2224
+#: src/x_dialog.c:2226
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>gschem uitgawe %s%s.%s</b>"
 
-#: ../src/x_dialog.c:2232
+#: src/x_dialog.c:2234
 msgid ""
 "Written by:\n"
 "Ales Hvezda\n"
@@ -1790,142 +1771,142 @@ msgstr ""
 "en vele andere (Sien AUTHORS lêer)"
 
 # FIXME: May need to have a deëlteken on second 'o'.
-#: ../src/x_dialog.c:2295
+#: src/x_dialog.c:2297
 msgid "Coords"
 msgstr "Koordinate"
 
-#: ../src/x_dialog.c:2316
+#: src/x_dialog.c:2318
 msgid "Screen"
 msgstr "Skerm"
 
-#: ../src/x_dialog.c:2325
+#: src/x_dialog.c:2327
 msgid "World"
 msgstr "Wêreld"
 
-#: ../src/x_dialog.c:2364
+#: src/x_dialog.c:2366
 msgid "Background"
 msgstr ""
 
-#: ../src/x_dialog.c:2370
+#: src/x_dialog.c:2372
 msgid "Net endpoint"
 msgstr ""
 
-#: ../src/x_dialog.c:2373
+#: src/x_dialog.c:2375
 msgid "Graphic"
 msgstr ""
 
-#: ../src/x_dialog.c:2382
+#: src/x_dialog.c:2384
 msgid "Logic bubble"
 msgstr ""
 
-#: ../src/x_dialog.c:2385
+#: src/x_dialog.c:2387
 msgid "Grid point"
 msgstr ""
 
-#: ../src/x_dialog.c:2388
+#: src/x_dialog.c:2390
 #, fuzzy
 msgid "Detached attribute"
 msgstr "Voeg Eienskap By"
 
-#: ../src/x_dialog.c:2391 ../src/x_window.c:382
+#: src/x_dialog.c:2393 src/x_window.c:382
 msgid "Text"
 msgstr "Teks"
 
-#: ../src/x_dialog.c:2397
+#: src/x_dialog.c:2399
 #, fuzzy
 msgid "Selection"
 msgstr "Kies"
 
-#: ../src/x_dialog.c:2400
+#: src/x_dialog.c:2402
 msgid "Bounding box"
 msgstr ""
 
-#: ../src/x_dialog.c:2403
+#: src/x_dialog.c:2405
 #, fuzzy
 msgid "Zoom box"
 msgstr "Zoem Reghoek"
 
-#: ../src/x_dialog.c:2412
+#: src/x_dialog.c:2414
 msgid "Output background"
 msgstr ""
 
-#: ../src/x_dialog.c:2415
+#: src/x_dialog.c:2417
 #, fuzzy
 msgid "Net junction"
 msgstr "Funksie"
 
-#: ../src/x_dialog.c:2418
+#: src/x_dialog.c:2420
 msgid "Mesh grid major"
 msgstr ""
 
-#: ../src/x_dialog.c:2421
+#: src/x_dialog.c:2423
 msgid "Mesh grid minor"
 msgstr ""
 
-#: ../src/x_dialog.c:2424
+#: src/x_dialog.c:2426
 msgid "Unknown"
 msgstr ""
 
-#: ../src/x_dialog.c:2570
+#: src/x_dialog.c:2572
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr "FOUT: NULL voorwerp in color_edit_dialog_apply!\n"
 
-#: ../src/x_dialog.c:2633
+#: src/x_dialog.c:2635
 msgid "Color Edit"
 msgstr "Kleurbewerking"
 
-#: ../src/x_dialog.c:2664
+#: src/x_dialog.c:2666
 msgid "Object color:"
 msgstr "Voorwerpkleur:"
 
-#: ../src/x_dialog.c:2786
+#: src/x_dialog.c:2788
 msgid "Function"
 msgstr "Funksie"
 
-#: ../src/x_dialog.c:2793
+#: src/x_dialog.c:2795
 msgid "Keystroke(s)"
 msgstr "Sleutelslae"
 
-#: ../src/x_dialog.c:3102
+#: src/x_dialog.c:3104
 msgid "Find Text"
 msgstr "Vind Teks"
 
-#: ../src/x_dialog.c:3133
+#: src/x_dialog.c:3135
 msgid "Text to find:"
 msgstr "Teks om te vind:"
 
-#: ../src/x_dialog.c:3143
+#: src/x_dialog.c:3145
 msgid "descend into hierarchy"
 msgstr "daal in hierargie af"
 
-#: ../src/x_dialog.c:3208
+#: src/x_dialog.c:3210
 msgid "Hide Text"
 msgstr "Verskuil Teks"
 
-#: ../src/x_dialog.c:3239
+#: src/x_dialog.c:3241
 msgid "Hide text starting with:"
 msgstr "Verskuil teks beginnende met:"
 
-#: ../src/x_dialog.c:3308
+#: src/x_dialog.c:3310
 msgid "Show Text"
 msgstr "Toon Teks"
 
-#: ../src/x_dialog.c:3339
+#: src/x_dialog.c:3341
 msgid "Show text starting with:"
 msgstr "Toon Teks beginnende met:"
 
-#: ../src/x_dialog.c:3796
+#: src/x_dialog.c:3798
 msgid "S_elect the schematics you want to save:"
 msgstr "Kies die stroombaandiagramme wat jy wil bewaar:"
 
-#: ../src/x_dialog.c:3890
+#: src/x_dialog.c:3892
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr ""
 "Wil jy veranderinge aan stroombaandiagram \"%s\" bewaar voor jy afsluit?"
 
-#: ../src/x_dialog.c:3896
+#: src/x_dialog.c:3898
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
@@ -1933,16 +1914,15 @@ msgstr ""
 "Daar is %d stroombaandiagramme met onbewaarde veranderinge.  Wil jy die "
 "veranderinge bewaar voor jy afsluit?"
 
-#. secondary label
-#: ../src/x_dialog.c:3925
+#: src/x_dialog.c:3927
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr "As jy nie bewaar nie, sal al jou veranderinge permanent verloregaan."
 
-#: ../src/x_dialog.c:3945
+#: src/x_dialog.c:3947
 msgid "_Close without saving"
 msgstr "Sluit sonder om te bewaar"
 
-#: ../src/x_dialog.c:4279
+#: src/x_dialog.c:4283
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1960,49 +1940,49 @@ msgstr ""
 "Die naam mag nie met 'n spasie eindig nie.\n"
 "Die waarde mag nie met 'n spasie begin nie."
 
-#: ../src/x_dialog.c:4281
+#: src/x_dialog.c:4285
 msgid "Invalid Attribute"
 msgstr "Ongeldige Eienskap"
 
-#: ../src/x_dialog.c:4317
+#: src/x_dialog.c:4321
 #, fuzzy
 msgid "Pin type"
 msgstr "Penmodus"
 
-#: ../src/x_dialog.c:4341
+#: src/x_dialog.c:4345
 #, fuzzy
 msgid "Net pin"
 msgstr "Funksie"
 
-#: ../src/x_dialog.c:4343
+#: src/x_dialog.c:4347
 msgid "Bus pin (graphical)"
 msgstr ""
 
-#: ../src/x_fileselect.c:42
+#: src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "Stroombaandiagramme"
 
-#: ../src/x_fileselect.c:47
+#: src/x_fileselect.c:47
 msgid "Symbols"
 msgstr "Simbole"
 
-#: ../src/x_fileselect.c:52
+#: src/x_fileselect.c:52
 msgid "Schematics and symbols"
 msgstr "Stroombaandiagramme en simbole"
 
-#: ../src/x_fileselect.c:58
+#: src/x_fileselect.c:58
 msgid "All files"
 msgstr "Alle lêers"
 
-#: ../src/x_fileselect.c:171
+#: src/x_fileselect.c:171
 msgid "Open..."
 msgstr "Open..."
 
-#: ../src/x_fileselect.c:231
+#: src/x_fileselect.c:231
 msgid "Save as..."
 msgstr "Bewaar as..."
 
-#: ../src/x_fileselect.c:284
+#: src/x_fileselect.c:284
 #, c-format
 msgid ""
 "The selected file `%s' already exists.\n"
@@ -2010,30 +1990,29 @@ msgid ""
 "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/x_fileselect.c:287
+#: src/x_fileselect.c:287
 msgid "Overwrite file?"
 msgstr "Vervang lêer?"
 
-#: ../src/x_fileselect.c:289
+#: src/x_fileselect.c:289
 msgid "Save cancelled on user request\n"
 msgstr ""
 
-#. WK - catch EPS export case
-#: ../src/x_image.c:176
+#: src/x_image.c:176
 msgid "Encapsulated Postscript"
 msgstr ""
 
-#: ../src/x_image.c:296
+#: src/x_image.c:296
 #, c-format
 msgid "x_image_lowlevel: Unable to write eps file %s.\n"
 msgstr "x_image_lowlevel: Kon nie eps-lêer %s skryf nie.\n"
 
-#: ../src/x_image.c:374
+#: src/x_image.c:374
 #, c-format
 msgid "x_image_lowlevel: Unable to write %s file %s.\n"
 msgstr "x_image_lowlevel: Kon nie %s-lêer %s skryf nie.\n"
 
-#: ../src/x_image.c:384
+#: src/x_image.c:384
 #, c-format
 msgid ""
 "There was the following error when saving image with type %s to filename:\n"
@@ -2046,259 +2025,259 @@ msgstr ""
 "\n"
 "%s.\n"
 
-#: ../src/x_image.c:403
+#: src/x_image.c:403
 #, c-format
 msgid "Wrote color image to [%s] [%d x %d]\n"
 msgstr "Het kleurafbeelding na [%s] [%d x %d] geskryf\n"
 
-#: ../src/x_image.c:405
+#: src/x_image.c:405
 #, c-format
 msgid "Wrote black and white image to [%s] [%d x %d]\n"
 msgstr "Het swart-en-witafbeelding na [%s] [%d x %d] geskryf\n"
 
-#: ../src/x_image.c:413
+#: src/x_image.c:413
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 msgstr "x_image_lowlevel: Kon nie pixbuf van gschem se venster kry nie.\n"
 
-#: ../src/x_image.c:458
+#: src/x_image.c:458
 msgid "Width x Height"
 msgstr "Wydte x Hoogte"
 
-#: ../src/x_image.c:474
+#: src/x_image.c:474
 msgid "Image type"
 msgstr "Afbeeldingsoort"
 
-#: ../src/x_log.c:188
+#: src/x_log.c:188
 msgid "** Invalid UTF-8 in log message. See stderr or gschem.log.\n"
 msgstr ""
 
-#: ../src/x_log.c:256
+#: src/x_log.c:256
 msgid "Status"
 msgstr "Stand"
 
-#: ../src/x_menus.c:36
+#: src/x_menus.c:36
 msgid "/Add Net"
 msgstr "/Voeg Net By"
 
-#: ../src/x_menus.c:37
+#: src/x_menus.c:37
 msgid "/Add Attribute..."
 msgstr "/Voeg Eienskap By"
 
-#: ../src/x_menus.c:38
+#: src/x_menus.c:38
 msgid "/Add Component..."
 msgstr "/Voeg Komponent By"
 
-#: ../src/x_menus.c:39
+#: src/x_menus.c:39
 msgid "/Add Bus"
 msgstr "/Voeg Bus By"
 
-#: ../src/x_menus.c:40
+#: src/x_menus.c:40
 msgid "/Add Text"
 msgstr "/Voeg Teks By"
 
-#: ../src/x_menus.c:42
+#: src/x_menus.c:42
 msgid "/Zoom In"
 msgstr "/Zoem In"
 
-#: ../src/x_menus.c:43
+#: src/x_menus.c:43
 msgid "/Zoom Out"
 msgstr "/Zoem Uit"
 
-#: ../src/x_menus.c:44
+#: src/x_menus.c:44
 msgid "/Zoom Box"
 msgstr "/Zoem Reghoek"
 
-#: ../src/x_menus.c:45
+#: src/x_menus.c:45
 msgid "/Zoom Extents"
 msgstr "/Zoem Uitmate"
 
-#: ../src/x_menus.c:47
+#: src/x_menus.c:47
 msgid "/Select"
 msgstr "/Kies"
 
-#: ../src/x_menus.c:48
+#: src/x_menus.c:48
 msgid "/Edit..."
 msgstr "/Bewerk"
 
-#: ../src/x_menus.c:49
+#: src/x_menus.c:49
 #, fuzzy
 msgid "/Edit pin type..."
 msgstr "Bewerk Lyntipe"
 
-#: ../src/x_menus.c:50
+#: src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Kopieer"
 
-#: ../src/x_menus.c:51
+#: src/x_menus.c:51
 msgid "/Move"
 msgstr "/Skuif"
 
-#: ../src/x_menus.c:52
+#: src/x_menus.c:52
 msgid "/Delete"
 msgstr "/Verwyder"
 
-#: ../src/x_menus.c:55
+#: src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/Stroombaandiagram Af"
 
-#: ../src/x_menus.c:56
+#: src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/Simbool Af"
 
-#: ../src/x_menus.c:57
+#: src/x_menus.c:57
 msgid "/Up"
 msgstr "/Op"
 
-#: ../src/x_menus.c:316
+#: src/x_menus.c:319
 #, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr "Het probeer om gevoeligheid op nie-bestaande menu-artikel '%s'\n"
 
-#: ../src/x_menus.c:340
+#: src/x_menus.c:343
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "popup_menu artikelfabriek bestaan nie!\n"
 
-#: ../src/x_menus.c:353
+#: src/x_menus.c:356
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 
-#. Remove this entry from all menus
-#: ../src/x_menus.c:462
+#: src/x_menus.c:436
 #, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Kon nie lêer %s oopmaak nie\n"
 
-#: ../src/x_menus.c:524
+#: src/x_menus.c:493
 msgid "Clear"
 msgstr "Maak Skoon"
 
-#: ../src/x_multiattrib.c:861
+#: src/x_multiattrib.c:913
 msgid "Attributes with empty name are not allowed. Please set a name."
 msgstr "Eienskappe met 'n leë naam word verbied.  Kies asseblief 'n naam."
 
-#: ../src/x_multiattrib.c:1371
+#: src/x_multiattrib.c:1461
 msgid "Show Value only"
 msgstr "Toon slegs waarde"
 
-#: ../src/x_multiattrib.c:1373
+#: src/x_multiattrib.c:1463
 msgid "Show Name only"
 msgstr "Toon slegs naam"
 
-#: ../src/x_multiattrib.c:1400
+#: src/x_multiattrib.c:1491
+msgid "Promote"
+msgstr ""
+
+#: src/x_multiattrib.c:1495
 msgid "Duplicate"
 msgstr "Dupliseer"
 
-#: ../src/x_multiattrib.c:1528
+#: src/x_multiattrib.c:1713
 msgid "Edit Attributes"
 msgstr "Bewerk Eienskappe"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1648
+#: src/x_multiattrib.c:1831
 msgid "Vis?"
 msgstr "Sig?"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1668
+#: src/x_multiattrib.c:1849
 msgid "N"
 msgstr "N"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1688
+#: src/x_multiattrib.c:1867
 msgid "V"
 msgstr "W"
 
-#: ../src/x_multiattrib.c:1709
+#: src/x_multiattrib.c:1889
+#, fuzzy
+msgid "Show inherited attributes"
+msgstr "Voeg Eienskap By"
+
+#: src/x_multiattrib.c:1905
 msgid "Add Attribute"
 msgstr "Voeg Eienskap By"
 
-#: ../src/x_pagesel.c:257
+#: src/x_pagesel.c:257
 msgid "Discard Page"
 msgstr "Werp Bladsy Weg"
 
-#: ../src/x_pagesel.c:376
+#: src/x_pagesel.c:376
 msgid "Page Manager"
 msgstr "Bladsybestuurder"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:432
+#: src/x_pagesel.c:432
 msgid "Filename"
 msgstr "Lêernaam"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:448
+#: src/x_pagesel.c:448
 msgid "Changed"
 msgstr "Veranderd"
 
-#. GtkLabel
-#: ../src/x_pagesel.c:468
+#: src/x_pagesel.c:468
 msgid "Right click on the filename for more options..."
 msgstr "Regs-klik op die lêernaam vir meer opsies..."
 
-#: ../src/x_preview.c:223
+#: src/x_preview.c:223
 #, fuzzy
 msgid "Preview Buffer"
 msgstr "Plak Buffer"
 
-#: ../src/x_print.c:84
+#: src/x_print.c:84
 msgid "Select PostScript Filename..."
 msgstr "Kies PostScript Lêernaam"
 
-#: ../src/x_print.c:164
+#: src/x_print.c:164
 msgid "Extents with margins"
 msgstr "Uitmate met kantlyn"
 
-#: ../src/x_print.c:170
+#: src/x_print.c:170
 msgid "Extents no margins"
 msgstr "Uitmate sonder kantlyn"
 
-#: ../src/x_print.c:176
+#: src/x_print.c:176
 msgid "Current Window"
 msgstr "Huidige Venster"
 
-#: ../src/x_print.c:210
+#: src/x_print.c:210
 msgid "Landscape"
 msgstr "Landskap"
 
-#: ../src/x_print.c:216
+#: src/x_print.c:216
 msgid "Portrait"
 msgstr "Portret"
 
-#. Upper frame
-#: ../src/x_print.c:284
+#: src/x_print.c:284
 msgid "Settings"
 msgstr "Instellinge"
 
-#: ../src/x_print.c:296
+#: src/x_print.c:296
 msgid "Output paper size:"
 msgstr "Uitset-papiergrootte:"
 
-#: ../src/x_print.c:318
+#: src/x_print.c:318
 msgid "Orientation:"
 msgstr "Orientasie"
 
-#. Lower frame
-#: ../src/x_print.c:330
+#: src/x_print.c:330
 msgid "Destination"
 msgstr "Bestemming"
 
-#: ../src/x_print.c:343
+#: src/x_print.c:343
 msgid "File:"
 msgstr "Lêer:"
 
-#: ../src/x_print.c:373
+#: src/x_print.c:373
 msgid "Command:"
 msgstr "Opdrag:"
 
-#: ../src/x_print.c:741
+#: src/x_print.c:741
 msgid "No print destination specified\n"
 msgstr "Geen drukbestemming aangegee nie\n"
 
-#: ../src/x_print.c:748
+#: src/x_print.c:748
 #, c-format
 msgid "Cannot print current schematic to [%s]\n"
 msgstr "Kan nie huidige stroombaandiagram na [%s] druk nie\n"
 
-#: ../src/x_print.c:757
+#: src/x_print.c:757
 #, c-format
 msgid ""
 "Error printing to file '%s'\n"
@@ -2307,45 +2286,45 @@ msgstr ""
 "Fout gedurende lêerdruk na '%s'\n"
 "Ondersoek die log-venster vir meer inligting"
 
-#: ../src/x_print.c:764
+#: src/x_print.c:764
 #, c-format
 msgid "Printed current schematic to [%s]\n"
 msgstr "Het lopende stroombaandiagram na [%s] gedruk\n"
 
-#: ../src/x_window.c:81
+#: src/x_window.c:81
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr "Kon nie aanspraak maak op gc nie\n"
 
-#: ../src/x_window.c:317
+#: src/x_window.c:317
 msgid "New file"
 msgstr "Nuwe lêer"
 
-#: ../src/x_window.c:323
+#: src/x_window.c:323
 msgid "Open"
 msgstr "Maak Oop"
 
-#: ../src/x_window.c:324
+#: src/x_window.c:324
 msgid "Open file..."
 msgstr "Maak lêer oop..."
 
-#: ../src/x_window.c:330
+#: src/x_window.c:330
 msgid "Save"
 msgstr "Bewaar"
 
-#: ../src/x_window.c:331
+#: src/x_window.c:331
 msgid "Save file"
 msgstr "Bewaar lêer"
 
-#: ../src/x_window.c:339
+#: src/x_window.c:339
 msgid "Undo last operation"
 msgstr "Maak laaste handeling ongedaan"
 
-#: ../src/x_window.c:346
+#: src/x_window.c:346
 msgid "Redo last undo"
 msgstr "Herhaal laas-ongedane handeling"
 
-#: ../src/x_window.c:355
+#: src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2353,102 +2332,101 @@ msgid ""
 "Right mouse button to cancel"
 msgstr ""
 
-#: ../src/x_window.c:365
+#: src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
 msgstr ""
 
-#: ../src/x_window.c:375
+#: src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
 msgstr ""
 
-#: ../src/x_window.c:383
+#: src/x_window.c:383
 msgid "Add Text..."
 msgstr "Voeg Teks By..."
 
-#: ../src/x_window.c:393
+#: src/x_window.c:393
 msgid "Select"
 msgstr "Kies"
 
-#: ../src/x_window.c:394
+#: src/x_window.c:394
 msgid "Select mode"
 msgstr "Kiesmodus"
 
-#: ../src/x_window.c:481
+#: src/x_window.c:481
 msgid "Pick"
 msgstr "Kies"
 
-#: ../src/x_window.c:497
+#: src/x_window.c:497
 msgid "Repeat/none"
 msgstr "Herhaal/geen"
 
-#: ../src/x_window.c:507
+#: src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "Menu/Kanselleer"
 
-#: ../src/x_window.c:509
+#: src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr ""
 
-#: ../src/x_window.c:733
+#: src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Laai stroombaandiagram [%s]\n"
 
-#: ../src/x_window.c:745
+#: src/x_window.c:745
 msgid "Failed to load file"
 msgstr "Misluk om lêer te laai"
 
-#: ../src/x_window.c:754
+#: src/x_window.c:754
 #, c-format
 msgid "New file [%s]\n"
 msgstr "Nuwe lêer [%s]\n"
 
-#. an error occured when saving page to file
-#: ../src/x_window.c:859
+#: src/x_window.c:859
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Kon nie bladsy [%s] bewaar nie\n"
 
-#: ../src/x_window.c:860
+#: src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Fout gedurende poging om te bewaar"
 
-#: ../src/x_window.c:869
+#: src/x_window.c:869
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "Bewaar as [%s]\n"
 
-#: ../src/x_window.c:871
+#: src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Bewaar [%s]\n"
 
-#: ../src/x_window.c:873
+#: src/x_window.c:873
 msgid "Saved"
 msgstr "Bewaar"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Werp bladsy [%s] weg\n"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Sluit [%s]\n"
 
-#: ../data/geda-gschem.desktop.in.h:1
-msgid "Create and edit electrical schematics and symbols with gschem"
-msgstr "Skep en bewerk stroombaandiagramme en simbole met gschem"
-
-#: ../data/geda-gschem.desktop.in.h:2
+#: data/geda-gschem.desktop.in.h:3
 msgid "gEDA Schematic Editor"
 msgstr "gEDA Stroombaandiagram Bewerker"
 
+#: data/geda-gschem.desktop.in.h:4
+msgid "Create and edit electrical schematics and symbols with gschem"
+msgstr "Skep en bewerk stroombaandiagramme en simbole met gschem"
+
 #~ msgid "Cut Buffer"
 #~ msgstr "Sny Buffer"
 
diff --git a/gschem/po/de.po b/gschem/po/de.po
index 4452e44..646ad13 100644
--- a/gschem/po/de.po
+++ b/gschem/po/de.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 14:35-0400\n"
+"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
+"POT-Creation-Date: 2009-06-18 11:53+0100\n"
 "PO-Revision-Date: 2008-12-21 12:10+0100\n"
 "Last-Translator: Werner Hoch <werner.ho@xxxxxx>\n"
 "Language-Team: deutsch <de@xxxxxx>\n"
@@ -17,621 +17,611 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../src/rcstrings.c:2
+#: src/rcstrings.c:2
 msgid "File"
 msgstr "Datei"
 
-#: ../src/rcstrings.c:3
+#: src/rcstrings.c:3
 msgid "New Window"
 msgstr "Neues Fenster"
 
-#: ../src/rcstrings.c:4 ../src/x_pagesel.c:252
+#: src/rcstrings.c:4 src/x_pagesel.c:252
 msgid "New Page"
 msgstr "Neue Seite"
 
-#: ../src/rcstrings.c:5 ../src/x_pagesel.c:253
+#: src/rcstrings.c:5 src/x_pagesel.c:253
 msgid "Open Page..."
 msgstr "Ã?ffnen..."
 
-#: ../src/rcstrings.c:6 ../src/x_pagesel.c:256
+#: src/rcstrings.c:6 src/x_pagesel.c:256
 msgid "Close Page"
 msgstr "Seite schlieÃ?en"
 
-#: ../src/rcstrings.c:7
+#: src/rcstrings.c:7
 msgid "Revert Page"
 msgstr "Wiederherstellen"
 
-#: ../src/rcstrings.c:8 ../src/x_pagesel.c:255
+#: src/rcstrings.c:8 src/x_pagesel.c:255
 msgid "Save Page"
 msgstr "Seite speichern"
 
-#: ../src/rcstrings.c:9
+#: src/rcstrings.c:9
 msgid "Save Page As..."
 msgstr "Speichern unter..."
 
-#: ../src/rcstrings.c:10
+#: src/rcstrings.c:10
 msgid "Save All"
 msgstr "Alles speichern"
 
-#. GtkWindow
-#: ../src/rcstrings.c:11 ../src/x_print.c:276
+#: src/rcstrings.c:11 src/x_print.c:276
 msgid "Print..."
 msgstr "Drucken..."
 
-#. Create the dialog
-#: ../src/rcstrings.c:12 ../src/x_image.c:495
+#: src/rcstrings.c:12 src/x_image.c:495
 msgid "Write image..."
 msgstr "Speichere Bild..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:501
+#: src/rcstrings.c:13
 msgid "Recent files"
 msgstr "Zuletzt verwendete Dateien"
 
-#: ../src/rcstrings.c:14 ../src/x_script.c:47
+#: src/rcstrings.c:14 src/x_script.c:47
 msgid "Execute Script..."
 msgstr "Skript ausführen..."
 
-#: ../src/rcstrings.c:15
+#: src/rcstrings.c:15
 msgid "Close Window"
 msgstr "Fenster schlieÃ?en"
 
-#: ../src/rcstrings.c:16
+#: src/rcstrings.c:16
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
+#: src/rcstrings.c:18 src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:338
+#: src/rcstrings.c:19 src/x_window.c:338
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:345
+#: src/rcstrings.c:20 src/x_window.c:345
 msgid "Redo"
 msgstr "Wiederherstellen"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
+#: src/rcstrings.c:21 src/i_basic.c:77 src/x_window.c:521
 msgid "Select Mode"
 msgstr "Auswahl Modus"
 
-#: ../src/rcstrings.c:22
+#: src/rcstrings.c:22
 #, fuzzy
 msgid "Cut"
 msgstr "Ausschneiden 1"
 
-#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
-#: ../src/i_callbacks.c:560
+#: src/rcstrings.c:23 src/i_basic.c:135 src/i_callbacks.c:536
+#: src/i_callbacks.c:560
 msgid "Copy"
 msgstr "Kopieren"
 
-#: ../src/rcstrings.c:24
+#: src/rcstrings.c:24
 #, fuzzy
 msgid "Paste"
 msgstr "Einfügen 1"
 
-#: ../src/rcstrings.c:25
+#: src/rcstrings.c:25
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#: ../src/rcstrings.c:26
+#: src/rcstrings.c:26
 msgid "Edit Text..."
 msgstr "Text bearbeiten..."
 
-#: ../src/rcstrings.c:27 ../src/i_basic.c:84
+#: src/rcstrings.c:27 src/i_basic.c:84
 msgid "Copy Mode"
 msgstr "Kopier Modus"
 
-#: ../src/rcstrings.c:28 ../src/i_basic.c:142
+#: src/rcstrings.c:28 src/i_basic.c:142
 msgid "Multiple Copy Mode"
 msgstr "Mehrfach Kopier Modus"
 
-#: ../src/rcstrings.c:29 ../src/i_basic.c:87
+#: src/rcstrings.c:29 src/i_basic.c:87
 msgid "Move Mode"
 msgstr "Verschiebe Modus"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
+#: src/rcstrings.c:30 src/i_callbacks.c:670 src/x_multiattrib.c:1496
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../src/rcstrings.c:31
+#: src/rcstrings.c:31
 msgid "Rotate 90 Mode"
 msgstr "Dreh Modus (90°)"
 
-#: ../src/rcstrings.c:32 ../src/i_basic.c:91
+#: src/rcstrings.c:32 src/i_basic.c:91
 msgid "Mirror Mode"
 msgstr "Spiegel Modus"
 
-#: ../src/rcstrings.c:33
+#: src/rcstrings.c:33
 msgid "Slot..."
 msgstr "Slot..."
 
-#: ../src/rcstrings.c:34
+#: src/rcstrings.c:34
 msgid "Color..."
 msgstr "Farbe..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
+#: src/rcstrings.c:35 src/i_callbacks.c:920 src/x_dialog.c:2411
 msgid "Lock"
 msgstr "Sperren"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
+#: src/rcstrings.c:36 src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "Entsperren"
 
-#: ../src/rcstrings.c:37
+#: src/rcstrings.c:37
 msgid "Line Width & Type..."
 msgstr "Linieneigenschaften..."
 
-#: ../src/rcstrings.c:38
+#: src/rcstrings.c:38
 msgid "Fill Type..."
 msgstr "Füllung..."
 
-#: ../src/rcstrings.c:39
+#: src/rcstrings.c:39
 msgid "Symbol Translate..."
 msgstr "Symbol transferieren..."
 
-#: ../src/rcstrings.c:40
+#: src/rcstrings.c:40
 msgid "Embed Component/Picture"
 msgstr "Bauteil/Bild einbetten"
 
-#: ../src/rcstrings.c:41
+#: src/rcstrings.c:41
 msgid "Unembed Component/Picture"
 msgstr "Bauteil/Bild ausbetten"
 
-#: ../src/rcstrings.c:42
+#: src/rcstrings.c:42
 msgid "Update Component"
 msgstr "Bauteil aktualisieren"
 
-#: ../src/rcstrings.c:43
+#: src/rcstrings.c:43
 msgid "Show/Hide Inv Text"
 msgstr "Zeige/Verberge unsichtbaren Text"
 
-#: ../src/rcstrings.c:44
+#: src/rcstrings.c:44
 msgid "Make Inv Text Vis"
 msgstr "Text sichtbar machen"
 
-#: ../src/rcstrings.c:46
+#: src/rcstrings.c:46
 msgid "Buffer"
 msgstr "Puffer"
 
-#: ../src/rcstrings.c:47
+#: src/rcstrings.c:47
 msgid "Copy into 1"
 msgstr "Kopiere in 1"
 
-#: ../src/rcstrings.c:48
+#: src/rcstrings.c:48
 msgid "Copy into 2"
 msgstr "Kopiere in 2"
 
-#: ../src/rcstrings.c:49
+#: src/rcstrings.c:49
 msgid "Copy into 3"
 msgstr "Kopiere in 3"
 
-#: ../src/rcstrings.c:50
+#: src/rcstrings.c:50
 msgid "Copy into 4"
 msgstr "Kopiere in 4"
 
-#: ../src/rcstrings.c:51
+#: src/rcstrings.c:51
 msgid "Copy into 5"
 msgstr "Kopiere in 5"
 
-#: ../src/rcstrings.c:52
+#: src/rcstrings.c:52
 msgid "Cut into 1"
 msgstr "Ausschneiden in 1"
 
-#: ../src/rcstrings.c:53
+#: src/rcstrings.c:53
 msgid "Cut into 2"
 msgstr "Ausschneiden in 2"
 
-#: ../src/rcstrings.c:54
+#: src/rcstrings.c:54
 msgid "Cut into 3"
 msgstr "Ausschneiden in 3"
 
-#: ../src/rcstrings.c:55
+#: src/rcstrings.c:55
 msgid "Cut into 4"
 msgstr "Ausschneiden in 4"
 
-#: ../src/rcstrings.c:56
+#: src/rcstrings.c:56
 msgid "Cut into 5"
 msgstr "Ausschneiden in 5"
 
-#: ../src/rcstrings.c:57
+#: src/rcstrings.c:57
 msgid "Paste from 1"
 msgstr "Einfügen aus 1"
 
-#: ../src/rcstrings.c:58
+#: src/rcstrings.c:58
 msgid "Paste from 2"
 msgstr "Einfügen aus 2"
 
-#: ../src/rcstrings.c:59
+#: src/rcstrings.c:59
 msgid "Paste from 3"
 msgstr "Einfügen aus 3"
 
-#: ../src/rcstrings.c:60
+#: src/rcstrings.c:60
 msgid "Paste from 4"
 msgstr "Einfügen aus 4"
 
-#: ../src/rcstrings.c:61
+#: src/rcstrings.c:61
 msgid "Paste from 5"
 msgstr "Einfügen aus 5"
 
-#: ../src/rcstrings.c:63
+#: src/rcstrings.c:63
 msgid "View"
 msgstr "Ansicht"
 
-#: ../src/rcstrings.c:64
+#: src/rcstrings.c:64
 msgid "Redraw"
 msgstr "Neu zeichnen"
 
-#. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
+#: src/rcstrings.c:65 src/i_callbacks.c:1474 src/i_callbacks.c:1546
 msgid "Pan"
 msgstr "Ausschnitt verschieben"
 
-#: ../src/rcstrings.c:66 ../src/i_basic.c:95
+#: src/rcstrings.c:66 src/i_basic.c:95
 msgid "Zoom Box"
 msgstr "Ausschnitt wählen"
 
-#: ../src/rcstrings.c:67
+#: src/rcstrings.c:67
 msgid "Zoom Extents"
 msgstr "Automatisch"
 
-#: ../src/rcstrings.c:68
+#: src/rcstrings.c:68
 msgid "Zoom In"
 msgstr "Vergrö�ern"
 
-#: ../src/rcstrings.c:69
+#: src/rcstrings.c:69
 msgid "Zoom Out"
 msgstr "Verkleinern"
 
-#: ../src/rcstrings.c:70
+#: src/rcstrings.c:70
 msgid "Zoom Full"
 msgstr "Ganze Seite"
 
-#: ../src/rcstrings.c:71
+#: src/rcstrings.c:71
 msgid "Dark color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:72
+#: src/rcstrings.c:72
 msgid "Light color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:74
+#: src/rcstrings.c:74
 msgid "Page"
 msgstr "Seite"
 
-#: ../src/rcstrings.c:75
+#: src/rcstrings.c:75
 msgid "Manager..."
 msgstr "Manager..."
 
-#: ../src/rcstrings.c:76
+#: src/rcstrings.c:76
 msgid "Next"
 msgstr "Nächste"
 
-#: ../src/rcstrings.c:77
+#: src/rcstrings.c:77
 msgid "Previous"
 msgstr "Vorherige"
 
-#: ../src/rcstrings.c:78 ../src/x_window.c:316
+#: src/rcstrings.c:78 src/x_window.c:316
 msgid "New"
 msgstr "Neu"
 
-#: ../src/rcstrings.c:79
+#: src/rcstrings.c:79
 msgid "Revert"
 msgstr "Wiederherstellen"
 
-#: ../src/rcstrings.c:80
+#: src/rcstrings.c:80
 msgid "Close"
 msgstr "SchlieÃ?en"
 
-#: ../src/rcstrings.c:81
+#: src/rcstrings.c:81
 msgid "Discard"
 msgstr "Ablegen"
 
-#: ../src/rcstrings.c:83
+#: src/rcstrings.c:83
 msgid "Add"
 msgstr "Einfügen"
 
-#: ../src/rcstrings.c:84
+#: src/rcstrings.c:84
 msgid "Component..."
 msgstr "Bauteil..."
 
-#. need to click
-#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
-#: ../src/x_dialog.c:2376
+#: src/rcstrings.c:85 src/i_callbacks.c:2401 src/i_callbacks.c:2428
+#: src/x_dialog.c:2378
 msgid "Net"
 msgstr "Netz"
 
-#. need to click
-#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
-#: ../src/x_dialog.c:2394 ../src/x_window.c:374
+#: src/rcstrings.c:86 src/i_callbacks.c:2472 src/i_callbacks.c:2499
+#: src/x_dialog.c:2396 src/x_window.c:374
 msgid "Bus"
 msgstr "Bus"
 
-#: ../src/rcstrings.c:87
+#: src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "Attribut..."
 
-#: ../src/rcstrings.c:88
+#: src/rcstrings.c:88
 msgid "Text..."
 msgstr "Text..."
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
+#: src/rcstrings.c:89 src/i_callbacks.c:2580 src/i_callbacks.c:2603
 msgid "Line"
 msgstr "Linie"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
+#: src/rcstrings.c:90 src/i_callbacks.c:2625 src/i_callbacks.c:2648
 msgid "Box"
 msgstr "Rechteck"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
+#: src/rcstrings.c:91 src/i_callbacks.c:2704 src/i_callbacks.c:2728
 msgid "Circle"
 msgstr "Kreis"
 
-#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
+#: src/rcstrings.c:92 src/i_callbacks.c:2750 src/i_callbacks.c:2773
 msgid "Arc"
 msgstr "Bogen"
 
-#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
-#: ../src/x_dialog.c:2367
+#: src/rcstrings.c:93 src/i_callbacks.c:2795 src/i_callbacks.c:2818
+#: src/x_dialog.c:2369
 msgid "Pin"
 msgstr "AnschluÃ?"
 
-#: ../src/rcstrings.c:94
+#: src/rcstrings.c:94
 msgid "Picture..."
 msgstr "Bild..."
 
-#: ../src/rcstrings.c:96
+#: src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "Hierarchie"
 
-#: ../src/rcstrings.c:97
+#: src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "zum Schaltplan hinab"
 
-#: ../src/rcstrings.c:98
+#: src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "zum Symbol hinab"
 
-#: ../src/rcstrings.c:99
+#: src/rcstrings.c:99
 msgid "Up"
 msgstr "Hinauf"
 
-#: ../src/rcstrings.c:100
+#: src/rcstrings.c:100
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#. GtkFrame
-#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
-#: ../src/x_multiattrib.c:1543
+#: src/rcstrings.c:102 src/x_compselect.c:1417
 msgid "Attributes"
 msgstr "Attribut"
 
-#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
+#: src/rcstrings.c:103 src/i_callbacks.c:3089
 msgid "Attach"
 msgstr "Anbringen"
 
-#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
+#: src/rcstrings.c:104 src/i_callbacks.c:3136
 msgid "Detach"
 msgstr "Ablösen"
 
-#: ../src/rcstrings.c:105
+#: src/rcstrings.c:105
 msgid "Show Value"
 msgstr "Wert zeigen"
 
-#: ../src/rcstrings.c:106
+#: src/rcstrings.c:106
 msgid "Show Name"
 msgstr "Name zeigen"
 
-#: ../src/rcstrings.c:107
+#: src/rcstrings.c:107
 msgid "Show Both"
 msgstr "Name & Wert zeigen"
 
-#: ../src/rcstrings.c:108
+#: src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "Sichbarkeit EIN/AUS"
 
-#: ../src/rcstrings.c:109
+#: src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "Suche Text..."
 
-#: ../src/rcstrings.c:110
+#: src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "Verberge Text..."
 
-#: ../src/rcstrings.c:111
+#: src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "Zeige Text..."
 
-#: ../src/rcstrings.c:112
+#: src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr "Text durchnummerieren..."
 
-#: ../src/rcstrings.c:114
+#: src/rcstrings.c:114
 msgid "Options"
 msgstr "Optionen"
 
-#: ../src/rcstrings.c:115
+#: src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "Text Grö�e..."
 
-#: ../src/rcstrings.c:116
+#: src/rcstrings.c:116
 msgid "Cycle grid styles"
 msgstr ""
 
-#: ../src/rcstrings.c:117
+#: src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr "am Raster ausrichten EIN/AUS"
 
-#: ../src/rcstrings.c:118
+#: src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "RastermaÃ? eingeben..."
 
-#: ../src/rcstrings.c:119
+#: src/rcstrings.c:119
 msgid "Scale up Grid Spacing"
 msgstr "Rasterma� vergrö�ern"
 
-#: ../src/rcstrings.c:120
+#: src/rcstrings.c:120
 msgid "Scale down Grid Spacing"
 msgstr "RastermaÃ? verkleinern"
 
-#: ../src/rcstrings.c:121
+#: src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr "Auswahl Umgebung/Lokal"
 
-#: ../src/rcstrings.c:122
+#: src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr "Gummifäden EIN/AUS"
 
-#: ../src/rcstrings.c:123
+#: src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "Statusmeldungen anzeigen..."
 
-#: ../src/rcstrings.c:124
+#: src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "Koordinaten anzeigen..."
 
-#: ../src/rcstrings.c:126
+#: src/rcstrings.c:126
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../src/rcstrings.c:127
+#: src/rcstrings.c:127
 msgid "Manual"
 msgstr "Handbuch"
 
-#: ../src/rcstrings.c:128
+#: src/rcstrings.c:128
 msgid "gEDA Documentation"
 msgstr "gEDA Dokumentation"
 
-#: ../src/rcstrings.c:129
+#: src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr "gschem FAQ"
 
-#: ../src/rcstrings.c:130
+#: src/rcstrings.c:130
 msgid "Component Documentation"
 msgstr "Bauteil Dokumentation"
 
-#: ../src/rcstrings.c:131
+#: src/rcstrings.c:131
 msgid "About gschem"
 msgstr "Ã?ber gschem"
 
-#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
+#: src/rcstrings.c:132 src/x_dialog.c:2724
 msgid "Hotkeys"
 msgstr "Tastenkürzel"
 
-#: ../src/a_zoom.c:212
+#: src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Bereich zu klein! Eine weitere Vergrö�erung ist nicht möglich.\n"
 
-#. Fork failed. Still in parent process, so can use the log
-#. * window
-#: ../src/g_funcs.c:339 ../src/i_callbacks.c:68
+#: src/g_funcs.c:339 src/i_callbacks.c:68
 #, c-format
 msgid "Could not fork\n"
 msgstr "fork fehlgeschlagen!\n"
 
-#. if we return, then nothing happened
-#: ../src/g_funcs.c:355 ../src/i_callbacks.c:78
+#: src/g_funcs.c:355 src/i_callbacks.c:78
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr "Konnte %s nicht aufrufen\n"
 
-#: ../src/g_funcs.c:361 ../src/i_callbacks.c:82
+#: src/g_funcs.c:361 src/i_callbacks.c:82
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Die Funktion \"Dokumentation\" wird unter MinGW nicht unterstützt.\n"
 
-#: ../src/g_rc.c:292
+#: src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Ein ungültiger Vergrösserungsfaktor [%d] wurde an %s übergeben.\n"
 
-#: ../src/g_rc.c:418
+#: src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Eine ungültige Grö�e [%d] wurde an text-size übergeben.\n"
 
-#: ../src/g_rc.c:445
+#: src/g_rc.c:445
 #, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "Ein ungültiger Wert [%f] wurde an postscript-font-scale übergeben.\n"
 
-#: ../src/g_rc.c:488
+#: src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Eine ungültige Grö�e [%d] wurde an snap-size übergeben.\n"
 
-#: ../src/g_rc.c:960
+#: src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "Eine ungültige Ebenenanzahl [%d] wurde an undo-levels übergeben.\n"
 
-#: ../src/g_rc.c:1218
+#: src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "Eine ungültige Grö�e [%d] wurde an bus-ripper-size übergeben.\n"
 
-#: ../src/g_rc.c:1293
+#: src/g_rc.c:1293
 #, fuzzy, c-format
 msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr "An \"grid-dot-size\" wurde eine falsche Punktgrö�e [%d] übergeben.\n"
 
-#: ../src/g_rc.c:1334
+#: src/g_rc.c:1334
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 msgstr ""
 "An \"grid-fixed-threshold\" wurde ein falscher Punktabstand [%d] übergeben.\n"
 
-#: ../src/g_rc.c:1360
+#: src/g_rc.c:1360
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 msgstr ""
 "An \"grid-fixed-threshold\" wurde ein falscher Punktabstand [%d] übergeben.\n"
 
-#: ../src/g_rc.c:1404
+#: src/g_rc.c:1404
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "Ein ungültiger Offset [%d] wurde an add-attribute-offset übergeben.\n"
 
-#: ../src/g_rc.c:1428
+#: src/g_rc.c:1428
 #, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr ""
 "An \"auto-save-interval\" wurde eine ungültige Sekundenanzahl [%d] "
 "übergeben\n"
 
-#: ../src/g_rc.c:1469
+#: src/g_rc.c:1469
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Ein ungültiger Werte [%d] wurde an mousepan-gain übergeben.\n"
 
-#: ../src/g_rc.c:1492
+#: src/g_rc.c:1492
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Ein ungültiger Wert [%d] wurde an keyboardpan-gain übergeben.\n"
 
-#: ../src/g_rc.c:1538
+#: src/g_rc.c:1538
 #, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr ""
 "An \"select-slack-pixels\" wurde eine ungültige Pixelzahl [%d] übergeben\n"
 
-#: ../src/g_rc.c:1564
+#: src/g_rc.c:1564
 #, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "Ein unzulässiger Wert [%d] wurde an zoom-gain übergeben\n"
 
-#: ../src/g_rc.c:1589
+#: src/g_rc.c:1589
 #, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr ""
 "Eine unzulässige Anzahl von Schritten [%d] wurde an scrollpan-steps "
 "übergeben\n"
 
-#: ../src/gschem.c:183 ../src/gschem.c:194
+#: src/gschem.c:183 src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem Version %s%s.%s\n"
 
-#: ../src/gschem.c:186 ../src/gschem.c:197
+#: src/gschem.c:186 src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -640,7 +630,7 @@ msgstr ""
 "gEDA/gschem kommt OHNE JEGLICHE GARANTIE. Bitte lies die Datei COPYING "
 "fürnähere Informationen.\n"
 
-#: ../src/gschem.c:188 ../src/gschem.c:199
+#: src/gschem.c:188 src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -648,7 +638,7 @@ msgstr ""
 "Dies ist Freie Software. Sie darf gerne weitergegeben werden. Bitte lies "
 "die\n"
 
-#: ../src/gschem.c:190 ../src/gschem.c:201
+#: src/gschem.c:190 src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -657,17 +647,17 @@ msgstr ""
 "Lizenzbestimmungen in der Datei COPYING für nähere Informationen.\n"
 "\n"
 
-#: ../src/gschem.c:205
+#: src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "Dies ist die MINGW32 Portierung.\n"
 
-#: ../src/gschem.c:209
+#: src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Aktuelle Spracheinstellungen: %s\n"
 
-#: ../src/gschem.c:224
+#: src/gschem.c:224
 msgid ""
 "You must set the GEDADATA environment variable!\n"
 "\n"
@@ -675,225 +665,248 @@ msgid ""
 "environment variable to point to the correct location.\n"
 msgstr ""
 
-#: ../src/gschem.c:251
+#: src/gschem.c:251
 #, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "Die init scm Datei wurde nicht gefunden [%s]\n"
 
-#: ../src/gschem.c:255
+#: src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Lese init scm Datei [%s]\n"
 
-#. ! \todo These two messages are the same. Should be
-#. * integrated.
-#: ../src/gschem.c:259
+#: src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Die Datei init scm [%s] konnte nicht gelesen werden.\n"
 
-#: ../src/gschem.c:320
+#: src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Das scheme Verzeichnis wurde nicht definiert!\n"
 
-#: ../src/gschem.c:327 ../src/x_script.c:66
+#: src/gschem.c:327 src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Führe guile scipt aus [%s]\n"
 
-#: ../src/gschem_cairo.c:310
+#: src/gschem_accel_label.c:319
+msgid "Accelerator Closure"
+msgstr ""
+
+#: src/gschem_accel_label.c:320
+msgid "The closure to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:326
+msgid "Accelerator Widget"
+msgstr ""
+
+#: src/gschem_accel_label.c:327
+msgid "The widget to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:333
+#, fuzzy
+msgid "Accelerator String"
+msgstr "Allgemeiner Text"
+
+#: src/gschem_accel_label.c:334
+msgid "The accelerator string to be displayed"
+msgstr ""
+
+#: src/gschem_cairo.c:310
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "Undefiniertes Ende einer Linie (%d)\n"
 
-#: ../src/gschem_cairo.c:318
+#: src/gschem_cairo.c:318
 #, fuzzy, c-format
 msgid "Unknown type for stroke (%d) !\n"
 msgstr "Undefinierter Type der Linie (%d).\n"
 
-#: ../src/i_basic.c:79
+#: src/i_basic.c:79
 msgid "Component Mode"
 msgstr "Bauteil Modus"
 
-#: ../src/i_basic.c:81
+#: src/i_basic.c:81
 msgid "Text Mode"
 msgstr "Text Modus"
 
-#: ../src/i_basic.c:89
+#: src/i_basic.c:89
 msgid "Rotate Mode"
 msgstr "Dreh Modus"
 
-#: ../src/i_basic.c:99
+#: src/i_basic.c:99
 msgid "Pan Mode"
 msgstr "Ausschnitt Modus"
 
-#: ../src/i_basic.c:103
+#: src/i_basic.c:103
 #, c-format
 msgid "Paste %d Mode"
 msgstr "Einfügen %d Modus"
 
-#: ../src/i_basic.c:109
+#: src/i_basic.c:109
 msgid "Magnetic Net Mode"
 msgstr "Magnetischer Netz Modus"
 
-#: ../src/i_basic.c:111
+#: src/i_basic.c:111
 msgid "Net Mode"
 msgstr "Netz Modus"
 
-#: ../src/i_basic.c:115
+#: src/i_basic.c:115
 msgid "Bus Mode"
 msgstr "Bus Modus"
 
-#: ../src/i_basic.c:118
+#: src/i_basic.c:118
 msgid "Line Mode"
 msgstr "Linien Modus"
 
-#: ../src/i_basic.c:121
+#: src/i_basic.c:121
 msgid "Box Mode"
 msgstr "Rechteck Modus"
 
-#: ../src/i_basic.c:124
+#: src/i_basic.c:124
 msgid "Picture Mode"
 msgstr "Bild Modus"
 
-#: ../src/i_basic.c:127
+#: src/i_basic.c:127
 msgid "Circle Mode"
 msgstr "Kreis Modus"
 
-#: ../src/i_basic.c:130
+#: src/i_basic.c:130
 msgid "Arc Mode"
 msgstr "Bogen Modus"
 
-#: ../src/i_basic.c:133
+#: src/i_basic.c:133
 msgid "Pin Mode"
 msgstr "AnschluÃ? Modus"
 
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
+#: src/i_basic.c:137 src/i_callbacks.c:626 src/i_callbacks.c:650
 msgid "Move"
 msgstr "Verschieben"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
+#: src/i_basic.c:139 src/i_callbacks.c:581 src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Mehrfaches Kopieren"
 
-#: ../src/i_basic.c:168
+#: src/i_basic.c:168
 msgid "Show Hidden"
 msgstr "Zeige Unsichbares"
 
-#: ../src/i_basic.c:171
+#: src/i_basic.c:171
 msgid "Snap Off"
 msgstr "Am Raster ausrichten aus"
 
-#: ../src/i_basic.c:173
+#: src/i_basic.c:173
 msgid "Resnap Active"
 msgstr ""
 
-#: ../src/i_basic.c:254 ../src/x_window.c:495
+#: src/i_basic.c:254 src/x_window.c:495
 msgid "Action"
 msgstr "Aktion"
 
-#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
+#: src/i_basic.c:260 src/x_dialog.c:2408 src/x_window.c:490
 msgid "Stroke"
 msgstr "Taste"
 
-#: ../src/i_basic.c:266 ../src/x_window.c:492
+#: src/i_basic.c:266 src/x_window.c:492
 msgid "none"
 msgstr "nichts"
 
-#: ../src/i_basic.c:271
+#: src/i_basic.c:271
 msgid "Repeat/"
 msgstr "Wiederhole/"
 
-#: ../src/i_basic.c:549 ../src/i_basic.c:563
+#: src/i_basic.c:549 src/i_basic.c:563
 msgid "OFF"
 msgstr "AUS"
 
-#: ../src/i_basic.c:567
+#: src/i_basic.c:567
 msgid "NONE"
 msgstr ""
 
-#: ../src/i_basic.c:572
+#: src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Raster(%s, %s)"
 
-#: ../src/i_callbacks.c:63
+#: src/i_callbacks.c:63
 #, c-format
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Dokumentation von [%s,%s,%s,%s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
+#: src/i_callbacks.c:123 src/i_callbacks.c:1705
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Neue Seite erzeugt [%s]\n"
 
-#: ../src/i_callbacks.c:163
+#: src/i_callbacks.c:163
 #, c-format
 msgid "New Window created [%s]\n"
 msgstr "Neues Fenster geöffnet [%s]\n"
 
-#: ../src/i_callbacks.c:281
+#: src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "Alles speichern fehlgeschlagen"
 
-#: ../src/i_callbacks.c:283
+#: src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Alles gespeichert"
 
-#: ../src/i_callbacks.c:373
+#: src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "SchlieÃ?e Fenster\n"
 
-#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
+#: src/i_callbacks.c:541 src/i_callbacks.c:586 src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "Wähle erst Objekte aus"
 
-#: ../src/i_callbacks.c:710
+#: src/i_callbacks.c:710
 #, fuzzy
 msgid "Edit pin type"
 msgstr "Editiere Linienart"
 
-#: ../src/i_callbacks.c:729
+#: src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Text bearbeiten"
 
-#: ../src/i_callbacks.c:752
+#: src/i_callbacks.c:752
 msgid "Slot"
 msgstr "Slot"
 
-#: ../src/i_callbacks.c:769
+#: src/i_callbacks.c:769
 msgid "Color"
 msgstr "Farbe"
 
-#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
+#: src/i_callbacks.c:806 src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Drehen"
 
-#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
+#: src/i_callbacks.c:874 src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Spiegeln"
 
-#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
+#: src/i_callbacks.c:956 src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Verschieben nach"
 
-#: ../src/i_callbacks.c:959
+#: src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr ""
 "ACHTUNG: Keine Transformation mit ausgeschalteter Ausrichtung am Raster!\n"
 
-#: ../src/i_callbacks.c:960
+#: src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr ""
 "ACHTUNG:\"am Raster ausrichten\" wird aktiviert und mit der Transformation "
 "fortgefahren.\n"
 
-#: ../src/i_callbacks.c:967
+#: src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "ACHTUNG: Das Raster ist ungleich 100!\n"
 
-#: ../src/i_callbacks.c:969
+#: src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -901,145 +914,144 @@ msgstr ""
 "ACHTUNG: Wenn ein Symbol transformiert wird, sollte das Raster auf 100 "
 "gesetzt sein.\n"
 
-#: ../src/i_callbacks.c:1000
+#: src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "Einbetten"
 
-#: ../src/i_callbacks.c:1041
+#: src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "Ausbetten"
 
-#: ../src/i_callbacks.c:1084
+#: src/i_callbacks.c:1085
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: ../src/i_callbacks.c:1141
+#: src/i_callbacks.c:1144
 msgid "ShowHidden"
 msgstr "Zeige Unsichbares"
 
-#: ../src/i_callbacks.c:1165
+#: src/i_callbacks.c:1168
 msgid "MakeVisible"
 msgstr "Sichbar Machen"
 
-#: ../src/i_callbacks.c:1562
+#: src/i_callbacks.c:1565
 msgid "Update Cues"
 msgstr "Ansicht aktualisieren (update cues)"
 
-#: ../src/i_callbacks.c:1746
+#: src/i_callbacks.c:1749
 msgid "Really revert page?"
 msgstr "Seite wirklich wiederherstellen?"
 
-#: ../src/i_callbacks.c:1816
+#: src/i_callbacks.c:1819
 msgid "Copy to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1834
+#: src/i_callbacks.c:1837
 msgid "Cut to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1852
+#: src/i_callbacks.c:1855
 #, fuzzy
 msgid "Paste from clipboard"
 msgstr "Einfügen aus 1"
 
-#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
-#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
-#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+#: src/i_callbacks.c:1867 src/i_callbacks.c:2106 src/i_callbacks.c:2128
+#: src/i_callbacks.c:2150 src/i_callbacks.c:2172 src/i_callbacks.c:2194
 msgid "Empty buffer"
 msgstr "Leerer Zwischenspeicher"
 
-#: ../src/i_callbacks.c:1909
+#: src/i_callbacks.c:1912
 msgid "Copy 1"
 msgstr "Kopie 1"
 
-#: ../src/i_callbacks.c:1928
+#: src/i_callbacks.c:1931
 msgid "Copy 2"
 msgstr "Kopie 2"
 
-#: ../src/i_callbacks.c:1947
+#: src/i_callbacks.c:1950
 msgid "Copy 3"
 msgstr "Kopie 3"
 
-#: ../src/i_callbacks.c:1966
+#: src/i_callbacks.c:1969
 msgid "Copy 4"
 msgstr "Kopie 4"
 
-#: ../src/i_callbacks.c:1985
+#: src/i_callbacks.c:1988
 msgid "Copy 5"
 msgstr "Kopie 5"
 
-#: ../src/i_callbacks.c:2004
+#: src/i_callbacks.c:2007
 msgid "Cut 1"
 msgstr "Ausschneiden 1"
 
-#: ../src/i_callbacks.c:2023
+#: src/i_callbacks.c:2026
 msgid "Cut 2"
 msgstr "Ausschneiden 2"
 
-#: ../src/i_callbacks.c:2042
+#: src/i_callbacks.c:2045
 msgid "Cut 3"
 msgstr "Ausschneiden 3"
 
-#: ../src/i_callbacks.c:2061
+#: src/i_callbacks.c:2064
 msgid "Cut 4"
 msgstr "Ausschneiden 4"
 
-#: ../src/i_callbacks.c:2080
+#: src/i_callbacks.c:2083
 msgid "Cut 5"
 msgstr "Ausschneiden 5"
 
-#: ../src/i_callbacks.c:2096
+#: src/i_callbacks.c:2099
 msgid "Paste 1"
 msgstr "Einfügen 1"
 
-#: ../src/i_callbacks.c:2118
+#: src/i_callbacks.c:2121
 msgid "Paste 2"
 msgstr "Einfügen 2"
 
-#: ../src/i_callbacks.c:2140
+#: src/i_callbacks.c:2143
 msgid "Paste 3"
 msgstr "Einfügen 3"
 
-#: ../src/i_callbacks.c:2162
+#: src/i_callbacks.c:2165
 msgid "Paste 4"
 msgstr "Einfügen 4"
 
-#: ../src/i_callbacks.c:2184
+#: src/i_callbacks.c:2187
 msgid "Paste 5"
 msgstr "Einfügen 5"
 
-#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
+#: src/i_callbacks.c:2324 src/x_window.c:354
 msgid "Component"
 msgstr "Bauteil"
 
-#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
+#: src/i_callbacks.c:2360 src/i_callbacks.c:2379 src/x_dialog.c:2381
 msgid "Attribute"
 msgstr "Attribut"
 
-#: ../src/i_callbacks.c:2873
+#: src/i_callbacks.c:2877
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Suche nach der Quelle [%s]\n"
 
-#: ../src/i_callbacks.c:2897
+#: src/i_callbacks.c:2901
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Die Quelle [%s] konnte nicht gefunden werden.\n"
 
-#: ../src/i_callbacks.c:2964
+#: src/i_callbacks.c:2970
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Suche nach dem Symbol [%s]\n"
 
-#: ../src/i_callbacks.c:2970
+#: src/i_callbacks.c:2976
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr "Das Symbol ist keine reale Datei. Symbol kann nicht geöffnet werden.\n"
 
-#: ../src/i_callbacks.c:3001
+#: src/i_callbacks.c:3007
 msgid "Cannot find any schematics above the current one!\n"
 msgstr "Konnte keinen übergeordneten Schaltplan finden!\n"
 
-#: ../src/i_callbacks.c:3064
+#: src/i_callbacks.c:3061
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
@@ -1047,256 +1059,254 @@ msgstr ""
 "Dieser Befehl sucht die Dokumentation eines Bauteils im Internet, aber es "
 "wurde kein Bauteil ausgewählt"
 
-#: ../src/i_callbacks.c:3177
+#: src/i_callbacks.c:3171
 msgid "ShowN"
 msgstr "ShowN"
 
-#: ../src/i_callbacks.c:3213
+#: src/i_callbacks.c:3207
 msgid "ShowV"
 msgstr "ShowV"
 
-#: ../src/i_callbacks.c:3249
+#: src/i_callbacks.c:3243
 msgid "ShowB"
 msgstr "ShowB"
 
-#: ../src/i_callbacks.c:3286
+#: src/i_callbacks.c:3280
 msgid "VisToggle"
 msgstr "VisToggle"
 
-#: ../src/i_callbacks.c:3316
+#: src/i_callbacks.c:3310
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Dieser Menupunkt funktioniert nicht. Sorry.\n"
 
-#: ../src/i_callbacks.c:3406
+#: src/i_callbacks.c:3400
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Aktions-Rückmelde-Modus wurde auf OUTLINE gesetzt.\n"
 
-#: ../src/i_callbacks.c:3409
+#: src/i_callbacks.c:3403
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Aktions-Rückmelde-Modus wurde auf BOUNDINGBOX gesetzt.\n"
 
-#: ../src/i_callbacks.c:3434
+#: src/i_callbacks.c:3428
 msgid "Grid OFF\n"
 msgstr "Raster AUS\n"
 
-#: ../src/i_callbacks.c:3435
+#: src/i_callbacks.c:3429
 msgid "Dot grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3436
+#: src/i_callbacks.c:3430
 msgid "Mesh grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3457
+#: src/i_callbacks.c:3451
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Freihandmodus (ACHTUNG! Ausrichten am Raster abgeschaltet)\n"
 
-#: ../src/i_callbacks.c:3460
+#: src/i_callbacks.c:3454
 msgid "Snap ON\n"
 msgstr "Am Raster ausrichten\n"
 
-#: ../src/i_callbacks.c:3463
+#: src/i_callbacks.c:3457
 #, fuzzy
 msgid "Snap back to the grid (CAUTION!)\n"
 msgstr "Freihandmodus (ACHTUNG! Ausrichten am Raster abgeschaltet)\n"
 
-#: ../src/i_callbacks.c:3489
+#: src/i_callbacks.c:3483
 msgid "Rubber band OFF \n"
 msgstr "Gummifäden AUS\n"
 
-#: ../src/i_callbacks.c:3492
+#: src/i_callbacks.c:3486
 msgid "Rubber band ON\n"
 msgstr "Gummifäden EIN\n"
 
-#: ../src/i_callbacks.c:3507
+#: src/i_callbacks.c:3501
 msgid "magnetic net mode: ON\n"
 msgstr "magnetischer Netz Modus: Ein\n"
 
-#: ../src/i_callbacks.c:3510
+#: src/i_callbacks.c:3504
 msgid "magnetic net mode: OFF\n"
 msgstr "magnetischer Netz Modus: Aus\n"
 
-#: ../src/o_box.c:160
+#: src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Undefinierter Typ für das Rechteck (Füllung)!\n"
 
-#: ../src/o_buffer.c:57
+#: src/o_buffer.c:57
 #, c-format
 msgid "o_buffer_copy: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:72
+#: src/o_buffer.c:72
 #, c-format
 msgid "o_buffer_cut: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:93
+#: src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr ""
 "Eine ungültige Zwischenspeichernummer wurde übergeben "
 "[o_buffer_paste_start]\n"
 
-#: ../src/o_bus.c:135
+#: src/o_bus.c:135
 #, fuzzy, c-format
 msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr ""
 "Ungültiger Wert in Variable whichone in der Funktion o_bus_draw_xor_single\n"
 
-#: ../src/o_circle.c:141
+#: src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Undefinierter Typ für einen Kreis (Füllung).\n"
 
-#: ../src/o_complex.c:250 ../src/o_complex.c:254
+#: src/o_complex.c:250 src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Verschiebe Schaltplan [%d %d]\n"
 
-#: ../src/o_misc.c:61
+#: src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
 msgstr "Der Rückgabewert von o_edit war unerwartet NULL\n"
 
-#: ../src/o_misc.c:125
+#: src/o_misc.c:125
 msgid "Object already locked\n"
 msgstr "Objekt bereits gesperrt\n"
 
-#: ../src/o_misc.c:163
+#: src/o_misc.c:163
 msgid "Object already unlocked\n"
 msgstr "Objekt bereits entsperrt\n"
 
-#: ../src/o_misc.c:445
+#: src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "Verborgener Text ist jetzt sichtbar.\n"
 
-#: ../src/o_misc.c:447
+#: src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "Verborgener Text ist jetzt unsichbar.\n"
 
-#: ../src/o_misc.c:697
+#: src/o_misc.c:700
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 "Das Symbol [%s] konnte nicht gefunden werden. Aktualisierung "
 "fehlgeschlagen.\n"
 
-#: ../src/o_misc.c:840
+#: src/o_misc.c:847
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr ""
 "o_autosave_backups: Konnte den tatsächlichen Dateinamen von %s nicht "
 "ermitteln."
 
-#: ../src/o_misc.c:884
+#: src/o_misc.c:891
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr ""
 "Die vorherige Backup-Datei [%s] konnte nicht auf read-write gesetzt werden.\n"
 
-#: ../src/o_misc.c:902
+#: src/o_misc.c:909
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Die Backup-Datei [%s] konnte nicht auf readonly gesetzt werden.\n"
 
-#: ../src/o_misc.c:907
+#: src/o_misc.c:914
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "Die Backup-Datei [%s] konnte nicht gespeichert werden.\n"
 
-#: ../src/o_move.c:188
+#: src/o_move.c:188
 #, c-format
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "FEHLER: NULL Objekt innerhalb von o_move_end.\n"
 
-#: ../src/o_move.c:461
+#: src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr ""
 "Versuchte vergebens das Objekt innerhalb von o_move_return_whichone zu "
 "finden.\n"
 
-#: ../src/o_move.c:482
+#: src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr "Da ist ein Objekt in o_move_check_endpoint, welches keine Linie ist.\n"
 
-#: ../src/o_net.c:176
+#: src/o_net.c:176
 #, fuzzy, c-format
 msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr ""
 "Ungültiger Wert der Variablen whichone innerhalb von o_net_draw_xor_single\n"
 
-#: ../src/o_net.c:552
+#: src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr ""
 "Achtung: Der Startpunkt des Netzes befindet sich nicht auf dem Raster\n"
 
-#: ../src/o_net.c:614
+#: src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr "Achtung: Das Ende des Netzes befindet sich nicht auf dem Raster\n"
 
-#. try to exit gracefully
-#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
-#: ../src/o_net.c:1126
+#: src/o_net.c:982 src/o_net.c:1019 src/o_net.c:1090 src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 "Interner gschem Fehler: Versuchte mehr als zwei Bus Abzweigungen "
 "hinzuzufügen\n"
 
-#: ../src/o_net.c:1196
+#: src/o_net.c:1196
 #, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "Das Busripper Symbol [%s] wurde in keiner Bauteilbibliothek gefunden\n"
 
-#: ../src/o_path.c:356
+#: src/o_path.c:356
 #, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "Unbekannte Füllart einer Pfad-Definition!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:557
+#: src/o_picture.c:166 src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Das Bild [%s] konnte nicht geladen werden"
 
-#: ../src/o_picture.c:180
+#: src/o_picture.c:180
 msgid "Picture"
 msgstr "Bild"
 
-#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
+#: src/o_picture.c:465 src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "FEHLER: NULL Objekt!\n"
 
-#: ../src/o_slot.c:110
+#: src/o_slot.c:81
 msgid "Slot attribute malformed\n"
 msgstr "Slot Attribut ist fehlerhaft.\n"
 
-#: ../src/o_slot.c:128
+#: src/o_slot.c:99
 msgid "numslots attribute missing\n"
 msgstr "Das numslots Attribut fehlt\n"
 
-#: ../src/o_slot.c:130
+#: src/o_slot.c:100
 msgid "Slotting not allowed for this component\n"
 msgstr "Bei diesem Bauteil ist nur ein slot erlaubt.\n"
 
-#: ../src/o_slot.c:145
+#: src/o_slot.c:115
 msgid "New slot number out of range\n"
 msgstr "Neue slot Nummer au�erhalb des gültigen Wertebereichs\n"
 
-#: ../src/o_slot.c:200
+#: src/o_slot.c:170
 #, c-format
 msgid "uggg! you tried to slot edit something that doesn't exist!\n"
 msgstr "Ups! Sie versuchen einen slot zu editieren, der nicht existiert.\n"
 
-#: ../src/o_undo.c:300
+#: src/o_undo.c:300
 msgid "Undo/Redo disabled in rc file\n"
 msgstr "Rückgängig/Wiederherstellen wurde in der rc Datei deaktiviert.\n"
 
-#: ../src/parsecmd.c:47
+#: src/parsecmd.c:47
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] schematic_filename1 ... schematic_filenameN\n"
@@ -1321,77 +1331,68 @@ msgstr ""
 "  -h            Hilfe (diese Ausgabe)\n"
 "\n"
 
-#: ../src/x_attribedit.c:127
+#: src/x_attribedit.c:127
 #, c-format
 msgid "Got invalid show option; defaulting to show both\n"
 msgstr "Ungültige Anzeigeoption, zeige beide als Voreinstellung\n"
 
-#: ../src/x_attribedit.c:330
+#: src/x_attribedit.c:330
 msgid "Single Attribute Editor"
 msgstr "Editor für ein Attribut"
 
-#: ../src/x_attribedit.c:359
+#: src/x_attribedit.c:359
 msgid "<b>Edit Attribute</b>"
 msgstr "<b>Attribut bearbeiten</b>"
 
-#: ../src/x_attribedit.c:361
+#: src/x_attribedit.c:361
 msgid "<b>Add Attribute</b>"
 msgstr "<b>Attribut hinzufügen</b>"
 
-#. Name selection
-#. GtkLabel
-#: ../src/x_attribedit.c:377 ../src/x_multiattrib.c:1725
+#: src/x_attribedit.c:377 src/x_multiattrib.c:1921
 msgid "Name:"
 msgstr "Name:"
 
-#. Value entry
-#. GtkLabel
-#: ../src/x_attribedit.c:393 ../src/x_multiattrib.c:1744
+#: src/x_attribedit.c:393 src/x_multiattrib.c:1940
 msgid "Value:"
 msgstr "Wert:"
 
-#. Visibility
-#. GtkButton
-#: ../src/x_attribedit.c:409 ../src/x_multiattrib.c:1781
+#: src/x_attribedit.c:409 src/x_multiattrib.c:1983
 msgid "Visible"
 msgstr "Sichtbar"
 
-#: ../src/x_attribedit.c:429
+#: src/x_attribedit.c:429
 msgid "Show Value Only"
 msgstr "Nur Wert anzeigen"
 
-#: ../src/x_attribedit.c:431
+#: src/x_attribedit.c:431
 msgid "Show Name Only"
 msgstr "Nur Name anzeigen"
 
-#: ../src/x_attribedit.c:433 ../src/x_multiattrib.c:1369
+#: src/x_attribedit.c:433 src/x_multiattrib.c:1459
 msgid "Show Name & Value"
 msgstr "Zeige Name & Wert"
 
-#. gschem specific
-#: ../src/x_attribedit.c:440
+#: src/x_attribedit.c:440
 msgid "<b>Attach Options</b>"
 msgstr "<b>Optionen</b>"
 
-#: ../src/x_attribedit.c:455
+#: src/x_attribedit.c:455
 msgid "All"
 msgstr "Alle"
 
-#. GtkTreeViewColumn
-#: ../src/x_attribedit.c:463 ../src/x_compselect.c:896
-#: ../src/x_compselect.c:1010
+#: src/x_attribedit.c:463 src/x_compselect.c:895 src/x_compselect.c:1009
 msgid "Components"
 msgstr "Bauteile"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:364
+#: src/x_attribedit.c:471 src/x_window.c:364
 msgid "Nets"
 msgstr "Netz"
 
-#: ../src/x_attribedit.c:479
+#: src/x_attribedit.c:479
 msgid "Replace existing attributes"
 msgstr "Vorhandene Attribute ersetzen"
 
-#: ../src/x_autonumber.c:413
+#: src/x_autonumber.c:415
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
@@ -1399,8 +1400,7 @@ msgstr ""
 "Objekte mit \"numslot\" Attribut und ohne \"slot\" Attribut können beim "
 "automatischen Nummerieren von Bauteilen Probleme verursachen.\n"
 
-#. duplicate slot in used_slots
-#: ../src/x_autonumber.c:428
+#: src/x_autonumber.c:430
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
@@ -1408,181 +1408,172 @@ msgstr ""
 "Doppelt vergebener slot kann Probleme verursachen: [Symbolname=%s, Number=%"
 "d, slot=%d]\n"
 
-#: ../src/x_autonumber.c:696
+#: src/x_autonumber.c:702
 msgid "No searchstring given in autonumber text.\n"
 msgstr "Es wurde kein Suchstring im Dialog eingegeben.\n"
 
-#: ../src/x_autonumber.c:748
+#: src/x_autonumber.c:754
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr "Am Ende des Suchstrings fehlt ein '*' oder ein '?'.\n"
 
-#: ../src/x_autonumber.c:883
+#: src/x_autonumber.c:889
 msgid "Diagonal"
 msgstr "Diagonal"
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Top to bottom"
 msgstr "Von oben nach unten"
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Bottom to top"
 msgstr "Von unten nach oben"
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 msgid "Left to right"
 msgstr "Von links nach rechts"
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 msgid "Right to left"
 msgstr "Von rechts nach links"
 
-#: ../src/x_autonumber.c:886
+#: src/x_autonumber.c:892
 msgid "File order"
 msgstr "Dateireihenfolge"
 
-#: ../src/x_autonumber.c:1222
+#: src/x_autonumber.c:1228
 msgid "Autonumber text"
 msgstr "Nummeriere Text automatisch"
 
-#. scope section
-#: ../src/x_autonumber.c:1246
+#: src/x_autonumber.c:1252
 msgid "<b>Scope</b>"
 msgstr "<b>Suchbereich</b>"
 
-#: ../src/x_autonumber.c:1268
+#: src/x_autonumber.c:1274
 msgid "Search for:"
 msgstr "Suchen nach:"
 
-#: ../src/x_autonumber.c:1282
+#: src/x_autonumber.c:1288
 msgid "Autonumber text in:"
 msgstr "Nummeriere Text in:"
 
-#: ../src/x_autonumber.c:1289
+#: src/x_autonumber.c:1295
 msgid "Skip numbers found in:"
 msgstr "Ã?berspringe Nummern:"
 
-#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
+#: src/x_autonumber.c:1307 src/x_autonumber.c:1316
 msgid "Selected objects"
 msgstr "Ausgewählte Objekte"
 
-#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
+#: src/x_autonumber.c:1308 src/x_autonumber.c:1317
 msgid "Current page"
 msgstr "Aktuelle Seite"
 
-#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
+#: src/x_autonumber.c:1309 src/x_autonumber.c:1318
 msgid "Whole hierarchy"
 msgstr "Gesamte Hierarchie"
 
-#: ../src/x_autonumber.c:1314
+#: src/x_autonumber.c:1320
 msgid "Overwrite existing numbers"
 msgstr "Vorhandene Nummern überschreiben"
 
-#. Options section
-#: ../src/x_autonumber.c:1319
+#: src/x_autonumber.c:1325
 msgid "<b>Options</b>"
 msgstr "<b>Optionen</b>"
 
-#: ../src/x_autonumber.c:1341
+#: src/x_autonumber.c:1347
 msgid "Starting number:"
 msgstr "Startnummer:"
 
-#: ../src/x_autonumber.c:1348
+#: src/x_autonumber.c:1354
 msgid "Sort order:"
 msgstr "Sortierung:"
 
-#: ../src/x_autonumber.c:1369
+#: src/x_autonumber.c:1375
 msgid "Remove numbers"
 msgstr "Nummern entfernen"
 
-#: ../src/x_autonumber.c:1373
+#: src/x_autonumber.c:1379
 msgid "Automatic slotting"
 msgstr "Automatische Nummerierung von Slots"
 
-#: ../src/x_color.c:94 ../src/x_color.c:103
+#: src/x_color.c:94 src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Konnte die Farbe %s nicht zuteilen!\n"
 
-#: ../src/x_color.c:94
+#: src/x_color.c:94
 msgid "black"
 msgstr "schwarz"
 
-#: ../src/x_color.c:103
+#: src/x_color.c:103
 msgid "white"
 msgstr "weiss"
 
-#: ../src/x_color.c:125
+#: src/x_color.c:125
 #, fuzzy, c-format
 msgid "Could not allocate display color %i!\n"
 msgstr "Konnte die Farbe %s nicht zuteilen!\n"
 
-#: ../src/x_color.c:147
+#: src/x_color.c:147
 #, fuzzy, c-format
 msgid "Could not allocate outline color %i!\n"
 msgstr "Konnte die Farbe %s nicht zuteilen!\n"
 
-#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
+#: src/x_color.c:164 src/x_color.c:181 src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Versuchte eine ungültige Farbe zuzuteilen: %d\n"
 
-#: ../src/x_color.c:214
+#: src/x_color.c:214
 #, fuzzy, c-format
 msgid "Tried to get an invalid outline color: %d\n"
 msgstr "Versuchte eine ungültige Farbe zuzuteilen: %d\n"
 
-#. GtkLabel
-#: ../src/x_compselect.c:1040
+#: src/x_compselect.c:1039
 msgid "Filter:"
 msgstr "Filter:"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
-#: ../src/x_multiattrib.c:1601
+#: src/x_compselect.c:1142 src/x_dialog.c:3776 src/x_multiattrib.c:1787
 msgid "Name"
 msgstr "Name"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1152 ../src/x_multiattrib.c:1626
+#: src/x_compselect.c:1151 src/x_multiattrib.c:1811
 msgid "Value"
 msgstr "Wert"
 
-#: ../src/x_compselect.c:1191
+#: src/x_compselect.c:1190
 msgid "Default behavior - reference component"
 msgstr "Bauteil referenzieren (Voreinstellung)"
 
-#: ../src/x_compselect.c:1194
+#: src/x_compselect.c:1193
 msgid "Embed component in schematic"
 msgstr "Bauteil in den Schaltplan einbetten"
 
-#: ../src/x_compselect.c:1197
+#: src/x_compselect.c:1196
 msgid "Include component as individual objects"
 msgstr "Bauteil als Einzelkomponenten einfügen"
 
-#. GtkWindow
-#: ../src/x_compselect.c:1354
+#: src/x_compselect.c:1353
 msgid "Select Component..."
 msgstr "Bauteil auswählen..."
 
-#: ../src/x_compselect.c:1377
+#: src/x_compselect.c:1376
 msgid "In Use"
 msgstr "In Verwendung"
 
-#: ../src/x_compselect.c:1381
+#: src/x_compselect.c:1380
 msgid "Libraries"
 msgstr "Bibliotheken"
 
-#. GtkFrame
-#: ../src/x_compselect.c:1390 ../src/x_fileselect.c:122
+#: src/x_compselect.c:1389 src/x_fileselect.c:122
 msgid "Preview"
 msgstr "Vorschau"
 
-#. dialog not created yet
-#: ../src/x_dialog.c:174
+#: src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "Text Eingabe..."
 
-#: ../src/x_dialog.c:205
+#: src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1592,185 +1583,176 @@ msgstr ""
 "bewege den Cursor ins Fenster, klicke um den Text zu plazieren.\n"
 "Mittlere Maustaste dreht während des Plazierens."
 
-#: ../src/x_dialog.c:294
-#, c-format
+#: src/x_dialog.c:294
 msgid "Lower Left"
 msgstr "Unten Links"
 
-#: ../src/x_dialog.c:305
-#, c-format
+#: src/x_dialog.c:305
 msgid "Middle Left"
 msgstr "Mitte Links"
 
-#: ../src/x_dialog.c:316
-#, c-format
+#: src/x_dialog.c:316
 msgid "Upper Left"
 msgstr "Oben Links"
 
-#: ../src/x_dialog.c:327
-#, c-format
+#: src/x_dialog.c:327
 msgid "Lower Middle"
 msgstr "Unten Mitte"
 
-#: ../src/x_dialog.c:338
-#, c-format
+#: src/x_dialog.c:338
 msgid "Middle Middle"
 msgstr "Mitte Mitte"
 
-#: ../src/x_dialog.c:349
-#, c-format
+#: src/x_dialog.c:349
 msgid "Upper Middle"
 msgstr "Oben Mitte"
 
-#: ../src/x_dialog.c:360
-#, c-format
+#: src/x_dialog.c:360
 msgid "Lower Right"
 msgstr "Unten Rechts"
 
-#: ../src/x_dialog.c:371
-#, c-format
+#: src/x_dialog.c:371
 msgid "Middle Right"
 msgstr "Mitte Rechts"
 
-#: ../src/x_dialog.c:382
-#, c-format
+#: src/x_dialog.c:382
 msgid "Upper Right"
 msgstr "0ben Rechts"
 
-#: ../src/x_dialog.c:496
+#: src/x_dialog.c:496
 msgid "Edit Text Properties"
 msgstr "Text Eigenschaften bearbeiten"
 
-#: ../src/x_dialog.c:530
+#: src/x_dialog.c:530
 msgid "<b>Text Content</b>"
 msgstr "<b>Textinhalt</b>"
 
-#: ../src/x_dialog.c:562
+#: src/x_dialog.c:562
 msgid "<b>Text Properties</b>"
 msgstr "<b>Texteigenschaften</b>"
 
-#: ../src/x_dialog.c:577
+#: src/x_dialog.c:577
 msgid "Color:"
 msgstr "Farbe:"
 
-#: ../src/x_dialog.c:584
+#: src/x_dialog.c:584
 msgid "Size:"
 msgstr "Grö�e:"
 
-#: ../src/x_dialog.c:593
+#: src/x_dialog.c:593
 msgid "Alignment:"
 msgstr "Ausrichtung:"
 
-#: ../src/x_dialog.c:647
+#: src/x_dialog.c:647
 msgid "Solid"
 msgstr "Durchgehend"
 
-#: ../src/x_dialog.c:648
+#: src/x_dialog.c:648
 msgid "Dotted"
 msgstr "Gepunktet"
 
-#: ../src/x_dialog.c:649
+#: src/x_dialog.c:649
 msgid "Dashed"
 msgstr "Gestrichelt"
 
-#: ../src/x_dialog.c:650
+#: src/x_dialog.c:650
 msgid "Center"
 msgstr "StrichPunkt"
 
-#: ../src/x_dialog.c:651
+#: src/x_dialog.c:651
 msgid "Phantom"
 msgstr "StrichZweiPunkt"
 
-#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
-#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
-#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
-#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
-#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
-#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
+#: src/x_dialog.c:652 src/x_dialog.c:749 src/x_dialog.c:758 src/x_dialog.c:767
+#: src/x_dialog.c:868 src/x_dialog.c:870 src/x_dialog.c:872
+#: src/x_dialog.c:1100 src/x_dialog.c:1203 src/x_dialog.c:1212
+#: src/x_dialog.c:1221 src/x_dialog.c:1230 src/x_dialog.c:1239
+#: src/x_dialog.c:1352 src/x_dialog.c:1354 src/x_dialog.c:1356
+#: src/x_dialog.c:1358 src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*unverändert*"
 
-#: ../src/x_dialog.c:978
+#: src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Linieneigenschaften bearbeiten"
 
-#: ../src/x_dialog.c:1017 ../src/x_print.c:307
+#: src/x_dialog.c:1017 src/x_print.c:307
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/x_dialog.c:1021
+#: src/x_dialog.c:1021
 msgid "Width:"
 msgstr "Breite:"
 
-#: ../src/x_dialog.c:1025
+#: src/x_dialog.c:1025
 msgid "Dash Length:"
 msgstr "Linienlänge:"
 
-#: ../src/x_dialog.c:1029
+#: src/x_dialog.c:1029
 msgid "Dash Space:"
 msgstr "Linienlücke:"
 
-#: ../src/x_dialog.c:1096
+#: src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Leer"
 
-#: ../src/x_dialog.c:1097
+#: src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Gefüllt"
 
-#: ../src/x_dialog.c:1098
+#: src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "Gitter"
 
-#: ../src/x_dialog.c:1099
+#: src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "Schraffiert"
 
-#: ../src/x_dialog.c:1470
+#: src/x_dialog.c:1470
 msgid "Edit Fill Type"
 msgstr "Editiere Füllmuster"
 
-#: ../src/x_dialog.c:1508
+#: src/x_dialog.c:1508
 msgid "Fill Type:"
 msgstr "Füllmuster:"
 
-#: ../src/x_dialog.c:1512
+#: src/x_dialog.c:1512
 msgid "Line Width:"
 msgstr "Linienbreite:"
 
-#: ../src/x_dialog.c:1516
+#: src/x_dialog.c:1516
 msgid "Angle 1:"
 msgstr "Winkel 1:"
 
-#: ../src/x_dialog.c:1520
+#: src/x_dialog.c:1520
 msgid "Pitch 1:"
 msgstr "Abstand 1:"
 
-#: ../src/x_dialog.c:1524
+#: src/x_dialog.c:1524
 msgid "Angle 2:"
 msgstr "Winkel 2:"
 
-#: ../src/x_dialog.c:1528
+#: src/x_dialog.c:1528
 msgid "Pitch 2:"
 msgstr "Abstand 2:"
 
-#: ../src/x_dialog.c:1657
+#: src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "Bogen Parameter"
 
-#: ../src/x_dialog.c:1697
+#: src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr "Bogen Radius:"
 
-#: ../src/x_dialog.c:1705
+#: src/x_dialog.c:1705
 msgid "Start Angle:"
 msgstr "Start Winkel:"
 
-#: ../src/x_dialog.c:1713
+#: src/x_dialog.c:1713
 msgid "Degrees of Sweep:"
 msgstr "Ã?ffnungswinkel:"
 
-#: ../src/x_dialog.c:1830
+#: src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1778,44 +1760,44 @@ msgstr ""
 "Wie weit soll verschoben werden?\n"
 "(0 verschiebt zum Ursprung)"
 
-#: ../src/x_dialog.c:1898
+#: src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "Text Grö�e"
 
-#: ../src/x_dialog.c:1928
+#: src/x_dialog.c:1928
 msgid "Enter new text size:"
 msgstr "Neue Textgrö�e eingeben:"
 
-#: ../src/x_dialog.c:2004
+#: src/x_dialog.c:2004
 msgid "Snap Size"
 msgstr "Rasterabstand"
 
-#: ../src/x_dialog.c:2034
+#: src/x_dialog.c:2034
 msgid "Enter new snap grid spacing:"
 msgstr "Neuen Rasterabstand eingeben"
 
-#: ../src/x_dialog.c:2107
+#: src/x_dialog.c:2110
 msgid "Edit slot number"
 msgstr "Editiere slot Nummer"
 
-#: ../src/x_dialog.c:2138
+#: src/x_dialog.c:2141
 msgid "Edit slot number:"
 msgstr "Editiere slot Nummer:"
 
-#: ../src/x_dialog.c:2200
+#: src/x_dialog.c:2202
 msgid "About..."
 msgstr "Ã?ber..."
 
-#: ../src/x_dialog.c:2220
+#: src/x_dialog.c:2222
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA : GPL Electronic Design Automation</b>"
 
-#: ../src/x_dialog.c:2224
+#: src/x_dialog.c:2226
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>gschem Version %s%s.%s</b>"
 
-#: ../src/x_dialog.c:2232
+#: src/x_dialog.c:2234
 msgid ""
 "Written by:\n"
 "Ales Hvezda\n"
@@ -1827,139 +1809,139 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "und vielen anderen (siehe Datei: AUTHORS)"
 
-#: ../src/x_dialog.c:2295
+#: src/x_dialog.c:2297
 msgid "Coords"
 msgstr "Koordinaten"
 
-#: ../src/x_dialog.c:2316
+#: src/x_dialog.c:2318
 msgid "Screen"
 msgstr "Bildschirm (Pixel)"
 
-#: ../src/x_dialog.c:2325
+#: src/x_dialog.c:2327
 msgid "World"
 msgstr "Global (0.001\")"
 
-#: ../src/x_dialog.c:2364
+#: src/x_dialog.c:2366
 msgid "Background"
 msgstr "Hintergrund"
 
-#: ../src/x_dialog.c:2370
+#: src/x_dialog.c:2372
 msgid "Net endpoint"
 msgstr "Netz-Endemarkierung"
 
-#: ../src/x_dialog.c:2373
+#: src/x_dialog.c:2375
 msgid "Graphic"
 msgstr "Graphik"
 
-#: ../src/x_dialog.c:2382
+#: src/x_dialog.c:2384
 msgid "Logic bubble"
 msgstr "Logik Markierung"
 
-#: ../src/x_dialog.c:2385
+#: src/x_dialog.c:2387
 msgid "Grid point"
 msgstr "Rasterpunkt"
 
-#: ../src/x_dialog.c:2388
+#: src/x_dialog.c:2390
 msgid "Detached attribute"
 msgstr "Attribut ablösen"
 
-#: ../src/x_dialog.c:2391 ../src/x_window.c:382
+#: src/x_dialog.c:2393 src/x_window.c:382
 msgid "Text"
 msgstr "Text"
 
-#: ../src/x_dialog.c:2397
+#: src/x_dialog.c:2399
 msgid "Selection"
 msgstr "Auswahl"
 
-#: ../src/x_dialog.c:2400
+#: src/x_dialog.c:2402
 msgid "Bounding box"
 msgstr "Randmarkierung"
 
-#: ../src/x_dialog.c:2403
+#: src/x_dialog.c:2405
 msgid "Zoom box"
 msgstr "Ausschnitt wählen"
 
-#: ../src/x_dialog.c:2412
+#: src/x_dialog.c:2414
 msgid "Output background"
 msgstr "Ausgabehintergrund"
 
-#: ../src/x_dialog.c:2415
+#: src/x_dialog.c:2417
 msgid "Net junction"
 msgstr "Netzverbindung"
 
-#: ../src/x_dialog.c:2418
+#: src/x_dialog.c:2420
 msgid "Mesh grid major"
 msgstr ""
 
-#: ../src/x_dialog.c:2421
+#: src/x_dialog.c:2423
 msgid "Mesh grid minor"
 msgstr ""
 
-#: ../src/x_dialog.c:2424
+#: src/x_dialog.c:2426
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/x_dialog.c:2570
+#: src/x_dialog.c:2572
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr "FEHLER: NULL Objekt innerhalb von color_edit_dialog_apply!\n"
 
-#: ../src/x_dialog.c:2633
+#: src/x_dialog.c:2635
 msgid "Color Edit"
 msgstr "Farbe bearbeiten"
 
-#: ../src/x_dialog.c:2664
+#: src/x_dialog.c:2666
 msgid "Object color:"
 msgstr "Objekt Farbe:"
 
-#: ../src/x_dialog.c:2786
+#: src/x_dialog.c:2788
 msgid "Function"
 msgstr "Funktion"
 
-#: ../src/x_dialog.c:2793
+#: src/x_dialog.c:2795
 msgid "Keystroke(s)"
 msgstr "Tastenkürzel"
 
-#: ../src/x_dialog.c:3102
+#: src/x_dialog.c:3104
 msgid "Find Text"
 msgstr "Suche Text"
 
-#: ../src/x_dialog.c:3133
+#: src/x_dialog.c:3135
 msgid "Text to find:"
 msgstr "Zu suchender Text:"
 
-#: ../src/x_dialog.c:3143
+#: src/x_dialog.c:3145
 msgid "descend into hierarchy"
 msgstr "In der Hierachie hinabsteigen"
 
-#: ../src/x_dialog.c:3208
+#: src/x_dialog.c:3210
 msgid "Hide Text"
 msgstr "Verberge Text"
 
-#: ../src/x_dialog.c:3239
+#: src/x_dialog.c:3241
 msgid "Hide text starting with:"
 msgstr "Verberge Text, der beginnt mit:"
 
-#: ../src/x_dialog.c:3308
+#: src/x_dialog.c:3310
 msgid "Show Text"
 msgstr "Zeige Text"
 
-#: ../src/x_dialog.c:3339
+#: src/x_dialog.c:3341
 msgid "Show text starting with:"
 msgstr "Zeige Text, der beginnt mit:"
 
-#: ../src/x_dialog.c:3796
+#: src/x_dialog.c:3798
 msgid "S_elect the schematics you want to save:"
 msgstr "_Wählen Sie die zu speichernden Seiten:"
 
-#: ../src/x_dialog.c:3890
+#: src/x_dialog.c:3892
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr ""
 "Sollen die Ã?nderungen am Schaltplan \"%s\" vor dem SchlieÃ?en gespeichert "
 "werden?"
 
-#: ../src/x_dialog.c:3896
+#: src/x_dialog.c:3898
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
@@ -1967,16 +1949,15 @@ msgstr ""
 "Es gibt %d ungesicherte Schaltpläne. Sollen die �nderungen vor dem Schlie�en "
 "gespeichert werden?"
 
-#. secondary label
-#: ../src/x_dialog.c:3925
+#: src/x_dialog.c:3927
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr "Wenn Sie nicht speichern, werden Sie alle Ã?nderungen verlieren."
 
-#: ../src/x_dialog.c:3945
+#: src/x_dialog.c:3947
 msgid "_Close without saving"
 msgstr "SchlieÃ?en _ohne Speichern"
 
-#: ../src/x_dialog.c:4279
+#: src/x_dialog.c:4283
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1994,49 +1975,49 @@ msgstr ""
 "Der Name darf nicht mit einem Leerzeichen enden.\n"
 "Der Wert darf nicht mit einem Leerzeichen beginnen."
 
-#: ../src/x_dialog.c:4281
+#: src/x_dialog.c:4285
 msgid "Invalid Attribute"
 msgstr "Fehlerhaftes Attribut"
 
-#: ../src/x_dialog.c:4317
+#: src/x_dialog.c:4321
 #, fuzzy
 msgid "Pin type"
 msgstr "Linien Typ"
 
-#: ../src/x_dialog.c:4341
+#: src/x_dialog.c:4345
 #, fuzzy
 msgid "Net pin"
 msgstr "Netz-Endemarkierung"
 
-#: ../src/x_dialog.c:4343
+#: src/x_dialog.c:4347
 msgid "Bus pin (graphical)"
 msgstr ""
 
-#: ../src/x_fileselect.c:42
+#: src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "Schaltpläne"
 
-#: ../src/x_fileselect.c:47
+#: src/x_fileselect.c:47
 msgid "Symbols"
 msgstr "Symbole"
 
-#: ../src/x_fileselect.c:52
+#: src/x_fileselect.c:52
 msgid "Schematics and symbols"
 msgstr "Schaltpläne und Symbole"
 
-#: ../src/x_fileselect.c:58
+#: src/x_fileselect.c:58
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/x_fileselect.c:171
+#: src/x_fileselect.c:171
 msgid "Open..."
 msgstr "Ã?ffnen..."
 
-#: ../src/x_fileselect.c:231
+#: src/x_fileselect.c:231
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: ../src/x_fileselect.c:284
+#: src/x_fileselect.c:284
 #, c-format
 msgid ""
 "The selected file `%s' already exists.\n"
@@ -2047,30 +2028,29 @@ msgstr ""
 "\n"
 "Soll die Datei überschrieben werden?"
 
-#: ../src/x_fileselect.c:287
+#: src/x_fileselect.c:287
 msgid "Overwrite file?"
 msgstr "Datei überschreiben?"
 
-#: ../src/x_fileselect.c:289
+#: src/x_fileselect.c:289
 msgid "Save cancelled on user request\n"
 msgstr "Das Speichern wurde durch den Anwender abgebrochen\n"
 
-#. WK - catch EPS export case
-#: ../src/x_image.c:176
+#: src/x_image.c:176
 msgid "Encapsulated Postscript"
 msgstr "Encapsulated Postscript"
 
-#: ../src/x_image.c:296
+#: src/x_image.c:296
 #, c-format
 msgid "x_image_lowlevel: Unable to write eps file %s.\n"
 msgstr "x_image_lowlevel: Konnte eps-Datei %s nicht schreiben.\n"
 
-#: ../src/x_image.c:374
+#: src/x_image.c:374
 #, c-format
 msgid "x_image_lowlevel: Unable to write %s file %s.\n"
 msgstr "x_image_lowlevel: Konnte %s-Datei %s nicht schreiben.\n"
 
-#: ../src/x_image.c:384
+#: src/x_image.c:384
 #, c-format
 msgid ""
 "There was the following error when saving image with type %s to filename:\n"
@@ -2083,266 +2063,266 @@ msgstr ""
 "\n"
 "%s.\n"
 
-#: ../src/x_image.c:403
+#: src/x_image.c:403
 #, c-format
 msgid "Wrote color image to [%s] [%d x %d]\n"
 msgstr "Farbiges Bild als [%s] gespeichert. Grö�e [%d x %d]\n"
 
-#: ../src/x_image.c:405
+#: src/x_image.c:405
 #, c-format
 msgid "Wrote black and white image to [%s] [%d x %d]\n"
 msgstr "Schwarz & wei� Bild als [%s] gespeichert. Grö�e [%d x %d]\n"
 
-#: ../src/x_image.c:413
+#: src/x_image.c:413
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 msgstr "x_image_lowlevel: konnte kein Bild vom gschem-Fenster bekommen.\n"
 
-#: ../src/x_image.c:458
+#: src/x_image.c:458
 msgid "Width x Height"
 msgstr "Breite x Höhe"
 
-#: ../src/x_image.c:474
+#: src/x_image.c:474
 msgid "Image type"
 msgstr "Bild Format"
 
-#: ../src/x_log.c:188
+#: src/x_log.c:188
 msgid "** Invalid UTF-8 in log message. See stderr or gschem.log.\n"
 msgstr ""
 "** Diese Fehlermeldung enthält eine ungültige UTF-8 Kodierung. Siehe gschem."
 "log und stderr.\n"
 
-#: ../src/x_log.c:256
+#: src/x_log.c:256
 msgid "Status"
 msgstr "Status"
 
-#: ../src/x_menus.c:36
+#: src/x_menus.c:36
 msgid "/Add Net"
 msgstr "/Netz einfügen"
 
-#: ../src/x_menus.c:37
+#: src/x_menus.c:37
 msgid "/Add Attribute..."
 msgstr "/Attribut hinzufügen..."
 
-#: ../src/x_menus.c:38
+#: src/x_menus.c:38
 msgid "/Add Component..."
 msgstr "/Bauteil einfügen..."
 
-#: ../src/x_menus.c:39
+#: src/x_menus.c:39
 msgid "/Add Bus"
 msgstr "/Bus einfügen"
 
-#: ../src/x_menus.c:40
+#: src/x_menus.c:40
 msgid "/Add Text"
 msgstr "/Text einfügen"
 
-#: ../src/x_menus.c:42
+#: src/x_menus.c:42
 msgid "/Zoom In"
 msgstr "/Vergrö�ern"
 
-#: ../src/x_menus.c:43
+#: src/x_menus.c:43
 msgid "/Zoom Out"
 msgstr "/Verkleinern"
 
-#: ../src/x_menus.c:44
+#: src/x_menus.c:44
 msgid "/Zoom Box"
 msgstr "/Ausschnitt wählen"
 
-#: ../src/x_menus.c:45
+#: src/x_menus.c:45
 msgid "/Zoom Extents"
 msgstr "/Automatisch"
 
-#: ../src/x_menus.c:47
+#: src/x_menus.c:47
 msgid "/Select"
 msgstr "/Auswählen"
 
-#: ../src/x_menus.c:48
+#: src/x_menus.c:48
 msgid "/Edit..."
 msgstr "/Bearbeiten..."
 
-#: ../src/x_menus.c:49
+#: src/x_menus.c:49
 #, fuzzy
 msgid "/Edit pin type..."
 msgstr "Editiere Linienart"
 
-#: ../src/x_menus.c:50
+#: src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Kopieren"
 
-#: ../src/x_menus.c:51
+#: src/x_menus.c:51
 msgid "/Move"
 msgstr "/Verschieben"
 
-#: ../src/x_menus.c:52
+#: src/x_menus.c:52
 msgid "/Delete"
 msgstr "/Löschen"
 
-#: ../src/x_menus.c:55
+#: src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/zum Schaltplan hinab"
 
-#: ../src/x_menus.c:56
+#: src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/zum Symbol hinab"
 
-#: ../src/x_menus.c:57
+#: src/x_menus.c:57
 msgid "/Up"
 msgstr "/Hinauf"
 
-#: ../src/x_menus.c:316
+#: src/x_menus.c:319
 #, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr ""
 "Es wurde versucht die Empfindlichkeit des nicht existenten Menueintrags '%s' "
 "zu setzen\n"
 
-#: ../src/x_menus.c:340
+#: src/x_menus.c:343
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "Popup_menu_item_factory existiert nicht\n"
 
-#: ../src/x_menus.c:353
+#: src/x_menus.c:356
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 "Es wurde versucht die Sensibilität für einen nichtexistierenden Menueintrag "
 "zu setzen\n"
 
-#. Remove this entry from all menus
-#: ../src/x_menus.c:462
+#: src/x_menus.c:436
 #, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Konnte Datei %s nicht öffnen\n"
 
-#: ../src/x_menus.c:524
+#: src/x_menus.c:493
 msgid "Clear"
 msgstr "Entfernen"
 
-#: ../src/x_multiattrib.c:861
+#: src/x_multiattrib.c:913
 msgid "Attributes with empty name are not allowed. Please set a name."
 msgstr ""
 "Attribute mit leerem Namen sind nicht erlaubt. Gib bitte einen Namen ein."
 
-#: ../src/x_multiattrib.c:1371
+#: src/x_multiattrib.c:1461
 msgid "Show Value only"
 msgstr "Nur Wert anzeigen"
 
-#: ../src/x_multiattrib.c:1373
+#: src/x_multiattrib.c:1463
 msgid "Show Name only"
 msgstr "Nur Name anzeigen"
 
-#: ../src/x_multiattrib.c:1400
+#: src/x_multiattrib.c:1491
+msgid "Promote"
+msgstr ""
+
+#: src/x_multiattrib.c:1495
 msgid "Duplicate"
 msgstr "Duplizieren"
 
-#: ../src/x_multiattrib.c:1528
+#: src/x_multiattrib.c:1713
 msgid "Edit Attributes"
 msgstr "Attribute bearbeiten"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1648
+#: src/x_multiattrib.c:1831
 msgid "Vis?"
 msgstr "Sichtbar?"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1668
+#: src/x_multiattrib.c:1849
 msgid "N"
 msgstr "Name"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1688
+#: src/x_multiattrib.c:1867
 msgid "V"
 msgstr "Wert"
 
-#: ../src/x_multiattrib.c:1709
+#: src/x_multiattrib.c:1889
+#, fuzzy
+msgid "Show inherited attributes"
+msgstr "Attribut ablösen"
+
+#: src/x_multiattrib.c:1905
 msgid "Add Attribute"
 msgstr "Attribut hinzufügen"
 
-#: ../src/x_pagesel.c:257
+#: src/x_pagesel.c:257
 msgid "Discard Page"
 msgstr "Seite ablegen"
 
-#: ../src/x_pagesel.c:376
+#: src/x_pagesel.c:376
 msgid "Page Manager"
 msgstr "Seiten Manager"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:432
+#: src/x_pagesel.c:432
 msgid "Filename"
 msgstr "Dateiname"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:448
+#: src/x_pagesel.c:448
 msgid "Changed"
 msgstr "Geändert"
 
-#. GtkLabel
-#: ../src/x_pagesel.c:468
+#: src/x_pagesel.c:468
 msgid "Right click on the filename for more options..."
 msgstr "Rechtsklick auf den Dateinamen für mehr Optionen..."
 
-#: ../src/x_preview.c:223
+#: src/x_preview.c:223
 #, fuzzy
 msgid "Preview Buffer"
 msgstr "Auswahl einfügen"
 
-#: ../src/x_print.c:84
+#: src/x_print.c:84
 msgid "Select PostScript Filename..."
 msgstr "PostScript Dateinamen auswählen..."
 
-#: ../src/x_print.c:164
+#: src/x_print.c:164
 msgid "Extents with margins"
 msgstr "Alles mit Rand"
 
-#: ../src/x_print.c:170
+#: src/x_print.c:170
 msgid "Extents no margins"
 msgstr "Alles ohne Rand"
 
-#: ../src/x_print.c:176
+#: src/x_print.c:176
 msgid "Current Window"
 msgstr "Aktuelles Fenster"
 
-#: ../src/x_print.c:210
+#: src/x_print.c:210
 msgid "Landscape"
 msgstr "Querformat"
 
-#: ../src/x_print.c:216
+#: src/x_print.c:216
 msgid "Portrait"
 msgstr "Hochformat"
 
-#. Upper frame
-#: ../src/x_print.c:284
+#: src/x_print.c:284
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../src/x_print.c:296
+#: src/x_print.c:296
 msgid "Output paper size:"
 msgstr "Papiergrö�e:"
 
-#: ../src/x_print.c:318
+#: src/x_print.c:318
 msgid "Orientation:"
 msgstr "Ausrichtung:"
 
-#. Lower frame
-#: ../src/x_print.c:330
+#: src/x_print.c:330
 msgid "Destination"
 msgstr "Ziel"
 
-#: ../src/x_print.c:343
+#: src/x_print.c:343
 msgid "File:"
 msgstr "Datei:"
 
-#: ../src/x_print.c:373
+#: src/x_print.c:373
 msgid "Command:"
 msgstr "Befehl:"
 
-#: ../src/x_print.c:741
+#: src/x_print.c:741
 msgid "No print destination specified\n"
 msgstr "Das Ziel für den Ausdruck fehlt\n"
 
-#: ../src/x_print.c:748
+#: src/x_print.c:748
 #, c-format
 msgid "Cannot print current schematic to [%s]\n"
 msgstr "Aktueller Schaltplan kann nicht in [%s] gedruckt werden.\n"
 
-#: ../src/x_print.c:757
+#: src/x_print.c:757
 #, c-format
 msgid ""
 "Error printing to file '%s'\n"
@@ -2351,45 +2331,45 @@ msgstr ""
 "Fehler beim Drucken in die Datei '%s'\n"
 "Nähere Informationen sind im Log-Fenster."
 
-#: ../src/x_print.c:764
+#: src/x_print.c:764
 #, c-format
 msgid "Printed current schematic to [%s]\n"
 msgstr "Aktueller Schalplan in [%s] ausgedruckt\n"
 
-#: ../src/x_window.c:81
+#: src/x_window.c:81
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr "Konnte gc in x_window_setup_gc nicht zuweisen\n"
 
-#: ../src/x_window.c:317
+#: src/x_window.c:317
 msgid "New file"
 msgstr "Neue Datei"
 
-#: ../src/x_window.c:323
+#: src/x_window.c:323
 msgid "Open"
 msgstr "Ã?ffnen"
 
-#: ../src/x_window.c:324
+#: src/x_window.c:324
 msgid "Open file..."
 msgstr "Datei öffnen..."
 
-#: ../src/x_window.c:330
+#: src/x_window.c:330
 msgid "Save"
 msgstr "Speichern"
 
-#: ../src/x_window.c:331
+#: src/x_window.c:331
 msgid "Save file"
 msgstr "Datei speichern"
 
-#: ../src/x_window.c:339
+#: src/x_window.c:339
 msgid "Undo last operation"
 msgstr "letzte Aktion rückgängig machen"
 
-#: ../src/x_window.c:346
+#: src/x_window.c:346
 msgid "Redo last undo"
 msgstr "letzte Aktion wiederherstellen"
 
-#: ../src/x_window.c:355
+#: src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2401,7 +2381,7 @@ msgstr ""
 "und klicke um es zu plazieren\n"
 "mit rechter Maustaste abbrechen"
 
-#: ../src/x_window.c:365
+#: src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2409,7 +2389,7 @@ msgstr ""
 "Netz einfügen\n"
 "mit rechter Maustaste abbrechen"
 
-#: ../src/x_window.c:375
+#: src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2417,92 +2397,91 @@ msgstr ""
 "Bus einfügen\n"
 "mit rechter Maustaste abbrechen"
 
-#: ../src/x_window.c:383
+#: src/x_window.c:383
 msgid "Add Text..."
 msgstr "Text einfügen..."
 
-#: ../src/x_window.c:393
+#: src/x_window.c:393
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../src/x_window.c:394
+#: src/x_window.c:394
 msgid "Select mode"
 msgstr "Auswahl Modus"
 
-#: ../src/x_window.c:481
+#: src/x_window.c:481
 msgid "Pick"
 msgstr "Auswählen"
 
-#: ../src/x_window.c:497
+#: src/x_window.c:497
 msgid "Repeat/none"
 msgstr "Wiederholen/nichts"
 
-#: ../src/x_window.c:507
+#: src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "Menu/Cancel"
 
-#: ../src/x_window.c:509
+#: src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "Ausschnitt/Cancel"
 
-#: ../src/x_window.c:733
+#: src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Lade Schaltplan [%s]\n"
 
-#: ../src/x_window.c:745
+#: src/x_window.c:745
 msgid "Failed to load file"
 msgstr "Eine Datei konnte nicht geladen werden"
 
-#: ../src/x_window.c:754
+#: src/x_window.c:754
 #, c-format
 msgid "New file [%s]\n"
 msgstr "Neue Datei [%s]\n"
 
-#. an error occured when saving page to file
-#: ../src/x_window.c:859
+#: src/x_window.c:859
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Die Seite [%s] konnte nicht gespeichert werden.\n"
 
-#: ../src/x_window.c:860
+#: src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Fehler während des Speicherns"
 
-#: ../src/x_window.c:869
+#: src/x_window.c:869
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "Gespeichert unter [%s]\n"
 
-#: ../src/x_window.c:871
+#: src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Gespeichert [%s]\n"
 
-#: ../src/x_window.c:873
+#: src/x_window.c:873
 msgid "Saved"
 msgstr "Gespeichert"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "SchlieÃ?e Schaltplan [%s]\n"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "SchlieÃ?e [%s]\n"
 
-#: ../data/geda-gschem.desktop.in.h:1
+#: data/geda-gschem.desktop.in.h:3
+msgid "gEDA Schematic Editor"
+msgstr "gEDA Schaltplan Editor"
+
+#: data/geda-gschem.desktop.in.h:4
 msgid "Create and edit electrical schematics and symbols with gschem"
 msgstr ""
 "Erstellen oder editieren eines elektrischen Schaltplans oder Symbols mit "
 "gschem"
 
-#: ../data/geda-gschem.desktop.in.h:2
-msgid "gEDA Schematic Editor"
-msgstr "gEDA Schaltplan Editor"
-
 #~ msgid "Cut Buffer"
 #~ msgstr "Auswahl ausschneiden"
 
@@ -2684,9 +2663,6 @@ msgstr "gEDA Schaltplan Editor"
 #~ msgstr ""
 #~ "Der Text kann nicht mit einem ungültigen Winkel gezeichnet werden: %d\n"
 
-#~ msgid "Generic String"
-#~ msgstr "Allgemeiner Text"
-
 #~ msgid "Enter new string."
 #~ msgstr "Neuen Text eingeben."
 
diff --git a/gschem/po/en_GB.po b/gschem/po/en_GB.po
index 1f10e3d..e99646c 100644
--- a/gschem/po/en_GB.po
+++ b/gschem/po/en_GB.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geda-schem\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 14:35-0400\n"
+"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
+"POT-Creation-Date: 2009-06-18 11:53+0100\n"
 "PO-Revision-Date: 2009-01-02 14:32+0100\n"
 "Last-Translator: Peter Clifton <pcjc2@xxxxxxxxx>\n"
 "Language-Team: geda-dev <geda-dev@xxxxxxxx>\n"
@@ -15,614 +15,604 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/rcstrings.c:2
+#: src/rcstrings.c:2
 msgid "File"
 msgstr "File"
 
-#: ../src/rcstrings.c:3
+#: src/rcstrings.c:3
 msgid "New Window"
 msgstr "New Window"
 
-#: ../src/rcstrings.c:4 ../src/x_pagesel.c:252
+#: src/rcstrings.c:4 src/x_pagesel.c:252
 msgid "New Page"
 msgstr "New Page"
 
-#: ../src/rcstrings.c:5 ../src/x_pagesel.c:253
+#: src/rcstrings.c:5 src/x_pagesel.c:253
 msgid "Open Page..."
 msgstr "Open Page..."
 
-#: ../src/rcstrings.c:6 ../src/x_pagesel.c:256
+#: src/rcstrings.c:6 src/x_pagesel.c:256
 msgid "Close Page"
 msgstr "Close Page"
 
-#: ../src/rcstrings.c:7
+#: src/rcstrings.c:7
 msgid "Revert Page"
 msgstr "Revert Page"
 
-#: ../src/rcstrings.c:8 ../src/x_pagesel.c:255
+#: src/rcstrings.c:8 src/x_pagesel.c:255
 msgid "Save Page"
 msgstr "Save Page"
 
-#: ../src/rcstrings.c:9
+#: src/rcstrings.c:9
 msgid "Save Page As..."
 msgstr "Save Page As..."
 
-#: ../src/rcstrings.c:10
+#: src/rcstrings.c:10
 msgid "Save All"
 msgstr "Save All"
 
-#. GtkWindow
-#: ../src/rcstrings.c:11 ../src/x_print.c:276
+#: src/rcstrings.c:11 src/x_print.c:276
 msgid "Print..."
 msgstr "Print..."
 
-#. Create the dialog
-#: ../src/rcstrings.c:12 ../src/x_image.c:495
+#: src/rcstrings.c:12 src/x_image.c:495
 msgid "Write image..."
 msgstr "Write image..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:501
+#: src/rcstrings.c:13
 msgid "Recent files"
 msgstr "Recent files"
 
-#: ../src/rcstrings.c:14 ../src/x_script.c:47
+#: src/rcstrings.c:14 src/x_script.c:47
 msgid "Execute Script..."
 msgstr "Execute Script..."
 
-#: ../src/rcstrings.c:15
+#: src/rcstrings.c:15
 msgid "Close Window"
 msgstr "Close Window"
 
-#: ../src/rcstrings.c:16
+#: src/rcstrings.c:16
 msgid "Quit"
 msgstr "Quit"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
+#: src/rcstrings.c:18 src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Edit"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:338
+#: src/rcstrings.c:19 src/x_window.c:338
 msgid "Undo"
 msgstr "Undo"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:345
+#: src/rcstrings.c:20 src/x_window.c:345
 msgid "Redo"
 msgstr "Redo"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
+#: src/rcstrings.c:21 src/i_basic.c:77 src/x_window.c:521
 msgid "Select Mode"
 msgstr "Select Mode"
 
-#: ../src/rcstrings.c:22
+#: src/rcstrings.c:22
 #, fuzzy
 msgid "Cut"
 msgstr "Cut 1"
 
-#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
-#: ../src/i_callbacks.c:560
+#: src/rcstrings.c:23 src/i_basic.c:135 src/i_callbacks.c:536
+#: src/i_callbacks.c:560
 msgid "Copy"
 msgstr "Copy"
 
-#: ../src/rcstrings.c:24
+#: src/rcstrings.c:24
 #, fuzzy
 msgid "Paste"
 msgstr "Paste 1"
 
-#: ../src/rcstrings.c:25
+#: src/rcstrings.c:25
 msgid "Edit..."
 msgstr "Edit..."
 
-#: ../src/rcstrings.c:26
+#: src/rcstrings.c:26
 msgid "Edit Text..."
 msgstr "Edit Text..."
 
-#: ../src/rcstrings.c:27 ../src/i_basic.c:84
+#: src/rcstrings.c:27 src/i_basic.c:84
 msgid "Copy Mode"
 msgstr "Copy Mode"
 
-#: ../src/rcstrings.c:28 ../src/i_basic.c:142
+#: src/rcstrings.c:28 src/i_basic.c:142
 msgid "Multiple Copy Mode"
 msgstr "Multiple Copy Mode"
 
-#: ../src/rcstrings.c:29 ../src/i_basic.c:87
+#: src/rcstrings.c:29 src/i_basic.c:87
 msgid "Move Mode"
 msgstr "Move Mode"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
+#: src/rcstrings.c:30 src/i_callbacks.c:670 src/x_multiattrib.c:1496
 msgid "Delete"
 msgstr "Delete"
 
-#: ../src/rcstrings.c:31
+#: src/rcstrings.c:31
 msgid "Rotate 90 Mode"
 msgstr "Rotate 90 Mode"
 
-#: ../src/rcstrings.c:32 ../src/i_basic.c:91
+#: src/rcstrings.c:32 src/i_basic.c:91
 msgid "Mirror Mode"
 msgstr "Mirror Mode"
 
-#: ../src/rcstrings.c:33
+#: src/rcstrings.c:33
 msgid "Slot..."
 msgstr "Slot..."
 
-#: ../src/rcstrings.c:34
+#: src/rcstrings.c:34
 msgid "Color..."
 msgstr "Colour..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
+#: src/rcstrings.c:35 src/i_callbacks.c:920 src/x_dialog.c:2411
 msgid "Lock"
 msgstr "Lock"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
+#: src/rcstrings.c:36 src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "Unlock"
 
-#: ../src/rcstrings.c:37
+#: src/rcstrings.c:37
 msgid "Line Width & Type..."
 msgstr "Line Width & Type..."
 
-#: ../src/rcstrings.c:38
+#: src/rcstrings.c:38
 msgid "Fill Type..."
 msgstr "Fill Type..."
 
-#: ../src/rcstrings.c:39
+#: src/rcstrings.c:39
 msgid "Symbol Translate..."
 msgstr "Symbol Translate..."
 
-#: ../src/rcstrings.c:40
+#: src/rcstrings.c:40
 msgid "Embed Component/Picture"
 msgstr "Embed Component/Picture"
 
-#: ../src/rcstrings.c:41
+#: src/rcstrings.c:41
 msgid "Unembed Component/Picture"
 msgstr "Unembed Component/Picture"
 
-#: ../src/rcstrings.c:42
+#: src/rcstrings.c:42
 msgid "Update Component"
 msgstr "Update Component"
 
-#: ../src/rcstrings.c:43
+#: src/rcstrings.c:43
 msgid "Show/Hide Inv Text"
 msgstr "Show/Hide Inv Text"
 
-#: ../src/rcstrings.c:44
+#: src/rcstrings.c:44
 msgid "Make Inv Text Vis"
 msgstr "Make Inv Text Vis"
 
-#: ../src/rcstrings.c:46
+#: src/rcstrings.c:46
 msgid "Buffer"
 msgstr "Buffer"
 
-#: ../src/rcstrings.c:47
+#: src/rcstrings.c:47
 msgid "Copy into 1"
 msgstr "Copy into 1"
 
-#: ../src/rcstrings.c:48
+#: src/rcstrings.c:48
 msgid "Copy into 2"
 msgstr "Copy into 2"
 
-#: ../src/rcstrings.c:49
+#: src/rcstrings.c:49
 msgid "Copy into 3"
 msgstr "Copy into 3"
 
-#: ../src/rcstrings.c:50
+#: src/rcstrings.c:50
 msgid "Copy into 4"
 msgstr "Copy into 4"
 
-#: ../src/rcstrings.c:51
+#: src/rcstrings.c:51
 msgid "Copy into 5"
 msgstr "Copy into 5"
 
-#: ../src/rcstrings.c:52
+#: src/rcstrings.c:52
 msgid "Cut into 1"
 msgstr "Cut into 1"
 
-#: ../src/rcstrings.c:53
+#: src/rcstrings.c:53
 msgid "Cut into 2"
 msgstr "Cut into 2"
 
-#: ../src/rcstrings.c:54
+#: src/rcstrings.c:54
 msgid "Cut into 3"
 msgstr "Cut into 3"
 
-#: ../src/rcstrings.c:55
+#: src/rcstrings.c:55
 msgid "Cut into 4"
 msgstr "Cut into 4"
 
-#: ../src/rcstrings.c:56
+#: src/rcstrings.c:56
 msgid "Cut into 5"
 msgstr "Cut into 5"
 
-#: ../src/rcstrings.c:57
+#: src/rcstrings.c:57
 msgid "Paste from 1"
 msgstr "Paste from 1"
 
-#: ../src/rcstrings.c:58
+#: src/rcstrings.c:58
 msgid "Paste from 2"
 msgstr "Paste from 2"
 
-#: ../src/rcstrings.c:59
+#: src/rcstrings.c:59
 msgid "Paste from 3"
 msgstr "Paste from 3"
 
-#: ../src/rcstrings.c:60
+#: src/rcstrings.c:60
 msgid "Paste from 4"
 msgstr "Paste from 4"
 
-#: ../src/rcstrings.c:61
+#: src/rcstrings.c:61
 msgid "Paste from 5"
 msgstr "Paste from 5"
 
-#: ../src/rcstrings.c:63
+#: src/rcstrings.c:63
 msgid "View"
 msgstr "View"
 
-#: ../src/rcstrings.c:64
+#: src/rcstrings.c:64
 msgid "Redraw"
 msgstr "Redraw"
 
-#. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
+#: src/rcstrings.c:65 src/i_callbacks.c:1474 src/i_callbacks.c:1546
 msgid "Pan"
 msgstr "Pan"
 
-#: ../src/rcstrings.c:66 ../src/i_basic.c:95
+#: src/rcstrings.c:66 src/i_basic.c:95
 msgid "Zoom Box"
 msgstr "Zoom Box"
 
-#: ../src/rcstrings.c:67
+#: src/rcstrings.c:67
 msgid "Zoom Extents"
 msgstr "Zoom Extents"
 
-#: ../src/rcstrings.c:68
+#: src/rcstrings.c:68
 msgid "Zoom In"
 msgstr "Zoom In"
 
-#: ../src/rcstrings.c:69
+#: src/rcstrings.c:69
 msgid "Zoom Out"
 msgstr "Zoom Out"
 
-#: ../src/rcstrings.c:70
+#: src/rcstrings.c:70
 msgid "Zoom Full"
 msgstr "Zoom Full"
 
-#: ../src/rcstrings.c:71
+#: src/rcstrings.c:71
 msgid "Dark color scheme"
 msgstr "Dark colour scheme"
 
-#: ../src/rcstrings.c:72
+#: src/rcstrings.c:72
 msgid "Light color scheme"
 msgstr "Light colour scheme"
 
-#: ../src/rcstrings.c:74
+#: src/rcstrings.c:74
 msgid "Page"
 msgstr "Page"
 
-#: ../src/rcstrings.c:75
+#: src/rcstrings.c:75
 msgid "Manager..."
 msgstr "Manager..."
 
-#: ../src/rcstrings.c:76
+#: src/rcstrings.c:76
 msgid "Next"
 msgstr "Next"
 
-#: ../src/rcstrings.c:77
+#: src/rcstrings.c:77
 msgid "Previous"
 msgstr "Previous"
 
-#: ../src/rcstrings.c:78 ../src/x_window.c:316
+#: src/rcstrings.c:78 src/x_window.c:316
 msgid "New"
 msgstr "New"
 
-#: ../src/rcstrings.c:79
+#: src/rcstrings.c:79
 msgid "Revert"
 msgstr "Revert"
 
-#: ../src/rcstrings.c:80
+#: src/rcstrings.c:80
 msgid "Close"
 msgstr "Close"
 
-#: ../src/rcstrings.c:81
+#: src/rcstrings.c:81
 msgid "Discard"
 msgstr "Discard"
 
-#: ../src/rcstrings.c:83
+#: src/rcstrings.c:83
 msgid "Add"
 msgstr "Add"
 
-#: ../src/rcstrings.c:84
+#: src/rcstrings.c:84
 msgid "Component..."
 msgstr "Component..."
 
-#. need to click
-#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
-#: ../src/x_dialog.c:2376
+#: src/rcstrings.c:85 src/i_callbacks.c:2401 src/i_callbacks.c:2428
+#: src/x_dialog.c:2378
 msgid "Net"
 msgstr "Net"
 
-#. need to click
-#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
-#: ../src/x_dialog.c:2394 ../src/x_window.c:374
+#: src/rcstrings.c:86 src/i_callbacks.c:2472 src/i_callbacks.c:2499
+#: src/x_dialog.c:2396 src/x_window.c:374
 msgid "Bus"
 msgstr "Bus"
 
-#: ../src/rcstrings.c:87
+#: src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "Attribute..."
 
-#: ../src/rcstrings.c:88
+#: src/rcstrings.c:88
 msgid "Text..."
 msgstr "Text..."
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
+#: src/rcstrings.c:89 src/i_callbacks.c:2580 src/i_callbacks.c:2603
 msgid "Line"
 msgstr "Line"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
+#: src/rcstrings.c:90 src/i_callbacks.c:2625 src/i_callbacks.c:2648
 msgid "Box"
 msgstr "Box"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
+#: src/rcstrings.c:91 src/i_callbacks.c:2704 src/i_callbacks.c:2728
 msgid "Circle"
 msgstr "Circle"
 
-#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
+#: src/rcstrings.c:92 src/i_callbacks.c:2750 src/i_callbacks.c:2773
 msgid "Arc"
 msgstr "Arc"
 
-#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
-#: ../src/x_dialog.c:2367
+#: src/rcstrings.c:93 src/i_callbacks.c:2795 src/i_callbacks.c:2818
+#: src/x_dialog.c:2369
 msgid "Pin"
 msgstr "Pin"
 
-#: ../src/rcstrings.c:94
+#: src/rcstrings.c:94
 msgid "Picture..."
 msgstr "Picture..."
 
-#: ../src/rcstrings.c:96
+#: src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "Hierarchy"
 
-#: ../src/rcstrings.c:97
+#: src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "Down Schematic"
 
-#: ../src/rcstrings.c:98
+#: src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "Down Symbol"
 
-#: ../src/rcstrings.c:99
+#: src/rcstrings.c:99
 msgid "Up"
 msgstr "Up"
 
-#: ../src/rcstrings.c:100
+#: src/rcstrings.c:100
 msgid "Documentation"
 msgstr "Documentation"
 
-#. GtkFrame
-#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
-#: ../src/x_multiattrib.c:1543
+#: src/rcstrings.c:102 src/x_compselect.c:1417
 msgid "Attributes"
 msgstr "Attributes"
 
-#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
+#: src/rcstrings.c:103 src/i_callbacks.c:3089
 msgid "Attach"
 msgstr "Attach"
 
-#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
+#: src/rcstrings.c:104 src/i_callbacks.c:3136
 msgid "Detach"
 msgstr "Detach"
 
-#: ../src/rcstrings.c:105
+#: src/rcstrings.c:105
 msgid "Show Value"
 msgstr "Show Value"
 
-#: ../src/rcstrings.c:106
+#: src/rcstrings.c:106
 msgid "Show Name"
 msgstr "Show Name"
 
-#: ../src/rcstrings.c:107
+#: src/rcstrings.c:107
 msgid "Show Both"
 msgstr "Show Both"
 
-#: ../src/rcstrings.c:108
+#: src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "Toggle Visibility"
 
-#: ../src/rcstrings.c:109
+#: src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "Find Specific Text..."
 
-#: ../src/rcstrings.c:110
+#: src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "Hide Specific Text..."
 
-#: ../src/rcstrings.c:111
+#: src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "Show Specific Text..."
 
-#: ../src/rcstrings.c:112
+#: src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr "Autonumber Text..."
 
-#: ../src/rcstrings.c:114
+#: src/rcstrings.c:114
 msgid "Options"
 msgstr "Options"
 
-#: ../src/rcstrings.c:115
+#: src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "Text Size..."
 
-#: ../src/rcstrings.c:116
+#: src/rcstrings.c:116
 msgid "Cycle grid styles"
 msgstr "Cycle grid styles"
 
-#: ../src/rcstrings.c:117
+#: src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr "Toggle Snap On/Off"
 
-#: ../src/rcstrings.c:118
+#: src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "Snap Grid Spacing..."
 
-#: ../src/rcstrings.c:119
+#: src/rcstrings.c:119
 msgid "Scale up Grid Spacing"
 msgstr "Scale up Grid Spacing"
 
-#: ../src/rcstrings.c:120
+#: src/rcstrings.c:120
 msgid "Scale down Grid Spacing"
 msgstr "Scale down Grid Spacing"
 
-#: ../src/rcstrings.c:121
+#: src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr "Toggle Outline/Box"
 
-#: ../src/rcstrings.c:122
+#: src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr "Toggle Net Rubberband"
 
-#: ../src/rcstrings.c:123
+#: src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "Show Log Window..."
 
-#: ../src/rcstrings.c:124
+#: src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "Show Coord Window..."
 
-#: ../src/rcstrings.c:126
+#: src/rcstrings.c:126
 msgid "Help"
 msgstr "Help"
 
-#: ../src/rcstrings.c:127
+#: src/rcstrings.c:127
 msgid "Manual"
 msgstr "Manual"
 
-#: ../src/rcstrings.c:128
+#: src/rcstrings.c:128
 msgid "gEDA Documentation"
 msgstr "gEDA Documentation"
 
-#: ../src/rcstrings.c:129
+#: src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr "gschem FAQ"
 
-#: ../src/rcstrings.c:130
+#: src/rcstrings.c:130
 msgid "Component Documentation"
 msgstr "Component Documentation"
 
-#: ../src/rcstrings.c:131
+#: src/rcstrings.c:131
 msgid "About gschem"
 msgstr "About gschem"
 
-#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
+#: src/rcstrings.c:132 src/x_dialog.c:2724
 msgid "Hotkeys"
 msgstr "Hotkeys"
 
-#: ../src/a_zoom.c:212
+#: src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Zoom too small!  Cannot zoom further.\n"
 
-#. Fork failed. Still in parent process, so can use the log
-#. * window
-#: ../src/g_funcs.c:339 ../src/i_callbacks.c:68
+#: src/g_funcs.c:339 src/i_callbacks.c:68
 #, c-format
 msgid "Could not fork\n"
 msgstr "Could not fork\n"
 
-#. if we return, then nothing happened
-#: ../src/g_funcs.c:355 ../src/i_callbacks.c:78
+#: src/g_funcs.c:355 src/i_callbacks.c:78
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr "Could not invoke %s\n"
 
-#: ../src/g_funcs.c:361 ../src/i_callbacks.c:82
+#: src/g_funcs.c:361 src/i_callbacks.c:82
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Documentation commands not supported under MinGW.\n"
 
-#: ../src/g_rc.c:292
+#: src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Invalid zoomfactor [%d] passed to %s\n"
 
-#: ../src/g_rc.c:418
+#: src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Invalid size [%d] passed to text-size\n"
 
-#: ../src/g_rc.c:445
+#: src/g_rc.c:445
 #, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "Invalid size [%f] passed to postscript-font-scale\n"
 
-#: ../src/g_rc.c:488
+#: src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Invalid size [%d] passed to snap-size\n"
 
-#: ../src/g_rc.c:960
+#: src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "Invalid num levels [%d] passed to undo-levels\n"
 
-#: ../src/g_rc.c:1218
+#: src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "Invalid size [%d] passed to bus-ripper-size\n"
 
-#: ../src/g_rc.c:1293
+#: src/g_rc.c:1293
 #, c-format
 msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 
-#: ../src/g_rc.c:1334
+#: src/g_rc.c:1334
 #, c-format
 msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 msgstr "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 
-#: ../src/g_rc.c:1360
+#: src/g_rc.c:1360
 #, c-format
 msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 msgstr "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 
-#: ../src/g_rc.c:1404
+#: src/g_rc.c:1404
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "Invalid offset [%d] passed to add-attribute-offset\n"
 
-#: ../src/g_rc.c:1428
+#: src/g_rc.c:1428
 #, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr "Invalid number of seconds [%d] passed to auto-save-interval\n"
 
-#: ../src/g_rc.c:1469
+#: src/g_rc.c:1469
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Invalid gain [%d] passed to mousepan-gain\n"
 
-#: ../src/g_rc.c:1492
+#: src/g_rc.c:1492
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Invalid gain [%d] passed to keyboardpan-gain\n"
 
-#: ../src/g_rc.c:1538
+#: src/g_rc.c:1538
 #, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 
-#: ../src/g_rc.c:1564
+#: src/g_rc.c:1564
 #, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "Invalid gain [%d] passed to zoom-gain\n"
 
-#: ../src/g_rc.c:1589
+#: src/g_rc.c:1589
 #, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr "Invalid number of steps [%d] scrollpan-steps\n"
 
-#: ../src/gschem.c:183 ../src/gschem.c:194
+#: src/gschem.c:183 src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem version %s%s.%s\n"
 
-#: ../src/gschem.c:186 ../src/gschem.c:197
+#: src/gschem.c:186 src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -631,14 +621,14 @@ msgstr ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
 "details.\n"
 
-#: ../src/gschem.c:188 ../src/gschem.c:199
+#: src/gschem.c:188 src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
 msgstr ""
 "This is free software, and you are welcome to redistribute it under certain\n"
 
-#: ../src/gschem.c:190 ../src/gschem.c:201
+#: src/gschem.c:190 src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -647,17 +637,17 @@ msgstr ""
 "conditions; please see the COPYING file for more details.\n"
 "\n"
 
-#: ../src/gschem.c:205
+#: src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "This is the MINGW32 port.\n"
 
-#: ../src/gschem.c:209
+#: src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Current locale settings: %s\n"
 
-#: ../src/gschem.c:224
+#: src/gschem.c:224
 msgid ""
 "You must set the GEDADATA environment variable!\n"
 "\n"
@@ -665,222 +655,244 @@ msgid ""
 "environment variable to point to the correct location.\n"
 msgstr ""
 
-#: ../src/gschem.c:251
+#: src/gschem.c:251
 #, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "Couldn't find init scm file [%s]\n"
 
-#: ../src/gschem.c:255
+#: src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Read init scm file [%s]\n"
 
-#. ! \todo These two messages are the same. Should be
-#. * integrated.
-#: ../src/gschem.c:259
+#: src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Failed to read init scm file [%s]\n"
 
-#: ../src/gschem.c:320
+#: src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Scheme directory NOT set!\n"
 
-#: ../src/gschem.c:327 ../src/x_script.c:66
+#: src/gschem.c:327 src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Executing guile script [%s]\n"
 
-#: ../src/gschem_cairo.c:310
+#: src/gschem_accel_label.c:319
+msgid "Accelerator Closure"
+msgstr ""
+
+#: src/gschem_accel_label.c:320
+msgid "The closure to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:326
+msgid "Accelerator Widget"
+msgstr ""
+
+#: src/gschem_accel_label.c:327
+msgid "The widget to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:333
+msgid "Accelerator String"
+msgstr ""
+
+#: src/gschem_accel_label.c:334
+msgid "The accelerator string to be displayed"
+msgstr ""
+
+#: src/gschem_cairo.c:310
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "Unknown end for line (%d)\n"
 
-#: ../src/gschem_cairo.c:318
+#: src/gschem_cairo.c:318
 #, c-format
 msgid "Unknown type for stroke (%d) !\n"
 msgstr "Unknown type for stroke (%d) !\n"
 
-#: ../src/i_basic.c:79
+#: src/i_basic.c:79
 msgid "Component Mode"
 msgstr "Component Mode"
 
-#: ../src/i_basic.c:81
+#: src/i_basic.c:81
 msgid "Text Mode"
 msgstr "Text Mode"
 
-#: ../src/i_basic.c:89
+#: src/i_basic.c:89
 msgid "Rotate Mode"
 msgstr "Rotate Mode"
 
-#: ../src/i_basic.c:99
+#: src/i_basic.c:99
 msgid "Pan Mode"
 msgstr "Pan Mode"
 
-#: ../src/i_basic.c:103
+#: src/i_basic.c:103
 #, c-format
 msgid "Paste %d Mode"
 msgstr "Paste %d Mode"
 
-#: ../src/i_basic.c:109
+#: src/i_basic.c:109
 msgid "Magnetic Net Mode"
 msgstr "Magnetic Net Mode"
 
-#: ../src/i_basic.c:111
+#: src/i_basic.c:111
 msgid "Net Mode"
 msgstr "Net Mode"
 
-#: ../src/i_basic.c:115
+#: src/i_basic.c:115
 msgid "Bus Mode"
 msgstr "Bus Mode"
 
-#: ../src/i_basic.c:118
+#: src/i_basic.c:118
 msgid "Line Mode"
 msgstr "Line Mode"
 
-#: ../src/i_basic.c:121
+#: src/i_basic.c:121
 msgid "Box Mode"
 msgstr "Box Mode"
 
-#: ../src/i_basic.c:124
+#: src/i_basic.c:124
 msgid "Picture Mode"
 msgstr "Picture Mode"
 
-#: ../src/i_basic.c:127
+#: src/i_basic.c:127
 msgid "Circle Mode"
 msgstr "Circle Mode"
 
-#: ../src/i_basic.c:130
+#: src/i_basic.c:130
 msgid "Arc Mode"
 msgstr "Arc Mode"
 
-#: ../src/i_basic.c:133
+#: src/i_basic.c:133
 msgid "Pin Mode"
 msgstr "Pin Mode"
 
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
+#: src/i_basic.c:137 src/i_callbacks.c:626 src/i_callbacks.c:650
 msgid "Move"
 msgstr "Move"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
+#: src/i_basic.c:139 src/i_callbacks.c:581 src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Multiple Copy"
 
-#: ../src/i_basic.c:168
+#: src/i_basic.c:168
 msgid "Show Hidden"
 msgstr "Show Hidden"
 
-#: ../src/i_basic.c:171
+#: src/i_basic.c:171
 msgid "Snap Off"
 msgstr "Snap Off"
 
-#: ../src/i_basic.c:173
+#: src/i_basic.c:173
 msgid "Resnap Active"
 msgstr ""
 
-#: ../src/i_basic.c:254 ../src/x_window.c:495
+#: src/i_basic.c:254 src/x_window.c:495
 msgid "Action"
 msgstr "Action"
 
-#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
+#: src/i_basic.c:260 src/x_dialog.c:2408 src/x_window.c:490
 msgid "Stroke"
 msgstr "Stroke"
 
-#: ../src/i_basic.c:266 ../src/x_window.c:492
+#: src/i_basic.c:266 src/x_window.c:492
 msgid "none"
 msgstr "none"
 
-#: ../src/i_basic.c:271
+#: src/i_basic.c:271
 msgid "Repeat/"
 msgstr "Repeat/"
 
-#: ../src/i_basic.c:549 ../src/i_basic.c:563
+#: src/i_basic.c:549 src/i_basic.c:563
 msgid "OFF"
 msgstr "OFF"
 
-#: ../src/i_basic.c:567
+#: src/i_basic.c:567
 msgid "NONE"
 msgstr "NONE"
 
-#: ../src/i_basic.c:572
+#: src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Grid(%s, %s)"
 
-#: ../src/i_callbacks.c:63
+#: src/i_callbacks.c:63
 #, c-format
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentation for [%s,%s,%s,%s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
+#: src/i_callbacks.c:123 src/i_callbacks.c:1705
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "New page created [%s]\n"
 
-#: ../src/i_callbacks.c:163
+#: src/i_callbacks.c:163
 #, c-format
 msgid "New Window created [%s]\n"
 msgstr "New Window created [%s]\n"
 
-#: ../src/i_callbacks.c:281
+#: src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "Failed to Save All"
 
-#: ../src/i_callbacks.c:283
+#: src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Saved All"
 
-#: ../src/i_callbacks.c:373
+#: src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "Closing Window\n"
 
-#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
+#: src/i_callbacks.c:541 src/i_callbacks.c:586 src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "Select objs first"
 
-#: ../src/i_callbacks.c:710
+#: src/i_callbacks.c:710
 #, fuzzy
 msgid "Edit pin type"
 msgstr "Edit Line Type"
 
-#: ../src/i_callbacks.c:729
+#: src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Edit Text"
 
-#: ../src/i_callbacks.c:752
+#: src/i_callbacks.c:752
 msgid "Slot"
 msgstr "Slot"
 
-#: ../src/i_callbacks.c:769
+#: src/i_callbacks.c:769
 msgid "Color"
 msgstr "Colour"
 
-#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
+#: src/i_callbacks.c:806 src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Rotate"
 
-#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
+#: src/i_callbacks.c:874 src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Mirror"
 
-#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
+#: src/i_callbacks.c:956 src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Translate"
 
-#: ../src/i_callbacks.c:959
+#: src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "WARNING: Do not translate with snap off!\n"
 
-#: ../src/i_callbacks.c:960
+#: src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr "WARNING: Turning snap on and continuing with translate.\n"
 
-#: ../src/i_callbacks.c:967
+#: src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "WARNING: Snap grid size is not equal to 100!\n"
 
-#: ../src/i_callbacks.c:969
+#: src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -888,145 +900,144 @@ msgstr ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
 
-#: ../src/i_callbacks.c:1000
+#: src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "Embed"
 
-#: ../src/i_callbacks.c:1041
+#: src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "Unembed"
 
-#: ../src/i_callbacks.c:1084
+#: src/i_callbacks.c:1085
 msgid "Update"
 msgstr "Update"
 
-#: ../src/i_callbacks.c:1141
+#: src/i_callbacks.c:1144
 msgid "ShowHidden"
 msgstr "ShowHidden"
 
-#: ../src/i_callbacks.c:1165
+#: src/i_callbacks.c:1168
 msgid "MakeVisible"
 msgstr "MakeVisible"
 
-#: ../src/i_callbacks.c:1562
+#: src/i_callbacks.c:1565
 msgid "Update Cues"
 msgstr "Update Cues"
 
-#: ../src/i_callbacks.c:1746
+#: src/i_callbacks.c:1749
 msgid "Really revert page?"
 msgstr "Really revert page?"
 
-#: ../src/i_callbacks.c:1816
+#: src/i_callbacks.c:1819
 msgid "Copy to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1834
+#: src/i_callbacks.c:1837
 msgid "Cut to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1852
+#: src/i_callbacks.c:1855
 #, fuzzy
 msgid "Paste from clipboard"
 msgstr "Paste from 1"
 
-#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
-#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
-#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+#: src/i_callbacks.c:1867 src/i_callbacks.c:2106 src/i_callbacks.c:2128
+#: src/i_callbacks.c:2150 src/i_callbacks.c:2172 src/i_callbacks.c:2194
 msgid "Empty buffer"
 msgstr "Empty buffer"
 
-#: ../src/i_callbacks.c:1909
+#: src/i_callbacks.c:1912
 msgid "Copy 1"
 msgstr "Copy 1"
 
-#: ../src/i_callbacks.c:1928
+#: src/i_callbacks.c:1931
 msgid "Copy 2"
 msgstr "Copy 2"
 
-#: ../src/i_callbacks.c:1947
+#: src/i_callbacks.c:1950
 msgid "Copy 3"
 msgstr "Copy 3"
 
-#: ../src/i_callbacks.c:1966
+#: src/i_callbacks.c:1969
 msgid "Copy 4"
 msgstr "Copy 4"
 
-#: ../src/i_callbacks.c:1985
+#: src/i_callbacks.c:1988
 msgid "Copy 5"
 msgstr "Copy 5"
 
-#: ../src/i_callbacks.c:2004
+#: src/i_callbacks.c:2007
 msgid "Cut 1"
 msgstr "Cut 1"
 
-#: ../src/i_callbacks.c:2023
+#: src/i_callbacks.c:2026
 msgid "Cut 2"
 msgstr "Cut 2"
 
-#: ../src/i_callbacks.c:2042
+#: src/i_callbacks.c:2045
 msgid "Cut 3"
 msgstr "Cut 3"
 
-#: ../src/i_callbacks.c:2061
+#: src/i_callbacks.c:2064
 msgid "Cut 4"
 msgstr "Cut 4"
 
-#: ../src/i_callbacks.c:2080
+#: src/i_callbacks.c:2083
 msgid "Cut 5"
 msgstr "Cut 5"
 
-#: ../src/i_callbacks.c:2096
+#: src/i_callbacks.c:2099
 msgid "Paste 1"
 msgstr "Paste 1"
 
-#: ../src/i_callbacks.c:2118
+#: src/i_callbacks.c:2121
 msgid "Paste 2"
 msgstr "Paste 2"
 
-#: ../src/i_callbacks.c:2140
+#: src/i_callbacks.c:2143
 msgid "Paste 3"
 msgstr "Paste 3"
 
-#: ../src/i_callbacks.c:2162
+#: src/i_callbacks.c:2165
 msgid "Paste 4"
 msgstr "Paste 4"
 
-#: ../src/i_callbacks.c:2184
+#: src/i_callbacks.c:2187
 msgid "Paste 5"
 msgstr "Paste 5"
 
-#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
+#: src/i_callbacks.c:2324 src/x_window.c:354
 msgid "Component"
 msgstr "Component"
 
-#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
+#: src/i_callbacks.c:2360 src/i_callbacks.c:2379 src/x_dialog.c:2381
 msgid "Attribute"
 msgstr "Attribute"
 
-#: ../src/i_callbacks.c:2873
+#: src/i_callbacks.c:2877
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Searching for source [%s]\n"
 
-#: ../src/i_callbacks.c:2897
+#: src/i_callbacks.c:2901
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Cannot find source [%s]\n"
 
-#: ../src/i_callbacks.c:2964
+#: src/i_callbacks.c:2970
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Searching for symbol [%s]\n"
 
-#: ../src/i_callbacks.c:2970
+#: src/i_callbacks.c:2976
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr "Symbol is not a real file. Symbol cannot be loaded.\n"
 
-#: ../src/i_callbacks.c:3001
+#: src/i_callbacks.c:3007
 msgid "Cannot find any schematics above the current one!\n"
 msgstr "Cannot find any schematics above the current one!\n"
 
-#: ../src/i_callbacks.c:3064
+#: src/i_callbacks.c:3061
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
@@ -1034,242 +1045,240 @@ msgstr ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
 
-#: ../src/i_callbacks.c:3177
+#: src/i_callbacks.c:3171
 msgid "ShowN"
 msgstr "ShowN"
 
-#: ../src/i_callbacks.c:3213
+#: src/i_callbacks.c:3207
 msgid "ShowV"
 msgstr "ShowV"
 
-#: ../src/i_callbacks.c:3249
+#: src/i_callbacks.c:3243
 msgid "ShowB"
 msgstr "ShowB"
 
-#: ../src/i_callbacks.c:3286
+#: src/i_callbacks.c:3280
 msgid "VisToggle"
 msgstr "VisToggle"
 
-#: ../src/i_callbacks.c:3316
+#: src/i_callbacks.c:3310
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Sorry but this is a non-functioning menu option\n"
 
-#: ../src/i_callbacks.c:3406
+#: src/i_callbacks.c:3400
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Action feedback mode set to OUTLINE\n"
 
-#: ../src/i_callbacks.c:3409
+#: src/i_callbacks.c:3403
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Action feedback mode set to BOUNDINGBOX\n"
 
-#: ../src/i_callbacks.c:3434
+#: src/i_callbacks.c:3428
 msgid "Grid OFF\n"
 msgstr "Grid OFF\n"
 
-#: ../src/i_callbacks.c:3435
+#: src/i_callbacks.c:3429
 msgid "Dot grid selected\n"
 msgstr "Dot grid selected\n"
 
-#: ../src/i_callbacks.c:3436
+#: src/i_callbacks.c:3430
 msgid "Mesh grid selected\n"
 msgstr "Mesh grid selected\n"
 
-#: ../src/i_callbacks.c:3457
+#: src/i_callbacks.c:3451
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Snap OFF (CAUTION!)\n"
 
-#: ../src/i_callbacks.c:3460
+#: src/i_callbacks.c:3454
 msgid "Snap ON\n"
 msgstr "Snap ON\n"
 
-#: ../src/i_callbacks.c:3463
+#: src/i_callbacks.c:3457
 #, fuzzy
 msgid "Snap back to the grid (CAUTION!)\n"
 msgstr "Snap OFF (CAUTION!)\n"
 
-#: ../src/i_callbacks.c:3489
+#: src/i_callbacks.c:3483
 msgid "Rubber band OFF \n"
 msgstr "Rubber band OFF \n"
 
-#: ../src/i_callbacks.c:3492
+#: src/i_callbacks.c:3486
 msgid "Rubber band ON\n"
 msgstr "Rubber band ON\n"
 
-#: ../src/i_callbacks.c:3507
+#: src/i_callbacks.c:3501
 msgid "magnetic net mode: ON\n"
 msgstr "magnetic net mode: ON\n"
 
-#: ../src/i_callbacks.c:3510
+#: src/i_callbacks.c:3504
 msgid "magnetic net mode: OFF\n"
 msgstr "magnetic net mode: OFF\n"
 
-#: ../src/o_box.c:160
+#: src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Unknown type for box (fill)!\n"
 
-#: ../src/o_buffer.c:57
+#: src/o_buffer.c:57
 #, c-format
 msgid "o_buffer_copy: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:72
+#: src/o_buffer.c:72
 #, c-format
 msgid "o_buffer_cut: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:93
+#: src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr "Got an invalid buffer_number [o_buffer_paste_start]\n"
 
-#: ../src/o_bus.c:135
+#: src/o_bus.c:135
 #, c-format
 msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr "Got an invalid which one in o_bus_draw_stretch\n"
 
-#: ../src/o_circle.c:141
+#: src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Unknown type for circle (fill)!\n"
 
-#: ../src/o_complex.c:250 ../src/o_complex.c:254
+#: src/o_complex.c:250 src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Translating schematic [%d %d]\n"
 
-#: ../src/o_misc.c:61
+#: src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
 msgstr "Got an unexpected NULL in o_edit\n"
 
-#: ../src/o_misc.c:125
+#: src/o_misc.c:125
 msgid "Object already locked\n"
 msgstr "Object already locked\n"
 
-#: ../src/o_misc.c:163
+#: src/o_misc.c:163
 msgid "Object already unlocked\n"
 msgstr "Object already unlocked\n"
 
-#: ../src/o_misc.c:445
+#: src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "Hidden text is now visible\n"
 
-#: ../src/o_misc.c:447
+#: src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "Hidden text is now invisible\n"
 
-#: ../src/o_misc.c:697
+#: src/o_misc.c:700
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr "Could not find symbol [%s] in library. Update failed.\n"
 
-#: ../src/o_misc.c:840
+#: src/o_misc.c:847
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr "o_autosave_backups: Can't get the real filename of %s."
 
-#: ../src/o_misc.c:884
+#: src/o_misc.c:891
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr "Could NOT set previous backup file [%s] read-write\n"
 
-#: ../src/o_misc.c:902
+#: src/o_misc.c:909
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Could NOT set backup file [%s] readonly\n"
 
-#: ../src/o_misc.c:907
+#: src/o_misc.c:914
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "Could NOT save backup file [%s]\n"
 
-#: ../src/o_move.c:188
+#: src/o_move.c:188
 #, c-format
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "ERROR: NULL object in o_move_end!\n"
 
-#: ../src/o_move.c:461
+#: src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr "DOH! tried to find the whichone, but didn't find it!\n"
 
-#: ../src/o_move.c:482
+#: src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr "Got a non line object in o_move_check_endpoint\n"
 
-#: ../src/o_net.c:176
+#: src/o_net.c:176
 #, c-format
 msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr "Got an invalid which one in o_net_draw_stretch\n"
 
-#: ../src/o_net.c:552
+#: src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr "Warning: Starting net at off grid coordinate\n"
 
-#: ../src/o_net.c:614
+#: src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr "Warning: Ending net at off grid coordinate\n"
 
-#. try to exit gracefully
-#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
-#: ../src/o_net.c:1126
+#: src/o_net.c:982 src/o_net.c:1019 src/o_net.c:1090 src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr "Tried to add more than two bus rippers. Internal gschem error.\n"
 
-#: ../src/o_net.c:1196
+#: src/o_net.c:1196
 #, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "Bus ripper symbol [%s] was not found in any component library\n"
 
-#: ../src/o_path.c:356
+#: src/o_path.c:356
 #, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "Unknown type for path (fill)!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:557
+#: src/o_picture.c:166 src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Failed to load picture: %s"
 
-#: ../src/o_picture.c:180
+#: src/o_picture.c:180
 msgid "Picture"
 msgstr "Picture"
 
-#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
+#: src/o_picture.c:465 src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "ERROR: NULL object!\n"
 
-#: ../src/o_slot.c:110
+#: src/o_slot.c:81
 msgid "Slot attribute malformed\n"
 msgstr "Slot attribute malformed\n"
 
-#: ../src/o_slot.c:128
+#: src/o_slot.c:99
 msgid "numslots attribute missing\n"
 msgstr "numslots attribute missing\n"
 
-#: ../src/o_slot.c:130
+#: src/o_slot.c:100
 msgid "Slotting not allowed for this component\n"
 msgstr "Slotting not allowed for this component\n"
 
-#: ../src/o_slot.c:145
+#: src/o_slot.c:115
 msgid "New slot number out of range\n"
 msgstr "New slot number out of range\n"
 
-#: ../src/o_slot.c:200
+#: src/o_slot.c:170
 #, c-format
 msgid "uggg! you tried to slot edit something that doesn't exist!\n"
 msgstr "uggg! you tried to slot edit something that doesn't exist!\n"
 
-#: ../src/o_undo.c:300
+#: src/o_undo.c:300
 msgid "Undo/Redo disabled in rc file\n"
 msgstr "Undo/Redo disabled in rc file\n"
 
-#: ../src/parsecmd.c:47
+#: src/parsecmd.c:47
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] schematic_filename1 ... schematic_filenameN\n"
@@ -1294,77 +1303,68 @@ msgstr ""
 "  -h            Help; this message\n"
 "\n"
 
-#: ../src/x_attribedit.c:127
+#: src/x_attribedit.c:127
 #, c-format
 msgid "Got invalid show option; defaulting to show both\n"
 msgstr "Got invalid show option; defaulting to show both\n"
 
-#: ../src/x_attribedit.c:330
+#: src/x_attribedit.c:330
 msgid "Single Attribute Editor"
 msgstr "Single Attribute Editor"
 
-#: ../src/x_attribedit.c:359
+#: src/x_attribedit.c:359
 msgid "<b>Edit Attribute</b>"
 msgstr "<b>Edit Attribute</b>"
 
-#: ../src/x_attribedit.c:361
+#: src/x_attribedit.c:361
 msgid "<b>Add Attribute</b>"
 msgstr "<b>Add Attribute</b>"
 
-#. Name selection
-#. GtkLabel
-#: ../src/x_attribedit.c:377 ../src/x_multiattrib.c:1725
+#: src/x_attribedit.c:377 src/x_multiattrib.c:1921
 msgid "Name:"
 msgstr "Name:"
 
-#. Value entry
-#. GtkLabel
-#: ../src/x_attribedit.c:393 ../src/x_multiattrib.c:1744
+#: src/x_attribedit.c:393 src/x_multiattrib.c:1940
 msgid "Value:"
 msgstr "Value:"
 
-#. Visibility
-#. GtkButton
-#: ../src/x_attribedit.c:409 ../src/x_multiattrib.c:1781
+#: src/x_attribedit.c:409 src/x_multiattrib.c:1983
 msgid "Visible"
 msgstr "Visible"
 
-#: ../src/x_attribedit.c:429
+#: src/x_attribedit.c:429
 msgid "Show Value Only"
 msgstr "Show Value Only"
 
-#: ../src/x_attribedit.c:431
+#: src/x_attribedit.c:431
 msgid "Show Name Only"
 msgstr "Show Name Only"
 
-#: ../src/x_attribedit.c:433 ../src/x_multiattrib.c:1369
+#: src/x_attribedit.c:433 src/x_multiattrib.c:1459
 msgid "Show Name & Value"
 msgstr "Show Name & Value"
 
-#. gschem specific
-#: ../src/x_attribedit.c:440
+#: src/x_attribedit.c:440
 msgid "<b>Attach Options</b>"
 msgstr "<b>Attach Options</b>"
 
-#: ../src/x_attribedit.c:455
+#: src/x_attribedit.c:455
 msgid "All"
 msgstr "All"
 
-#. GtkTreeViewColumn
-#: ../src/x_attribedit.c:463 ../src/x_compselect.c:896
-#: ../src/x_compselect.c:1010
+#: src/x_attribedit.c:463 src/x_compselect.c:895 src/x_compselect.c:1009
 msgid "Components"
 msgstr "Components"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:364
+#: src/x_attribedit.c:471 src/x_window.c:364
 msgid "Nets"
 msgstr "Nets"
 
-#: ../src/x_attribedit.c:479
+#: src/x_attribedit.c:479
 msgid "Replace existing attributes"
 msgstr "Replace existing attributes"
 
-#: ../src/x_autonumber.c:413
+#: src/x_autonumber.c:415
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
@@ -1372,189 +1372,179 @@ msgstr ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
 
-#. duplicate slot in used_slots
-#: ../src/x_autonumber.c:428
+#: src/x_autonumber.c:430
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 
-#: ../src/x_autonumber.c:696
+#: src/x_autonumber.c:702
 msgid "No searchstring given in autonumber text.\n"
 msgstr "No searchstring given in autonumber text.\n"
 
-#: ../src/x_autonumber.c:748
+#: src/x_autonumber.c:754
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr "No '*' or '?' given at the end of the autonumber text.\n"
 
-#: ../src/x_autonumber.c:883
+#: src/x_autonumber.c:889
 msgid "Diagonal"
 msgstr "Diagonal"
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Top to bottom"
 msgstr "Top to bottom"
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Bottom to top"
 msgstr "Bottom to top"
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 msgid "Left to right"
 msgstr "Left to right"
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 msgid "Right to left"
 msgstr "Right to left"
 
-#: ../src/x_autonumber.c:886
+#: src/x_autonumber.c:892
 msgid "File order"
 msgstr "File order"
 
-#: ../src/x_autonumber.c:1222
+#: src/x_autonumber.c:1228
 msgid "Autonumber text"
 msgstr "Autonumber text"
 
-#. scope section
-#: ../src/x_autonumber.c:1246
+#: src/x_autonumber.c:1252
 msgid "<b>Scope</b>"
 msgstr "<b>Scope</b>"
 
-#: ../src/x_autonumber.c:1268
+#: src/x_autonumber.c:1274
 msgid "Search for:"
 msgstr "Search for:"
 
-#: ../src/x_autonumber.c:1282
+#: src/x_autonumber.c:1288
 msgid "Autonumber text in:"
 msgstr "Autonumber text in:"
 
-#: ../src/x_autonumber.c:1289
+#: src/x_autonumber.c:1295
 msgid "Skip numbers found in:"
 msgstr "Skip numbers found in:"
 
-#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
+#: src/x_autonumber.c:1307 src/x_autonumber.c:1316
 msgid "Selected objects"
 msgstr "Selected objects"
 
-#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
+#: src/x_autonumber.c:1308 src/x_autonumber.c:1317
 msgid "Current page"
 msgstr "Current page"
 
-#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
+#: src/x_autonumber.c:1309 src/x_autonumber.c:1318
 msgid "Whole hierarchy"
 msgstr "Whole hierarchy"
 
-#: ../src/x_autonumber.c:1314
+#: src/x_autonumber.c:1320
 msgid "Overwrite existing numbers"
 msgstr "Overwrite existing numbers"
 
-#. Options section
-#: ../src/x_autonumber.c:1319
+#: src/x_autonumber.c:1325
 msgid "<b>Options</b>"
 msgstr "<b>Options</b>"
 
-#: ../src/x_autonumber.c:1341
+#: src/x_autonumber.c:1347
 msgid "Starting number:"
 msgstr "Starting number:"
 
-#: ../src/x_autonumber.c:1348
+#: src/x_autonumber.c:1354
 msgid "Sort order:"
 msgstr "Sort order:"
 
-#: ../src/x_autonumber.c:1369
+#: src/x_autonumber.c:1375
 msgid "Remove numbers"
 msgstr "Remove numbers"
 
-#: ../src/x_autonumber.c:1373
+#: src/x_autonumber.c:1379
 msgid "Automatic slotting"
 msgstr "Automatic slotting"
 
-#: ../src/x_color.c:94 ../src/x_color.c:103
+#: src/x_color.c:94 src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Could not allocate the colour %s!\n"
 
-#: ../src/x_color.c:94
+#: src/x_color.c:94
 msgid "black"
 msgstr "black"
 
-#: ../src/x_color.c:103
+#: src/x_color.c:103
 msgid "white"
 msgstr "white"
 
-#: ../src/x_color.c:125
+#: src/x_color.c:125
 #, c-format
 msgid "Could not allocate display color %i!\n"
 msgstr "Could not allocate display colour %i!\n"
 
-#: ../src/x_color.c:147
+#: src/x_color.c:147
 #, c-format
 msgid "Could not allocate outline color %i!\n"
 msgstr "Could not allocate outline colour %i!\n"
 
-#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
+#: src/x_color.c:164 src/x_color.c:181 src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Tried to get an invalid colour: %d\n"
 
-#: ../src/x_color.c:214
+#: src/x_color.c:214
 #, c-format
 msgid "Tried to get an invalid outline color: %d\n"
 msgstr "Tried to get an invalid outline colour: %d\n"
 
-#. GtkLabel
-#: ../src/x_compselect.c:1040
+#: src/x_compselect.c:1039
 msgid "Filter:"
 msgstr "Filter:"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
-#: ../src/x_multiattrib.c:1601
+#: src/x_compselect.c:1142 src/x_dialog.c:3776 src/x_multiattrib.c:1787
 msgid "Name"
 msgstr "Name"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1152 ../src/x_multiattrib.c:1626
+#: src/x_compselect.c:1151 src/x_multiattrib.c:1811
 msgid "Value"
 msgstr "Value"
 
-#: ../src/x_compselect.c:1191
+#: src/x_compselect.c:1190
 msgid "Default behavior - reference component"
 msgstr "Default behavior - reference component"
 
-#: ../src/x_compselect.c:1194
+#: src/x_compselect.c:1193
 msgid "Embed component in schematic"
 msgstr "Embed component in schematic"
 
-#: ../src/x_compselect.c:1197
+#: src/x_compselect.c:1196
 msgid "Include component as individual objects"
 msgstr "Include component as individual objects"
 
-#. GtkWindow
-#: ../src/x_compselect.c:1354
+#: src/x_compselect.c:1353
 msgid "Select Component..."
 msgstr "Select Component..."
 
-#: ../src/x_compselect.c:1377
+#: src/x_compselect.c:1376
 msgid "In Use"
 msgstr "In Use"
 
-#: ../src/x_compselect.c:1381
+#: src/x_compselect.c:1380
 msgid "Libraries"
 msgstr "Libraries"
 
-#. GtkFrame
-#: ../src/x_compselect.c:1390 ../src/x_fileselect.c:122
+#: src/x_compselect.c:1389 src/x_fileselect.c:122
 msgid "Preview"
 msgstr "Preview"
 
-#. dialog not created yet
-#: ../src/x_dialog.c:174
+#: src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "Text Entry..."
 
-#: ../src/x_dialog.c:205
+#: src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1564,185 +1554,176 @@ msgstr ""
 "move cursor into window, click to place text.\n"
 "Middle button to rotate while placing."
 
-#: ../src/x_dialog.c:294
-#, c-format
+#: src/x_dialog.c:294
 msgid "Lower Left"
 msgstr "Lower Left"
 
-#: ../src/x_dialog.c:305
-#, c-format
+#: src/x_dialog.c:305
 msgid "Middle Left"
 msgstr "Middle Left"
 
-#: ../src/x_dialog.c:316
-#, c-format
+#: src/x_dialog.c:316
 msgid "Upper Left"
 msgstr "Upper Left"
 
-#: ../src/x_dialog.c:327
-#, c-format
+#: src/x_dialog.c:327
 msgid "Lower Middle"
 msgstr "Lower Middle"
 
-#: ../src/x_dialog.c:338
-#, c-format
+#: src/x_dialog.c:338
 msgid "Middle Middle"
 msgstr "Middle Middle"
 
-#: ../src/x_dialog.c:349
-#, c-format
+#: src/x_dialog.c:349
 msgid "Upper Middle"
 msgstr "Upper Middle"
 
-#: ../src/x_dialog.c:360
-#, c-format
+#: src/x_dialog.c:360
 msgid "Lower Right"
 msgstr "Lower Right"
 
-#: ../src/x_dialog.c:371
-#, c-format
+#: src/x_dialog.c:371
 msgid "Middle Right"
 msgstr "Middle Right"
 
-#: ../src/x_dialog.c:382
-#, c-format
+#: src/x_dialog.c:382
 msgid "Upper Right"
 msgstr "Upper Right"
 
-#: ../src/x_dialog.c:496
+#: src/x_dialog.c:496
 msgid "Edit Text Properties"
 msgstr "Edit Text Properties"
 
-#: ../src/x_dialog.c:530
+#: src/x_dialog.c:530
 msgid "<b>Text Content</b>"
 msgstr "<b>Text Content</b>"
 
-#: ../src/x_dialog.c:562
+#: src/x_dialog.c:562
 msgid "<b>Text Properties</b>"
 msgstr "<b>Text Properties</b>"
 
-#: ../src/x_dialog.c:577
+#: src/x_dialog.c:577
 msgid "Color:"
 msgstr "Colour:"
 
-#: ../src/x_dialog.c:584
+#: src/x_dialog.c:584
 msgid "Size:"
 msgstr "Size:"
 
-#: ../src/x_dialog.c:593
+#: src/x_dialog.c:593
 msgid "Alignment:"
 msgstr "Alignment:"
 
-#: ../src/x_dialog.c:647
+#: src/x_dialog.c:647
 msgid "Solid"
 msgstr "Solid"
 
-#: ../src/x_dialog.c:648
+#: src/x_dialog.c:648
 msgid "Dotted"
 msgstr "Dotted"
 
-#: ../src/x_dialog.c:649
+#: src/x_dialog.c:649
 msgid "Dashed"
 msgstr "Dashed"
 
-#: ../src/x_dialog.c:650
+#: src/x_dialog.c:650
 msgid "Center"
 msgstr "Center"
 
-#: ../src/x_dialog.c:651
+#: src/x_dialog.c:651
 msgid "Phantom"
 msgstr "Phantom"
 
-#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
-#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
-#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
-#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
-#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
-#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
+#: src/x_dialog.c:652 src/x_dialog.c:749 src/x_dialog.c:758 src/x_dialog.c:767
+#: src/x_dialog.c:868 src/x_dialog.c:870 src/x_dialog.c:872
+#: src/x_dialog.c:1100 src/x_dialog.c:1203 src/x_dialog.c:1212
+#: src/x_dialog.c:1221 src/x_dialog.c:1230 src/x_dialog.c:1239
+#: src/x_dialog.c:1352 src/x_dialog.c:1354 src/x_dialog.c:1356
+#: src/x_dialog.c:1358 src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*unchanged*"
 
-#: ../src/x_dialog.c:978
+#: src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Edit Line Width & Type"
 
-#: ../src/x_dialog.c:1017 ../src/x_print.c:307
+#: src/x_dialog.c:1017 src/x_print.c:307
 msgid "Type:"
 msgstr "Type:"
 
-#: ../src/x_dialog.c:1021
+#: src/x_dialog.c:1021
 msgid "Width:"
 msgstr "Width:"
 
-#: ../src/x_dialog.c:1025
+#: src/x_dialog.c:1025
 msgid "Dash Length:"
 msgstr "Dash Length:"
 
-#: ../src/x_dialog.c:1029
+#: src/x_dialog.c:1029
 msgid "Dash Space:"
 msgstr "Dash Space:"
 
-#: ../src/x_dialog.c:1096
+#: src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Hollow"
 
-#: ../src/x_dialog.c:1097
+#: src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Filled"
 
-#: ../src/x_dialog.c:1098
+#: src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "Mesh"
 
-#: ../src/x_dialog.c:1099
+#: src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "Hatch"
 
-#: ../src/x_dialog.c:1470
+#: src/x_dialog.c:1470
 msgid "Edit Fill Type"
 msgstr "Edit Fill Type"
 
-#: ../src/x_dialog.c:1508
+#: src/x_dialog.c:1508
 msgid "Fill Type:"
 msgstr "Fill Type:"
 
-#: ../src/x_dialog.c:1512
+#: src/x_dialog.c:1512
 msgid "Line Width:"
 msgstr "Line Width:"
 
-#: ../src/x_dialog.c:1516
+#: src/x_dialog.c:1516
 msgid "Angle 1:"
 msgstr "Angle 1:"
 
-#: ../src/x_dialog.c:1520
+#: src/x_dialog.c:1520
 msgid "Pitch 1:"
 msgstr "Pitch 1:"
 
-#: ../src/x_dialog.c:1524
+#: src/x_dialog.c:1524
 msgid "Angle 2:"
 msgstr "Angle 2:"
 
-#: ../src/x_dialog.c:1528
+#: src/x_dialog.c:1528
 msgid "Pitch 2:"
 msgstr "Pitch 2:"
 
-#: ../src/x_dialog.c:1657
+#: src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "Arc Params"
 
-#: ../src/x_dialog.c:1697
+#: src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr "Arc Radius:"
 
-#: ../src/x_dialog.c:1705
+#: src/x_dialog.c:1705
 msgid "Start Angle:"
 msgstr "Start Angle:"
 
-#: ../src/x_dialog.c:1713
+#: src/x_dialog.c:1713
 msgid "Degrees of Sweep:"
 msgstr "Degrees of Sweep:"
 
-#: ../src/x_dialog.c:1830
+#: src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1750,44 +1731,44 @@ msgstr ""
 "Offset to translate?\n"
 "(0 for origin)"
 
-#: ../src/x_dialog.c:1898
+#: src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "Text Size"
 
-#: ../src/x_dialog.c:1928
+#: src/x_dialog.c:1928
 msgid "Enter new text size:"
 msgstr "Enter new text size:"
 
-#: ../src/x_dialog.c:2004
+#: src/x_dialog.c:2004
 msgid "Snap Size"
 msgstr "Snap Size"
 
-#: ../src/x_dialog.c:2034
+#: src/x_dialog.c:2034
 msgid "Enter new snap grid spacing:"
 msgstr "Enter new snap grid spacing:"
 
-#: ../src/x_dialog.c:2107
+#: src/x_dialog.c:2110
 msgid "Edit slot number"
 msgstr "Edit slot number"
 
-#: ../src/x_dialog.c:2138
+#: src/x_dialog.c:2141
 msgid "Edit slot number:"
 msgstr "Edit slot number:"
 
-#: ../src/x_dialog.c:2200
+#: src/x_dialog.c:2202
 msgid "About..."
 msgstr "About..."
 
-#: ../src/x_dialog.c:2220
+#: src/x_dialog.c:2222
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA: GPL Electronic Design Automation</b>"
 
-#: ../src/x_dialog.c:2224
+#: src/x_dialog.c:2226
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>gschem version %s%s.%s</b>"
 
-#: ../src/x_dialog.c:2232
+#: src/x_dialog.c:2234
 msgid ""
 "Written by:\n"
 "Ales Hvezda\n"
@@ -1799,153 +1780,152 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "And many others (See AUTHORS file)"
 
-#: ../src/x_dialog.c:2295
+#: src/x_dialog.c:2297
 msgid "Coords"
 msgstr "Coords"
 
-#: ../src/x_dialog.c:2316
+#: src/x_dialog.c:2318
 msgid "Screen"
 msgstr "Screen"
 
-#: ../src/x_dialog.c:2325
+#: src/x_dialog.c:2327
 msgid "World"
 msgstr "World"
 
-#: ../src/x_dialog.c:2364
+#: src/x_dialog.c:2366
 msgid "Background"
 msgstr "Background"
 
-#: ../src/x_dialog.c:2370
+#: src/x_dialog.c:2372
 msgid "Net endpoint"
 msgstr "Net endpoint"
 
-#: ../src/x_dialog.c:2373
+#: src/x_dialog.c:2375
 msgid "Graphic"
 msgstr "Graphic"
 
-#: ../src/x_dialog.c:2382
+#: src/x_dialog.c:2384
 msgid "Logic bubble"
 msgstr "Logic bubble"
 
-#: ../src/x_dialog.c:2385
+#: src/x_dialog.c:2387
 msgid "Grid point"
 msgstr "Grid point"
 
-#: ../src/x_dialog.c:2388
+#: src/x_dialog.c:2390
 msgid "Detached attribute"
 msgstr "Detached attribute"
 
-#: ../src/x_dialog.c:2391 ../src/x_window.c:382
+#: src/x_dialog.c:2393 src/x_window.c:382
 msgid "Text"
 msgstr "Text"
 
-#: ../src/x_dialog.c:2397
+#: src/x_dialog.c:2399
 msgid "Selection"
 msgstr "Selection"
 
-#: ../src/x_dialog.c:2400
+#: src/x_dialog.c:2402
 msgid "Bounding box"
 msgstr "Bounding box"
 
-#: ../src/x_dialog.c:2403
+#: src/x_dialog.c:2405
 msgid "Zoom box"
 msgstr "Zoom box"
 
-#: ../src/x_dialog.c:2412
+#: src/x_dialog.c:2414
 msgid "Output background"
 msgstr "Output background"
 
-#: ../src/x_dialog.c:2415
+#: src/x_dialog.c:2417
 msgid "Net junction"
 msgstr "Net junction"
 
-#: ../src/x_dialog.c:2418
+#: src/x_dialog.c:2420
 msgid "Mesh grid major"
 msgstr "Mesh grid major"
 
-#: ../src/x_dialog.c:2421
+#: src/x_dialog.c:2423
 msgid "Mesh grid minor"
 msgstr "Mesh grid minor"
 
-#: ../src/x_dialog.c:2424
+#: src/x_dialog.c:2426
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../src/x_dialog.c:2570
+#: src/x_dialog.c:2572
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr "ERROR: NULL object in color_edit_dialog_apply!\n"
 
-#: ../src/x_dialog.c:2633
+#: src/x_dialog.c:2635
 msgid "Color Edit"
 msgstr "Colour Edit"
 
-#: ../src/x_dialog.c:2664
+#: src/x_dialog.c:2666
 msgid "Object color:"
 msgstr "Object colour:"
 
-#: ../src/x_dialog.c:2786
+#: src/x_dialog.c:2788
 msgid "Function"
 msgstr "Function"
 
-#: ../src/x_dialog.c:2793
+#: src/x_dialog.c:2795
 msgid "Keystroke(s)"
 msgstr "Keystroke(s)"
 
-#: ../src/x_dialog.c:3102
+#: src/x_dialog.c:3104
 msgid "Find Text"
 msgstr "Find Text"
 
-#: ../src/x_dialog.c:3133
+#: src/x_dialog.c:3135
 msgid "Text to find:"
 msgstr "Text to find:"
 
-#: ../src/x_dialog.c:3143
+#: src/x_dialog.c:3145
 msgid "descend into hierarchy"
 msgstr "descend into hierarchy"
 
-#: ../src/x_dialog.c:3208
+#: src/x_dialog.c:3210
 msgid "Hide Text"
 msgstr "Hide Text"
 
-#: ../src/x_dialog.c:3239
+#: src/x_dialog.c:3241
 msgid "Hide text starting with:"
 msgstr "Hide text starting with:"
 
-#: ../src/x_dialog.c:3308
+#: src/x_dialog.c:3310
 msgid "Show Text"
 msgstr "Show Text"
 
-#: ../src/x_dialog.c:3339
+#: src/x_dialog.c:3341
 msgid "Show text starting with:"
 msgstr "Show text starting with:"
 
-#: ../src/x_dialog.c:3796
+#: src/x_dialog.c:3798
 msgid "S_elect the schematics you want to save:"
 msgstr "S_elect the schematics you want to save:"
 
-#: ../src/x_dialog.c:3890
+#: src/x_dialog.c:3892
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr "Save the changes to schematic \"%s\" before closing?"
 
-#: ../src/x_dialog.c:3896
+#: src/x_dialog.c:3898
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
 msgstr ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
 
-#. secondary label
-#: ../src/x_dialog.c:3925
+#: src/x_dialog.c:3927
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr "If you don't save, all your changes will be permanently lost."
 
-#: ../src/x_dialog.c:3945
+#: src/x_dialog.c:3947
 msgid "_Close without saving"
 msgstr "_Close without saving"
 
-#: ../src/x_dialog.c:4279
+#: src/x_dialog.c:4283
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1962,49 +1942,49 @@ msgstr ""
 "The name cannot end with a space.\n"
 "The value cannot start with a space."
 
-#: ../src/x_dialog.c:4281
+#: src/x_dialog.c:4285
 msgid "Invalid Attribute"
 msgstr "Invalid Attribute"
 
-#: ../src/x_dialog.c:4317
+#: src/x_dialog.c:4321
 #, fuzzy
 msgid "Pin type"
 msgstr "Pin Mode"
 
-#: ../src/x_dialog.c:4341
+#: src/x_dialog.c:4345
 #, fuzzy
 msgid "Net pin"
 msgstr "Net endpoint"
 
-#: ../src/x_dialog.c:4343
+#: src/x_dialog.c:4347
 msgid "Bus pin (graphical)"
 msgstr ""
 
-#: ../src/x_fileselect.c:42
+#: src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "Schematics"
 
-#: ../src/x_fileselect.c:47
+#: src/x_fileselect.c:47
 msgid "Symbols"
 msgstr "Symbols"
 
-#: ../src/x_fileselect.c:52
+#: src/x_fileselect.c:52
 msgid "Schematics and symbols"
 msgstr "Schematics and symbols"
 
-#: ../src/x_fileselect.c:58
+#: src/x_fileselect.c:58
 msgid "All files"
 msgstr "All files"
 
-#: ../src/x_fileselect.c:171
+#: src/x_fileselect.c:171
 msgid "Open..."
 msgstr "Open..."
 
-#: ../src/x_fileselect.c:231
+#: src/x_fileselect.c:231
 msgid "Save as..."
 msgstr "Save as..."
 
-#: ../src/x_fileselect.c:284
+#: src/x_fileselect.c:284
 #, c-format
 msgid ""
 "The selected file `%s' already exists.\n"
@@ -2015,30 +1995,29 @@ msgstr ""
 "\n"
 "Would you like to overwrite it?"
 
-#: ../src/x_fileselect.c:287
+#: src/x_fileselect.c:287
 msgid "Overwrite file?"
 msgstr "Overwrite file?"
 
-#: ../src/x_fileselect.c:289
+#: src/x_fileselect.c:289
 msgid "Save cancelled on user request\n"
 msgstr "Save cancelled on user request\n"
 
-#. WK - catch EPS export case
-#: ../src/x_image.c:176
+#: src/x_image.c:176
 msgid "Encapsulated Postscript"
 msgstr "Encapsulated Postscript"
 
-#: ../src/x_image.c:296
+#: src/x_image.c:296
 #, c-format
 msgid "x_image_lowlevel: Unable to write eps file %s.\n"
 msgstr "x_image_lowlevel: Unable to write eps file %s.\n"
 
-#: ../src/x_image.c:374
+#: src/x_image.c:374
 #, c-format
 msgid "x_image_lowlevel: Unable to write %s file %s.\n"
 msgstr "x_image_lowlevel: Unable to write %s file %s.\n"
 
-#: ../src/x_image.c:384
+#: src/x_image.c:384
 #, c-format
 msgid ""
 "There was the following error when saving image with type %s to filename:\n"
@@ -2051,258 +2030,258 @@ msgstr ""
 "\n"
 "%s.\n"
 
-#: ../src/x_image.c:403
+#: src/x_image.c:403
 #, c-format
 msgid "Wrote color image to [%s] [%d x %d]\n"
 msgstr "Wrote colour image to [%s] [%d x %d]\n"
 
-#: ../src/x_image.c:405
+#: src/x_image.c:405
 #, c-format
 msgid "Wrote black and white image to [%s] [%d x %d]\n"
 msgstr "Wrote black and white image to [%s] [%d x %d]\n"
 
-#: ../src/x_image.c:413
+#: src/x_image.c:413
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 msgstr "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 
-#: ../src/x_image.c:458
+#: src/x_image.c:458
 msgid "Width x Height"
 msgstr "Width x Height"
 
-#: ../src/x_image.c:474
+#: src/x_image.c:474
 msgid "Image type"
 msgstr "Image type"
 
-#: ../src/x_log.c:188
+#: src/x_log.c:188
 msgid "** Invalid UTF-8 in log message. See stderr or gschem.log.\n"
 msgstr "** Invalid UTF-8 in log message. See stderr or gschem.log.\n"
 
-#: ../src/x_log.c:256
+#: src/x_log.c:256
 msgid "Status"
 msgstr "Status"
 
-#: ../src/x_menus.c:36
+#: src/x_menus.c:36
 msgid "/Add Net"
 msgstr "/Add Net"
 
-#: ../src/x_menus.c:37
+#: src/x_menus.c:37
 msgid "/Add Attribute..."
 msgstr "/Add Attribute..."
 
-#: ../src/x_menus.c:38
+#: src/x_menus.c:38
 msgid "/Add Component..."
 msgstr "/Add Component..."
 
-#: ../src/x_menus.c:39
+#: src/x_menus.c:39
 msgid "/Add Bus"
 msgstr "/Add Bus"
 
-#: ../src/x_menus.c:40
+#: src/x_menus.c:40
 msgid "/Add Text"
 msgstr "/Add Text"
 
-#: ../src/x_menus.c:42
+#: src/x_menus.c:42
 msgid "/Zoom In"
 msgstr "/Zoom In"
 
-#: ../src/x_menus.c:43
+#: src/x_menus.c:43
 msgid "/Zoom Out"
 msgstr "/Zoom Out"
 
-#: ../src/x_menus.c:44
+#: src/x_menus.c:44
 msgid "/Zoom Box"
 msgstr "/Zoom Box"
 
-#: ../src/x_menus.c:45
+#: src/x_menus.c:45
 msgid "/Zoom Extents"
 msgstr "/Zoom Extents"
 
-#: ../src/x_menus.c:47
+#: src/x_menus.c:47
 msgid "/Select"
 msgstr "/Select"
 
-#: ../src/x_menus.c:48
+#: src/x_menus.c:48
 msgid "/Edit..."
 msgstr "/Edit..."
 
-#: ../src/x_menus.c:49
+#: src/x_menus.c:49
 #, fuzzy
 msgid "/Edit pin type..."
 msgstr "Edit Line Type"
 
-#: ../src/x_menus.c:50
+#: src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Copy"
 
-#: ../src/x_menus.c:51
+#: src/x_menus.c:51
 msgid "/Move"
 msgstr "/Move"
 
-#: ../src/x_menus.c:52
+#: src/x_menus.c:52
 msgid "/Delete"
 msgstr "/Delete"
 
-#: ../src/x_menus.c:55
+#: src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/Down Schematic"
 
-#: ../src/x_menus.c:56
+#: src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/Down Symbol"
 
-#: ../src/x_menus.c:57
+#: src/x_menus.c:57
 msgid "/Up"
 msgstr "/Up"
 
-#: ../src/x_menus.c:316
+#: src/x_menus.c:319
 #, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr "Tried to set the sensitivity on non-existent menu item '%s'\n"
 
-#: ../src/x_menus.c:340
+#: src/x_menus.c:343
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "Popup_menu_item_factory doesn't exist!\n"
 
-#: ../src/x_menus.c:353
+#: src/x_menus.c:356
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr "Tried to set the sensitivity on a non-existent popup menu_item\n"
 
-#. Remove this entry from all menus
-#: ../src/x_menus.c:462
+#: src/x_menus.c:436
 #, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Couldn't open file %s\n"
 
-#: ../src/x_menus.c:524
+#: src/x_menus.c:493
 msgid "Clear"
 msgstr "Clear"
 
-#: ../src/x_multiattrib.c:861
+#: src/x_multiattrib.c:913
 msgid "Attributes with empty name are not allowed. Please set a name."
 msgstr "Attributes with empty name are not allowed. Please set a name."
 
-#: ../src/x_multiattrib.c:1371
+#: src/x_multiattrib.c:1461
 msgid "Show Value only"
 msgstr "Show Value only"
 
-#: ../src/x_multiattrib.c:1373
+#: src/x_multiattrib.c:1463
 msgid "Show Name only"
 msgstr "Show Name only"
 
-#: ../src/x_multiattrib.c:1400
+#: src/x_multiattrib.c:1491
+msgid "Promote"
+msgstr ""
+
+#: src/x_multiattrib.c:1495
 msgid "Duplicate"
 msgstr "Duplicate"
 
-#: ../src/x_multiattrib.c:1528
+#: src/x_multiattrib.c:1713
 msgid "Edit Attributes"
 msgstr "Edit Attributes"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1648
+#: src/x_multiattrib.c:1831
 msgid "Vis?"
 msgstr "Vis?"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1668
+#: src/x_multiattrib.c:1849
 msgid "N"
 msgstr "N"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1688
+#: src/x_multiattrib.c:1867
 msgid "V"
 msgstr "V"
 
-#: ../src/x_multiattrib.c:1709
+#: src/x_multiattrib.c:1889
+#, fuzzy
+msgid "Show inherited attributes"
+msgstr "Detached attribute"
+
+#: src/x_multiattrib.c:1905
 msgid "Add Attribute"
 msgstr "Add Attribute"
 
-#: ../src/x_pagesel.c:257
+#: src/x_pagesel.c:257
 msgid "Discard Page"
 msgstr "Discard Page"
 
-#: ../src/x_pagesel.c:376
+#: src/x_pagesel.c:376
 msgid "Page Manager"
 msgstr "Page Manager"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:432
+#: src/x_pagesel.c:432
 msgid "Filename"
 msgstr "Filename"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:448
+#: src/x_pagesel.c:448
 msgid "Changed"
 msgstr "Changed"
 
-#. GtkLabel
-#: ../src/x_pagesel.c:468
+#: src/x_pagesel.c:468
 msgid "Right click on the filename for more options..."
 msgstr "Right click on the filename for more options..."
 
-#: ../src/x_preview.c:223
+#: src/x_preview.c:223
 msgid "Preview Buffer"
 msgstr "Preview Buffer"
 
-#: ../src/x_print.c:84
+#: src/x_print.c:84
 msgid "Select PostScript Filename..."
 msgstr "Select PostScript Filename..."
 
-#: ../src/x_print.c:164
+#: src/x_print.c:164
 msgid "Extents with margins"
 msgstr "Extents with margins"
 
-#: ../src/x_print.c:170
+#: src/x_print.c:170
 msgid "Extents no margins"
 msgstr "Extents no margins"
 
-#: ../src/x_print.c:176
+#: src/x_print.c:176
 msgid "Current Window"
 msgstr "Current Window"
 
-#: ../src/x_print.c:210
+#: src/x_print.c:210
 msgid "Landscape"
 msgstr "Landscape"
 
-#: ../src/x_print.c:216
+#: src/x_print.c:216
 msgid "Portrait"
 msgstr "Portrait"
 
-#. Upper frame
-#: ../src/x_print.c:284
+#: src/x_print.c:284
 msgid "Settings"
 msgstr "Settings"
 
-#: ../src/x_print.c:296
+#: src/x_print.c:296
 msgid "Output paper size:"
 msgstr "Output paper size:"
 
-#: ../src/x_print.c:318
+#: src/x_print.c:318
 msgid "Orientation:"
 msgstr "Orientation:"
 
-#. Lower frame
-#: ../src/x_print.c:330
+#: src/x_print.c:330
 msgid "Destination"
 msgstr "Destination"
 
-#: ../src/x_print.c:343
+#: src/x_print.c:343
 msgid "File:"
 msgstr "File:"
 
-#: ../src/x_print.c:373
+#: src/x_print.c:373
 msgid "Command:"
 msgstr "Command:"
 
-#: ../src/x_print.c:741
+#: src/x_print.c:741
 msgid "No print destination specified\n"
 msgstr "No print destination specified\n"
 
-#: ../src/x_print.c:748
+#: src/x_print.c:748
 #, c-format
 msgid "Cannot print current schematic to [%s]\n"
 msgstr "Cannot print current schematic to [%s]\n"
 
-#: ../src/x_print.c:757
+#: src/x_print.c:757
 #, c-format
 msgid ""
 "Error printing to file '%s'\n"
@@ -2311,45 +2290,45 @@ msgstr ""
 "Error printing to file '%s'\n"
 "Check the log window for more information"
 
-#: ../src/x_print.c:764
+#: src/x_print.c:764
 #, c-format
 msgid "Printed current schematic to [%s]\n"
 msgstr "Printed current schematic to [%s]\n"
 
-#: ../src/x_window.c:81
+#: src/x_window.c:81
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr "Couldn't allocate gc\n"
 
-#: ../src/x_window.c:317
+#: src/x_window.c:317
 msgid "New file"
 msgstr "New file"
 
-#: ../src/x_window.c:323
+#: src/x_window.c:323
 msgid "Open"
 msgstr "Open"
 
-#: ../src/x_window.c:324
+#: src/x_window.c:324
 msgid "Open file..."
 msgstr "Open file..."
 
-#: ../src/x_window.c:330
+#: src/x_window.c:330
 msgid "Save"
 msgstr "Save"
 
-#: ../src/x_window.c:331
+#: src/x_window.c:331
 msgid "Save file"
 msgstr "Save file"
 
-#: ../src/x_window.c:339
+#: src/x_window.c:339
 msgid "Undo last operation"
 msgstr "Undo last operation"
 
-#: ../src/x_window.c:346
+#: src/x_window.c:346
 msgid "Redo last undo"
 msgstr "Redo last undo"
 
-#: ../src/x_window.c:355
+#: src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2361,7 +2340,7 @@ msgstr ""
 "click to place\n"
 "Right mouse button to cancel"
 
-#: ../src/x_window.c:365
+#: src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2369,7 +2348,7 @@ msgstr ""
 "Add nets mode\n"
 "Right mouse button to cancel"
 
-#: ../src/x_window.c:375
+#: src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2377,90 +2356,89 @@ msgstr ""
 "Add buses mode\n"
 "Right mouse button to cancel"
 
-#: ../src/x_window.c:383
+#: src/x_window.c:383
 msgid "Add Text..."
 msgstr "Add Text..."
 
-#: ../src/x_window.c:393
+#: src/x_window.c:393
 msgid "Select"
 msgstr "Select"
 
-#: ../src/x_window.c:394
+#: src/x_window.c:394
 msgid "Select mode"
 msgstr "Select mode"
 
-#: ../src/x_window.c:481
+#: src/x_window.c:481
 msgid "Pick"
 msgstr "Pick"
 
-#: ../src/x_window.c:497
+#: src/x_window.c:497
 msgid "Repeat/none"
 msgstr "Repeat/none"
 
-#: ../src/x_window.c:507
+#: src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "Menu/Cancel"
 
-#: ../src/x_window.c:509
+#: src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "Pan/Cancel"
 
-#: ../src/x_window.c:733
+#: src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Loading schematic [%s]\n"
 
-#: ../src/x_window.c:745
+#: src/x_window.c:745
 msgid "Failed to load file"
 msgstr "Failed to load file"
 
-#: ../src/x_window.c:754
+#: src/x_window.c:754
 #, c-format
 msgid "New file [%s]\n"
 msgstr "New file [%s]\n"
 
-#. an error occured when saving page to file
-#: ../src/x_window.c:859
+#: src/x_window.c:859
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Could NOT save page [%s]\n"
 
-#: ../src/x_window.c:860
+#: src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Error while trying to save"
 
-#: ../src/x_window.c:869
+#: src/x_window.c:869
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "Saved as [%s]\n"
 
-#: ../src/x_window.c:871
+#: src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Saved [%s]\n"
 
-#: ../src/x_window.c:873
+#: src/x_window.c:873
 msgid "Saved"
 msgstr "Saved"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Discarding page [%s]\n"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Closing [%s]\n"
 
-#: ../data/geda-gschem.desktop.in.h:1
-msgid "Create and edit electrical schematics and symbols with gschem"
-msgstr "Create and edit electrical schematics and symbols with gschem"
-
-#: ../data/geda-gschem.desktop.in.h:2
+#: data/geda-gschem.desktop.in.h:3
 msgid "gEDA Schematic Editor"
 msgstr "gEDA Schematic Editor"
 
+#: data/geda-gschem.desktop.in.h:4
+msgid "Create and edit electrical schematics and symbols with gschem"
+msgstr "Create and edit electrical schematics and symbols with gschem"
+
 #~ msgid "Cut Buffer"
 #~ msgstr "Cut Buffer"
 
diff --git a/gschem/po/es.po b/gschem/po/es.po
index b2ca73d..cf4d5c4 100644
--- a/gschem/po/es.po
+++ b/gschem/po/es.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gschem VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 14:35-0400\n"
+"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
+"POT-Creation-Date: 2009-06-18 11:53+0100\n"
 "PO-Revision-Date: 2008-12-21 21:20+0100\n"
 "Last-Translator: Carlos Nieves Ã?nega <cnieves@xxxxxxxxxx>\n"
 "Language-Team: Spanish/SpainMIME-Version: 1.0\n"
@@ -16,634 +16,624 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);X-Generator: KBabel 1.0.2\n"
 
-#: ../src/rcstrings.c:2
+#: src/rcstrings.c:2
 msgid "File"
 msgstr "Archivo"
 
-#: ../src/rcstrings.c:3
+#: src/rcstrings.c:3
 msgid "New Window"
 msgstr "Nueva ventana"
 
-#: ../src/rcstrings.c:4 ../src/x_pagesel.c:252
+#: src/rcstrings.c:4 src/x_pagesel.c:252
 msgid "New Page"
 msgstr "Nueva página"
 
-#: ../src/rcstrings.c:5 ../src/x_pagesel.c:253
+#: src/rcstrings.c:5 src/x_pagesel.c:253
 msgid "Open Page..."
 msgstr "Abrir página"
 
-#: ../src/rcstrings.c:6 ../src/x_pagesel.c:256
+#: src/rcstrings.c:6 src/x_pagesel.c:256
 msgid "Close Page"
 msgstr "Cerrar página"
 
-#: ../src/rcstrings.c:7
+#: src/rcstrings.c:7
 msgid "Revert Page"
 msgstr "Recargar página"
 
-#: ../src/rcstrings.c:8 ../src/x_pagesel.c:255
+#: src/rcstrings.c:8 src/x_pagesel.c:255
 msgid "Save Page"
 msgstr "Guardar página"
 
-#: ../src/rcstrings.c:9
+#: src/rcstrings.c:9
 msgid "Save Page As..."
 msgstr "Guardar página como..."
 
-#: ../src/rcstrings.c:10
+#: src/rcstrings.c:10
 msgid "Save All"
 msgstr "Guardar todo"
 
-#. GtkWindow
-#: ../src/rcstrings.c:11 ../src/x_print.c:276
+#: src/rcstrings.c:11 src/x_print.c:276
 msgid "Print..."
 msgstr "Imprimir..."
 
-#. Create the dialog
-#: ../src/rcstrings.c:12 ../src/x_image.c:495
+#: src/rcstrings.c:12 src/x_image.c:495
 msgid "Write image..."
 msgstr "Guardar imagen..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:501
+#: src/rcstrings.c:13
 msgid "Recent files"
 msgstr "Archivos recientes"
 
-#: ../src/rcstrings.c:14 ../src/x_script.c:47
+#: src/rcstrings.c:14 src/x_script.c:47
 msgid "Execute Script..."
 msgstr "Ejecutar subprograma..."
 
-#: ../src/rcstrings.c:15
+#: src/rcstrings.c:15
 msgid "Close Window"
 msgstr "Cerrar ventana"
 
-#: ../src/rcstrings.c:16
+#: src/rcstrings.c:16
 msgid "Quit"
 msgstr "Salir"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
+#: src/rcstrings.c:18 src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Editar"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:338
+#: src/rcstrings.c:19 src/x_window.c:338
 msgid "Undo"
 msgstr "Deshacer"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:345
+#: src/rcstrings.c:20 src/x_window.c:345
 msgid "Redo"
 msgstr "Rehacer"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
+#: src/rcstrings.c:21 src/i_basic.c:77 src/x_window.c:521
 msgid "Select Mode"
 msgstr "Seleccionar"
 
-#: ../src/rcstrings.c:22
+#: src/rcstrings.c:22
 #, fuzzy
 msgid "Cut"
 msgstr "Cortar 1"
 
-#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
-#: ../src/i_callbacks.c:560
+#: src/rcstrings.c:23 src/i_basic.c:135 src/i_callbacks.c:536
+#: src/i_callbacks.c:560
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../src/rcstrings.c:24
+#: src/rcstrings.c:24
 #, fuzzy
 msgid "Paste"
 msgstr "Pegar 1"
 
-#: ../src/rcstrings.c:25
+#: src/rcstrings.c:25
 msgid "Edit..."
 msgstr "Editar..."
 
-#: ../src/rcstrings.c:26
+#: src/rcstrings.c:26
 msgid "Edit Text..."
 msgstr "Editar texto..."
 
-#: ../src/rcstrings.c:27 ../src/i_basic.c:84
+#: src/rcstrings.c:27 src/i_basic.c:84
 msgid "Copy Mode"
 msgstr "Copiar"
 
-#: ../src/rcstrings.c:28 ../src/i_basic.c:142
+#: src/rcstrings.c:28 src/i_basic.c:142
 msgid "Multiple Copy Mode"
 msgstr "Modo de copia múltiple"
 
-#: ../src/rcstrings.c:29 ../src/i_basic.c:87
+#: src/rcstrings.c:29 src/i_basic.c:87
 msgid "Move Mode"
 msgstr "Mover"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
+#: src/rcstrings.c:30 src/i_callbacks.c:670 src/x_multiattrib.c:1496
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../src/rcstrings.c:31
+#: src/rcstrings.c:31
 msgid "Rotate 90 Mode"
 msgstr "Rotar 90º"
 
-#: ../src/rcstrings.c:32 ../src/i_basic.c:91
+#: src/rcstrings.c:32 src/i_basic.c:91
 msgid "Mirror Mode"
 msgstr "Voltear"
 
-#: ../src/rcstrings.c:33
+#: src/rcstrings.c:33
 msgid "Slot..."
 msgstr "Elemento..."
 
-#: ../src/rcstrings.c:34
+#: src/rcstrings.c:34
 msgid "Color..."
 msgstr "Color..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
+#: src/rcstrings.c:35 src/i_callbacks.c:920 src/x_dialog.c:2411
 msgid "Lock"
 msgstr "Fijar"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
+#: src/rcstrings.c:36 src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "Desfijar"
 
-#: ../src/rcstrings.c:37
+#: src/rcstrings.c:37
 msgid "Line Width & Type..."
 msgstr "Anchura y tipo de línea"
 
-#: ../src/rcstrings.c:38
+#: src/rcstrings.c:38
 msgid "Fill Type..."
 msgstr "Tipo de relleno"
 
-#: ../src/rcstrings.c:39
+#: src/rcstrings.c:39
 msgid "Symbol Translate..."
 msgstr "Mover símbolo..."
 
-#: ../src/rcstrings.c:40
+#: src/rcstrings.c:40
 msgid "Embed Component/Picture"
 msgstr "Incrustar componente/imagen"
 
-#: ../src/rcstrings.c:41
+#: src/rcstrings.c:41
 msgid "Unembed Component/Picture"
 msgstr "Desincrustar componente/imagen"
 
-#: ../src/rcstrings.c:42
+#: src/rcstrings.c:42
 msgid "Update Component"
 msgstr "Actualizar componente"
 
-#: ../src/rcstrings.c:43
+#: src/rcstrings.c:43
 msgid "Show/Hide Inv Text"
 msgstr "Mostrar/Ocultar texto oculto"
 
-#: ../src/rcstrings.c:44
+#: src/rcstrings.c:44
 msgid "Make Inv Text Vis"
 msgstr "Hacer visible el texto oculto"
 
-#: ../src/rcstrings.c:46
+#: src/rcstrings.c:46
 msgid "Buffer"
 msgstr "Memoria intermedia"
 
-#: ../src/rcstrings.c:47
+#: src/rcstrings.c:47
 msgid "Copy into 1"
 msgstr "Copiar en memoria intermedia 1"
 
-#: ../src/rcstrings.c:48
+#: src/rcstrings.c:48
 msgid "Copy into 2"
 msgstr "Copiar en memoria intermedia 2"
 
-#: ../src/rcstrings.c:49
+#: src/rcstrings.c:49
 msgid "Copy into 3"
 msgstr "Copiar en memoria intermedia 3"
 
-#: ../src/rcstrings.c:50
+#: src/rcstrings.c:50
 msgid "Copy into 4"
 msgstr "Copiar en memoria intermedia 4"
 
-#: ../src/rcstrings.c:51
+#: src/rcstrings.c:51
 msgid "Copy into 5"
 msgstr "Copiar en memoria intermedia 5"
 
-#: ../src/rcstrings.c:52
+#: src/rcstrings.c:52
 msgid "Cut into 1"
 msgstr "Cortar en memoria intermedia 1"
 
-#: ../src/rcstrings.c:53
+#: src/rcstrings.c:53
 msgid "Cut into 2"
 msgstr "Cortar en memoria intermedia 2"
 
-#: ../src/rcstrings.c:54
+#: src/rcstrings.c:54
 msgid "Cut into 3"
 msgstr "Cortar en memoria intermedia 3"
 
-#: ../src/rcstrings.c:55
+#: src/rcstrings.c:55
 msgid "Cut into 4"
 msgstr "Cortar en memoria intermedia 4"
 
-#: ../src/rcstrings.c:56
+#: src/rcstrings.c:56
 msgid "Cut into 5"
 msgstr "Cortar en memoria intermedia 5"
 
-#: ../src/rcstrings.c:57
+#: src/rcstrings.c:57
 msgid "Paste from 1"
 msgstr "Pegar memoria intermedia 1"
 
-#: ../src/rcstrings.c:58
+#: src/rcstrings.c:58
 msgid "Paste from 2"
 msgstr "Pegar memoria intermedia 2"
 
-#: ../src/rcstrings.c:59
+#: src/rcstrings.c:59
 msgid "Paste from 3"
 msgstr "Pegar memoria intermedia 3"
 
-#: ../src/rcstrings.c:60
+#: src/rcstrings.c:60
 msgid "Paste from 4"
 msgstr "Pegar memoria intermedia 4"
 
-#: ../src/rcstrings.c:61
+#: src/rcstrings.c:61
 msgid "Paste from 5"
 msgstr "Pegar memoria intermedia 5"
 
-#: ../src/rcstrings.c:63
+#: src/rcstrings.c:63
 msgid "View"
 msgstr "Ver"
 
-#: ../src/rcstrings.c:64
+#: src/rcstrings.c:64
 msgid "Redraw"
 msgstr "Redibujar"
 
-#. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
+#: src/rcstrings.c:65 src/i_callbacks.c:1474 src/i_callbacks.c:1546
 msgid "Pan"
 msgstr "Centrar respecto al cursor"
 
-#: ../src/rcstrings.c:66 ../src/i_basic.c:95
+#: src/rcstrings.c:66 src/i_basic.c:95
 msgid "Zoom Box"
 msgstr "Ampliar"
 
-#: ../src/rcstrings.c:67
+#: src/rcstrings.c:67
 msgid "Zoom Extents"
 msgstr "Mostrar todo"
 
-#: ../src/rcstrings.c:68
+#: src/rcstrings.c:68
 msgid "Zoom In"
 msgstr "Aumentar ampliación"
 
-#: ../src/rcstrings.c:69
+#: src/rcstrings.c:69
 msgid "Zoom Out"
 msgstr "Disminuir ampliación"
 
-#: ../src/rcstrings.c:70
+#: src/rcstrings.c:70
 msgid "Zoom Full"
 msgstr "Vista completa"
 
-#: ../src/rcstrings.c:71
+#: src/rcstrings.c:71
 msgid "Dark color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:72
+#: src/rcstrings.c:72
 msgid "Light color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:74
+#: src/rcstrings.c:74
 msgid "Page"
 msgstr "Página"
 
-#: ../src/rcstrings.c:75
+#: src/rcstrings.c:75
 msgid "Manager..."
 msgstr "Administrador..."
 
-#: ../src/rcstrings.c:76
+#: src/rcstrings.c:76
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../src/rcstrings.c:77
+#: src/rcstrings.c:77
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../src/rcstrings.c:78 ../src/x_window.c:316
+#: src/rcstrings.c:78 src/x_window.c:316
 msgid "New"
 msgstr "Nuevo"
 
-#: ../src/rcstrings.c:79
+#: src/rcstrings.c:79
 msgid "Revert"
 msgstr "Recargar"
 
-#: ../src/rcstrings.c:80
+#: src/rcstrings.c:80
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../src/rcstrings.c:81
+#: src/rcstrings.c:81
 msgid "Discard"
 msgstr "Descartar"
 
-#: ../src/rcstrings.c:83
+#: src/rcstrings.c:83
 msgid "Add"
 msgstr "Añadir"
 
-#: ../src/rcstrings.c:84
+#: src/rcstrings.c:84
 msgid "Component..."
 msgstr "Componente..."
 
-#. need to click
-#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
-#: ../src/x_dialog.c:2376
+#: src/rcstrings.c:85 src/i_callbacks.c:2401 src/i_callbacks.c:2428
+#: src/x_dialog.c:2378
 msgid "Net"
 msgstr "Conexión"
 
-#. need to click
-#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
-#: ../src/x_dialog.c:2394 ../src/x_window.c:374
+#: src/rcstrings.c:86 src/i_callbacks.c:2472 src/i_callbacks.c:2499
+#: src/x_dialog.c:2396 src/x_window.c:374
 msgid "Bus"
 msgstr "Bus"
 
-#: ../src/rcstrings.c:87
+#: src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "Propiedad..."
 
-#: ../src/rcstrings.c:88
+#: src/rcstrings.c:88
 msgid "Text..."
 msgstr "Texto..."
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
+#: src/rcstrings.c:89 src/i_callbacks.c:2580 src/i_callbacks.c:2603
 msgid "Line"
 msgstr "Línea"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
+#: src/rcstrings.c:90 src/i_callbacks.c:2625 src/i_callbacks.c:2648
 msgid "Box"
 msgstr "Rectángulo"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
+#: src/rcstrings.c:91 src/i_callbacks.c:2704 src/i_callbacks.c:2728
 msgid "Circle"
 msgstr "Círculo"
 
-#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
+#: src/rcstrings.c:92 src/i_callbacks.c:2750 src/i_callbacks.c:2773
 msgid "Arc"
 msgstr "Arco"
 
-#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
-#: ../src/x_dialog.c:2367
+#: src/rcstrings.c:93 src/i_callbacks.c:2795 src/i_callbacks.c:2818
+#: src/x_dialog.c:2369
 msgid "Pin"
 msgstr "Pin"
 
-#: ../src/rcstrings.c:94
+#: src/rcstrings.c:94
 msgid "Picture..."
 msgstr "Imagen..."
 
-#: ../src/rcstrings.c:96
+#: src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "Jerarquía"
 
-#: ../src/rcstrings.c:97
+#: src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "Descender en esquema"
 
-#: ../src/rcstrings.c:98
+#: src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "Descender en símbolo"
 
-#: ../src/rcstrings.c:99
+#: src/rcstrings.c:99
 msgid "Up"
 msgstr "Arriba"
 
-#: ../src/rcstrings.c:100
+#: src/rcstrings.c:100
 msgid "Documentation"
 msgstr "Documentación"
 
-#. GtkFrame
-#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
-#: ../src/x_multiattrib.c:1543
+#: src/rcstrings.c:102 src/x_compselect.c:1417
 msgid "Attributes"
 msgstr "Propiedades"
 
-#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
+#: src/rcstrings.c:103 src/i_callbacks.c:3089
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
+#: src/rcstrings.c:104 src/i_callbacks.c:3136
 msgid "Detach"
 msgstr "No adjuntar"
 
-#: ../src/rcstrings.c:105
+#: src/rcstrings.c:105
 msgid "Show Value"
 msgstr "Mostrar valor"
 
-#: ../src/rcstrings.c:106
+#: src/rcstrings.c:106
 msgid "Show Name"
 msgstr "Mostrar nombre"
 
-#: ../src/rcstrings.c:107
+#: src/rcstrings.c:107
 msgid "Show Both"
 msgstr "Mostrar ambos"
 
-#: ../src/rcstrings.c:108
+#: src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "Cambiar visibilidad"
 
-#: ../src/rcstrings.c:109
+#: src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "Encontrar texto específico..."
 
-#: ../src/rcstrings.c:110
+#: src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "Ocultar texto específico..."
 
-#: ../src/rcstrings.c:111
+#: src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "Mostrar texto específico..."
 
-#: ../src/rcstrings.c:112
+#: src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr "Autonumerar texto..."
 
-#: ../src/rcstrings.c:114
+#: src/rcstrings.c:114
 msgid "Options"
 msgstr "Opciones"
 
-#: ../src/rcstrings.c:115
+#: src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "Tamaño de texto..."
 
-#: ../src/rcstrings.c:116
+#: src/rcstrings.c:116
 msgid "Cycle grid styles"
 msgstr ""
 
-#: ../src/rcstrings.c:117
+#: src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr "Act/Desact ajuste a la rejilla"
 
-#: ../src/rcstrings.c:118
+#: src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "Espaciado de la rejilla..."
 
-#: ../src/rcstrings.c:119
+#: src/rcstrings.c:119
 msgid "Scale up Grid Spacing"
 msgstr "Aumentar espaciado de la rejilla..."
 
-#: ../src/rcstrings.c:120
+#: src/rcstrings.c:120
 msgid "Scale down Grid Spacing"
 msgstr "Disminuir espaciado de la rejilla..."
 
-#: ../src/rcstrings.c:121
+#: src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr "Cambiar Silueta/Rectángulo"
 
-#: ../src/rcstrings.c:122
+#: src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr "Act/Desact conservar conexiones"
 
-#: ../src/rcstrings.c:123
+#: src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "Mostrar ventana de registro..."
 
-#: ../src/rcstrings.c:124
+#: src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "Mostrar ventana de coordenadas..."
 
-#: ../src/rcstrings.c:126
+#: src/rcstrings.c:126
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../src/rcstrings.c:127
+#: src/rcstrings.c:127
 msgid "Manual"
 msgstr "Manual"
 
-#: ../src/rcstrings.c:128
+#: src/rcstrings.c:128
 msgid "gEDA Documentation"
 msgstr "Documentación de gEDA"
 
-#: ../src/rcstrings.c:129
+#: src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr "PUF de gschem"
 
-#: ../src/rcstrings.c:130
+#: src/rcstrings.c:130
 msgid "Component Documentation"
 msgstr "Documentación del componente"
 
-#: ../src/rcstrings.c:131
+#: src/rcstrings.c:131
 msgid "About gschem"
 msgstr "Acerca de gschem"
 
-#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
+#: src/rcstrings.c:132 src/x_dialog.c:2724
 msgid "Hotkeys"
 msgstr "Teclas rápidas"
 
-#: ../src/a_zoom.c:212
+#: src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "¡Vista demasiado ampliada! No se puede ampliar más.\n"
 
-#. Fork failed. Still in parent process, so can use the log
-#. * window
-#: ../src/g_funcs.c:339 ../src/i_callbacks.c:68
+#: src/g_funcs.c:339 src/i_callbacks.c:68
 #, c-format
 msgid "Could not fork\n"
 msgstr "No se ha podido crear un proceso hijo\n"
 
-#. if we return, then nothing happened
-#: ../src/g_funcs.c:355 ../src/i_callbacks.c:78
+#: src/g_funcs.c:355 src/i_callbacks.c:78
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr "No se ha podido llamar a %s\n"
 
-#: ../src/g_funcs.c:361 ../src/i_callbacks.c:82
+#: src/g_funcs.c:361 src/i_callbacks.c:82
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "No se pueden utilizar los comandos de documentación bajo MinGW.\n"
 
-#: ../src/g_rc.c:292
+#: src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr ""
 "Se ha especificado un factor de ampliación no válido [%d] a la función %s\n"
 
-#: ../src/g_rc.c:418
+#: src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Se ha especificado un tamaño no válido [%d] a la función text-size\n"
 
-#: ../src/g_rc.c:445
+#: src/g_rc.c:445
 #, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr ""
 "Se ha especificado un tamaño no válido [%f] a la función postscript-font-"
 "scale\n"
 
-#: ../src/g_rc.c:488
+#: src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Se ha especificado un tamaño no válido [%d] a la función snap-size\n"
 
-#: ../src/g_rc.c:960
+#: src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr ""
 "Número de niveles [%d] no válidos especificados a la función undo-levels\n"
 
-#: ../src/g_rc.c:1218
+#: src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "Tamaño no válido [%d] especificado a la función bus-ripper-size\n"
 
-#: ../src/g_rc.c:1293
+#: src/g_rc.c:1293
 #, fuzzy, c-format
 msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr ""
 "Tamaño de punto no válido [%d] especificado a la función grid-dot-size\n"
 
-#: ../src/g_rc.c:1334
+#: src/g_rc.c:1334
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 msgstr ""
 "Espaciado de punto no válido [%d] especificado a la función grid-fixed-"
 "threshold\n"
 
-#: ../src/g_rc.c:1360
+#: src/g_rc.c:1360
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 msgstr ""
 "Espaciado de punto no válido [%d] especificado a la función grid-fixed-"
 "threshold\n"
 
-#: ../src/g_rc.c:1404
+#: src/g_rc.c:1404
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr ""
 "Se ha especificado un desplazamiento no válido [%d] a la función add-"
 "attribute-offset\n"
 
-#: ../src/g_rc.c:1428
+#: src/g_rc.c:1428
 #, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr ""
 "Se ha especificado un número de segundos no válido [%d] a la función auto-"
 "save-interval\n"
 
-#: ../src/g_rc.c:1469
+#: src/g_rc.c:1469
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr ""
 "Se ha especificado un aumento no válido [%d] a la función mousepan-gain\n"
 
-#: ../src/g_rc.c:1492
+#: src/g_rc.c:1492
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr ""
 "Se ha especificado un aumento no válido [%d] a la función keyboardpan-gain\n"
 
-#: ../src/g_rc.c:1538
+#: src/g_rc.c:1538
 #, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr ""
 "Se ha especificado un número de pixels no válido [%d] a la función select-"
 "slack-pixels\n"
 
-#: ../src/g_rc.c:1564
+#: src/g_rc.c:1564
 #, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr ""
 "Se ha llamado a la función zoom-gain con un nivel de aumento [%d] no válido\n"
 
-#: ../src/g_rc.c:1589
+#: src/g_rc.c:1589
 #, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr ""
 "Se ha llamado a la función scrollpan-steps con un número de pasos no válido "
 "[%d]\n"
 
-#: ../src/gschem.c:183 ../src/gschem.c:194
+#: src/gschem.c:183 src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "Versión de gEDA/gschem %s%s.%s\n"
 
-#: ../src/gschem.c:186 ../src/gschem.c:197
+#: src/gschem.c:186 src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -652,13 +642,13 @@ msgstr ""
 "gEDA/gschem no incluye NINGUNA GARANT�A; véase el fichero COPYING para más "
 "detalles.\n"
 
-#: ../src/gschem.c:188 ../src/gschem.c:199
+#: src/gschem.c:188 src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
 msgstr "Esto es software libre, y puede redistribuirlo bajo ciertas\n"
 
-#: ../src/gschem.c:190 ../src/gschem.c:201
+#: src/gschem.c:190 src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -667,17 +657,17 @@ msgstr ""
 "condiciones; por favor vea el fichero COPYING para más detalles.\n"
 "\n"
 
-#: ../src/gschem.c:205
+#: src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "�sta es la adaptación MINGW32.\n"
 
-#: ../src/gschem.c:209
+#: src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Entorno actual de locale: %s\n"
 
-#: ../src/gschem.c:224
+#: src/gschem.c:224
 msgid ""
 "You must set the GEDADATA environment variable!\n"
 "\n"
@@ -685,225 +675,247 @@ msgid ""
 "environment variable to point to the correct location.\n"
 msgstr ""
 
-#: ../src/gschem.c:251
+#: src/gschem.c:251
 #, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "No se ha podido encontrar el fichero de inicialización scm [%s]\n"
 
-#: ../src/gschem.c:255
+#: src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Leído fichero de inicialización scm [%s]\n"
 
-#. ! \todo These two messages are the same. Should be
-#. * integrated.
-#: ../src/gschem.c:259
+#: src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Fallo al leer fichero de inicialización scm [%s]\n"
 
-#: ../src/gschem.c:320
+#: src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "¡Directorio de Scheme no especificado!\n"
 
-#: ../src/gschem.c:327 ../src/x_script.c:66
+#: src/gschem.c:327 src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Ejecutando programa de guile [%s]\n"
 
-#: ../src/gschem_cairo.c:310
+#: src/gschem_accel_label.c:319
+msgid "Accelerator Closure"
+msgstr ""
+
+#: src/gschem_accel_label.c:320
+msgid "The closure to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:326
+msgid "Accelerator Widget"
+msgstr ""
+
+#: src/gschem_accel_label.c:327
+msgid "The widget to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:333
+msgid "Accelerator String"
+msgstr ""
+
+#: src/gschem_accel_label.c:334
+msgid "The accelerator string to be displayed"
+msgstr ""
+
+#: src/gschem_cairo.c:310
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "Final de línea desconocido (%d)\n"
 
-#: ../src/gschem_cairo.c:318
+#: src/gschem_cairo.c:318
 #, fuzzy, c-format
 msgid "Unknown type for stroke (%d) !\n"
 msgstr "Tipo de línea desconocido (%d)\n"
 
-#: ../src/i_basic.c:79
+#: src/i_basic.c:79
 msgid "Component Mode"
 msgstr "Modo Componentes"
 
-#: ../src/i_basic.c:81
+#: src/i_basic.c:81
 msgid "Text Mode"
 msgstr "Modo Texto"
 
-#: ../src/i_basic.c:89
+#: src/i_basic.c:89
 msgid "Rotate Mode"
 msgstr "Rotar"
 
-#: ../src/i_basic.c:99
+#: src/i_basic.c:99
 msgid "Pan Mode"
 msgstr "Modo Centrar"
 
-#: ../src/i_basic.c:103
+#: src/i_basic.c:103
 #, c-format
 msgid "Paste %d Mode"
 msgstr "Modo Pegar %d"
 
-#: ../src/i_basic.c:109
+#: src/i_basic.c:109
 msgid "Magnetic Net Mode"
 msgstr "Modo Ayuda a la conexión"
 
-#: ../src/i_basic.c:111
+#: src/i_basic.c:111
 msgid "Net Mode"
 msgstr "Modo Conexión"
 
-#: ../src/i_basic.c:115
+#: src/i_basic.c:115
 msgid "Bus Mode"
 msgstr "Modo Bus"
 
-#: ../src/i_basic.c:118
+#: src/i_basic.c:118
 msgid "Line Mode"
 msgstr "Modo Línea"
 
-#: ../src/i_basic.c:121
+#: src/i_basic.c:121
 msgid "Box Mode"
 msgstr "Modo Rectángulo"
 
-#: ../src/i_basic.c:124
+#: src/i_basic.c:124
 msgid "Picture Mode"
 msgstr "Modo Imagen"
 
-#: ../src/i_basic.c:127
+#: src/i_basic.c:127
 msgid "Circle Mode"
 msgstr "Modo Círculo"
 
-#: ../src/i_basic.c:130
+#: src/i_basic.c:130
 msgid "Arc Mode"
 msgstr "Modo Arco"
 
-#: ../src/i_basic.c:133
+#: src/i_basic.c:133
 msgid "Pin Mode"
 msgstr "Modo Pin"
 
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
+#: src/i_basic.c:137 src/i_callbacks.c:626 src/i_callbacks.c:650
 msgid "Move"
 msgstr "Mover"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
+#: src/i_basic.c:139 src/i_callbacks.c:581 src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Copia múltiple"
 
-#: ../src/i_basic.c:168
+#: src/i_basic.c:168
 msgid "Show Hidden"
 msgstr "Mostrar ocultos"
 
-#: ../src/i_basic.c:171
+#: src/i_basic.c:171
 msgid "Snap Off"
 msgstr "Desactivado el ajuste a la rejilla"
 
-#: ../src/i_basic.c:173
+#: src/i_basic.c:173
 msgid "Resnap Active"
 msgstr ""
 
-#: ../src/i_basic.c:254 ../src/x_window.c:495
+#: src/i_basic.c:254 src/x_window.c:495
 msgid "Action"
 msgstr "Acción"
 
-#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
+#: src/i_basic.c:260 src/x_dialog.c:2408 src/x_window.c:490
 msgid "Stroke"
 msgstr "Gesto"
 
-#: ../src/i_basic.c:266 ../src/x_window.c:492
+#: src/i_basic.c:266 src/x_window.c:492
 msgid "none"
 msgstr "ninguno"
 
-#: ../src/i_basic.c:271
+#: src/i_basic.c:271
 msgid "Repeat/"
 msgstr "Repetir/"
 
-#: ../src/i_basic.c:549 ../src/i_basic.c:563
+#: src/i_basic.c:549 src/i_basic.c:563
 msgid "OFF"
 msgstr "NO"
 
-#: ../src/i_basic.c:567
+#: src/i_basic.c:567
 msgid "NONE"
 msgstr ""
 
-#: ../src/i_basic.c:572
+#: src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Rejilla(%s, %s)"
 
-#: ../src/i_callbacks.c:63
+#: src/i_callbacks.c:63
 #, c-format
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentación de [%s, %s, %s, %s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
+#: src/i_callbacks.c:123 src/i_callbacks.c:1705
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Se ha creado una página nueva [%s]\n"
 
-#: ../src/i_callbacks.c:163
+#: src/i_callbacks.c:163
 #, c-format
 msgid "New Window created [%s]\n"
 msgstr "Se ha creado una nueva ventana [%s]\n"
 
-#: ../src/i_callbacks.c:281
+#: src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "No se ha podido guardar todo"
 
-#: ../src/i_callbacks.c:283
+#: src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Guardado todo"
 
-#: ../src/i_callbacks.c:373
+#: src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "Cerrando ventana\n"
 
-#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
+#: src/i_callbacks.c:541 src/i_callbacks.c:586 src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "Antes seleccione objetos"
 
-#: ../src/i_callbacks.c:710
+#: src/i_callbacks.c:710
 #, fuzzy
 msgid "Edit pin type"
 msgstr "Editar tipo de línea"
 
-#: ../src/i_callbacks.c:729
+#: src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Editar texto"
 
-#: ../src/i_callbacks.c:752
+#: src/i_callbacks.c:752
 msgid "Slot"
 msgstr "Elemento"
 
-#: ../src/i_callbacks.c:769
+#: src/i_callbacks.c:769
 msgid "Color"
 msgstr "Color"
 
-#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
+#: src/i_callbacks.c:806 src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Rotar"
 
-#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
+#: src/i_callbacks.c:874 src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Voltear"
 
-#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
+#: src/i_callbacks.c:956 src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Mover"
 
-#: ../src/i_callbacks.c:959
+#: src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr ""
 "ADVERTENCIA: ¡No mueva objetos con el ajuste a la rejilla desactivado!\n"
 
-#: ../src/i_callbacks.c:960
+#: src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr ""
 "ADVERTENCIA: Activando el ajuste a la rejilla y continuando con el "
 "movimiento.\n"
 
-#: ../src/i_callbacks.c:967
+#: src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "ADVERTENCIA: ¡El tamaño de la rejilla no es 100!\n"
 
-#: ../src/i_callbacks.c:969
+#: src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -911,145 +923,144 @@ msgstr ""
 "ADVERTENCIA: Si está moviendo un símbolo al origen, el tamaño de la "
 "rejilladebe ser de 100\n"
 
-#: ../src/i_callbacks.c:1000
+#: src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "Incrustar"
 
-#: ../src/i_callbacks.c:1041
+#: src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "Desincrustar"
 
-#: ../src/i_callbacks.c:1084
+#: src/i_callbacks.c:1085
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../src/i_callbacks.c:1141
+#: src/i_callbacks.c:1144
 msgid "ShowHidden"
 msgstr "Mostrar ocultos"
 
-#: ../src/i_callbacks.c:1165
+#: src/i_callbacks.c:1168
 msgid "MakeVisible"
 msgstr "Hacer visible"
 
-#: ../src/i_callbacks.c:1562
+#: src/i_callbacks.c:1565
 msgid "Update Cues"
 msgstr "Actualizar entradas"
 
-#: ../src/i_callbacks.c:1746
+#: src/i_callbacks.c:1749
 msgid "Really revert page?"
 msgstr "¿Seguro que quiere recargar la página?"
 
-#: ../src/i_callbacks.c:1816
+#: src/i_callbacks.c:1819
 msgid "Copy to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1834
+#: src/i_callbacks.c:1837
 msgid "Cut to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1852
+#: src/i_callbacks.c:1855
 #, fuzzy
 msgid "Paste from clipboard"
 msgstr "Pegar memoria intermedia 1"
 
-#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
-#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
-#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+#: src/i_callbacks.c:1867 src/i_callbacks.c:2106 src/i_callbacks.c:2128
+#: src/i_callbacks.c:2150 src/i_callbacks.c:2172 src/i_callbacks.c:2194
 msgid "Empty buffer"
 msgstr "Buffer vacío"
 
-#: ../src/i_callbacks.c:1909
+#: src/i_callbacks.c:1912
 msgid "Copy 1"
 msgstr "Copiar 1"
 
-#: ../src/i_callbacks.c:1928
+#: src/i_callbacks.c:1931
 msgid "Copy 2"
 msgstr "Copiar 2"
 
-#: ../src/i_callbacks.c:1947
+#: src/i_callbacks.c:1950
 msgid "Copy 3"
 msgstr "Copiar 3"
 
-#: ../src/i_callbacks.c:1966
+#: src/i_callbacks.c:1969
 msgid "Copy 4"
 msgstr "Copiar 4"
 
-#: ../src/i_callbacks.c:1985
+#: src/i_callbacks.c:1988
 msgid "Copy 5"
 msgstr "Copiar 5"
 
-#: ../src/i_callbacks.c:2004
+#: src/i_callbacks.c:2007
 msgid "Cut 1"
 msgstr "Cortar 1"
 
-#: ../src/i_callbacks.c:2023
+#: src/i_callbacks.c:2026
 msgid "Cut 2"
 msgstr "Cortar 2"
 
-#: ../src/i_callbacks.c:2042
+#: src/i_callbacks.c:2045
 msgid "Cut 3"
 msgstr "Cortar 3"
 
-#: ../src/i_callbacks.c:2061
+#: src/i_callbacks.c:2064
 msgid "Cut 4"
 msgstr "Cortar 4"
 
-#: ../src/i_callbacks.c:2080
+#: src/i_callbacks.c:2083
 msgid "Cut 5"
 msgstr "Cortar 5"
 
-#: ../src/i_callbacks.c:2096
+#: src/i_callbacks.c:2099
 msgid "Paste 1"
 msgstr "Pegar 1"
 
-#: ../src/i_callbacks.c:2118
+#: src/i_callbacks.c:2121
 msgid "Paste 2"
 msgstr "Pegar 2"
 
-#: ../src/i_callbacks.c:2140
+#: src/i_callbacks.c:2143
 msgid "Paste 3"
 msgstr "Pegar 3"
 
-#: ../src/i_callbacks.c:2162
+#: src/i_callbacks.c:2165
 msgid "Paste 4"
 msgstr "Pegar 4"
 
-#: ../src/i_callbacks.c:2184
+#: src/i_callbacks.c:2187
 msgid "Paste 5"
 msgstr "Pegar 5"
 
-#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
+#: src/i_callbacks.c:2324 src/x_window.c:354
 msgid "Component"
 msgstr "Componente"
 
-#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
+#: src/i_callbacks.c:2360 src/i_callbacks.c:2379 src/x_dialog.c:2381
 msgid "Attribute"
 msgstr "Propiedad"
 
-#: ../src/i_callbacks.c:2873
+#: src/i_callbacks.c:2877
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Buscando origen [%s]\n"
 
-#: ../src/i_callbacks.c:2897
+#: src/i_callbacks.c:2901
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "No se ha podido encontrar la fuente [%s]\n"
 
-#: ../src/i_callbacks.c:2964
+#: src/i_callbacks.c:2970
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Buscando símbolo [%s]\n"
 
-#: ../src/i_callbacks.c:2970
+#: src/i_callbacks.c:2976
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr "El símbolo no es un archivo físico. No se puede cargar el símbolo.\n"
 
-#: ../src/i_callbacks.c:3001
+#: src/i_callbacks.c:3007
 msgid "Cannot find any schematics above the current one!\n"
 msgstr "¡No se ha podido encontrar ningún esquema jerárquico superior!\n"
 
-#: ../src/i_callbacks.c:3064
+#: src/i_callbacks.c:3061
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
@@ -1057,264 +1068,262 @@ msgstr ""
 "Este comando consigue la información del componente de internet, pero no hay "
 "ningún componente seleccionado"
 
-#: ../src/i_callbacks.c:3177
+#: src/i_callbacks.c:3171
 msgid "ShowN"
 msgstr "Mostrar nombre"
 
-#: ../src/i_callbacks.c:3213
+#: src/i_callbacks.c:3207
 msgid "ShowV"
 msgstr "Mostrar valor"
 
-#: ../src/i_callbacks.c:3249
+#: src/i_callbacks.c:3243
 msgid "ShowB"
 msgstr "Mostrar ambos"
 
-#: ../src/i_callbacks.c:3286
+#: src/i_callbacks.c:3280
 msgid "VisToggle"
 msgstr "Cambiar visibilidad"
 
-#: ../src/i_callbacks.c:3316
+#: src/i_callbacks.c:3310
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Disculpe. Esta opción del menú no funciona\n"
 
-#: ../src/i_callbacks.c:3406
+#: src/i_callbacks.c:3400
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Modo de realimentación seleccionado: SILUETA\n"
 
-#: ../src/i_callbacks.c:3409
+#: src/i_callbacks.c:3403
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Modo de realimentación seleccionado: CONTENEDOR\n"
 
-#: ../src/i_callbacks.c:3434
+#: src/i_callbacks.c:3428
 msgid "Grid OFF\n"
 msgstr "Rejilla DESACTIVADA\n"
 
-#: ../src/i_callbacks.c:3435
+#: src/i_callbacks.c:3429
 msgid "Dot grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3436
+#: src/i_callbacks.c:3430
 msgid "Mesh grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3457
+#: src/i_callbacks.c:3451
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "¡PRECAUCI�N!: Ajuste a la rejilla DESACTIVADO \n"
 
-#: ../src/i_callbacks.c:3460
+#: src/i_callbacks.c:3454
 msgid "Snap ON\n"
 msgstr "Ajuste a la rejilla ACTIVADO\n"
 
-#: ../src/i_callbacks.c:3463
+#: src/i_callbacks.c:3457
 #, fuzzy
 msgid "Snap back to the grid (CAUTION!)\n"
 msgstr "¡PRECAUCI�N!: Ajuste a la rejilla DESACTIVADO \n"
 
-#: ../src/i_callbacks.c:3489
+#: src/i_callbacks.c:3483
 msgid "Rubber band OFF \n"
 msgstr "Goma de borrar DESACT\n"
 
-#: ../src/i_callbacks.c:3492
+#: src/i_callbacks.c:3486
 msgid "Rubber band ON\n"
 msgstr "Goma de borrar ACT\n"
 
-#: ../src/i_callbacks.c:3507
+#: src/i_callbacks.c:3501
 msgid "magnetic net mode: ON\n"
 msgstr "Modo de Ayuda a la conexión: ACTIVADO\n"
 
-#: ../src/i_callbacks.c:3510
+#: src/i_callbacks.c:3504
 msgid "magnetic net mode: OFF\n"
 msgstr "Modo de Ayuda a la conexión: DESACTIVADO\n"
 
-#: ../src/o_box.c:160
+#: src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "¡Tipo de relleno de rectángulo desconocido!\n"
 
-#: ../src/o_buffer.c:57
+#: src/o_buffer.c:57
 #, c-format
 msgid "o_buffer_copy: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:72
+#: src/o_buffer.c:72
 #, c-format
 msgid "o_buffer_cut: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:93
+#: src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr ""
 "Se ha recibido un número de memoria intermedia no válida en la función "
 "o_buffer_paste_start\n"
 
-#: ../src/o_bus.c:135
+#: src/o_bus.c:135
 #, fuzzy, c-format
 msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr ""
 "Se ha recibido un parámetro no válido (\"whichone\") en la función "
 "o_bus_draw_xor_single\n"
 
-#: ../src/o_circle.c:141
+#: src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "¡Tipo de relleno de círculo desconocido!\n"
 
-#: ../src/o_complex.c:250 ../src/o_complex.c:254
+#: src/o_complex.c:250 src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Convirtiendo esquema [%d %d]\n"
 
-#: ../src/o_misc.c:61
+#: src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
 msgstr "Se ha recibido NULL (no esperado) en la función o_edit\n"
 
-#: ../src/o_misc.c:125
+#: src/o_misc.c:125
 msgid "Object already locked\n"
 msgstr "Objeto previamente fijado\n"
 
-#: ../src/o_misc.c:163
+#: src/o_misc.c:163
 msgid "Object already unlocked\n"
 msgstr "El objeto no estaba fijado\n"
 
-#: ../src/o_misc.c:445
+#: src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "El texto oculto es ahora visible\n"
 
-#: ../src/o_misc.c:447
+#: src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "El texto oculto es ahora invisible\n"
 
-#: ../src/o_misc.c:697
+#: src/o_misc.c:700
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 "No se pudo encontrar el símbolo [%s] en la librería. Error al actualizar.\n"
 
-#: ../src/o_misc.c:840
+#: src/o_misc.c:847
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr ""
 "o_autosave_backups: Imposible averiguar el nombre de archivo real de %s."
 
-#: ../src/o_misc.c:884
+#: src/o_misc.c:891
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr ""
 "NO se han podido cambiar los permisos de la copia de seguridad anterior [%s] "
 "a lectura-escritura\n"
 
-#: ../src/o_misc.c:902
+#: src/o_misc.c:909
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr ""
 "NO se han podido cambiar los permisos de la copia de seguridad anterior [%s] "
 "a sólo lectura\n"
 
-#: ../src/o_misc.c:907
+#: src/o_misc.c:914
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "NO se ha podido guardar la copia de seguridad [%s]\n"
 
-#: ../src/o_move.c:188
+#: src/o_move.c:188
 #, c-format
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "ERROR: en la función o_move_end, ¡el objeto es NULL!\n"
 
-#: ../src/o_move.c:461
+#: src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr ""
 "¡Eh! Se ha intentado encontrar el parámetro \"whichone\", pero ¡no se ha "
 "encontrado!\n"
 
-#: ../src/o_move.c:482
+#: src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr ""
 "Se ha recibido un objeto que no es una línea en la función "
 "o_move_check_endpoint\n"
 
-#: ../src/o_net.c:176
+#: src/o_net.c:176
 #, fuzzy, c-format
 msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr ""
 "Se ha recibido un parámetro no válido (\"whichone\") en la función "
 "o_net_draw_xor_single\n"
 
-#: ../src/o_net.c:552
+#: src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr ""
 "Advertencia: se ha iniciado la conexión en una coordenada fuera de la "
 "rejilla\n"
 
-#: ../src/o_net.c:614
+#: src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr ""
 "Advertencia: se ha finalizado la conexión en una coordenada fuera de la "
 "rejilla\n"
 
-#. try to exit gracefully
-#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
-#: ../src/o_net.c:1126
+#: src/o_net.c:982 src/o_net.c:1019 src/o_net.c:1090 src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 "Se ha intentado añadir más de dos conexiones a bus. Error interno de "
 "gschem.\n"
 
-#: ../src/o_net.c:1196
+#: src/o_net.c:1196
 #, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "No se ha encontrado el símbolo %s en ninguna librería de componentes\n"
 
-#: ../src/o_path.c:356
+#: src/o_path.c:356
 #, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "¡Tipo de camino (relleno) desconocido!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:557
+#: src/o_picture.c:166 src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Fallo al cargar la imagen: %s"
 
-#: ../src/o_picture.c:180
+#: src/o_picture.c:180
 msgid "Picture"
 msgstr "Imagen"
 
-#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
+#: src/o_picture.c:465 src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "ERROR: ¡objeto vacío (NULL)!\n"
 
-#: ../src/o_slot.c:110
+#: src/o_slot.c:81
 msgid "Slot attribute malformed\n"
 msgstr "El atributo del elemento está mal especificado\n"
 
-#: ../src/o_slot.c:128
+#: src/o_slot.c:99
 msgid "numslots attribute missing\n"
 msgstr "La propiedad \"numslots\" no está definida\n"
 
-#: ../src/o_slot.c:130
+#: src/o_slot.c:100
 msgid "Slotting not allowed for this component\n"
 msgstr "No se permiten múltiples elementos para este componente\n"
 
-#: ../src/o_slot.c:145
+#: src/o_slot.c:115
 msgid "New slot number out of range\n"
 msgstr "El nuevo número de elemento está fuera de rango\n"
 
-#: ../src/o_slot.c:200
+#: src/o_slot.c:170
 #, c-format
 msgid "uggg! you tried to slot edit something that doesn't exist!\n"
 msgstr "¡¡Ufff!! ¡se ha intentado editar el elemento de algo que no existe!\n"
 
-#: ../src/o_undo.c:300
+#: src/o_undo.c:300
 msgid "Undo/Redo disabled in rc file\n"
 msgstr "¡Deshacer/Rehacer deshabilitado en el fichero rc!\n"
 
-#: ../src/parsecmd.c:47
+#: src/parsecmd.c:47
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] schematic_filename1 ... schematic_filenameN\n"
@@ -1338,78 +1347,69 @@ msgstr ""
 "  -h                Ayuda; éste mensaje\n"
 "\n"
 
-#: ../src/x_attribedit.c:127
+#: src/x_attribedit.c:127
 #, c-format
 msgid "Got invalid show option; defaulting to show both\n"
 msgstr ""
 "Se ha recibido una opción de mostrar no válida; mostrando ambos por defecto\n"
 
-#: ../src/x_attribedit.c:330
+#: src/x_attribedit.c:330
 msgid "Single Attribute Editor"
 msgstr "Editor de una única propiedad"
 
-#: ../src/x_attribedit.c:359
+#: src/x_attribedit.c:359
 msgid "<b>Edit Attribute</b>"
 msgstr "<b>Editar propiedades</b>"
 
-#: ../src/x_attribedit.c:361
+#: src/x_attribedit.c:361
 msgid "<b>Add Attribute</b>"
 msgstr "<b>Añadir propiedad</b>"
 
-#. Name selection
-#. GtkLabel
-#: ../src/x_attribedit.c:377 ../src/x_multiattrib.c:1725
+#: src/x_attribedit.c:377 src/x_multiattrib.c:1921
 msgid "Name:"
 msgstr "Nombre:"
 
-#. Value entry
-#. GtkLabel
-#: ../src/x_attribedit.c:393 ../src/x_multiattrib.c:1744
+#: src/x_attribedit.c:393 src/x_multiattrib.c:1940
 msgid "Value:"
 msgstr "Valor:"
 
-#. Visibility
-#. GtkButton
-#: ../src/x_attribedit.c:409 ../src/x_multiattrib.c:1781
+#: src/x_attribedit.c:409 src/x_multiattrib.c:1983
 msgid "Visible"
 msgstr "Visible"
 
-#: ../src/x_attribedit.c:429
+#: src/x_attribedit.c:429
 msgid "Show Value Only"
 msgstr "Mostrar sólo valor"
 
-#: ../src/x_attribedit.c:431
+#: src/x_attribedit.c:431
 msgid "Show Name Only"
 msgstr "Mostrar sólo nombre"
 
-#: ../src/x_attribedit.c:433 ../src/x_multiattrib.c:1369
+#: src/x_attribedit.c:433 src/x_multiattrib.c:1459
 msgid "Show Name & Value"
 msgstr "Mostrar nombre y valor"
 
-#. gschem specific
-#: ../src/x_attribedit.c:440
+#: src/x_attribedit.c:440
 msgid "<b>Attach Options</b>"
 msgstr "<b>Opciones de asociación</b>"
 
-#: ../src/x_attribedit.c:455
+#: src/x_attribedit.c:455
 msgid "All"
 msgstr "Todo"
 
-#. GtkTreeViewColumn
-#: ../src/x_attribedit.c:463 ../src/x_compselect.c:896
-#: ../src/x_compselect.c:1010
+#: src/x_attribedit.c:463 src/x_compselect.c:895 src/x_compselect.c:1009
 msgid "Components"
 msgstr "Componentes"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:364
+#: src/x_attribedit.c:471 src/x_window.c:364
 msgid "Nets"
 msgstr "Conexiones"
 
-#: ../src/x_attribedit.c:479
+#: src/x_attribedit.c:479
 msgid "Replace existing attributes"
 msgstr "Reemplazar las propiedades existentes"
 
-#: ../src/x_autonumber.c:413
+#: src/x_autonumber.c:415
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
@@ -1417,8 +1417,7 @@ msgstr ""
 "Un componente con varios elementos sin la propiedad 'slot' puede causar "
 "problemas al autonumerar los números de elemento\n"
 
-#. duplicate slot in used_slots
-#: ../src/x_autonumber.c:428
+#: src/x_autonumber.c:430
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
@@ -1426,181 +1425,172 @@ msgstr ""
 "La duplicidad de la propiedad 'slot' puede causar problemas: [nombre del "
 "símbolo=%s, número=%d, slot=%d]\n"
 
-#: ../src/x_autonumber.c:696
+#: src/x_autonumber.c:702
 msgid "No searchstring given in autonumber text.\n"
 msgstr "No se ha especificado una cadena de búsqueda para autonumerar texto.\n"
 
-#: ../src/x_autonumber.c:748
+#: src/x_autonumber.c:754
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr "No se ha especificado '*' o '?' al final del texto a autonumerar.\n"
 
-#: ../src/x_autonumber.c:883
+#: src/x_autonumber.c:889
 msgid "Diagonal"
 msgstr "Diagonal"
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Top to bottom"
 msgstr "De arriba hacia abajo"
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Bottom to top"
 msgstr "De abajo hacia arriba"
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 msgid "Left to right"
 msgstr "De izquierda hacia derecha"
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 msgid "Right to left"
 msgstr "De derecha hacia izquierda"
 
-#: ../src/x_autonumber.c:886
+#: src/x_autonumber.c:892
 msgid "File order"
 msgstr "Orden de archivos:"
 
-#: ../src/x_autonumber.c:1222
+#: src/x_autonumber.c:1228
 msgid "Autonumber text"
 msgstr "Autoenumerar texto"
 
-#. scope section
-#: ../src/x_autonumber.c:1246
+#: src/x_autonumber.c:1252
 msgid "<b>Scope</b>"
 msgstr "<b>Ã?mbito</b>"
 
-#: ../src/x_autonumber.c:1268
+#: src/x_autonumber.c:1274
 msgid "Search for:"
 msgstr "Buscar:"
 
-#: ../src/x_autonumber.c:1282
+#: src/x_autonumber.c:1288
 msgid "Autonumber text in:"
 msgstr "Autoenumerar texto en:"
 
-#: ../src/x_autonumber.c:1289
+#: src/x_autonumber.c:1295
 msgid "Skip numbers found in:"
 msgstr "Ignorar números encontrados en:"
 
-#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
+#: src/x_autonumber.c:1307 src/x_autonumber.c:1316
 msgid "Selected objects"
 msgstr "Objetos seleccionados"
 
-#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
+#: src/x_autonumber.c:1308 src/x_autonumber.c:1317
 msgid "Current page"
 msgstr "Hoja actual"
 
-#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
+#: src/x_autonumber.c:1309 src/x_autonumber.c:1318
 msgid "Whole hierarchy"
 msgstr "Jerarquía completa"
 
-#: ../src/x_autonumber.c:1314
+#: src/x_autonumber.c:1320
 msgid "Overwrite existing numbers"
 msgstr "Sobreescribir los números existentes"
 
-#. Options section
-#: ../src/x_autonumber.c:1319
+#: src/x_autonumber.c:1325
 msgid "<b>Options</b>"
 msgstr "<b>Opciones</b>"
 
-#: ../src/x_autonumber.c:1341
+#: src/x_autonumber.c:1347
 msgid "Starting number:"
 msgstr "Número inicial:"
 
-#: ../src/x_autonumber.c:1348
+#: src/x_autonumber.c:1354
 msgid "Sort order:"
 msgstr "Método de ordenación:"
 
-#: ../src/x_autonumber.c:1369
+#: src/x_autonumber.c:1375
 msgid "Remove numbers"
 msgstr "Borrar los números"
 
-#: ../src/x_autonumber.c:1373
+#: src/x_autonumber.c:1379
 msgid "Automatic slotting"
 msgstr "Asignar números de elemento automáticamente"
 
-#: ../src/x_color.c:94 ../src/x_color.c:103
+#: src/x_color.c:94 src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "¡No se puede reservar memoria para el color %s!\n"
 
-#: ../src/x_color.c:94
+#: src/x_color.c:94
 msgid "black"
 msgstr "negro"
 
-#: ../src/x_color.c:103
+#: src/x_color.c:103
 msgid "white"
 msgstr "blanco"
 
-#: ../src/x_color.c:125
+#: src/x_color.c:125
 #, fuzzy, c-format
 msgid "Could not allocate display color %i!\n"
 msgstr "¡No se puede reservar memoria para el color %s!\n"
 
-#: ../src/x_color.c:147
+#: src/x_color.c:147
 #, fuzzy, c-format
 msgid "Could not allocate outline color %i!\n"
 msgstr "¡No se puede reservar memoria para el color %s!\n"
 
-#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
+#: src/x_color.c:164 src/x_color.c:181 src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Se ha intentado obtener un color no válido: %d\n"
 
-#: ../src/x_color.c:214
+#: src/x_color.c:214
 #, fuzzy, c-format
 msgid "Tried to get an invalid outline color: %d\n"
 msgstr "Se ha intentado obtener un color no válido: %d\n"
 
-#. GtkLabel
-#: ../src/x_compselect.c:1040
+#: src/x_compselect.c:1039
 msgid "Filter:"
 msgstr "Filtro:"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
-#: ../src/x_multiattrib.c:1601
+#: src/x_compselect.c:1142 src/x_dialog.c:3776 src/x_multiattrib.c:1787
 msgid "Name"
 msgstr "Nombre"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1152 ../src/x_multiattrib.c:1626
+#: src/x_compselect.c:1151 src/x_multiattrib.c:1811
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/x_compselect.c:1191
+#: src/x_compselect.c:1190
 msgid "Default behavior - reference component"
 msgstr "Comportamiento por defecto - designar componente"
 
-#: ../src/x_compselect.c:1194
+#: src/x_compselect.c:1193
 msgid "Embed component in schematic"
 msgstr "Incrustar componente en el esquema"
 
-#: ../src/x_compselect.c:1197
+#: src/x_compselect.c:1196
 msgid "Include component as individual objects"
 msgstr "Incluir componentes como objetos individuales"
 
-#. GtkWindow
-#: ../src/x_compselect.c:1354
+#: src/x_compselect.c:1353
 msgid "Select Component..."
 msgstr "Seleccionar componente..."
 
-#: ../src/x_compselect.c:1377
+#: src/x_compselect.c:1376
 msgid "In Use"
 msgstr "En uso"
 
-#: ../src/x_compselect.c:1381
+#: src/x_compselect.c:1380
 msgid "Libraries"
 msgstr "Librerías"
 
-#. GtkFrame
-#: ../src/x_compselect.c:1390 ../src/x_fileselect.c:122
+#: src/x_compselect.c:1389 src/x_fileselect.c:122
 msgid "Preview"
 msgstr "Vista preliminar"
 
-#. dialog not created yet
-#: ../src/x_dialog.c:174
+#: src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "Introducción de texto..."
 
-#: ../src/x_dialog.c:205
+#: src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1611,185 +1601,176 @@ msgstr ""
 "para colocar el texto.\n"
 "Botón intermedio para rotar mientras está colocando el texto."
 
-#: ../src/x_dialog.c:294
-#, c-format
+#: src/x_dialog.c:294
 msgid "Lower Left"
 msgstr "Abajo a la izquierda"
 
-#: ../src/x_dialog.c:305
-#, c-format
+#: src/x_dialog.c:305
 msgid "Middle Left"
 msgstr "Centrado a la izquierda"
 
-#: ../src/x_dialog.c:316
-#, c-format
+#: src/x_dialog.c:316
 msgid "Upper Left"
 msgstr "Arriba a la izquierda"
 
-#: ../src/x_dialog.c:327
-#, c-format
+#: src/x_dialog.c:327
 msgid "Lower Middle"
 msgstr "Abajo centrado"
 
-#: ../src/x_dialog.c:338
-#, c-format
+#: src/x_dialog.c:338
 msgid "Middle Middle"
 msgstr "Centrado Centrado"
 
-#: ../src/x_dialog.c:349
-#, c-format
+#: src/x_dialog.c:349
 msgid "Upper Middle"
 msgstr "Arriba centrado"
 
-#: ../src/x_dialog.c:360
-#, c-format
+#: src/x_dialog.c:360
 msgid "Lower Right"
 msgstr "Abajo a la derecha"
 
-#: ../src/x_dialog.c:371
-#, c-format
+#: src/x_dialog.c:371
 msgid "Middle Right"
 msgstr "Centrado a la derecha"
 
-#: ../src/x_dialog.c:382
-#, c-format
+#: src/x_dialog.c:382
 msgid "Upper Right"
 msgstr "Arriba a la derecha"
 
-#: ../src/x_dialog.c:496
+#: src/x_dialog.c:496
 msgid "Edit Text Properties"
 msgstr "Editar las propiedades del texto"
 
-#: ../src/x_dialog.c:530
+#: src/x_dialog.c:530
 msgid "<b>Text Content</b>"
 msgstr "<b>Contenido del texto</b>"
 
-#: ../src/x_dialog.c:562
+#: src/x_dialog.c:562
 msgid "<b>Text Properties</b>"
 msgstr "<b>Propiedades del texto</b>"
 
-#: ../src/x_dialog.c:577
+#: src/x_dialog.c:577
 msgid "Color:"
 msgstr "Color:"
 
-#: ../src/x_dialog.c:584
+#: src/x_dialog.c:584
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: ../src/x_dialog.c:593
+#: src/x_dialog.c:593
 msgid "Alignment:"
 msgstr "Alineación:"
 
-#: ../src/x_dialog.c:647
+#: src/x_dialog.c:647
 msgid "Solid"
 msgstr "Sólido"
 
-#: ../src/x_dialog.c:648
+#: src/x_dialog.c:648
 msgid "Dotted"
 msgstr "Punteado"
 
-#: ../src/x_dialog.c:649
+#: src/x_dialog.c:649
 msgid "Dashed"
 msgstr "Guión"
 
-#: ../src/x_dialog.c:650
+#: src/x_dialog.c:650
 msgid "Center"
 msgstr "Centrar"
 
-#: ../src/x_dialog.c:651
+#: src/x_dialog.c:651
 msgid "Phantom"
 msgstr "Fantasma"
 
-#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
-#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
-#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
-#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
-#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
-#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
+#: src/x_dialog.c:652 src/x_dialog.c:749 src/x_dialog.c:758 src/x_dialog.c:767
+#: src/x_dialog.c:868 src/x_dialog.c:870 src/x_dialog.c:872
+#: src/x_dialog.c:1100 src/x_dialog.c:1203 src/x_dialog.c:1212
+#: src/x_dialog.c:1221 src/x_dialog.c:1230 src/x_dialog.c:1239
+#: src/x_dialog.c:1352 src/x_dialog.c:1354 src/x_dialog.c:1356
+#: src/x_dialog.c:1358 src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*sin modificar*"
 
-#: ../src/x_dialog.c:978
+#: src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Editar ancho y tipo de línea"
 
-#: ../src/x_dialog.c:1017 ../src/x_print.c:307
+#: src/x_dialog.c:1017 src/x_print.c:307
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/x_dialog.c:1021
+#: src/x_dialog.c:1021
 msgid "Width:"
 msgstr "Ancho:"
 
-#: ../src/x_dialog.c:1025
+#: src/x_dialog.c:1025
 msgid "Dash Length:"
 msgstr "Longitud de la línea en la discontinuidad:"
 
-#: ../src/x_dialog.c:1029
+#: src/x_dialog.c:1029
 msgid "Dash Space:"
 msgstr "Espaciado de la discontinuidad:"
 
-#: ../src/x_dialog.c:1096
+#: src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Hueco"
 
-#: ../src/x_dialog.c:1097
+#: src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Relleno"
 
-#: ../src/x_dialog.c:1098
+#: src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "Malla"
 
-#: ../src/x_dialog.c:1099
+#: src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "Trama"
 
-#: ../src/x_dialog.c:1470
+#: src/x_dialog.c:1470
 msgid "Edit Fill Type"
 msgstr "Editar tipo de relleno"
 
-#: ../src/x_dialog.c:1508
+#: src/x_dialog.c:1508
 msgid "Fill Type:"
 msgstr "Tipo de relleno:"
 
-#: ../src/x_dialog.c:1512
+#: src/x_dialog.c:1512
 msgid "Line Width:"
 msgstr "Ancho de línea:"
 
-#: ../src/x_dialog.c:1516
+#: src/x_dialog.c:1516
 msgid "Angle 1:"
 msgstr "Ã?ngulo 1:"
 
-#: ../src/x_dialog.c:1520
+#: src/x_dialog.c:1520
 msgid "Pitch 1:"
 msgstr "Separación 1:"
 
-#: ../src/x_dialog.c:1524
+#: src/x_dialog.c:1524
 msgid "Angle 2:"
 msgstr "Ã?ngulo 2:"
 
-#: ../src/x_dialog.c:1528
+#: src/x_dialog.c:1528
 msgid "Pitch 2:"
 msgstr "Separación 2:"
 
-#: ../src/x_dialog.c:1657
+#: src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "Parámetros de arco"
 
-#: ../src/x_dialog.c:1697
+#: src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr "Radio de arco:"
 
-#: ../src/x_dialog.c:1705
+#: src/x_dialog.c:1705
 msgid "Start Angle:"
 msgstr "Ã?ngulo de comienzo:"
 
-#: ../src/x_dialog.c:1713
+#: src/x_dialog.c:1713
 msgid "Degrees of Sweep:"
 msgstr "Grados de barrido:"
 
-#: ../src/x_dialog.c:1830
+#: src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1797,44 +1778,44 @@ msgstr ""
 "¿Desplazamiento del movimiento?\n"
 "(0 para el origen)"
 
-#: ../src/x_dialog.c:1898
+#: src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "Tamaño de texto"
 
-#: ../src/x_dialog.c:1928
+#: src/x_dialog.c:1928
 msgid "Enter new text size:"
 msgstr "Introduzca nuevo tamaño de texto:"
 
-#: ../src/x_dialog.c:2004
+#: src/x_dialog.c:2004
 msgid "Snap Size"
 msgstr "Tamaño de la rejilla"
 
-#: ../src/x_dialog.c:2034
+#: src/x_dialog.c:2034
 msgid "Enter new snap grid spacing:"
 msgstr "Introduzca el nuevo espaciado de la rejilla:"
 
-#: ../src/x_dialog.c:2107
+#: src/x_dialog.c:2110
 msgid "Edit slot number"
 msgstr "Editar número de elemento"
 
-#: ../src/x_dialog.c:2138
+#: src/x_dialog.c:2141
 msgid "Edit slot number:"
 msgstr "Editar número de elemento:"
 
-#: ../src/x_dialog.c:2200
+#: src/x_dialog.c:2202
 msgid "About..."
 msgstr "Acerca de..."
 
-#: ../src/x_dialog.c:2220
+#: src/x_dialog.c:2222
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA: Automatización de Diseño Electrónico GPL</b>"
 
-#: ../src/x_dialog.c:2224
+#: src/x_dialog.c:2226
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>versión de gschem %s%s.%s</b>"
 
-#: ../src/x_dialog.c:2232
+#: src/x_dialog.c:2234
 msgid ""
 "Written by:\n"
 "Ales Hvezda\n"
@@ -1846,153 +1827,152 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "Y muchos otros (Véase el archivo AUTHORS)"
 
-#: ../src/x_dialog.c:2295
+#: src/x_dialog.c:2297
 msgid "Coords"
 msgstr "Coordenadas"
 
-#: ../src/x_dialog.c:2316
+#: src/x_dialog.c:2318
 msgid "Screen"
 msgstr "Pantalla"
 
-#: ../src/x_dialog.c:2325
+#: src/x_dialog.c:2327
 msgid "World"
 msgstr "Mundo"
 
-#: ../src/x_dialog.c:2364
+#: src/x_dialog.c:2366
 msgid "Background"
 msgstr "Fondo"
 
-#: ../src/x_dialog.c:2370
+#: src/x_dialog.c:2372
 msgid "Net endpoint"
 msgstr "Punto final de conexión"
 
-#: ../src/x_dialog.c:2373
+#: src/x_dialog.c:2375
 msgid "Graphic"
 msgstr "Gráfico"
 
-#: ../src/x_dialog.c:2382
+#: src/x_dialog.c:2384
 msgid "Logic bubble"
 msgstr "Negación lógica"
 
-#: ../src/x_dialog.c:2385
+#: src/x_dialog.c:2387
 msgid "Grid point"
 msgstr "Punto de rejilla"
 
-#: ../src/x_dialog.c:2388
+#: src/x_dialog.c:2390
 msgid "Detached attribute"
 msgstr "Desvincular propiedad"
 
-#: ../src/x_dialog.c:2391 ../src/x_window.c:382
+#: src/x_dialog.c:2393 src/x_window.c:382
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/x_dialog.c:2397
+#: src/x_dialog.c:2399
 msgid "Selection"
 msgstr "Selección"
 
-#: ../src/x_dialog.c:2400
+#: src/x_dialog.c:2402
 msgid "Bounding box"
 msgstr "Envolvente"
 
-#: ../src/x_dialog.c:2403
+#: src/x_dialog.c:2405
 msgid "Zoom box"
 msgstr "Ventana de ampliado"
 
-#: ../src/x_dialog.c:2412
+#: src/x_dialog.c:2414
 msgid "Output background"
 msgstr "Fondo de salida"
 
-#: ../src/x_dialog.c:2415
+#: src/x_dialog.c:2417
 msgid "Net junction"
 msgstr "Unión de conexiones"
 
-#: ../src/x_dialog.c:2418
+#: src/x_dialog.c:2420
 msgid "Mesh grid major"
 msgstr ""
 
-#: ../src/x_dialog.c:2421
+#: src/x_dialog.c:2423
 msgid "Mesh grid minor"
 msgstr ""
 
-#: ../src/x_dialog.c:2424
+#: src/x_dialog.c:2426
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../src/x_dialog.c:2570
+#: src/x_dialog.c:2572
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr "ERROR: ¡objeto vacío (NULL) en la función color_edit_dialog_apply!\n"
 
-#: ../src/x_dialog.c:2633
+#: src/x_dialog.c:2635
 msgid "Color Edit"
 msgstr "Editar color"
 
-#: ../src/x_dialog.c:2664
+#: src/x_dialog.c:2666
 msgid "Object color:"
 msgstr "Color del componente:"
 
-#: ../src/x_dialog.c:2786
+#: src/x_dialog.c:2788
 msgid "Function"
 msgstr "Función"
 
-#: ../src/x_dialog.c:2793
+#: src/x_dialog.c:2795
 msgid "Keystroke(s)"
 msgstr "Pulsación(es)"
 
-#: ../src/x_dialog.c:3102
+#: src/x_dialog.c:3104
 msgid "Find Text"
 msgstr "Encontrar texto:"
 
-#: ../src/x_dialog.c:3133
+#: src/x_dialog.c:3135
 msgid "Text to find:"
 msgstr "Texto a encontrar:"
 
-#: ../src/x_dialog.c:3143
+#: src/x_dialog.c:3145
 msgid "descend into hierarchy"
 msgstr "Descender en la jerarquía"
 
-#: ../src/x_dialog.c:3208
+#: src/x_dialog.c:3210
 msgid "Hide Text"
 msgstr "Ocultar texto:"
 
-#: ../src/x_dialog.c:3239
+#: src/x_dialog.c:3241
 msgid "Hide text starting with:"
 msgstr "Ocultar texto que comienza por:"
 
-#: ../src/x_dialog.c:3308
+#: src/x_dialog.c:3310
 msgid "Show Text"
 msgstr "Mostrar texto"
 
-#: ../src/x_dialog.c:3339
+#: src/x_dialog.c:3341
 msgid "Show text starting with:"
 msgstr "Mostrar texto que comienza por:"
 
-#: ../src/x_dialog.c:3796
+#: src/x_dialog.c:3798
 msgid "S_elect the schematics you want to save:"
 msgstr "S_eleccione los esquemas que quiere guardar:"
 
-#: ../src/x_dialog.c:3890
+#: src/x_dialog.c:3892
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr "¿Guardar cambios del esquema \"%s\" antes de salir?"
 
-#: ../src/x_dialog.c:3896
+#: src/x_dialog.c:3898
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
 msgstr ""
 "Hay %d esquemas con cambios sin guardar. ¿Guardar cambios antes de cerrar?"
 
-#. secondary label
-#: ../src/x_dialog.c:3925
+#: src/x_dialog.c:3927
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr "Si no los guarda, todos los cambios se perderán definitivamente."
 
-#: ../src/x_dialog.c:3945
+#: src/x_dialog.c:3947
 msgid "_Close without saving"
 msgstr "_Cerrar sin guardar"
 
-#: ../src/x_dialog.c:4279
+#: src/x_dialog.c:4283
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -2010,49 +1990,49 @@ msgstr ""
 "El nombre no puede finalizar en un espacio.\n"
 "El valor no puede empezar con un espacio."
 
-#: ../src/x_dialog.c:4281
+#: src/x_dialog.c:4285
 msgid "Invalid Attribute"
 msgstr "Propiedad incorrecta"
 
-#: ../src/x_dialog.c:4317
+#: src/x_dialog.c:4321
 #, fuzzy
 msgid "Pin type"
 msgstr "Modo Pin"
 
-#: ../src/x_dialog.c:4341
+#: src/x_dialog.c:4345
 #, fuzzy
 msgid "Net pin"
 msgstr "Punto final de conexión"
 
-#: ../src/x_dialog.c:4343
+#: src/x_dialog.c:4347
 msgid "Bus pin (graphical)"
 msgstr ""
 
-#: ../src/x_fileselect.c:42
+#: src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "Esquemas"
 
-#: ../src/x_fileselect.c:47
+#: src/x_fileselect.c:47
 msgid "Symbols"
 msgstr "Símbolos"
 
-#: ../src/x_fileselect.c:52
+#: src/x_fileselect.c:52
 msgid "Schematics and symbols"
 msgstr "Esquemas y símbolos"
 
-#: ../src/x_fileselect.c:58
+#: src/x_fileselect.c:58
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../src/x_fileselect.c:171
+#: src/x_fileselect.c:171
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../src/x_fileselect.c:231
+#: src/x_fileselect.c:231
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: ../src/x_fileselect.c:284
+#: src/x_fileselect.c:284
 #, c-format
 msgid ""
 "The selected file `%s' already exists.\n"
@@ -2063,30 +2043,29 @@ msgstr ""
 "\n"
 "¿Quiere sobreescribirlo?"
 
-#: ../src/x_fileselect.c:287
+#: src/x_fileselect.c:287
 msgid "Overwrite file?"
 msgstr "¿Sobreescribir el archivo?"
 
-#: ../src/x_fileselect.c:289
+#: src/x_fileselect.c:289
 msgid "Save cancelled on user request\n"
 msgstr "El usuario ha cancelado la operación de guardar los cambios\n"
 
-#. WK - catch EPS export case
-#: ../src/x_image.c:176
+#: src/x_image.c:176
 msgid "Encapsulated Postscript"
 msgstr "Postscript encapsulado"
 
-#: ../src/x_image.c:296
+#: src/x_image.c:296
 #, c-format
 msgid "x_image_lowlevel: Unable to write eps file %s.\n"
 msgstr "x_image_lowlevel: Imposible escribir archivo eps: %s.\n"
 
-#: ../src/x_image.c:374
+#: src/x_image.c:374
 #, c-format
 msgid "x_image_lowlevel: Unable to write %s file %s.\n"
 msgstr "x_image_lowlevel: Imposible escribir archivo %s: %s.\n"
 
-#: ../src/x_image.c:384
+#: src/x_image.c:384
 #, c-format
 msgid ""
 "There was the following error when saving image with type %s to filename:\n"
@@ -2099,266 +2078,266 @@ msgstr ""
 "\n"
 "%s.\n"
 
-#: ../src/x_image.c:403
+#: src/x_image.c:403
 #, c-format
 msgid "Wrote color image to [%s] [%d x %d]\n"
 msgstr "Se ha guardado la imagen en color en [%s] [%d x %d]\n"
 
-#: ../src/x_image.c:405
+#: src/x_image.c:405
 #, c-format
 msgid "Wrote black and white image to [%s] [%d x %d]\n"
 msgstr "Se ha guardado la imagen en blanco y negro en [%s] [%d x %d]\n"
 
-#: ../src/x_image.c:413
+#: src/x_image.c:413
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 msgstr "x_image_lowlevel: Imposible obtener pixbuf de la ventana de gschem.\n"
 
-#: ../src/x_image.c:458
+#: src/x_image.c:458
 msgid "Width x Height"
 msgstr "Anchura x Altura"
 
-#: ../src/x_image.c:474
+#: src/x_image.c:474
 msgid "Image type"
 msgstr "Tipo de imagen"
 
-#: ../src/x_log.c:188
+#: src/x_log.c:188
 msgid "** Invalid UTF-8 in log message. See stderr or gschem.log.\n"
 msgstr ""
 "** mensaje sin codificación UTF-8 en la ventana de registro. Véase la "
 "ventana de registro de gschem o la salida de errores.\n"
 
-#: ../src/x_log.c:256
+#: src/x_log.c:256
 msgid "Status"
 msgstr "Estado"
 
-#: ../src/x_menus.c:36
+#: src/x_menus.c:36
 msgid "/Add Net"
 msgstr "/Añadir conexión..."
 
-#: ../src/x_menus.c:37
+#: src/x_menus.c:37
 msgid "/Add Attribute..."
 msgstr "/Añadir propiedad"
 
-#: ../src/x_menus.c:38
+#: src/x_menus.c:38
 msgid "/Add Component..."
 msgstr "/Añadir componente..."
 
-#: ../src/x_menus.c:39
+#: src/x_menus.c:39
 msgid "/Add Bus"
 msgstr "/Añadir bus"
 
-#: ../src/x_menus.c:40
+#: src/x_menus.c:40
 msgid "/Add Text"
 msgstr "/Añadir texto"
 
-#: ../src/x_menus.c:42
+#: src/x_menus.c:42
 msgid "/Zoom In"
 msgstr "/Aumentar ampliación"
 
-#: ../src/x_menus.c:43
+#: src/x_menus.c:43
 msgid "/Zoom Out"
 msgstr "/Disminuir ampliación"
 
-#: ../src/x_menus.c:44
+#: src/x_menus.c:44
 msgid "/Zoom Box"
 msgstr "/Ampliar zona"
 
-#: ../src/x_menus.c:45
+#: src/x_menus.c:45
 msgid "/Zoom Extents"
 msgstr "/Mostrar todo"
 
-#: ../src/x_menus.c:47
+#: src/x_menus.c:47
 msgid "/Select"
 msgstr "/Seleccionar"
 
-#: ../src/x_menus.c:48
+#: src/x_menus.c:48
 msgid "/Edit..."
 msgstr "/Editar..."
 
-#: ../src/x_menus.c:49
+#: src/x_menus.c:49
 #, fuzzy
 msgid "/Edit pin type..."
 msgstr "Editar tipo de línea"
 
-#: ../src/x_menus.c:50
+#: src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Copiar"
 
-#: ../src/x_menus.c:51
+#: src/x_menus.c:51
 msgid "/Move"
 msgstr "/Mover"
 
-#: ../src/x_menus.c:52
+#: src/x_menus.c:52
 msgid "/Delete"
 msgstr "/Borrar"
 
-#: ../src/x_menus.c:55
+#: src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/Descender en esquema"
 
-#: ../src/x_menus.c:56
+#: src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/Descender en símbolo"
 
-#: ../src/x_menus.c:57
+#: src/x_menus.c:57
 msgid "/Up"
 msgstr "/Arriba"
 
-#: ../src/x_menus.c:316
+#: src/x_menus.c:319
 #, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr ""
 "Se ha intentado modificar la sensibilidad de una opción de menú que no "
 "existe '%s'\n"
 
-#: ../src/x_menus.c:340
+#: src/x_menus.c:343
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "¡No existen menúes contextuales!\n"
 
-#: ../src/x_menus.c:353
+#: src/x_menus.c:356
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 "Se ha intentado modificar la sensibilidad de una opción de menú que no "
 "existe\n"
 
-#. Remove this entry from all menus
-#: ../src/x_menus.c:462
+#: src/x_menus.c:436
 #, c-format
 msgid "Couldn't open file %s\n"
 msgstr "No se ha podido abrir el archivo %s\n"
 
-#: ../src/x_menus.c:524
+#: src/x_menus.c:493
 msgid "Clear"
 msgstr "Borrar"
 
-#: ../src/x_multiattrib.c:861
+#: src/x_multiattrib.c:913
 msgid "Attributes with empty name are not allowed. Please set a name."
 msgstr ""
 "No se permiten las propiedades sin nombre. Por favor, introduzca un nombre."
 
-#: ../src/x_multiattrib.c:1371
+#: src/x_multiattrib.c:1461
 msgid "Show Value only"
 msgstr "Mostrar sólo valor"
 
-#: ../src/x_multiattrib.c:1373
+#: src/x_multiattrib.c:1463
 msgid "Show Name only"
 msgstr "Mostrar sólo nombre"
 
-#: ../src/x_multiattrib.c:1400
+#: src/x_multiattrib.c:1491
+msgid "Promote"
+msgstr ""
+
+#: src/x_multiattrib.c:1495
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: ../src/x_multiattrib.c:1528
+#: src/x_multiattrib.c:1713
 msgid "Edit Attributes"
 msgstr "Editar propiedades"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1648
+#: src/x_multiattrib.c:1831
 msgid "Vis?"
 msgstr "Visible?"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1668
+#: src/x_multiattrib.c:1849
 msgid "N"
 msgstr "N"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1688
+#: src/x_multiattrib.c:1867
 msgid "V"
 msgstr "V"
 
-#: ../src/x_multiattrib.c:1709
+#: src/x_multiattrib.c:1889
+#, fuzzy
+msgid "Show inherited attributes"
+msgstr "Desvincular propiedad"
+
+#: src/x_multiattrib.c:1905
 msgid "Add Attribute"
 msgstr "Añadir propiedad"
 
-#: ../src/x_pagesel.c:257
+#: src/x_pagesel.c:257
 msgid "Discard Page"
 msgstr "Descartar página"
 
-#: ../src/x_pagesel.c:376
+#: src/x_pagesel.c:376
 msgid "Page Manager"
 msgstr "Administrador de páginas"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:432
+#: src/x_pagesel.c:432
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:448
+#: src/x_pagesel.c:448
 msgid "Changed"
 msgstr "Modificado"
 
-#. GtkLabel
-#: ../src/x_pagesel.c:468
+#: src/x_pagesel.c:468
 msgid "Right click on the filename for more options..."
 msgstr "Pulse con el botón derecho para ver más opciones..."
 
-#: ../src/x_preview.c:223
+#: src/x_preview.c:223
 #, fuzzy
 msgid "Preview Buffer"
 msgstr "Pegar"
 
-#: ../src/x_print.c:84
+#: src/x_print.c:84
 msgid "Select PostScript Filename..."
 msgstr "Seleccionar archivo PostScript..."
 
-#: ../src/x_print.c:164
+#: src/x_print.c:164
 msgid "Extents with margins"
 msgstr "Completo con márgenes"
 
-#: ../src/x_print.c:170
+#: src/x_print.c:170
 msgid "Extents no margins"
 msgstr "Completo sin márgenes"
 
-#: ../src/x_print.c:176
+#: src/x_print.c:176
 msgid "Current Window"
 msgstr "Ventana actual"
 
-#: ../src/x_print.c:210
+#: src/x_print.c:210
 msgid "Landscape"
 msgstr "Apaisado"
 
-#: ../src/x_print.c:216
+#: src/x_print.c:216
 msgid "Portrait"
 msgstr "Vertical"
 
-#. Upper frame
-#: ../src/x_print.c:284
+#: src/x_print.c:284
 msgid "Settings"
 msgstr "Opciones"
 
-#: ../src/x_print.c:296
+#: src/x_print.c:296
 msgid "Output paper size:"
 msgstr "Tamaño de papel:"
 
-#: ../src/x_print.c:318
+#: src/x_print.c:318
 msgid "Orientation:"
 msgstr "Orientación:"
 
-#. Lower frame
-#: ../src/x_print.c:330
+#: src/x_print.c:330
 msgid "Destination"
 msgstr "Destino"
 
-#: ../src/x_print.c:343
+#: src/x_print.c:343
 msgid "File:"
 msgstr "Archivo:"
 
-#: ../src/x_print.c:373
+#: src/x_print.c:373
 msgid "Command:"
 msgstr "Comando:"
 
-#: ../src/x_print.c:741
+#: src/x_print.c:741
 msgid "No print destination specified\n"
 msgstr "No se ha especificado el destino de impresión\n"
 
-#: ../src/x_print.c:748
+#: src/x_print.c:748
 #, c-format
 msgid "Cannot print current schematic to [%s]\n"
 msgstr "No se puede imprimir el esquema actual a [%s]\n"
 
-#: ../src/x_print.c:757
+#: src/x_print.c:757
 #, c-format
 msgid ""
 "Error printing to file '%s'\n"
@@ -2367,45 +2346,45 @@ msgstr ""
 "Error al imprimir al fichero '%s'\n"
 "Vea la ventana de registro para más información"
 
-#: ../src/x_print.c:764
+#: src/x_print.c:764
 #, c-format
 msgid "Printed current schematic to [%s]\n"
 msgstr "Se ha imprimido el esquema actual a [%s]\n"
 
-#: ../src/x_window.c:81
+#: src/x_window.c:81
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr "No se ha podido reservar memoria para la variable gc\n"
 
-#: ../src/x_window.c:317
+#: src/x_window.c:317
 msgid "New file"
 msgstr "Nuevo archivo"
 
-#: ../src/x_window.c:323
+#: src/x_window.c:323
 msgid "Open"
 msgstr "Abrir"
 
-#: ../src/x_window.c:324
+#: src/x_window.c:324
 msgid "Open file..."
 msgstr "Abrir archivo"
 
-#: ../src/x_window.c:330
+#: src/x_window.c:330
 msgid "Save"
 msgstr "Guardar"
 
-#: ../src/x_window.c:331
+#: src/x_window.c:331
 msgid "Save file"
 msgstr "Guardar archivo"
 
-#: ../src/x_window.c:339
+#: src/x_window.c:339
 msgid "Undo last operation"
 msgstr "Deshacer última operación"
 
-#: ../src/x_window.c:346
+#: src/x_window.c:346
 msgid "Redo last undo"
 msgstr "Rehacer el último deshacer"
 
-#: ../src/x_window.c:355
+#: src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2417,7 +2396,7 @@ msgstr ""
 "ventana principal, y presione el botón izq. del ratón para colocarlo.\n"
 "Botón derecho del ratón para cancelar"
 
-#: ../src/x_window.c:365
+#: src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2425,7 +2404,7 @@ msgstr ""
 "Añadir conexión\n"
 "Botón derecho del ratón para cancelar"
 
-#: ../src/x_window.c:375
+#: src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2433,90 +2412,89 @@ msgstr ""
 "Añadir bus\n"
 "Botón derecho del ratón para cancelar"
 
-#: ../src/x_window.c:383
+#: src/x_window.c:383
 msgid "Add Text..."
 msgstr "Añadir texto..."
 
-#: ../src/x_window.c:393
+#: src/x_window.c:393
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../src/x_window.c:394
+#: src/x_window.c:394
 msgid "Select mode"
 msgstr "Seleccionar"
 
-#: ../src/x_window.c:481
+#: src/x_window.c:481
 msgid "Pick"
 msgstr "Coger"
 
-#: ../src/x_window.c:497
+#: src/x_window.c:497
 msgid "Repeat/none"
 msgstr "Repetir/ninguno"
 
-#: ../src/x_window.c:507
+#: src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "Menú/Cancelar"
 
-#: ../src/x_window.c:509
+#: src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "Panorámica/Cancelar"
 
-#: ../src/x_window.c:733
+#: src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Cargando esquema [%s]\n"
 
-#: ../src/x_window.c:745
+#: src/x_window.c:745
 msgid "Failed to load file"
 msgstr "Fallo al cargar el archivo"
 
-#: ../src/x_window.c:754
+#: src/x_window.c:754
 #, c-format
 msgid "New file [%s]\n"
 msgstr "Nuevo archivo [%s]\n"
 
-#. an error occured when saving page to file
-#: ../src/x_window.c:859
+#: src/x_window.c:859
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "NO se ha podido guardar la página [%s]\n"
 
-#: ../src/x_window.c:860
+#: src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Error al intentar guardar"
 
-#: ../src/x_window.c:869
+#: src/x_window.c:869
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "Guardado como [%s]\n"
 
-#: ../src/x_window.c:871
+#: src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Guardado [%s]\n"
 
-#: ../src/x_window.c:873
+#: src/x_window.c:873
 msgid "Saved"
 msgstr "Guardado"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Descartando página [%s]\n"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Cerrando [%s]\n"
 
-#: ../data/geda-gschem.desktop.in.h:1
-msgid "Create and edit electrical schematics and symbols with gschem"
-msgstr "Crear y modificar esquemas y símbolos con gschem"
-
-#: ../data/geda-gschem.desktop.in.h:2
+#: data/geda-gschem.desktop.in.h:3
 msgid "gEDA Schematic Editor"
 msgstr "Editor de esquemas gEDA"
 
+#: data/geda-gschem.desktop.in.h:4
+msgid "Create and edit electrical schematics and symbols with gschem"
+msgstr "Crear y modificar esquemas y símbolos con gschem"
+
 #~ msgid "Cut Buffer"
 #~ msgstr "Cortar"
 
diff --git a/gschem/po/fr.po b/gschem/po/fr.po
index e1979d8..cd1b3b6 100644
--- a/gschem/po/fr.po
+++ b/gschem/po/fr.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr_FR\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 14:35-0400\n"
+"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
+"POT-Creation-Date: 2009-06-18 11:53+0100\n"
 "PO-Revision-Date: 2008-12-20 14:26+0000\n"
 "Last-Translator: Patrick Bernaud <b-patrick@xxxxxxxxxx>\n"
 "Language-Team: French\n"
@@ -18,630 +18,620 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/rcstrings.c:2
+#: src/rcstrings.c:2
 msgid "File"
 msgstr "Fichier"
 
-#: ../src/rcstrings.c:3
+#: src/rcstrings.c:3
 msgid "New Window"
 msgstr "Nouvelle fenêtre"
 
-#: ../src/rcstrings.c:4 ../src/x_pagesel.c:252
+#: src/rcstrings.c:4 src/x_pagesel.c:252
 msgid "New Page"
 msgstr "Nouvelle page"
 
-#: ../src/rcstrings.c:5 ../src/x_pagesel.c:253
+#: src/rcstrings.c:5 src/x_pagesel.c:253
 msgid "Open Page..."
 msgstr "Ouvrir une page..."
 
-#: ../src/rcstrings.c:6 ../src/x_pagesel.c:256
+#: src/rcstrings.c:6 src/x_pagesel.c:256
 msgid "Close Page"
 msgstr "Fermer la page"
 
-#: ../src/rcstrings.c:7
+#: src/rcstrings.c:7
 msgid "Revert Page"
 msgstr "Annuler les modifications"
 
-#: ../src/rcstrings.c:8 ../src/x_pagesel.c:255
+#: src/rcstrings.c:8 src/x_pagesel.c:255
 msgid "Save Page"
 msgstr "Enregistrer la page"
 
-#: ../src/rcstrings.c:9
+#: src/rcstrings.c:9
 msgid "Save Page As..."
 msgstr "Enregistrer la page sous..."
 
-#: ../src/rcstrings.c:10
+#: src/rcstrings.c:10
 msgid "Save All"
 msgstr "Enregistrer toutes les pages"
 
-#. GtkWindow
-#: ../src/rcstrings.c:11 ../src/x_print.c:276
+#: src/rcstrings.c:11 src/x_print.c:276
 msgid "Print..."
 msgstr "Imprimer..."
 
-#. Create the dialog
-#: ../src/rcstrings.c:12 ../src/x_image.c:495
+#: src/rcstrings.c:12 src/x_image.c:495
 #, fuzzy
 msgid "Write image..."
 msgstr "Exporter l'image..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:501
+#: src/rcstrings.c:13
 #, fuzzy
 msgid "Recent files"
 msgstr "Nouveau fichier"
 
-#: ../src/rcstrings.c:14 ../src/x_script.c:47
+#: src/rcstrings.c:14 src/x_script.c:47
 msgid "Execute Script..."
 msgstr "Exécuter le script..."
 
-#: ../src/rcstrings.c:15
+#: src/rcstrings.c:15
 msgid "Close Window"
 msgstr "Fermer la fenêtre"
 
-#: ../src/rcstrings.c:16
+#: src/rcstrings.c:16
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
+#: src/rcstrings.c:18 src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Ã?dition"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:338
+#: src/rcstrings.c:19 src/x_window.c:338
 msgid "Undo"
 msgstr "Défaire"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:345
+#: src/rcstrings.c:20 src/x_window.c:345
 msgid "Redo"
 msgstr "Refaire"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
+#: src/rcstrings.c:21 src/i_basic.c:77 src/x_window.c:521
 msgid "Select Mode"
 msgstr "Mode Sélection"
 
-#: ../src/rcstrings.c:22
+#: src/rcstrings.c:22
 #, fuzzy
 msgid "Cut"
 msgstr "Couper 1"
 
-#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
-#: ../src/i_callbacks.c:560
+#: src/rcstrings.c:23 src/i_basic.c:135 src/i_callbacks.c:536
+#: src/i_callbacks.c:560
 msgid "Copy"
 msgstr "Copier"
 
-#: ../src/rcstrings.c:24
+#: src/rcstrings.c:24
 #, fuzzy
 msgid "Paste"
 msgstr "Coller 1"
 
-#: ../src/rcstrings.c:25
+#: src/rcstrings.c:25
 msgid "Edit..."
 msgstr "Ã?diter"
 
-#: ../src/rcstrings.c:26
+#: src/rcstrings.c:26
 msgid "Edit Text..."
 msgstr "Ã?diter le texte..."
 
-#: ../src/rcstrings.c:27 ../src/i_basic.c:84
+#: src/rcstrings.c:27 src/i_basic.c:84
 msgid "Copy Mode"
 msgstr "Mode Copie"
 
-#: ../src/rcstrings.c:28 ../src/i_basic.c:142
+#: src/rcstrings.c:28 src/i_basic.c:142
 msgid "Multiple Copy Mode"
 msgstr "Mode Copie Multiple"
 
-#: ../src/rcstrings.c:29 ../src/i_basic.c:87
+#: src/rcstrings.c:29 src/i_basic.c:87
 msgid "Move Mode"
 msgstr "Mode Déplacement"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
+#: src/rcstrings.c:30 src/i_callbacks.c:670 src/x_multiattrib.c:1496
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../src/rcstrings.c:31
+#: src/rcstrings.c:31
 msgid "Rotate 90 Mode"
 msgstr "Mode Rotation 90"
 
-#: ../src/rcstrings.c:32 ../src/i_basic.c:91
+#: src/rcstrings.c:32 src/i_basic.c:91
 msgid "Mirror Mode"
 msgstr "Mode Miroir"
 
-#: ../src/rcstrings.c:33
+#: src/rcstrings.c:33
 msgid "Slot..."
 msgstr "Slot..."
 
-#: ../src/rcstrings.c:34
+#: src/rcstrings.c:34
 msgid "Color..."
 msgstr "Couleur..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
+#: src/rcstrings.c:35 src/i_callbacks.c:920 src/x_dialog.c:2411
 msgid "Lock"
 msgstr "Verrouiller"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
+#: src/rcstrings.c:36 src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "Déverrouiller"
 
-#: ../src/rcstrings.c:37
+#: src/rcstrings.c:37
 msgid "Line Width & Type..."
 msgstr "Ã?paisseur & type de ligne..."
 
-#: ../src/rcstrings.c:38
+#: src/rcstrings.c:38
 msgid "Fill Type..."
 msgstr "Type de remplissage..."
 
-#: ../src/rcstrings.c:39
+#: src/rcstrings.c:39
 msgid "Symbol Translate..."
 msgstr "Translater le symbole..."
 
-#: ../src/rcstrings.c:40
+#: src/rcstrings.c:40
 msgid "Embed Component/Picture"
 msgstr "Embarquer le composant/l'image"
 
-#: ../src/rcstrings.c:41
+#: src/rcstrings.c:41
 msgid "Unembed Component/Picture"
 msgstr "Débarquer le composant/l'image"
 
-#: ../src/rcstrings.c:42
+#: src/rcstrings.c:42
 msgid "Update Component"
 msgstr "Mise à jour du composant"
 
-#: ../src/rcstrings.c:43
+#: src/rcstrings.c:43
 msgid "Show/Hide Inv Text"
 msgstr "Afficher/Cacher le texte invisible"
 
-#: ../src/rcstrings.c:44
+#: src/rcstrings.c:44
 msgid "Make Inv Text Vis"
 msgstr "Rendre le texte invisible visible"
 
-#: ../src/rcstrings.c:46
+#: src/rcstrings.c:46
 msgid "Buffer"
 msgstr "Tampon"
 
-#: ../src/rcstrings.c:47
+#: src/rcstrings.c:47
 msgid "Copy into 1"
 msgstr "Copier dans 1"
 
-#: ../src/rcstrings.c:48
+#: src/rcstrings.c:48
 msgid "Copy into 2"
 msgstr "Copier dans 2"
 
-#: ../src/rcstrings.c:49
+#: src/rcstrings.c:49
 msgid "Copy into 3"
 msgstr "Copier dans 3"
 
-#: ../src/rcstrings.c:50
+#: src/rcstrings.c:50
 msgid "Copy into 4"
 msgstr "Copier dans 4"
 
-#: ../src/rcstrings.c:51
+#: src/rcstrings.c:51
 msgid "Copy into 5"
 msgstr "Copier dans 5"
 
-#: ../src/rcstrings.c:52
+#: src/rcstrings.c:52
 msgid "Cut into 1"
 msgstr "Couper dans 1"
 
-#: ../src/rcstrings.c:53
+#: src/rcstrings.c:53
 msgid "Cut into 2"
 msgstr "Couper dans 2"
 
-#: ../src/rcstrings.c:54
+#: src/rcstrings.c:54
 msgid "Cut into 3"
 msgstr "Couper dans 3"
 
-#: ../src/rcstrings.c:55
+#: src/rcstrings.c:55
 msgid "Cut into 4"
 msgstr "Couper dans 4"
 
-#: ../src/rcstrings.c:56
+#: src/rcstrings.c:56
 msgid "Cut into 5"
 msgstr "Couper dans 5"
 
-#: ../src/rcstrings.c:57
+#: src/rcstrings.c:57
 msgid "Paste from 1"
 msgstr "Coller depuis 1"
 
-#: ../src/rcstrings.c:58
+#: src/rcstrings.c:58
 msgid "Paste from 2"
 msgstr "Coller depuis 2"
 
-#: ../src/rcstrings.c:59
+#: src/rcstrings.c:59
 msgid "Paste from 3"
 msgstr "Coller depuis 3"
 
-#: ../src/rcstrings.c:60
+#: src/rcstrings.c:60
 msgid "Paste from 4"
 msgstr "Coller depuis 4"
 
-#: ../src/rcstrings.c:61
+#: src/rcstrings.c:61
 msgid "Paste from 5"
 msgstr "Coller depuis 5"
 
-#: ../src/rcstrings.c:63
+#: src/rcstrings.c:63
 msgid "View"
 msgstr "Affichage"
 
-#: ../src/rcstrings.c:64
+#: src/rcstrings.c:64
 msgid "Redraw"
 msgstr "Redessiner"
 
-#. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
+#: src/rcstrings.c:65 src/i_callbacks.c:1474 src/i_callbacks.c:1546
 msgid "Pan"
 msgstr "Panoramique"
 
-#: ../src/rcstrings.c:66 ../src/i_basic.c:95
+#: src/rcstrings.c:66 src/i_basic.c:95
 msgid "Zoom Box"
 msgstr "Zoom boîte"
 
-#: ../src/rcstrings.c:67
+#: src/rcstrings.c:67
 msgid "Zoom Extents"
 msgstr "Agrandissement auto"
 
-#: ../src/rcstrings.c:68
+#: src/rcstrings.c:68
 msgid "Zoom In"
 msgstr "Réduction"
 
-#: ../src/rcstrings.c:69
+#: src/rcstrings.c:69
 msgid "Zoom Out"
 msgstr "Agrandissement"
 
-#: ../src/rcstrings.c:70
+#: src/rcstrings.c:70
 msgid "Zoom Full"
 msgstr "Agrandissement minimum"
 
-#: ../src/rcstrings.c:71
+#: src/rcstrings.c:71
 msgid "Dark color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:72
+#: src/rcstrings.c:72
 msgid "Light color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:74
+#: src/rcstrings.c:74
 msgid "Page"
 msgstr "Page"
 
-#: ../src/rcstrings.c:75
+#: src/rcstrings.c:75
 msgid "Manager..."
 msgstr "Gestionnaire..."
 
-#: ../src/rcstrings.c:76
+#: src/rcstrings.c:76
 msgid "Next"
 msgstr "Suivante"
 
-#: ../src/rcstrings.c:77
+#: src/rcstrings.c:77
 msgid "Previous"
 msgstr "Précédente"
 
-#: ../src/rcstrings.c:78 ../src/x_window.c:316
+#: src/rcstrings.c:78 src/x_window.c:316
 msgid "New"
 msgstr "Nouvelle"
 
-#: ../src/rcstrings.c:79
+#: src/rcstrings.c:79
 msgid "Revert"
 msgstr "Restaurer"
 
-#: ../src/rcstrings.c:80
+#: src/rcstrings.c:80
 msgid "Close"
 msgstr "Fermer"
 
-#: ../src/rcstrings.c:81
+#: src/rcstrings.c:81
 msgid "Discard"
 msgstr "Abandonner"
 
-#: ../src/rcstrings.c:83
+#: src/rcstrings.c:83
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../src/rcstrings.c:84
+#: src/rcstrings.c:84
 msgid "Component..."
 msgstr "Composant..."
 
-#. need to click
-#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
-#: ../src/x_dialog.c:2376
+#: src/rcstrings.c:85 src/i_callbacks.c:2401 src/i_callbacks.c:2428
+#: src/x_dialog.c:2378
 msgid "Net"
 msgstr "Piste"
 
-#. need to click
-#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
-#: ../src/x_dialog.c:2394 ../src/x_window.c:374
+#: src/rcstrings.c:86 src/i_callbacks.c:2472 src/i_callbacks.c:2499
+#: src/x_dialog.c:2396 src/x_window.c:374
 msgid "Bus"
 msgstr "Bus"
 
-#: ../src/rcstrings.c:87
+#: src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "Attribut..."
 
-#: ../src/rcstrings.c:88
+#: src/rcstrings.c:88
 msgid "Text..."
 msgstr "Texte..."
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
+#: src/rcstrings.c:89 src/i_callbacks.c:2580 src/i_callbacks.c:2603
 msgid "Line"
 msgstr "Ligne"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
+#: src/rcstrings.c:90 src/i_callbacks.c:2625 src/i_callbacks.c:2648
 msgid "Box"
 msgstr "Boîte"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
+#: src/rcstrings.c:91 src/i_callbacks.c:2704 src/i_callbacks.c:2728
 msgid "Circle"
 msgstr "Cercle"
 
-#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
+#: src/rcstrings.c:92 src/i_callbacks.c:2750 src/i_callbacks.c:2773
 msgid "Arc"
 msgstr "Arc"
 
-#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
-#: ../src/x_dialog.c:2367
+#: src/rcstrings.c:93 src/i_callbacks.c:2795 src/i_callbacks.c:2818
+#: src/x_dialog.c:2369
 msgid "Pin"
 msgstr "Broche"
 
-#: ../src/rcstrings.c:94
+#: src/rcstrings.c:94
 msgid "Picture..."
 msgstr "Image..."
 
-#: ../src/rcstrings.c:96
+#: src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "Hiérarchie"
 
-#: ../src/rcstrings.c:97
+#: src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "Descendre dans la hiérarchie"
 
-#: ../src/rcstrings.c:98
+#: src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "Descendre dans le symbole"
 
-#: ../src/rcstrings.c:99
+#: src/rcstrings.c:99
 msgid "Up"
 msgstr "Remonter"
 
-#: ../src/rcstrings.c:100
+#: src/rcstrings.c:100
 msgid "Documentation"
 msgstr "Documentation"
 
-#. GtkFrame
-#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
-#: ../src/x_multiattrib.c:1543
+#: src/rcstrings.c:102 src/x_compselect.c:1417
 msgid "Attributes"
 msgstr "Attributs"
 
-#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
+#: src/rcstrings.c:103 src/i_callbacks.c:3089
 msgid "Attach"
 msgstr "Attacher"
 
-#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
+#: src/rcstrings.c:104 src/i_callbacks.c:3136
 msgid "Detach"
 msgstr "Détacher"
 
-#: ../src/rcstrings.c:105
+#: src/rcstrings.c:105
 msgid "Show Value"
 msgstr "Montrer la valeur"
 
-#: ../src/rcstrings.c:106
+#: src/rcstrings.c:106
 msgid "Show Name"
 msgstr "Montrer le nom"
 
-#: ../src/rcstrings.c:107
+#: src/rcstrings.c:107
 msgid "Show Both"
 msgstr "Montrer le nom et la valeur"
 
-#: ../src/rcstrings.c:108
+#: src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "Afficher/Cacher"
 
-#: ../src/rcstrings.c:109
+#: src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "Rechercher le texte..."
 
-#: ../src/rcstrings.c:110
+#: src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "Cacher le texte..."
 
-#: ../src/rcstrings.c:111
+#: src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "Montrer le texte..."
 
-#: ../src/rcstrings.c:112
+#: src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr "Annotation automatique..."
 
-#: ../src/rcstrings.c:114
+#: src/rcstrings.c:114
 msgid "Options"
 msgstr "Options"
 
-#: ../src/rcstrings.c:115
+#: src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "Taille de texte..."
 
-#: ../src/rcstrings.c:116
+#: src/rcstrings.c:116
 msgid "Cycle grid styles"
 msgstr ""
 
-#: ../src/rcstrings.c:117
+#: src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr "Activer/Désactiver le snap"
 
-#: ../src/rcstrings.c:118
+#: src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "Espacement de la grille de snap..."
 
-#: ../src/rcstrings.c:119
+#: src/rcstrings.c:119
 #, fuzzy
 msgid "Scale up Grid Spacing"
 msgstr "Espacement de la grille de snap..."
 
-#: ../src/rcstrings.c:120
+#: src/rcstrings.c:120
 #, fuzzy
 msgid "Scale down Grid Spacing"
 msgstr "Espacement de la grille de snap..."
 
-#: ../src/rcstrings.c:121
+#: src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr ""
 
-#: ../src/rcstrings.c:122
+#: src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr ""
 
-#: ../src/rcstrings.c:123
+#: src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "Montrer la fenêtre de messages..."
 
-#: ../src/rcstrings.c:124
+#: src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "Montrer la fenêtre de coordonnées..."
 
-#: ../src/rcstrings.c:126
+#: src/rcstrings.c:126
 msgid "Help"
 msgstr "Aide"
 
-#: ../src/rcstrings.c:127
+#: src/rcstrings.c:127
 #, fuzzy
 msgid "Manual"
 msgstr "Manuel..."
 
-#: ../src/rcstrings.c:128
+#: src/rcstrings.c:128
 #, fuzzy
 msgid "gEDA Documentation"
 msgstr "Documentation"
 
-#: ../src/rcstrings.c:129
+#: src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr ""
 
-#: ../src/rcstrings.c:130
+#: src/rcstrings.c:130
 #, fuzzy
 msgid "Component Documentation"
 msgstr "Documentation"
 
-#: ../src/rcstrings.c:131
+#: src/rcstrings.c:131
 msgid "About gschem"
 msgstr ""
 
-#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
+#: src/rcstrings.c:132 src/x_dialog.c:2724
 msgid "Hotkeys"
 msgstr "Raccourcis"
 
-#: ../src/a_zoom.c:212
+#: src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Agrandissement maximum ! Impossible d'agrandir plus.\n"
 
-#. Fork failed. Still in parent process, so can use the log
-#. * window
-#: ../src/g_funcs.c:339 ../src/i_callbacks.c:68
+#: src/g_funcs.c:339 src/i_callbacks.c:68
 #, c-format
 msgid "Could not fork\n"
 msgstr "Impossible de créer un processus fils\n"
 
-#. if we return, then nothing happened
-#: ../src/g_funcs.c:355 ../src/i_callbacks.c:78
+#: src/g_funcs.c:355 src/i_callbacks.c:78
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr "Impossible de lancer %s\n"
 
-#: ../src/g_funcs.c:361 ../src/i_callbacks.c:82
+#: src/g_funcs.c:361 src/i_callbacks.c:82
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Commandes de documentation non supportées sous MinGW.\n"
 
-#: ../src/g_rc.c:292
+#: src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Agrandissement [%d] passé à %s invalide\n"
 
-#: ../src/g_rc.c:418
+#: src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Taille [%d] passée à text-size invalide\n"
 
-#: ../src/g_rc.c:445
+#: src/g_rc.c:445
 #, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "Taille [%f] passée à postscript-font-scale invalide\n"
 
-#: ../src/g_rc.c:488
+#: src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Taille [%d] passée à snap-size invalide\n"
 
-#: ../src/g_rc.c:960
+#: src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "Nombre de niveaux [%d] passé à undo-levels invalide\n"
 
-#: ../src/g_rc.c:1218
+#: src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "Taille [%d] passée à bus-ripper-size invalide\n"
 
-#: ../src/g_rc.c:1293
+#: src/g_rc.c:1293
 #, fuzzy, c-format
 msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr "Taille de point [%d] passée à grid-dot-size invalide\n"
 
-#: ../src/g_rc.c:1334
+#: src/g_rc.c:1334
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 msgstr ""
 "Seuil d'affichage de grille [%d] passé à grid-fixed-threshold invalide\n"
 
-#: ../src/g_rc.c:1360
+#: src/g_rc.c:1360
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 msgstr ""
 "Seuil d'affichage de grille [%d] passé à grid-fixed-threshold invalide\n"
 
-#: ../src/g_rc.c:1404
+#: src/g_rc.c:1404
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "Offset [%d] passé à add-attribute-offset invalide\n"
 
-#: ../src/g_rc.c:1428
+#: src/g_rc.c:1428
 #, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr "Nombre de secondes [%d] passé  auto-save-interval invalide\n"
 
-#: ../src/g_rc.c:1469
+#: src/g_rc.c:1469
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Gain [%d] passé à mousepan-gain invalide\n"
 
-#: ../src/g_rc.c:1492
+#: src/g_rc.c:1492
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Gain [%d] passé à keyboardpan-gain invalide\n"
 
-#: ../src/g_rc.c:1538
+#: src/g_rc.c:1538
 #, fuzzy, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr "Nombre de secondes [%d] passé  auto-save-interval invalide\n"
 
-#: ../src/g_rc.c:1564
+#: src/g_rc.c:1564
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "Gain [%d] passé à mousepan-gain invalide\n"
 
-#: ../src/g_rc.c:1589
+#: src/g_rc.c:1589
 #, fuzzy, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr "Nombre de secondes [%d] passé  auto-save-interval invalide\n"
 
-#: ../src/gschem.c:183 ../src/gschem.c:194
+#: src/gschem.c:183 src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem version %s%s.%s\n"
 
-#: ../src/gschem.c:186 ../src/gschem.c:197
+#: src/gschem.c:186 src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
 "details.\n"
 msgstr "gEDA/gschem n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE.\n"
 
-#: ../src/gschem.c:188 ../src/gschem.c:199
+#: src/gschem.c:188 src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -649,7 +639,7 @@ msgstr ""
 "Ceci est un logiciel libre et vous êtes invité à le redistribuer en "
 "respectant\n"
 
-#: ../src/gschem.c:190 ../src/gschem.c:201
+#: src/gschem.c:190 src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -659,17 +649,17 @@ msgstr ""
 "COPYING.\n"
 "\n"
 
-#: ../src/gschem.c:205
+#: src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "Ceci est le portage sous MINGW32\n"
 
-#: ../src/gschem.c:209
+#: src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Locale en cours : %s\n"
 
-#: ../src/gschem.c:224
+#: src/gschem.c:224
 msgid ""
 "You must set the GEDADATA environment variable!\n"
 "\n"
@@ -677,223 +667,246 @@ msgid ""
 "environment variable to point to the correct location.\n"
 msgstr ""
 
-#: ../src/gschem.c:251
+#: src/gschem.c:251
 #, fuzzy, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "�chec de la lecture du fichier scm de démarrage [%s]\n"
 
-#: ../src/gschem.c:255
+#: src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Lecture du fichier scm de démarrage [%s]\n"
 
-#. ! \todo These two messages are the same. Should be
-#. * integrated.
-#: ../src/gschem.c:259
+#: src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "�chec de la lecture du fichier scm de démarrage [%s]\n"
 
-#: ../src/gschem.c:320
+#: src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Répertoire Scheme NON initialisé !\n"
 
-#: ../src/gschem.c:327 ../src/x_script.c:66
+#: src/gschem.c:327 src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Exécution du script guile [%s]\n"
 
-#: ../src/gschem_cairo.c:310
+#: src/gschem_accel_label.c:319
+msgid "Accelerator Closure"
+msgstr ""
+
+#: src/gschem_accel_label.c:320
+msgid "The closure to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:326
+msgid "Accelerator Widget"
+msgstr ""
+
+#: src/gschem_accel_label.c:327
+msgid "The widget to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:333
+#, fuzzy
+msgid "Accelerator String"
+msgstr "Saisie de texte"
+
+#: src/gschem_accel_label.c:334
+msgid "The accelerator string to be displayed"
+msgstr ""
+
+#: src/gschem_cairo.c:310
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "Extrémité de ligne inconnue (%d)\n"
 
-#: ../src/gschem_cairo.c:318
+#: src/gschem_cairo.c:318
 #, fuzzy, c-format
 msgid "Unknown type for stroke (%d) !\n"
 msgstr "Type de ligne pour ligne inconnu (%d) !\n"
 
-#: ../src/i_basic.c:79
+#: src/i_basic.c:79
 msgid "Component Mode"
 msgstr "Mode Composant"
 
-#: ../src/i_basic.c:81
+#: src/i_basic.c:81
 msgid "Text Mode"
 msgstr "Mode Texte"
 
-#: ../src/i_basic.c:89
+#: src/i_basic.c:89
 msgid "Rotate Mode"
 msgstr "Mode Rotation"
 
-#: ../src/i_basic.c:99
+#: src/i_basic.c:99
 msgid "Pan Mode"
 msgstr "Mode Panoramique"
 
-#: ../src/i_basic.c:103
+#: src/i_basic.c:103
 #, c-format
 msgid "Paste %d Mode"
 msgstr "Mode Coller %d"
 
-#: ../src/i_basic.c:109
+#: src/i_basic.c:109
 #, fuzzy
 msgid "Magnetic Net Mode"
 msgstr "Mode Lien"
 
-#: ../src/i_basic.c:111
+#: src/i_basic.c:111
 msgid "Net Mode"
 msgstr "Mode Lien"
 
-#: ../src/i_basic.c:115
+#: src/i_basic.c:115
 msgid "Bus Mode"
 msgstr "Mode Bus"
 
-#: ../src/i_basic.c:118
+#: src/i_basic.c:118
 msgid "Line Mode"
 msgstr "Mode Ligne"
 
-#: ../src/i_basic.c:121
+#: src/i_basic.c:121
 msgid "Box Mode"
 msgstr "Mode Boîte"
 
-#: ../src/i_basic.c:124
+#: src/i_basic.c:124
 msgid "Picture Mode"
 msgstr "Mode Image"
 
-#: ../src/i_basic.c:127
+#: src/i_basic.c:127
 msgid "Circle Mode"
 msgstr "Mode Cercle"
 
-#: ../src/i_basic.c:130
+#: src/i_basic.c:130
 msgid "Arc Mode"
 msgstr "Mode Arc"
 
-#: ../src/i_basic.c:133
+#: src/i_basic.c:133
 msgid "Pin Mode"
 msgstr "Mode Broche"
 
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
+#: src/i_basic.c:137 src/i_callbacks.c:626 src/i_callbacks.c:650
 msgid "Move"
 msgstr "Déplacer"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
+#: src/i_basic.c:139 src/i_callbacks.c:581 src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Copie Multiple"
 
-#: ../src/i_basic.c:168
+#: src/i_basic.c:168
 msgid "Show Hidden"
 msgstr "Montrer caché"
 
-#: ../src/i_basic.c:171
+#: src/i_basic.c:171
 msgid "Snap Off"
 msgstr "Snap Off"
 
-#: ../src/i_basic.c:173
+#: src/i_basic.c:173
 msgid "Resnap Active"
 msgstr ""
 
-#: ../src/i_basic.c:254 ../src/x_window.c:495
+#: src/i_basic.c:254 src/x_window.c:495
 msgid "Action"
 msgstr "Action"
 
-#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
+#: src/i_basic.c:260 src/x_dialog.c:2408 src/x_window.c:490
 msgid "Stroke"
 msgstr ""
 
-#: ../src/i_basic.c:266 ../src/x_window.c:492
+#: src/i_basic.c:266 src/x_window.c:492
 msgid "none"
 msgstr "aucun"
 
-#: ../src/i_basic.c:271
+#: src/i_basic.c:271
 msgid "Repeat/"
 msgstr "Répéter"
 
-#: ../src/i_basic.c:549 ../src/i_basic.c:563
+#: src/i_basic.c:549 src/i_basic.c:563
 msgid "OFF"
 msgstr ""
 
-#: ../src/i_basic.c:567
+#: src/i_basic.c:567
 msgid "NONE"
 msgstr ""
 
-#: ../src/i_basic.c:572
+#: src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Grille(%s,%s)"
 
-#: ../src/i_callbacks.c:63
+#: src/i_callbacks.c:63
 #, c-format
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentation pour [%s,%s,%s,%s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
+#: src/i_callbacks.c:123 src/i_callbacks.c:1705
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Nouvelle page [%s] créée\n"
 
-#: ../src/i_callbacks.c:163
+#: src/i_callbacks.c:163
 #, fuzzy, c-format
 msgid "New Window created [%s]\n"
 msgstr "Nouvelle fenêtre créée\n"
 
-#: ../src/i_callbacks.c:281
+#: src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "Ã?chec de la sauvegarde de toutes les pages"
 
-#: ../src/i_callbacks.c:283
+#: src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Toutes les pages enregistrées"
 
-#: ../src/i_callbacks.c:373
+#: src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "Fermeture de la fenêtre\n"
 
-#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
+#: src/i_callbacks.c:541 src/i_callbacks.c:586 src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "Sélectionnez d'abord des objets"
 
-#: ../src/i_callbacks.c:710
+#: src/i_callbacks.c:710
 #, fuzzy
 msgid "Edit pin type"
 msgstr "Ã?diter le type de ligne"
 
-#: ../src/i_callbacks.c:729
+#: src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Ã?diter le texte"
 
-#: ../src/i_callbacks.c:752
+#: src/i_callbacks.c:752
 msgid "Slot"
 msgstr "Slot"
 
-#: ../src/i_callbacks.c:769
+#: src/i_callbacks.c:769
 msgid "Color"
 msgstr "Couleur"
 
-#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
+#: src/i_callbacks.c:806 src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Pivoter"
 
-#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
+#: src/i_callbacks.c:874 src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Miroir"
 
-#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
+#: src/i_callbacks.c:956 src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Translater"
 
-#: ../src/i_callbacks.c:959
+#: src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "ATTENTION : ne translatez pas quand le snap est désactivé !\n"
 
-#: ../src/i_callbacks.c:960
+#: src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr "ATTENTION : activation du snap et poursuite de la translation.\n"
 
-#: ../src/i_callbacks.c:967
+#: src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "ATTENTION : la taille du snap sur la grille n'est pas égale à 100 !\n"
 
-#: ../src/i_callbacks.c:969
+#: src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -901,393 +914,390 @@ msgstr ""
 "ATTENTION : si vous déplacez un symbole à l'origine, la taille de snap de la "
 "grille devrait être de 100 !\n"
 
-#: ../src/i_callbacks.c:1000
+#: src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "Embarquer"
 
-#: ../src/i_callbacks.c:1041
+#: src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "Débarquer"
 
-#: ../src/i_callbacks.c:1084
+#: src/i_callbacks.c:1085
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: ../src/i_callbacks.c:1141
+#: src/i_callbacks.c:1144
 msgid "ShowHidden"
 msgstr "AfficheCaché"
 
-#: ../src/i_callbacks.c:1165
+#: src/i_callbacks.c:1168
 msgid "MakeVisible"
 msgstr "RendVisible"
 
-#: ../src/i_callbacks.c:1562
+#: src/i_callbacks.c:1565
 msgid "Update Cues"
 msgstr "Met à jour les extrémités"
 
-#: ../src/i_callbacks.c:1746
+#: src/i_callbacks.c:1749
 msgid "Really revert page?"
 msgstr "Abandonner les modifications ?"
 
-#: ../src/i_callbacks.c:1816
+#: src/i_callbacks.c:1819
 msgid "Copy to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1834
+#: src/i_callbacks.c:1837
 msgid "Cut to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1852
+#: src/i_callbacks.c:1855
 #, fuzzy
 msgid "Paste from clipboard"
 msgstr "Coller depuis 1"
 
-#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
-#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
-#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+#: src/i_callbacks.c:1867 src/i_callbacks.c:2106 src/i_callbacks.c:2128
+#: src/i_callbacks.c:2150 src/i_callbacks.c:2172 src/i_callbacks.c:2194
 msgid "Empty buffer"
 msgstr "Tampon vide"
 
-#: ../src/i_callbacks.c:1909
+#: src/i_callbacks.c:1912
 msgid "Copy 1"
 msgstr "Copier 1"
 
-#: ../src/i_callbacks.c:1928
+#: src/i_callbacks.c:1931
 msgid "Copy 2"
 msgstr "Copier 2"
 
-#: ../src/i_callbacks.c:1947
+#: src/i_callbacks.c:1950
 msgid "Copy 3"
 msgstr "Copier 3"
 
-#: ../src/i_callbacks.c:1966
+#: src/i_callbacks.c:1969
 msgid "Copy 4"
 msgstr "Copier 4"
 
-#: ../src/i_callbacks.c:1985
+#: src/i_callbacks.c:1988
 msgid "Copy 5"
 msgstr "Copier 5"
 
-#: ../src/i_callbacks.c:2004
+#: src/i_callbacks.c:2007
 msgid "Cut 1"
 msgstr "Couper 1"
 
-#: ../src/i_callbacks.c:2023
+#: src/i_callbacks.c:2026
 msgid "Cut 2"
 msgstr "Couper 2"
 
-#: ../src/i_callbacks.c:2042
+#: src/i_callbacks.c:2045
 msgid "Cut 3"
 msgstr "Couper 3"
 
-#: ../src/i_callbacks.c:2061
+#: src/i_callbacks.c:2064
 msgid "Cut 4"
 msgstr "Couper 4"
 
-#: ../src/i_callbacks.c:2080
+#: src/i_callbacks.c:2083
 msgid "Cut 5"
 msgstr "Couper 5"
 
-#: ../src/i_callbacks.c:2096
+#: src/i_callbacks.c:2099
 msgid "Paste 1"
 msgstr "Coller 1"
 
-#: ../src/i_callbacks.c:2118
+#: src/i_callbacks.c:2121
 msgid "Paste 2"
 msgstr "Coller 2"
 
-#: ../src/i_callbacks.c:2140
+#: src/i_callbacks.c:2143
 msgid "Paste 3"
 msgstr "Coller 3"
 
-#: ../src/i_callbacks.c:2162
+#: src/i_callbacks.c:2165
 msgid "Paste 4"
 msgstr "Coller 4"
 
-#: ../src/i_callbacks.c:2184
+#: src/i_callbacks.c:2187
 msgid "Paste 5"
 msgstr "Coller 5"
 
-#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
+#: src/i_callbacks.c:2324 src/x_window.c:354
 msgid "Component"
 msgstr "Composant"
 
-#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
+#: src/i_callbacks.c:2360 src/i_callbacks.c:2379 src/x_dialog.c:2381
 msgid "Attribute"
 msgstr "Attribut"
 
-#: ../src/i_callbacks.c:2873
+#: src/i_callbacks.c:2877
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Recherche de source [%s]\n"
 
-#: ../src/i_callbacks.c:2897
+#: src/i_callbacks.c:2901
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Impossible de trouver source [%s]\n"
 
-#: ../src/i_callbacks.c:2964
+#: src/i_callbacks.c:2970
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Recherche du symbole [%s]\n"
 
-#: ../src/i_callbacks.c:2970
+#: src/i_callbacks.c:2976
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3001
+#: src/i_callbacks.c:3007
 msgid "Cannot find any schematics above the current one!\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3064
+#: src/i_callbacks.c:3061
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
 msgstr ""
 
-#: ../src/i_callbacks.c:3177
+#: src/i_callbacks.c:3171
 msgid "ShowN"
 msgstr "MontrerN"
 
-#: ../src/i_callbacks.c:3213
+#: src/i_callbacks.c:3207
 msgid "ShowV"
 msgstr "MontrerV"
 
-#: ../src/i_callbacks.c:3249
+#: src/i_callbacks.c:3243
 msgid "ShowB"
 msgstr "MontrerNV"
 
-#: ../src/i_callbacks.c:3286
+#: src/i_callbacks.c:3280
 msgid "VisToggle"
 msgstr ""
 
-#: ../src/i_callbacks.c:3316
+#: src/i_callbacks.c:3310
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Désolé mais c'est une option de menu non fonctionnelle\n"
 
-#: ../src/i_callbacks.c:3406
+#: src/i_callbacks.c:3400
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Mode de retour utilisateur positionné à OUTLINE\n"
 
-#: ../src/i_callbacks.c:3409
+#: src/i_callbacks.c:3403
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Mode de retour utilisateur positionné à BOUNDINGBOX\n"
 
-#: ../src/i_callbacks.c:3434
+#: src/i_callbacks.c:3428
 msgid "Grid OFF\n"
 msgstr "Grille OFF\n"
 
-#: ../src/i_callbacks.c:3435
+#: src/i_callbacks.c:3429
 msgid "Dot grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3436
+#: src/i_callbacks.c:3430
 msgid "Mesh grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3457
+#: src/i_callbacks.c:3451
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Snap OFF (ATTENTION)\n"
 
-#: ../src/i_callbacks.c:3460
+#: src/i_callbacks.c:3454
 msgid "Snap ON\n"
 msgstr "Snap ON\n"
 
-#: ../src/i_callbacks.c:3463
+#: src/i_callbacks.c:3457
 #, fuzzy
 msgid "Snap back to the grid (CAUTION!)\n"
 msgstr "Snap OFF (ATTENTION)\n"
 
-#: ../src/i_callbacks.c:3489
+#: src/i_callbacks.c:3483
 msgid "Rubber band OFF \n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3492
+#: src/i_callbacks.c:3486
 msgid "Rubber band ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3507
+#: src/i_callbacks.c:3501
 msgid "magnetic net mode: ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3510
+#: src/i_callbacks.c:3504
 msgid "magnetic net mode: OFF\n"
 msgstr ""
 
-#: ../src/o_box.c:160
+#: src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Type de remplissage de boîte inconnu !\n"
 
-#: ../src/o_buffer.c:57
+#: src/o_buffer.c:57
 #, c-format
 msgid "o_buffer_copy: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:72
+#: src/o_buffer.c:72
 #, c-format
 msgid "o_buffer_cut: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:93
+#: src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr "Valeur de buffer_number incorrecte [o_buffer_paste_start]\n"
 
-#: ../src/o_bus.c:135
+#: src/o_bus.c:135
 #, fuzzy, c-format
 msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr "Valeur de whichone incorrecte dans o_bus_draw_xor_single\n"
 
-#: ../src/o_circle.c:141
+#: src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Type de remplissage pour cercle inconnu !\n"
 
-#: ../src/o_complex.c:250 ../src/o_complex.c:254
+#: src/o_complex.c:250 src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Translation du schéma [%d %d]\n"
 
-#: ../src/o_misc.c:61
+#: src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
 msgstr "o_current==NULL dans o_edit()\n"
 
-#: ../src/o_misc.c:125
+#: src/o_misc.c:125
 #, fuzzy
 msgid "Object already locked\n"
 msgstr "Objet déjà verrouillé\n"
 
-#: ../src/o_misc.c:163
+#: src/o_misc.c:163
 #, fuzzy
 msgid "Object already unlocked\n"
 msgstr "Objet déjà déverrouillé\n"
 
-#: ../src/o_misc.c:445
+#: src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "Le texte normalement caché est maintenant visible\n"
 
-#: ../src/o_misc.c:447
+#: src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "Le texte normalement caché est maintenant invisible\n"
 
-#: ../src/o_misc.c:697
+#: src/o_misc.c:700
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 
-#: ../src/o_misc.c:840
+#: src/o_misc.c:847
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr ""
 "o_autosave_backups() : Impossible de récupérer le véritable nom du fichier %s"
 
-#: ../src/o_misc.c:884
+#: src/o_misc.c:891
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr ""
 "Impossible de passer le fichier copie de sauvegarde [%s] en lecture/"
 "écriture\n"
 
-#: ../src/o_misc.c:902
+#: src/o_misc.c:909
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr ""
 "Impossible de passer le fichier copie de sauvegarde [%s] en lecture seule\n"
 
-#: ../src/o_misc.c:907
+#: src/o_misc.c:914
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "�chec lors de la création de la copie de sauvegarde [%s]\n"
 
-#: ../src/o_move.c:188
+#: src/o_move.c:188
 #, c-format
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "ERREUR : object==NULL dans o_move_end !\n"
 
-#: ../src/o_move.c:461
+#: src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr "Incapable de déterminer le whichone de l'object !\n"
 
-#: ../src/o_move.c:482
+#: src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr "L'objet passé n'est pas une ligne dans o_move_check_endpoint\n"
 
-#: ../src/o_net.c:176
+#: src/o_net.c:176
 #, fuzzy, c-format
 msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr "Valeur de whichone incorrecte dans o_net_draw_xor_single\n"
 
-#: ../src/o_net.c:552
+#: src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr ""
 
-#: ../src/o_net.c:614
+#: src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr ""
 
-#. try to exit gracefully
-#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
-#: ../src/o_net.c:1126
+#: src/o_net.c:982 src/o_net.c:1019 src/o_net.c:1090 src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 "Tentative d'ajout de plus de deux jonctions de bus. Erreur interne gschem.\n"
 
-#: ../src/o_net.c:1196
+#: src/o_net.c:1196
 #, fuzzy, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "Impossible de trouver %s dans toutes les bibliothèques de composants\n"
 
-#: ../src/o_path.c:356
+#: src/o_path.c:356
 #, fuzzy, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "Type de remplissage de boîte inconnu !\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:557
+#: src/o_picture.c:166 src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Ã?chec lors du chargement de l'image : %s"
 
-#: ../src/o_picture.c:180
+#: src/o_picture.c:180
 msgid "Picture"
 msgstr "Image"
 
-#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
+#: src/o_picture.c:465 src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "ERREUR : object==NULL !\n"
 
-#: ../src/o_slot.c:110
+#: src/o_slot.c:81
 msgid "Slot attribute malformed\n"
 msgstr "Attribut slot mal formé\n"
 
-#: ../src/o_slot.c:128
+#: src/o_slot.c:99
 msgid "numslots attribute missing\n"
 msgstr "attribut numslots manquant\n"
 
-#: ../src/o_slot.c:130
+#: src/o_slot.c:100
 msgid "Slotting not allowed for this component\n"
 msgstr "Le slotting n'est pas supporté par ce composant\n"
 
-#: ../src/o_slot.c:145
+#: src/o_slot.c:115
 msgid "New slot number out of range\n"
 msgstr "Nouvelle valeur de slot hors plage\n"
 
-#: ../src/o_slot.c:200
+#: src/o_slot.c:170
 #, c-format
 msgid "uggg! you tried to slot edit something that doesn't exist!\n"
 msgstr "Tentative d'édition de slot sur un objet inexistant !\n"
 
-#: ../src/o_undo.c:300
+#: src/o_undo.c:300
 msgid "Undo/Redo disabled in rc file\n"
 msgstr "Opérations Défaire/Refaire désactivées dans fichier rc\n"
 
-#: ../src/parsecmd.c:47
+#: src/parsecmd.c:47
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] schematic_filename1 ... schematic_filenameN\n"
@@ -1312,79 +1322,70 @@ msgstr ""
 "  -h            Aide, affichage de ce message\n"
 "\n"
 
-#: ../src/x_attribedit.c:127
+#: src/x_attribedit.c:127
 #, c-format
 msgid "Got invalid show option; defaulting to show both\n"
 msgstr ""
 "Option d'affichage invalide ; changement pour affichage du nom et de la "
 "valeur\n"
 
-#: ../src/x_attribedit.c:330
+#: src/x_attribedit.c:330
 msgid "Single Attribute Editor"
 msgstr "Ã?diteur d'attribut"
 
-#: ../src/x_attribedit.c:359
+#: src/x_attribedit.c:359
 msgid "<b>Edit Attribute</b>"
 msgstr "<b>Ã?diter un attribut</b>"
 
-#: ../src/x_attribedit.c:361
+#: src/x_attribedit.c:361
 msgid "<b>Add Attribute</b>"
 msgstr "<b>Ajouter un attribut</b>"
 
-#. Name selection
-#. GtkLabel
-#: ../src/x_attribedit.c:377 ../src/x_multiattrib.c:1725
+#: src/x_attribedit.c:377 src/x_multiattrib.c:1921
 msgid "Name:"
 msgstr "Nom :"
 
-#. Value entry
-#. GtkLabel
-#: ../src/x_attribedit.c:393 ../src/x_multiattrib.c:1744
+#: src/x_attribedit.c:393 src/x_multiattrib.c:1940
 msgid "Value:"
 msgstr "Valeur :"
 
-#. Visibility
-#. GtkButton
-#: ../src/x_attribedit.c:409 ../src/x_multiattrib.c:1781
+#: src/x_attribedit.c:409 src/x_multiattrib.c:1983
 msgid "Visible"
 msgstr "Visible"
 
-#: ../src/x_attribedit.c:429
+#: src/x_attribedit.c:429
 msgid "Show Value Only"
 msgstr "Montrer seulement la valeur"
 
-#: ../src/x_attribedit.c:431
+#: src/x_attribedit.c:431
 msgid "Show Name Only"
 msgstr "Montrer seulement le nom"
 
-#: ../src/x_attribedit.c:433 ../src/x_multiattrib.c:1369
+#: src/x_attribedit.c:433 src/x_multiattrib.c:1459
 msgid "Show Name & Value"
 msgstr "Montrer le nom et la valeur"
 
-#. gschem specific
-#: ../src/x_attribedit.c:440
+#: src/x_attribedit.c:440
 msgid "<b>Attach Options</b>"
 msgstr "<b>Options d'attache</b>"
 
-#: ../src/x_attribedit.c:455
+#: src/x_attribedit.c:455
 msgid "All"
 msgstr "Tous"
 
-#. GtkTreeViewColumn
-#: ../src/x_attribedit.c:463 ../src/x_compselect.c:896
-#: ../src/x_compselect.c:1010
+#: src/x_attribedit.c:463 src/x_compselect.c:895 src/x_compselect.c:1009
 msgid "Components"
 msgstr "Composants"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:364
+#: src/x_attribedit.c:471 src/x_window.c:364
 msgid "Nets"
 msgstr "Pistes"
 
-#: ../src/x_attribedit.c:479
+#: src/x_attribedit.c:479
 msgid "Replace existing attributes"
 msgstr "Remplacer les attributs existants"
 
-#: ../src/x_autonumber.c:413
+#: src/x_autonumber.c:415
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
@@ -1392,8 +1393,7 @@ msgstr ""
 "Les objets à slots sans attribut de slot sont susceptibles de créer des "
 "problèmes durant l'annotation automatique\n"
 
-#. duplicate slot in used_slots
-#: ../src/x_autonumber.c:428
+#: src/x_autonumber.c:430
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
@@ -1401,183 +1401,174 @@ msgstr ""
 "Les slots dupliqués sont susceptibles de créer des problèmes : [symbolname=%"
 "s, number=%d, slot=%d]\n"
 
-#: ../src/x_autonumber.c:696
+#: src/x_autonumber.c:702
 msgid "No searchstring given in autonumber text.\n"
 msgstr "Pas de motif de recherche fourni pour l'annotation automatique.\n"
 
-#: ../src/x_autonumber.c:748
+#: src/x_autonumber.c:754
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr ""
 "Pas de caractère '*' ou '?' à la fin du motif de recherche pour annotation "
 "automatique.\n"
 
-#: ../src/x_autonumber.c:883
+#: src/x_autonumber.c:889
 msgid "Diagonal"
 msgstr "en diagonal"
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Top to bottom"
 msgstr "de haut en bas"
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Bottom to top"
 msgstr "de bas en haut"
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 msgid "Left to right"
 msgstr "de gauche à droite"
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 msgid "Right to left"
 msgstr "de droite à gauche"
 
-#: ../src/x_autonumber.c:886
+#: src/x_autonumber.c:892
 msgid "File order"
 msgstr "dans ordre des éléments du fichier"
 
-#: ../src/x_autonumber.c:1222
+#: src/x_autonumber.c:1228
 msgid "Autonumber text"
 msgstr "Annotation automatique"
 
-#. scope section
-#: ../src/x_autonumber.c:1246
+#: src/x_autonumber.c:1252
 msgid "<b>Scope</b>"
 msgstr "<b>Portée</b>"
 
-#: ../src/x_autonumber.c:1268
+#: src/x_autonumber.c:1274
 msgid "Search for:"
 msgstr "Motif de recherche :"
 
-#: ../src/x_autonumber.c:1282
+#: src/x_autonumber.c:1288
 msgid "Autonumber text in:"
 msgstr "Annoter automatiquement :"
 
-#: ../src/x_autonumber.c:1289
+#: src/x_autonumber.c:1295
 msgid "Skip numbers found in:"
 msgstr "Passer les nombres trouvés dans :"
 
-#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
+#: src/x_autonumber.c:1307 src/x_autonumber.c:1316
 msgid "Selected objects"
 msgstr "les objets sélectionnés"
 
-#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
+#: src/x_autonumber.c:1308 src/x_autonumber.c:1317
 msgid "Current page"
 msgstr "la page en cours"
 
-#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
+#: src/x_autonumber.c:1309 src/x_autonumber.c:1318
 msgid "Whole hierarchy"
 msgstr "la hiérarchie complète"
 
-#: ../src/x_autonumber.c:1314
+#: src/x_autonumber.c:1320
 msgid "Overwrite existing numbers"
 msgstr "Remplacer les annotations existantes"
 
-#. Options section
-#: ../src/x_autonumber.c:1319
+#: src/x_autonumber.c:1325
 msgid "<b>Options</b>"
 msgstr "<b>Options</b>"
 
-#: ../src/x_autonumber.c:1341
+#: src/x_autonumber.c:1347
 msgid "Starting number:"
 msgstr "Indice de départ :"
 
-#: ../src/x_autonumber.c:1348
+#: src/x_autonumber.c:1354
 msgid "Sort order:"
 msgstr "Ordre :"
 
-#: ../src/x_autonumber.c:1369
+#: src/x_autonumber.c:1375
 msgid "Remove numbers"
 msgstr "Supprimer les annotations"
 
-#: ../src/x_autonumber.c:1373
+#: src/x_autonumber.c:1379
 msgid "Automatic slotting"
 msgstr "Slotting automatique"
 
-#: ../src/x_color.c:94 ../src/x_color.c:103
+#: src/x_color.c:94 src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Impossible d'allouer la couleur %s !\n"
 
-#: ../src/x_color.c:94
+#: src/x_color.c:94
 msgid "black"
 msgstr "noir"
 
-#: ../src/x_color.c:103
+#: src/x_color.c:103
 msgid "white"
 msgstr "blanc"
 
-#: ../src/x_color.c:125
+#: src/x_color.c:125
 #, fuzzy, c-format
 msgid "Could not allocate display color %i!\n"
 msgstr "Impossible d'allouer la couleur %s !\n"
 
-#: ../src/x_color.c:147
+#: src/x_color.c:147
 #, fuzzy, c-format
 msgid "Could not allocate outline color %i!\n"
 msgstr "Impossible d'allouer la couleur %s !\n"
 
-#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
+#: src/x_color.c:164 src/x_color.c:181 src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Tentative d'obtention d'une couleur invalide : %d\n"
 
-#: ../src/x_color.c:214
+#: src/x_color.c:214
 #, fuzzy, c-format
 msgid "Tried to get an invalid outline color: %d\n"
 msgstr "Tentative d'obtention d'une couleur invalide : %d\n"
 
-#. GtkLabel
-#: ../src/x_compselect.c:1040
+#: src/x_compselect.c:1039
 msgid "Filter:"
 msgstr "Filtre:"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
-#: ../src/x_multiattrib.c:1601
+#: src/x_compselect.c:1142 src/x_dialog.c:3776 src/x_multiattrib.c:1787
 msgid "Name"
 msgstr "Nom"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1152 ../src/x_multiattrib.c:1626
+#: src/x_compselect.c:1151 src/x_multiattrib.c:1811
 msgid "Value"
 msgstr "Valeur"
 
-#: ../src/x_compselect.c:1191
+#: src/x_compselect.c:1190
 msgid "Default behavior - reference component"
 msgstr "Comportement par défaut - référencer le composant"
 
-#: ../src/x_compselect.c:1194
+#: src/x_compselect.c:1193
 msgid "Embed component in schematic"
 msgstr "Embarquer le composant dans le schéma"
 
-#: ../src/x_compselect.c:1197
+#: src/x_compselect.c:1196
 msgid "Include component as individual objects"
 msgstr "Ã?clater le composant en objets individuels"
 
-#. GtkWindow
-#: ../src/x_compselect.c:1354
+#: src/x_compselect.c:1353
 msgid "Select Component..."
 msgstr "Sélecteur de composant..."
 
-#: ../src/x_compselect.c:1377
+#: src/x_compselect.c:1376
 msgid "In Use"
 msgstr ""
 
-#: ../src/x_compselect.c:1381
+#: src/x_compselect.c:1380
 msgid "Libraries"
 msgstr "Bibliothèques"
 
-#. GtkFrame
-#: ../src/x_compselect.c:1390 ../src/x_fileselect.c:122
+#: src/x_compselect.c:1389 src/x_fileselect.c:122
 msgid "Preview"
 msgstr "Prévisualisation"
 
-#. dialog not created yet
-#: ../src/x_dialog.c:174
+#: src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "Ajout de texte..."
 
-#: ../src/x_dialog.c:205
+#: src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1587,185 +1578,176 @@ msgstr ""
 "déplacez le curseur dans la fenêtre, cliquez pour placer le texte.\n"
 "Bouton du milieu pour pivoter le texte avant placement."
 
-#: ../src/x_dialog.c:294
-#, c-format
+#: src/x_dialog.c:294
 msgid "Lower Left"
 msgstr "En bas à gauche"
 
-#: ../src/x_dialog.c:305
-#, c-format
+#: src/x_dialog.c:305
 msgid "Middle Left"
 msgstr "Au milieu à gauche"
 
-#: ../src/x_dialog.c:316
-#, c-format
+#: src/x_dialog.c:316
 msgid "Upper Left"
 msgstr "En haut à gauche"
 
-#: ../src/x_dialog.c:327
-#, c-format
+#: src/x_dialog.c:327
 msgid "Lower Middle"
 msgstr "En bas au milieu"
 
-#: ../src/x_dialog.c:338
-#, c-format
+#: src/x_dialog.c:338
 msgid "Middle Middle"
 msgstr "Au centre"
 
-#: ../src/x_dialog.c:349
-#, c-format
+#: src/x_dialog.c:349
 msgid "Upper Middle"
 msgstr "En haut au milieu"
 
-#: ../src/x_dialog.c:360
-#, c-format
+#: src/x_dialog.c:360
 msgid "Lower Right"
 msgstr "En bas à droite"
 
-#: ../src/x_dialog.c:371
-#, c-format
+#: src/x_dialog.c:371
 msgid "Middle Right"
 msgstr "Au milieu à droite"
 
-#: ../src/x_dialog.c:382
-#, c-format
+#: src/x_dialog.c:382
 msgid "Upper Right"
 msgstr "En haut à droite"
 
-#: ../src/x_dialog.c:496
+#: src/x_dialog.c:496
 msgid "Edit Text Properties"
 msgstr "Editer les propriétés du texte"
 
-#: ../src/x_dialog.c:530
+#: src/x_dialog.c:530
 msgid "<b>Text Content</b>"
 msgstr "<b>Texte</b>"
 
-#: ../src/x_dialog.c:562
+#: src/x_dialog.c:562
 msgid "<b>Text Properties</b>"
 msgstr "<b>Propriétés du texte</b>"
 
-#: ../src/x_dialog.c:577
+#: src/x_dialog.c:577
 msgid "Color:"
 msgstr "Couleur :"
 
-#: ../src/x_dialog.c:584
+#: src/x_dialog.c:584
 msgid "Size:"
 msgstr "Taille :"
 
-#: ../src/x_dialog.c:593
+#: src/x_dialog.c:593
 msgid "Alignment:"
 msgstr "Alignement du texte :"
 
-#: ../src/x_dialog.c:647
+#: src/x_dialog.c:647
 msgid "Solid"
 msgstr "Continu"
 
-#: ../src/x_dialog.c:648
+#: src/x_dialog.c:648
 msgid "Dotted"
 msgstr "Pointillés"
 
-#: ../src/x_dialog.c:649
+#: src/x_dialog.c:649
 msgid "Dashed"
 msgstr "Tirets"
 
-#: ../src/x_dialog.c:650
+#: src/x_dialog.c:650
 msgid "Center"
 msgstr "Centré"
 
-#: ../src/x_dialog.c:651
+#: src/x_dialog.c:651
 msgid "Phantom"
 msgstr "Fantôme"
 
-#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
-#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
-#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
-#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
-#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
-#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
+#: src/x_dialog.c:652 src/x_dialog.c:749 src/x_dialog.c:758 src/x_dialog.c:767
+#: src/x_dialog.c:868 src/x_dialog.c:870 src/x_dialog.c:872
+#: src/x_dialog.c:1100 src/x_dialog.c:1203 src/x_dialog.c:1212
+#: src/x_dialog.c:1221 src/x_dialog.c:1230 src/x_dialog.c:1239
+#: src/x_dialog.c:1352 src/x_dialog.c:1354 src/x_dialog.c:1356
+#: src/x_dialog.c:1358 src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*inchangé*"
 
-#: ../src/x_dialog.c:978
+#: src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Ã?paisseur et type de ligne"
 
-#: ../src/x_dialog.c:1017 ../src/x_print.c:307
+#: src/x_dialog.c:1017 src/x_print.c:307
 msgid "Type:"
 msgstr "Type :"
 
-#: ../src/x_dialog.c:1021
+#: src/x_dialog.c:1021
 msgid "Width:"
 msgstr "Largeur :"
 
-#: ../src/x_dialog.c:1025
+#: src/x_dialog.c:1025
 msgid "Dash Length:"
 msgstr "Longueur du tiret :"
 
-#: ../src/x_dialog.c:1029
+#: src/x_dialog.c:1029
 msgid "Dash Space:"
 msgstr "Espace entre tirets :"
 
-#: ../src/x_dialog.c:1096
+#: src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Vide"
 
-#: ../src/x_dialog.c:1097
+#: src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Plein"
 
-#: ../src/x_dialog.c:1098
+#: src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "Quadrillage"
 
-#: ../src/x_dialog.c:1099
+#: src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "Rayures"
 
-#: ../src/x_dialog.c:1470
+#: src/x_dialog.c:1470
 msgid "Edit Fill Type"
 msgstr "Ã?diter le type de remplissage"
 
-#: ../src/x_dialog.c:1508
+#: src/x_dialog.c:1508
 msgid "Fill Type:"
 msgstr "Type de remplissage :"
 
-#: ../src/x_dialog.c:1512
+#: src/x_dialog.c:1512
 msgid "Line Width:"
 msgstr "Ã?paisseur :"
 
-#: ../src/x_dialog.c:1516
+#: src/x_dialog.c:1516
 msgid "Angle 1:"
 msgstr "Angle1 :"
 
-#: ../src/x_dialog.c:1520
+#: src/x_dialog.c:1520
 msgid "Pitch 1:"
 msgstr "Ã?cart1 :"
 
-#: ../src/x_dialog.c:1524
+#: src/x_dialog.c:1524
 msgid "Angle 2:"
 msgstr "Angle2 :"
 
-#: ../src/x_dialog.c:1528
+#: src/x_dialog.c:1528
 msgid "Pitch 2:"
 msgstr "Ã?cart2 :"
 
-#: ../src/x_dialog.c:1657
+#: src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "Paramètres d'arc"
 
-#: ../src/x_dialog.c:1697
+#: src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr ""
 
-#: ../src/x_dialog.c:1705
+#: src/x_dialog.c:1705
 msgid "Start Angle:"
 msgstr "Angle de départ :"
 
-#: ../src/x_dialog.c:1713
+#: src/x_dialog.c:1713
 msgid "Degrees of Sweep:"
 msgstr "Balayage :"
 
-#: ../src/x_dialog.c:1830
+#: src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1773,44 +1755,44 @@ msgstr ""
 "Cible pour translation ?\n"
 "(0 pour translation à l'origine)"
 
-#: ../src/x_dialog.c:1898
+#: src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "Taille de texte :"
 
-#: ../src/x_dialog.c:1928
+#: src/x_dialog.c:1928
 msgid "Enter new text size:"
 msgstr "Entrez la nouvelle taille de texte :"
 
-#: ../src/x_dialog.c:2004
+#: src/x_dialog.c:2004
 msgid "Snap Size"
 msgstr "Grille de snap"
 
-#: ../src/x_dialog.c:2034
+#: src/x_dialog.c:2034
 msgid "Enter new snap grid spacing:"
 msgstr "Entrez le nouvel espacement de la grille de snap :"
 
-#: ../src/x_dialog.c:2107
+#: src/x_dialog.c:2110
 msgid "Edit slot number"
 msgstr "Numéro de slot"
 
-#: ../src/x_dialog.c:2138
+#: src/x_dialog.c:2141
 msgid "Edit slot number:"
 msgstr "Numéro de slot :"
 
-#: ../src/x_dialog.c:2200
+#: src/x_dialog.c:2202
 msgid "About..."
 msgstr "Ã? propos..."
 
-#: ../src/x_dialog.c:2220
+#: src/x_dialog.c:2222
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA : GPL Electronic Design Automation</b>"
 
-#: ../src/x_dialog.c:2224
+#: src/x_dialog.c:2226
 #, fuzzy, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>gschem version %s%s.$s</b>"
 
-#: ../src/x_dialog.c:2232
+#: src/x_dialog.c:2234
 #, fuzzy
 msgid ""
 "Written by:\n"
@@ -1823,145 +1805,145 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "Et bien d'autres (consultez le fichier AUTHORS)"
 
-#: ../src/x_dialog.c:2295
+#: src/x_dialog.c:2297
 msgid "Coords"
 msgstr "Coords"
 
-#: ../src/x_dialog.c:2316
+#: src/x_dialog.c:2318
 msgid "Screen"
 msgstr "Ã?cran"
 
-#: ../src/x_dialog.c:2325
+#: src/x_dialog.c:2327
 msgid "World"
 msgstr "Monde"
 
-#: ../src/x_dialog.c:2364
+#: src/x_dialog.c:2366
 msgid "Background"
 msgstr ""
 
-#: ../src/x_dialog.c:2370
+#: src/x_dialog.c:2372
 msgid "Net endpoint"
 msgstr ""
 
-#: ../src/x_dialog.c:2373
+#: src/x_dialog.c:2375
 msgid "Graphic"
 msgstr ""
 
-#: ../src/x_dialog.c:2382
+#: src/x_dialog.c:2384
 msgid "Logic bubble"
 msgstr ""
 
-#: ../src/x_dialog.c:2385
+#: src/x_dialog.c:2387
 msgid "Grid point"
 msgstr ""
 
-#: ../src/x_dialog.c:2388
+#: src/x_dialog.c:2390
 #, fuzzy
 msgid "Detached attribute"
 msgstr "Ajouter un attribut"
 
-#: ../src/x_dialog.c:2391 ../src/x_window.c:382
+#: src/x_dialog.c:2393 src/x_window.c:382
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/x_dialog.c:2397
+#: src/x_dialog.c:2399
 #, fuzzy
 msgid "Selection"
 msgstr "Sélection"
 
-#: ../src/x_dialog.c:2400
+#: src/x_dialog.c:2402
 msgid "Bounding box"
 msgstr ""
 
-#: ../src/x_dialog.c:2403
+#: src/x_dialog.c:2405
 #, fuzzy
 msgid "Zoom box"
 msgstr "Zoom boîte"
 
-#: ../src/x_dialog.c:2412
+#: src/x_dialog.c:2414
 msgid "Output background"
 msgstr ""
 
-#: ../src/x_dialog.c:2415
+#: src/x_dialog.c:2417
 #, fuzzy
 msgid "Net junction"
 msgstr "Action"
 
-#: ../src/x_dialog.c:2418
+#: src/x_dialog.c:2420
 msgid "Mesh grid major"
 msgstr ""
 
-#: ../src/x_dialog.c:2421
+#: src/x_dialog.c:2423
 msgid "Mesh grid minor"
 msgstr ""
 
-#: ../src/x_dialog.c:2424
+#: src/x_dialog.c:2426
 msgid "Unknown"
 msgstr ""
 
-#: ../src/x_dialog.c:2570
+#: src/x_dialog.c:2572
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr "ERREUR : object==NULL dans color_edit_dialog_apply !\n"
 
-#: ../src/x_dialog.c:2633
+#: src/x_dialog.c:2635
 msgid "Color Edit"
 msgstr "Sélecteur de couleur"
 
-#: ../src/x_dialog.c:2664
+#: src/x_dialog.c:2666
 msgid "Object color:"
 msgstr "Couleur de l'objet :"
 
-#: ../src/x_dialog.c:2786
+#: src/x_dialog.c:2788
 #, fuzzy
 msgid "Function"
 msgstr "Action"
 
-#: ../src/x_dialog.c:2793
+#: src/x_dialog.c:2795
 #, fuzzy
 msgid "Keystroke(s)"
 msgstr "Action : raccourci(s)"
 
-#: ../src/x_dialog.c:3102
+#: src/x_dialog.c:3104
 msgid "Find Text"
 msgstr "Recherche de texte"
 
-#: ../src/x_dialog.c:3133
+#: src/x_dialog.c:3135
 msgid "Text to find:"
 msgstr "Texte à rechercher :"
 
-#: ../src/x_dialog.c:3143
+#: src/x_dialog.c:3145
 msgid "descend into hierarchy"
 msgstr "descendre dans la hiérarchie"
 
-#: ../src/x_dialog.c:3208
+#: src/x_dialog.c:3210
 msgid "Hide Text"
 msgstr "Cacher le texte"
 
-#: ../src/x_dialog.c:3239
+#: src/x_dialog.c:3241
 msgid "Hide text starting with:"
 msgstr "Cacher le texte commençant par :"
 
-#: ../src/x_dialog.c:3308
+#: src/x_dialog.c:3310
 msgid "Show Text"
 msgstr "Montrer le texte"
 
-#: ../src/x_dialog.c:3339
+#: src/x_dialog.c:3341
 msgid "Show text starting with:"
 msgstr "Montrer le texte commençant par :"
 
-#: ../src/x_dialog.c:3796
+#: src/x_dialog.c:3798
 msgid "S_elect the schematics you want to save:"
 msgstr "_Sélectionnez les schémas que vous souhaitez enregistrer :"
 
-#: ../src/x_dialog.c:3890
+#: src/x_dialog.c:3892
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr ""
 "Voulez-vous enregistrer les modifications dans le schéma \"%s\" avant de le "
 "fermer ?"
 
-#: ../src/x_dialog.c:3896
+#: src/x_dialog.c:3898
 #, fuzzy, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
@@ -1969,18 +1951,17 @@ msgstr ""
 "Il y a %d schémas avec des modifications non enregistrées. Voulez-vous "
 "enregistrer les modifications avant de fermer ?"
 
-#. secondary label
-#: ../src/x_dialog.c:3925
+#: src/x_dialog.c:3927
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr ""
 "Si vous n'enregistrez pas, les modifications effectuées seront "
 "définitivement perdues."
 
-#: ../src/x_dialog.c:3945
+#: src/x_dialog.c:3947
 msgid "_Close without saving"
 msgstr "Fermer sans sa_uvegarder"
 
-#: ../src/x_dialog.c:4279
+#: src/x_dialog.c:4283
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1991,50 +1972,50 @@ msgid ""
 "The value cannot start with a space."
 msgstr ""
 
-#: ../src/x_dialog.c:4281
+#: src/x_dialog.c:4285
 #, fuzzy
 msgid "Invalid Attribute"
 msgstr "Ajouter un attribut"
 
-#: ../src/x_dialog.c:4317
+#: src/x_dialog.c:4321
 #, fuzzy
 msgid "Pin type"
 msgstr "Type :"
 
-#: ../src/x_dialog.c:4341
+#: src/x_dialog.c:4345
 #, fuzzy
 msgid "Net pin"
 msgstr "Action"
 
-#: ../src/x_dialog.c:4343
+#: src/x_dialog.c:4347
 msgid "Bus pin (graphical)"
 msgstr ""
 
-#: ../src/x_fileselect.c:42
+#: src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "sch - Schémas"
 
-#: ../src/x_fileselect.c:47
+#: src/x_fileselect.c:47
 msgid "Symbols"
 msgstr "sym - Symboles"
 
-#: ../src/x_fileselect.c:52
+#: src/x_fileselect.c:52
 msgid "Schematics and symbols"
 msgstr "sym/sch - Schémas et symboles"
 
-#: ../src/x_fileselect.c:58
+#: src/x_fileselect.c:58
 msgid "All files"
 msgstr "* - Tous fichiers"
 
-#: ../src/x_fileselect.c:171
+#: src/x_fileselect.c:171
 msgid "Open..."
 msgstr "Ouvrir..."
 
-#: ../src/x_fileselect.c:231
+#: src/x_fileselect.c:231
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: ../src/x_fileselect.c:284
+#: src/x_fileselect.c:284
 #, c-format
 msgid ""
 "The selected file `%s' already exists.\n"
@@ -2042,31 +2023,30 @@ msgid ""
 "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/x_fileselect.c:287
+#: src/x_fileselect.c:287
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Nouveau fichier"
 
-#: ../src/x_fileselect.c:289
+#: src/x_fileselect.c:289
 msgid "Save cancelled on user request\n"
 msgstr ""
 
-#. WK - catch EPS export case
-#: ../src/x_image.c:176
+#: src/x_image.c:176
 msgid "Encapsulated Postscript"
 msgstr ""
 
-#: ../src/x_image.c:296
+#: src/x_image.c:296
 #, fuzzy, c-format
 msgid "x_image_lowlevel: Unable to write eps file %s.\n"
 msgstr "x_image_lowlevel(): Impossible d'écrire le fichier PNG.\n"
 
-#: ../src/x_image.c:374
+#: src/x_image.c:374
 #, fuzzy, c-format
 msgid "x_image_lowlevel: Unable to write %s file %s.\n"
 msgstr "x_image_lowlevel(): Impossible d'écrire le fichier PNG.\n"
 
-#: ../src/x_image.c:384
+#: src/x_image.c:384
 #, c-format
 msgid ""
 "There was the following error when saving image with type %s to filename:\n"
@@ -2075,264 +2055,264 @@ msgid ""
 "%s.\n"
 msgstr ""
 
-#: ../src/x_image.c:403
+#: src/x_image.c:403
 #, c-format
 msgid "Wrote color image to [%s] [%d x %d]\n"
 msgstr "Image couleur exportée dans fichier [%s] [%d x %d]\n"
 
-#: ../src/x_image.c:405
+#: src/x_image.c:405
 #, c-format
 msgid "Wrote black and white image to [%s] [%d x %d]\n"
 msgstr "Image noire et blanche exportée dans fichier [%s] [%d x %d]\n"
 
-#: ../src/x_image.c:413
+#: src/x_image.c:413
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 msgstr ""
 "x_image_lowlevel(): Impossible de récupérer le pixbuf depuis la fenêtre de "
 "gschem.\n"
 
-#: ../src/x_image.c:458
+#: src/x_image.c:458
 #, fuzzy
 msgid "Width x Height"
 msgstr "Largeur x Hauteur :"
 
-#: ../src/x_image.c:474
+#: src/x_image.c:474
 #, fuzzy
 msgid "Image type"
 msgstr "Image"
 
-#: ../src/x_log.c:188
+#: src/x_log.c:188
 msgid "** Invalid UTF-8 in log message. See stderr or gschem.log.\n"
 msgstr ""
 
-#: ../src/x_log.c:256
+#: src/x_log.c:256
 msgid "Status"
 msgstr "Messages"
 
-#: ../src/x_menus.c:36
+#: src/x_menus.c:36
 msgid "/Add Net"
 msgstr "/Ajouter une piste"
 
-#: ../src/x_menus.c:37
+#: src/x_menus.c:37
 msgid "/Add Attribute..."
 msgstr "/Ajouter un attribut..."
 
-#: ../src/x_menus.c:38
+#: src/x_menus.c:38
 msgid "/Add Component..."
 msgstr "/Ajouter un composant..."
 
-#: ../src/x_menus.c:39
+#: src/x_menus.c:39
 msgid "/Add Bus"
 msgstr "/Ajouter un bus"
 
-#: ../src/x_menus.c:40
+#: src/x_menus.c:40
 msgid "/Add Text"
 msgstr "/Ajouter du texte"
 
-#: ../src/x_menus.c:42
+#: src/x_menus.c:42
 msgid "/Zoom In"
 msgstr "/Agrandir"
 
-#: ../src/x_menus.c:43
+#: src/x_menus.c:43
 msgid "/Zoom Out"
 msgstr "/Réduire"
 
-#: ../src/x_menus.c:44
+#: src/x_menus.c:44
 msgid "/Zoom Box"
 msgstr "/Zoom boîte"
 
-#: ../src/x_menus.c:45
+#: src/x_menus.c:45
 msgid "/Zoom Extents"
 msgstr "/Agrandissement auto"
 
-#: ../src/x_menus.c:47
+#: src/x_menus.c:47
 msgid "/Select"
 msgstr "/Sélectionner"
 
-#: ../src/x_menus.c:48
+#: src/x_menus.c:48
 msgid "/Edit..."
 msgstr "/Ã?diter..."
 
-#: ../src/x_menus.c:49
+#: src/x_menus.c:49
 #, fuzzy
 msgid "/Edit pin type..."
 msgstr "Ã?diter le type de ligne"
 
-#: ../src/x_menus.c:50
+#: src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Copier"
 
-#: ../src/x_menus.c:51
+#: src/x_menus.c:51
 msgid "/Move"
 msgstr "/Déplacer"
 
-#: ../src/x_menus.c:52
+#: src/x_menus.c:52
 msgid "/Delete"
 msgstr "/Supprimer"
 
-#: ../src/x_menus.c:55
+#: src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/Descendre dans le schéma"
 
-#: ../src/x_menus.c:56
+#: src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/Descendre dans le symbole"
 
-#: ../src/x_menus.c:57
+#: src/x_menus.c:57
 msgid "/Up"
 msgstr "/Remonter"
 
-#: ../src/x_menus.c:316
+#: src/x_menus.c:319
 #, fuzzy, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr "Tentative de rendre sensible un élément de menu inexistant\n"
 
-#: ../src/x_menus.c:340
+#: src/x_menus.c:343
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "Popup_menu_item_factory n'existe pas !\n"
 
-#: ../src/x_menus.c:353
+#: src/x_menus.c:356
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 "Tentative de rendre sensible un élément de menu contextuel inexistant\n"
 
-#. Remove this entry from all menus
-#: ../src/x_menus.c:462
+#: src/x_menus.c:436
 #, fuzzy, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Impossible de lancer %s\n"
 
-#: ../src/x_menus.c:524
+#: src/x_menus.c:493
 msgid "Clear"
 msgstr "Effacer"
 
-#: ../src/x_multiattrib.c:861
+#: src/x_multiattrib.c:913
 msgid "Attributes with empty name are not allowed. Please set a name."
 msgstr "Les attributs sans nom sont interdits. Donnez un nom."
 
-#: ../src/x_multiattrib.c:1371
+#: src/x_multiattrib.c:1461
 msgid "Show Value only"
 msgstr "Montrer seulement la valeur"
 
-#: ../src/x_multiattrib.c:1373
+#: src/x_multiattrib.c:1463
 msgid "Show Name only"
 msgstr "Montrer seulement le nom"
 
-#: ../src/x_multiattrib.c:1400
+#: src/x_multiattrib.c:1491
+msgid "Promote"
+msgstr ""
+
+#: src/x_multiattrib.c:1495
 msgid "Duplicate"
 msgstr "Cloner"
 
-#: ../src/x_multiattrib.c:1528
+#: src/x_multiattrib.c:1713
 msgid "Edit Attributes"
 msgstr "Ã?diteur d'attributs"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1648
+#: src/x_multiattrib.c:1831
 msgid "Vis?"
 msgstr "Vis?"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1668
+#: src/x_multiattrib.c:1849
 msgid "N"
 msgstr "N"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1688
+#: src/x_multiattrib.c:1867
 msgid "V"
 msgstr "V"
 
-#: ../src/x_multiattrib.c:1709
+#: src/x_multiattrib.c:1889
+#, fuzzy
+msgid "Show inherited attributes"
+msgstr "Ajouter un attribut"
+
+#: src/x_multiattrib.c:1905
 msgid "Add Attribute"
 msgstr "Ajouter un attribut"
 
-#: ../src/x_pagesel.c:257
+#: src/x_pagesel.c:257
 msgid "Discard Page"
 msgstr "Abandonner la page"
 
-#: ../src/x_pagesel.c:376
+#: src/x_pagesel.c:376
 msgid "Page Manager"
 msgstr "Gestionnaire de pages"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:432
+#: src/x_pagesel.c:432
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:448
+#: src/x_pagesel.c:448
 msgid "Changed"
 msgstr "Modifié"
 
-#. GtkLabel
-#: ../src/x_pagesel.c:468
+#: src/x_pagesel.c:468
 msgid "Right click on the filename for more options..."
 msgstr "Utilisez le clic droit sur le nom de fichier pour plus d'options..."
 
-#: ../src/x_preview.c:223
+#: src/x_preview.c:223
 #, fuzzy
 msgid "Preview Buffer"
 msgstr "Tampon"
 
-#: ../src/x_print.c:84
+#: src/x_print.c:84
 msgid "Select PostScript Filename..."
 msgstr "Enregistrer en PostScript sous..."
 
-#: ../src/x_print.c:164
+#: src/x_print.c:164
 msgid "Extents with margins"
 msgstr "Totalité avec marges"
 
-#: ../src/x_print.c:170
+#: src/x_print.c:170
 msgid "Extents no margins"
 msgstr "Totalité sans marge"
 
-#: ../src/x_print.c:176
+#: src/x_print.c:176
 msgid "Current Window"
 msgstr "Vue en cours"
 
-#: ../src/x_print.c:210
+#: src/x_print.c:210
 msgid "Landscape"
 msgstr "Paysage"
 
-#: ../src/x_print.c:216
+#: src/x_print.c:216
 msgid "Portrait"
 msgstr "Portrait"
 
-#. Upper frame
-#: ../src/x_print.c:284
+#: src/x_print.c:284
 msgid "Settings"
 msgstr "Configuration"
 
-#: ../src/x_print.c:296
+#: src/x_print.c:296
 msgid "Output paper size:"
 msgstr "Taille de papier :"
 
-#: ../src/x_print.c:318
+#: src/x_print.c:318
 msgid "Orientation:"
 msgstr "Orientation :"
 
-#. Lower frame
-#: ../src/x_print.c:330
+#: src/x_print.c:330
 msgid "Destination"
 msgstr "Destination"
 
-#: ../src/x_print.c:343
+#: src/x_print.c:343
 msgid "File:"
 msgstr "Fichier :"
 
-#: ../src/x_print.c:373
+#: src/x_print.c:373
 msgid "Command:"
 msgstr "Commande :"
 
-#: ../src/x_print.c:741
+#: src/x_print.c:741
 msgid "No print destination specified\n"
 msgstr "Destination pour l'impression non spécifiée\n"
 
-#: ../src/x_print.c:748
+#: src/x_print.c:748
 #, c-format
 msgid "Cannot print current schematic to [%s]\n"
 msgstr "Impossible d'imprimer le schéma en cours dans [%s]\n"
 
-#: ../src/x_print.c:757
+#: src/x_print.c:757
 #, c-format
 msgid ""
 "Error printing to file '%s'\n"
@@ -2341,45 +2321,45 @@ msgstr ""
 "Erreur pendant l'impression du fichier '%s'\n"
 "Reportez-vous à la fenêtre des messages pour plus de détails"
 
-#: ../src/x_print.c:764
+#: src/x_print.c:764
 #, c-format
 msgid "Printed current schematic to [%s]\n"
 msgstr "Schéma en cours imprimé dans fichier [%s]\n"
 
-#: ../src/x_window.c:81
+#: src/x_window.c:81
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr "Allocation gc impossible\n"
 
-#: ../src/x_window.c:317
+#: src/x_window.c:317
 msgid "New file"
 msgstr "Nouveau fichier"
 
-#: ../src/x_window.c:323
+#: src/x_window.c:323
 msgid "Open"
 msgstr "Ouvrir"
 
-#: ../src/x_window.c:324
+#: src/x_window.c:324
 msgid "Open file..."
 msgstr "Ouvrir fichier..."
 
-#: ../src/x_window.c:330
+#: src/x_window.c:330
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ../src/x_window.c:331
+#: src/x_window.c:331
 msgid "Save file"
 msgstr "Sauvegarder le fichier"
 
-#: ../src/x_window.c:339
+#: src/x_window.c:339
 msgid "Undo last operation"
 msgstr "Défaire la dernière opération"
 
-#: ../src/x_window.c:346
+#: src/x_window.c:346
 msgid "Redo last undo"
 msgstr "Refaire le dernier défait"
 
-#: ../src/x_window.c:355
+#: src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2391,7 +2371,7 @@ msgstr ""
 "pointeur dans la fenêtre principale.\n"
 "Clic gauche pour placer, clic droit pour annuler."
 
-#: ../src/x_window.c:365
+#: src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2399,7 +2379,7 @@ msgstr ""
 "Mode ajout de piste\n"
 "Clic droit pour annuler"
 
-#: ../src/x_window.c:375
+#: src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2407,92 +2387,91 @@ msgstr ""
 "Mode ajout de bus\n"
 "Clic droit pour annuler"
 
-#: ../src/x_window.c:383
+#: src/x_window.c:383
 msgid "Add Text..."
 msgstr "Ajouter du texte..."
 
-#: ../src/x_window.c:393
+#: src/x_window.c:393
 msgid "Select"
 msgstr "Sélectionner"
 
-#: ../src/x_window.c:394
+#: src/x_window.c:394
 msgid "Select mode"
 msgstr "Mode sélection"
 
-#: ../src/x_window.c:481
+#: src/x_window.c:481
 msgid "Pick"
 msgstr "Prendre"
 
-#: ../src/x_window.c:497
+#: src/x_window.c:497
 msgid "Repeat/none"
 msgstr "Répéter/aucun"
 
-#: ../src/x_window.c:507
+#: src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "Menu/Annuler"
 
-#: ../src/x_window.c:509
+#: src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "Panoramique/Annuler"
 
-#: ../src/x_window.c:733
+#: src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Chargement du schéma [%s]\n"
 
-#: ../src/x_window.c:745
+#: src/x_window.c:745
 #, fuzzy
 msgid "Failed to load file"
 msgstr "Ã?chec lors du chargement de l'image : %s"
 
-#: ../src/x_window.c:754
+#: src/x_window.c:754
 #, fuzzy, c-format
 msgid "New file [%s]\n"
 msgstr "Nouveau fichier"
 
-#. an error occured when saving page to file
-#: ../src/x_window.c:859
+#: src/x_window.c:859
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Ã?chec sauvegarde de la page [%s]\n"
 
-#: ../src/x_window.c:860
+#: src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Erreur lors de la tentative de sauvegarde"
 
-#: ../src/x_window.c:869
+#: src/x_window.c:869
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "Enregistré sous [%s]\n"
 
-#: ../src/x_window.c:871
+#: src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Sauvegarder [%s]\n"
 
-#: ../src/x_window.c:873
+#: src/x_window.c:873
 msgid "Saved"
 msgstr "Sauvegarder"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Abandonne page [%s]\n"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Ferme [%s]\n"
 
-#: ../data/geda-gschem.desktop.in.h:1
-msgid "Create and edit electrical schematics and symbols with gschem"
-msgstr ""
-
-#: ../data/geda-gschem.desktop.in.h:2
+#: data/geda-gschem.desktop.in.h:3
 #, fuzzy
 msgid "gEDA Schematic Editor"
 msgstr "Descendre dans la hiérarchie"
 
+#: data/geda-gschem.desktop.in.h:4
+msgid "Create and edit electrical schematics and symbols with gschem"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Cut Buffer"
 #~ msgstr "Tampon"
@@ -2650,9 +2629,6 @@ msgstr "Descendre dans la hiérarchie"
 #~ msgid "Tried to render text with an invalid angle: %d\n"
 #~ msgstr "Angle du texte invalide : %d\n"
 
-#~ msgid "Generic String"
-#~ msgstr "Saisie de texte"
-
 #~ msgid "Enter new string."
 #~ msgstr "Entrez la nouvelle chaîne."
 
diff --git a/gschem/po/it.po b/gschem/po/it.po
index 805159f..995da26 100644
--- a/gschem/po/it.po
+++ b/gschem/po/it.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: it_IT\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 14:35-0400\n"
+"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
+"POT-Creation-Date: 2009-06-18 11:53+0100\n"
 "PO-Revision-Date: 2008-12-20 14:38+0000\n"
 "Last-Translator: Michele <michelinux@xxxxxxxx>\n"
 "Language-Team: Italiano <michelinux@xxxxxxxx>\n"
@@ -17,622 +17,612 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../src/rcstrings.c:2
+#: src/rcstrings.c:2
 msgid "File"
 msgstr "File"
 
-#: ../src/rcstrings.c:3
+#: src/rcstrings.c:3
 msgid "New Window"
 msgstr "Nuova finestra"
 
-#: ../src/rcstrings.c:4 ../src/x_pagesel.c:252
+#: src/rcstrings.c:4 src/x_pagesel.c:252
 msgid "New Page"
 msgstr "Nuova pagina"
 
-#: ../src/rcstrings.c:5 ../src/x_pagesel.c:253
+#: src/rcstrings.c:5 src/x_pagesel.c:253
 msgid "Open Page..."
 msgstr "Apri pagina..."
 
-#: ../src/rcstrings.c:6 ../src/x_pagesel.c:256
+#: src/rcstrings.c:6 src/x_pagesel.c:256
 msgid "Close Page"
 msgstr "Chiudi pagina"
 
-#: ../src/rcstrings.c:7
+#: src/rcstrings.c:7
 msgid "Revert Page"
 msgstr ""
 
-#: ../src/rcstrings.c:8 ../src/x_pagesel.c:255
+#: src/rcstrings.c:8 src/x_pagesel.c:255
 msgid "Save Page"
 msgstr "Salva la pagina"
 
-#: ../src/rcstrings.c:9
+#: src/rcstrings.c:9
 msgid "Save Page As..."
 msgstr "Salva pagina con nome..."
 
-#: ../src/rcstrings.c:10
+#: src/rcstrings.c:10
 msgid "Save All"
 msgstr "Salva tutto"
 
-#. GtkWindow
-#: ../src/rcstrings.c:11 ../src/x_print.c:276
+#: src/rcstrings.c:11 src/x_print.c:276
 msgid "Print..."
 msgstr "Stampa..."
 
-#. Create the dialog
-#: ../src/rcstrings.c:12 ../src/x_image.c:495
+#: src/rcstrings.c:12 src/x_image.c:495
 msgid "Write image..."
 msgstr "Scrivi immagine..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:501
+#: src/rcstrings.c:13
 msgid "Recent files"
 msgstr "File recenti"
 
-#: ../src/rcstrings.c:14 ../src/x_script.c:47
+#: src/rcstrings.c:14 src/x_script.c:47
 msgid "Execute Script..."
 msgstr "Esegui Script..."
 
-#: ../src/rcstrings.c:15
+#: src/rcstrings.c:15
 msgid "Close Window"
 msgstr "Chiudi finestra"
 
-#: ../src/rcstrings.c:16
+#: src/rcstrings.c:16
 msgid "Quit"
 msgstr "Esci"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
+#: src/rcstrings.c:18 src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Modifica"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:338
+#: src/rcstrings.c:19 src/x_window.c:338
 msgid "Undo"
 msgstr "Annulla"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:345
+#: src/rcstrings.c:20 src/x_window.c:345
 msgid "Redo"
 msgstr "Ripristina"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
+#: src/rcstrings.c:21 src/i_basic.c:77 src/x_window.c:521
 msgid "Select Mode"
 msgstr "Modalità selezione"
 
-#: ../src/rcstrings.c:22
+#: src/rcstrings.c:22
 #, fuzzy
 msgid "Cut"
 msgstr "Taglia 1"
 
-#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
-#: ../src/i_callbacks.c:560
+#: src/rcstrings.c:23 src/i_basic.c:135 src/i_callbacks.c:536
+#: src/i_callbacks.c:560
 msgid "Copy"
 msgstr "Copia"
 
-#: ../src/rcstrings.c:24
+#: src/rcstrings.c:24
 #, fuzzy
 msgid "Paste"
 msgstr "Incolla 1"
 
-#: ../src/rcstrings.c:25
+#: src/rcstrings.c:25
 msgid "Edit..."
 msgstr "Modifica..."
 
-#: ../src/rcstrings.c:26
+#: src/rcstrings.c:26
 msgid "Edit Text..."
 msgstr "Modifica il testo..."
 
-#: ../src/rcstrings.c:27 ../src/i_basic.c:84
+#: src/rcstrings.c:27 src/i_basic.c:84
 msgid "Copy Mode"
 msgstr "Modalità copia"
 
-#: ../src/rcstrings.c:28 ../src/i_basic.c:142
+#: src/rcstrings.c:28 src/i_basic.c:142
 msgid "Multiple Copy Mode"
 msgstr "Modalità di copiatura multipla"
 
-#: ../src/rcstrings.c:29 ../src/i_basic.c:87
+#: src/rcstrings.c:29 src/i_basic.c:87
 msgid "Move Mode"
 msgstr "Modalità spostamento"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
+#: src/rcstrings.c:30 src/i_callbacks.c:670 src/x_multiattrib.c:1496
 msgid "Delete"
 msgstr "Cancella"
 
-#: ../src/rcstrings.c:31
+#: src/rcstrings.c:31
 msgid "Rotate 90 Mode"
 msgstr "Ruota di 90 gradi"
 
-#: ../src/rcstrings.c:32 ../src/i_basic.c:91
+#: src/rcstrings.c:32 src/i_basic.c:91
 msgid "Mirror Mode"
 msgstr "Modalità specchio"
 
-#: ../src/rcstrings.c:33
+#: src/rcstrings.c:33
 msgid "Slot..."
 msgstr "Slot..."
 
-#: ../src/rcstrings.c:34
+#: src/rcstrings.c:34
 msgid "Color..."
 msgstr "Colore..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
+#: src/rcstrings.c:35 src/i_callbacks.c:920 src/x_dialog.c:2411
 msgid "Lock"
 msgstr "Blocca"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
+#: src/rcstrings.c:36 src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "Sblocca"
 
-#: ../src/rcstrings.c:37
+#: src/rcstrings.c:37
 msgid "Line Width & Type..."
 msgstr "Tipo & Larghezza della linea..."
 
-#: ../src/rcstrings.c:38
+#: src/rcstrings.c:38
 msgid "Fill Type..."
 msgstr "Riempimento..."
 
-#: ../src/rcstrings.c:39
+#: src/rcstrings.c:39
 msgid "Symbol Translate..."
 msgstr "Converti simbolo..."
 
-#: ../src/rcstrings.c:40
+#: src/rcstrings.c:40
 msgid "Embed Component/Picture"
 msgstr "Componente/Immagine fissato/a"
 
-#: ../src/rcstrings.c:41
+#: src/rcstrings.c:41
 msgid "Unembed Component/Picture"
 msgstr "Componente/immagine non fissato/a"
 
-#: ../src/rcstrings.c:42
+#: src/rcstrings.c:42
 msgid "Update Component"
 msgstr "Aggiorna Componente"
 
-#: ../src/rcstrings.c:43
+#: src/rcstrings.c:43
 msgid "Show/Hide Inv Text"
 msgstr "Mostra/Nascondi Testo Invisibile"
 
-#: ../src/rcstrings.c:44
+#: src/rcstrings.c:44
 msgid "Make Inv Text Vis"
 msgstr "Rendi Invisibile Testo Visibile"
 
-#: ../src/rcstrings.c:46
+#: src/rcstrings.c:46
 msgid "Buffer"
 msgstr "Buffer"
 
-#: ../src/rcstrings.c:47
+#: src/rcstrings.c:47
 msgid "Copy into 1"
 msgstr "Copia in 1"
 
-#: ../src/rcstrings.c:48
+#: src/rcstrings.c:48
 msgid "Copy into 2"
 msgstr "Copia in 2"
 
-#: ../src/rcstrings.c:49
+#: src/rcstrings.c:49
 msgid "Copy into 3"
 msgstr "Copia in 3"
 
-#: ../src/rcstrings.c:50
+#: src/rcstrings.c:50
 msgid "Copy into 4"
 msgstr "Copia in 4"
 
-#: ../src/rcstrings.c:51
+#: src/rcstrings.c:51
 msgid "Copy into 5"
 msgstr "Copia in 5"
 
-#: ../src/rcstrings.c:52
+#: src/rcstrings.c:52
 msgid "Cut into 1"
 msgstr "Taglia in 1"
 
-#: ../src/rcstrings.c:53
+#: src/rcstrings.c:53
 msgid "Cut into 2"
 msgstr "Taglia in 2"
 
-#: ../src/rcstrings.c:54
+#: src/rcstrings.c:54
 msgid "Cut into 3"
 msgstr "Taglia in 3"
 
-#: ../src/rcstrings.c:55
+#: src/rcstrings.c:55
 msgid "Cut into 4"
 msgstr "Taglia in 4"
 
-#: ../src/rcstrings.c:56
+#: src/rcstrings.c:56
 msgid "Cut into 5"
 msgstr "Taglia in 5"
 
-#: ../src/rcstrings.c:57
+#: src/rcstrings.c:57
 msgid "Paste from 1"
 msgstr "Incolla da 1"
 
-#: ../src/rcstrings.c:58
+#: src/rcstrings.c:58
 msgid "Paste from 2"
 msgstr "Incolla da 2"
 
-#: ../src/rcstrings.c:59
+#: src/rcstrings.c:59
 msgid "Paste from 3"
 msgstr "Incolla da 3"
 
-#: ../src/rcstrings.c:60
+#: src/rcstrings.c:60
 msgid "Paste from 4"
 msgstr "Incolla da 4"
 
-#: ../src/rcstrings.c:61
+#: src/rcstrings.c:61
 msgid "Paste from 5"
 msgstr "Incolla da 5"
 
-#: ../src/rcstrings.c:63
+#: src/rcstrings.c:63
 msgid "View"
 msgstr "Vista"
 
-#: ../src/rcstrings.c:64
+#: src/rcstrings.c:64
 msgid "Redraw"
 msgstr "Aggiorna"
 
-#. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
+#: src/rcstrings.c:65 src/i_callbacks.c:1474 src/i_callbacks.c:1546
 msgid "Pan"
 msgstr "Pan"
 
-#: ../src/rcstrings.c:66 ../src/i_basic.c:95
+#: src/rcstrings.c:66 src/i_basic.c:95
 msgid "Zoom Box"
 msgstr "Ingrandisci Riquadro"
 
-#: ../src/rcstrings.c:67
+#: src/rcstrings.c:67
 msgid "Zoom Extents"
 msgstr "Adatta alla pagina"
 
-#: ../src/rcstrings.c:68
+#: src/rcstrings.c:68
 msgid "Zoom In"
 msgstr "Ingrandisci"
 
-#: ../src/rcstrings.c:69
+#: src/rcstrings.c:69
 msgid "Zoom Out"
 msgstr "Riduci"
 
-#: ../src/rcstrings.c:70
+#: src/rcstrings.c:70
 msgid "Zoom Full"
 msgstr "Riduci al Massimo"
 
-#: ../src/rcstrings.c:71
+#: src/rcstrings.c:71
 msgid "Dark color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:72
+#: src/rcstrings.c:72
 msgid "Light color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:74
+#: src/rcstrings.c:74
 msgid "Page"
 msgstr "Pagina"
 
-#: ../src/rcstrings.c:75
+#: src/rcstrings.c:75
 msgid "Manager..."
 msgstr "Gestore..."
 
-#: ../src/rcstrings.c:76
+#: src/rcstrings.c:76
 msgid "Next"
 msgstr "Successiva"
 
-#: ../src/rcstrings.c:77
+#: src/rcstrings.c:77
 msgid "Previous"
 msgstr "Precedente"
 
-#: ../src/rcstrings.c:78 ../src/x_window.c:316
+#: src/rcstrings.c:78 src/x_window.c:316
 msgid "New"
 msgstr "Nuovo"
 
-#: ../src/rcstrings.c:79
+#: src/rcstrings.c:79
 msgid "Revert"
 msgstr "Riduce e Centra lo Schema"
 
-#: ../src/rcstrings.c:80
+#: src/rcstrings.c:80
 msgid "Close"
 msgstr "Chiudi"
 
-#: ../src/rcstrings.c:81
+#: src/rcstrings.c:81
 msgid "Discard"
 msgstr "Annulla"
 
-#: ../src/rcstrings.c:83
+#: src/rcstrings.c:83
 msgid "Add"
 msgstr "Aggiungi"
 
-#: ../src/rcstrings.c:84
+#: src/rcstrings.c:84
 msgid "Component..."
 msgstr "Componente..."
 
-#. need to click
-#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
-#: ../src/x_dialog.c:2376
+#: src/rcstrings.c:85 src/i_callbacks.c:2401 src/i_callbacks.c:2428
+#: src/x_dialog.c:2378
 msgid "Net"
 msgstr "Collegamento"
 
-#. need to click
-#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
-#: ../src/x_dialog.c:2394 ../src/x_window.c:374
+#: src/rcstrings.c:86 src/i_callbacks.c:2472 src/i_callbacks.c:2499
+#: src/x_dialog.c:2396 src/x_window.c:374
 msgid "Bus"
 msgstr "Bus"
 
-#: ../src/rcstrings.c:87
+#: src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "Caratteristica..."
 
-#: ../src/rcstrings.c:88
+#: src/rcstrings.c:88
 msgid "Text..."
 msgstr "Testo..."
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
+#: src/rcstrings.c:89 src/i_callbacks.c:2580 src/i_callbacks.c:2603
 msgid "Line"
 msgstr "Linea"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
+#: src/rcstrings.c:90 src/i_callbacks.c:2625 src/i_callbacks.c:2648
 msgid "Box"
 msgstr "Box"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
+#: src/rcstrings.c:91 src/i_callbacks.c:2704 src/i_callbacks.c:2728
 msgid "Circle"
 msgstr "Cerchio"
 
-#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
+#: src/rcstrings.c:92 src/i_callbacks.c:2750 src/i_callbacks.c:2773
 msgid "Arc"
 msgstr "Arco"
 
-#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
-#: ../src/x_dialog.c:2367
+#: src/rcstrings.c:93 src/i_callbacks.c:2795 src/i_callbacks.c:2818
+#: src/x_dialog.c:2369
 msgid "Pin"
 msgstr "Pin"
 
-#: ../src/rcstrings.c:94
+#: src/rcstrings.c:94
 msgid "Picture..."
 msgstr "Immagine..."
 
-#: ../src/rcstrings.c:96
+#: src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "Gerarchia"
 
-#: ../src/rcstrings.c:97
+#: src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "Scarica Schematico"
 
-#: ../src/rcstrings.c:98
+#: src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "Scarica Simbolo"
 
-#: ../src/rcstrings.c:99
+#: src/rcstrings.c:99
 msgid "Up"
 msgstr "Sopra"
 
-#: ../src/rcstrings.c:100
+#: src/rcstrings.c:100
 msgid "Documentation"
 msgstr "Documentazione"
 
-#. GtkFrame
-#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
-#: ../src/x_multiattrib.c:1543
+#: src/rcstrings.c:102 src/x_compselect.c:1417
 msgid "Attributes"
 msgstr "Caratteristiche"
 
-#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
+#: src/rcstrings.c:103 src/i_callbacks.c:3089
 msgid "Attach"
 msgstr "Collega"
 
-#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
+#: src/rcstrings.c:104 src/i_callbacks.c:3136
 msgid "Detach"
 msgstr "Scollega"
 
-#: ../src/rcstrings.c:105
+#: src/rcstrings.c:105
 msgid "Show Value"
 msgstr "Mostra Valore"
 
-#: ../src/rcstrings.c:106
+#: src/rcstrings.c:106
 msgid "Show Name"
 msgstr "Mostra Nome"
 
-#: ../src/rcstrings.c:107
+#: src/rcstrings.c:107
 msgid "Show Both"
 msgstr "Mostra Entrambi"
 
-#: ../src/rcstrings.c:108
+#: src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "Pulsante Visibilità"
 
-#: ../src/rcstrings.c:109
+#: src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "Trova Testo Specifico..."
 
-#: ../src/rcstrings.c:110
+#: src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "Nascondi Testo Specifico..."
 
-#: ../src/rcstrings.c:111
+#: src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "Mostra Testo Specifico..."
 
-#: ../src/rcstrings.c:112
+#: src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr ""
 
-#: ../src/rcstrings.c:114
+#: src/rcstrings.c:114
 msgid "Options"
 msgstr "Opzioni"
 
-#: ../src/rcstrings.c:115
+#: src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "Ampiezza Testo..."
 
-#: ../src/rcstrings.c:116
+#: src/rcstrings.c:116
 msgid "Cycle grid styles"
 msgstr ""
 
-#: ../src/rcstrings.c:117
+#: src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr ""
 
-#: ../src/rcstrings.c:118
+#: src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "Ampiezza Griglia"
 
-#: ../src/rcstrings.c:119
+#: src/rcstrings.c:119
 msgid "Scale up Grid Spacing"
 msgstr ""
 
-#: ../src/rcstrings.c:120
+#: src/rcstrings.c:120
 msgid "Scale down Grid Spacing"
 msgstr ""
 
-#: ../src/rcstrings.c:121
+#: src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr ""
 
-#: ../src/rcstrings.c:122
+#: src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr ""
 
-#: ../src/rcstrings.c:123
+#: src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "Mostra Finestra File di Log..."
 
-#: ../src/rcstrings.c:124
+#: src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "Mostra Coordinate Finestra..."
 
-#: ../src/rcstrings.c:126
+#: src/rcstrings.c:126
 msgid "Help"
 msgstr "Aiuto"
 
-#: ../src/rcstrings.c:127
+#: src/rcstrings.c:127
 msgid "Manual"
 msgstr "Manuale"
 
-#: ../src/rcstrings.c:128
+#: src/rcstrings.c:128
 msgid "gEDA Documentation"
 msgstr "Documentazione gEDA"
 
-#: ../src/rcstrings.c:129
+#: src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr "FAQ gschem"
 
-#: ../src/rcstrings.c:130
+#: src/rcstrings.c:130
 msgid "Component Documentation"
 msgstr "Documentazione componente"
 
-#: ../src/rcstrings.c:131
+#: src/rcstrings.c:131
 msgid "About gschem"
 msgstr "Informazioni su gschem"
 
-#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
+#: src/rcstrings.c:132 src/x_dialog.c:2724
 msgid "Hotkeys"
 msgstr "Hotkeys"
 
-#: ../src/a_zoom.c:212
+#: src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr ""
 "Eccessiva riduzione dell'immagine!  Non è possibile ridurla ulteriormente.\n"
 
-#. Fork failed. Still in parent process, so can use the log
-#. * window
-#: ../src/g_funcs.c:339 ../src/i_callbacks.c:68
+#: src/g_funcs.c:339 src/i_callbacks.c:68
 #, c-format
 msgid "Could not fork\n"
 msgstr "Impossibile creare un nuovo processo\n"
 
-#. if we return, then nothing happened
-#: ../src/g_funcs.c:355 ../src/i_callbacks.c:78
+#: src/g_funcs.c:355 src/i_callbacks.c:78
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr "Non è possibile invocare %s\n"
 
-#: ../src/g_funcs.c:361 ../src/i_callbacks.c:82
+#: src/g_funcs.c:361 src/i_callbacks.c:82
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Comandi documentazione non supportati sotto MinGW.\n"
 
-#: ../src/g_rc.c:292
+#: src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Fattore di ingrandimento [%d] passato a %s non valido.\n"
 
-#: ../src/g_rc.c:418
+#: src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Grandezza [%d] passata alla dimensione del testo, non valida\n"
 
-#: ../src/g_rc.c:445
+#: src/g_rc.c:445
 #, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "L'ampiezza [%f] passata al postscript-font-scale non è valida\n"
 
-#: ../src/g_rc.c:488
+#: src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "L'ampiezza [%d] , assegnata alla snap size, non è corretta\n"
 
-#: ../src/g_rc.c:960
+#: src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "Il numero di livelli [%d] assegnato ai livelli Cancella non è valido\n"
 
-#: ../src/g_rc.c:1218
+#: src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr ""
 
-#: ../src/g_rc.c:1293
+#: src/g_rc.c:1293
 #, fuzzy, c-format
 msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr ""
 "Il valore [%d] dell'ampiezza dei punti passata alla griglia non è valida\n"
 
-#: ../src/g_rc.c:1334
+#: src/g_rc.c:1334
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 msgstr ""
 "Il valore [%d] dell'ampiezza dei punti passata alla griglia non è valida\n"
 
-#: ../src/g_rc.c:1360
+#: src/g_rc.c:1360
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 msgstr ""
 "Il valore [%d] dell'ampiezza dei punti passata alla griglia non è valida\n"
 
-#: ../src/g_rc.c:1404
+#: src/g_rc.c:1404
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr ""
 
-#: ../src/g_rc.c:1428
+#: src/g_rc.c:1428
 #, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr ""
 "Il numero di secondi indicati [%d] non è valido ai fini dell'intervallo di "
 "auto salvataggio\n"
 
-#: ../src/g_rc.c:1469
+#: src/g_rc.c:1469
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr ""
 
-#: ../src/g_rc.c:1492
+#: src/g_rc.c:1492
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr ""
 
-#: ../src/g_rc.c:1538
+#: src/g_rc.c:1538
 #, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr "Il numero [%d] di pixel indicati non è valido\n"
 
-#: ../src/g_rc.c:1564
+#: src/g_rc.c:1564
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "Grandezza [%d] passata alla dimensione del testo, non valida\n"
 
-#: ../src/g_rc.c:1589
+#: src/g_rc.c:1589
 #, fuzzy, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr ""
 "Il numero di secondi indicati [%d] non è valido ai fini dell'intervallo di "
 "auto salvataggio\n"
 
-#: ../src/gschem.c:183 ../src/gschem.c:194
+#: src/gschem.c:183 src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem versione %s%s.%s\n"
 
-#: ../src/gschem.c:186 ../src/gschem.c:197
+#: src/gschem.c:186 src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -641,7 +631,7 @@ msgstr ""
 "gEDA/gschem viene rilasciato SENZA GARANZIA ALCUNA A CAUSA DEL SUO SVILUPPO "
 "IN FASE ALFA; leggere il file COPYING per ulteriori informazioni.\n"
 
-#: ../src/gschem.c:188 ../src/gschem.c:199
+#: src/gschem.c:188 src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -649,24 +639,24 @@ msgstr ""
 "Questo software è rilasciato sotto licenza GPL e può essere ridistribuito "
 "sotto determinate\n"
 
-#: ../src/gschem.c:190 ../src/gschem.c:201
+#: src/gschem.c:190 src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
 "\n"
 msgstr "condizioni; per favore leggi il file COPYNG per ulteriori dettagli.\n"
 
-#: ../src/gschem.c:205
+#: src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "Port per MINGW32.\n"
 
-#: ../src/gschem.c:209
+#: src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Impostazioni locali correnti: %s\n"
 
-#: ../src/gschem.c:224
+#: src/gschem.c:224
 msgid ""
 "You must set the GEDADATA environment variable!\n"
 "\n"
@@ -674,225 +664,247 @@ msgid ""
 "environment variable to point to the correct location.\n"
 msgstr ""
 
-#: ../src/gschem.c:251
+#: src/gschem.c:251
 #, fuzzy, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "Fallita la lettura del file init scm [%s]\n"
 
-#: ../src/gschem.c:255
+#: src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Lettura del file init scm [%s]\n"
 
-#. ! \todo These two messages are the same. Should be
-#. * integrated.
-#: ../src/gschem.c:259
+#: src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Fallita la lettura del file init scm [%s]\n"
 
-#: ../src/gschem.c:320
+#: src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Cartelle degli schemi non impostata!\n"
 
-#: ../src/gschem.c:327 ../src/x_script.c:66
+#: src/gschem.c:327 src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Esecuzione dello script guile [%s]\n"
 
-#: ../src/gschem_cairo.c:310
+#: src/gschem_accel_label.c:319
+msgid "Accelerator Closure"
+msgstr ""
+
+#: src/gschem_accel_label.c:320
+msgid "The closure to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:326
+msgid "Accelerator Widget"
+msgstr ""
+
+#: src/gschem_accel_label.c:327
+msgid "The widget to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:333
+msgid "Accelerator String"
+msgstr ""
+
+#: src/gschem_accel_label.c:334
+msgid "The accelerator string to be displayed"
+msgstr ""
+
+#: src/gschem_cairo.c:310
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "Non corretta terminazione per la linea (%d)\n"
 
-#: ../src/gschem_cairo.c:318
+#: src/gschem_cairo.c:318
 #, fuzzy, c-format
 msgid "Unknown type for stroke (%d) !\n"
 msgstr "Tipo di linea sconosciuta per (%d) !\n"
 
-#: ../src/i_basic.c:79
+#: src/i_basic.c:79
 msgid "Component Mode"
 msgstr "Scelta Componente"
 
-#: ../src/i_basic.c:81
+#: src/i_basic.c:81
 msgid "Text Mode"
 msgstr "Modalità Testo"
 
-#: ../src/i_basic.c:89
+#: src/i_basic.c:89
 msgid "Rotate Mode"
 msgstr "Modalità Rotazione"
 
-#: ../src/i_basic.c:99
+#: src/i_basic.c:99
 msgid "Pan Mode"
 msgstr ""
 
-#: ../src/i_basic.c:103
+#: src/i_basic.c:103
 #, c-format
 msgid "Paste %d Mode"
 msgstr "Modalità %d Incolla"
 
-#: ../src/i_basic.c:109
+#: src/i_basic.c:109
 #, fuzzy
 msgid "Magnetic Net Mode"
 msgstr "Modalità Collegamento"
 
-#: ../src/i_basic.c:111
+#: src/i_basic.c:111
 msgid "Net Mode"
 msgstr "Modalità Collegamento"
 
-#: ../src/i_basic.c:115
+#: src/i_basic.c:115
 msgid "Bus Mode"
 msgstr "Modalità Bus"
 
-#: ../src/i_basic.c:118
+#: src/i_basic.c:118
 msgid "Line Mode"
 msgstr "Modalità Linea"
 
-#: ../src/i_basic.c:121
+#: src/i_basic.c:121
 msgid "Box Mode"
 msgstr "Modalità Riquadro"
 
-#: ../src/i_basic.c:124
+#: src/i_basic.c:124
 msgid "Picture Mode"
 msgstr "Modalità Immagine"
 
-#: ../src/i_basic.c:127
+#: src/i_basic.c:127
 msgid "Circle Mode"
 msgstr "Modalità Cerchio"
 
-#: ../src/i_basic.c:130
+#: src/i_basic.c:130
 msgid "Arc Mode"
 msgstr "Modalità Arco"
 
-#: ../src/i_basic.c:133
+#: src/i_basic.c:133
 msgid "Pin Mode"
 msgstr "Modalità Pin"
 
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
+#: src/i_basic.c:137 src/i_callbacks.c:626 src/i_callbacks.c:650
 msgid "Move"
 msgstr "Sposta"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
+#: src/i_basic.c:139 src/i_callbacks.c:581 src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Copia Multipla"
 
-#: ../src/i_basic.c:168
+#: src/i_basic.c:168
 msgid "Show Hidden"
 msgstr "Mostra Nascosto"
 
-#: ../src/i_basic.c:171
+#: src/i_basic.c:171
 msgid "Snap Off"
 msgstr "Snap Off"
 
-#: ../src/i_basic.c:173
+#: src/i_basic.c:173
 msgid "Resnap Active"
 msgstr ""
 
-#: ../src/i_basic.c:254 ../src/x_window.c:495
+#: src/i_basic.c:254 src/x_window.c:495
 msgid "Action"
 msgstr "Azione"
 
-#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
+#: src/i_basic.c:260 src/x_dialog.c:2408 src/x_window.c:490
 msgid "Stroke"
 msgstr ""
 
-#: ../src/i_basic.c:266 ../src/x_window.c:492
+#: src/i_basic.c:266 src/x_window.c:492
 msgid "none"
 msgstr "none"
 
-#: ../src/i_basic.c:271
+#: src/i_basic.c:271
 msgid "Repeat/"
 msgstr "Ripeti/"
 
-#: ../src/i_basic.c:549 ../src/i_basic.c:563
+#: src/i_basic.c:549 src/i_basic.c:563
 msgid "OFF"
 msgstr "OFF"
 
-#: ../src/i_basic.c:567
+#: src/i_basic.c:567
 msgid "NONE"
 msgstr ""
 
-#: ../src/i_basic.c:572
+#: src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Griglia(%s, %s)"
 
-#: ../src/i_callbacks.c:63
+#: src/i_callbacks.c:63
 #, c-format
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentazione per [%s,%s,%s,%s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
+#: src/i_callbacks.c:123 src/i_callbacks.c:1705
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Nuova Pagina Creata [%s]\n"
 
-#: ../src/i_callbacks.c:163
+#: src/i_callbacks.c:163
 #, c-format
 msgid "New Window created [%s]\n"
 msgstr "Creata Nuova Finestra [%s]\n"
 
-#: ../src/i_callbacks.c:281
+#: src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "Salvataggio Fallito"
 
-#: ../src/i_callbacks.c:283
+#: src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Salvato Tutto"
 
-#: ../src/i_callbacks.c:373
+#: src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "Chiusura Finestra\n"
 
-#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
+#: src/i_callbacks.c:541 src/i_callbacks.c:586 src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "Seleziona prima un oggetto"
 
-#: ../src/i_callbacks.c:710
+#: src/i_callbacks.c:710
 #, fuzzy
 msgid "Edit pin type"
 msgstr "Modifica il Tipo di Linea"
 
-#: ../src/i_callbacks.c:729
+#: src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Modifica Testo"
 
-#: ../src/i_callbacks.c:752
+#: src/i_callbacks.c:752
 msgid "Slot"
 msgstr "Slot"
 
-#: ../src/i_callbacks.c:769
+#: src/i_callbacks.c:769
 msgid "Color"
 msgstr "Colore"
 
-#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
+#: src/i_callbacks.c:806 src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Ruota"
 
-#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
+#: src/i_callbacks.c:874 src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Specchio"
 
-#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
+#: src/i_callbacks.c:956 src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Converti"
 
-#: ../src/i_callbacks.c:959
+#: src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "ATTENZIONE: Non effettuare la conversione in modalità snap off!\n"
 
-#: ../src/i_callbacks.c:960
+#: src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr ""
 "ATTENZIONE: Sei in modalità snap off; passa prima in modalità snap on e poi "
 "continua con la conversione.\n"
 
-#: ../src/i_callbacks.c:967
+#: src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "ATTENZIONE: L'ampiezza snap gride non è uguale a 100!\n"
 
-#: ../src/i_callbacks.c:969
+#: src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -900,145 +912,144 @@ msgstr ""
 "ATTENZIONE: se stai convertendo un simbolo dalla sua origine, è opportuno "
 "che l'ampiezza snap gride venga impostata a 100\n"
 
-#: ../src/i_callbacks.c:1000
+#: src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "Posizionato"
 
-#: ../src/i_callbacks.c:1041
+#: src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "Non posizionato"
 
-#: ../src/i_callbacks.c:1084
+#: src/i_callbacks.c:1085
 msgid "Update"
 msgstr "Aggiorna"
 
-#: ../src/i_callbacks.c:1141
+#: src/i_callbacks.c:1144
 msgid "ShowHidden"
 msgstr "Mostra Nascosto"
 
-#: ../src/i_callbacks.c:1165
+#: src/i_callbacks.c:1168
 msgid "MakeVisible"
 msgstr "Rendi Visibile"
 
-#: ../src/i_callbacks.c:1562
+#: src/i_callbacks.c:1565
 msgid "Update Cues"
 msgstr ""
 
-#: ../src/i_callbacks.c:1746
+#: src/i_callbacks.c:1749
 msgid "Really revert page?"
 msgstr "Vuoi veramente ritornare alla pagina precedente?"
 
-#: ../src/i_callbacks.c:1816
+#: src/i_callbacks.c:1819
 msgid "Copy to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1834
+#: src/i_callbacks.c:1837
 msgid "Cut to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1852
+#: src/i_callbacks.c:1855
 #, fuzzy
 msgid "Paste from clipboard"
 msgstr "Incolla da 1"
 
-#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
-#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
-#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+#: src/i_callbacks.c:1867 src/i_callbacks.c:2106 src/i_callbacks.c:2128
+#: src/i_callbacks.c:2150 src/i_callbacks.c:2172 src/i_callbacks.c:2194
 msgid "Empty buffer"
 msgstr "Buffer vuoto"
 
-#: ../src/i_callbacks.c:1909
+#: src/i_callbacks.c:1912
 msgid "Copy 1"
 msgstr "Copia 1"
 
-#: ../src/i_callbacks.c:1928
+#: src/i_callbacks.c:1931
 msgid "Copy 2"
 msgstr "Copia 2"
 
-#: ../src/i_callbacks.c:1947
+#: src/i_callbacks.c:1950
 msgid "Copy 3"
 msgstr "Copia 3"
 
-#: ../src/i_callbacks.c:1966
+#: src/i_callbacks.c:1969
 msgid "Copy 4"
 msgstr "Copia 4"
 
-#: ../src/i_callbacks.c:1985
+#: src/i_callbacks.c:1988
 msgid "Copy 5"
 msgstr "Copia 5"
 
-#: ../src/i_callbacks.c:2004
+#: src/i_callbacks.c:2007
 msgid "Cut 1"
 msgstr "Taglia 1"
 
-#: ../src/i_callbacks.c:2023
+#: src/i_callbacks.c:2026
 msgid "Cut 2"
 msgstr "Taglia 2"
 
-#: ../src/i_callbacks.c:2042
+#: src/i_callbacks.c:2045
 msgid "Cut 3"
 msgstr "Taglia 3"
 
-#: ../src/i_callbacks.c:2061
+#: src/i_callbacks.c:2064
 msgid "Cut 4"
 msgstr "Taglia 4"
 
-#: ../src/i_callbacks.c:2080
+#: src/i_callbacks.c:2083
 msgid "Cut 5"
 msgstr "Taglia 5"
 
-#: ../src/i_callbacks.c:2096
+#: src/i_callbacks.c:2099
 msgid "Paste 1"
 msgstr "Incolla 1"
 
-#: ../src/i_callbacks.c:2118
+#: src/i_callbacks.c:2121
 msgid "Paste 2"
 msgstr "Incolla 2"
 
-#: ../src/i_callbacks.c:2140
+#: src/i_callbacks.c:2143
 msgid "Paste 3"
 msgstr "Incolla 3"
 
-#: ../src/i_callbacks.c:2162
+#: src/i_callbacks.c:2165
 msgid "Paste 4"
 msgstr "Incolla 4"
 
-#: ../src/i_callbacks.c:2184
+#: src/i_callbacks.c:2187
 msgid "Paste 5"
 msgstr "Incolla 5"
 
-#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
+#: src/i_callbacks.c:2324 src/x_window.c:354
 msgid "Component"
 msgstr "Componente"
 
-#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
+#: src/i_callbacks.c:2360 src/i_callbacks.c:2379 src/x_dialog.c:2381
 msgid "Attribute"
 msgstr "Caratteristica"
 
-#: ../src/i_callbacks.c:2873
+#: src/i_callbacks.c:2877
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Ricerca del sorgente [%s]\n"
 
-#: ../src/i_callbacks.c:2897
+#: src/i_callbacks.c:2901
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Impossibile trovare il sorgente [%s]\n"
 
-#: ../src/i_callbacks.c:2964
+#: src/i_callbacks.c:2970
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Ricerca del simbolo [%s]\n"
 
-#: ../src/i_callbacks.c:2970
+#: src/i_callbacks.c:2976
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3001
+#: src/i_callbacks.c:3007
 msgid "Cannot find any schematics above the current one!\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3064
+#: src/i_callbacks.c:3061
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
@@ -1046,248 +1057,246 @@ msgstr ""
 "Questo comando reperisce la documentazione del componente da Internet, ma "
 "non hai selezionato nessun componente da cercare."
 
-#: ../src/i_callbacks.c:3177
+#: src/i_callbacks.c:3171
 msgid "ShowN"
 msgstr "MostraN"
 
-#: ../src/i_callbacks.c:3213
+#: src/i_callbacks.c:3207
 msgid "ShowV"
 msgstr "MostraV"
 
-#: ../src/i_callbacks.c:3249
+#: src/i_callbacks.c:3243
 msgid "ShowB"
 msgstr "MostraB"
 
-#: ../src/i_callbacks.c:3286
+#: src/i_callbacks.c:3280
 msgid "VisToggle"
 msgstr "Visibilità Strumenti"
 
-#: ../src/i_callbacks.c:3316
+#: src/i_callbacks.c:3310
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Spiacente, ma questa non è una funzione del menù opzioni\n"
 
-#: ../src/i_callbacks.c:3406
+#: src/i_callbacks.c:3400
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3409
+#: src/i_callbacks.c:3403
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3434
+#: src/i_callbacks.c:3428
 msgid "Grid OFF\n"
 msgstr "Griglia NON ATTIVA\n"
 
-#: ../src/i_callbacks.c:3435
+#: src/i_callbacks.c:3429
 msgid "Dot grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3436
+#: src/i_callbacks.c:3430
 msgid "Mesh grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3457
+#: src/i_callbacks.c:3451
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Snap OFF (ATTENZIONE!)\n"
 
-#: ../src/i_callbacks.c:3460
+#: src/i_callbacks.c:3454
 msgid "Snap ON\n"
 msgstr "Snap ON\n"
 
-#: ../src/i_callbacks.c:3463
+#: src/i_callbacks.c:3457
 #, fuzzy
 msgid "Snap back to the grid (CAUTION!)\n"
 msgstr "Snap OFF (ATTENZIONE!)\n"
 
-#: ../src/i_callbacks.c:3489
+#: src/i_callbacks.c:3483
 msgid "Rubber band OFF \n"
 msgstr "Rubber band OFF \n"
 
-#: ../src/i_callbacks.c:3492
+#: src/i_callbacks.c:3486
 msgid "Rubber band ON\n"
 msgstr "Rubber band ON\n"
 
-#: ../src/i_callbacks.c:3507
+#: src/i_callbacks.c:3501
 msgid "magnetic net mode: ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3510
+#: src/i_callbacks.c:3504
 msgid "magnetic net mode: OFF\n"
 msgstr ""
 
-#: ../src/o_box.c:160
+#: src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Sconosciuto tipo per il riquadro (riempimento)!\n"
 
-#: ../src/o_buffer.c:57
+#: src/o_buffer.c:57
 #, c-format
 msgid "o_buffer_copy: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:72
+#: src/o_buffer.c:72
 #, c-format
 msgid "o_buffer_cut: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:93
+#: src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr "Ottenuto un non valido buffer_number [o_buffer_paste_start]\n"
 
-#: ../src/o_bus.c:135
+#: src/o_bus.c:135
 #, fuzzy, c-format
 msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr "Ottenuto un non valido buffer_number [o_buffer_paste_start]\n"
 
-#: ../src/o_circle.c:141
+#: src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Tipo sconosciuto per il cerchio (riempimento)!\n"
 
-#: ../src/o_complex.c:250 ../src/o_complex.c:254
+#: src/o_complex.c:250 src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Spostamento schema [%d %d]\n"
 
-#: ../src/o_misc.c:61
+#: src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
 msgstr "Ottenuto un NULLO inaspettato in o_edit\n"
 
-#: ../src/o_misc.c:125
+#: src/o_misc.c:125
 msgid "Object already locked\n"
 msgstr "Oggetto già bloccato\n"
 
-#: ../src/o_misc.c:163
+#: src/o_misc.c:163
 msgid "Object already unlocked\n"
 msgstr "Oggetto già sbloccato\n"
 
-#: ../src/o_misc.c:445
+#: src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "Il testo nascosto è ora visibile\n"
 
-#: ../src/o_misc.c:447
+#: src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "Il testo ora è non visibile\n"
 
-#: ../src/o_misc.c:697
+#: src/o_misc.c:700
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 "Non è possibile trovare il simbolo [%s] nella libreria. Aggiornamento "
 "fallito.\n"
 
-#: ../src/o_misc.c:840
+#: src/o_misc.c:847
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr "o_autosave_backups: Non è possibile ottenere il vero nome del file %s."
 
-#: ../src/o_misc.c:884
+#: src/o_misc.c:891
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr ""
 "NOn è possibile impostare il precedente file di ripristino [%s] in lettura-"
 "scrittura\n"
 
-#: ../src/o_misc.c:902
+#: src/o_misc.c:909
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr ""
 "Non è possibile impostare il precedente file di ripristino [%s] in sola "
 "lettura\n"
 
-#: ../src/o_misc.c:907
+#: src/o_misc.c:914
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "Non è possibile salvare il file di ripristino [%s]\n"
 
-#: ../src/o_move.c:188
+#: src/o_move.c:188
 #, c-format
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "ERRORE: oggetto NULLO in o_move_end!\n"
 
-#: ../src/o_move.c:461
+#: src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr ""
 
-#: ../src/o_move.c:482
+#: src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr "Ottenuto un oggetto non in linea in o_move_check_endpoint\n"
 
-#: ../src/o_net.c:176
+#: src/o_net.c:176
 #, c-format
 msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr ""
 
-#: ../src/o_net.c:552
+#: src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr ""
 
-#: ../src/o_net.c:614
+#: src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr ""
 
-#. try to exit gracefully
-#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
-#: ../src/o_net.c:1126
+#: src/o_net.c:982 src/o_net.c:1019 src/o_net.c:1090 src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 
-#: ../src/o_net.c:1196
+#: src/o_net.c:1196
 #, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr ""
 
-#: ../src/o_path.c:356
+#: src/o_path.c:356
 #, fuzzy, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "Sconosciuto tipo per il riquadro (riempimento)!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:557
+#: src/o_picture.c:166 src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Fallito il caricamento dell'immagine: [%s]"
 
-#: ../src/o_picture.c:180
+#: src/o_picture.c:180
 msgid "Picture"
 msgstr "Immagine"
 
-#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
+#: src/o_picture.c:465 src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "ERRORE: oggetto NULLO!\n"
 
-#: ../src/o_slot.c:110
+#: src/o_slot.c:81
 msgid "Slot attribute malformed\n"
 msgstr "Attributo dello slot malposto\n"
 
-#: ../src/o_slot.c:128
+#: src/o_slot.c:99
 msgid "numslots attribute missing\n"
 msgstr "attributo del numero dello slot mancante\n"
 
-#: ../src/o_slot.c:130
+#: src/o_slot.c:100
 msgid "Slotting not allowed for this component\n"
 msgstr ""
 
-#: ../src/o_slot.c:145
+#: src/o_slot.c:115
 msgid "New slot number out of range\n"
 msgstr "Numero del nuovo slot fuori dal limite\n"
 
-#: ../src/o_slot.c:200
+#: src/o_slot.c:170
 #, c-format
 msgid "uggg! you tried to slot edit something that doesn't exist!\n"
 msgstr "Hai provato a editare qualcosa che non esiste!\n"
 
-#: ../src/o_undo.c:300
+#: src/o_undo.c:300
 msgid "Undo/Redo disabled in rc file\n"
 msgstr "Cancella/Ripristina disabilitato nel file rc\n"
 
-#: ../src/parsecmd.c:47
+#: src/parsecmd.c:47
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] schematic_filename1 ... schematic_filenameN\n"
@@ -1312,264 +1321,245 @@ msgstr ""
 "  -h            Help; this message\n"
 "\n"
 
-#: ../src/x_attribedit.c:127
+#: src/x_attribedit.c:127
 #, c-format
 msgid "Got invalid show option; defaulting to show both\n"
 msgstr ""
 
-#: ../src/x_attribedit.c:330
+#: src/x_attribedit.c:330
 msgid "Single Attribute Editor"
 msgstr "Editor Singola Caratteristica"
 
-#: ../src/x_attribedit.c:359
+#: src/x_attribedit.c:359
 msgid "<b>Edit Attribute</b>"
 msgstr "<b>Modifica Caratteristiche</b>"
 
-#: ../src/x_attribedit.c:361
+#: src/x_attribedit.c:361
 msgid "<b>Add Attribute</b>"
 msgstr "<b>Aggiungi Caratteristiche</b>"
 
-#. Name selection
-#. GtkLabel
-#: ../src/x_attribedit.c:377 ../src/x_multiattrib.c:1725
+#: src/x_attribedit.c:377 src/x_multiattrib.c:1921
 msgid "Name:"
 msgstr "Nome:"
 
-#. Value entry
-#. GtkLabel
-#: ../src/x_attribedit.c:393 ../src/x_multiattrib.c:1744
+#: src/x_attribedit.c:393 src/x_multiattrib.c:1940
 msgid "Value:"
 msgstr "Valore:"
 
-#. Visibility
-#. GtkButton
-#: ../src/x_attribedit.c:409 ../src/x_multiattrib.c:1781
+#: src/x_attribedit.c:409 src/x_multiattrib.c:1983
 msgid "Visible"
 msgstr "Visibile"
 
-#: ../src/x_attribedit.c:429
+#: src/x_attribedit.c:429
 msgid "Show Value Only"
 msgstr "Mostra Solo il Valore"
 
-#: ../src/x_attribedit.c:431
+#: src/x_attribedit.c:431
 msgid "Show Name Only"
 msgstr "Mostra Solo il Nome"
 
-#: ../src/x_attribedit.c:433 ../src/x_multiattrib.c:1369
+#: src/x_attribedit.c:433 src/x_multiattrib.c:1459
 msgid "Show Name & Value"
 msgstr "Mostra Nome & Valore"
 
-#. gschem specific
-#: ../src/x_attribedit.c:440
+#: src/x_attribedit.c:440
 msgid "<b>Attach Options</b>"
 msgstr "<b>Aggiungi Opzioni</b>"
 
-#: ../src/x_attribedit.c:455
+#: src/x_attribedit.c:455
 msgid "All"
 msgstr "Tutto"
 
-#. GtkTreeViewColumn
-#: ../src/x_attribedit.c:463 ../src/x_compselect.c:896
-#: ../src/x_compselect.c:1010
+#: src/x_attribedit.c:463 src/x_compselect.c:895 src/x_compselect.c:1009
 msgid "Components"
 msgstr "Componenti"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:364
+#: src/x_attribedit.c:471 src/x_window.c:364
 msgid "Nets"
 msgstr "Collegamenti"
 
-#: ../src/x_attribedit.c:479
+#: src/x_attribedit.c:479
 msgid "Replace existing attributes"
 msgstr "Ridefinisci le caratteristiche esistenti"
 
-#: ../src/x_autonumber.c:413
+#: src/x_autonumber.c:415
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
 msgstr ""
 
-#. duplicate slot in used_slots
-#: ../src/x_autonumber.c:428
+#: src/x_autonumber.c:430
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:696
+#: src/x_autonumber.c:702
 msgid "No searchstring given in autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:748
+#: src/x_autonumber.c:754
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:883
+#: src/x_autonumber.c:889
 msgid "Diagonal"
 msgstr "Diagonale"
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Top to bottom"
 msgstr "Dall'alto verso il basso"
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Bottom to top"
 msgstr "Dal basso verso l'alto"
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 msgid "Left to right"
 msgstr "Da sinistra a destra"
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 msgid "Right to left"
 msgstr "Da destra a sinistra"
 
-#: ../src/x_autonumber.c:886
+#: src/x_autonumber.c:892
 msgid "File order"
 msgstr "Sequenza dei file"
 
-#: ../src/x_autonumber.c:1222
+#: src/x_autonumber.c:1228
 msgid "Autonumber text"
 msgstr ""
 
-#. scope section
-#: ../src/x_autonumber.c:1246
+#: src/x_autonumber.c:1252
 msgid "<b>Scope</b>"
 msgstr "<b>Visibilità</b>"
 
-#: ../src/x_autonumber.c:1268
+#: src/x_autonumber.c:1274
 msgid "Search for:"
 msgstr "Ricerca di:"
 
-#: ../src/x_autonumber.c:1282
+#: src/x_autonumber.c:1288
 msgid "Autonumber text in:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1289
+#: src/x_autonumber.c:1295
 msgid "Skip numbers found in:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
+#: src/x_autonumber.c:1307 src/x_autonumber.c:1316
 msgid "Selected objects"
 msgstr "Oggetti selezionati"
 
-#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
+#: src/x_autonumber.c:1308 src/x_autonumber.c:1317
 msgid "Current page"
 msgstr "Pagina corrente"
 
-#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
+#: src/x_autonumber.c:1309 src/x_autonumber.c:1318
 msgid "Whole hierarchy"
 msgstr "Intera gerarchia"
 
-#: ../src/x_autonumber.c:1314
+#: src/x_autonumber.c:1320
 msgid "Overwrite existing numbers"
 msgstr "Sovrascrivi i numeri esistenti"
 
-#. Options section
-#: ../src/x_autonumber.c:1319
+#: src/x_autonumber.c:1325
 msgid "<b>Options</b>"
 msgstr "<b>Opzioni</b>"
 
-#: ../src/x_autonumber.c:1341
+#: src/x_autonumber.c:1347
 msgid "Starting number:"
 msgstr "Numero iniziale:"
 
-#: ../src/x_autonumber.c:1348
+#: src/x_autonumber.c:1354
 msgid "Sort order:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1369
+#: src/x_autonumber.c:1375
 msgid "Remove numbers"
 msgstr "Rimuovi numeri"
 
-#: ../src/x_autonumber.c:1373
+#: src/x_autonumber.c:1379
 msgid "Automatic slotting"
 msgstr ""
 
-#: ../src/x_color.c:94 ../src/x_color.c:103
+#: src/x_color.c:94 src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Non è possibile inserire il colore %s!\n"
 
-#: ../src/x_color.c:94
+#: src/x_color.c:94
 msgid "black"
 msgstr "nero"
 
-#: ../src/x_color.c:103
+#: src/x_color.c:103
 msgid "white"
 msgstr "bianco"
 
-#: ../src/x_color.c:125
+#: src/x_color.c:125
 #, fuzzy, c-format
 msgid "Could not allocate display color %i!\n"
 msgstr "Non è possibile inserire il colore %s!\n"
 
-#: ../src/x_color.c:147
+#: src/x_color.c:147
 #, fuzzy, c-format
 msgid "Could not allocate outline color %i!\n"
 msgstr "Non è possibile inserire il colore %s!\n"
 
-#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
+#: src/x_color.c:164 src/x_color.c:181 src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Provato a ottenere un colore non valido: %d\n"
 
-#: ../src/x_color.c:214
+#: src/x_color.c:214
 #, fuzzy, c-format
 msgid "Tried to get an invalid outline color: %d\n"
 msgstr "Provato a ottenere un colore non valido: %d\n"
 
-#. GtkLabel
-#: ../src/x_compselect.c:1040
+#: src/x_compselect.c:1039
 msgid "Filter:"
 msgstr "Filtro:"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
-#: ../src/x_multiattrib.c:1601
+#: src/x_compselect.c:1142 src/x_dialog.c:3776 src/x_multiattrib.c:1787
 msgid "Name"
 msgstr "Nome"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1152 ../src/x_multiattrib.c:1626
+#: src/x_compselect.c:1151 src/x_multiattrib.c:1811
 msgid "Value"
 msgstr "Valore"
 
-#: ../src/x_compselect.c:1191
+#: src/x_compselect.c:1190
 msgid "Default behavior - reference component"
 msgstr "Comportamento predefinito - Consultazione componente"
 
-#: ../src/x_compselect.c:1194
+#: src/x_compselect.c:1193
 msgid "Embed component in schematic"
 msgstr "Fissa il componente nello schema"
 
-#: ../src/x_compselect.c:1197
+#: src/x_compselect.c:1196
 msgid "Include component as individual objects"
 msgstr "Includi componente come oggetto individuale"
 
-#. GtkWindow
-#: ../src/x_compselect.c:1354
+#: src/x_compselect.c:1353
 msgid "Select Component..."
 msgstr "Seleziona Componente..."
 
-#: ../src/x_compselect.c:1377
+#: src/x_compselect.c:1376
 msgid "In Use"
 msgstr "In uso"
 
-#: ../src/x_compselect.c:1381
+#: src/x_compselect.c:1380
 msgid "Libraries"
 msgstr "Librerie"
 
-#. GtkFrame
-#: ../src/x_compselect.c:1390 ../src/x_fileselect.c:122
+#: src/x_compselect.c:1389 src/x_fileselect.c:122
 msgid "Preview"
 msgstr "Anteprima"
 
-#. dialog not created yet
-#: ../src/x_dialog.c:174
+#: src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "Inserisci Testo..."
 
-#: ../src/x_dialog.c:205
+#: src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1580,228 +1570,219 @@ msgstr ""
 "e clicca con il tasto sinistro per rilasciare il testo.\n"
 "Il pulsante centrale del mouse ruota il testo."
 
-#: ../src/x_dialog.c:294
-#, c-format
+#: src/x_dialog.c:294
 msgid "Lower Left"
 msgstr "In basso a sinistra"
 
-#: ../src/x_dialog.c:305
-#, c-format
+#: src/x_dialog.c:305
 msgid "Middle Left"
 msgstr "Regione centrale a sinistra"
 
-#: ../src/x_dialog.c:316
-#, c-format
+#: src/x_dialog.c:316
 msgid "Upper Left"
 msgstr "In alto a sinistra"
 
-#: ../src/x_dialog.c:327
-#, c-format
+#: src/x_dialog.c:327
 msgid "Lower Middle"
 msgstr "Regione centrale in basso"
 
-#: ../src/x_dialog.c:338
-#, c-format
+#: src/x_dialog.c:338
 msgid "Middle Middle"
 msgstr "Centro della regione centrale"
 
-#: ../src/x_dialog.c:349
-#, c-format
+#: src/x_dialog.c:349
 msgid "Upper Middle"
 msgstr "Regione centrale in alto"
 
-#: ../src/x_dialog.c:360
-#, c-format
+#: src/x_dialog.c:360
 msgid "Lower Right"
 msgstr "In basso a destra"
 
-#: ../src/x_dialog.c:371
-#, c-format
+#: src/x_dialog.c:371
 msgid "Middle Right"
 msgstr "Zona centrale a destra"
 
-#: ../src/x_dialog.c:382
-#, c-format
+#: src/x_dialog.c:382
 msgid "Upper Right"
 msgstr "In alto a destra"
 
-#: ../src/x_dialog.c:496
+#: src/x_dialog.c:496
 msgid "Edit Text Properties"
 msgstr "Modifica proprietà del testo"
 
-#: ../src/x_dialog.c:530
+#: src/x_dialog.c:530
 msgid "<b>Text Content</b>"
 msgstr ""
 
-#: ../src/x_dialog.c:562
+#: src/x_dialog.c:562
 msgid "<b>Text Properties</b>"
 msgstr "<b>Proprietà del testo</b>"
 
-#: ../src/x_dialog.c:577
+#: src/x_dialog.c:577
 msgid "Color:"
 msgstr "Colore:"
 
-#: ../src/x_dialog.c:584
+#: src/x_dialog.c:584
 msgid "Size:"
 msgstr "Ampiezza:"
 
-#: ../src/x_dialog.c:593
+#: src/x_dialog.c:593
 msgid "Alignment:"
 msgstr "Allineamento:"
 
-#: ../src/x_dialog.c:647
+#: src/x_dialog.c:647
 msgid "Solid"
 msgstr "Continua"
 
-#: ../src/x_dialog.c:648
+#: src/x_dialog.c:648
 msgid "Dotted"
 msgstr "Punteggiata"
 
-#: ../src/x_dialog.c:649
+#: src/x_dialog.c:649
 msgid "Dashed"
 msgstr "Tratteggiata"
 
-#: ../src/x_dialog.c:650
+#: src/x_dialog.c:650
 msgid "Center"
 msgstr "Centro"
 
-#: ../src/x_dialog.c:651
+#: src/x_dialog.c:651
 msgid "Phantom"
 msgstr ""
 
-#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
-#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
-#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
-#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
-#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
-#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
+#: src/x_dialog.c:652 src/x_dialog.c:749 src/x_dialog.c:758 src/x_dialog.c:767
+#: src/x_dialog.c:868 src/x_dialog.c:870 src/x_dialog.c:872
+#: src/x_dialog.c:1100 src/x_dialog.c:1203 src/x_dialog.c:1212
+#: src/x_dialog.c:1221 src/x_dialog.c:1230 src/x_dialog.c:1239
+#: src/x_dialog.c:1352 src/x_dialog.c:1354 src/x_dialog.c:1356
+#: src/x_dialog.c:1358 src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*non cambiato*"
 
-#: ../src/x_dialog.c:978
+#: src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Modifica Larghezza & Tipo di Linea"
 
-#: ../src/x_dialog.c:1017 ../src/x_print.c:307
+#: src/x_dialog.c:1017 src/x_print.c:307
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/x_dialog.c:1021
+#: src/x_dialog.c:1021
 msgid "Width:"
 msgstr "Larghezza:"
 
-#: ../src/x_dialog.c:1025
+#: src/x_dialog.c:1025
 msgid "Dash Length:"
 msgstr "Lunghezza linea tratteggiata:"
 
-#: ../src/x_dialog.c:1029
+#: src/x_dialog.c:1029
 msgid "Dash Space:"
 msgstr "Spazio linea tratteggiata:"
 
-#: ../src/x_dialog.c:1096
+#: src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Vuoto"
 
-#: ../src/x_dialog.c:1097
+#: src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Riempito"
 
-#: ../src/x_dialog.c:1098
+#: src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "Rete"
 
-#: ../src/x_dialog.c:1099
+#: src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "Tratteggio"
 
-#: ../src/x_dialog.c:1470
+#: src/x_dialog.c:1470
 msgid "Edit Fill Type"
 msgstr "Modifica il Tipo di Riempimento"
 
-#: ../src/x_dialog.c:1508
+#: src/x_dialog.c:1508
 msgid "Fill Type:"
 msgstr "Tipo di riempimento:"
 
-#: ../src/x_dialog.c:1512
+#: src/x_dialog.c:1512
 msgid "Line Width:"
 msgstr "Larghezza linea:"
 
-#: ../src/x_dialog.c:1516
+#: src/x_dialog.c:1516
 msgid "Angle 1:"
 msgstr "Angolo 1:"
 
-#: ../src/x_dialog.c:1520
+#: src/x_dialog.c:1520
 msgid "Pitch 1:"
 msgstr "Livello 1:"
 
-#: ../src/x_dialog.c:1524
+#: src/x_dialog.c:1524
 msgid "Angle 2:"
 msgstr "Angolo 2:"
 
-#: ../src/x_dialog.c:1528
+#: src/x_dialog.c:1528
 msgid "Pitch 2:"
 msgstr "Livello 2:"
 
-#: ../src/x_dialog.c:1657
+#: src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "Parametri Arco"
 
-#: ../src/x_dialog.c:1697
+#: src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr ""
 
-#: ../src/x_dialog.c:1705
+#: src/x_dialog.c:1705
 msgid "Start Angle:"
 msgstr "Angolo di Attacco:"
 
-#: ../src/x_dialog.c:1713
+#: src/x_dialog.c:1713
 msgid "Degrees of Sweep:"
 msgstr "Gradi di sviluppo dell'arco:"
 
-#: ../src/x_dialog.c:1830
+#: src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
 msgstr ""
 
-#: ../src/x_dialog.c:1898
+#: src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "Dimensione Testo"
 
-#: ../src/x_dialog.c:1928
+#: src/x_dialog.c:1928
 msgid "Enter new text size:"
 msgstr "Inserisci nuova ampiezza del testo:"
 
-#: ../src/x_dialog.c:2004
+#: src/x_dialog.c:2004
 msgid "Snap Size"
 msgstr ""
 
-#: ../src/x_dialog.c:2034
+#: src/x_dialog.c:2034
 msgid "Enter new snap grid spacing:"
 msgstr ""
 
-#: ../src/x_dialog.c:2107
+#: src/x_dialog.c:2110
 msgid "Edit slot number"
 msgstr "Modifica numero slot"
 
-#: ../src/x_dialog.c:2138
+#: src/x_dialog.c:2141
 msgid "Edit slot number:"
 msgstr "Modifica numero slot:"
 
-#: ../src/x_dialog.c:2200
+#: src/x_dialog.c:2202
 msgid "About..."
 msgstr "Altro..."
 
-#: ../src/x_dialog.c:2220
+#: src/x_dialog.c:2222
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA: GPL Electronic Design Automation</b>"
 
-#: ../src/x_dialog.c:2224
+#: src/x_dialog.c:2226
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>versione di gschem %s%s.%s</b>"
 
-#: ../src/x_dialog.c:2232
+#: src/x_dialog.c:2234
 msgid ""
 "Written by:\n"
 "Ales Hvezda\n"
@@ -1813,141 +1794,141 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "...e molti altri (leggere il file AUTHORS)"
 
-#: ../src/x_dialog.c:2295
+#: src/x_dialog.c:2297
 msgid "Coords"
 msgstr "Coordinate"
 
-#: ../src/x_dialog.c:2316
+#: src/x_dialog.c:2318
 msgid "Screen"
 msgstr "Schermo"
 
-#: ../src/x_dialog.c:2325
+#: src/x_dialog.c:2327
 msgid "World"
 msgstr ""
 
-#: ../src/x_dialog.c:2364
+#: src/x_dialog.c:2366
 msgid "Background"
 msgstr ""
 
-#: ../src/x_dialog.c:2370
+#: src/x_dialog.c:2372
 msgid "Net endpoint"
 msgstr ""
 
-#: ../src/x_dialog.c:2373
+#: src/x_dialog.c:2375
 msgid "Graphic"
 msgstr ""
 
-#: ../src/x_dialog.c:2382
+#: src/x_dialog.c:2384
 msgid "Logic bubble"
 msgstr ""
 
-#: ../src/x_dialog.c:2385
+#: src/x_dialog.c:2387
 msgid "Grid point"
 msgstr ""
 
-#: ../src/x_dialog.c:2388
+#: src/x_dialog.c:2390
 #, fuzzy
 msgid "Detached attribute"
 msgstr "Aggiungi Attributo"
 
-#: ../src/x_dialog.c:2391 ../src/x_window.c:382
+#: src/x_dialog.c:2393 src/x_window.c:382
 msgid "Text"
 msgstr "Testo"
 
-#: ../src/x_dialog.c:2397
+#: src/x_dialog.c:2399
 #, fuzzy
 msgid "Selection"
 msgstr "Seleziona"
 
-#: ../src/x_dialog.c:2400
+#: src/x_dialog.c:2402
 msgid "Bounding box"
 msgstr ""
 
-#: ../src/x_dialog.c:2403
+#: src/x_dialog.c:2405
 #, fuzzy
 msgid "Zoom box"
 msgstr "Ingrandisci Riquadro"
 
-#: ../src/x_dialog.c:2412
+#: src/x_dialog.c:2414
 msgid "Output background"
 msgstr ""
 
-#: ../src/x_dialog.c:2415
+#: src/x_dialog.c:2417
 #, fuzzy
 msgid "Net junction"
 msgstr "Funzione"
 
-#: ../src/x_dialog.c:2418
+#: src/x_dialog.c:2420
 msgid "Mesh grid major"
 msgstr ""
 
-#: ../src/x_dialog.c:2421
+#: src/x_dialog.c:2423
 msgid "Mesh grid minor"
 msgstr ""
 
-#: ../src/x_dialog.c:2424
+#: src/x_dialog.c:2426
 msgid "Unknown"
 msgstr ""
 
-#: ../src/x_dialog.c:2570
+#: src/x_dialog.c:2572
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr "ERRORE: oggetto NULLO in color_edit_dialog_apply!\n"
 
-#: ../src/x_dialog.c:2633
+#: src/x_dialog.c:2635
 msgid "Color Edit"
 msgstr "Modifica Colore"
 
-#: ../src/x_dialog.c:2664
+#: src/x_dialog.c:2666
 msgid "Object color:"
 msgstr "Colore dell'oggetto:"
 
-#: ../src/x_dialog.c:2786
+#: src/x_dialog.c:2788
 msgid "Function"
 msgstr "Funzione"
 
-#: ../src/x_dialog.c:2793
+#: src/x_dialog.c:2795
 msgid "Keystroke(s)"
 msgstr ""
 
-#: ../src/x_dialog.c:3102
+#: src/x_dialog.c:3104
 msgid "Find Text"
 msgstr "Trova testo"
 
-#: ../src/x_dialog.c:3133
+#: src/x_dialog.c:3135
 msgid "Text to find:"
 msgstr "Testo da cercare:"
 
-#: ../src/x_dialog.c:3143
+#: src/x_dialog.c:3145
 msgid "descend into hierarchy"
 msgstr "discende nella gerarchia"
 
-#: ../src/x_dialog.c:3208
+#: src/x_dialog.c:3210
 msgid "Hide Text"
 msgstr "Nascondi testo"
 
-#: ../src/x_dialog.c:3239
+#: src/x_dialog.c:3241
 msgid "Hide text starting with:"
 msgstr "Nascondi il testo iniziando con:"
 
-#: ../src/x_dialog.c:3308
+#: src/x_dialog.c:3310
 msgid "Show Text"
 msgstr "Mostra testo"
 
-#: ../src/x_dialog.c:3339
+#: src/x_dialog.c:3341
 msgid "Show text starting with:"
 msgstr "Mostra il testo iniziando con:"
 
-#: ../src/x_dialog.c:3796
+#: src/x_dialog.c:3798
 msgid "S_elect the schematics you want to save:"
 msgstr "S_eleziona lo schematico che vuoi salvare:"
 
-#: ../src/x_dialog.c:3890
+#: src/x_dialog.c:3892
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr "Salvare i cambi allo schematico \"%s\" prima di chiudere?"
 
-#: ../src/x_dialog.c:3896
+#: src/x_dialog.c:3898
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
@@ -1955,18 +1936,17 @@ msgstr ""
 "Ci sono %d schemi che presentano cambi non salvati. Salvare i cambi prima di "
 "chiudere?"
 
-#. secondary label
-#: ../src/x_dialog.c:3925
+#: src/x_dialog.c:3927
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr ""
 "Se non effettui un salvataggio dei cambi, essi verranno definitivamente "
 "persi."
 
-#: ../src/x_dialog.c:3945
+#: src/x_dialog.c:3947
 msgid "_Close without saving"
 msgstr "_Chiudi senza salvare"
 
-#: ../src/x_dialog.c:4279
+#: src/x_dialog.c:4283
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1984,49 +1964,49 @@ msgstr ""
 "Il nome non deve terminare con uno spazio.\n"
 "Il valore non deve iniziare con uno spazio."
 
-#: ../src/x_dialog.c:4281
+#: src/x_dialog.c:4285
 msgid "Invalid Attribute"
 msgstr "Caratteristica non valida"
 
-#: ../src/x_dialog.c:4317
+#: src/x_dialog.c:4321
 #, fuzzy
 msgid "Pin type"
 msgstr "Modalità Pin"
 
-#: ../src/x_dialog.c:4341
+#: src/x_dialog.c:4345
 #, fuzzy
 msgid "Net pin"
 msgstr "Funzione"
 
-#: ../src/x_dialog.c:4343
+#: src/x_dialog.c:4347
 msgid "Bus pin (graphical)"
 msgstr ""
 
-#: ../src/x_fileselect.c:42
+#: src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "Schematici"
 
-#: ../src/x_fileselect.c:47
+#: src/x_fileselect.c:47
 msgid "Symbols"
 msgstr "Simboli"
 
-#: ../src/x_fileselect.c:52
+#: src/x_fileselect.c:52
 msgid "Schematics and symbols"
 msgstr "Schematici e Simboli"
 
-#: ../src/x_fileselect.c:58
+#: src/x_fileselect.c:58
 msgid "All files"
 msgstr "Tutti i File"
 
-#: ../src/x_fileselect.c:171
+#: src/x_fileselect.c:171
 msgid "Open..."
 msgstr "Apri..."
 
-#: ../src/x_fileselect.c:231
+#: src/x_fileselect.c:231
 msgid "Save as..."
 msgstr "Salva con nome..."
 
-#: ../src/x_fileselect.c:284
+#: src/x_fileselect.c:284
 #, c-format
 msgid ""
 "The selected file `%s' already exists.\n"
@@ -2034,31 +2014,30 @@ msgid ""
 "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/x_fileselect.c:287
+#: src/x_fileselect.c:287
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Nuovo file"
 
-#: ../src/x_fileselect.c:289
+#: src/x_fileselect.c:289
 msgid "Save cancelled on user request\n"
 msgstr ""
 
-#. WK - catch EPS export case
-#: ../src/x_image.c:176
+#: src/x_image.c:176
 msgid "Encapsulated Postscript"
 msgstr "formato eps (Encapsulated Postscript)"
 
-#: ../src/x_image.c:296
+#: src/x_image.c:296
 #, c-format
 msgid "x_image_lowlevel: Unable to write eps file %s.\n"
 msgstr "x_image_lowlevel: non è possibile scrivere il file eps %s.\n"
 
-#: ../src/x_image.c:374
+#: src/x_image.c:374
 #, c-format
 msgid "x_image_lowlevel: Unable to write %s file %s.\n"
 msgstr ""
 
-#: ../src/x_image.c:384
+#: src/x_image.c:384
 #, c-format
 msgid ""
 "There was the following error when saving image with type %s to filename:\n"
@@ -2067,265 +2046,265 @@ msgid ""
 "%s.\n"
 msgstr ""
 
-#: ../src/x_image.c:403
+#: src/x_image.c:403
 #, c-format
 msgid "Wrote color image to [%s] [%d x %d]\n"
 msgstr "Scritta immagine a colori per [%s] [%d x %d]\n"
 
-#: ../src/x_image.c:405
+#: src/x_image.c:405
 #, c-format
 msgid "Wrote black and white image to [%s] [%d x %d]\n"
 msgstr "Scritta immagine in bianco e nero per [%s] [%d x %d]\n"
 
-#: ../src/x_image.c:413
+#: src/x_image.c:413
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 msgstr ""
 "x_image_lowlevel: incapace ad ottenere immagine pixbuf dalla finestra di "
 "gschem.\n"
 
-#: ../src/x_image.c:458
+#: src/x_image.c:458
 msgid "Width x Height"
 msgstr "Larghezza x Altezza"
 
-#: ../src/x_image.c:474
+#: src/x_image.c:474
 msgid "Image type"
 msgstr "Tipo di immagine"
 
-#: ../src/x_log.c:188
+#: src/x_log.c:188
 msgid "** Invalid UTF-8 in log message. See stderr or gschem.log.\n"
 msgstr ""
 
-#: ../src/x_log.c:256
+#: src/x_log.c:256
 msgid "Status"
 msgstr "Stato"
 
-#: ../src/x_menus.c:36
+#: src/x_menus.c:36
 msgid "/Add Net"
 msgstr "/Aggiungi Net"
 
-#: ../src/x_menus.c:37
+#: src/x_menus.c:37
 msgid "/Add Attribute..."
 msgstr "/Aggiungi Attributo..."
 
-#: ../src/x_menus.c:38
+#: src/x_menus.c:38
 msgid "/Add Component..."
 msgstr "/Aggiungi Componente..."
 
-#: ../src/x_menus.c:39
+#: src/x_menus.c:39
 msgid "/Add Bus"
 msgstr "/Aggiungi Bus"
 
-#: ../src/x_menus.c:40
+#: src/x_menus.c:40
 msgid "/Add Text"
 msgstr "/Aggiungi Testo"
 
-#: ../src/x_menus.c:42
+#: src/x_menus.c:42
 msgid "/Zoom In"
 msgstr "/Ingrandisci"
 
-#: ../src/x_menus.c:43
+#: src/x_menus.c:43
 msgid "/Zoom Out"
 msgstr "/Riduci"
 
-#: ../src/x_menus.c:44
+#: src/x_menus.c:44
 msgid "/Zoom Box"
 msgstr "/Ingrandisci Riquadro"
 
-#: ../src/x_menus.c:45
+#: src/x_menus.c:45
 msgid "/Zoom Extents"
 msgstr "/Adatta alla pagina"
 
-#: ../src/x_menus.c:47
+#: src/x_menus.c:47
 msgid "/Select"
 msgstr "/Seleziona"
 
-#: ../src/x_menus.c:48
+#: src/x_menus.c:48
 msgid "/Edit..."
 msgstr "/Modifica..."
 
-#: ../src/x_menus.c:49
+#: src/x_menus.c:49
 #, fuzzy
 msgid "/Edit pin type..."
 msgstr "Modifica il Tipo di Linea"
 
-#: ../src/x_menus.c:50
+#: src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Copia"
 
-#: ../src/x_menus.c:51
+#: src/x_menus.c:51
 msgid "/Move"
 msgstr "/Sposta"
 
-#: ../src/x_menus.c:52
+#: src/x_menus.c:52
 msgid "/Delete"
 msgstr "/Cancella"
 
-#: ../src/x_menus.c:55
+#: src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/Rilascia schematico"
 
-#: ../src/x_menus.c:56
+#: src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/Rilascia simbolo"
 
-#: ../src/x_menus.c:57
+#: src/x_menus.c:57
 msgid "/Up"
 msgstr "/Sopra"
 
-#: ../src/x_menus.c:316
+#: src/x_menus.c:319
 #, fuzzy, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr "Provato a impostare la sensibilità  su un menù di voci non esistenti\n"
 
-#: ../src/x_menus.c:340
+#: src/x_menus.c:343
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "La voce Popup_menu_item_factory non esiste!\n"
 
-#: ../src/x_menus.c:353
+#: src/x_menus.c:356
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 "Provato a impostare la sensibilità su una finestra di popup menu_itemi\n"
 
-#. Remove this entry from all menus
-#: ../src/x_menus.c:462
+#: src/x_menus.c:436
 #, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Non è possibile aprire il file %s\n"
 
-#: ../src/x_menus.c:524
+#: src/x_menus.c:493
 msgid "Clear"
 msgstr "Pulisci"
 
-#: ../src/x_multiattrib.c:861
+#: src/x_multiattrib.c:913
 msgid "Attributes with empty name are not allowed. Please set a name."
 msgstr ""
 "Attributi con il nome vuoto non sono permessi. Per favore inserisci un nome."
 
-#: ../src/x_multiattrib.c:1371
+#: src/x_multiattrib.c:1461
 msgid "Show Value only"
 msgstr "Mostra solo il Valore"
 
-#: ../src/x_multiattrib.c:1373
+#: src/x_multiattrib.c:1463
 msgid "Show Name only"
 msgstr "Mostra solo il Nome"
 
-#: ../src/x_multiattrib.c:1400
+#: src/x_multiattrib.c:1491
+msgid "Promote"
+msgstr ""
+
+#: src/x_multiattrib.c:1495
 msgid "Duplicate"
 msgstr "Duplicare"
 
-#: ../src/x_multiattrib.c:1528
+#: src/x_multiattrib.c:1713
 msgid "Edit Attributes"
 msgstr "Modifica Caratteristiche"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1648
+#: src/x_multiattrib.c:1831
 msgid "Vis?"
 msgstr "Vis?"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1668
+#: src/x_multiattrib.c:1849
 msgid "N"
 msgstr "N"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1688
+#: src/x_multiattrib.c:1867
 msgid "V"
 msgstr "V"
 
-#: ../src/x_multiattrib.c:1709
+#: src/x_multiattrib.c:1889
+#, fuzzy
+msgid "Show inherited attributes"
+msgstr "Aggiungi Attributo"
+
+#: src/x_multiattrib.c:1905
 msgid "Add Attribute"
 msgstr "Aggiungi Attributo"
 
-#: ../src/x_pagesel.c:257
+#: src/x_pagesel.c:257
 msgid "Discard Page"
 msgstr "Abbandona la pagina"
 
-#: ../src/x_pagesel.c:376
+#: src/x_pagesel.c:376
 msgid "Page Manager"
 msgstr "Gestore Pagina"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:432
+#: src/x_pagesel.c:432
 msgid "Filename"
 msgstr "Nome file"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:448
+#: src/x_pagesel.c:448
 msgid "Changed"
 msgstr "Cambiato"
 
-#. GtkLabel
-#: ../src/x_pagesel.c:468
+#: src/x_pagesel.c:468
 msgid "Right click on the filename for more options..."
 msgstr ""
 "Clicca con il tasto destro del mouse sul nome del file per ulteriori "
 "opzioni..."
 
-#: ../src/x_preview.c:223
+#: src/x_preview.c:223
 #, fuzzy
 msgid "Preview Buffer"
 msgstr "Incolla buffer"
 
-#: ../src/x_print.c:84
+#: src/x_print.c:84
 msgid "Select PostScript Filename..."
 msgstr "Seleziona il nome del file Psotscript..."
 
-#: ../src/x_print.c:164
+#: src/x_print.c:164
 msgid "Extents with margins"
 msgstr "Estensioni con margini"
 
-#: ../src/x_print.c:170
+#: src/x_print.c:170
 msgid "Extents no margins"
 msgstr "Estensioni senza margini"
 
-#: ../src/x_print.c:176
+#: src/x_print.c:176
 msgid "Current Window"
 msgstr "Finestra Corrente"
 
-#: ../src/x_print.c:210
+#: src/x_print.c:210
 msgid "Landscape"
 msgstr "Landscape"
 
-#: ../src/x_print.c:216
+#: src/x_print.c:216
 msgid "Portrait"
 msgstr "Portrait"
 
-#. Upper frame
-#: ../src/x_print.c:284
+#: src/x_print.c:284
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: ../src/x_print.c:296
+#: src/x_print.c:296
 msgid "Output paper size:"
 msgstr "Ampiezza del foglio:"
 
-#: ../src/x_print.c:318
+#: src/x_print.c:318
 msgid "Orientation:"
 msgstr "Orientazione:"
 
-#. Lower frame
-#: ../src/x_print.c:330
+#: src/x_print.c:330
 msgid "Destination"
 msgstr "Destinazione"
 
-#: ../src/x_print.c:343
+#: src/x_print.c:343
 msgid "File:"
 msgstr "File:"
 
-#: ../src/x_print.c:373
+#: src/x_print.c:373
 msgid "Command:"
 msgstr "Comando:"
 
-#: ../src/x_print.c:741
+#: src/x_print.c:741
 msgid "No print destination specified\n"
 msgstr "Non è stata specificata nessuna stampante\n"
 
-#: ../src/x_print.c:748
+#: src/x_print.c:748
 #, c-format
 msgid "Cannot print current schematic to [%s]\n"
 msgstr "Non è possibile stampare lo schema corrente in [%s]\n"
 
-#: ../src/x_print.c:757
+#: src/x_print.c:757
 #, c-format
 msgid ""
 "Error printing to file '%s'\n"
@@ -2334,45 +2313,45 @@ msgstr ""
 "Errore nella stampa del file '%s'\n"
 "Verifica la finestra di stato per maggiori informazioni"
 
-#: ../src/x_print.c:764
+#: src/x_print.c:764
 #, c-format
 msgid "Printed current schematic to [%s]\n"
 msgstr "Lo schema corrente è stato stampato in [%s]\n"
 
-#: ../src/x_window.c:81
+#: src/x_window.c:81
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr "Impossibile l'allocazione di gc\n"
 
-#: ../src/x_window.c:317
+#: src/x_window.c:317
 msgid "New file"
 msgstr "Nuovo file"
 
-#: ../src/x_window.c:323
+#: src/x_window.c:323
 msgid "Open"
 msgstr "Apri"
 
-#: ../src/x_window.c:324
+#: src/x_window.c:324
 msgid "Open file..."
 msgstr "Apri file..."
 
-#: ../src/x_window.c:330
+#: src/x_window.c:330
 msgid "Save"
 msgstr "Salva"
 
-#: ../src/x_window.c:331
+#: src/x_window.c:331
 msgid "Save file"
 msgstr "Salva file"
 
-#: ../src/x_window.c:339
+#: src/x_window.c:339
 msgid "Undo last operation"
 msgstr "Annulla l'ultima operazione"
 
-#: ../src/x_window.c:346
+#: src/x_window.c:346
 msgid "Redo last undo"
 msgstr "Ripristina ultima operazione annullata"
 
-#: ../src/x_window.c:355
+#: src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2386,7 +2365,7 @@ msgstr ""
 "Il tasto destro del mouse serve ad abbandonare il componente al fine di "
 "sceglierne un altro."
 
-#: ../src/x_window.c:365
+#: src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2395,7 +2374,7 @@ msgstr ""
 "Tasto destro del mouse per\n"
 "cancellare il collegamento"
 
-#: ../src/x_window.c:375
+#: src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2404,92 +2383,91 @@ msgstr ""
 "Tasto destro del mouse per\n"
 "cancellare il collegamento"
 
-#: ../src/x_window.c:383
+#: src/x_window.c:383
 msgid "Add Text..."
 msgstr "Aggiungi Testo..."
 
-#: ../src/x_window.c:393
+#: src/x_window.c:393
 msgid "Select"
 msgstr "Seleziona"
 
-#: ../src/x_window.c:394
+#: src/x_window.c:394
 msgid "Select mode"
 msgstr "Modalità Selezione"
 
-#: ../src/x_window.c:481
+#: src/x_window.c:481
 msgid "Pick"
 msgstr "Prendi"
 
-#: ../src/x_window.c:497
+#: src/x_window.c:497
 msgid "Repeat/none"
 msgstr "Ripeti/Niente"
 
-#: ../src/x_window.c:507
+#: src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "Menù/Cancella"
 
-#: ../src/x_window.c:509
+#: src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "Pan/Cancella"
 
-#: ../src/x_window.c:733
+#: src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Caricamento schema [%s]\n"
 
-#: ../src/x_window.c:745
+#: src/x_window.c:745
 #, fuzzy
 msgid "Failed to load file"
 msgstr "Fallito il caricamento dell'immagine: [%s]"
 
-#: ../src/x_window.c:754
+#: src/x_window.c:754
 #, fuzzy, c-format
 msgid "New file [%s]\n"
 msgstr "Nuovo file"
 
-#. an error occured when saving page to file
-#: ../src/x_window.c:859
+#: src/x_window.c:859
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Non è possibile salvare la pagina [%s]\n"
 
-#: ../src/x_window.c:860
+#: src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Errore durante il salvataggio"
 
-#: ../src/x_window.c:869
+#: src/x_window.c:869
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "Salvato con il nome [%s]\n"
 
-#: ../src/x_window.c:871
+#: src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Salvato [%s]\n"
 
-#: ../src/x_window.c:873
+#: src/x_window.c:873
 msgid "Saved"
 msgstr "Salvato"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Annulla pagina [%s]\n"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Chiusura [%s]\n"
 
-#: ../data/geda-gschem.desktop.in.h:1
-msgid "Create and edit electrical schematics and symbols with gschem"
-msgstr ""
-
-#: ../data/geda-gschem.desktop.in.h:2
+#: data/geda-gschem.desktop.in.h:3
 #, fuzzy
 msgid "gEDA Schematic Editor"
 msgstr "Scarica Schematico"
 
+#: data/geda-gschem.desktop.in.h:4
+msgid "Create and edit electrical schematics and symbols with gschem"
+msgstr ""
+
 #~ msgid "Cut Buffer"
 #~ msgstr "Svuota buffer"
 
diff --git a/gschem/po/ja.po b/gschem/po/ja.po
index f6f3c43..fcfe716 100644
--- a/gschem/po/ja.po
+++ b/gschem/po/ja.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geda-gschem-CVS-2002-09-26\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 14:35-0400\n"
+"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
+"POT-Creation-Date: 2009-06-18 11:53+0100\n"
 "PO-Revision-Date: 2008-12-20 14:22+0000\n"
 "Last-Translator: MIYAMOTO Takanori <pnms@xxxxxxxxxxxxxxx>\n"
 "Language-Team: japanese <ja@xxxxxx>\n"
@@ -15,626 +15,616 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/rcstrings.c:2
+#: src/rcstrings.c:2
 msgid "File"
 msgstr "¥Õ¥¡¥¤¥ë"
 
-#: ../src/rcstrings.c:3
+#: src/rcstrings.c:3
 msgid "New Window"
 msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦"
 
-#: ../src/rcstrings.c:4 ../src/x_pagesel.c:252
+#: src/rcstrings.c:4 src/x_pagesel.c:252
 msgid "New Page"
 msgstr "¿·µ¬¥Ú¡¼¥¸"
 
-#: ../src/rcstrings.c:5 ../src/x_pagesel.c:253
+#: src/rcstrings.c:5 src/x_pagesel.c:253
 msgid "Open Page..."
 msgstr "³«¤¯..."
 
-#: ../src/rcstrings.c:6 ../src/x_pagesel.c:256
+#: src/rcstrings.c:6 src/x_pagesel.c:256
 msgid "Close Page"
 msgstr "ÊĤ¸¤ë"
 
-#: ../src/rcstrings.c:7
+#: src/rcstrings.c:7
 msgid "Revert Page"
 msgstr "Ì᤹"
 
-#: ../src/rcstrings.c:8 ../src/x_pagesel.c:255
+#: src/rcstrings.c:8 src/x_pagesel.c:255
 msgid "Save Page"
 msgstr "Êݸ"
 
-#: ../src/rcstrings.c:9
+#: src/rcstrings.c:9
 msgid "Save Page As..."
 msgstr "̾Á°¤òÉÕ¤±¤ÆÊݸ..."
 
-#: ../src/rcstrings.c:10
+#: src/rcstrings.c:10
 msgid "Save All"
 msgstr "¤¹¤Ù¤ÆÊݸ"
 
-#. GtkWindow
-#: ../src/rcstrings.c:11 ../src/x_print.c:276
+#: src/rcstrings.c:11 src/x_print.c:276
 msgid "Print..."
 msgstr "°õºþ..."
 
-#. Create the dialog
-#: ../src/rcstrings.c:12 ../src/x_image.c:495
+#: src/rcstrings.c:12 src/x_image.c:495
 #, fuzzy
 msgid "Write image..."
 msgstr "¥¤¥á¡¼¥¸½ÐÎÏ..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:501
+#: src/rcstrings.c:13
 #, fuzzy
 msgid "Recent files"
 msgstr "¿·µ¬¥Õ¥¡¥¤¥ë"
 
-#: ../src/rcstrings.c:14 ../src/x_script.c:47
+#: src/rcstrings.c:14 src/x_script.c:47
 msgid "Execute Script..."
 msgstr "¥¹¥¯¥ê¥×¥È¼Â¹Ô..."
 
-#: ../src/rcstrings.c:15
+#: src/rcstrings.c:15
 msgid "Close Window"
 msgstr "¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë"
 
-#: ../src/rcstrings.c:16
+#: src/rcstrings.c:16
 msgid "Quit"
 msgstr "½ªÎ»"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
+#: src/rcstrings.c:18 src/i_callbacks.c:695
 msgid "Edit"
 msgstr "ÊÔ½¸"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:338
+#: src/rcstrings.c:19 src/x_window.c:338
 msgid "Undo"
 msgstr "¥¢¥ó¥É¥¥"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:345
+#: src/rcstrings.c:20 src/x_window.c:345
 msgid "Redo"
 msgstr "¥ê¥É¥¥"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
+#: src/rcstrings.c:21 src/i_basic.c:77 src/x_window.c:521
 msgid "Select Mode"
 msgstr "ÁªÂò¥â¡¼¥É"
 
-#: ../src/rcstrings.c:22
+#: src/rcstrings.c:22
 #, fuzzy
 msgid "Cut"
 msgstr "¥«¥Ã¥È1"
 
-#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
-#: ../src/i_callbacks.c:560
+#: src/rcstrings.c:23 src/i_basic.c:135 src/i_callbacks.c:536
+#: src/i_callbacks.c:560
 msgid "Copy"
 msgstr "¥³¥Ô¡¼"
 
-#: ../src/rcstrings.c:24
+#: src/rcstrings.c:24
 #, fuzzy
 msgid "Paste"
 msgstr "¥Ú¡¼¥¹¥È1"
 
-#: ../src/rcstrings.c:25
+#: src/rcstrings.c:25
 msgid "Edit..."
 msgstr "ÊÔ½¸..."
 
-#: ../src/rcstrings.c:26
+#: src/rcstrings.c:26
 msgid "Edit Text..."
 msgstr "¥Æ¥­¥¹¥ÈÊÔ½¸..."
 
-#: ../src/rcstrings.c:27 ../src/i_basic.c:84
+#: src/rcstrings.c:27 src/i_basic.c:84
 msgid "Copy Mode"
 msgstr "¥³¥Ô¡¼¥â¡¼¥É"
 
-#: ../src/rcstrings.c:28 ../src/i_basic.c:142
+#: src/rcstrings.c:28 src/i_basic.c:142
 #, fuzzy
 msgid "Multiple Copy Mode"
 msgstr "¥³¥Ô¡¼¥â¡¼¥É"
 
-#: ../src/rcstrings.c:29 ../src/i_basic.c:87
+#: src/rcstrings.c:29 src/i_basic.c:87
 msgid "Move Mode"
 msgstr "°ÜÆ°¥â¡¼¥É"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
+#: src/rcstrings.c:30 src/i_callbacks.c:670 src/x_multiattrib.c:1496
 msgid "Delete"
 msgstr "ºï½ü"
 
-#: ../src/rcstrings.c:31
+#: src/rcstrings.c:31
 msgid "Rotate 90 Mode"
 msgstr "90ÅÙ²óž¥â¡¼¥É"
 
-#: ../src/rcstrings.c:32 ../src/i_basic.c:91
+#: src/rcstrings.c:32 src/i_basic.c:91
 msgid "Mirror Mode"
 msgstr "ȿž¥â¡¼¥É"
 
-#: ../src/rcstrings.c:33
+#: src/rcstrings.c:33
 msgid "Slot..."
 msgstr "¥¹¥í¥Ã¥È..."
 
-#: ../src/rcstrings.c:34
+#: src/rcstrings.c:34
 msgid "Color..."
 msgstr "¿§..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
+#: src/rcstrings.c:35 src/i_callbacks.c:920 src/x_dialog.c:2411
 msgid "Lock"
 msgstr "¥í¥Ã¥¯"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
+#: src/rcstrings.c:36 src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "¥í¥Ã¥¯²ò½ü"
 
-#: ../src/rcstrings.c:37
+#: src/rcstrings.c:37
 msgid "Line Width & Type..."
 msgstr "Àþ¼ï¤ÈÉý..."
 
-#: ../src/rcstrings.c:38
+#: src/rcstrings.c:38
 msgid "Fill Type..."
 msgstr "Åɤê¤Ä¤Ö¤·¼ïÎà..."
 
-#: ../src/rcstrings.c:39
+#: src/rcstrings.c:39
 msgid "Symbol Translate..."
 msgstr "¥·¥ó¥Ü¥ëžÁ÷..."
 
-#: ../src/rcstrings.c:40
+#: src/rcstrings.c:40
 #, fuzzy
 msgid "Embed Component/Picture"
 msgstr "ÁȤ߹þ¤à"
 
-#: ../src/rcstrings.c:41
+#: src/rcstrings.c:41
 #, fuzzy
 msgid "Unembed Component/Picture"
 msgstr "ÁȤ߹þ¤ß²ò½ü"
 
-#: ../src/rcstrings.c:42
+#: src/rcstrings.c:42
 msgid "Update Component"
 msgstr "ÉôÉʹ¹¿·"
 
-#: ../src/rcstrings.c:43
+#: src/rcstrings.c:43
 msgid "Show/Hide Inv Text"
 msgstr "¥Æ¥­¥¹¥Èɽ¼¨/Èóɽ¼¨"
 
-#: ../src/rcstrings.c:44
+#: src/rcstrings.c:44
 msgid "Make Inv Text Vis"
 msgstr "±£¤·¥Æ¥­¥¹¥Èɽ¼¨"
 
-#: ../src/rcstrings.c:46
+#: src/rcstrings.c:46
 msgid "Buffer"
 msgstr "¥Ð¥Ã¥Õ¥¡"
 
-#: ../src/rcstrings.c:47
+#: src/rcstrings.c:47
 msgid "Copy into 1"
 msgstr "¥³¥Ô¡¼1"
 
-#: ../src/rcstrings.c:48
+#: src/rcstrings.c:48
 msgid "Copy into 2"
 msgstr "¥³¥Ô¡¼2"
 
-#: ../src/rcstrings.c:49
+#: src/rcstrings.c:49
 msgid "Copy into 3"
 msgstr "¥³¥Ô¡¼3"
 
-#: ../src/rcstrings.c:50
+#: src/rcstrings.c:50
 msgid "Copy into 4"
 msgstr "¥³¥Ô¡¼4"
 
-#: ../src/rcstrings.c:51
+#: src/rcstrings.c:51
 msgid "Copy into 5"
 msgstr "¥³¥Ô¡¼5"
 
-#: ../src/rcstrings.c:52
+#: src/rcstrings.c:52
 msgid "Cut into 1"
 msgstr "¥«¥Ã¥È1"
 
-#: ../src/rcstrings.c:53
+#: src/rcstrings.c:53
 msgid "Cut into 2"
 msgstr "¥«¥Ã¥È2"
 
-#: ../src/rcstrings.c:54
+#: src/rcstrings.c:54
 msgid "Cut into 3"
 msgstr "¥«¥Ã¥È3"
 
-#: ../src/rcstrings.c:55
+#: src/rcstrings.c:55
 msgid "Cut into 4"
 msgstr "¥«¥Ã¥È4"
 
-#: ../src/rcstrings.c:56
+#: src/rcstrings.c:56
 msgid "Cut into 5"
 msgstr "¥«¥Ã¥È5"
 
-#: ../src/rcstrings.c:57
+#: src/rcstrings.c:57
 msgid "Paste from 1"
 msgstr "¥Ú¡¼¥¹¥È1"
 
-#: ../src/rcstrings.c:58
+#: src/rcstrings.c:58
 msgid "Paste from 2"
 msgstr "¥Ú¡¼¥¹¥È2"
 
-#: ../src/rcstrings.c:59
+#: src/rcstrings.c:59
 msgid "Paste from 3"
 msgstr "¥Ú¡¼¥¹¥È3"
 
-#: ../src/rcstrings.c:60
+#: src/rcstrings.c:60
 msgid "Paste from 4"
 msgstr "¥Ú¡¼¥¹¥È4"
 
-#: ../src/rcstrings.c:61
+#: src/rcstrings.c:61
 msgid "Paste from 5"
 msgstr "¥Ú¡¼¥¹¥È5"
 
-#: ../src/rcstrings.c:63
+#: src/rcstrings.c:63
 msgid "View"
 msgstr "ɽ¼¨"
 
-#: ../src/rcstrings.c:64
+#: src/rcstrings.c:64
 msgid "Redraw"
 msgstr "²èÌ̹¹¿·"
 
-#. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
+#: src/rcstrings.c:65 src/i_callbacks.c:1474 src/i_callbacks.c:1546
 msgid "Pan"
 msgstr "¥Ñ¥ó"
 
-#: ../src/rcstrings.c:66 ../src/i_basic.c:95
+#: src/rcstrings.c:66 src/i_basic.c:95
 msgid "Zoom Box"
 msgstr "³ÈÂç"
 
-#: ../src/rcstrings.c:67
+#: src/rcstrings.c:67
 msgid "Zoom Extents"
 msgstr "³ÈÂçÈÏ°Ï"
 
-#: ../src/rcstrings.c:68
+#: src/rcstrings.c:68
 msgid "Zoom In"
 msgstr "³ÈÂç"
 
-#: ../src/rcstrings.c:69
+#: src/rcstrings.c:69
 msgid "Zoom Out"
 msgstr "½Ì¾®"
 
-#: ../src/rcstrings.c:70
+#: src/rcstrings.c:70
 msgid "Zoom Full"
 msgstr "ºÇÂç³ÈÂç"
 
-#: ../src/rcstrings.c:71
+#: src/rcstrings.c:71
 msgid "Dark color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:72
+#: src/rcstrings.c:72
 msgid "Light color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:74
+#: src/rcstrings.c:74
 msgid "Page"
 msgstr "¥Ú¡¼¥¸"
 
-#: ../src/rcstrings.c:75
+#: src/rcstrings.c:75
 msgid "Manager..."
 msgstr "¥Þ¥Í¡¼¥¸¥ã..."
 
-#: ../src/rcstrings.c:76
+#: src/rcstrings.c:76
 msgid "Next"
 msgstr "¼¡"
 
-#: ../src/rcstrings.c:77
+#: src/rcstrings.c:77
 msgid "Previous"
 msgstr "Á°"
 
-#: ../src/rcstrings.c:78 ../src/x_window.c:316
+#: src/rcstrings.c:78 src/x_window.c:316
 msgid "New"
 msgstr "¿·µ¬"
 
-#: ../src/rcstrings.c:79
+#: src/rcstrings.c:79
 msgid "Revert"
 msgstr "Ìá¤ë"
 
-#: ../src/rcstrings.c:80
+#: src/rcstrings.c:80
 msgid "Close"
 msgstr "ÊĤ¸¤ë"
 
-#: ../src/rcstrings.c:81
+#: src/rcstrings.c:81
 msgid "Discard"
 msgstr "ÇË´þ"
 
-#: ../src/rcstrings.c:83
+#: src/rcstrings.c:83
 msgid "Add"
 msgstr "ÄɲÃ"
 
-#: ../src/rcstrings.c:84
+#: src/rcstrings.c:84
 msgid "Component..."
 msgstr "ÉôÉÊ..."
 
-#. need to click
-#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
-#: ../src/x_dialog.c:2376
+#: src/rcstrings.c:85 src/i_callbacks.c:2401 src/i_callbacks.c:2428
+#: src/x_dialog.c:2378
 msgid "Net"
 msgstr "¥Í¥Ã¥È"
 
-#. need to click
-#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
-#: ../src/x_dialog.c:2394 ../src/x_window.c:374
+#: src/rcstrings.c:86 src/i_callbacks.c:2472 src/i_callbacks.c:2499
+#: src/x_dialog.c:2396 src/x_window.c:374
 msgid "Bus"
 msgstr "¥Ð¥¹"
 
-#: ../src/rcstrings.c:87
+#: src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥È..."
 
-#: ../src/rcstrings.c:88
+#: src/rcstrings.c:88
 msgid "Text..."
 msgstr "¥Æ¥­¥¹¥È..."
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
+#: src/rcstrings.c:89 src/i_callbacks.c:2580 src/i_callbacks.c:2603
 msgid "Line"
 msgstr "Àþ"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
+#: src/rcstrings.c:90 src/i_callbacks.c:2625 src/i_callbacks.c:2648
 msgid "Box"
 msgstr "¥Ü¥Ã¥¯¥¹"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
+#: src/rcstrings.c:91 src/i_callbacks.c:2704 src/i_callbacks.c:2728
 msgid "Circle"
 msgstr "±ß"
 
-#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
+#: src/rcstrings.c:92 src/i_callbacks.c:2750 src/i_callbacks.c:2773
 msgid "Arc"
 msgstr "±ß¸Ì"
 
-#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
-#: ../src/x_dialog.c:2367
+#: src/rcstrings.c:93 src/i_callbacks.c:2795 src/i_callbacks.c:2818
+#: src/x_dialog.c:2369
 msgid "Pin"
 msgstr "¥Ô¥ó"
 
-#: ../src/rcstrings.c:94
+#: src/rcstrings.c:94
 #, fuzzy
 msgid "Picture..."
 msgstr "°õºþ..."
 
-#: ../src/rcstrings.c:96
+#: src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "³¬ÁØ"
 
-#: ../src/rcstrings.c:97
+#: src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "¥¹¥±¥Þ¥Á¥Ã¥¯¤Ø"
 
-#: ../src/rcstrings.c:98
+#: src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "¥·¥ó¥Ü¥ë¤Ø"
 
-#: ../src/rcstrings.c:99
+#: src/rcstrings.c:99
 msgid "Up"
 msgstr "¾å¤Ø"
 
-#: ../src/rcstrings.c:100
+#: src/rcstrings.c:100
 msgid "Documentation"
 msgstr "¥É¥­¥å¥á¥ó¥Èɽ¼¨/¸¡º÷"
 
-#. GtkFrame
-#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
-#: ../src/x_multiattrib.c:1543
+#: src/rcstrings.c:102 src/x_compselect.c:1417
 msgid "Attributes"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥È"
 
-#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
+#: src/rcstrings.c:103 src/i_callbacks.c:3089
 msgid "Attach"
 msgstr "¥¢¥¿¥Ã¥Á"
 
-#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
+#: src/rcstrings.c:104 src/i_callbacks.c:3136
 msgid "Detach"
 msgstr "¥¢¥¿¥Ã¥Á²ò½ü"
 
-#: ../src/rcstrings.c:105
+#: src/rcstrings.c:105
 msgid "Show Value"
 msgstr "ÃÍɽ¼¨"
 
-#: ../src/rcstrings.c:106
+#: src/rcstrings.c:106
 msgid "Show Name"
 msgstr "̾Á°É½¼¨"
 
-#: ../src/rcstrings.c:107
+#: src/rcstrings.c:107
 msgid "Show Both"
 msgstr "̾Á°¤ÈÃͤòɽ¼¨"
 
-#: ../src/rcstrings.c:108
+#: src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "ɽ¼¨/Èóɽ¼¨"
 
-#: ../src/rcstrings.c:109
+#: src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "¥Æ¥­¥¹¥È¸¡º÷..."
 
-#: ../src/rcstrings.c:110
+#: src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "¥Æ¥­¥¹¥È¤ò±£¤¹..."
 
-#: ../src/rcstrings.c:111
+#: src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "¥Æ¥­¥¹¥È¤òɽ¼¨..."
 
-#: ../src/rcstrings.c:112
+#: src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr "¥ª¡¼¥È¥Ê¥ó¥Ð¡¼¥Æ¥­¥¹¥È"
 
-#: ../src/rcstrings.c:114
+#: src/rcstrings.c:114
 msgid "Options"
 msgstr "¥ª¥×¥·¥ç¥ó"
 
-#: ../src/rcstrings.c:115
+#: src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "¥Æ¥­¥¹¥È¥µ¥¤¥º..."
 
-#: ../src/rcstrings.c:116
+#: src/rcstrings.c:116
 msgid "Cycle grid styles"
 msgstr ""
 
-#: ../src/rcstrings.c:117
+#: src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr "¥¹¥Ê¥Ã¥× ¥ª¥ó/¥ª¥Õ"
 
-#: ../src/rcstrings.c:118
+#: src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "¥°¥ê¥Ã¥É¤Î´Ö³Ö..."
 
-#: ../src/rcstrings.c:119
+#: src/rcstrings.c:119
 #, fuzzy
 msgid "Scale up Grid Spacing"
 msgstr "¥°¥ê¥Ã¥É¤Î´Ö³Ö..."
 
-#: ../src/rcstrings.c:120
+#: src/rcstrings.c:120
 #, fuzzy
 msgid "Scale down Grid Spacing"
 msgstr "¥°¥ê¥Ã¥É¤Î´Ö³Ö..."
 
-#: ../src/rcstrings.c:121
+#: src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr "¥¢¥¦¥È¥é¥¤¥ó/¥Ü¥Ã¥¯¥¹"
 
-#: ../src/rcstrings.c:122
+#: src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr "¥é¥Ð¡¼¥Ð¥ó¥ÉÀÚÂؤ¨"
 
-#: ../src/rcstrings.c:123
+#: src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "¥í¥°¥¦¥£¥ó¥É¥¦É½¼¨..."
 
-#: ../src/rcstrings.c:124
+#: src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "ºÂɸ¥¦¥£¥ó¥É¥¦É½¼¨..."
 
-#: ../src/rcstrings.c:126
+#: src/rcstrings.c:126
 msgid "Help"
 msgstr "¥Ø¥ë¥×"
 
-#: ../src/rcstrings.c:127
+#: src/rcstrings.c:127
 #, fuzzy
 msgid "Manual"
 msgstr "¥Þ¥Ë¥å¥¢¥ë..."
 
-#: ../src/rcstrings.c:128
+#: src/rcstrings.c:128
 #, fuzzy
 msgid "gEDA Documentation"
 msgstr "¥É¥­¥å¥á¥ó¥Èɽ¼¨/¸¡º÷"
 
-#: ../src/rcstrings.c:129
+#: src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr ""
 
-#: ../src/rcstrings.c:130
+#: src/rcstrings.c:130
 #, fuzzy
 msgid "Component Documentation"
 msgstr "¥É¥­¥å¥á¥ó¥Èɽ¼¨/¸¡º÷"
 
-#: ../src/rcstrings.c:131
+#: src/rcstrings.c:131
 msgid "About gschem"
 msgstr ""
 
-#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
+#: src/rcstrings.c:132 src/x_dialog.c:2724
 #, fuzzy
 msgid "Hotkeys"
 msgstr "¥Û¥Ã¥È¥­¡¼..."
 
-#: ../src/a_zoom.c:212
+#: src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "¤³¤ì°Ê¾å¥º¡¼¥à¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#. Fork failed. Still in parent process, so can use the log
-#. * window
-#: ../src/g_funcs.c:339 ../src/i_callbacks.c:68
+#: src/g_funcs.c:339 src/i_callbacks.c:68
 #, c-format
 msgid "Could not fork\n"
 msgstr ""
 
-#. if we return, then nothing happened
-#: ../src/g_funcs.c:355 ../src/i_callbacks.c:78
+#: src/g_funcs.c:355 src/i_callbacks.c:78
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr ""
 
-#: ../src/g_funcs.c:361 ../src/i_callbacks.c:82
+#: src/g_funcs.c:361 src/i_callbacks.c:82
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr ""
 
-#: ../src/g_rc.c:292
+#: src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "̵¸ú¤Ê³ÈÂçΨ[%d]¤¬%s¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:418
+#: src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬text-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:445
+#: src/g_rc.c:445
 #, fuzzy, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬text-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:488
+#: src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬snap-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:960
+#: src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "̵¸ú¤Ê¥¢¥ó¥É¥¥¥ì¥Ù¥ë[%d]¤¬undo-levels¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1218
+#: src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬bus-ripper¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1293
+#: src/g_rc.c:1293
 #, fuzzy, c-format
 msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬text-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1334
+#: src/g_rc.c:1334
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬text-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1360
+#: src/g_rc.c:1360
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬text-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1404
+#: src/g_rc.c:1404
 #, fuzzy, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬text-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1428
+#: src/g_rc.c:1428
 #, fuzzy, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr "̵¸ú¤Ê¥¢¥ó¥É¥¥¥ì¥Ù¥ë[%d]¤¬undo-levels¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1469
+#: src/g_rc.c:1469
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬snap-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1492
+#: src/g_rc.c:1492
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬snap-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1538
+#: src/g_rc.c:1538
 #, fuzzy, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr "̵¸ú¤Ê¥¢¥ó¥É¥¥¥ì¥Ù¥ë[%d]¤¬undo-levels¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1564
+#: src/g_rc.c:1564
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "̵¸ú¤Ê¥µ¥¤¥º[%d]¤¬snap-size¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/g_rc.c:1589
+#: src/g_rc.c:1589
 #, fuzzy, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr "̵¸ú¤Ê¥¢¥ó¥É¥¥¥ì¥Ù¥ë[%d]¤¬undo-levels¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/gschem.c:183 ../src/gschem.c:194
+#: src/gschem.c:183 src/gschem.c:194
 #, fuzzy, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem¥Ð¡¼¥¸¥ç¥ó%s%s.%s\n"
 
-#: ../src/gschem.c:186 ../src/gschem.c:197
+#: src/gschem.c:186 src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -643,7 +633,7 @@ msgstr ""
 "gEDA/gschem¤Ï´°Á´¤Ë̵ÊݾڤÇÄ󶡤µ¤ì¤Þ¤¹¡£¾Ü¤·¤¯¤ÏCOPYING¥Õ¥¡¥¤¥ë¤ò¤´Í÷¤¯¤À¤µ"
 "¤¤¡£\n"
 
-#: ../src/gschem.c:188 ../src/gschem.c:199
+#: src/gschem.c:188 src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -651,7 +641,7 @@ msgstr ""
 "¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¢¤ê¡¢¤¢¤ë¾ò·ï¤Î²¼¤ÇºÆÈÒÉÛ¤¹¤ë¤³¤È¤¬¾©Î夵¤ì¤Æ¤¤¤Þ"
 "¤¹¡£\n"
 
-#: ../src/gschem.c:190 ../src/gschem.c:201
+#: src/gschem.c:190 src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -660,17 +650,17 @@ msgstr ""
 "¾Ü¤·¤¯¤ÏCOPYING¥Õ¥¡¥¤¥ë¤ò¤´Í÷¤¯¤À¤µ¤¤¡£\n"
 "\n"
 
-#: ../src/gschem.c:205
+#: src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "MIGW32ÈǤǤ¹¡£\n"
 
-#: ../src/gschem.c:209
+#: src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr ""
 
-#: ../src/gschem.c:224
+#: src/gschem.c:224
 msgid ""
 "You must set the GEDADATA environment variable!\n"
 "\n"
@@ -678,226 +668,248 @@ msgid ""
 "environment variable to point to the correct location.\n"
 msgstr ""
 
-#: ../src/gschem.c:251
+#: src/gschem.c:251
 #, fuzzy, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "½é´ü²½scm¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¡£[%s]\n"
 
-#: ../src/gschem.c:255
+#: src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "½é´ü²½scm¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ó¤Ç¤¤¤Þ¤¹¡£[%s]\n"
 
-#. ! \todo These two messages are the same. Should be
-#. * integrated.
-#: ../src/gschem.c:259
+#: src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "½é´ü²½scm¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¡£[%s]\n"
 
-#: ../src/gschem.c:320
+#: src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "scheme¥Ç¥£¥ì¥¯¥È¥ê¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó!\n"
 
-#: ../src/gschem.c:327 ../src/x_script.c:66
+#: src/gschem.c:327 src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "guile¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Æ¤¤¤Þ¤¹¡£[%s]\n"
 
-#: ../src/gschem_cairo.c:310
+#: src/gschem_accel_label.c:319
+msgid "Accelerator Closure"
+msgstr ""
+
+#: src/gschem_accel_label.c:320
+msgid "The closure to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:326
+msgid "Accelerator Widget"
+msgstr ""
+
+#: src/gschem_accel_label.c:327
+msgid "The widget to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:333
+msgid "Accelerator String"
+msgstr ""
+
+#: src/gschem_accel_label.c:334
+msgid "The accelerator string to be displayed"
+msgstr ""
+
+#: src/gschem_cairo.c:310
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "ÉÔÌÀ¤ÊÀþ¤ÎÀèü(%d)\n"
 
-#: ../src/gschem_cairo.c:318
+#: src/gschem_cairo.c:318
 #, fuzzy, c-format
 msgid "Unknown type for stroke (%d) !\n"
 msgstr "ÉÔÌÀ¤ÊÀþ¤Î¼ïÎà(%d)!\n"
 
-#: ../src/i_basic.c:79
+#: src/i_basic.c:79
 msgid "Component Mode"
 msgstr "ÉôÉʥ⡼¥É"
 
-#: ../src/i_basic.c:81
+#: src/i_basic.c:81
 msgid "Text Mode"
 msgstr "¥Í¥Ã¥È¥â¡¼¥É"
 
-#: ../src/i_basic.c:89
+#: src/i_basic.c:89
 msgid "Rotate Mode"
 msgstr "²óž¥â¡¼¥É"
 
-#: ../src/i_basic.c:99
+#: src/i_basic.c:99
 msgid "Pan Mode"
 msgstr "¥Ñ¥ó¥â¡¼¥É"
 
-#: ../src/i_basic.c:103
+#: src/i_basic.c:103
 #, c-format
 msgid "Paste %d Mode"
 msgstr "¥Ú¡¼¥¹¥È%d¥â¡¼¥É"
 
-#: ../src/i_basic.c:109
+#: src/i_basic.c:109
 #, fuzzy
 msgid "Magnetic Net Mode"
 msgstr "¥Í¥Ã¥È¥â¡¼¥É"
 
-#: ../src/i_basic.c:111
+#: src/i_basic.c:111
 msgid "Net Mode"
 msgstr "¥Í¥Ã¥È¥â¡¼¥É"
 
-#: ../src/i_basic.c:115
+#: src/i_basic.c:115
 msgid "Bus Mode"
 msgstr "¥Ð¥¹¥â¡¼¥É"
 
-#: ../src/i_basic.c:118
+#: src/i_basic.c:118
 msgid "Line Mode"
 msgstr "Àþ¥â¡¼¥É"
 
-#: ../src/i_basic.c:121
+#: src/i_basic.c:121
 msgid "Box Mode"
 msgstr "¥Ü¥Ã¥¯¥¹¥â¡¼¥É"
 
-#: ../src/i_basic.c:124
+#: src/i_basic.c:124
 #, fuzzy
 msgid "Picture Mode"
 msgstr "¥Ô¥ó¥â¡¼¥É"
 
-#: ../src/i_basic.c:127
+#: src/i_basic.c:127
 msgid "Circle Mode"
 msgstr "±ß¥â¡¼¥É"
 
-#: ../src/i_basic.c:130
+#: src/i_basic.c:130
 msgid "Arc Mode"
 msgstr "±ß¸Ì¥â¡¼¥É"
 
-#: ../src/i_basic.c:133
+#: src/i_basic.c:133
 msgid "Pin Mode"
 msgstr "¥Ô¥ó¥â¡¼¥É"
 
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
+#: src/i_basic.c:137 src/i_callbacks.c:626 src/i_callbacks.c:650
 msgid "Move"
 msgstr "°ÜÆ°"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
+#: src/i_basic.c:139 src/i_callbacks.c:581 src/i_callbacks.c:605
 #, fuzzy
 msgid "Multiple Copy"
 msgstr "¿½Å¥¢¥¿¥Ã¥Á"
 
-#: ../src/i_basic.c:168
+#: src/i_basic.c:168
 msgid "Show Hidden"
 msgstr "±£¤·¥Æ¥­¥¹¥Èɽ¼¨"
 
-#: ../src/i_basic.c:171
+#: src/i_basic.c:171
 msgid "Snap Off"
 msgstr "¥¹¥Ê¥Ã¥×¡¦¥ª¥Õ"
 
-#: ../src/i_basic.c:173
+#: src/i_basic.c:173
 msgid "Resnap Active"
 msgstr ""
 
-#: ../src/i_basic.c:254 ../src/x_window.c:495
+#: src/i_basic.c:254 src/x_window.c:495
 msgid "Action"
 msgstr "¥¢¥¯¥·¥ç¥ó"
 
-#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
+#: src/i_basic.c:260 src/x_dialog.c:2408 src/x_window.c:490
 msgid "Stroke"
 msgstr "¥¹¥È¥í¡¼¥¯"
 
-#: ../src/i_basic.c:266 ../src/x_window.c:492
+#: src/i_basic.c:266 src/x_window.c:492
 msgid "none"
 msgstr "¤Ê¤·"
 
-#: ../src/i_basic.c:271
+#: src/i_basic.c:271
 msgid "Repeat/"
 msgstr "·«¤êÊÖ¤·/"
 
-#: ../src/i_basic.c:549 ../src/i_basic.c:563
+#: src/i_basic.c:549 src/i_basic.c:563
 msgid "OFF"
 msgstr ""
 
-#: ../src/i_basic.c:567
+#: src/i_basic.c:567
 msgid "NONE"
 msgstr ""
 
-#: ../src/i_basic.c:572
+#: src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr ""
 
-#: ../src/i_callbacks.c:63
+#: src/i_callbacks.c:63
 #, c-format
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
+#: src/i_callbacks.c:123 src/i_callbacks.c:1705
 #, fuzzy, c-format
 msgid "New page created [%s]\n"
 msgstr "¿·µ¬¥Ú¡¼¥¸¤òºîÀ®¤·¤Þ¤·¤¿¡£[%s]\n"
 
-#: ../src/i_callbacks.c:163
+#: src/i_callbacks.c:163
 #, fuzzy, c-format
 msgid "New Window created [%s]\n"
 msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤òºîÀ®¤·¤Þ¤·¤¿¡£\n"
 
-#: ../src/i_callbacks.c:281
+#: src/i_callbacks.c:281
 #, fuzzy
 msgid "Failed to Save All"
 msgstr "¤¹¤Ù¤ÆÊݸ"
 
-#: ../src/i_callbacks.c:283
+#: src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "¤¹¤Ù¤ÆÊݸ"
 
-#: ../src/i_callbacks.c:373
+#: src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
+#: src/i_callbacks.c:541 src/i_callbacks.c:586 src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "¤Þ¤º¥ª¥Ö¥¸¥§¥¯¥È¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: ../src/i_callbacks.c:710
+#: src/i_callbacks.c:710
 #, fuzzy
 msgid "Edit pin type"
 msgstr "Àþ¼ï¤òÊÔ½¸"
 
-#: ../src/i_callbacks.c:729
+#: src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "¥Æ¥­¥¹¥ÈÊÔ½¸"
 
-#: ../src/i_callbacks.c:752
+#: src/i_callbacks.c:752
 msgid "Slot"
 msgstr "¥¹¥í¥Ã¥È"
 
-#: ../src/i_callbacks.c:769
+#: src/i_callbacks.c:769
 msgid "Color"
 msgstr "¿§"
 
-#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
+#: src/i_callbacks.c:806 src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "²óž"
 
-#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
+#: src/i_callbacks.c:874 src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "ȿž"
 
-#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
+#: src/i_callbacks.c:956 src/x_dialog.c:1800
 msgid "Translate"
 msgstr "žÁ÷"
 
-#: ../src/i_callbacks.c:959
+#: src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "·Ù¹ð:¥¹¥Ê¥Ã¥×¡¦¥ª¥Õ¤ÇžÁ÷¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤!\n"
 
-#: ../src/i_callbacks.c:960
+#: src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr "·Ù¹ð:¥¹¥Ê¥Ã¥×¤ò¥ª¥ó¤·¤Æ¤«¤éžÁ÷¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: ../src/i_callbacks.c:967
+#: src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "·Ù¹ð:¥°¥ê¥Ã¥É¥µ¥¤¥º¤¬100¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n"
 
-#: ../src/i_callbacks.c:969
+#: src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -905,389 +917,386 @@ msgstr ""
 "·Ù¹ð:¸¶ÅÀ¤ØžÁ÷¤¹¤ë¤È¤­¤Ï¥¹¥Ê¥Ã¥×¤Î¥°¥ê¥Ã¥É¥µ¥¤¥º¤ò\n"
 "100¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: ../src/i_callbacks.c:1000
+#: src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "ÁȤ߹þ¤ß"
 
-#: ../src/i_callbacks.c:1041
+#: src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "ÁȤ߹þ¤ß²ò½ü"
 
-#: ../src/i_callbacks.c:1084
+#: src/i_callbacks.c:1085
 msgid "Update"
 msgstr "¹¹¿·"
 
-#: ../src/i_callbacks.c:1141
+#: src/i_callbacks.c:1144
 msgid "ShowHidden"
 msgstr "±£¤·¥Æ¥­¥¹¥Èɽ¼¨"
 
-#: ../src/i_callbacks.c:1165
+#: src/i_callbacks.c:1168
 msgid "MakeVisible"
 msgstr "ɽ¼¨¤¹¤ë"
 
-#: ../src/i_callbacks.c:1562
+#: src/i_callbacks.c:1565
 msgid "Update Cues"
 msgstr "¥­¥å¡¼¹¹¿·"
 
-#: ../src/i_callbacks.c:1746
+#: src/i_callbacks.c:1749
 #, fuzzy
 msgid "Really revert page?"
 msgstr "Ì᤹"
 
-#: ../src/i_callbacks.c:1816
+#: src/i_callbacks.c:1819
 msgid "Copy to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1834
+#: src/i_callbacks.c:1837
 msgid "Cut to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1852
+#: src/i_callbacks.c:1855
 #, fuzzy
 msgid "Paste from clipboard"
 msgstr "¥Ú¡¼¥¹¥È1"
 
-#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
-#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
-#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+#: src/i_callbacks.c:1867 src/i_callbacks.c:2106 src/i_callbacks.c:2128
+#: src/i_callbacks.c:2150 src/i_callbacks.c:2172 src/i_callbacks.c:2194
 msgid "Empty buffer"
 msgstr "¥Ð¥Ã¥Õ¥¡¤¬¶õ¤Ç¤¹¡£"
 
-#: ../src/i_callbacks.c:1909
+#: src/i_callbacks.c:1912
 msgid "Copy 1"
 msgstr "¥³¥Ô¡¼1"
 
-#: ../src/i_callbacks.c:1928
+#: src/i_callbacks.c:1931
 msgid "Copy 2"
 msgstr "¥³¥Ô¡¼2"
 
-#: ../src/i_callbacks.c:1947
+#: src/i_callbacks.c:1950
 msgid "Copy 3"
 msgstr "¥³¥Ô¡¼3"
 
-#: ../src/i_callbacks.c:1966
+#: src/i_callbacks.c:1969
 msgid "Copy 4"
 msgstr "¥³¥Ô¡¼4"
 
-#: ../src/i_callbacks.c:1985
+#: src/i_callbacks.c:1988
 msgid "Copy 5"
 msgstr "¥³¥Ô¡¼5"
 
-#: ../src/i_callbacks.c:2004
+#: src/i_callbacks.c:2007
 msgid "Cut 1"
 msgstr "¥«¥Ã¥È1"
 
-#: ../src/i_callbacks.c:2023
+#: src/i_callbacks.c:2026
 msgid "Cut 2"
 msgstr "¥«¥Ã¥È2"
 
-#: ../src/i_callbacks.c:2042
+#: src/i_callbacks.c:2045
 msgid "Cut 3"
 msgstr "¥«¥Ã¥È3"
 
-#: ../src/i_callbacks.c:2061
+#: src/i_callbacks.c:2064
 msgid "Cut 4"
 msgstr "¥«¥Ã¥È4"
 
-#: ../src/i_callbacks.c:2080
+#: src/i_callbacks.c:2083
 msgid "Cut 5"
 msgstr "¥«¥Ã¥È5"
 
-#: ../src/i_callbacks.c:2096
+#: src/i_callbacks.c:2099
 msgid "Paste 1"
 msgstr "¥Ú¡¼¥¹¥È1"
 
-#: ../src/i_callbacks.c:2118
+#: src/i_callbacks.c:2121
 msgid "Paste 2"
 msgstr "¥Ú¡¼¥¹¥È 2"
 
-#: ../src/i_callbacks.c:2140
+#: src/i_callbacks.c:2143
 msgid "Paste 3"
 msgstr "¥Ú¡¼¥¹¥È 3"
 
-#: ../src/i_callbacks.c:2162
+#: src/i_callbacks.c:2165
 msgid "Paste 4"
 msgstr "¥Ú¡¼¥¹¥È 4"
 
-#: ../src/i_callbacks.c:2184
+#: src/i_callbacks.c:2187
 msgid "Paste 5"
 msgstr "¥Ú¡¼¥¹¥È 5"
 
-#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
+#: src/i_callbacks.c:2324 src/x_window.c:354
 msgid "Component"
 msgstr "ÉôÉÊ"
 
-#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
+#: src/i_callbacks.c:2360 src/i_callbacks.c:2379 src/x_dialog.c:2381
 msgid "Attribute"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥È"
 
-#: ../src/i_callbacks.c:2873
+#: src/i_callbacks.c:2877
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "¥½¡¼¥¹¸¡º÷Ãæ[%s]\n"
 
-#: ../src/i_callbacks.c:2897
+#: src/i_callbacks.c:2901
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "¥½¡¼¥¹¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡£[%s]\n"
 
-#: ../src/i_callbacks.c:2964
+#: src/i_callbacks.c:2970
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "¥·¥ó¥Ü¥ë¸¡º÷Ãæ[%s]\n"
 
-#: ../src/i_callbacks.c:2970
+#: src/i_callbacks.c:2976
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3001
+#: src/i_callbacks.c:3007
 msgid "Cannot find any schematics above the current one!\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3064
+#: src/i_callbacks.c:3061
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
 msgstr ""
 
-#: ../src/i_callbacks.c:3177
+#: src/i_callbacks.c:3171
 msgid "ShowN"
 msgstr "Nɽ¼¨"
 
-#: ../src/i_callbacks.c:3213
+#: src/i_callbacks.c:3207
 msgid "ShowV"
 msgstr "ɽ¼¨V"
 
-#: ../src/i_callbacks.c:3249
+#: src/i_callbacks.c:3243
 msgid "ShowB"
 msgstr "ɽ¼¨B"
 
-#: ../src/i_callbacks.c:3286
+#: src/i_callbacks.c:3280
 msgid "VisToggle"
 msgstr "ɽ¼¨ÀÚÂؤ¨"
 
-#: ../src/i_callbacks.c:3316
+#: src/i_callbacks.c:3310
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "µ¡Ç½¤·¤Ê¤¤¥á¥Ë¥å¡¼¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
 
-#: ../src/i_callbacks.c:3406
+#: src/i_callbacks.c:3400
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3409
+#: src/i_callbacks.c:3403
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3434
+#: src/i_callbacks.c:3428
 msgid "Grid OFF\n"
 msgstr "¥°¥ê¥Ã¥É¡¦¥ª¥Õ\n"
 
-#: ../src/i_callbacks.c:3435
+#: src/i_callbacks.c:3429
 msgid "Dot grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3436
+#: src/i_callbacks.c:3430
 msgid "Mesh grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3457
+#: src/i_callbacks.c:3451
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "¥¹¥Ê¥Ã¥×¡¦¥ª¥Õ(Ãí°Õ!)\n"
 
-#: ../src/i_callbacks.c:3460
+#: src/i_callbacks.c:3454
 msgid "Snap ON\n"
 msgstr "¥¹¥Ê¥Ã¥×¡¦¥ª¥ó\n"
 
-#: ../src/i_callbacks.c:3463
+#: src/i_callbacks.c:3457
 #, fuzzy
 msgid "Snap back to the grid (CAUTION!)\n"
 msgstr "¥¹¥Ê¥Ã¥×¡¦¥ª¥Õ(Ãí°Õ!)\n"
 
-#: ../src/i_callbacks.c:3489
+#: src/i_callbacks.c:3483
 msgid "Rubber band OFF \n"
 msgstr "¥é¥Ð¡¼¥Ð¥ó¥É¡¦¥ª¥Õ\n"
 
-#: ../src/i_callbacks.c:3492
+#: src/i_callbacks.c:3486
 msgid "Rubber band ON\n"
 msgstr "¥é¥Ð¡¼¥Ð¥ó¥É¡¦¥ª¥ó\n"
 
-#: ../src/i_callbacks.c:3507
+#: src/i_callbacks.c:3501
 msgid "magnetic net mode: ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3510
+#: src/i_callbacks.c:3504
 msgid "magnetic net mode: OFF\n"
 msgstr ""
 
-#: ../src/o_box.c:160
+#: src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "ÉÔÌÀ¤Ê¥Ü¥Ã¥¯¥¹¤Î¼ïÎà(Åɤê¤Ä¤Ö¤·)!\n"
 
-#: ../src/o_buffer.c:57
+#: src/o_buffer.c:57
 #, c-format
 msgid "o_buffer_copy: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:72
+#: src/o_buffer.c:72
 #, c-format
 msgid "o_buffer_cut: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:93
+#: src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr ""
 
-#: ../src/o_bus.c:135
+#: src/o_bus.c:135
 #, c-format
 msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr ""
 
-#: ../src/o_circle.c:141
+#: src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "ÉÔÌÀ¤Ê±ß¤Î¼ïÎà(Åɤê¤Ä¤Ö¤·)!\n"
 
-#: ../src/o_complex.c:250 ../src/o_complex.c:254
+#: src/o_complex.c:250 src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "¥¹¥±¥Þ¥Á¥Ã¥¯¤òžÁ÷¤·¤Æ¤¤¤Þ¤¹¡£[%d %d]\n"
 
-#: ../src/o_misc.c:61
+#: src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
 msgstr ""
 
-#: ../src/o_misc.c:125
+#: src/o_misc.c:125
 #, fuzzy
 msgid "Object already locked\n"
 msgstr "¤³¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ï¤¹¤Ç¤Ë¥í¥Ã¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: ../src/o_misc.c:163
+#: src/o_misc.c:163
 #, fuzzy
 msgid "Object already unlocked\n"
 msgstr "¤³¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ï¤¹¤Ç¤Ë¥í¥Ã¥¯²ò½ü¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: ../src/o_misc.c:445
+#: src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "±£¤·¥Æ¥­¥¹¥È¤¬É½¼¨¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/o_misc.c:447
+#: src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "±£¤·¥Æ¥­¥¹¥È¤¬Èóɽ¼¨¤Ë¤Ê¤ê¤Þ¤·¤¿¡£\n"
 
-#: ../src/o_misc.c:697
+#: src/o_misc.c:700
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 
-#: ../src/o_misc.c:840
+#: src/o_misc.c:847
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr ""
 
-#: ../src/o_misc.c:884
+#: src/o_misc.c:891
 #, fuzzy, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr "Êݸ¤Ç¤­¤Þ¤»¤ó¡£[%s]\n"
 
-#: ../src/o_misc.c:902
+#: src/o_misc.c:909
 #, fuzzy, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Êݸ¤Ç¤­¤Þ¤»¤ó¡£[%s]\n"
 
-#: ../src/o_misc.c:907
+#: src/o_misc.c:914
 #, fuzzy, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "Êݸ¤Ç¤­¤Þ¤»¤ó¡£[%s]\n"
 
-#: ../src/o_move.c:188
+#: src/o_move.c:188
 #, c-format
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr ""
 
-#: ../src/o_move.c:461
+#: src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr ""
 
-#: ../src/o_move.c:482
+#: src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr ""
 
-#: ../src/o_net.c:176
+#: src/o_net.c:176
 #, c-format
 msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr ""
 
-#: ../src/o_net.c:552
+#: src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr ""
 
-#: ../src/o_net.c:614
+#: src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr ""
 
-#. try to exit gracefully
-#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
-#: ../src/o_net.c:1126
+#: src/o_net.c:982 src/o_net.c:1019 src/o_net.c:1090 src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 
-#: ../src/o_net.c:1196
+#: src/o_net.c:1196
 #, fuzzy, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "̵¸ú¤Ê¥Ñ¥¹[%s]¤¬component-library¤Ë»ØÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: ../src/o_path.c:356
+#: src/o_path.c:356
 #, fuzzy, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "ÉÔÌÀ¤Ê¥Ü¥Ã¥¯¥¹¤Î¼ïÎà(Åɤê¤Ä¤Ö¤·)!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:557
+#: src/o_picture.c:166 src/o_picture.c:557
 #, fuzzy, c-format
 msgid "Failed to load picture: %s"
 msgstr "½é´ü²½scm¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¡£[%s]\n"
 
-#: ../src/o_picture.c:180
+#: src/o_picture.c:180
 msgid "Picture"
 msgstr ""
 
-#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
+#: src/o_picture.c:465 src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr ""
 
-#: ../src/o_slot.c:110
+#: src/o_slot.c:81
 msgid "Slot attribute malformed\n"
 msgstr "¥¹¥í¥Ã¥È¥¢¥È¥ê¥Ó¥å¡¼¥È¤¬ÊѤǤ¹¡£\n"
 
-#: ../src/o_slot.c:128
+#: src/o_slot.c:99
 msgid "numslots attribute missing\n"
 msgstr "¥¹¥í¥Ã¥ÈÈֹ椬¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: ../src/o_slot.c:130
+#: src/o_slot.c:100
 msgid "Slotting not allowed for this component\n"
 msgstr "¤³¤ÎÉôÉʤ˥¹¥í¥Ã¥È¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: ../src/o_slot.c:145
+#: src/o_slot.c:115
 msgid "New slot number out of range\n"
 msgstr "¥¹¥í¥Ã¥ÈÈֹ椬ÈϰϤò±Û¤¨¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: ../src/o_slot.c:200
+#: src/o_slot.c:170
 #, c-format
 msgid "uggg! you tried to slot edit something that doesn't exist!\n"
 msgstr "¤ª¤Ã¤È! ¸ºß¤·¤Ê¤¤¥¹¥í¥Ã¥È¤òÊÔ½¸¤·¤è¤¦¤È¤·¤Þ¤·¤¿!\n"
 
-#: ../src/o_undo.c:300
+#: src/o_undo.c:300
 msgid "Undo/Redo disabled in rc file\n"
 msgstr "¥¢¥ó¥É¥¥/¥ê¥É¥¥¤Ïrc¥Õ¥¡¥¤¥ë¤Ç̵¸ú¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: ../src/parsecmd.c:47
+#: src/parsecmd.c:47
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] schematic_filename1 ... schematic_filenameN\n"
@@ -1302,277 +1311,258 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../src/x_attribedit.c:127
+#: src/x_attribedit.c:127
 #, c-format
 msgid "Got invalid show option; defaulting to show both\n"
 msgstr ""
 
-#: ../src/x_attribedit.c:330
+#: src/x_attribedit.c:330
 msgid "Single Attribute Editor"
 msgstr "¥·¥ó¥°¥ë¥¢¥È¥ë¥Ó¥å¡¼¥È¥¨¥Ç¥£¥¿"
 
-#: ../src/x_attribedit.c:359
+#: src/x_attribedit.c:359
 #, fuzzy
 msgid "<b>Edit Attribute</b>"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥ÈÊÔ½¸"
 
-#: ../src/x_attribedit.c:361
+#: src/x_attribedit.c:361
 #, fuzzy
 msgid "<b>Add Attribute</b>"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥ÈÄɲÃ/ÊÔ½¸"
 
-#. Name selection
-#. GtkLabel
-#: ../src/x_attribedit.c:377 ../src/x_multiattrib.c:1725
+#: src/x_attribedit.c:377 src/x_multiattrib.c:1921
 msgid "Name:"
 msgstr "̾Á°:"
 
-#. Value entry
-#. GtkLabel
-#: ../src/x_attribedit.c:393 ../src/x_multiattrib.c:1744
+#: src/x_attribedit.c:393 src/x_multiattrib.c:1940
 msgid "Value:"
 msgstr "ÃÍ:"
 
-#. Visibility
-#. GtkButton
-#: ../src/x_attribedit.c:409 ../src/x_multiattrib.c:1781
+#: src/x_attribedit.c:409 src/x_multiattrib.c:1983
 msgid "Visible"
 msgstr "ɽ¼¨"
 
-#: ../src/x_attribedit.c:429
+#: src/x_attribedit.c:429
 msgid "Show Value Only"
 msgstr "ÃͤΤßɽ¼¨"
 
-#: ../src/x_attribedit.c:431
+#: src/x_attribedit.c:431
 msgid "Show Name Only"
 msgstr "̾Á°¤Î¤ßɽ¼¨"
 
-#: ../src/x_attribedit.c:433 ../src/x_multiattrib.c:1369
+#: src/x_attribedit.c:433 src/x_multiattrib.c:1459
 msgid "Show Name & Value"
 msgstr "̾Á°¤ÈÃͤòɽ¼¨"
 
-#. gschem specific
-#: ../src/x_attribedit.c:440
+#: src/x_attribedit.c:440
 #, fuzzy
 msgid "<b>Attach Options</b>"
 msgstr "¥ª¥×¥·¥ç¥ó"
 
-#: ../src/x_attribedit.c:455
+#: src/x_attribedit.c:455
 msgid "All"
 msgstr "¤¹¤Ù¤Æ"
 
-#. GtkTreeViewColumn
-#: ../src/x_attribedit.c:463 ../src/x_compselect.c:896
-#: ../src/x_compselect.c:1010
+#: src/x_attribedit.c:463 src/x_compselect.c:895 src/x_compselect.c:1009
 msgid "Components"
 msgstr "ÉôÉÊ"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:364
+#: src/x_attribedit.c:471 src/x_window.c:364
 msgid "Nets"
 msgstr "¥Í¥Ã¥È"
 
-#: ../src/x_attribedit.c:479
+#: src/x_attribedit.c:479
 msgid "Replace existing attributes"
 msgstr ""
 
-#: ../src/x_autonumber.c:413
+#: src/x_autonumber.c:415
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
 msgstr ""
 
-#. duplicate slot in used_slots
-#: ../src/x_autonumber.c:428
+#: src/x_autonumber.c:430
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:696
+#: src/x_autonumber.c:702
 msgid "No searchstring given in autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:748
+#: src/x_autonumber.c:754
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:883
+#: src/x_autonumber.c:889
 msgid "Diagonal"
 msgstr ""
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Top to bottom"
 msgstr ""
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Bottom to top"
 msgstr ""
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 #, fuzzy
 msgid "Left to right"
 msgstr "Ãæ±û ±¦"
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 msgid "Right to left"
 msgstr ""
 
-#: ../src/x_autonumber.c:886
+#: src/x_autonumber.c:892
 #, fuzzy
 msgid "File order"
 msgstr "±ß¥â¡¼¥É"
 
-#: ../src/x_autonumber.c:1222
+#: src/x_autonumber.c:1228
 msgid "Autonumber text"
 msgstr "¥ª¡¼¥È¥Ê¥ó¥Ð¡¼¥Æ¥­¥¹¥È"
 
-#. scope section
-#: ../src/x_autonumber.c:1246
+#: src/x_autonumber.c:1252
 msgid "<b>Scope</b>"
 msgstr ""
 
-#: ../src/x_autonumber.c:1268
+#: src/x_autonumber.c:1274
 msgid "Search for:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1282
+#: src/x_autonumber.c:1288
 #, fuzzy
 msgid "Autonumber text in:"
 msgstr "¥ª¡¼¥È¥Ê¥ó¥Ð¡¼¥Æ¥­¥¹¥È"
 
-#: ../src/x_autonumber.c:1289
+#: src/x_autonumber.c:1295
 msgid "Skip numbers found in:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
+#: src/x_autonumber.c:1307 src/x_autonumber.c:1316
 #, fuzzy
 msgid "Selected objects"
 msgstr "¸ºß¤·¤Ê¤¤¥ª¥Ö¥¸¥§¥¯¥È¤¬ÁªÂò¤µ¤ì¤Þ¤·¤¿!\n"
 
-#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
+#: src/x_autonumber.c:1308 src/x_autonumber.c:1317
 #, fuzzy
 msgid "Current page"
 msgstr "¥Æ¥¹¥È¥·¡¼¥È"
 
-#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
+#: src/x_autonumber.c:1309 src/x_autonumber.c:1318
 #, fuzzy
 msgid "Whole hierarchy"
 msgstr "³¬ÁØ"
 
-#: ../src/x_autonumber.c:1314
+#: src/x_autonumber.c:1320
 msgid "Overwrite existing numbers"
 msgstr ""
 
-#. Options section
-#: ../src/x_autonumber.c:1319
+#: src/x_autonumber.c:1325
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "¥ª¥×¥·¥ç¥ó"
 
-#: ../src/x_autonumber.c:1341
+#: src/x_autonumber.c:1347
 #, fuzzy
 msgid "Starting number:"
 msgstr "¥¹¥í¥Ã¥ÈÈÖ¹æÊÔ½¸"
 
-#: ../src/x_autonumber.c:1348
+#: src/x_autonumber.c:1354
 msgid "Sort order:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1369
+#: src/x_autonumber.c:1375
 msgid "Remove numbers"
 msgstr ""
 
-#: ../src/x_autonumber.c:1373
+#: src/x_autonumber.c:1379
 msgid "Automatic slotting"
 msgstr ""
 
-#: ../src/x_color.c:94 ../src/x_color.c:103
+#: src/x_color.c:94 src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "»ØÄê¤Ç¤­¤Ê¤¤¿§[%s]¤Ç¤¹!\n"
 
-#: ../src/x_color.c:94
+#: src/x_color.c:94
 msgid "black"
 msgstr "¹õ"
 
-#: ../src/x_color.c:103
+#: src/x_color.c:103
 msgid "white"
 msgstr "Çò"
 
-#: ../src/x_color.c:125
+#: src/x_color.c:125
 #, fuzzy, c-format
 msgid "Could not allocate display color %i!\n"
 msgstr "»ØÄê¤Ç¤­¤Ê¤¤¿§[%s]¤Ç¤¹!\n"
 
-#: ../src/x_color.c:147
+#: src/x_color.c:147
 #, fuzzy, c-format
 msgid "Could not allocate outline color %i!\n"
 msgstr "»ØÄê¤Ç¤­¤Ê¤¤¿§[%s]¤Ç¤¹!\n"
 
-#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
+#: src/x_color.c:164 src/x_color.c:181 src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "̵¸ú¤Ê¿§¤Î»ØÄê¤Ç¤¹¡£ : %d\n"
 
-#: ../src/x_color.c:214
+#: src/x_color.c:214
 #, fuzzy, c-format
 msgid "Tried to get an invalid outline color: %d\n"
 msgstr "̵¸ú¤Ê¿§¤Î»ØÄê¤Ç¤¹¡£ : %d\n"
 
-#. GtkLabel
-#: ../src/x_compselect.c:1040
+#: src/x_compselect.c:1039
 #, fuzzy
 msgid "Filter:"
 msgstr "¥Õ¥£¥ë¥¿"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
-#: ../src/x_multiattrib.c:1601
+#: src/x_compselect.c:1142 src/x_dialog.c:3776 src/x_multiattrib.c:1787
 msgid "Name"
 msgstr "̾Á°"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1152 ../src/x_multiattrib.c:1626
+#: src/x_compselect.c:1151 src/x_multiattrib.c:1811
 msgid "Value"
 msgstr "ÃÍ"
 
-#: ../src/x_compselect.c:1191
+#: src/x_compselect.c:1190
 msgid "Default behavior - reference component"
 msgstr ""
 
-#: ../src/x_compselect.c:1194
+#: src/x_compselect.c:1193
 #, fuzzy
 msgid "Embed component in schematic"
 msgstr "ÁȤ߹þ¤à"
 
-#: ../src/x_compselect.c:1197
+#: src/x_compselect.c:1196
 msgid "Include component as individual objects"
 msgstr ""
 
-#. GtkWindow
-#: ../src/x_compselect.c:1354
+#: src/x_compselect.c:1353
 msgid "Select Component..."
 msgstr "ÉôÉÊÁªÂò..."
 
-#: ../src/x_compselect.c:1377
+#: src/x_compselect.c:1376
 msgid "In Use"
 msgstr ""
 
-#: ../src/x_compselect.c:1381
+#: src/x_compselect.c:1380
 msgid "Libraries"
 msgstr "¥é¥¤¥Ö¥é¥ê"
 
-#. GtkFrame
-#: ../src/x_compselect.c:1390 ../src/x_fileselect.c:122
+#: src/x_compselect.c:1389 src/x_fileselect.c:122
 msgid "Preview"
 msgstr "¥×¥ì¥Ó¥å¡¼"
 
-#. dialog not created yet
-#: ../src/x_dialog.c:174
+#: src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "¥Æ¥­¥¹¥È..."
 
-#: ../src/x_dialog.c:205
+#: src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1582,202 +1572,193 @@ msgstr ""
 "¥¦¥£¥ó¥É¥¦Æâ¤Ç¥¯¥ê¥Ã¥¯¤¹¤ë¤È¥Æ¥­¥¹¥È¤òÇÛÃÖ¤·¤Þ¤¹¡£\n"
 "Ãæ¥Ü¥¿¥ó¤Ç²óž¤·¤Þ¤¹¡£"
 
-#: ../src/x_dialog.c:294
-#, c-format
+#: src/x_dialog.c:294
 msgid "Lower Left"
 msgstr "²¼ º¸"
 
-#: ../src/x_dialog.c:305
-#, c-format
+#: src/x_dialog.c:305
 msgid "Middle Left"
 msgstr "Ãæ±û º¸"
 
-#: ../src/x_dialog.c:316
-#, c-format
+#: src/x_dialog.c:316
 msgid "Upper Left"
 msgstr "¾å º¸"
 
-#: ../src/x_dialog.c:327
-#, c-format
+#: src/x_dialog.c:327
 msgid "Lower Middle"
 msgstr "²¼ Ãæ±û"
 
-#: ../src/x_dialog.c:338
-#, c-format
+#: src/x_dialog.c:338
 msgid "Middle Middle"
 msgstr "Ãæ±û Ãæ±û"
 
-#: ../src/x_dialog.c:349
-#, c-format
+#: src/x_dialog.c:349
 msgid "Upper Middle"
 msgstr "¾å Ãæ±û"
 
-#: ../src/x_dialog.c:360
-#, c-format
+#: src/x_dialog.c:360
 msgid "Lower Right"
 msgstr "²¼ ±¦"
 
-#: ../src/x_dialog.c:371
-#, c-format
+#: src/x_dialog.c:371
 msgid "Middle Right"
 msgstr "Ãæ±û ±¦"
 
-#: ../src/x_dialog.c:382
-#, c-format
+#: src/x_dialog.c:382
 msgid "Upper Right"
 msgstr "¾å ±¦"
 
-#: ../src/x_dialog.c:496
+#: src/x_dialog.c:496
 #, fuzzy
 msgid "Edit Text Properties"
 msgstr "¥µ¥¤¥º"
 
-#: ../src/x_dialog.c:530
+#: src/x_dialog.c:530
 #, fuzzy
 msgid "<b>Text Content</b>"
 msgstr "¥ª¥×¥·¥ç¥ó"
 
-#: ../src/x_dialog.c:562
+#: src/x_dialog.c:562
 #, fuzzy
 msgid "<b>Text Properties</b>"
 msgstr "¥ª¥×¥·¥ç¥ó"
 
-#: ../src/x_dialog.c:577
+#: src/x_dialog.c:577
 #, fuzzy
 msgid "Color:"
 msgstr "¿§"
 
-#: ../src/x_dialog.c:584
+#: src/x_dialog.c:584
 msgid "Size:"
 msgstr ""
 
-#: ../src/x_dialog.c:593
+#: src/x_dialog.c:593
 #, fuzzy
 msgid "Alignment:"
 msgstr "ÇÛÃÖ"
 
-#: ../src/x_dialog.c:647
+#: src/x_dialog.c:647
 msgid "Solid"
 msgstr "¼ÂÀþ"
 
-#: ../src/x_dialog.c:648
+#: src/x_dialog.c:648
 msgid "Dotted"
 msgstr "ÅÀÀþ"
 
-#: ../src/x_dialog.c:649
+#: src/x_dialog.c:649
 msgid "Dashed"
 msgstr "ÇËÀþ"
 
-#: ../src/x_dialog.c:650
+#: src/x_dialog.c:650
 msgid "Center"
 msgstr "Ãæ±û"
 
-#: ../src/x_dialog.c:651
+#: src/x_dialog.c:651
 msgid "Phantom"
 msgstr "¥Õ¥¡¥ó¥È¥à"
 
-#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
-#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
-#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
-#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
-#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
-#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
+#: src/x_dialog.c:652 src/x_dialog.c:749 src/x_dialog.c:758 src/x_dialog.c:767
+#: src/x_dialog.c:868 src/x_dialog.c:870 src/x_dialog.c:872
+#: src/x_dialog.c:1100 src/x_dialog.c:1203 src/x_dialog.c:1212
+#: src/x_dialog.c:1221 src/x_dialog.c:1230 src/x_dialog.c:1239
+#: src/x_dialog.c:1352 src/x_dialog.c:1354 src/x_dialog.c:1356
+#: src/x_dialog.c:1358 src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr ""
 
-#: ../src/x_dialog.c:978
+#: src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Àþ¼ï¤ÈÉýÊÔ½¸"
 
-#: ../src/x_dialog.c:1017 ../src/x_print.c:307
+#: src/x_dialog.c:1017 src/x_print.c:307
 #, fuzzy
 msgid "Type:"
 msgstr "¼ïÎà"
 
-#: ../src/x_dialog.c:1021
+#: src/x_dialog.c:1021
 #, fuzzy
 msgid "Width:"
 msgstr "Éý"
 
-#: ../src/x_dialog.c:1025
+#: src/x_dialog.c:1025
 #, fuzzy
 msgid "Dash Length:"
 msgstr "ÇËÀþ¤ÎŤµ"
 
-#: ../src/x_dialog.c:1029
+#: src/x_dialog.c:1029
 #, fuzzy
 msgid "Dash Space:"
 msgstr "ÇËÀþ¤Î´Ö³Ö"
 
-#: ../src/x_dialog.c:1096
+#: src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "¶õƶ"
 
-#: ../src/x_dialog.c:1097
+#: src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Åɤê¤Ä¤Ö¤·"
 
-#: ../src/x_dialog.c:1098
+#: src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "¥á¥Ã¥·¥å"
 
-#: ../src/x_dialog.c:1099
+#: src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "¥Ï¥Ã¥Á"
 
-#: ../src/x_dialog.c:1470
+#: src/x_dialog.c:1470
 msgid "Edit Fill Type"
 msgstr "Åɤê¤Ä¤Ö¤·¤òÊÔ½¸"
 
-#: ../src/x_dialog.c:1508
+#: src/x_dialog.c:1508
 #, fuzzy
 msgid "Fill Type:"
 msgstr "Åɤê¤Ä¤Ö¤·¼ïÎà"
 
-#: ../src/x_dialog.c:1512
+#: src/x_dialog.c:1512
 #, fuzzy
 msgid "Line Width:"
 msgstr "Àþ¤ÎÉý"
 
-#: ../src/x_dialog.c:1516
+#: src/x_dialog.c:1516
 #, fuzzy
 msgid "Angle 1:"
 msgstr "³ÑÅÙ1"
 
-#: ../src/x_dialog.c:1520
+#: src/x_dialog.c:1520
 #, fuzzy
 msgid "Pitch 1:"
 msgstr "¥Ô¥Ã¥Á1"
 
-#: ../src/x_dialog.c:1524
+#: src/x_dialog.c:1524
 #, fuzzy
 msgid "Angle 2:"
 msgstr "³ÑÅÙ2"
 
-#: ../src/x_dialog.c:1528
+#: src/x_dialog.c:1528
 #, fuzzy
 msgid "Pitch 2:"
 msgstr "¥Ô¥Ã¥Á2"
 
-#: ../src/x_dialog.c:1657
+#: src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "±ß¸Ì¥Ñ¥é¥á¡¼¥¿"
 
-#: ../src/x_dialog.c:1697
+#: src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr ""
 
-#: ../src/x_dialog.c:1705
+#: src/x_dialog.c:1705
 #, fuzzy
 msgid "Start Angle:"
 msgstr "³«»Ï³Ñ"
 
-#: ../src/x_dialog.c:1713
+#: src/x_dialog.c:1713
 #, fuzzy
 msgid "Degrees of Sweep:"
 msgstr "¥¹¥¤¡¼¥×³Ñ"
 
-#: ../src/x_dialog.c:1830
+#: src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1785,49 +1766,49 @@ msgstr ""
 "žÁ÷¤·¤Þ¤¹¤«?\n"
 "(0¤Ç¸¶ÅÀ)"
 
-#: ../src/x_dialog.c:1898
+#: src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "¥Æ¥­¥¹¥È¥µ¥¤¥º"
 
-#: ../src/x_dialog.c:1928
+#: src/x_dialog.c:1928
 #, fuzzy
 msgid "Enter new text size:"
 msgstr "¥Æ¥­¥¹¥È¥µ¥¤¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: ../src/x_dialog.c:2004
+#: src/x_dialog.c:2004
 #, fuzzy
 msgid "Snap Size"
 msgstr "¥¹¥Ê¥Ã¥×¥°¥ê¥Ã¥É"
 
-#: ../src/x_dialog.c:2034
+#: src/x_dialog.c:2034
 #, fuzzy
 msgid "Enter new snap grid spacing:"
 msgstr "¥°¥ê¥Ã¥É¥µ¥¤¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: ../src/x_dialog.c:2107
+#: src/x_dialog.c:2110
 msgid "Edit slot number"
 msgstr "¥¹¥í¥Ã¥ÈÈÖ¹æÊÔ½¸"
 
-#: ../src/x_dialog.c:2138
+#: src/x_dialog.c:2141
 #, fuzzy
 msgid "Edit slot number:"
 msgstr "¥¹¥í¥Ã¥ÈÈÖ¹æÊÔ½¸"
 
-#: ../src/x_dialog.c:2200
+#: src/x_dialog.c:2202
 msgid "About..."
 msgstr "gschem¤Ë¤Ä¤¤¤Æ..."
 
-#: ../src/x_dialog.c:2220
+#: src/x_dialog.c:2222
 #, fuzzy
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "gEDA : GPL Electronic Design Automation"
 
-#: ../src/x_dialog.c:2224
+#: src/x_dialog.c:2226
 #, fuzzy, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "gschem¥Ð¡¼¥¸¥ç¥ó%s%s.%s"
 
-#: ../src/x_dialog.c:2232
+#: src/x_dialog.c:2234
 #, fuzzy
 msgid ""
 "Written by:\n"
@@ -1840,161 +1821,160 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "¤ª¤è¤ÓÂçÀª¤Î¿Í¡¹(¥Õ¥¡¥¤¥ëAUTHORS»²¾È)"
 
-#: ../src/x_dialog.c:2295
+#: src/x_dialog.c:2297
 msgid "Coords"
 msgstr "ºÂɸ"
 
-#: ../src/x_dialog.c:2316
+#: src/x_dialog.c:2318
 msgid "Screen"
 msgstr "¥¹¥¯¥ê¡¼¥ó"
 
-#: ../src/x_dialog.c:2325
+#: src/x_dialog.c:2327
 msgid "World"
 msgstr "¥ï¡¼¥ë¥É"
 
-#: ../src/x_dialog.c:2364
+#: src/x_dialog.c:2366
 msgid "Background"
 msgstr ""
 
-#: ../src/x_dialog.c:2370
+#: src/x_dialog.c:2372
 msgid "Net endpoint"
 msgstr ""
 
-#: ../src/x_dialog.c:2373
+#: src/x_dialog.c:2375
 msgid "Graphic"
 msgstr ""
 
-#: ../src/x_dialog.c:2382
+#: src/x_dialog.c:2384
 msgid "Logic bubble"
 msgstr ""
 
-#: ../src/x_dialog.c:2385
+#: src/x_dialog.c:2387
 msgid "Grid point"
 msgstr ""
 
-#: ../src/x_dialog.c:2388
+#: src/x_dialog.c:2390
 #, fuzzy
 msgid "Detached attribute"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥ÈÄɲÃ/ÊÔ½¸"
 
-#: ../src/x_dialog.c:2391 ../src/x_window.c:382
+#: src/x_dialog.c:2393 src/x_window.c:382
 msgid "Text"
 msgstr "¥Æ¥­¥¹¥È"
 
-#: ../src/x_dialog.c:2397
+#: src/x_dialog.c:2399
 #, fuzzy
 msgid "Selection"
 msgstr "ÁªÂò"
 
-#: ../src/x_dialog.c:2400
+#: src/x_dialog.c:2402
 msgid "Bounding box"
 msgstr ""
 
-#: ../src/x_dialog.c:2403
+#: src/x_dialog.c:2405
 #, fuzzy
 msgid "Zoom box"
 msgstr "³ÈÂç"
 
-#: ../src/x_dialog.c:2412
+#: src/x_dialog.c:2414
 msgid "Output background"
 msgstr ""
 
-#: ../src/x_dialog.c:2415
+#: src/x_dialog.c:2417
 #, fuzzy
 msgid "Net junction"
 msgstr "¥¢¥¯¥·¥ç¥ó"
 
-#: ../src/x_dialog.c:2418
+#: src/x_dialog.c:2420
 msgid "Mesh grid major"
 msgstr ""
 
-#: ../src/x_dialog.c:2421
+#: src/x_dialog.c:2423
 msgid "Mesh grid minor"
 msgstr ""
 
-#: ../src/x_dialog.c:2424
+#: src/x_dialog.c:2426
 msgid "Unknown"
 msgstr ""
 
-#: ../src/x_dialog.c:2570
+#: src/x_dialog.c:2572
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr ""
 
-#: ../src/x_dialog.c:2633
+#: src/x_dialog.c:2635
 msgid "Color Edit"
 msgstr "¿§ÊÔ½¸"
 
-#: ../src/x_dialog.c:2664
+#: src/x_dialog.c:2666
 msgid "Object color:"
 msgstr ""
 
-#: ../src/x_dialog.c:2786
+#: src/x_dialog.c:2788
 #, fuzzy
 msgid "Function"
 msgstr "¥¢¥¯¥·¥ç¥ó"
 
-#: ../src/x_dialog.c:2793
+#: src/x_dialog.c:2795
 #, fuzzy
 msgid "Keystroke(s)"
 msgstr "´Ø¿ô : ¥­¡¼¥¹¥È¥í¡¼¥¯"
 
-#: ../src/x_dialog.c:3102
+#: src/x_dialog.c:3104
 #, fuzzy
 msgid "Find Text"
 msgstr "¥Æ¥­¥¹¥È¸¡º÷"
 
-#: ../src/x_dialog.c:3133
+#: src/x_dialog.c:3135
 msgid "Text to find:"
 msgstr "¸¡º÷¥Æ¥­¥¹¥È"
 
-#: ../src/x_dialog.c:3143
+#: src/x_dialog.c:3145
 msgid "descend into hierarchy"
 msgstr "²¼¤Î³¬Áؤ⸡º÷"
 
-#: ../src/x_dialog.c:3208
+#: src/x_dialog.c:3210
 #, fuzzy
 msgid "Hide Text"
 msgstr "¥Æ¥­¥¹¥È¤ò±£¤¹"
 
-#: ../src/x_dialog.c:3239
+#: src/x_dialog.c:3241
 msgid "Hide text starting with:"
 msgstr "±£¤·¥Æ¥­¥¹¥È"
 
-#: ../src/x_dialog.c:3308
+#: src/x_dialog.c:3310
 #, fuzzy
 msgid "Show Text"
 msgstr "¥Æ¥­¥¹¥Èɽ¼¨"
 
-#: ../src/x_dialog.c:3339
+#: src/x_dialog.c:3341
 msgid "Show text starting with:"
 msgstr "¥Æ¥­¥¹¥È"
 
-#: ../src/x_dialog.c:3796
+#: src/x_dialog.c:3798
 msgid "S_elect the schematics you want to save:"
 msgstr ""
 
-#: ../src/x_dialog.c:3890
+#: src/x_dialog.c:3892
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr ""
 
-#: ../src/x_dialog.c:3896
+#: src/x_dialog.c:3898
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
 msgstr ""
 
-#. secondary label
-#: ../src/x_dialog.c:3925
+#: src/x_dialog.c:3927
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr ""
 
-#: ../src/x_dialog.c:3945
+#: src/x_dialog.c:3947
 msgid "_Close without saving"
 msgstr ""
 
-#: ../src/x_dialog.c:4279
+#: src/x_dialog.c:4283
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -2005,55 +1985,55 @@ msgid ""
 "The value cannot start with a space."
 msgstr ""
 
-#: ../src/x_dialog.c:4281
+#: src/x_dialog.c:4285
 #, fuzzy
 msgid "Invalid Attribute"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥ÈÄɲÃ/ÊÔ½¸"
 
-#: ../src/x_dialog.c:4317
+#: src/x_dialog.c:4321
 #, fuzzy
 msgid "Pin type"
 msgstr "Àþ¼ï"
 
-#: ../src/x_dialog.c:4341
+#: src/x_dialog.c:4345
 #, fuzzy
 msgid "Net pin"
 msgstr "¥¢¥¯¥·¥ç¥ó"
 
-#: ../src/x_dialog.c:4343
+#: src/x_dialog.c:4347
 msgid "Bus pin (graphical)"
 msgstr ""
 
-#: ../src/x_fileselect.c:42
+#: src/x_fileselect.c:42
 #, fuzzy
 msgid "Schematics"
 msgstr "sch - ¥¹¥±¥Þ¥Á¥Ã¥¯"
 
-#: ../src/x_fileselect.c:47
+#: src/x_fileselect.c:47
 #, fuzzy
 msgid "Symbols"
 msgstr "sym - ¥·¥ó¥Ü¥ë"
 
-#: ../src/x_fileselect.c:52
+#: src/x_fileselect.c:52
 #, fuzzy
 msgid "Schematics and symbols"
 msgstr "sym/sch - ¥¹¥±¥Þ¥Á¥Ã¥¯¤È¥·¥ó¥Ü¥ë"
 
-#: ../src/x_fileselect.c:58
+#: src/x_fileselect.c:58
 #, fuzzy
 msgid "All files"
 msgstr "* - ¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë"
 
-#: ../src/x_fileselect.c:171
+#: src/x_fileselect.c:171
 msgid "Open..."
 msgstr "³«¤¯..."
 
-#: ../src/x_fileselect.c:231
+#: src/x_fileselect.c:231
 #, fuzzy
 msgid "Save as..."
 msgstr "ÊÌ̾¤ÇÊݸ..."
 
-#: ../src/x_fileselect.c:284
+#: src/x_fileselect.c:284
 #, c-format
 msgid ""
 "The selected file `%s' already exists.\n"
@@ -2061,31 +2041,30 @@ msgid ""
 "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/x_fileselect.c:287
+#: src/x_fileselect.c:287
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "¿·µ¬¥Õ¥¡¥¤¥ë"
 
-#: ../src/x_fileselect.c:289
+#: src/x_fileselect.c:289
 msgid "Save cancelled on user request\n"
 msgstr ""
 
-#. WK - catch EPS export case
-#: ../src/x_image.c:176
+#: src/x_image.c:176
 msgid "Encapsulated Postscript"
 msgstr ""
 
-#: ../src/x_image.c:296
+#: src/x_image.c:296
 #, c-format
 msgid "x_image_lowlevel: Unable to write eps file %s.\n"
 msgstr ""
 
-#: ../src/x_image.c:374
+#: src/x_image.c:374
 #, c-format
 msgid "x_image_lowlevel: Unable to write %s file %s.\n"
 msgstr ""
 
-#: ../src/x_image.c:384
+#: src/x_image.c:384
 #, c-format
 msgid ""
 "There was the following error when saving image with type %s to filename:\n"
@@ -2094,330 +2073,330 @@ msgid ""
 "%s.\n"
 msgstr ""
 
-#: ../src/x_image.c:403
+#: src/x_image.c:403
 #, c-format
 msgid "Wrote color image to [%s] [%d x %d]\n"
 msgstr "¥«¥é¡¼¥¤¥á¡¼¥¸¤ò½ÐÎϤ·¤Þ¤·¤¿¡£[%s] [%d x %d]\n"
 
-#: ../src/x_image.c:405
+#: src/x_image.c:405
 #, c-format
 msgid "Wrote black and white image to [%s] [%d x %d]\n"
 msgstr "Çò¹õ¥¤¥á¡¼¥¸¤ò½ÐÎϤ·¤Þ¤·¤¿¡£[%s] [%d x %d]\n"
 
-#: ../src/x_image.c:413
+#: src/x_image.c:413
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 msgstr ""
 
-#: ../src/x_image.c:458
+#: src/x_image.c:458
 #, fuzzy
 msgid "Width x Height"
 msgstr "Éý x ¹â¤µ"
 
-#: ../src/x_image.c:474
+#: src/x_image.c:474
 #, fuzzy
 msgid "Image type"
 msgstr "¥Ú¡¼¥¸"
 
-#: ../src/x_log.c:188
+#: src/x_log.c:188
 msgid "** Invalid UTF-8 in log message. See stderr or gschem.log.\n"
 msgstr ""
 
-#: ../src/x_log.c:256
+#: src/x_log.c:256
 msgid "Status"
 msgstr "¥¹¥Æ¡¼¥¿¥¹"
 
-#: ../src/x_menus.c:36
+#: src/x_menus.c:36
 #, fuzzy
 msgid "/Add Net"
 msgstr "¥Æ¥­¥¹¥ÈÄɲÃ..."
 
-#: ../src/x_menus.c:37
+#: src/x_menus.c:37
 #, fuzzy
 msgid "/Add Attribute..."
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥ÈÄɲÃ/ÊÔ½¸"
 
-#: ../src/x_menus.c:38
+#: src/x_menus.c:38
 #, fuzzy
 msgid "/Add Component..."
 msgstr "ÉôÉÊ..."
 
-#: ../src/x_menus.c:39
+#: src/x_menus.c:39
 #, fuzzy
 msgid "/Add Bus"
 msgstr "¥Æ¥­¥¹¥ÈÄɲÃ..."
 
-#: ../src/x_menus.c:40
+#: src/x_menus.c:40
 #, fuzzy
 msgid "/Add Text"
 msgstr "¥Æ¥­¥¹¥ÈÄɲÃ..."
 
-#: ../src/x_menus.c:42
+#: src/x_menus.c:42
 #, fuzzy
 msgid "/Zoom In"
 msgstr "³ÈÂç"
 
-#: ../src/x_menus.c:43
+#: src/x_menus.c:43
 #, fuzzy
 msgid "/Zoom Out"
 msgstr "½Ì¾®"
 
-#: ../src/x_menus.c:44
+#: src/x_menus.c:44
 #, fuzzy
 msgid "/Zoom Box"
 msgstr "³ÈÂç"
 
-#: ../src/x_menus.c:45
+#: src/x_menus.c:45
 #, fuzzy
 msgid "/Zoom Extents"
 msgstr "³ÈÂçÈÏ°Ï"
 
-#: ../src/x_menus.c:47
+#: src/x_menus.c:47
 #, fuzzy
 msgid "/Select"
 msgstr "ÁªÂò"
 
-#: ../src/x_menus.c:48
+#: src/x_menus.c:48
 #, fuzzy
 msgid "/Edit..."
 msgstr "ÊÔ½¸..."
 
-#: ../src/x_menus.c:49
+#: src/x_menus.c:49
 #, fuzzy
 msgid "/Edit pin type..."
 msgstr "Àþ¼ï¤òÊÔ½¸"
 
-#: ../src/x_menus.c:50
+#: src/x_menus.c:50
 #, fuzzy
 msgid "/Copy"
 msgstr "¥³¥Ô¡¼"
 
-#: ../src/x_menus.c:51
+#: src/x_menus.c:51
 #, fuzzy
 msgid "/Move"
 msgstr "°ÜÆ°"
 
-#: ../src/x_menus.c:52
+#: src/x_menus.c:52
 #, fuzzy
 msgid "/Delete"
 msgstr "ºï½ü"
 
-#: ../src/x_menus.c:55
+#: src/x_menus.c:55
 #, fuzzy
 msgid "/Down Schematic"
 msgstr "¥¹¥±¥Þ¥Á¥Ã¥¯¤Ø"
 
-#: ../src/x_menus.c:56
+#: src/x_menus.c:56
 #, fuzzy
 msgid "/Down Symbol"
 msgstr "¥·¥ó¥Ü¥ë¤Ø"
 
-#: ../src/x_menus.c:57
+#: src/x_menus.c:57
 #, fuzzy
 msgid "/Up"
 msgstr "¾å¤Ø"
 
-#: ../src/x_menus.c:316
+#: src/x_menus.c:319
 #, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr ""
 
-#: ../src/x_menus.c:340
+#: src/x_menus.c:343
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr ""
 
-#: ../src/x_menus.c:353
+#: src/x_menus.c:356
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 
-#. Remove this entry from all menus
-#: ../src/x_menus.c:462
+#: src/x_menus.c:436
 #, fuzzy, c-format
 msgid "Couldn't open file %s\n"
 msgstr "¤ª¤Ã¤È¡¢¥Ç¥£¥ì¥¯¥È¥ê¤¬³«¤±¤Þ¤»¤ó: %s\n"
 
-#: ../src/x_menus.c:524
+#: src/x_menus.c:493
 msgid "Clear"
 msgstr "¥¯¥ê¥¢"
 
-#: ../src/x_multiattrib.c:861
+#: src/x_multiattrib.c:913
 msgid "Attributes with empty name are not allowed. Please set a name."
 msgstr ""
 
-#: ../src/x_multiattrib.c:1371
+#: src/x_multiattrib.c:1461
 msgid "Show Value only"
 msgstr "ÃͤΤßɽ¼¨"
 
-#: ../src/x_multiattrib.c:1373
+#: src/x_multiattrib.c:1463
 msgid "Show Name only"
 msgstr "̾Á°¤Î¤ßɽ¼¨"
 
-#: ../src/x_multiattrib.c:1400
+#: src/x_multiattrib.c:1491
+msgid "Promote"
+msgstr ""
+
+#: src/x_multiattrib.c:1495
 msgid "Duplicate"
 msgstr ""
 
-#: ../src/x_multiattrib.c:1528
+#: src/x_multiattrib.c:1713
 msgid "Edit Attributes"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥ÈÊÔ½¸"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1648
+#: src/x_multiattrib.c:1831
 msgid "Vis?"
 msgstr "ɽ¼¨"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1668
+#: src/x_multiattrib.c:1849
 msgid "N"
 msgstr "̾Á°"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1688
+#: src/x_multiattrib.c:1867
 msgid "V"
 msgstr "ÃÍ"
 
-#: ../src/x_multiattrib.c:1709
+#: src/x_multiattrib.c:1889
+#, fuzzy
+msgid "Show inherited attributes"
+msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥ÈÄɲÃ/ÊÔ½¸"
+
+#: src/x_multiattrib.c:1905
 #, fuzzy
 msgid "Add Attribute"
 msgstr "¥¢¥È¥ê¥Ó¥å¡¼¥ÈÄɲÃ/ÊÔ½¸"
 
-#: ../src/x_pagesel.c:257
+#: src/x_pagesel.c:257
 msgid "Discard Page"
 msgstr "ÇË´þ"
 
-#: ../src/x_pagesel.c:376
+#: src/x_pagesel.c:376
 msgid "Page Manager"
 msgstr "¥Ú¡¼¥¸¥Þ¥Í¡¼¥¸¥ã"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:432
+#: src/x_pagesel.c:432
 msgid "Filename"
 msgstr "¥Õ¥¡¥¤¥ë̾"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:448
+#: src/x_pagesel.c:448
 #, fuzzy
 msgid "Changed"
 msgstr "Êѹ¹"
 
-#. GtkLabel
-#: ../src/x_pagesel.c:468
+#: src/x_pagesel.c:468
 msgid "Right click on the filename for more options..."
 msgstr ""
 
-#: ../src/x_preview.c:223
+#: src/x_preview.c:223
 #, fuzzy
 msgid "Preview Buffer"
 msgstr "¥Ð¥Ã¥Õ¥¡"
 
-#: ../src/x_print.c:84
+#: src/x_print.c:84
 #, fuzzy
 msgid "Select PostScript Filename..."
 msgstr "̾Á°¤òÉÕ¤±¤ÆÊݸ..."
 
-#: ../src/x_print.c:164
+#: src/x_print.c:164
 msgid "Extents with margins"
 msgstr ""
 
-#: ../src/x_print.c:170
+#: src/x_print.c:170
 msgid "Extents no margins"
 msgstr ""
 
-#: ../src/x_print.c:176
+#: src/x_print.c:176
 msgid "Current Window"
 msgstr "¸½ºß¤Î¥¦¥£¥ó¥É¥¦"
 
-#: ../src/x_print.c:210
+#: src/x_print.c:210
 msgid "Landscape"
 msgstr "¥é¥ó¥É¥¹¥±¡¼¥×"
 
-#: ../src/x_print.c:216
+#: src/x_print.c:216
 msgid "Portrait"
 msgstr "¥Ý¡¼¥È¥ì¥¤¥È"
 
-#. Upper frame
-#: ../src/x_print.c:284
+#: src/x_print.c:284
 msgid "Settings"
 msgstr ""
 
-#: ../src/x_print.c:296
+#: src/x_print.c:296
 #, fuzzy
 msgid "Output paper size:"
 msgstr "½ÐÎÏÍѻ極¥¤¥º"
 
-#: ../src/x_print.c:318
+#: src/x_print.c:318
 #, fuzzy
 msgid "Orientation:"
 msgstr "¥ª¥ê¥¨¥ó¥Æ¡¼¥·¥ç¥ó"
 
-#. Lower frame
-#: ../src/x_print.c:330
+#: src/x_print.c:330
 #, fuzzy
 msgid "Destination"
 msgstr "¥É¥­¥å¥á¥ó¥Èɽ¼¨/¸¡º÷"
 
-#: ../src/x_print.c:343
+#: src/x_print.c:343
 #, fuzzy
 msgid "File:"
 msgstr "¥Õ¥¡¥¤¥ë"
 
-#: ../src/x_print.c:373
+#: src/x_print.c:373
 msgid "Command:"
 msgstr ""
 
-#: ../src/x_print.c:741
+#: src/x_print.c:741
 msgid "No print destination specified\n"
 msgstr ""
 
-#: ../src/x_print.c:748
+#: src/x_print.c:748
 #, c-format
 msgid "Cannot print current schematic to [%s]\n"
 msgstr "¸½ºß¤Î¥¹¥±¥Þ¥Á¥Ã¥¯¤ò°õºþ¤Ç¤­¤Þ¤»¤ó¡£[%s]\n"
 
-#: ../src/x_print.c:757
+#: src/x_print.c:757
 #, c-format
 msgid ""
 "Error printing to file '%s'\n"
 "Check the log window for more information"
 msgstr ""
 
-#: ../src/x_print.c:764
+#: src/x_print.c:764
 #, c-format
 msgid "Printed current schematic to [%s]\n"
 msgstr "¸½ºß¤Î¥¹¥±¥Þ¥Á¥Ã¥¯¤ò°õºþ¤·¤Þ¤·¤¿¡£[%s]\n"
 
-#: ../src/x_window.c:81
+#: src/x_window.c:81
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr ""
 
-#: ../src/x_window.c:317
+#: src/x_window.c:317
 msgid "New file"
 msgstr "¿·µ¬¥Õ¥¡¥¤¥ë"
 
-#: ../src/x_window.c:323
+#: src/x_window.c:323
 msgid "Open"
 msgstr "³«¤¯"
 
-#: ../src/x_window.c:324
+#: src/x_window.c:324
 msgid "Open file..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯..."
 
-#: ../src/x_window.c:330
+#: src/x_window.c:330
 msgid "Save"
 msgstr "Êݸ"
 
-#: ../src/x_window.c:331
+#: src/x_window.c:331
 msgid "Save file"
 msgstr "¥Õ¥¡¥¤¥ë¤òÊݸ"
 
-#: ../src/x_window.c:339
+#: src/x_window.c:339
 msgid "Undo last operation"
 msgstr "¥¢¥ó¥É¥¥"
 
-#: ../src/x_window.c:346
+#: src/x_window.c:346
 msgid "Redo last undo"
 msgstr "¥ê¥É¥¥"
 
-#: ../src/x_window.c:355
+#: src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2429,7 +2408,7 @@ msgstr ""
 "¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢ÇÛÃÖ¤·¤Þ¤¹¡£\n"
 "±¦¥Ü¥¿¥ó¤Ç¥­¥ã¥ó¥»¥ë¤·¤Þ¤¹¡£"
 
-#: ../src/x_window.c:365
+#: src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2437,7 +2416,7 @@ msgstr ""
 "¥Í¥Ã¥ÈÄɲå⡼¥É\n"
 "±¦¥Ü¥¿¥ó¤Ç¥­¥ã¥ó¥»¥ë"
 
-#: ../src/x_window.c:375
+#: src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2445,92 +2424,91 @@ msgstr ""
 "¥Ð¥¹Äɲå⡼¥É\n"
 "±¦¥Ü¥¿¥ó¤Ç¥­¥ã¥ó¥»¥ë"
 
-#: ../src/x_window.c:383
+#: src/x_window.c:383
 msgid "Add Text..."
 msgstr "¥Æ¥­¥¹¥ÈÄɲÃ..."
 
-#: ../src/x_window.c:393
+#: src/x_window.c:393
 msgid "Select"
 msgstr "ÁªÂò"
 
-#: ../src/x_window.c:394
+#: src/x_window.c:394
 msgid "Select mode"
 msgstr "ÁªÂò¥â¡¼¥É"
 
-#: ../src/x_window.c:481
+#: src/x_window.c:481
 msgid "Pick"
 msgstr "¥Ô¥Ã¥¯"
 
-#: ../src/x_window.c:497
+#: src/x_window.c:497
 msgid "Repeat/none"
 msgstr "·«¤êÊÖ¤·/¤Ê¤·"
 
-#: ../src/x_window.c:507
+#: src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "¥á¥Ë¥å¡¼/¥­¥ã¥ó¥»¥ë"
 
-#: ../src/x_window.c:509
+#: src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "¥Ñ¥ó/¥­¥ã¥ó¥»¥ë"
 
-#: ../src/x_window.c:733
+#: src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "¥¹¥±¥Þ¥Á¥Ã¥¯¤òÆɤ߹þ¤ó¤Ç¤¤¤Þ¤¹¡£[%s]\n"
 
-#: ../src/x_window.c:745
+#: src/x_window.c:745
 #, fuzzy
 msgid "Failed to load file"
 msgstr "½é´ü²½scm¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¡£[%s]\n"
 
-#: ../src/x_window.c:754
+#: src/x_window.c:754
 #, fuzzy, c-format
 msgid "New file [%s]\n"
 msgstr "¿·µ¬¥Õ¥¡¥¤¥ë"
 
-#. an error occured when saving page to file
-#: ../src/x_window.c:859
+#: src/x_window.c:859
 #, fuzzy, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Êݸ¤Ç¤­¤Þ¤»¤ó¡£[%s]\n"
 
-#: ../src/x_window.c:860
+#: src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "ÊݸÃæ¤Ë¥¨¥é¡¼È¯À¸"
 
-#: ../src/x_window.c:869
+#: src/x_window.c:869
 #, fuzzy, c-format
 msgid "Saved as [%s]\n"
 msgstr "[%s]¤È¤·¤ÆÊݸ¤·¤Þ¤·¤¿¡£\n"
 
-#: ../src/x_window.c:871
+#: src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Êݸ¤·¤Þ¤·¤¿¡£[%s]\n"
 
-#: ../src/x_window.c:873
+#: src/x_window.c:873
 msgid "Saved"
 msgstr "Êݸ¤·¤Þ¤·¤¿¡£"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "¥Ú¡¼¥¸¤òÇË´þ¤·¤Æ¤¤¤Þ¤¹¡£[%s]\n"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "ÊĤ¸¤Æ¤¤¤Þ¤¹¡£[%s]\n"
 
-#: ../data/geda-gschem.desktop.in.h:1
-msgid "Create and edit electrical schematics and symbols with gschem"
-msgstr ""
-
-#: ../data/geda-gschem.desktop.in.h:2
+#: data/geda-gschem.desktop.in.h:3
 #, fuzzy
 msgid "gEDA Schematic Editor"
 msgstr "¥¹¥±¥Þ¥Á¥Ã¥¯¤Ø"
 
+#: data/geda-gschem.desktop.in.h:4
+msgid "Create and edit electrical schematics and symbols with gschem"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Cut Buffer"
 #~ msgstr "¥Ð¥Ã¥Õ¥¡"
diff --git a/gschem/po/nl.po b/gschem/po/nl.po
index de049c6..6c0ecf7 100644
--- a/gschem/po/nl.po
+++ b/gschem/po/nl.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geda-gschem\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 14:35-0400\n"
+"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
+"POT-Creation-Date: 2009-06-18 11:53+0100\n"
 "PO-Revision-Date: 2009-01-02 07:40+0100\n"
 "Last-Translator: Bert Timmerman <bert.timmerman@xxxxxxxxx>\n"
 "Language-Team: geda-dev@xxxxxxxxxxxxxx\n"
@@ -14,617 +14,607 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/rcstrings.c:2
+#: src/rcstrings.c:2
 msgid "File"
 msgstr "Bestand"
 
-#: ../src/rcstrings.c:3
+#: src/rcstrings.c:3
 msgid "New Window"
 msgstr "Nieuw venster"
 
-#: ../src/rcstrings.c:4 ../src/x_pagesel.c:252
+#: src/rcstrings.c:4 src/x_pagesel.c:252
 msgid "New Page"
 msgstr "Nieuwe pagina"
 
-#: ../src/rcstrings.c:5 ../src/x_pagesel.c:253
+#: src/rcstrings.c:5 src/x_pagesel.c:253
 msgid "Open Page..."
 msgstr "Open pagina..."
 
-#: ../src/rcstrings.c:6 ../src/x_pagesel.c:256
+#: src/rcstrings.c:6 src/x_pagesel.c:256
 msgid "Close Page"
 msgstr "Sluit pagina"
 
-#: ../src/rcstrings.c:7
+#: src/rcstrings.c:7
 msgid "Revert Page"
 msgstr "Terughalen pagina"
 
-#: ../src/rcstrings.c:8 ../src/x_pagesel.c:255
+#: src/rcstrings.c:8 src/x_pagesel.c:255
 msgid "Save Page"
 msgstr "Opslaan pagina"
 
-#: ../src/rcstrings.c:9
+#: src/rcstrings.c:9
 msgid "Save Page As..."
 msgstr "Opslaan Pagina Als..."
 
-#: ../src/rcstrings.c:10
+#: src/rcstrings.c:10
 msgid "Save All"
 msgstr "Alles Opslaan"
 
-#. GtkWindow
-#: ../src/rcstrings.c:11 ../src/x_print.c:276
+#: src/rcstrings.c:11 src/x_print.c:276
 msgid "Print..."
 msgstr "Afdrukken..."
 
-#. Create the dialog
-#: ../src/rcstrings.c:12 ../src/x_image.c:495
+#: src/rcstrings.c:12 src/x_image.c:495
 msgid "Write image..."
 msgstr "Schrijf Afbeelding..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:501
+#: src/rcstrings.c:13
 msgid "Recent files"
 msgstr "Recente bestanden"
 
-#: ../src/rcstrings.c:14 ../src/x_script.c:47
+#: src/rcstrings.c:14 src/x_script.c:47
 msgid "Execute Script..."
 msgstr "Script Uitvoeren..."
 
-#: ../src/rcstrings.c:15
+#: src/rcstrings.c:15
 msgid "Close Window"
 msgstr "Sluit venster"
 
-#: ../src/rcstrings.c:16
+#: src/rcstrings.c:16
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
+#: src/rcstrings.c:18 src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Bewerk"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:338
+#: src/rcstrings.c:19 src/x_window.c:338
 msgid "Undo"
 msgstr "Ongedaan maken"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:345
+#: src/rcstrings.c:20 src/x_window.c:345
 msgid "Redo"
 msgstr "Herstel"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
+#: src/rcstrings.c:21 src/i_basic.c:77 src/x_window.c:521
 msgid "Select Mode"
 msgstr "Selectie Mode"
 
-#: ../src/rcstrings.c:22
+#: src/rcstrings.c:22
 #, fuzzy
 msgid "Cut"
 msgstr "Knip 1"
 
-#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
-#: ../src/i_callbacks.c:560
+#: src/rcstrings.c:23 src/i_basic.c:135 src/i_callbacks.c:536
+#: src/i_callbacks.c:560
 msgid "Copy"
 msgstr "Kopieer"
 
-#: ../src/rcstrings.c:24
+#: src/rcstrings.c:24
 #, fuzzy
 msgid "Paste"
 msgstr "Plak 1"
 
-#: ../src/rcstrings.c:25
+#: src/rcstrings.c:25
 msgid "Edit..."
 msgstr "Bewerk..."
 
-#: ../src/rcstrings.c:26
+#: src/rcstrings.c:26
 msgid "Edit Text..."
 msgstr "Bewerk Tekst..."
 
-#: ../src/rcstrings.c:27 ../src/i_basic.c:84
+#: src/rcstrings.c:27 src/i_basic.c:84
 msgid "Copy Mode"
 msgstr "Kopieer Mode"
 
-#: ../src/rcstrings.c:28 ../src/i_basic.c:142
+#: src/rcstrings.c:28 src/i_basic.c:142
 msgid "Multiple Copy Mode"
 msgstr "Meervoudige Kopieer Mode"
 
-#: ../src/rcstrings.c:29 ../src/i_basic.c:87
+#: src/rcstrings.c:29 src/i_basic.c:87
 msgid "Move Mode"
 msgstr "Verplaats Mode"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
+#: src/rcstrings.c:30 src/i_callbacks.c:670 src/x_multiattrib.c:1496
 msgid "Delete"
 msgstr "Verwijder"
 
-#: ../src/rcstrings.c:31
+#: src/rcstrings.c:31
 msgid "Rotate 90 Mode"
 msgstr "Rotatie 90 Mode"
 
-#: ../src/rcstrings.c:32 ../src/i_basic.c:91
+#: src/rcstrings.c:32 src/i_basic.c:91
 msgid "Mirror Mode"
 msgstr "Spiegel Mode"
 
-#: ../src/rcstrings.c:33
+#: src/rcstrings.c:33
 msgid "Slot..."
 msgstr "Slot..."
 
-#: ../src/rcstrings.c:34
+#: src/rcstrings.c:34
 msgid "Color..."
 msgstr "Kleur..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
+#: src/rcstrings.c:35 src/i_callbacks.c:920 src/x_dialog.c:2411
 msgid "Lock"
 msgstr "Vergrendel"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
+#: src/rcstrings.c:36 src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "Ontgrendel"
 
-#: ../src/rcstrings.c:37
+#: src/rcstrings.c:37
 msgid "Line Width & Type..."
 msgstr "Lijn Dikte & Type..."
 
-#: ../src/rcstrings.c:38
+#: src/rcstrings.c:38
 msgid "Fill Type..."
 msgstr "Arcering Type..."
 
-#: ../src/rcstrings.c:39
+#: src/rcstrings.c:39
 msgid "Symbol Translate..."
 msgstr "Verplaats Symbool..."
 
-#: ../src/rcstrings.c:40
+#: src/rcstrings.c:40
 msgid "Embed Component/Picture"
 msgstr "Component/Afbeelding Insluiten"
 
-#: ../src/rcstrings.c:41
+#: src/rcstrings.c:41
 msgid "Unembed Component/Picture"
 msgstr "Component/Afbeelding Uitsluiten"
 
-#: ../src/rcstrings.c:42
+#: src/rcstrings.c:42
 msgid "Update Component"
 msgstr "Hernieuw Component"
 
-#: ../src/rcstrings.c:43
+#: src/rcstrings.c:43
 msgid "Show/Hide Inv Text"
 msgstr "Zichtbaar/Verborgen Onzichtbare Tekst"
 
-#: ../src/rcstrings.c:44
+#: src/rcstrings.c:44
 msgid "Make Inv Text Vis"
 msgstr "Maak Onzichtbare Tekst Zichtbaar"
 
-#: ../src/rcstrings.c:46
+#: src/rcstrings.c:46
 msgid "Buffer"
 msgstr "Buffer"
 
-#: ../src/rcstrings.c:47
+#: src/rcstrings.c:47
 msgid "Copy into 1"
 msgstr "Kopieer naar 1"
 
-#: ../src/rcstrings.c:48
+#: src/rcstrings.c:48
 msgid "Copy into 2"
 msgstr "Kopieer naar 2"
 
-#: ../src/rcstrings.c:49
+#: src/rcstrings.c:49
 msgid "Copy into 3"
 msgstr "Kopieer naar 3"
 
-#: ../src/rcstrings.c:50
+#: src/rcstrings.c:50
 msgid "Copy into 4"
 msgstr "Kopieer naar 4"
 
-#: ../src/rcstrings.c:51
+#: src/rcstrings.c:51
 msgid "Copy into 5"
 msgstr "Kopieer naar 5"
 
-#: ../src/rcstrings.c:52
+#: src/rcstrings.c:52
 msgid "Cut into 1"
 msgstr "Knip naar 1"
 
-#: ../src/rcstrings.c:53
+#: src/rcstrings.c:53
 msgid "Cut into 2"
 msgstr "Knip naar 2"
 
-#: ../src/rcstrings.c:54
+#: src/rcstrings.c:54
 msgid "Cut into 3"
 msgstr "Knip naar 3"
 
-#: ../src/rcstrings.c:55
+#: src/rcstrings.c:55
 msgid "Cut into 4"
 msgstr "Knip naar 4"
 
-#: ../src/rcstrings.c:56
+#: src/rcstrings.c:56
 msgid "Cut into 5"
 msgstr "Knip naar 5"
 
-#: ../src/rcstrings.c:57
+#: src/rcstrings.c:57
 msgid "Paste from 1"
 msgstr "Plak vanuit 1"
 
-#: ../src/rcstrings.c:58
+#: src/rcstrings.c:58
 msgid "Paste from 2"
 msgstr "Plak vanuit 2"
 
-#: ../src/rcstrings.c:59
+#: src/rcstrings.c:59
 msgid "Paste from 3"
 msgstr "Plak vanuit 3"
 
-#: ../src/rcstrings.c:60
+#: src/rcstrings.c:60
 msgid "Paste from 4"
 msgstr "Plak vanuit 4"
 
-#: ../src/rcstrings.c:61
+#: src/rcstrings.c:61
 msgid "Paste from 5"
 msgstr "Plak vanuit 5"
 
-#: ../src/rcstrings.c:63
+#: src/rcstrings.c:63
 msgid "View"
 msgstr "Toon"
 
-#: ../src/rcstrings.c:64
+#: src/rcstrings.c:64
 msgid "Redraw"
 msgstr "Hertekenen"
 
-#. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
+#: src/rcstrings.c:65 src/i_callbacks.c:1474 src/i_callbacks.c:1546
 msgid "Pan"
 msgstr "Schuif"
 
-#: ../src/rcstrings.c:66 ../src/i_basic.c:95
+#: src/rcstrings.c:66 src/i_basic.c:95
 msgid "Zoom Box"
 msgstr "Vergroot Venster"
 
-#: ../src/rcstrings.c:67
+#: src/rcstrings.c:67
 msgid "Zoom Extents"
 msgstr "Toon Alles"
 
-#: ../src/rcstrings.c:68
+#: src/rcstrings.c:68
 msgid "Zoom In"
 msgstr "Vergroot"
 
-#: ../src/rcstrings.c:69
+#: src/rcstrings.c:69
 msgid "Zoom Out"
 msgstr "Verklein"
 
-#: ../src/rcstrings.c:70
+#: src/rcstrings.c:70
 msgid "Zoom Full"
 msgstr "Toon Maximaal"
 
-#: ../src/rcstrings.c:71
+#: src/rcstrings.c:71
 msgid "Dark color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:72
+#: src/rcstrings.c:72
 msgid "Light color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:74
+#: src/rcstrings.c:74
 msgid "Page"
 msgstr "Pagina"
 
-#: ../src/rcstrings.c:75
+#: src/rcstrings.c:75
 msgid "Manager..."
 msgstr "Manager..."
 
-#: ../src/rcstrings.c:76
+#: src/rcstrings.c:76
 msgid "Next"
 msgstr "Volgende"
 
-#: ../src/rcstrings.c:77
+#: src/rcstrings.c:77
 msgid "Previous"
 msgstr "Vorige"
 
-#: ../src/rcstrings.c:78 ../src/x_window.c:316
+#: src/rcstrings.c:78 src/x_window.c:316
 msgid "New"
 msgstr "Nieuw"
 
-#: ../src/rcstrings.c:79
+#: src/rcstrings.c:79
 msgid "Revert"
 msgstr "Terughalen"
 
-#: ../src/rcstrings.c:80
+#: src/rcstrings.c:80
 msgid "Close"
 msgstr "Sluit"
 
-#: ../src/rcstrings.c:81
+#: src/rcstrings.c:81
 msgid "Discard"
 msgstr "Wegdoen"
 
-#: ../src/rcstrings.c:83
+#: src/rcstrings.c:83
 msgid "Add"
 msgstr "Toevoegen"
 
-#: ../src/rcstrings.c:84
+#: src/rcstrings.c:84
 msgid "Component..."
 msgstr "Component..."
 
-#. need to click
-#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
-#: ../src/x_dialog.c:2376
+#: src/rcstrings.c:85 src/i_callbacks.c:2401 src/i_callbacks.c:2428
+#: src/x_dialog.c:2378
 msgid "Net"
 msgstr "Draad"
 
-#. need to click
-#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
-#: ../src/x_dialog.c:2394 ../src/x_window.c:374
+#: src/rcstrings.c:86 src/i_callbacks.c:2472 src/i_callbacks.c:2499
+#: src/x_dialog.c:2396 src/x_window.c:374
 msgid "Bus"
 msgstr "Bus"
 
-#: ../src/rcstrings.c:87
+#: src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "Attribuut..."
 
-#: ../src/rcstrings.c:88
+#: src/rcstrings.c:88
 msgid "Text..."
 msgstr "Tekst..."
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
+#: src/rcstrings.c:89 src/i_callbacks.c:2580 src/i_callbacks.c:2603
 msgid "Line"
 msgstr "Lijn"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
+#: src/rcstrings.c:90 src/i_callbacks.c:2625 src/i_callbacks.c:2648
 msgid "Box"
 msgstr "Rechthoek"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
+#: src/rcstrings.c:91 src/i_callbacks.c:2704 src/i_callbacks.c:2728
 msgid "Circle"
 msgstr "Cirkel"
 
-#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
+#: src/rcstrings.c:92 src/i_callbacks.c:2750 src/i_callbacks.c:2773
 msgid "Arc"
 msgstr "Boog"
 
-#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
-#: ../src/x_dialog.c:2367
+#: src/rcstrings.c:93 src/i_callbacks.c:2795 src/i_callbacks.c:2818
+#: src/x_dialog.c:2369
 msgid "Pin"
 msgstr "Pen"
 
-#: ../src/rcstrings.c:94
+#: src/rcstrings.c:94
 msgid "Picture..."
 msgstr "Afbeelding..."
 
-#: ../src/rcstrings.c:96
+#: src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "Hierarchie"
 
-#: ../src/rcstrings.c:97
+#: src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "Naar Schema"
 
-#: ../src/rcstrings.c:98
+#: src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "Naar Symbool"
 
-#: ../src/rcstrings.c:99
+#: src/rcstrings.c:99
 msgid "Up"
 msgstr "Omhoog"
 
-#: ../src/rcstrings.c:100
+#: src/rcstrings.c:100
 msgid "Documentation"
 msgstr "Documentatie"
 
-#. GtkFrame
-#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
-#: ../src/x_multiattrib.c:1543
+#: src/rcstrings.c:102 src/x_compselect.c:1417
 msgid "Attributes"
 msgstr "Attributen"
 
-#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
+#: src/rcstrings.c:103 src/i_callbacks.c:3089
 msgid "Attach"
 msgstr "Vastmaken"
 
-#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
+#: src/rcstrings.c:104 src/i_callbacks.c:3136
 msgid "Detach"
 msgstr "Losmaken"
 
-#: ../src/rcstrings.c:105
+#: src/rcstrings.c:105
 msgid "Show Value"
 msgstr "Toon Waarde"
 
-#: ../src/rcstrings.c:106
+#: src/rcstrings.c:106
 msgid "Show Name"
 msgstr "Toon Naam"
 
-#: ../src/rcstrings.c:107
+#: src/rcstrings.c:107
 msgid "Show Both"
 msgstr "Toon Beide"
 
-#: ../src/rcstrings.c:108
+#: src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "Schakel Zichtbaarheid"
 
-#: ../src/rcstrings.c:109
+#: src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "Vind Specifieke Tekst..."
 
-#: ../src/rcstrings.c:110
+#: src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "Verberg Specifike Tekst..."
 
-#: ../src/rcstrings.c:111
+#: src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "Toon Specifieke Tekst..."
 
-#: ../src/rcstrings.c:112
+#: src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr "Automatisch Tekst Nummeren..."
 
-#: ../src/rcstrings.c:114
+#: src/rcstrings.c:114
 msgid "Options"
 msgstr "Opties"
 
-#: ../src/rcstrings.c:115
+#: src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "Tekst Hoogte..."
 
-#: ../src/rcstrings.c:116
+#: src/rcstrings.c:116
 msgid "Cycle grid styles"
 msgstr ""
 
-#: ../src/rcstrings.c:117
+#: src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr "Schakel Snap Aan/Uit"
 
-#: ../src/rcstrings.c:118
+#: src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "Snap Grid Afstand..."
 
-#: ../src/rcstrings.c:119
+#: src/rcstrings.c:119
 msgid "Scale up Grid Spacing"
 msgstr "Omhoog schalen Grid Afstand"
 
-#: ../src/rcstrings.c:120
+#: src/rcstrings.c:120
 msgid "Scale down Grid Spacing"
 msgstr "Omlaag schalen Snap Grid Afstand"
 
-#: ../src/rcstrings.c:121
+#: src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr "Schakel Contour/Rechthoek"
 
-#: ../src/rcstrings.c:122
+#: src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr "Schakel Draad Elastiekband"
 
-#: ../src/rcstrings.c:123
+#: src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "Toon Logboek venster..."
 
-#: ../src/rcstrings.c:124
+#: src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "Toon Coordinaten venster..."
 
-#: ../src/rcstrings.c:126
+#: src/rcstrings.c:126
 msgid "Help"
 msgstr "Help"
 
-#: ../src/rcstrings.c:127
+#: src/rcstrings.c:127
 msgid "Manual"
 msgstr "Handleiding"
 
-#: ../src/rcstrings.c:128
+#: src/rcstrings.c:128
 msgid "gEDA Documentation"
 msgstr "gEDA Documentatie"
 
-#: ../src/rcstrings.c:129
+#: src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr "gschem FAQ"
 
-#: ../src/rcstrings.c:130
+#: src/rcstrings.c:130
 msgid "Component Documentation"
 msgstr "Component Documentatie"
 
-#: ../src/rcstrings.c:131
+#: src/rcstrings.c:131
 msgid "About gschem"
 msgstr "Over gschem"
 
-#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
+#: src/rcstrings.c:132 src/x_dialog.c:2724
 msgid "Hotkeys"
 msgstr "Sneltoets"
 
-#: ../src/a_zoom.c:212
+#: src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Vergroting te klein! Kan niet verder vergroten.\n"
 
-#. Fork failed. Still in parent process, so can use the log
-#. * window
-#: ../src/g_funcs.c:339 ../src/i_callbacks.c:68
+#: src/g_funcs.c:339 src/i_callbacks.c:68
 #, c-format
 msgid "Could not fork\n"
 msgstr "Kan niet afsplitsen\n"
 
-#. if we return, then nothing happened
-#: ../src/g_funcs.c:355 ../src/i_callbacks.c:78
+#: src/g_funcs.c:355 src/i_callbacks.c:78
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr "Kan %s niet aanroepen\n"
 
-#: ../src/g_funcs.c:361 ../src/i_callbacks.c:82
+#: src/g_funcs.c:361 src/i_callbacks.c:82
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Documentatie opdrachten niet ondersteund bij MinGW.\n"
 
-#: ../src/g_rc.c:292
+#: src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Ongeldige vergrotingsfactor [%d] overgedragen aan %s\n"
 
-#: ../src/g_rc.c:418
+#: src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Ongeldige waarde [%d] overgedragen aan text-size\n"
 
-#: ../src/g_rc.c:445
+#: src/g_rc.c:445
 #, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "Ongeldige waarde [%f] overgedragen aan postscript-font-scale\n"
 
-#: ../src/g_rc.c:488
+#: src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Ongeldige waarde [%d] overgedragen aan snap-size\n"
 
-#: ../src/g_rc.c:960
+#: src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "Ongeldige num niveaus [%d] overgedragen naar undo-levels\n"
 
-#: ../src/g_rc.c:1218
+#: src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "Ongeldige afmeting [%d] overgedragen aan bus-ripper-size\n"
 
-#: ../src/g_rc.c:1293
+#: src/g_rc.c:1293
 #, fuzzy, c-format
 msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr "Ongeldige beeldpunt afmeting [%d] overgedragen aan grid-dot-size\n"
 
-#: ../src/g_rc.c:1334
+#: src/g_rc.c:1334
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 msgstr ""
 "Ongeldige beeldpunt ruimte [%d] overgedragen aan grid-fixed-threshold\n"
 
-#: ../src/g_rc.c:1360
+#: src/g_rc.c:1360
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 msgstr ""
 "Ongeldige beeldpunt ruimte [%d] overgedragen aan grid-fixed-threshold\n"
 
-#: ../src/g_rc.c:1404
+#: src/g_rc.c:1404
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "Ongeldige offset waarde [%d] overgedragen aan add-attribute-offset\n"
 
-#: ../src/g_rc.c:1428
+#: src/g_rc.c:1428
 #, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr "Ongeldig aantal seconden [%d] overgedragen naar auto-save-interval\n"
 
-#: ../src/g_rc.c:1469
+#: src/g_rc.c:1469
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Ongeldige versterking [%d] overgedragen aan mousepan-gain\n"
 
-#: ../src/g_rc.c:1492
+#: src/g_rc.c:1492
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Ongeldige versterking [%d] overgedragen aan keyboardpan-gain\n"
 
-#: ../src/g_rc.c:1538
+#: src/g_rc.c:1538
 #, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr ""
 "Ongeldig aantal beeldpunten [%d] overgedragen aan select-slack-pixels\n"
 
-#: ../src/g_rc.c:1564
+#: src/g_rc.c:1564
 #, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "Ongeldige versterking [%d] overgedragen aan zoom-gain\n"
 
-#: ../src/g_rc.c:1589
+#: src/g_rc.c:1589
 #, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr "Ongeldig aantal stappen [%d] scrollpan-steps\n"
 
-#: ../src/gschem.c:183 ../src/gschem.c:194
+#: src/gschem.c:183 src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem versie %s%s.%s\n"
 
-#: ../src/gschem.c:186 ../src/gschem.c:197
+#: src/gschem.c:186 src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -633,7 +623,7 @@ msgstr ""
 "gEDA/gschem komt ABSOLUUT ZONDER GARANTIE; zie het COPYING bestand voor meer "
 "informatie.\n"
 
-#: ../src/gschem.c:188 ../src/gschem.c:199
+#: src/gschem.c:188 src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -641,7 +631,7 @@ msgstr ""
 "Dit is vrije software, en je wordt aangemoedigt dit te herdistribueren onder "
 "bepaalde\n"
 
-#: ../src/gschem.c:190 ../src/gschem.c:201
+#: src/gschem.c:190 src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -650,17 +640,17 @@ msgstr ""
 "condities; zie het COPYING bestand voor meer informatie.\n"
 "\n"
 
-#: ../src/gschem.c:205
+#: src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "Dit is de MINGW32 versie.\n"
 
-#: ../src/gschem.c:209
+#: src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Huidige locale instellingen: %s\n"
 
-#: ../src/gschem.c:224
+#: src/gschem.c:224
 msgid ""
 "You must set the GEDADATA environment variable!\n"
 "\n"
@@ -668,222 +658,244 @@ msgid ""
 "environment variable to point to the correct location.\n"
 msgstr ""
 
-#: ../src/gschem.c:251
+#: src/gschem.c:251
 #, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "Kan init scm bestand [%s]niet vinden\n"
 
-#: ../src/gschem.c:255
+#: src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Lees init scm bestand [%s]\n"
 
-#. ! \todo These two messages are the same. Should be
-#. * integrated.
-#: ../src/gschem.c:259
+#: src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Fout bij het lezen van het init scm bestand [%s]\n"
 
-#: ../src/gschem.c:320
+#: src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Scheme bestandenmap is NIET ingesteld!\n"
 
-#: ../src/gschem.c:327 ../src/x_script.c:66
+#: src/gschem.c:327 src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Bezig met uitvoeren van guile script [%s]\n"
 
-#: ../src/gschem_cairo.c:310
+#: src/gschem_accel_label.c:319
+msgid "Accelerator Closure"
+msgstr ""
+
+#: src/gschem_accel_label.c:320
+msgid "The closure to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:326
+msgid "Accelerator Widget"
+msgstr ""
+
+#: src/gschem_accel_label.c:327
+msgid "The widget to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:333
+msgid "Accelerator String"
+msgstr ""
+
+#: src/gschem_accel_label.c:334
+msgid "The accelerator string to be displayed"
+msgstr ""
+
+#: src/gschem_cairo.c:310
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "Onbekend einde voor lijn (%d)\n"
 
-#: ../src/gschem_cairo.c:318
+#: src/gschem_cairo.c:318
 #, fuzzy, c-format
 msgid "Unknown type for stroke (%d) !\n"
 msgstr "Onbekend type voor lijn (%d)!\n"
 
-#: ../src/i_basic.c:79
+#: src/i_basic.c:79
 msgid "Component Mode"
 msgstr "Component Mode"
 
-#: ../src/i_basic.c:81
+#: src/i_basic.c:81
 msgid "Text Mode"
 msgstr "Tekst Mode"
 
-#: ../src/i_basic.c:89
+#: src/i_basic.c:89
 msgid "Rotate Mode"
 msgstr "Rotatie Mode"
 
-#: ../src/i_basic.c:99
+#: src/i_basic.c:99
 msgid "Pan Mode"
 msgstr "Schuif Mode"
 
-#: ../src/i_basic.c:103
+#: src/i_basic.c:103
 #, c-format
 msgid "Paste %d Mode"
 msgstr "Plak %d Mode"
 
-#: ../src/i_basic.c:109
+#: src/i_basic.c:109
 msgid "Magnetic Net Mode"
 msgstr "Magnetische Net Mode"
 
-#: ../src/i_basic.c:111
+#: src/i_basic.c:111
 msgid "Net Mode"
 msgstr "Net Mode"
 
-#: ../src/i_basic.c:115
+#: src/i_basic.c:115
 msgid "Bus Mode"
 msgstr "Bus Mode"
 
-#: ../src/i_basic.c:118
+#: src/i_basic.c:118
 msgid "Line Mode"
 msgstr "Lijn Mode"
 
-#: ../src/i_basic.c:121
+#: src/i_basic.c:121
 msgid "Box Mode"
 msgstr "Rechthoek Mode"
 
-#: ../src/i_basic.c:124
+#: src/i_basic.c:124
 msgid "Picture Mode"
 msgstr "Afbeelding Mode"
 
-#: ../src/i_basic.c:127
+#: src/i_basic.c:127
 msgid "Circle Mode"
 msgstr "Cirkel Mode"
 
-#: ../src/i_basic.c:130
+#: src/i_basic.c:130
 msgid "Arc Mode"
 msgstr "Boog Mode"
 
-#: ../src/i_basic.c:133
+#: src/i_basic.c:133
 msgid "Pin Mode"
 msgstr "Pen Mode"
 
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
+#: src/i_basic.c:137 src/i_callbacks.c:626 src/i_callbacks.c:650
 msgid "Move"
 msgstr "Verplaats"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
+#: src/i_basic.c:139 src/i_callbacks.c:581 src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Meervoudig Kopieren"
 
-#: ../src/i_basic.c:168
+#: src/i_basic.c:168
 msgid "Show Hidden"
 msgstr "Zichtbaar Verborgen"
 
-#: ../src/i_basic.c:171
+#: src/i_basic.c:171
 msgid "Snap Off"
 msgstr "Snap Aan"
 
-#: ../src/i_basic.c:173
+#: src/i_basic.c:173
 msgid "Resnap Active"
 msgstr ""
 
-#: ../src/i_basic.c:254 ../src/x_window.c:495
+#: src/i_basic.c:254 src/x_window.c:495
 msgid "Action"
 msgstr "Aktie"
 
-#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
+#: src/i_basic.c:260 src/x_dialog.c:2408 src/x_window.c:490
 msgid "Stroke"
 msgstr "Slag"
 
-#: ../src/i_basic.c:266 ../src/x_window.c:492
+#: src/i_basic.c:266 src/x_window.c:492
 msgid "none"
 msgstr "geen"
 
-#: ../src/i_basic.c:271
+#: src/i_basic.c:271
 msgid "Repeat/"
 msgstr "Herhaal/"
 
-#: ../src/i_basic.c:549 ../src/i_basic.c:563
+#: src/i_basic.c:549 src/i_basic.c:563
 msgid "OFF"
 msgstr "UIT"
 
-#: ../src/i_basic.c:567
+#: src/i_basic.c:567
 msgid "NONE"
 msgstr ""
 
-#: ../src/i_basic.c:572
+#: src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr "Raster(%s, %s)"
 
-#: ../src/i_callbacks.c:63
+#: src/i_callbacks.c:63
 #, c-format
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentatie voor [%s,%s,%s,%s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
+#: src/i_callbacks.c:123 src/i_callbacks.c:1705
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Nieuwe pagina gemaakt [%s]\n"
 
-#: ../src/i_callbacks.c:163
+#: src/i_callbacks.c:163
 #, c-format
 msgid "New Window created [%s]\n"
 msgstr "Nieuw venster gemaakt [%s]\n"
 
-#: ../src/i_callbacks.c:281
+#: src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "Fout tijdens Alles Opslaan"
 
-#: ../src/i_callbacks.c:283
+#: src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Alles Opgeslagen"
 
-#: ../src/i_callbacks.c:373
+#: src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "Sluit Venster\n"
 
-#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
+#: src/i_callbacks.c:541 src/i_callbacks.c:586 src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "Selecteer voorwerpen eerst"
 
-#: ../src/i_callbacks.c:710
+#: src/i_callbacks.c:710
 #, fuzzy
 msgid "Edit pin type"
 msgstr "Bewerk Lijn Type"
 
-#: ../src/i_callbacks.c:729
+#: src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Bewerk Tekst"
 
-#: ../src/i_callbacks.c:752
+#: src/i_callbacks.c:752
 msgid "Slot"
 msgstr "Slot"
 
-#: ../src/i_callbacks.c:769
+#: src/i_callbacks.c:769
 msgid "Color"
 msgstr "Kleur"
 
-#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
+#: src/i_callbacks.c:806 src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Roteer"
 
-#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
+#: src/i_callbacks.c:874 src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Spiegel"
 
-#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
+#: src/i_callbacks.c:956 src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Verplaats"
 
-#: ../src/i_callbacks.c:959
+#: src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "WAARSCHUWING: Niet verplaatsen met snap uit!\n"
 
-#: ../src/i_callbacks.c:960
+#: src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr "WAARSCHUWING: Zet snap aan en vervolg de verplaatsing.\n"
 
-#: ../src/i_callbacks.c:967
+#: src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "WAARSCHUWING: Snap grid waarde is niet gelijk aan 100!\n"
 
-#: ../src/i_callbacks.c:969
+#: src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -891,145 +903,144 @@ msgstr ""
 "WAARSCHUWING: Als je een symbool naar de oorsprong verschuift, dan moet de "
 "snap grip waarde op 100 gezet worden\n"
 
-#: ../src/i_callbacks.c:1000
+#: src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "Insluiten"
 
-#: ../src/i_callbacks.c:1041
+#: src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "Uitsluiten"
 
-#: ../src/i_callbacks.c:1084
+#: src/i_callbacks.c:1085
 msgid "Update"
 msgstr "Vernieuw"
 
-#: ../src/i_callbacks.c:1141
+#: src/i_callbacks.c:1144
 msgid "ShowHidden"
 msgstr "ZichtbaarVerborgen"
 
-#: ../src/i_callbacks.c:1165
+#: src/i_callbacks.c:1168
 msgid "MakeVisible"
 msgstr "MaakZichtbaar"
 
-#: ../src/i_callbacks.c:1562
+#: src/i_callbacks.c:1565
 msgid "Update Cues"
 msgstr "Vernieuw aanwijzing"
 
-#: ../src/i_callbacks.c:1746
+#: src/i_callbacks.c:1749
 msgid "Really revert page?"
 msgstr "Echt Terughalen pagina?"
 
-#: ../src/i_callbacks.c:1816
+#: src/i_callbacks.c:1819
 msgid "Copy to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1834
+#: src/i_callbacks.c:1837
 msgid "Cut to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1852
+#: src/i_callbacks.c:1855
 #, fuzzy
 msgid "Paste from clipboard"
 msgstr "Plak vanuit 1"
 
-#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
-#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
-#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+#: src/i_callbacks.c:1867 src/i_callbacks.c:2106 src/i_callbacks.c:2128
+#: src/i_callbacks.c:2150 src/i_callbacks.c:2172 src/i_callbacks.c:2194
 msgid "Empty buffer"
 msgstr "Maak buffer leeg"
 
-#: ../src/i_callbacks.c:1909
+#: src/i_callbacks.c:1912
 msgid "Copy 1"
 msgstr "Kopieer 1"
 
-#: ../src/i_callbacks.c:1928
+#: src/i_callbacks.c:1931
 msgid "Copy 2"
 msgstr "Kopieer 2"
 
-#: ../src/i_callbacks.c:1947
+#: src/i_callbacks.c:1950
 msgid "Copy 3"
 msgstr "Kopieer 3"
 
-#: ../src/i_callbacks.c:1966
+#: src/i_callbacks.c:1969
 msgid "Copy 4"
 msgstr "Kopieer 4"
 
-#: ../src/i_callbacks.c:1985
+#: src/i_callbacks.c:1988
 msgid "Copy 5"
 msgstr "Kopieer 5"
 
-#: ../src/i_callbacks.c:2004
+#: src/i_callbacks.c:2007
 msgid "Cut 1"
 msgstr "Knip 1"
 
-#: ../src/i_callbacks.c:2023
+#: src/i_callbacks.c:2026
 msgid "Cut 2"
 msgstr "Knip 2"
 
-#: ../src/i_callbacks.c:2042
+#: src/i_callbacks.c:2045
 msgid "Cut 3"
 msgstr "Knip 3"
 
-#: ../src/i_callbacks.c:2061
+#: src/i_callbacks.c:2064
 msgid "Cut 4"
 msgstr "Knip 4"
 
-#: ../src/i_callbacks.c:2080
+#: src/i_callbacks.c:2083
 msgid "Cut 5"
 msgstr "Knip 5"
 
-#: ../src/i_callbacks.c:2096
+#: src/i_callbacks.c:2099
 msgid "Paste 1"
 msgstr "Plak 1"
 
-#: ../src/i_callbacks.c:2118
+#: src/i_callbacks.c:2121
 msgid "Paste 2"
 msgstr "Plak 2"
 
-#: ../src/i_callbacks.c:2140
+#: src/i_callbacks.c:2143
 msgid "Paste 3"
 msgstr "Plak 3"
 
-#: ../src/i_callbacks.c:2162
+#: src/i_callbacks.c:2165
 msgid "Paste 4"
 msgstr "Plak 4"
 
-#: ../src/i_callbacks.c:2184
+#: src/i_callbacks.c:2187
 msgid "Paste 5"
 msgstr "Plak 5"
 
-#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
+#: src/i_callbacks.c:2324 src/x_window.c:354
 msgid "Component"
 msgstr "Component"
 
-#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
+#: src/i_callbacks.c:2360 src/i_callbacks.c:2379 src/x_dialog.c:2381
 msgid "Attribute"
 msgstr "Attribuut"
 
-#: ../src/i_callbacks.c:2873
+#: src/i_callbacks.c:2877
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Zoek naar bron [%s]\n"
 
-#: ../src/i_callbacks.c:2897
+#: src/i_callbacks.c:2901
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Kan bron [%s] niet vinden\n"
 
-#: ../src/i_callbacks.c:2964
+#: src/i_callbacks.c:2970
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Zoek naar symbool [%s]\n"
 
-#: ../src/i_callbacks.c:2970
+#: src/i_callbacks.c:2976
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3001
+#: src/i_callbacks.c:3007
 msgid "Cannot find any schematics above the current one!\n"
 msgstr "Kan geen schema's vinden boven het huidige schema!\n"
 
-#: ../src/i_callbacks.c:3064
+#: src/i_callbacks.c:3061
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
@@ -1037,246 +1048,244 @@ msgstr ""
 "Dit commando haalt de component documentatie van het web, maar er is geen "
 "component geselecteerd"
 
-#: ../src/i_callbacks.c:3177
+#: src/i_callbacks.c:3171
 msgid "ShowN"
 msgstr "ToonN"
 
-#: ../src/i_callbacks.c:3213
+#: src/i_callbacks.c:3207
 msgid "ShowV"
 msgstr "ToonW"
 
-#: ../src/i_callbacks.c:3249
+#: src/i_callbacks.c:3243
 msgid "ShowB"
 msgstr "ToonB"
 
-#: ../src/i_callbacks.c:3286
+#: src/i_callbacks.c:3280
 msgid "VisToggle"
 msgstr "SchakelZichtbaarheid"
 
-#: ../src/i_callbacks.c:3316
+#: src/i_callbacks.c:3310
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Sorry, maar dit is een niet werkende menu optie\n"
 
-#: ../src/i_callbacks.c:3406
+#: src/i_callbacks.c:3400
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Aktie terugkoppel mode is ingesteld op OUTLINE\n"
 
-#: ../src/i_callbacks.c:3409
+#: src/i_callbacks.c:3403
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Aktie terugkoppel mode is ingesteld op BOUNDINGBOX.\n"
 
-#: ../src/i_callbacks.c:3434
+#: src/i_callbacks.c:3428
 msgid "Grid OFF\n"
 msgstr "Grid UIT\n"
 
-#: ../src/i_callbacks.c:3435
+#: src/i_callbacks.c:3429
 msgid "Dot grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3436
+#: src/i_callbacks.c:3430
 msgid "Mesh grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3457
+#: src/i_callbacks.c:3451
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Snap UIT (PAS OP!)\n"
 
-#: ../src/i_callbacks.c:3460
+#: src/i_callbacks.c:3454
 msgid "Snap ON\n"
 msgstr "Snap AAN\n"
 
-#: ../src/i_callbacks.c:3463
+#: src/i_callbacks.c:3457
 #, fuzzy
 msgid "Snap back to the grid (CAUTION!)\n"
 msgstr "Snap UIT (PAS OP!)\n"
 
-#: ../src/i_callbacks.c:3489
+#: src/i_callbacks.c:3483
 msgid "Rubber band OFF \n"
 msgstr "Elastiek band UIT\n"
 
-#: ../src/i_callbacks.c:3492
+#: src/i_callbacks.c:3486
 msgid "Rubber band ON\n"
 msgstr "Elastiek band AAN\n"
 
-#: ../src/i_callbacks.c:3507
+#: src/i_callbacks.c:3501
 msgid "magnetic net mode: ON\n"
 msgstr "magnetische net mode: AAN\n"
 
-#: ../src/i_callbacks.c:3510
+#: src/i_callbacks.c:3504
 msgid "magnetic net mode: OFF\n"
 msgstr "magnetische net mode: UIT\n"
 
-#: ../src/o_box.c:160
+#: src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Onbekend type voor rechthoek (arcering)!\n"
 
-#: ../src/o_buffer.c:57
+#: src/o_buffer.c:57
 #, c-format
 msgid "o_buffer_copy: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:72
+#: src/o_buffer.c:72
 #, c-format
 msgid "o_buffer_cut: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:93
+#: src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr "Ontving een ongeldig buffernummer [o_buffer_paste_start]\n"
 
-#: ../src/o_bus.c:135
+#: src/o_bus.c:135
 #, fuzzy, c-format
 msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr "Ontving ereen die ongeldig is in [o_bus_draw_xor_single]\n"
 
-#: ../src/o_circle.c:141
+#: src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Onbekend type voor cirkel (arcering)!\n"
 
-#: ../src/o_complex.c:250 ../src/o_complex.c:254
+#: src/o_complex.c:250 src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Vertaal schema [%d %d]\n"
 
-#: ../src/o_misc.c:61
+#: src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
 msgstr "Ontving een onverwachte NULL in o_edit\n"
 
-#: ../src/o_misc.c:125
+#: src/o_misc.c:125
 msgid "Object already locked\n"
 msgstr "Object reeds vergrendeld\n"
 
-#: ../src/o_misc.c:163
+#: src/o_misc.c:163
 msgid "Object already unlocked\n"
 msgstr "Object reeds ontgrendeld\n"
 
-#: ../src/o_misc.c:445
+#: src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "Verborgen tekst is nu zichtbaar\n"
 
-#: ../src/o_misc.c:447
+#: src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "Verborgen tekst is nu onzichtbaar\n"
 
-#: ../src/o_misc.c:697
+#: src/o_misc.c:700
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr "Kan symbool [%s] niet in bibliotheek vinden. Vernieuwen faalde.\n"
 
-#: ../src/o_misc.c:840
+#: src/o_misc.c:847
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr "o_autosave_backups: Kan de echte bestandsnaam van %s niet krijgen."
 
-#: ../src/o_misc.c:884
+#: src/o_misc.c:891
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr ""
 "Voorgaande reserve bestand [%s] kan NIET op lezen-schrijven ingesteld "
 "worden\n"
 
-#: ../src/o_misc.c:902
+#: src/o_misc.c:909
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Reserve bestand [%s] kan NIET op alleen-lezen ingesteld worden\n"
 
-#: ../src/o_misc.c:907
+#: src/o_misc.c:914
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "Reserve bestand [%s] kan NIET opgeslagen worden\n"
 
-#: ../src/o_move.c:188
+#: src/o_move.c:188
 #, c-format
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "FOUT: NULL object in o_move_end!\n"
 
-#: ../src/o_move.c:461
+#: src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr "OH! probeerde er een te vinden, maar heb 'em niet gevonden!\n"
 
-#: ../src/o_move.c:482
+#: src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr "Ontving een niet lijn object in o_move_check_endpoint\n"
 
-#: ../src/o_net.c:176
+#: src/o_net.c:176
 #, fuzzy, c-format
 msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr "Ontving er een die ongeldig is in o_net_draw_xor_single\n"
 
-#: ../src/o_net.c:552
+#: src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr "Waarschuwing: begin van net niet op raster coordinaat\n"
 
-#: ../src/o_net.c:614
+#: src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr "Waarschuwing: einde van net niet op raster coordinaat\n"
 
-#. try to exit gracefully
-#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
-#: ../src/o_net.c:1126
+#: src/o_net.c:982 src/o_net.c:1019 src/o_net.c:1090 src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 "Probeerde meer dan twee busrippers toe te voegen. Interne gschem fout.\n"
 
-#: ../src/o_net.c:1196
+#: src/o_net.c:1196
 #, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr ""
 "Bus ripper symbool [%s] niet gevonden in een van de component bibliotheken\n"
 
-#: ../src/o_path.c:356
+#: src/o_path.c:356
 #, fuzzy, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "Onbekend type voor rechthoek (arcering)!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:557
+#: src/o_picture.c:166 src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Fout bij het lezen van afbeelding: %s"
 
-#: ../src/o_picture.c:180
+#: src/o_picture.c:180
 msgid "Picture"
 msgstr "Afbeelding"
 
-#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
+#: src/o_picture.c:465 src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "FOUT: NULL object!\n"
 
-#: ../src/o_slot.c:110
+#: src/o_slot.c:81
 msgid "Slot attribute malformed\n"
 msgstr "Slot attribuut misvormd\n"
 
-#: ../src/o_slot.c:128
+#: src/o_slot.c:99
 msgid "numslots attribute missing\n"
 msgstr "numslots attribuut ontbreekt\n"
 
-#: ../src/o_slot.c:130
+#: src/o_slot.c:100
 msgid "Slotting not allowed for this component\n"
 msgstr "Slots niet toegestaan voor deze component\n"
 
-#: ../src/o_slot.c:145
+#: src/o_slot.c:115
 msgid "New slot number out of range\n"
 msgstr "Nieuw slotnummer overschrijdt de limiet\n"
 
-#: ../src/o_slot.c:200
+#: src/o_slot.c:170
 #, c-format
 msgid "uggg! you tried to slot edit something that doesn't exist!\n"
 msgstr "Hmmm, je probeerde een slot te bewerken op iets dat niet bestaat!\n"
 
-#: ../src/o_undo.c:300
+#: src/o_undo.c:300
 msgid "Undo/Redo disabled in rc file\n"
 msgstr "Ongedaan/Opnieuw doen uitgeschakeld in rc bestand\n"
 
-#: ../src/parsecmd.c:47
+#: src/parsecmd.c:47
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] schematic_filename1 ... schematic_filenameN\n"
@@ -1300,77 +1309,68 @@ msgstr ""
 "  -h            Help; deze mededeling\n"
 "\n"
 
-#: ../src/x_attribedit.c:127
+#: src/x_attribedit.c:127
 #, c-format
 msgid "Got invalid show option; defaulting to show both\n"
 msgstr "Kreeg ongeldige toon optie; standaardwaarde is toon beide\n"
 
-#: ../src/x_attribedit.c:330
+#: src/x_attribedit.c:330
 msgid "Single Attribute Editor"
 msgstr "Enkelvoudige Attribuut Bewerking"
 
-#: ../src/x_attribedit.c:359
+#: src/x_attribedit.c:359
 msgid "<b>Edit Attribute</b>"
 msgstr "<b>Bewerk Attribuut</b>"
 
-#: ../src/x_attribedit.c:361
+#: src/x_attribedit.c:361
 msgid "<b>Add Attribute</b>"
 msgstr "<b>Plaats Attribuut</b>"
 
-#. Name selection
-#. GtkLabel
-#: ../src/x_attribedit.c:377 ../src/x_multiattrib.c:1725
+#: src/x_attribedit.c:377 src/x_multiattrib.c:1921
 msgid "Name:"
 msgstr "Naam:"
 
-#. Value entry
-#. GtkLabel
-#: ../src/x_attribedit.c:393 ../src/x_multiattrib.c:1744
+#: src/x_attribedit.c:393 src/x_multiattrib.c:1940
 msgid "Value:"
 msgstr "Waarde:"
 
-#. Visibility
-#. GtkButton
-#: ../src/x_attribedit.c:409 ../src/x_multiattrib.c:1781
+#: src/x_attribedit.c:409 src/x_multiattrib.c:1983
 msgid "Visible"
 msgstr "Zichtbaar"
 
-#: ../src/x_attribedit.c:429
+#: src/x_attribedit.c:429
 msgid "Show Value Only"
 msgstr "Toon Alleen Waarde"
 
-#: ../src/x_attribedit.c:431
+#: src/x_attribedit.c:431
 msgid "Show Name Only"
 msgstr "Toon Alleen Naam"
 
-#: ../src/x_attribedit.c:433 ../src/x_multiattrib.c:1369
+#: src/x_attribedit.c:433 src/x_multiattrib.c:1459
 msgid "Show Name & Value"
 msgstr "Toon Naam & Waarde"
 
-#. gschem specific
-#: ../src/x_attribedit.c:440
+#: src/x_attribedit.c:440
 msgid "<b>Attach Options</b>"
 msgstr "<b>Opties Vastmaken</b>"
 
-#: ../src/x_attribedit.c:455
+#: src/x_attribedit.c:455
 msgid "All"
 msgstr "Alle"
 
-#. GtkTreeViewColumn
-#: ../src/x_attribedit.c:463 ../src/x_compselect.c:896
-#: ../src/x_compselect.c:1010
+#: src/x_attribedit.c:463 src/x_compselect.c:895 src/x_compselect.c:1009
 msgid "Components"
 msgstr "Componenten"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:364
+#: src/x_attribedit.c:471 src/x_window.c:364
 msgid "Nets"
 msgstr "Draden"
 
-#: ../src/x_attribedit.c:479
+#: src/x_attribedit.c:479
 msgid "Replace existing attributes"
 msgstr "Vervang bestaande attributen"
 
-#: ../src/x_autonumber.c:413
+#: src/x_autonumber.c:415
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
@@ -1378,189 +1378,179 @@ msgstr ""
 "geslotte objecten zonder slot attribuut kunnen een probleem geven bij het "
 "automatisch nummeren van slots\n"
 
-#. duplicate slot in used_slots
-#: ../src/x_autonumber.c:428
+#: src/x_autonumber.c:430
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 "een dubbel slot kan een probleem geven: [symbolname=%s, number=%d, slot=%d]\n"
 
-#: ../src/x_autonumber.c:696
+#: src/x_autonumber.c:702
 msgid "No searchstring given in autonumber text.\n"
 msgstr "Geen zoektekst gegeven in autonumber text.\n"
 
-#: ../src/x_autonumber.c:748
+#: src/x_autonumber.c:754
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr "Geen '*' of '?' gegeven aan het einden van de autonummer tekst.\n"
 
-#: ../src/x_autonumber.c:883
+#: src/x_autonumber.c:889
 msgid "Diagonal"
 msgstr "Diagonaal"
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Top to bottom"
 msgstr "Van boven naar beneden"
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Bottom to top"
 msgstr "Van beneden naar boven"
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 msgid "Left to right"
 msgstr "Van links naar rechts"
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 msgid "Right to left"
 msgstr "Van rechts naar links"
 
-#: ../src/x_autonumber.c:886
+#: src/x_autonumber.c:892
 msgid "File order"
 msgstr "Bestand volgorde"
 
-#: ../src/x_autonumber.c:1222
+#: src/x_autonumber.c:1228
 msgid "Autonumber text"
 msgstr "Automatisch tekst nummeren"
 
-#. scope section
-#: ../src/x_autonumber.c:1246
+#: src/x_autonumber.c:1252
 msgid "<b>Scope</b>"
 msgstr "<b>Omvang</b>"
 
-#: ../src/x_autonumber.c:1268
+#: src/x_autonumber.c:1274
 msgid "Search for:"
 msgstr "Zoek naar:"
 
-#: ../src/x_autonumber.c:1282
+#: src/x_autonumber.c:1288
 msgid "Autonumber text in:"
 msgstr "Automatisch tekst nummeren in:"
 
-#: ../src/x_autonumber.c:1289
+#: src/x_autonumber.c:1295
 msgid "Skip numbers found in:"
 msgstr "Sla nummers over gevonden in:"
 
-#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
+#: src/x_autonumber.c:1307 src/x_autonumber.c:1316
 msgid "Selected objects"
 msgstr "Geselecteerde objecten"
 
-#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
+#: src/x_autonumber.c:1308 src/x_autonumber.c:1317
 msgid "Current page"
 msgstr "Huidig blad"
 
-#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
+#: src/x_autonumber.c:1309 src/x_autonumber.c:1318
 msgid "Whole hierarchy"
 msgstr "Hele hierarchie"
 
-#: ../src/x_autonumber.c:1314
+#: src/x_autonumber.c:1320
 msgid "Overwrite existing numbers"
 msgstr "Overschrijven van bestaande nummers"
 
-#. Options section
-#: ../src/x_autonumber.c:1319
+#: src/x_autonumber.c:1325
 msgid "<b>Options</b>"
 msgstr "<b>Opties</b>"
 
-#: ../src/x_autonumber.c:1341
+#: src/x_autonumber.c:1347
 msgid "Starting number:"
 msgstr "Start nummer:"
 
-#: ../src/x_autonumber.c:1348
+#: src/x_autonumber.c:1354
 msgid "Sort order:"
 msgstr "Sorteer volgorde:"
 
-#: ../src/x_autonumber.c:1369
+#: src/x_autonumber.c:1375
 msgid "Remove numbers"
 msgstr "Verwijder nummers"
 
-#: ../src/x_autonumber.c:1373
+#: src/x_autonumber.c:1379
 msgid "Automatic slotting"
 msgstr "Automatisch slotten"
 
-#: ../src/x_color.c:94 ../src/x_color.c:103
+#: src/x_color.c:94 src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Kan de kleur %s niet toewijzen!\n"
 
-#: ../src/x_color.c:94
+#: src/x_color.c:94
 msgid "black"
 msgstr "zwart"
 
-#: ../src/x_color.c:103
+#: src/x_color.c:103
 msgid "white"
 msgstr "wit"
 
-#: ../src/x_color.c:125
+#: src/x_color.c:125
 #, fuzzy, c-format
 msgid "Could not allocate display color %i!\n"
 msgstr "Kan de kleur %s niet toewijzen!\n"
 
-#: ../src/x_color.c:147
+#: src/x_color.c:147
 #, fuzzy, c-format
 msgid "Could not allocate outline color %i!\n"
 msgstr "Kan de kleur %s niet toewijzen!\n"
 
-#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
+#: src/x_color.c:164 src/x_color.c:181 src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Probeerde een ongeldige kleur te verkrijgen: %d\n"
 
-#: ../src/x_color.c:214
+#: src/x_color.c:214
 #, fuzzy, c-format
 msgid "Tried to get an invalid outline color: %d\n"
 msgstr "Probeerde een ongeldige kleur te verkrijgen: %d\n"
 
-#. GtkLabel
-#: ../src/x_compselect.c:1040
+#: src/x_compselect.c:1039
 msgid "Filter:"
 msgstr "Filter:"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
-#: ../src/x_multiattrib.c:1601
+#: src/x_compselect.c:1142 src/x_dialog.c:3776 src/x_multiattrib.c:1787
 msgid "Name"
 msgstr "Naam"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1152 ../src/x_multiattrib.c:1626
+#: src/x_compselect.c:1151 src/x_multiattrib.c:1811
 msgid "Value"
 msgstr "Waarde"
 
-#: ../src/x_compselect.c:1191
+#: src/x_compselect.c:1190
 msgid "Default behavior - reference component"
 msgstr "Normaal gedrag - referentie component"
 
-#: ../src/x_compselect.c:1194
+#: src/x_compselect.c:1193
 msgid "Embed component in schematic"
 msgstr "Component insluiten in schema"
 
-#: ../src/x_compselect.c:1197
+#: src/x_compselect.c:1196
 msgid "Include component as individual objects"
 msgstr "Invoegen component als individuele objecten"
 
-#. GtkWindow
-#: ../src/x_compselect.c:1354
+#: src/x_compselect.c:1353
 msgid "Select Component..."
 msgstr "Selecteer Component..."
 
-#: ../src/x_compselect.c:1377
+#: src/x_compselect.c:1376
 msgid "In Use"
 msgstr "In gebruik"
 
-#: ../src/x_compselect.c:1381
+#: src/x_compselect.c:1380
 msgid "Libraries"
 msgstr "Bibliotheken"
 
-#. GtkFrame
-#: ../src/x_compselect.c:1390 ../src/x_fileselect.c:122
+#: src/x_compselect.c:1389 src/x_fileselect.c:122
 msgid "Preview"
 msgstr "Vooraf zien"
 
-#. dialog not created yet
-#: ../src/x_dialog.c:174
+#: src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "Tekst Ingeven..."
 
-#: ../src/x_dialog.c:205
+#: src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1570,185 +1560,176 @@ msgstr ""
 "verplaats cursor in het venster, klik om tekst te plaatsen.\n"
 "Middelste muisknop gebruiken om te plaatsen"
 
-#: ../src/x_dialog.c:294
-#, c-format
+#: src/x_dialog.c:294
 msgid "Lower Left"
 msgstr "Onder Links"
 
-#: ../src/x_dialog.c:305
-#, c-format
+#: src/x_dialog.c:305
 msgid "Middle Left"
 msgstr "Midden Links"
 
-#: ../src/x_dialog.c:316
-#, c-format
+#: src/x_dialog.c:316
 msgid "Upper Left"
 msgstr "Boven Links"
 
-#: ../src/x_dialog.c:327
-#, c-format
+#: src/x_dialog.c:327
 msgid "Lower Middle"
 msgstr "Onder Midden"
 
-#: ../src/x_dialog.c:338
-#, c-format
+#: src/x_dialog.c:338
 msgid "Middle Middle"
 msgstr "Midden Midden"
 
-#: ../src/x_dialog.c:349
-#, c-format
+#: src/x_dialog.c:349
 msgid "Upper Middle"
 msgstr "Boven Midden"
 
-#: ../src/x_dialog.c:360
-#, c-format
+#: src/x_dialog.c:360
 msgid "Lower Right"
 msgstr "Onder Rechts"
 
-#: ../src/x_dialog.c:371
-#, c-format
+#: src/x_dialog.c:371
 msgid "Middle Right"
 msgstr "Midden Rechts"
 
-#: ../src/x_dialog.c:382
-#, c-format
+#: src/x_dialog.c:382
 msgid "Upper Right"
 msgstr "Boven Rechts"
 
-#: ../src/x_dialog.c:496
+#: src/x_dialog.c:496
 msgid "Edit Text Properties"
 msgstr "Bewerk Tekst Eigenschappen"
 
-#: ../src/x_dialog.c:530
+#: src/x_dialog.c:530
 msgid "<b>Text Content</b>"
 msgstr "<b>Tekst Inhoud</b>"
 
-#: ../src/x_dialog.c:562
+#: src/x_dialog.c:562
 msgid "<b>Text Properties</b>"
 msgstr "<b>Tekst Eigenschappen</b>"
 
-#: ../src/x_dialog.c:577
+#: src/x_dialog.c:577
 msgid "Color:"
 msgstr "Kleur:"
 
-#: ../src/x_dialog.c:584
+#: src/x_dialog.c:584
 msgid "Size:"
 msgstr "Grootte:"
 
-#: ../src/x_dialog.c:593
+#: src/x_dialog.c:593
 msgid "Alignment:"
 msgstr "Uitlijning:"
 
-#: ../src/x_dialog.c:647
+#: src/x_dialog.c:647
 msgid "Solid"
 msgstr "Getrokken lijn"
 
-#: ../src/x_dialog.c:648
+#: src/x_dialog.c:648
 msgid "Dotted"
 msgstr "Gestippeld"
 
-#: ../src/x_dialog.c:649
+#: src/x_dialog.c:649
 msgid "Dashed"
 msgstr "Gestreept"
 
-#: ../src/x_dialog.c:650
+#: src/x_dialog.c:650
 msgid "Center"
 msgstr "Hart"
 
-#: ../src/x_dialog.c:651
+#: src/x_dialog.c:651
 msgid "Phantom"
 msgstr "Begrenzing"
 
-#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
-#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
-#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
-#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
-#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
-#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
+#: src/x_dialog.c:652 src/x_dialog.c:749 src/x_dialog.c:758 src/x_dialog.c:767
+#: src/x_dialog.c:868 src/x_dialog.c:870 src/x_dialog.c:872
+#: src/x_dialog.c:1100 src/x_dialog.c:1203 src/x_dialog.c:1212
+#: src/x_dialog.c:1221 src/x_dialog.c:1230 src/x_dialog.c:1239
+#: src/x_dialog.c:1352 src/x_dialog.c:1354 src/x_dialog.c:1356
+#: src/x_dialog.c:1358 src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*onveranderd*"
 
-#: ../src/x_dialog.c:978
+#: src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Bewerk Lijn Dikte & Type"
 
-#: ../src/x_dialog.c:1017 ../src/x_print.c:307
+#: src/x_dialog.c:1017 src/x_print.c:307
 msgid "Type:"
 msgstr "Type:"
 
-#: ../src/x_dialog.c:1021
+#: src/x_dialog.c:1021
 msgid "Width:"
 msgstr "Breedte:"
 
-#: ../src/x_dialog.c:1025
+#: src/x_dialog.c:1025
 msgid "Dash Length:"
 msgstr "Lijn Streeplengte:"
 
-#: ../src/x_dialog.c:1029
+#: src/x_dialog.c:1029
 msgid "Dash Space:"
 msgstr "Lijn Tussenruimte:"
 
-#: ../src/x_dialog.c:1096
+#: src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Hol"
 
-#: ../src/x_dialog.c:1097
+#: src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Gevuld"
 
-#: ../src/x_dialog.c:1098
+#: src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "Maas"
 
-#: ../src/x_dialog.c:1099
+#: src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "Arcering"
 
-#: ../src/x_dialog.c:1470
+#: src/x_dialog.c:1470
 msgid "Edit Fill Type"
 msgstr "Bewerk Arcering Type"
 
-#: ../src/x_dialog.c:1508
+#: src/x_dialog.c:1508
 msgid "Fill Type:"
 msgstr "Arcering Type:"
 
-#: ../src/x_dialog.c:1512
+#: src/x_dialog.c:1512
 msgid "Line Width:"
 msgstr "Lijn Dikte:"
 
-#: ../src/x_dialog.c:1516
+#: src/x_dialog.c:1516
 msgid "Angle 1:"
 msgstr "Hoek 1:"
 
-#: ../src/x_dialog.c:1520
+#: src/x_dialog.c:1520
 msgid "Pitch 1:"
 msgstr "Steek 1:"
 
-#: ../src/x_dialog.c:1524
+#: src/x_dialog.c:1524
 msgid "Angle 2:"
 msgstr "Hoek 2:"
 
-#: ../src/x_dialog.c:1528
+#: src/x_dialog.c:1528
 msgid "Pitch 2:"
 msgstr "Steek 2:"
 
-#: ../src/x_dialog.c:1657
+#: src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "Boog parameters"
 
-#: ../src/x_dialog.c:1697
+#: src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr ""
 
-#: ../src/x_dialog.c:1705
+#: src/x_dialog.c:1705
 msgid "Start Angle:"
 msgstr "Start Hoek:"
 
-#: ../src/x_dialog.c:1713
+#: src/x_dialog.c:1713
 msgid "Degrees of Sweep:"
 msgstr "Doorlopen Hoek:"
 
-#: ../src/x_dialog.c:1830
+#: src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1756,44 +1737,44 @@ msgstr ""
 "Offset van de verplaatsing?\n"
 "(0 voor oorsprong)"
 
-#: ../src/x_dialog.c:1898
+#: src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "Tekst Hoogte"
 
-#: ../src/x_dialog.c:1928
+#: src/x_dialog.c:1928
 msgid "Enter new text size:"
 msgstr "Voer nieuwe tekstgrootte in:"
 
-#: ../src/x_dialog.c:2004
+#: src/x_dialog.c:2004
 msgid "Snap Size"
 msgstr "Snap Grootte"
 
-#: ../src/x_dialog.c:2034
+#: src/x_dialog.c:2034
 msgid "Enter new snap grid spacing:"
 msgstr "Voer nieuwe snap grid waarde in:"
 
-#: ../src/x_dialog.c:2107
+#: src/x_dialog.c:2110
 msgid "Edit slot number"
 msgstr "Bewerk slot nummer"
 
-#: ../src/x_dialog.c:2138
+#: src/x_dialog.c:2141
 msgid "Edit slot number:"
 msgstr "Bewerk slot nummer:"
 
-#: ../src/x_dialog.c:2200
+#: src/x_dialog.c:2202
 msgid "About..."
 msgstr "Omtrent..."
 
-#: ../src/x_dialog.c:2220
+#: src/x_dialog.c:2222
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "<b>gEDA: GPL Elektronische Ontwerp Automatisering</b>"
 
-#: ../src/x_dialog.c:2224
+#: src/x_dialog.c:2226
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "<b>gschem versie %s%s.%s</b>"
 
-#: ../src/x_dialog.c:2232
+#: src/x_dialog.c:2234
 msgid ""
 "Written by:\n"
 "Ales Hvezda\n"
@@ -1805,157 +1786,156 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "En vele anderen (zie het AUTHORS bestand)"
 
-#: ../src/x_dialog.c:2295
+#: src/x_dialog.c:2297
 msgid "Coords"
 msgstr "Coord."
 
-#: ../src/x_dialog.c:2316
+#: src/x_dialog.c:2318
 msgid "Screen"
 msgstr "Scherm"
 
-#: ../src/x_dialog.c:2325
+#: src/x_dialog.c:2327
 msgid "World"
 msgstr "Wereld"
 
-#: ../src/x_dialog.c:2364
+#: src/x_dialog.c:2366
 msgid "Background"
 msgstr ""
 
-#: ../src/x_dialog.c:2370
+#: src/x_dialog.c:2372
 msgid "Net endpoint"
 msgstr ""
 
-#: ../src/x_dialog.c:2373
+#: src/x_dialog.c:2375
 msgid "Graphic"
 msgstr ""
 
-#: ../src/x_dialog.c:2382
+#: src/x_dialog.c:2384
 msgid "Logic bubble"
 msgstr ""
 
-#: ../src/x_dialog.c:2385
+#: src/x_dialog.c:2387
 msgid "Grid point"
 msgstr ""
 
-#: ../src/x_dialog.c:2388
+#: src/x_dialog.c:2390
 #, fuzzy
 msgid "Detached attribute"
 msgstr "Plaats Attribuut"
 
-#: ../src/x_dialog.c:2391 ../src/x_window.c:382
+#: src/x_dialog.c:2393 src/x_window.c:382
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/x_dialog.c:2397
+#: src/x_dialog.c:2399
 #, fuzzy
 msgid "Selection"
 msgstr "Selecteer"
 
-#: ../src/x_dialog.c:2400
+#: src/x_dialog.c:2402
 msgid "Bounding box"
 msgstr ""
 
-#: ../src/x_dialog.c:2403
+#: src/x_dialog.c:2405
 #, fuzzy
 msgid "Zoom box"
 msgstr "Vergroot Venster"
 
-#: ../src/x_dialog.c:2412
+#: src/x_dialog.c:2414
 msgid "Output background"
 msgstr ""
 
-#: ../src/x_dialog.c:2415
+#: src/x_dialog.c:2417
 #, fuzzy
 msgid "Net junction"
 msgstr "Funktie"
 
-#: ../src/x_dialog.c:2418
+#: src/x_dialog.c:2420
 msgid "Mesh grid major"
 msgstr ""
 
-#: ../src/x_dialog.c:2421
+#: src/x_dialog.c:2423
 msgid "Mesh grid minor"
 msgstr ""
 
-#: ../src/x_dialog.c:2424
+#: src/x_dialog.c:2426
 msgid "Unknown"
 msgstr ""
 
-#: ../src/x_dialog.c:2570
+#: src/x_dialog.c:2572
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr "FOUT: NULL object in color_edit_dialog_apply!\n"
 
-#: ../src/x_dialog.c:2633
+#: src/x_dialog.c:2635
 msgid "Color Edit"
 msgstr "Kleur Bewerken"
 
-#: ../src/x_dialog.c:2664
+#: src/x_dialog.c:2666
 msgid "Object color:"
 msgstr "Object kleur:"
 
-#: ../src/x_dialog.c:2786
+#: src/x_dialog.c:2788
 msgid "Function"
 msgstr "Funktie"
 
-#: ../src/x_dialog.c:2793
+#: src/x_dialog.c:2795
 msgid "Keystroke(s)"
 msgstr "Toetsaanslag(en)"
 
-#: ../src/x_dialog.c:3102
+#: src/x_dialog.c:3104
 msgid "Find Text"
 msgstr "Vind tekst"
 
-#: ../src/x_dialog.c:3133
+#: src/x_dialog.c:3135
 msgid "Text to find:"
 msgstr "Te vinden tekst:"
 
-#: ../src/x_dialog.c:3143
+#: src/x_dialog.c:3145
 msgid "descend into hierarchy"
 msgstr "afdalen in hierarchie"
 
-#: ../src/x_dialog.c:3208
+#: src/x_dialog.c:3210
 msgid "Hide Text"
 msgstr "Verberg tekst"
 
-#: ../src/x_dialog.c:3239
+#: src/x_dialog.c:3241
 msgid "Hide text starting with:"
 msgstr "Verberg tekst beginnend met:"
 
-#: ../src/x_dialog.c:3308
+#: src/x_dialog.c:3310
 msgid "Show Text"
 msgstr "Toon tekst"
 
-#: ../src/x_dialog.c:3339
+#: src/x_dialog.c:3341
 msgid "Show text starting with:"
 msgstr "Toon tekst beginnend met:"
 
-#: ../src/x_dialog.c:3796
+#: src/x_dialog.c:3798
 msgid "S_elect the schematics you want to save:"
 msgstr "S_electeer de schema's die je op wil slaan:"
 
-#: ../src/x_dialog.c:3890
+#: src/x_dialog.c:3892
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr "Wijzigingen in schema \"%s\" opslaan voor het afsluiten?"
 
-#: ../src/x_dialog.c:3896
+#: src/x_dialog.c:3898
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
 msgstr ""
 "Er zijn %d schema's met wijzigingen. Wijzigingen opslaan voor het afsluiten?"
 
-#. secondary label
-#: ../src/x_dialog.c:3925
+#: src/x_dialog.c:3927
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr "Als je niet opslaat, verlies je alle wijzigingen definitief."
 
-#: ../src/x_dialog.c:3945
+#: src/x_dialog.c:3947
 msgid "_Close without saving"
 msgstr "Afsluiten zonder opslaan"
 
-#: ../src/x_dialog.c:4279
+#: src/x_dialog.c:4283
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -1973,49 +1953,49 @@ msgstr ""
 "De naam mag niet eindigen met een spatie.\n"
 "De waarde mag niet met een spatie beginnen."
 
-#: ../src/x_dialog.c:4281
+#: src/x_dialog.c:4285
 msgid "Invalid Attribute"
 msgstr "Ongeldig Attribuut"
 
-#: ../src/x_dialog.c:4317
+#: src/x_dialog.c:4321
 #, fuzzy
 msgid "Pin type"
 msgstr "Pen Mode"
 
-#: ../src/x_dialog.c:4341
+#: src/x_dialog.c:4345
 #, fuzzy
 msgid "Net pin"
 msgstr "Funktie"
 
-#: ../src/x_dialog.c:4343
+#: src/x_dialog.c:4347
 msgid "Bus pin (graphical)"
 msgstr ""
 
-#: ../src/x_fileselect.c:42
+#: src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "Schema's"
 
-#: ../src/x_fileselect.c:47
+#: src/x_fileselect.c:47
 msgid "Symbols"
 msgstr "Symbolen"
 
-#: ../src/x_fileselect.c:52
+#: src/x_fileselect.c:52
 msgid "Schematics and symbols"
 msgstr "Schema's en symbolen"
 
-#: ../src/x_fileselect.c:58
+#: src/x_fileselect.c:58
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: ../src/x_fileselect.c:171
+#: src/x_fileselect.c:171
 msgid "Open..."
 msgstr "Open..."
 
-#: ../src/x_fileselect.c:231
+#: src/x_fileselect.c:231
 msgid "Save as..."
 msgstr "Opslaan Als..."
 
-#: ../src/x_fileselect.c:284
+#: src/x_fileselect.c:284
 #, c-format
 msgid ""
 "The selected file `%s' already exists.\n"
@@ -2026,30 +2006,29 @@ msgstr ""
 "\n"
 "Wil je het overschrijven ?"
 
-#: ../src/x_fileselect.c:287
+#: src/x_fileselect.c:287
 msgid "Overwrite file?"
 msgstr "Overschrijf bestand ?"
 
-#: ../src/x_fileselect.c:289
+#: src/x_fileselect.c:289
 msgid "Save cancelled on user request\n"
 msgstr "Opslaan afgebroken op verzoek van de gebruiker\n"
 
-#. WK - catch EPS export case
-#: ../src/x_image.c:176
+#: src/x_image.c:176
 msgid "Encapsulated Postscript"
 msgstr "Encapsulated Postscript"
 
-#: ../src/x_image.c:296
+#: src/x_image.c:296
 #, c-format
 msgid "x_image_lowlevel: Unable to write eps file %s.\n"
 msgstr "x_image_lowlevel: Kan EPS bestand %s niet schrijven.\n"
 
-#: ../src/x_image.c:374
+#: src/x_image.c:374
 #, c-format
 msgid "x_image_lowlevel: Unable to write %s file %s.\n"
 msgstr "x_image_lowlevel: Kan %s bestand %s niet schrijven.\n"
 
-#: ../src/x_image.c:384
+#: src/x_image.c:384
 #, c-format
 msgid ""
 "There was the following error when saving image with type %s to filename:\n"
@@ -2063,263 +2042,263 @@ msgstr ""
 "\n"
 "%s.\n"
 
-#: ../src/x_image.c:403
+#: src/x_image.c:403
 #, c-format
 msgid "Wrote color image to [%s] [%d x %d]\n"
 msgstr "Schreef kleuren afbeelding naar [%s] [%d x %d]\n"
 
-#: ../src/x_image.c:405
+#: src/x_image.c:405
 #, c-format
 msgid "Wrote black and white image to [%s] [%d x %d]\n"
 msgstr "Schreef zwart/wit afbeelding naar [%s] [%d x %d]\n"
 
-#: ../src/x_image.c:413
+#: src/x_image.c:413
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 msgstr "x_image_lowlevel: Kan geen pixbuf krijgen van gschem's venster.\n"
 
-#: ../src/x_image.c:458
+#: src/x_image.c:458
 msgid "Width x Height"
 msgstr "Breedte x Hoogte"
 
-#: ../src/x_image.c:474
+#: src/x_image.c:474
 msgid "Image type"
 msgstr "Afbeelding type"
 
-#: ../src/x_log.c:188
+#: src/x_log.c:188
 msgid "** Invalid UTF-8 in log message. See stderr or gschem.log.\n"
 msgstr "** Ongeldige UTF-8 in logboek bericht. Zie stderr of gschem.log.\n"
 
-#: ../src/x_log.c:256
+#: src/x_log.c:256
 msgid "Status"
 msgstr "Status"
 
-#: ../src/x_menus.c:36
+#: src/x_menus.c:36
 msgid "/Add Net"
 msgstr "/Plaats Draad"
 
-#: ../src/x_menus.c:37
+#: src/x_menus.c:37
 msgid "/Add Attribute..."
 msgstr "/Plaats Attribuut..."
 
-#: ../src/x_menus.c:38
+#: src/x_menus.c:38
 msgid "/Add Component..."
 msgstr "/Plaats Component..."
 
-#: ../src/x_menus.c:39
+#: src/x_menus.c:39
 msgid "/Add Bus"
 msgstr "/Plaats Bus"
 
-#: ../src/x_menus.c:40
+#: src/x_menus.c:40
 msgid "/Add Text"
 msgstr "/Plaats Tekst"
 
-#: ../src/x_menus.c:42
+#: src/x_menus.c:42
 msgid "/Zoom In"
 msgstr "/Vergroot"
 
-#: ../src/x_menus.c:43
+#: src/x_menus.c:43
 msgid "/Zoom Out"
 msgstr "/Verklein"
 
-#: ../src/x_menus.c:44
+#: src/x_menus.c:44
 msgid "/Zoom Box"
 msgstr "/Vergroot Venster"
 
-#: ../src/x_menus.c:45
+#: src/x_menus.c:45
 msgid "/Zoom Extents"
 msgstr "/Toon Alles"
 
-#: ../src/x_menus.c:47
+#: src/x_menus.c:47
 msgid "/Select"
 msgstr "/Selecteer"
 
-#: ../src/x_menus.c:48
+#: src/x_menus.c:48
 msgid "/Edit..."
 msgstr "/Bewerk..."
 
-#: ../src/x_menus.c:49
+#: src/x_menus.c:49
 #, fuzzy
 msgid "/Edit pin type..."
 msgstr "Bewerk Lijn Type"
 
-#: ../src/x_menus.c:50
+#: src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Kopieer"
 
-#: ../src/x_menus.c:51
+#: src/x_menus.c:51
 msgid "/Move"
 msgstr "/Verplaats"
 
-#: ../src/x_menus.c:52
+#: src/x_menus.c:52
 msgid "/Delete"
 msgstr "/Verwijder"
 
-#: ../src/x_menus.c:55
+#: src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/Naar Schema"
 
-#: ../src/x_menus.c:56
+#: src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/Naar Symbool"
 
-#: ../src/x_menus.c:57
+#: src/x_menus.c:57
 msgid "/Up"
 msgstr "/Omhoog"
 
-#: ../src/x_menus.c:316
+#: src/x_menus.c:319
 #, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr ""
 "Probeerde de gevoeligheid in te stellen op een niet bestaand menu_item '%s'\n"
 
-#: ../src/x_menus.c:340
+#: src/x_menus.c:343
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "Popup_menu_item_factory bestaat niet!\n"
 
-#: ../src/x_menus.c:353
+#: src/x_menus.c:356
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 "Probeerde de gevoeligheid in te stellen op een niet bestaand popup "
 "menu_item\n"
 
-#. Remove this entry from all menus
-#: ../src/x_menus.c:462
+#: src/x_menus.c:436
 #, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Kan bestand %s niet openen\n"
 
-#: ../src/x_menus.c:524
+#: src/x_menus.c:493
 msgid "Clear"
 msgstr "Wis"
 
-#: ../src/x_multiattrib.c:861
+#: src/x_multiattrib.c:913
 msgid "Attributes with empty name are not allowed. Please set a name."
 msgstr "Attributen met een lege naam zijn niet toegestaan. Geef een naam."
 
-#: ../src/x_multiattrib.c:1371
+#: src/x_multiattrib.c:1461
 msgid "Show Value only"
 msgstr "Toon alleen Waarde"
 
-#: ../src/x_multiattrib.c:1373
+#: src/x_multiattrib.c:1463
 msgid "Show Name only"
 msgstr "Toon alleen Naam"
 
-#: ../src/x_multiattrib.c:1400
+#: src/x_multiattrib.c:1491
+msgid "Promote"
+msgstr ""
+
+#: src/x_multiattrib.c:1495
 msgid "Duplicate"
 msgstr "Dupliceer"
 
-#: ../src/x_multiattrib.c:1528
+#: src/x_multiattrib.c:1713
 msgid "Edit Attributes"
 msgstr "Bewerk Attribuut"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1648
+#: src/x_multiattrib.c:1831
 msgid "Vis?"
 msgstr "Zichtbaar?"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1668
+#: src/x_multiattrib.c:1849
 msgid "N"
 msgstr "N"
 
 # GtkTreeViewColumn
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1688
+#: src/x_multiattrib.c:1867
 msgid "V"
 msgstr "W"
 
-#: ../src/x_multiattrib.c:1709
+#: src/x_multiattrib.c:1889
+#, fuzzy
+msgid "Show inherited attributes"
+msgstr "Plaats Attribuut"
+
+#: src/x_multiattrib.c:1905
 msgid "Add Attribute"
 msgstr "Plaats Attribuut"
 
-#: ../src/x_pagesel.c:257
+#: src/x_pagesel.c:257
 msgid "Discard Page"
 msgstr "Pagina Wegdoen"
 
-#: ../src/x_pagesel.c:376
+#: src/x_pagesel.c:376
 msgid "Page Manager"
 msgstr "Pagina Manager"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:432
+#: src/x_pagesel.c:432
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:448
+#: src/x_pagesel.c:448
 msgid "Changed"
 msgstr "Veranderd"
 
-#. GtkLabel
-#: ../src/x_pagesel.c:468
+#: src/x_pagesel.c:468
 msgid "Right click on the filename for more options..."
 msgstr "Klik met rechts op de bestandnaam voor meer opties..."
 
-#: ../src/x_preview.c:223
+#: src/x_preview.c:223
 #, fuzzy
 msgid "Preview Buffer"
 msgstr "Plak Buffer"
 
-#: ../src/x_print.c:84
+#: src/x_print.c:84
 msgid "Select PostScript Filename..."
 msgstr "Selecteer Postscript bestandsnaam..."
 
-#: ../src/x_print.c:164
+#: src/x_print.c:164
 msgid "Extents with margins"
 msgstr "Alles met kantlijnen"
 
-#: ../src/x_print.c:170
+#: src/x_print.c:170
 msgid "Extents no margins"
 msgstr "Alles zonder kantlijnen"
 
-#: ../src/x_print.c:176
+#: src/x_print.c:176
 msgid "Current Window"
 msgstr "Huidige Venster"
 
-#: ../src/x_print.c:210
+#: src/x_print.c:210
 msgid "Landscape"
 msgstr "Liggend"
 
-#: ../src/x_print.c:216
+#: src/x_print.c:216
 msgid "Portrait"
 msgstr "Staand"
 
-#. Upper frame
-#: ../src/x_print.c:284
+#: src/x_print.c:284
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ../src/x_print.c:296
+#: src/x_print.c:296
 msgid "Output paper size:"
 msgstr "Uitvoer papier afmeting:"
 
-#: ../src/x_print.c:318
+#: src/x_print.c:318
 msgid "Orientation:"
 msgstr "Orientatie:"
 
-#. Lower frame
-#: ../src/x_print.c:330
+#: src/x_print.c:330
 msgid "Destination"
 msgstr "Bestemming"
 
-#: ../src/x_print.c:343
+#: src/x_print.c:343
 msgid "File:"
 msgstr "Bestand:"
 
-#: ../src/x_print.c:373
+#: src/x_print.c:373
 msgid "Command:"
 msgstr "Commando:"
 
-#: ../src/x_print.c:741
+#: src/x_print.c:741
 msgid "No print destination specified\n"
 msgstr "Geen afdruk bestemming opgegeven\n"
 
-#: ../src/x_print.c:748
+#: src/x_print.c:748
 #, c-format
 msgid "Cannot print current schematic to [%s]\n"
 msgstr "Kan huidige schema niet afdrukken op [%s]\n"
 
-#: ../src/x_print.c:757
+#: src/x_print.c:757
 #, c-format
 msgid ""
 "Error printing to file '%s'\n"
@@ -2328,45 +2307,45 @@ msgstr ""
 "Fout bij afdrukken naar bestand '%s'\n"
 "Controleer het log venster voor meer informatie"
 
-#: ../src/x_print.c:764
+#: src/x_print.c:764
 #, c-format
 msgid "Printed current schematic to [%s]\n"
 msgstr "Huidig schema afgedrukt op [%s]\n"
 
-#: ../src/x_window.c:81
+#: src/x_window.c:81
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr "Kan gc niet toewijzen\n"
 
-#: ../src/x_window.c:317
+#: src/x_window.c:317
 msgid "New file"
 msgstr "Nieuw bestand"
 
-#: ../src/x_window.c:323
+#: src/x_window.c:323
 msgid "Open"
 msgstr "Open"
 
-#: ../src/x_window.c:324
+#: src/x_window.c:324
 msgid "Open file..."
 msgstr "Open bestand..."
 
-#: ../src/x_window.c:330
+#: src/x_window.c:330
 msgid "Save"
 msgstr "Opslaan"
 
-#: ../src/x_window.c:331
+#: src/x_window.c:331
 msgid "Save file"
 msgstr "Opslaan bestand"
 
-#: ../src/x_window.c:339
+#: src/x_window.c:339
 msgid "Undo last operation"
 msgstr "Maak laatste bewerking ongedaan"
 
-#: ../src/x_window.c:346
+#: src/x_window.c:346
 msgid "Redo last undo"
 msgstr "Herstel de laatste ongedaanmaking"
 
-#: ../src/x_window.c:355
+#: src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2378,7 +2357,7 @@ msgstr ""
 "muisindicator in het hoofdvensterklik om component te plaatsen\n"
 "Rechter muisknop om af te breken"
 
-#: ../src/x_window.c:365
+#: src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2386,7 +2365,7 @@ msgstr ""
 "Plaats draden modus\n"
 "Rechter muisknop om af te breken"
 
-#: ../src/x_window.c:375
+#: src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2394,90 +2373,89 @@ msgstr ""
 "Plaats bussen modus\n"
 "Rechter muisknop om af te breken"
 
-#: ../src/x_window.c:383
+#: src/x_window.c:383
 msgid "Add Text..."
 msgstr "Plaats een tekst..."
 
-#: ../src/x_window.c:393
+#: src/x_window.c:393
 msgid "Select"
 msgstr "Selecteer"
 
-#: ../src/x_window.c:394
+#: src/x_window.c:394
 msgid "Select mode"
 msgstr "Selectie mode"
 
-#: ../src/x_window.c:481
+#: src/x_window.c:481
 msgid "Pick"
 msgstr "Pak"
 
-#: ../src/x_window.c:497
+#: src/x_window.c:497
 msgid "Repeat/none"
 msgstr "Herhaal/geen"
 
-#: ../src/x_window.c:507
+#: src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "Menu/Afbreken"
 
-#: ../src/x_window.c:509
+#: src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "Schuif/Afbreken"
 
-#: ../src/x_window.c:733
+#: src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Bezig met laden van schema [%s]\n"
 
-#: ../src/x_window.c:745
+#: src/x_window.c:745
 msgid "Failed to load file"
 msgstr "Fout bij het lezen van bestand"
 
-#: ../src/x_window.c:754
+#: src/x_window.c:754
 #, c-format
 msgid "New file [%s]\n"
 msgstr "Nieuw bestand [%s]\n"
 
-#. an error occured when saving page to file
-#: ../src/x_window.c:859
+#: src/x_window.c:859
 #, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Pagina [%s] kan NIET opgeslagen worden\n"
 
-#: ../src/x_window.c:860
+#: src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Fout tijdens het opslaan"
 
-#: ../src/x_window.c:869
+#: src/x_window.c:869
 #, c-format
 msgid "Saved as [%s]\n"
 msgstr "Opgeslagen Als [%s]\n"
 
-#: ../src/x_window.c:871
+#: src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Opgeslagen [%s]\n"
 
-#: ../src/x_window.c:873
+#: src/x_window.c:873
 msgid "Saved"
 msgstr "Opgeslagen"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Pagina [%s] wegdoen\n"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Sluiten [%s]\n"
 
-#: ../data/geda-gschem.desktop.in.h:1
-msgid "Create and edit electrical schematics and symbols with gschem"
-msgstr "Creer en bewerk elektrische schema's en symbolen met gschem"
-
-#: ../data/geda-gschem.desktop.in.h:2
+#: data/geda-gschem.desktop.in.h:3
 msgid "gEDA Schematic Editor"
 msgstr "gEDA schema bewerking"
 
+#: data/geda-gschem.desktop.in.h:4
+msgid "Create and edit electrical schematics and symbols with gschem"
+msgstr "Creer en bewerk elektrische schema's en symbolen met gschem"
+
 #~ msgid "Cut Buffer"
 #~ msgstr "Knip Buffer"
 
diff --git a/gschem/po/pt_BR.po b/gschem/po/pt_BR.po
index ac3adda..65075d6 100644
--- a/gschem/po/pt_BR.po
+++ b/gschem/po/pt_BR.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 14:35-0400\n"
+"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
+"POT-Creation-Date: 2009-06-18 11:53+0100\n"
 "PO-Revision-Date: 2008-12-20 14:24+0000\n"
 "Last-Translator: \n"
 "Language-Team:  <pt@xxxxxx>\n"
@@ -16,626 +16,616 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../src/rcstrings.c:2
+#: src/rcstrings.c:2
 msgid "File"
 msgstr "Arquivo"
 
-#: ../src/rcstrings.c:3
+#: src/rcstrings.c:3
 msgid "New Window"
 msgstr "Nova Janela"
 
-#: ../src/rcstrings.c:4 ../src/x_pagesel.c:252
+#: src/rcstrings.c:4 src/x_pagesel.c:252
 msgid "New Page"
 msgstr "Nova Página"
 
-#: ../src/rcstrings.c:5 ../src/x_pagesel.c:253
+#: src/rcstrings.c:5 src/x_pagesel.c:253
 msgid "Open Page..."
 msgstr "Abrir Página..."
 
-#: ../src/rcstrings.c:6 ../src/x_pagesel.c:256
+#: src/rcstrings.c:6 src/x_pagesel.c:256
 msgid "Close Page"
 msgstr "Fechar Página"
 
-#: ../src/rcstrings.c:7
+#: src/rcstrings.c:7
 msgid "Revert Page"
 msgstr "Reverter Página"
 
-#: ../src/rcstrings.c:8 ../src/x_pagesel.c:255
+#: src/rcstrings.c:8 src/x_pagesel.c:255
 msgid "Save Page"
 msgstr "Salvar"
 
-#: ../src/rcstrings.c:9
+#: src/rcstrings.c:9
 msgid "Save Page As..."
 msgstr "Salvar Como..."
 
-#: ../src/rcstrings.c:10
+#: src/rcstrings.c:10
 msgid "Save All"
 msgstr "Salvar Tudo"
 
-#. GtkWindow
-#: ../src/rcstrings.c:11 ../src/x_print.c:276
+#: src/rcstrings.c:11 src/x_print.c:276
 msgid "Print..."
 msgstr "Imprimir..."
 
-#. Create the dialog
-#: ../src/rcstrings.c:12 ../src/x_image.c:495
+#: src/rcstrings.c:12 src/x_image.c:495
 #, fuzzy
 msgid "Write image..."
 msgstr "Salvar Imagem..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:501
+#: src/rcstrings.c:13
 #, fuzzy
 msgid "Recent files"
 msgstr "Novo arquivo"
 
-#: ../src/rcstrings.c:14 ../src/x_script.c:47
+#: src/rcstrings.c:14 src/x_script.c:47
 msgid "Execute Script..."
 msgstr "Script..."
 
-#: ../src/rcstrings.c:15
+#: src/rcstrings.c:15
 msgid "Close Window"
 msgstr "Fechando Janela"
 
-#: ../src/rcstrings.c:16
+#: src/rcstrings.c:16
 msgid "Quit"
 msgstr "Sair"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
+#: src/rcstrings.c:18 src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Editar"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:338
+#: src/rcstrings.c:19 src/x_window.c:338
 msgid "Undo"
 msgstr "Desfazer"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:345
+#: src/rcstrings.c:20 src/x_window.c:345
 msgid "Redo"
 msgstr "Refazer"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
+#: src/rcstrings.c:21 src/i_basic.c:77 src/x_window.c:521
 msgid "Select Mode"
 msgstr "Modo de Seleção"
 
-#: ../src/rcstrings.c:22
+#: src/rcstrings.c:22
 #, fuzzy
 msgid "Cut"
 msgstr "Cortar para 1"
 
-#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
-#: ../src/i_callbacks.c:560
+#: src/rcstrings.c:23 src/i_basic.c:135 src/i_callbacks.c:536
+#: src/i_callbacks.c:560
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../src/rcstrings.c:24
+#: src/rcstrings.c:24
 #, fuzzy
 msgid "Paste"
 msgstr "Colar de 1"
 
-#: ../src/rcstrings.c:25
+#: src/rcstrings.c:25
 msgid "Edit..."
 msgstr "Editar..."
 
-#: ../src/rcstrings.c:26
+#: src/rcstrings.c:26
 msgid "Edit Text..."
 msgstr "Editar Texto..."
 
-#: ../src/rcstrings.c:27 ../src/i_basic.c:84
+#: src/rcstrings.c:27 src/i_basic.c:84
 msgid "Copy Mode"
 msgstr "Modo de Cópia"
 
-#: ../src/rcstrings.c:28 ../src/i_basic.c:142
+#: src/rcstrings.c:28 src/i_basic.c:142
 msgid "Multiple Copy Mode"
 msgstr "Modo de Múltipla Cópia"
 
-#: ../src/rcstrings.c:29 ../src/i_basic.c:87
+#: src/rcstrings.c:29 src/i_basic.c:87
 msgid "Move Mode"
 msgstr "Modo de Movimentação"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
+#: src/rcstrings.c:30 src/i_callbacks.c:670 src/x_multiattrib.c:1496
 msgid "Delete"
 msgstr "Apagar"
 
-#: ../src/rcstrings.c:31
+#: src/rcstrings.c:31
 msgid "Rotate 90 Mode"
 msgstr "Modo de Rotação"
 
-#: ../src/rcstrings.c:32 ../src/i_basic.c:91
+#: src/rcstrings.c:32 src/i_basic.c:91
 msgid "Mirror Mode"
 msgstr "Modo de espelho"
 
-#: ../src/rcstrings.c:33
+#: src/rcstrings.c:33
 msgid "Slot..."
 msgstr ""
 
-#: ../src/rcstrings.c:34
+#: src/rcstrings.c:34
 msgid "Color..."
 msgstr "Cor..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
+#: src/rcstrings.c:35 src/i_callbacks.c:920 src/x_dialog.c:2411
 msgid "Lock"
 msgstr "Bloquear"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
+#: src/rcstrings.c:36 src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: ../src/rcstrings.c:37
+#: src/rcstrings.c:37
 msgid "Line Width & Type..."
 msgstr "Largura/Tipo de Linha..."
 
-#: ../src/rcstrings.c:38
+#: src/rcstrings.c:38
 msgid "Fill Type..."
 msgstr "Preenchimento..."
 
-#: ../src/rcstrings.c:39
+#: src/rcstrings.c:39
 msgid "Symbol Translate..."
 msgstr "Transladar..."
 
-#: ../src/rcstrings.c:40
+#: src/rcstrings.c:40
 msgid "Embed Component/Picture"
 msgstr "Embutir Componente/Imagem"
 
-#: ../src/rcstrings.c:41
+#: src/rcstrings.c:41
 msgid "Unembed Component/Picture"
 msgstr "Desembutir Componente/Imagem"
 
-#: ../src/rcstrings.c:42
+#: src/rcstrings.c:42
 msgid "Update Component"
 msgstr "Atualizar Componente"
 
-#: ../src/rcstrings.c:43
+#: src/rcstrings.c:43
 msgid "Show/Hide Inv Text"
 msgstr "Exibir/Ocultar textos ocultos"
 
-#: ../src/rcstrings.c:44
+#: src/rcstrings.c:44
 msgid "Make Inv Text Vis"
 msgstr "Tornar todos textos visíveis"
 
-#: ../src/rcstrings.c:46
+#: src/rcstrings.c:46
 msgid "Buffer"
 msgstr "Buffer"
 
-#: ../src/rcstrings.c:47
+#: src/rcstrings.c:47
 msgid "Copy into 1"
 msgstr "Copiar para 1"
 
-#: ../src/rcstrings.c:48
+#: src/rcstrings.c:48
 msgid "Copy into 2"
 msgstr "Copiar para 2"
 
-#: ../src/rcstrings.c:49
+#: src/rcstrings.c:49
 msgid "Copy into 3"
 msgstr "Copiar para 3"
 
-#: ../src/rcstrings.c:50
+#: src/rcstrings.c:50
 msgid "Copy into 4"
 msgstr "Copiar para 4"
 
-#: ../src/rcstrings.c:51
+#: src/rcstrings.c:51
 msgid "Copy into 5"
 msgstr "Copiar para 5"
 
-#: ../src/rcstrings.c:52
+#: src/rcstrings.c:52
 msgid "Cut into 1"
 msgstr "Cortar para 1"
 
-#: ../src/rcstrings.c:53
+#: src/rcstrings.c:53
 msgid "Cut into 2"
 msgstr "Cortar para 2"
 
-#: ../src/rcstrings.c:54
+#: src/rcstrings.c:54
 msgid "Cut into 3"
 msgstr "Cortar para 3"
 
-#: ../src/rcstrings.c:55
+#: src/rcstrings.c:55
 msgid "Cut into 4"
 msgstr "Cortar para 4"
 
-#: ../src/rcstrings.c:56
+#: src/rcstrings.c:56
 msgid "Cut into 5"
 msgstr "Cortar para 5"
 
-#: ../src/rcstrings.c:57
+#: src/rcstrings.c:57
 msgid "Paste from 1"
 msgstr "Colar de 1"
 
-#: ../src/rcstrings.c:58
+#: src/rcstrings.c:58
 msgid "Paste from 2"
 msgstr "Colar de 2"
 
-#: ../src/rcstrings.c:59
+#: src/rcstrings.c:59
 msgid "Paste from 3"
 msgstr "Colar de 3"
 
-#: ../src/rcstrings.c:60
+#: src/rcstrings.c:60
 msgid "Paste from 4"
 msgstr "Colar de 4"
 
-#: ../src/rcstrings.c:61
+#: src/rcstrings.c:61
 msgid "Paste from 5"
 msgstr "Colar de 5"
 
-#: ../src/rcstrings.c:63
+#: src/rcstrings.c:63
 msgid "View"
 msgstr "Exibir"
 
-#: ../src/rcstrings.c:64
+#: src/rcstrings.c:64
 msgid "Redraw"
 msgstr "Redesenhar"
 
-#. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
+#: src/rcstrings.c:65 src/i_callbacks.c:1474 src/i_callbacks.c:1546
 msgid "Pan"
 msgstr "Pan"
 
-#: ../src/rcstrings.c:66 ../src/i_basic.c:95
+#: src/rcstrings.c:66 src/i_basic.c:95
 msgid "Zoom Box"
 msgstr "Caixa de Zoom"
 
-#: ../src/rcstrings.c:67
+#: src/rcstrings.c:67
 msgid "Zoom Extents"
 msgstr "Zoom desenho"
 
-#: ../src/rcstrings.c:68
+#: src/rcstrings.c:68
 msgid "Zoom In"
 msgstr "Zoom maior"
 
-#: ../src/rcstrings.c:69
+#: src/rcstrings.c:69
 msgid "Zoom Out"
 msgstr "Zoom menor"
 
-#: ../src/rcstrings.c:70
+#: src/rcstrings.c:70
 msgid "Zoom Full"
 msgstr "Zoom total"
 
-#: ../src/rcstrings.c:71
+#: src/rcstrings.c:71
 msgid "Dark color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:72
+#: src/rcstrings.c:72
 msgid "Light color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:74
+#: src/rcstrings.c:74
 msgid "Page"
 msgstr "Página"
 
-#: ../src/rcstrings.c:75
+#: src/rcstrings.c:75
 msgid "Manager..."
 msgstr "Gerenciador..."
 
-#: ../src/rcstrings.c:76
+#: src/rcstrings.c:76
 msgid "Next"
 msgstr "Próxima"
 
-#: ../src/rcstrings.c:77
+#: src/rcstrings.c:77
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../src/rcstrings.c:78 ../src/x_window.c:316
+#: src/rcstrings.c:78 src/x_window.c:316
 msgid "New"
 msgstr "Novo"
 
-#: ../src/rcstrings.c:79
+#: src/rcstrings.c:79
 msgid "Revert"
 msgstr "Reverter"
 
-#: ../src/rcstrings.c:80
+#: src/rcstrings.c:80
 msgid "Close"
 msgstr "Fechar"
 
-#: ../src/rcstrings.c:81
+#: src/rcstrings.c:81
 msgid "Discard"
 msgstr "Descartar"
 
-#: ../src/rcstrings.c:83
+#: src/rcstrings.c:83
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../src/rcstrings.c:84
+#: src/rcstrings.c:84
 msgid "Component..."
 msgstr "Componente..."
 
-#. need to click
-#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
-#: ../src/x_dialog.c:2376
+#: src/rcstrings.c:85 src/i_callbacks.c:2401 src/i_callbacks.c:2428
+#: src/x_dialog.c:2378
 msgid "Net"
 msgstr "Conexão"
 
-#. need to click
-#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
-#: ../src/x_dialog.c:2394 ../src/x_window.c:374
+#: src/rcstrings.c:86 src/i_callbacks.c:2472 src/i_callbacks.c:2499
+#: src/x_dialog.c:2396 src/x_window.c:374
 msgid "Bus"
 msgstr "Barramento"
 
-#: ../src/rcstrings.c:87
+#: src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "Atributo..."
 
-#: ../src/rcstrings.c:88
+#: src/rcstrings.c:88
 msgid "Text..."
 msgstr "Texto..."
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
+#: src/rcstrings.c:89 src/i_callbacks.c:2580 src/i_callbacks.c:2603
 msgid "Line"
 msgstr "Linha"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
+#: src/rcstrings.c:90 src/i_callbacks.c:2625 src/i_callbacks.c:2648
 msgid "Box"
 msgstr "Caixa"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
+#: src/rcstrings.c:91 src/i_callbacks.c:2704 src/i_callbacks.c:2728
 msgid "Circle"
 msgstr "Círculo"
 
-#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
+#: src/rcstrings.c:92 src/i_callbacks.c:2750 src/i_callbacks.c:2773
 msgid "Arc"
 msgstr "Arco"
 
-#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
-#: ../src/x_dialog.c:2367
+#: src/rcstrings.c:93 src/i_callbacks.c:2795 src/i_callbacks.c:2818
+#: src/x_dialog.c:2369
 msgid "Pin"
 msgstr "Pino"
 
-#: ../src/rcstrings.c:94
+#: src/rcstrings.c:94
 msgid "Picture..."
 msgstr "Imagem..."
 
-#: ../src/rcstrings.c:96
+#: src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "Hierarquia"
 
-#: ../src/rcstrings.c:97
+#: src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "Descer ao Esquemático"
 
-#: ../src/rcstrings.c:98
+#: src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "Descer ao Símbolo"
 
-#: ../src/rcstrings.c:99
+#: src/rcstrings.c:99
 msgid "Up"
 msgstr "Subir"
 
-#: ../src/rcstrings.c:100
+#: src/rcstrings.c:100
 msgid "Documentation"
 msgstr "Documentação"
 
-#. GtkFrame
-#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
-#: ../src/x_multiattrib.c:1543
+#: src/rcstrings.c:102 src/x_compselect.c:1417
 msgid "Attributes"
 msgstr "Atributos"
 
-#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
+#: src/rcstrings.c:103 src/i_callbacks.c:3089
 msgid "Attach"
 msgstr "Anexar"
 
-#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
+#: src/rcstrings.c:104 src/i_callbacks.c:3136
 msgid "Detach"
 msgstr "Desanexar"
 
-#: ../src/rcstrings.c:105
+#: src/rcstrings.c:105
 msgid "Show Value"
 msgstr "Mostra Valor"
 
-#: ../src/rcstrings.c:106
+#: src/rcstrings.c:106
 msgid "Show Name"
 msgstr "Mostra Nome"
 
-#: ../src/rcstrings.c:107
+#: src/rcstrings.c:107
 msgid "Show Both"
 msgstr "Mostrar Ambos"
 
-#: ../src/rcstrings.c:108
+#: src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "Comuta Visibilidade"
 
-#: ../src/rcstrings.c:109
+#: src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "Procurar texto..."
 
-#: ../src/rcstrings.c:110
+#: src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "Ocultar Texto..."
 
-#: ../src/rcstrings.c:111
+#: src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "Exibir Texto..."
 
-#: ../src/rcstrings.c:112
+#: src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr "Autonumerar..."
 
-#: ../src/rcstrings.c:114
+#: src/rcstrings.c:114
 msgid "Options"
 msgstr "Opções"
 
-#: ../src/rcstrings.c:115
+#: src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "Tamanho do Texto..."
 
-#: ../src/rcstrings.c:116
+#: src/rcstrings.c:116
 msgid "Cycle grid styles"
 msgstr ""
 
-#: ../src/rcstrings.c:117
+#: src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr "Liga/Desliga Agarre"
 
-#: ../src/rcstrings.c:118
+#: src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "Grade de Agarre..."
 
-#: ../src/rcstrings.c:119
+#: src/rcstrings.c:119
 #, fuzzy
 msgid "Scale up Grid Spacing"
 msgstr "Grade de Agarre..."
 
-#: ../src/rcstrings.c:120
+#: src/rcstrings.c:120
 #, fuzzy
 msgid "Scale down Grid Spacing"
 msgstr "Grade de Agarre..."
 
-#: ../src/rcstrings.c:121
+#: src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr "Silhueta/Caixa"
 
-#: ../src/rcstrings.c:122
+#: src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr "Lig/Desliga elástico"
 
-#: ../src/rcstrings.c:123
+#: src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "Exibir janela de Log"
 
-#: ../src/rcstrings.c:124
+#: src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "Exibir janela de Coord."
 
-#: ../src/rcstrings.c:126
+#: src/rcstrings.c:126
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/rcstrings.c:127
+#: src/rcstrings.c:127
 #, fuzzy
 msgid "Manual"
 msgstr "Manual..."
 
-#: ../src/rcstrings.c:128
+#: src/rcstrings.c:128
 #, fuzzy
 msgid "gEDA Documentation"
 msgstr "Documentação"
 
-#: ../src/rcstrings.c:129
+#: src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr ""
 
-#: ../src/rcstrings.c:130
+#: src/rcstrings.c:130
 #, fuzzy
 msgid "Component Documentation"
 msgstr "Documentação"
 
-#: ../src/rcstrings.c:131
+#: src/rcstrings.c:131
 msgid "About gschem"
 msgstr ""
 
-#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
+#: src/rcstrings.c:132 src/x_dialog.c:2724
 #, fuzzy
 msgid "Hotkeys"
 msgstr "Atalhos..."
 
-#: ../src/a_zoom.c:212
+#: src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Zoom muito pequeno! Não posso diminuir. \n"
 
-#. Fork failed. Still in parent process, so can use the log
-#. * window
-#: ../src/g_funcs.c:339 ../src/i_callbacks.c:68
+#: src/g_funcs.c:339 src/i_callbacks.c:68
 #, c-format
 msgid "Could not fork\n"
 msgstr ""
 
-#. if we return, then nothing happened
-#: ../src/g_funcs.c:355 ../src/i_callbacks.c:78
+#: src/g_funcs.c:355 src/i_callbacks.c:78
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr "Impossível invocar %s!\n"
 
-#: ../src/g_funcs.c:361 ../src/i_callbacks.c:82
+#: src/g_funcs.c:361 src/i_callbacks.c:82
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr ""
 
-#: ../src/g_rc.c:292
+#: src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Fator de Zoom [%d] inválido passado para %s\n"
 
-#: ../src/g_rc.c:418
+#: src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Tamanho [%d] inválido (text-size)\n"
 
-#: ../src/g_rc.c:445
+#: src/g_rc.c:445
 #, fuzzy, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "Tamanho [%d] inválido (text-size)\n"
 
-#: ../src/g_rc.c:488
+#: src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Tamanho [%d] inválido passado tamanho de grade\n"
 
-#: ../src/g_rc.c:960
+#: src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr ""
 "Número de níveis [%d] inválido para função desfaz passado para undo-level\n"
 
-#: ../src/g_rc.c:1218
+#: src/g_rc.c:1218
 #, fuzzy, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "Tamanho [%d] inválido passado tamanho de grade\n"
 
-#: ../src/g_rc.c:1293
+#: src/g_rc.c:1293
 #, fuzzy, c-format
 msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr "Tamanho [%d] inválido (text-size)\n"
 
-#: ../src/g_rc.c:1334
+#: src/g_rc.c:1334
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 msgstr "Tamanho [%d] inválido (text-size)\n"
 
-#: ../src/g_rc.c:1360
+#: src/g_rc.c:1360
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 msgstr "Tamanho [%d] inválido (text-size)\n"
 
-#: ../src/g_rc.c:1404
+#: src/g_rc.c:1404
 #, fuzzy, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "Tamanho [%d] inválido (text-size)\n"
 
-#: ../src/g_rc.c:1428
+#: src/g_rc.c:1428
 #, fuzzy, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr ""
 "Número de níveis [%d] inválido para função desfaz passado para undo-level\n"
 
-#: ../src/g_rc.c:1469
+#: src/g_rc.c:1469
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Tamanho [%d] inválido passado tamanho de grade\n"
 
-#: ../src/g_rc.c:1492
+#: src/g_rc.c:1492
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Tamanho [%d] inválido passado tamanho de grade\n"
 
-#: ../src/g_rc.c:1538
+#: src/g_rc.c:1538
 #, fuzzy, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr ""
 "Número de níveis [%d] inválido para função desfaz passado para undo-level\n"
 
-#: ../src/g_rc.c:1564
+#: src/g_rc.c:1564
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "Tamanho [%d] inválido passado tamanho de grade\n"
 
-#: ../src/g_rc.c:1589
+#: src/g_rc.c:1589
 #, fuzzy, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr ""
 "Número de níveis [%d] inválido para função desfaz passado para undo-level\n"
 
-#: ../src/gschem.c:183 ../src/gschem.c:194
+#: src/gschem.c:183 src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "gEDA/gschem versão %s%s.%s\n"
 
-#: ../src/gschem.c:186 ../src/gschem.c:197
+#: src/gschem.c:186 src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -644,7 +634,7 @@ msgstr ""
 "gEDA/gschem vem com ABSOLUTAMENTE NENHUMA GARANTIA; leia o arquivo COPYING "
 "para maiores detalhes.\n"
 
-#: ../src/gschem.c:188 ../src/gschem.c:199
+#: src/gschem.c:188 src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -652,24 +642,24 @@ msgstr ""
 "Este programa é um software livre, e você é convidado a redistribui-lo sob "
 "certas\n"
 
-#: ../src/gschem.c:190 ../src/gschem.c:201
+#: src/gschem.c:190 src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
 "\n"
 msgstr "condições; Leia o arquivo COPYING para maiores detalhes.\n"
 
-#: ../src/gschem.c:205
+#: src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "Esta é a versão portada para MINGW32.\n"
 
-#: ../src/gschem.c:209
+#: src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "Configuração para Localização: %s\n"
 
-#: ../src/gschem.c:224
+#: src/gschem.c:224
 msgid ""
 "You must set the GEDADATA environment variable!\n"
 "\n"
@@ -677,611 +667,631 @@ msgid ""
 "environment variable to point to the correct location.\n"
 msgstr ""
 
-#: ../src/gschem.c:251
+#: src/gschem.c:251
 #, fuzzy, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "Falhou ao ler o arquivo scm [%s]\n"
 
-#: ../src/gschem.c:255
+#: src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "Lendo o arquivo scm [%s]\n"
 
-#. ! \todo These two messages are the same. Should be
-#. * integrated.
-#: ../src/gschem.c:259
+#: src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Falhou ao ler o arquivo scm [%s]\n"
 
-#: ../src/gschem.c:320
+#: src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Diretório Scheme N�O ajustado!\n"
 
-#: ../src/gschem.c:327 ../src/x_script.c:66
+#: src/gschem.c:327 src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Executando script guile [%s]\n"
 
-#: ../src/gschem_cairo.c:310
+#: src/gschem_accel_label.c:319
+msgid "Accelerator Closure"
+msgstr ""
+
+#: src/gschem_accel_label.c:320
+msgid "The closure to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:326
+msgid "Accelerator Widget"
+msgstr ""
+
+#: src/gschem_accel_label.c:327
+msgid "The widget to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:333
+#, fuzzy
+msgid "Accelerator String"
+msgstr "String geral"
+
+#: src/gschem_accel_label.c:334
+msgid "The accelerator string to be displayed"
+msgstr ""
+
+#: src/gschem_cairo.c:310
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "Fim desconhecido para linha (%d)!\n"
 
-#: ../src/gschem_cairo.c:318
+#: src/gschem_cairo.c:318
 #, fuzzy, c-format
 msgid "Unknown type for stroke (%d) !\n"
 msgstr "Tipo desconhecido para linha (%d)!\n"
 
-#: ../src/i_basic.c:79
+#: src/i_basic.c:79
 msgid "Component Mode"
 msgstr "Modo de Componente"
 
-#: ../src/i_basic.c:81
+#: src/i_basic.c:81
 msgid "Text Mode"
 msgstr "Modo Texto"
 
-#: ../src/i_basic.c:89
+#: src/i_basic.c:89
 msgid "Rotate Mode"
 msgstr "Modo de Rotação"
 
-#: ../src/i_basic.c:99
+#: src/i_basic.c:99
 msgid "Pan Mode"
 msgstr "Modo Pan"
 
-#: ../src/i_basic.c:103
+#: src/i_basic.c:103
 #, c-format
 msgid "Paste %d Mode"
 msgstr "Modo Colar de %d"
 
-#: ../src/i_basic.c:109
+#: src/i_basic.c:109
 #, fuzzy
 msgid "Magnetic Net Mode"
 msgstr "Modo de Conexão (NET)"
 
-#: ../src/i_basic.c:111
+#: src/i_basic.c:111
 msgid "Net Mode"
 msgstr "Modo de Conexão (NET)"
 
-#: ../src/i_basic.c:115
+#: src/i_basic.c:115
 msgid "Bus Mode"
 msgstr "Modo Barramento (BUS)"
 
-#: ../src/i_basic.c:118
+#: src/i_basic.c:118
 msgid "Line Mode"
 msgstr "Modo de Linha"
 
-#: ../src/i_basic.c:121
+#: src/i_basic.c:121
 msgid "Box Mode"
 msgstr "Modo de Caixa"
 
-#: ../src/i_basic.c:124
+#: src/i_basic.c:124
 msgid "Picture Mode"
 msgstr "Modo Imagem"
 
-#: ../src/i_basic.c:127
+#: src/i_basic.c:127
 msgid "Circle Mode"
 msgstr "Modo de Círculo"
 
-#: ../src/i_basic.c:130
+#: src/i_basic.c:130
 msgid "Arc Mode"
 msgstr "Modo de Arco"
 
-#: ../src/i_basic.c:133
+#: src/i_basic.c:133
 msgid "Pin Mode"
 msgstr "Modo de Pino"
 
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
+#: src/i_basic.c:137 src/i_callbacks.c:626 src/i_callbacks.c:650
 msgid "Move"
 msgstr "Mover"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
+#: src/i_basic.c:139 src/i_callbacks.c:581 src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Multipla Cópia"
 
-#: ../src/i_basic.c:168
+#: src/i_basic.c:168
 msgid "Show Hidden"
 msgstr "Mostrar Oculto"
 
-#: ../src/i_basic.c:171
+#: src/i_basic.c:171
 msgid "Snap Off"
 msgstr "Agarre desligado"
 
-#: ../src/i_basic.c:173
+#: src/i_basic.c:173
 msgid "Resnap Active"
 msgstr ""
 
-#: ../src/i_basic.c:254 ../src/x_window.c:495
+#: src/i_basic.c:254 src/x_window.c:495
 msgid "Action"
 msgstr "Ação"
 
-#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
+#: src/i_basic.c:260 src/x_dialog.c:2408 src/x_window.c:490
 msgid "Stroke"
 msgstr "Stroke"
 
-#: ../src/i_basic.c:266 ../src/x_window.c:492
+#: src/i_basic.c:266 src/x_window.c:492
 msgid "none"
 msgstr "nenhum"
 
-#: ../src/i_basic.c:271
+#: src/i_basic.c:271
 msgid "Repeat/"
 msgstr "Repetir/"
 
-#: ../src/i_basic.c:549 ../src/i_basic.c:563
+#: src/i_basic.c:549 src/i_basic.c:563
 msgid "OFF"
 msgstr ""
 
-#: ../src/i_basic.c:567
+#: src/i_basic.c:567
 msgid "NONE"
 msgstr ""
 
-#: ../src/i_basic.c:572
+#: src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr ""
 
-#: ../src/i_callbacks.c:63
+#: src/i_callbacks.c:63
 #, c-format
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Documentação para [%s,%s,%s,%s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
+#: src/i_callbacks.c:123 src/i_callbacks.c:1705
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Criada Nova Página [%s]\n"
 
-#: ../src/i_callbacks.c:163
+#: src/i_callbacks.c:163
 #, fuzzy, c-format
 msgid "New Window created [%s]\n"
 msgstr "Nova janela criada\n"
 
-#: ../src/i_callbacks.c:281
+#: src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "Falha ao salvar tudo"
 
-#: ../src/i_callbacks.c:283
+#: src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Salvar Tudo"
 
-#: ../src/i_callbacks.c:373
+#: src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "Fechando Janela\n"
 
-#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
+#: src/i_callbacks.c:541 src/i_callbacks.c:586 src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "Selecione objetos antes"
 
-#: ../src/i_callbacks.c:710
+#: src/i_callbacks.c:710
 #, fuzzy
 msgid "Edit pin type"
 msgstr "Editar Tipo de Linha"
 
-#: ../src/i_callbacks.c:729
+#: src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Editar Texto"
 
-#: ../src/i_callbacks.c:752
+#: src/i_callbacks.c:752
 msgid "Slot"
 msgstr "Slot"
 
-#: ../src/i_callbacks.c:769
+#: src/i_callbacks.c:769
 msgid "Color"
 msgstr "Cor"
 
-#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
+#: src/i_callbacks.c:806 src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Rotacionar"
 
-#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
+#: src/i_callbacks.c:874 src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Espelhar"
 
-#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
+#: src/i_callbacks.c:956 src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Transladar"
 
-#: ../src/i_callbacks.c:959
+#: src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "ATEN��O: Não translade com o agarre (snap) desligado!\n"
 
-#: ../src/i_callbacks.c:960
+#: src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr "ATENÃ?Ã?O: Ligando o agarre e continuando o translado.\n"
 
-#: ../src/i_callbacks.c:967
+#: src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "ATEN��O: A grade de agarre não está em 100!\n"
 
-#: ../src/i_callbacks.c:969
+#: src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
 msgstr ""
 "ATEN��O: Se transladar um símbolo para origem, a grade deve estar em 100\n"
 
-#: ../src/i_callbacks.c:1000
+#: src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "Embutir"
 
-#: ../src/i_callbacks.c:1041
+#: src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "Desembutir"
 
-#: ../src/i_callbacks.c:1084
+#: src/i_callbacks.c:1085
 msgid "Update"
 msgstr "Atualizar"
 
-#: ../src/i_callbacks.c:1141
+#: src/i_callbacks.c:1144
 msgid "ShowHidden"
 msgstr "Mostrar Oculto"
 
-#: ../src/i_callbacks.c:1165
+#: src/i_callbacks.c:1168
 msgid "MakeVisible"
 msgstr "Deixar Visível"
 
-#: ../src/i_callbacks.c:1562
+#: src/i_callbacks.c:1565
 msgid "Update Cues"
 msgstr "Atualiza dicas"
 
-#: ../src/i_callbacks.c:1746
+#: src/i_callbacks.c:1749
 msgid "Really revert page?"
 msgstr "Reverter Página?"
 
-#: ../src/i_callbacks.c:1816
+#: src/i_callbacks.c:1819
 msgid "Copy to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1834
+#: src/i_callbacks.c:1837
 msgid "Cut to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1852
+#: src/i_callbacks.c:1855
 #, fuzzy
 msgid "Paste from clipboard"
 msgstr "Colar de 1"
 
-#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
-#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
-#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+#: src/i_callbacks.c:1867 src/i_callbacks.c:2106 src/i_callbacks.c:2128
+#: src/i_callbacks.c:2150 src/i_callbacks.c:2172 src/i_callbacks.c:2194
 msgid "Empty buffer"
 msgstr "Buffer vazio"
 
-#: ../src/i_callbacks.c:1909
+#: src/i_callbacks.c:1912
 msgid "Copy 1"
 msgstr "Copiar para 1"
 
-#: ../src/i_callbacks.c:1928
+#: src/i_callbacks.c:1931
 msgid "Copy 2"
 msgstr "Copiar para 2"
 
-#: ../src/i_callbacks.c:1947
+#: src/i_callbacks.c:1950
 msgid "Copy 3"
 msgstr "Copiar para 3"
 
-#: ../src/i_callbacks.c:1966
+#: src/i_callbacks.c:1969
 msgid "Copy 4"
 msgstr "Copiar para 4"
 
-#: ../src/i_callbacks.c:1985
+#: src/i_callbacks.c:1988
 msgid "Copy 5"
 msgstr "Copiar para 5"
 
-#: ../src/i_callbacks.c:2004
+#: src/i_callbacks.c:2007
 msgid "Cut 1"
 msgstr "Cortar para 1"
 
-#: ../src/i_callbacks.c:2023
+#: src/i_callbacks.c:2026
 msgid "Cut 2"
 msgstr "Cortar para 2"
 
-#: ../src/i_callbacks.c:2042
+#: src/i_callbacks.c:2045
 msgid "Cut 3"
 msgstr "Cortar para 3"
 
-#: ../src/i_callbacks.c:2061
+#: src/i_callbacks.c:2064
 msgid "Cut 4"
 msgstr "Cortar para 4"
 
-#: ../src/i_callbacks.c:2080
+#: src/i_callbacks.c:2083
 msgid "Cut 5"
 msgstr "Cortar para 5"
 
-#: ../src/i_callbacks.c:2096
+#: src/i_callbacks.c:2099
 msgid "Paste 1"
 msgstr "Colar de 1"
 
-#: ../src/i_callbacks.c:2118
+#: src/i_callbacks.c:2121
 msgid "Paste 2"
 msgstr "Colar de 2"
 
-#: ../src/i_callbacks.c:2140
+#: src/i_callbacks.c:2143
 msgid "Paste 3"
 msgstr "Colar de 3"
 
-#: ../src/i_callbacks.c:2162
+#: src/i_callbacks.c:2165
 msgid "Paste 4"
 msgstr "Colar de 4"
 
-#: ../src/i_callbacks.c:2184
+#: src/i_callbacks.c:2187
 msgid "Paste 5"
 msgstr "Colar de 5"
 
-#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
+#: src/i_callbacks.c:2324 src/x_window.c:354
 msgid "Component"
 msgstr "Componente"
 
-#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
+#: src/i_callbacks.c:2360 src/i_callbacks.c:2379 src/x_dialog.c:2381
 msgid "Attribute"
 msgstr "Atributo"
 
-#: ../src/i_callbacks.c:2873
+#: src/i_callbacks.c:2877
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Procurando por origem [%s]\n"
 
-#: ../src/i_callbacks.c:2897
+#: src/i_callbacks.c:2901
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Impossível encontrar origem [%s]\n"
 
-#: ../src/i_callbacks.c:2964
+#: src/i_callbacks.c:2970
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Procurando por símbolo [%s]\n"
 
-#: ../src/i_callbacks.c:2970
+#: src/i_callbacks.c:2976
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3001
+#: src/i_callbacks.c:3007
 msgid "Cannot find any schematics above the current one!\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3064
+#: src/i_callbacks.c:3061
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
 msgstr ""
 
-#: ../src/i_callbacks.c:3177
+#: src/i_callbacks.c:3171
 msgid "ShowN"
 msgstr "Mostrar N"
 
-#: ../src/i_callbacks.c:3213
+#: src/i_callbacks.c:3207
 msgid "ShowV"
 msgstr "Mostrar V"
 
-#: ../src/i_callbacks.c:3249
+#: src/i_callbacks.c:3243
 msgid "ShowB"
 msgstr "Mostrar T"
 
-#: ../src/i_callbacks.c:3286
+#: src/i_callbacks.c:3280
 msgid "VisToggle"
 msgstr "Comuta Visibilidade"
 
-#: ../src/i_callbacks.c:3316
+#: src/i_callbacks.c:3310
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Desculpe, mas esta é uma opção de menu sem função\n"
 
-#: ../src/i_callbacks.c:3406
+#: src/i_callbacks.c:3400
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr "Retorno de ação ajustado para silhueta\n"
 
-#: ../src/i_callbacks.c:3409
+#: src/i_callbacks.c:3403
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr "Retorno de ação ajustado para caixa completa\n"
 
-#: ../src/i_callbacks.c:3434
+#: src/i_callbacks.c:3428
 msgid "Grid OFF\n"
 msgstr "Grade DESLIGADA\n"
 
-#: ../src/i_callbacks.c:3435
+#: src/i_callbacks.c:3429
 msgid "Dot grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3436
+#: src/i_callbacks.c:3430
 msgid "Mesh grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3457
+#: src/i_callbacks.c:3451
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Agarre desligado (CUIDADO!)\n"
 
-#: ../src/i_callbacks.c:3460
+#: src/i_callbacks.c:3454
 msgid "Snap ON\n"
 msgstr "Agarre ligado\n"
 
-#: ../src/i_callbacks.c:3463
+#: src/i_callbacks.c:3457
 #, fuzzy
 msgid "Snap back to the grid (CAUTION!)\n"
 msgstr "Agarre desligado (CUIDADO!)\n"
 
-#: ../src/i_callbacks.c:3489
+#: src/i_callbacks.c:3483
 msgid "Rubber band OFF \n"
 msgstr "Elástico desligado\n"
 
-#: ../src/i_callbacks.c:3492
+#: src/i_callbacks.c:3486
 msgid "Rubber band ON\n"
 msgstr "Elástico ligado\n"
 
-#: ../src/i_callbacks.c:3507
+#: src/i_callbacks.c:3501
 msgid "magnetic net mode: ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3510
+#: src/i_callbacks.c:3504
 msgid "magnetic net mode: OFF\n"
 msgstr ""
 
-#: ../src/o_box.c:160
+#: src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Tipo desconhecido para enchimento da caixa!\n"
 
-#: ../src/o_buffer.c:57
+#: src/o_buffer.c:57
 #, c-format
 msgid "o_buffer_copy: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:72
+#: src/o_buffer.c:72
 #, c-format
 msgid "o_buffer_cut: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:93
+#: src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr ""
 
-#: ../src/o_bus.c:135
+#: src/o_bus.c:135
 #, c-format
 msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr ""
 
-#: ../src/o_circle.c:141
+#: src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Tipo desconhecido para enchimento de arco!\n"
 
-#: ../src/o_complex.c:250 ../src/o_complex.c:254
+#: src/o_complex.c:250 src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Transladando diagrama [%d %d]\n"
 
-#: ../src/o_misc.c:61
+#: src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
 msgstr ""
 
-#: ../src/o_misc.c:125
+#: src/o_misc.c:125
 #, fuzzy
 msgid "Object already locked\n"
 msgstr "Objeto já bloqueado\n"
 
-#: ../src/o_misc.c:163
+#: src/o_misc.c:163
 #, fuzzy
 msgid "Object already unlocked\n"
 msgstr "Objeto já desbloqueado\n"
 
-#: ../src/o_misc.c:445
+#: src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "Texto oculto agora está visível\n"
 
-#: ../src/o_misc.c:447
+#: src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "Texto oculto agora está invisível\n"
 
-#: ../src/o_misc.c:697
+#: src/o_misc.c:700
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 
-#: ../src/o_misc.c:840
+#: src/o_misc.c:847
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr ""
 
-#: ../src/o_misc.c:884
+#: src/o_misc.c:891
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr "N�O foi possível deixar arquivo backup [%s] como leitura e gravação\n"
 
-#: ../src/o_misc.c:902
+#: src/o_misc.c:909
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "N�O foi possível deixar arquivo backup [%s] apenas leitura!\n"
 
-#: ../src/o_misc.c:907
+#: src/o_misc.c:914
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "N�O foi possível salvar  arquivo backup [%s] !\n"
 
-#: ../src/o_move.c:188
+#: src/o_move.c:188
 #, c-format
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr ""
 
-#: ../src/o_move.c:461
+#: src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr ""
 
-#: ../src/o_move.c:482
+#: src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr ""
 
-#: ../src/o_net.c:176
+#: src/o_net.c:176
 #, c-format
 msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr ""
 
-#: ../src/o_net.c:552
+#: src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr ""
 
-#: ../src/o_net.c:614
+#: src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr ""
 
-#. try to exit gracefully
-#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
-#: ../src/o_net.c:1126
+#: src/o_net.c:982 src/o_net.c:1019 src/o_net.c:1090 src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr ""
 
-#: ../src/o_net.c:1196
+#: src/o_net.c:1196
 #, fuzzy, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "Não consigo encontrar %s em nenhuma biblioteca\n"
 
-#: ../src/o_path.c:356
+#: src/o_path.c:356
 #, fuzzy, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "Tipo desconhecido para enchimento da caixa!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:557
+#: src/o_picture.c:166 src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Falhou ao ler imagem: %s"
 
-#: ../src/o_picture.c:180
+#: src/o_picture.c:180
 msgid "Picture"
 msgstr "Imagem"
 
-#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
+#: src/o_picture.c:465 src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "ERRO: NENHUM objeto!\n"
 
-#: ../src/o_slot.c:110
+#: src/o_slot.c:81
 msgid "Slot attribute malformed\n"
 msgstr "Atributo Slot mau feito\n"
 
-#: ../src/o_slot.c:128
+#: src/o_slot.c:99
 msgid "numslots attribute missing\n"
 msgstr "Sem atributo NUMSLOTS\n"
 
-#: ../src/o_slot.c:130
+#: src/o_slot.c:100
 msgid "Slotting not allowed for this component\n"
 msgstr "Slots não disponível para este componente\n"
 
-#: ../src/o_slot.c:145
+#: src/o_slot.c:115
 msgid "New slot number out of range\n"
 msgstr "Número de slot fora dos limites\n"
 
-#: ../src/o_slot.c:200
+#: src/o_slot.c:170
 #, c-format
 msgid "uggg! you tried to slot edit something that doesn't exist!\n"
 msgstr "Você tentou editar o slot de algo que não existe!\n"
 
-#: ../src/o_undo.c:300
+#: src/o_undo.c:300
 msgid "Undo/Redo disabled in rc file\n"
 msgstr "Desfaz e Refaz desabilitado no arquivo rc\n"
 
-#: ../src/parsecmd.c:47
+#: src/parsecmd.c:47
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] schematic_filename1 ... schematic_filenameN\n"
@@ -1306,279 +1316,260 @@ msgstr ""
 "  -h            Ajuda; esta mensagem\n"
 "\n"
 
-#: ../src/x_attribedit.c:127
+#: src/x_attribedit.c:127
 #, c-format
 msgid "Got invalid show option; defaulting to show both\n"
 msgstr ""
 
-#: ../src/x_attribedit.c:330
+#: src/x_attribedit.c:330
 msgid "Single Attribute Editor"
 msgstr "Editor de um atributo"
 
-#: ../src/x_attribedit.c:359
+#: src/x_attribedit.c:359
 #, fuzzy
 msgid "<b>Edit Attribute</b>"
 msgstr "Editar Atributos"
 
-#: ../src/x_attribedit.c:361
+#: src/x_attribedit.c:361
 #, fuzzy
 msgid "<b>Add Attribute</b>"
 msgstr "Inserir Atributo"
 
-#. Name selection
-#. GtkLabel
-#: ../src/x_attribedit.c:377 ../src/x_multiattrib.c:1725
+#: src/x_attribedit.c:377 src/x_multiattrib.c:1921
 msgid "Name:"
 msgstr "Nome:"
 
-#. Value entry
-#. GtkLabel
-#: ../src/x_attribedit.c:393 ../src/x_multiattrib.c:1744
+#: src/x_attribedit.c:393 src/x_multiattrib.c:1940
 msgid "Value:"
 msgstr "Valor:"
 
-#. Visibility
-#. GtkButton
-#: ../src/x_attribedit.c:409 ../src/x_multiattrib.c:1781
+#: src/x_attribedit.c:409 src/x_multiattrib.c:1983
 msgid "Visible"
 msgstr "Visível"
 
-#: ../src/x_attribedit.c:429
+#: src/x_attribedit.c:429
 msgid "Show Value Only"
 msgstr "Mostra apenas Valor"
 
-#: ../src/x_attribedit.c:431
+#: src/x_attribedit.c:431
 msgid "Show Name Only"
 msgstr "Mostra apenas Nome"
 
-#: ../src/x_attribedit.c:433 ../src/x_multiattrib.c:1369
+#: src/x_attribedit.c:433 src/x_multiattrib.c:1459
 msgid "Show Name & Value"
 msgstr "Mostra Nome e Valor"
 
-#. gschem specific
-#: ../src/x_attribedit.c:440
+#: src/x_attribedit.c:440
 #, fuzzy
 msgid "<b>Attach Options</b>"
 msgstr "Opções"
 
-#: ../src/x_attribedit.c:455
+#: src/x_attribedit.c:455
 msgid "All"
 msgstr "Todos"
 
-#. GtkTreeViewColumn
-#: ../src/x_attribedit.c:463 ../src/x_compselect.c:896
-#: ../src/x_compselect.c:1010
+#: src/x_attribedit.c:463 src/x_compselect.c:895 src/x_compselect.c:1009
 msgid "Components"
 msgstr "Componentes"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:364
+#: src/x_attribedit.c:471 src/x_window.c:364
 msgid "Nets"
 msgstr "Conexões"
 
-#: ../src/x_attribedit.c:479
+#: src/x_attribedit.c:479
 msgid "Replace existing attributes"
 msgstr ""
 
-#: ../src/x_autonumber.c:413
+#: src/x_autonumber.c:415
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
 msgstr ""
 
-#. duplicate slot in used_slots
-#: ../src/x_autonumber.c:428
+#: src/x_autonumber.c:430
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:696
+#: src/x_autonumber.c:702
 msgid "No searchstring given in autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:748
+#: src/x_autonumber.c:754
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:883
+#: src/x_autonumber.c:889
 #, fuzzy
 msgid "Diagonal"
 msgstr "diagonal"
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Top to bottom"
 msgstr ""
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Bottom to top"
 msgstr ""
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 #, fuzzy
 msgid "Left to right"
 msgstr "Esq Dir"
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 msgid "Right to left"
 msgstr ""
 
-#: ../src/x_autonumber.c:886
+#: src/x_autonumber.c:892
 #, fuzzy
 msgid "File order"
 msgstr "Ordena em arquivos"
 
-#: ../src/x_autonumber.c:1222
+#: src/x_autonumber.c:1228
 msgid "Autonumber text"
 msgstr "Autonumerar texto"
 
-#. scope section
-#: ../src/x_autonumber.c:1246
+#: src/x_autonumber.c:1252
 msgid "<b>Scope</b>"
 msgstr ""
 
-#: ../src/x_autonumber.c:1268
+#: src/x_autonumber.c:1274
 #, fuzzy
 msgid "Search for:"
 msgstr "foco de procura"
 
-#: ../src/x_autonumber.c:1282
+#: src/x_autonumber.c:1288
 #, fuzzy
 msgid "Autonumber text in:"
 msgstr "Autonumerar texto"
 
-#: ../src/x_autonumber.c:1289
+#: src/x_autonumber.c:1295
 msgid "Skip numbers found in:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
+#: src/x_autonumber.c:1307 src/x_autonumber.c:1316
 #, fuzzy
 msgid "Selected objects"
 msgstr "Objetos selecionados"
 
-#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
+#: src/x_autonumber.c:1308 src/x_autonumber.c:1317
 #, fuzzy
 msgid "Current page"
 msgstr "Folha corrente"
 
-#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
+#: src/x_autonumber.c:1309 src/x_autonumber.c:1318
 #, fuzzy
 msgid "Whole hierarchy"
 msgstr "Hierarquia"
 
-#: ../src/x_autonumber.c:1314
+#: src/x_autonumber.c:1320
 msgid "Overwrite existing numbers"
 msgstr ""
 
-#. Options section
-#: ../src/x_autonumber.c:1319
+#: src/x_autonumber.c:1325
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "Opções"
 
-#: ../src/x_autonumber.c:1341
+#: src/x_autonumber.c:1347
 #, fuzzy
 msgid "Starting number:"
 msgstr "Número inicial"
 
-#: ../src/x_autonumber.c:1348
+#: src/x_autonumber.c:1354
 #, fuzzy
 msgid "Sort order:"
 msgstr "Ordenação"
 
-#: ../src/x_autonumber.c:1369
+#: src/x_autonumber.c:1375
 msgid "Remove numbers"
 msgstr ""
 
-#: ../src/x_autonumber.c:1373
+#: src/x_autonumber.c:1379
 msgid "Automatic slotting"
 msgstr ""
 
-#: ../src/x_color.c:94 ../src/x_color.c:103
+#: src/x_color.c:94 src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Impossível alocar a cor %s!\n"
 
-#: ../src/x_color.c:94
+#: src/x_color.c:94
 msgid "black"
 msgstr "preta"
 
-#: ../src/x_color.c:103
+#: src/x_color.c:103
 msgid "white"
 msgstr "branca"
 
-#: ../src/x_color.c:125
+#: src/x_color.c:125
 #, fuzzy, c-format
 msgid "Could not allocate display color %i!\n"
 msgstr "Impossível alocar a cor %s!\n"
 
-#: ../src/x_color.c:147
+#: src/x_color.c:147
 #, fuzzy, c-format
 msgid "Could not allocate outline color %i!\n"
 msgstr "Impossível alocar a cor %s!\n"
 
-#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
+#: src/x_color.c:164 src/x_color.c:181 src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Tentou ter cor inválida: %d\n"
 
-#: ../src/x_color.c:214
+#: src/x_color.c:214
 #, fuzzy, c-format
 msgid "Tried to get an invalid outline color: %d\n"
 msgstr "Tentou ter cor inválida: %d\n"
 
-#. GtkLabel
-#: ../src/x_compselect.c:1040
+#: src/x_compselect.c:1039
 #, fuzzy
 msgid "Filter:"
 msgstr "Filtro"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
-#: ../src/x_multiattrib.c:1601
+#: src/x_compselect.c:1142 src/x_dialog.c:3776 src/x_multiattrib.c:1787
 msgid "Name"
 msgstr "Nome"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1152 ../src/x_multiattrib.c:1626
+#: src/x_compselect.c:1151 src/x_multiattrib.c:1811
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/x_compselect.c:1191
+#: src/x_compselect.c:1190
 msgid "Default behavior - reference component"
 msgstr "Uso normal - referenciar componente"
 
-#: ../src/x_compselect.c:1194
+#: src/x_compselect.c:1193
 msgid "Embed component in schematic"
 msgstr "Embutir componente no diagrama"
 
-#: ../src/x_compselect.c:1197
+#: src/x_compselect.c:1196
 msgid "Include component as individual objects"
 msgstr "Incluir como objetos individuais"
 
-#. GtkWindow
-#: ../src/x_compselect.c:1354
+#: src/x_compselect.c:1353
 msgid "Select Component..."
 msgstr "Selecionar Componente"
 
-#: ../src/x_compselect.c:1377
+#: src/x_compselect.c:1376
 msgid "In Use"
 msgstr ""
 
-#: ../src/x_compselect.c:1381
+#: src/x_compselect.c:1380
 msgid "Libraries"
 msgstr "Bibliotecas"
 
-#. GtkFrame
-#: ../src/x_compselect.c:1390 ../src/x_fileselect.c:122
+#: src/x_compselect.c:1389 src/x_fileselect.c:122
 msgid "Preview"
 msgstr "Prévia"
 
-#. dialog not created yet
-#: ../src/x_dialog.c:174
+#: src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "Entrada de texto..."
 
-#: ../src/x_dialog.c:205
+#: src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1588,202 +1579,193 @@ msgstr ""
 "cursor na janela, clique para deixar o texto.\n"
 "Use botão do meio para rotacionar enquanto posiciona"
 
-#: ../src/x_dialog.c:294
-#, c-format
+#: src/x_dialog.c:294
 msgid "Lower Left"
 msgstr "Esq Baixo"
 
-#: ../src/x_dialog.c:305
-#, c-format
+#: src/x_dialog.c:305
 msgid "Middle Left"
 msgstr "Esq Centro"
 
-#: ../src/x_dialog.c:316
-#, c-format
+#: src/x_dialog.c:316
 msgid "Upper Left"
 msgstr "Esq Alto"
 
-#: ../src/x_dialog.c:327
-#, c-format
+#: src/x_dialog.c:327
 msgid "Lower Middle"
 msgstr "Centro Baixo"
 
-#: ../src/x_dialog.c:338
-#, c-format
+#: src/x_dialog.c:338
 msgid "Middle Middle"
 msgstr "Centro Centro"
 
-#: ../src/x_dialog.c:349
-#, c-format
+#: src/x_dialog.c:349
 msgid "Upper Middle"
 msgstr "Centro Alto"
 
-#: ../src/x_dialog.c:360
-#, c-format
+#: src/x_dialog.c:360
 msgid "Lower Right"
 msgstr "Dir Baixo"
 
-#: ../src/x_dialog.c:371
-#, c-format
+#: src/x_dialog.c:371
 msgid "Middle Right"
 msgstr "Dir Centro"
 
-#: ../src/x_dialog.c:382
-#, c-format
+#: src/x_dialog.c:382
 msgid "Upper Right"
 msgstr "Dir Alto"
 
-#: ../src/x_dialog.c:496
+#: src/x_dialog.c:496
 #, fuzzy
 msgid "Edit Text Properties"
 msgstr "Editar Tamanho do Texto"
 
-#: ../src/x_dialog.c:530
+#: src/x_dialog.c:530
 #, fuzzy
 msgid "<b>Text Content</b>"
 msgstr "Opções"
 
-#: ../src/x_dialog.c:562
+#: src/x_dialog.c:562
 #, fuzzy
 msgid "<b>Text Properties</b>"
 msgstr "Opções"
 
-#: ../src/x_dialog.c:577
+#: src/x_dialog.c:577
 #, fuzzy
 msgid "Color:"
 msgstr "Cor"
 
-#: ../src/x_dialog.c:584
+#: src/x_dialog.c:584
 msgid "Size:"
 msgstr ""
 
-#: ../src/x_dialog.c:593
+#: src/x_dialog.c:593
 #, fuzzy
 msgid "Alignment:"
 msgstr "Editar Alinhamento do Texto"
 
-#: ../src/x_dialog.c:647
+#: src/x_dialog.c:647
 msgid "Solid"
 msgstr "Solido"
 
-#: ../src/x_dialog.c:648
+#: src/x_dialog.c:648
 msgid "Dotted"
 msgstr "Pontilhado"
 
-#: ../src/x_dialog.c:649
+#: src/x_dialog.c:649
 msgid "Dashed"
 msgstr "Tracejado"
 
-#: ../src/x_dialog.c:650
+#: src/x_dialog.c:650
 msgid "Center"
 msgstr "Centro"
 
-#: ../src/x_dialog.c:651
+#: src/x_dialog.c:651
 msgid "Phantom"
 msgstr "Fantasma"
 
-#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
-#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
-#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
-#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
-#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
-#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
+#: src/x_dialog.c:652 src/x_dialog.c:749 src/x_dialog.c:758 src/x_dialog.c:767
+#: src/x_dialog.c:868 src/x_dialog.c:870 src/x_dialog.c:872
+#: src/x_dialog.c:1100 src/x_dialog.c:1203 src/x_dialog.c:1212
+#: src/x_dialog.c:1221 src/x_dialog.c:1230 src/x_dialog.c:1239
+#: src/x_dialog.c:1352 src/x_dialog.c:1354 src/x_dialog.c:1356
+#: src/x_dialog.c:1358 src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*inalterado*"
 
-#: ../src/x_dialog.c:978
+#: src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Editar Largura e Tipo de Linha"
 
-#: ../src/x_dialog.c:1017 ../src/x_print.c:307
+#: src/x_dialog.c:1017 src/x_print.c:307
 #, fuzzy
 msgid "Type:"
 msgstr "Origem da Imagem"
 
-#: ../src/x_dialog.c:1021
+#: src/x_dialog.c:1021
 #, fuzzy
 msgid "Width:"
 msgstr "Largura"
 
-#: ../src/x_dialog.c:1025
+#: src/x_dialog.c:1025
 #, fuzzy
 msgid "Dash Length:"
 msgstr "Comprimento dos traços"
 
-#: ../src/x_dialog.c:1029
+#: src/x_dialog.c:1029
 #, fuzzy
 msgid "Dash Space:"
 msgstr "Comprimento dos espaços"
 
-#: ../src/x_dialog.c:1096
+#: src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Vazio"
 
-#: ../src/x_dialog.c:1097
+#: src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Preenchida"
 
-#: ../src/x_dialog.c:1098
+#: src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "Malha"
 
-#: ../src/x_dialog.c:1099
+#: src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "Linhas"
 
-#: ../src/x_dialog.c:1470
+#: src/x_dialog.c:1470
 msgid "Edit Fill Type"
 msgstr "Editar Preenchimento"
 
-#: ../src/x_dialog.c:1508
+#: src/x_dialog.c:1508
 #, fuzzy
 msgid "Fill Type:"
 msgstr "Tipo de Preenchimento"
 
-#: ../src/x_dialog.c:1512
+#: src/x_dialog.c:1512
 #, fuzzy
 msgid "Line Width:"
 msgstr "Largura da Linha"
 
-#: ../src/x_dialog.c:1516
+#: src/x_dialog.c:1516
 #, fuzzy
 msgid "Angle 1:"
 msgstr "Ã?ngulo1"
 
-#: ../src/x_dialog.c:1520
+#: src/x_dialog.c:1520
 #, fuzzy
 msgid "Pitch 1:"
 msgstr "Passo1"
 
-#: ../src/x_dialog.c:1524
+#: src/x_dialog.c:1524
 #, fuzzy
 msgid "Angle 2:"
 msgstr "Ã?ngulo2"
 
-#: ../src/x_dialog.c:1528
+#: src/x_dialog.c:1528
 #, fuzzy
 msgid "Pitch 2:"
 msgstr "Passo2"
 
-#: ../src/x_dialog.c:1657
+#: src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "Parametros do Arco"
 
-#: ../src/x_dialog.c:1697
+#: src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr ""
 
-#: ../src/x_dialog.c:1705
+#: src/x_dialog.c:1705
 #, fuzzy
 msgid "Start Angle:"
 msgstr "Ã?ngulo Inicial"
 
-#: ../src/x_dialog.c:1713
+#: src/x_dialog.c:1713
 #, fuzzy
 msgid "Degrees of Sweep:"
 msgstr "Graus de comprimento"
 
-#: ../src/x_dialog.c:1830
+#: src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1791,49 +1773,49 @@ msgstr ""
 "Valor a transladar?\n"
 "(0 para origem)"
 
-#: ../src/x_dialog.c:1898
+#: src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "Tamanho do Texto"
 
-#: ../src/x_dialog.c:1928
+#: src/x_dialog.c:1928
 #, fuzzy
 msgid "Enter new text size:"
 msgstr "Entre com novo tamanho de texto"
 
-#: ../src/x_dialog.c:2004
+#: src/x_dialog.c:2004
 #, fuzzy
 msgid "Snap Size"
 msgstr "Grade de agarre"
 
-#: ../src/x_dialog.c:2034
+#: src/x_dialog.c:2034
 #, fuzzy
 msgid "Enter new snap grid spacing:"
 msgstr "Entre com novo tamanho de grade"
 
-#: ../src/x_dialog.c:2107
+#: src/x_dialog.c:2110
 msgid "Edit slot number"
 msgstr "Editar número de SLOT"
 
-#: ../src/x_dialog.c:2138
+#: src/x_dialog.c:2141
 #, fuzzy
 msgid "Edit slot number:"
 msgstr "Editar número de SLOT"
 
-#: ../src/x_dialog.c:2200
+#: src/x_dialog.c:2202
 msgid "About..."
 msgstr "Sobre..."
 
-#: ../src/x_dialog.c:2220
+#: src/x_dialog.c:2222
 #, fuzzy
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr "gEDA : GPL Electronic Design Automation"
 
-#: ../src/x_dialog.c:2224
+#: src/x_dialog.c:2226
 #, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "gschem versão %s%s.%s"
 
-#: ../src/x_dialog.c:2232
+#: src/x_dialog.c:2234
 #, fuzzy
 msgid ""
 "Written by:\n"
@@ -1846,161 +1828,160 @@ msgstr ""
 "ahvezda@xxxxxxxxxxxxx\n"
 "e outros autores (ver arquivo AUTHORS)"
 
-#: ../src/x_dialog.c:2295
+#: src/x_dialog.c:2297
 msgid "Coords"
 msgstr "Coordenadas"
 
-#: ../src/x_dialog.c:2316
+#: src/x_dialog.c:2318
 msgid "Screen"
 msgstr "Janela"
 
-#: ../src/x_dialog.c:2325
+#: src/x_dialog.c:2327
 msgid "World"
 msgstr "Universo"
 
-#: ../src/x_dialog.c:2364
+#: src/x_dialog.c:2366
 msgid "Background"
 msgstr ""
 
-#: ../src/x_dialog.c:2370
+#: src/x_dialog.c:2372
 msgid "Net endpoint"
 msgstr ""
 
-#: ../src/x_dialog.c:2373
+#: src/x_dialog.c:2375
 msgid "Graphic"
 msgstr ""
 
-#: ../src/x_dialog.c:2382
+#: src/x_dialog.c:2384
 msgid "Logic bubble"
 msgstr ""
 
-#: ../src/x_dialog.c:2385
+#: src/x_dialog.c:2387
 msgid "Grid point"
 msgstr ""
 
-#: ../src/x_dialog.c:2388
+#: src/x_dialog.c:2390
 #, fuzzy
 msgid "Detached attribute"
 msgstr "Inserir Atributo"
 
-#: ../src/x_dialog.c:2391 ../src/x_window.c:382
+#: src/x_dialog.c:2393 src/x_window.c:382
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/x_dialog.c:2397
+#: src/x_dialog.c:2399
 #, fuzzy
 msgid "Selection"
 msgstr "Seleção"
 
-#: ../src/x_dialog.c:2400
+#: src/x_dialog.c:2402
 msgid "Bounding box"
 msgstr ""
 
-#: ../src/x_dialog.c:2403
+#: src/x_dialog.c:2405
 #, fuzzy
 msgid "Zoom box"
 msgstr "Caixa de Zoom"
 
-#: ../src/x_dialog.c:2412
+#: src/x_dialog.c:2414
 msgid "Output background"
 msgstr ""
 
-#: ../src/x_dialog.c:2415
+#: src/x_dialog.c:2417
 #, fuzzy
 msgid "Net junction"
 msgstr "Ação"
 
-#: ../src/x_dialog.c:2418
+#: src/x_dialog.c:2420
 msgid "Mesh grid major"
 msgstr ""
 
-#: ../src/x_dialog.c:2421
+#: src/x_dialog.c:2423
 msgid "Mesh grid minor"
 msgstr ""
 
-#: ../src/x_dialog.c:2424
+#: src/x_dialog.c:2426
 msgid "Unknown"
 msgstr ""
 
-#: ../src/x_dialog.c:2570
+#: src/x_dialog.c:2572
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr ""
 
-#: ../src/x_dialog.c:2633
+#: src/x_dialog.c:2635
 msgid "Color Edit"
 msgstr "Edição de Cor"
 
-#: ../src/x_dialog.c:2664
+#: src/x_dialog.c:2666
 msgid "Object color:"
 msgstr ""
 
-#: ../src/x_dialog.c:2786
+#: src/x_dialog.c:2788
 #, fuzzy
 msgid "Function"
 msgstr "Ação"
 
-#: ../src/x_dialog.c:2793
+#: src/x_dialog.c:2795
 #, fuzzy
 msgid "Keystroke(s)"
 msgstr "Função : atalho(s)"
 
-#: ../src/x_dialog.c:3102
+#: src/x_dialog.c:3104
 #, fuzzy
 msgid "Find Text"
 msgstr "Localizar"
 
-#: ../src/x_dialog.c:3133
+#: src/x_dialog.c:3135
 msgid "Text to find:"
 msgstr "Loc. Texto:"
 
-#: ../src/x_dialog.c:3143
+#: src/x_dialog.c:3145
 msgid "descend into hierarchy"
 msgstr "Desce à hierarquia"
 
-#: ../src/x_dialog.c:3208
+#: src/x_dialog.c:3210
 #, fuzzy
 msgid "Hide Text"
 msgstr "Ocultar texto"
 
-#: ../src/x_dialog.c:3239
+#: src/x_dialog.c:3241
 msgid "Hide text starting with:"
 msgstr "Ocultar texto iniciado com:"
 
-#: ../src/x_dialog.c:3308
+#: src/x_dialog.c:3310
 #, fuzzy
 msgid "Show Text"
 msgstr "Mostrar Texto"
 
-#: ../src/x_dialog.c:3339
+#: src/x_dialog.c:3341
 msgid "Show text starting with:"
 msgstr "Mostrar texto iniciado com:"
 
-#: ../src/x_dialog.c:3796
+#: src/x_dialog.c:3798
 msgid "S_elect the schematics you want to save:"
 msgstr ""
 
-#: ../src/x_dialog.c:3890
+#: src/x_dialog.c:3892
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr ""
 
-#: ../src/x_dialog.c:3896
+#: src/x_dialog.c:3898
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
 msgstr ""
 
-#. secondary label
-#: ../src/x_dialog.c:3925
+#: src/x_dialog.c:3927
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr ""
 
-#: ../src/x_dialog.c:3945
+#: src/x_dialog.c:3947
 msgid "_Close without saving"
 msgstr ""
 
-#: ../src/x_dialog.c:4279
+#: src/x_dialog.c:4283
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -2011,52 +1992,52 @@ msgid ""
 "The value cannot start with a space."
 msgstr ""
 
-#: ../src/x_dialog.c:4281
+#: src/x_dialog.c:4285
 #, fuzzy
 msgid "Invalid Attribute"
 msgstr "Inserir Atributo"
 
-#: ../src/x_dialog.c:4317
+#: src/x_dialog.c:4321
 #, fuzzy
 msgid "Pin type"
 msgstr "Tipo da Linha"
 
-#: ../src/x_dialog.c:4341
+#: src/x_dialog.c:4345
 #, fuzzy
 msgid "Net pin"
 msgstr "Ação"
 
-#: ../src/x_dialog.c:4343
+#: src/x_dialog.c:4347
 msgid "Bus pin (graphical)"
 msgstr ""
 
-#: ../src/x_fileselect.c:42
+#: src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "Diagramas"
 
-#: ../src/x_fileselect.c:47
+#: src/x_fileselect.c:47
 msgid "Symbols"
 msgstr "Símbolos"
 
-#: ../src/x_fileselect.c:52
+#: src/x_fileselect.c:52
 msgid "Schematics and symbols"
 msgstr "Diagramas e Símbolos"
 
-#: ../src/x_fileselect.c:58
+#: src/x_fileselect.c:58
 #, fuzzy
 msgid "All files"
 msgstr "Todos arquivos"
 
-#: ../src/x_fileselect.c:171
+#: src/x_fileselect.c:171
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../src/x_fileselect.c:231
+#: src/x_fileselect.c:231
 #, fuzzy
 msgid "Save as..."
 msgstr "Salvar Como..."
 
-#: ../src/x_fileselect.c:284
+#: src/x_fileselect.c:284
 #, c-format
 msgid ""
 "The selected file `%s' already exists.\n"
@@ -2064,31 +2045,30 @@ msgid ""
 "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/x_fileselect.c:287
+#: src/x_fileselect.c:287
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Novo arquivo"
 
-#: ../src/x_fileselect.c:289
+#: src/x_fileselect.c:289
 msgid "Save cancelled on user request\n"
 msgstr ""
 
-#. WK - catch EPS export case
-#: ../src/x_image.c:176
+#: src/x_image.c:176
 msgid "Encapsulated Postscript"
 msgstr ""
 
-#: ../src/x_image.c:296
+#: src/x_image.c:296
 #, c-format
 msgid "x_image_lowlevel: Unable to write eps file %s.\n"
 msgstr ""
 
-#: ../src/x_image.c:374
+#: src/x_image.c:374
 #, c-format
 msgid "x_image_lowlevel: Unable to write %s file %s.\n"
 msgstr ""
 
-#: ../src/x_image.c:384
+#: src/x_image.c:384
 #, c-format
 msgid ""
 "There was the following error when saving image with type %s to filename:\n"
@@ -2097,311 +2077,311 @@ msgid ""
 "%s.\n"
 msgstr ""
 
-#: ../src/x_image.c:403
+#: src/x_image.c:403
 #, c-format
 msgid "Wrote color image to [%s] [%d x %d]\n"
 msgstr "Salva imagem colorida [%s] [%d x %d]\n"
 
-#: ../src/x_image.c:405
+#: src/x_image.c:405
 #, c-format
 msgid "Wrote black and white image to [%s] [%d x %d]\n"
 msgstr "Salva imagem em Preto e branco [%s] [%d x %d]\n"
 
-#: ../src/x_image.c:413
+#: src/x_image.c:413
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 msgstr ""
 
-#: ../src/x_image.c:458
+#: src/x_image.c:458
 #, fuzzy
 msgid "Width x Height"
 msgstr "Largura x Altura"
 
-#: ../src/x_image.c:474
+#: src/x_image.c:474
 msgid "Image type"
 msgstr ""
 
-#: ../src/x_log.c:188
+#: src/x_log.c:188
 msgid "** Invalid UTF-8 in log message. See stderr or gschem.log.\n"
 msgstr ""
 
-#: ../src/x_log.c:256
+#: src/x_log.c:256
 msgid "Status"
 msgstr "Status"
 
-#: ../src/x_menus.c:36
+#: src/x_menus.c:36
 msgid "/Add Net"
 msgstr "/Inserir Net"
 
-#: ../src/x_menus.c:37
+#: src/x_menus.c:37
 msgid "/Add Attribute..."
 msgstr "/Inserir Atributo..."
 
-#: ../src/x_menus.c:38
+#: src/x_menus.c:38
 msgid "/Add Component..."
 msgstr "/Inserir Componente..."
 
-#: ../src/x_menus.c:39
+#: src/x_menus.c:39
 msgid "/Add Bus"
 msgstr "/Inserir Bus"
 
-#: ../src/x_menus.c:40
+#: src/x_menus.c:40
 msgid "/Add Text"
 msgstr "/Inserir Texto"
 
-#: ../src/x_menus.c:42
+#: src/x_menus.c:42
 msgid "/Zoom In"
 msgstr "/Zoom maior"
 
-#: ../src/x_menus.c:43
+#: src/x_menus.c:43
 msgid "/Zoom Out"
 msgstr "/Zoom menor"
 
-#: ../src/x_menus.c:44
+#: src/x_menus.c:44
 msgid "/Zoom Box"
 msgstr "/Caixa de Zoom"
 
-#: ../src/x_menus.c:45
+#: src/x_menus.c:45
 msgid "/Zoom Extents"
 msgstr "/Zoom desenho"
 
-#: ../src/x_menus.c:47
+#: src/x_menus.c:47
 msgid "/Select"
 msgstr "/Selecionar"
 
-#: ../src/x_menus.c:48
+#: src/x_menus.c:48
 msgid "/Edit..."
 msgstr "/Editar..."
 
-#: ../src/x_menus.c:49
+#: src/x_menus.c:49
 #, fuzzy
 msgid "/Edit pin type..."
 msgstr "Editar Tipo de Linha"
 
-#: ../src/x_menus.c:50
+#: src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Copiar"
 
-#: ../src/x_menus.c:51
+#: src/x_menus.c:51
 msgid "/Move"
 msgstr "/Mover"
 
-#: ../src/x_menus.c:52
+#: src/x_menus.c:52
 msgid "/Delete"
 msgstr "/Apagar"
 
-#: ../src/x_menus.c:55
+#: src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/Descer ao Esquemático"
 
-#: ../src/x_menus.c:56
+#: src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/Descer ao Símbolo"
 
-#: ../src/x_menus.c:57
+#: src/x_menus.c:57
 msgid "/Up"
 msgstr "/Subir"
 
-#: ../src/x_menus.c:316
+#: src/x_menus.c:319
 #, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr ""
 
-#: ../src/x_menus.c:340
+#: src/x_menus.c:343
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr ""
 
-#: ../src/x_menus.c:353
+#: src/x_menus.c:356
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 
-#. Remove this entry from all menus
-#: ../src/x_menus.c:462
+#: src/x_menus.c:436
 #, fuzzy, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Impossível invocar %s!\n"
 
-#: ../src/x_menus.c:524
+#: src/x_menus.c:493
 #, fuzzy
 msgid "Clear"
 msgstr "Fechar"
 
-#: ../src/x_multiattrib.c:861
+#: src/x_multiattrib.c:913
 msgid "Attributes with empty name are not allowed. Please set a name."
 msgstr "Atributos com nome vazio não permitidos. Defina um nome."
 
-#: ../src/x_multiattrib.c:1371
+#: src/x_multiattrib.c:1461
 msgid "Show Value only"
 msgstr "Mostra apenas Valor"
 
-#: ../src/x_multiattrib.c:1373
+#: src/x_multiattrib.c:1463
 msgid "Show Name only"
 msgstr "Mostra apenas Nome"
 
-#: ../src/x_multiattrib.c:1400
+#: src/x_multiattrib.c:1491
+msgid "Promote"
+msgstr ""
+
+#: src/x_multiattrib.c:1495
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: ../src/x_multiattrib.c:1528
+#: src/x_multiattrib.c:1713
 msgid "Edit Attributes"
 msgstr "Editar Atributos"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1648
+#: src/x_multiattrib.c:1831
 msgid "Vis?"
 msgstr "Vis?"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1668
+#: src/x_multiattrib.c:1849
 msgid "N"
 msgstr "N"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1688
+#: src/x_multiattrib.c:1867
 msgid "V"
 msgstr "V"
 
-#: ../src/x_multiattrib.c:1709
+#: src/x_multiattrib.c:1889
+#, fuzzy
+msgid "Show inherited attributes"
+msgstr "Inserir Atributo"
+
+#: src/x_multiattrib.c:1905
 msgid "Add Attribute"
 msgstr "Inserir Atributo"
 
-#: ../src/x_pagesel.c:257
+#: src/x_pagesel.c:257
 msgid "Discard Page"
 msgstr "Descartar"
 
-#: ../src/x_pagesel.c:376
+#: src/x_pagesel.c:376
 msgid "Page Manager"
 msgstr "Gerenciador de Páginas"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:432
+#: src/x_pagesel.c:432
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:448
+#: src/x_pagesel.c:448
 msgid "Changed"
 msgstr "Alterado"
 
-#. GtkLabel
-#: ../src/x_pagesel.c:468
+#: src/x_pagesel.c:468
 msgid "Right click on the filename for more options..."
 msgstr "Clique direito no arquivo para opções..."
 
-#: ../src/x_preview.c:223
+#: src/x_preview.c:223
 #, fuzzy
 msgid "Preview Buffer"
 msgstr "Buffer"
 
-#: ../src/x_print.c:84
+#: src/x_print.c:84
 #, fuzzy
 msgid "Select PostScript Filename..."
 msgstr "Salvar Como..."
 
-#: ../src/x_print.c:164
+#: src/x_print.c:164
 msgid "Extents with margins"
 msgstr "Extensão com margens"
 
-#: ../src/x_print.c:170
+#: src/x_print.c:170
 msgid "Extents no margins"
 msgstr "Extensão sem margens"
 
-#: ../src/x_print.c:176
+#: src/x_print.c:176
 msgid "Current Window"
 msgstr "Janela Atual"
 
-#: ../src/x_print.c:210
+#: src/x_print.c:210
 msgid "Landscape"
 msgstr "Paisagem"
 
-#: ../src/x_print.c:216
+#: src/x_print.c:216
 msgid "Portrait"
 msgstr "Retrato"
 
-#. Upper frame
-#: ../src/x_print.c:284
+#: src/x_print.c:284
 msgid "Settings"
 msgstr ""
 
-#: ../src/x_print.c:296
+#: src/x_print.c:296
 #, fuzzy
 msgid "Output paper size:"
 msgstr "Tamanho do papel"
 
-#: ../src/x_print.c:318
+#: src/x_print.c:318
 #, fuzzy
 msgid "Orientation:"
 msgstr "Orientação"
 
-#. Lower frame
-#: ../src/x_print.c:330
+#: src/x_print.c:330
 #, fuzzy
 msgid "Destination"
 msgstr "Documentação"
 
-#: ../src/x_print.c:343
+#: src/x_print.c:343
 #, fuzzy
 msgid "File:"
 msgstr "Arquivo"
 
-#: ../src/x_print.c:373
+#: src/x_print.c:373
 msgid "Command:"
 msgstr ""
 
-#: ../src/x_print.c:741
+#: src/x_print.c:741
 msgid "No print destination specified\n"
 msgstr ""
 
-#: ../src/x_print.c:748
+#: src/x_print.c:748
 #, c-format
 msgid "Cannot print current schematic to [%s]\n"
 msgstr "Não consigo imprimir para arquivo [%s]\n"
 
-#: ../src/x_print.c:757
+#: src/x_print.c:757
 #, c-format
 msgid ""
 "Error printing to file '%s'\n"
 "Check the log window for more information"
 msgstr ""
 
-#: ../src/x_print.c:764
+#: src/x_print.c:764
 #, c-format
 msgid "Printed current schematic to [%s]\n"
 msgstr "Diagrama atual impresso para [%s]\n"
 
-#: ../src/x_window.c:81
+#: src/x_window.c:81
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr ""
 
-#: ../src/x_window.c:317
+#: src/x_window.c:317
 msgid "New file"
 msgstr "Novo arquivo"
 
-#: ../src/x_window.c:323
+#: src/x_window.c:323
 msgid "Open"
 msgstr "Abrir"
 
-#: ../src/x_window.c:324
+#: src/x_window.c:324
 msgid "Open file..."
 msgstr "Abrir arquivo..."
 
-#: ../src/x_window.c:330
+#: src/x_window.c:330
 msgid "Save"
 msgstr "Salvar"
 
-#: ../src/x_window.c:331
+#: src/x_window.c:331
 msgid "Save file"
 msgstr "Salvar arquivo"
 
-#: ../src/x_window.c:339
+#: src/x_window.c:339
 msgid "Undo last operation"
 msgstr "Desfazer última operação"
 
-#: ../src/x_window.c:346
+#: src/x_window.c:346
 msgid "Redo last undo"
 msgstr "Refaz o último Desfaz"
 
-#: ../src/x_window.c:355
+#: src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2413,7 +2393,7 @@ msgstr ""
 "para colocar o componente\n"
 "Botão Direito para cancelar"
 
-#: ../src/x_window.c:365
+#: src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2421,7 +2401,7 @@ msgstr ""
 "Modo de conexões\n"
 "Botão Direito para cancelar"
 
-#: ../src/x_window.c:375
+#: src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2429,92 +2409,91 @@ msgstr ""
 "Modo de Barramentos\n"
 "Botão Direito do mouse para cancelar"
 
-#: ../src/x_window.c:383
+#: src/x_window.c:383
 msgid "Add Text..."
 msgstr "Adicionar Texto..."
 
-#: ../src/x_window.c:393
+#: src/x_window.c:393
 msgid "Select"
 msgstr "Selecionar"
 
-#: ../src/x_window.c:394
+#: src/x_window.c:394
 msgid "Select mode"
 msgstr "Modo de Seleção"
 
-#: ../src/x_window.c:481
+#: src/x_window.c:481
 msgid "Pick"
 msgstr "Pegar"
 
-#: ../src/x_window.c:497
+#: src/x_window.c:497
 msgid "Repeat/none"
 msgstr "Repetir/nenhum"
 
-#: ../src/x_window.c:507
+#: src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "Menu/Cancelar"
 
-#: ../src/x_window.c:509
+#: src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "Pan/Cancelar"
 
-#: ../src/x_window.c:733
+#: src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Carregando o diagrama [%s]\n"
 
-#: ../src/x_window.c:745
+#: src/x_window.c:745
 #, fuzzy
 msgid "Failed to load file"
 msgstr "Falhou ao ler imagem: %s"
 
-#: ../src/x_window.c:754
+#: src/x_window.c:754
 #, fuzzy, c-format
 msgid "New file [%s]\n"
 msgstr "Novo arquivo"
 
-#. an error occured when saving page to file
-#: ../src/x_window.c:859
+#: src/x_window.c:859
 #, fuzzy, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "N�O foi possível salvar [%s] !\n"
 
-#: ../src/x_window.c:860
+#: src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Erro tentando salvar"
 
-#: ../src/x_window.c:869
+#: src/x_window.c:869
 #, fuzzy, c-format
 msgid "Saved as [%s]\n"
 msgstr "Salvo Como [%s]\n"
 
-#: ../src/x_window.c:871
+#: src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Salvo [%s]\n"
 
-#: ../src/x_window.c:873
+#: src/x_window.c:873
 msgid "Saved"
 msgstr "Salvo"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Descartando página [%s]\n"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Fechando [%s]\n"
 
-#: ../data/geda-gschem.desktop.in.h:1
-msgid "Create and edit electrical schematics and symbols with gschem"
-msgstr ""
-
-#: ../data/geda-gschem.desktop.in.h:2
+#: data/geda-gschem.desktop.in.h:3
 #, fuzzy
 msgid "gEDA Schematic Editor"
 msgstr "Descer ao Esquemático"
 
+#: data/geda-gschem.desktop.in.h:4
+msgid "Create and edit electrical schematics and symbols with gschem"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Cut Buffer"
 #~ msgstr "Buffer"
@@ -2648,9 +2627,6 @@ msgstr "Descer ao Esquemático"
 #~ msgid "Tried to render text with an invalid angle: %d\n"
 #~ msgstr "Tentou rederizar texto com ângulo inválido: %d\n"
 
-#~ msgid "Generic String"
-#~ msgstr "String geral"
-
 #~ msgid "Enter new string."
 #~ msgstr "Insira nova string"
 
diff --git a/gschem/po/ru.po b/gschem/po/ru.po
index 8b9b556..d08a7ae 100644
--- a/gschem/po/ru.po
+++ b/gschem/po/ru.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 14:35-0400\n"
+"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
+"POT-Creation-Date: 2009-06-18 11:53+0100\n"
 "PO-Revision-Date: 2006-09-13 16:59+0300\n"
 "Last-Translator: Andy Shevchenko <andy@xxxxxxxxxxxx>\n"
 "Language-Team: Russian <ru@xxxxxx>\n"
@@ -18,622 +18,612 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../src/rcstrings.c:2
+#: src/rcstrings.c:2
 msgid "File"
 msgstr "Файл"
 
-#: ../src/rcstrings.c:3
+#: src/rcstrings.c:3
 msgid "New Window"
 msgstr "Ð?овое окно"
 
-#: ../src/rcstrings.c:4 ../src/x_pagesel.c:252
+#: src/rcstrings.c:4 src/x_pagesel.c:252
 msgid "New Page"
 msgstr "Ð?оваÑ? Ñ?Ñ?Ñ?аниÑ?а"
 
-#: ../src/rcstrings.c:5 ../src/x_pagesel.c:253
+#: src/rcstrings.c:5 src/x_pagesel.c:253
 msgid "Open Page..."
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ?..."
 
-#: ../src/rcstrings.c:6 ../src/x_pagesel.c:256
+#: src/rcstrings.c:6 src/x_pagesel.c:256
 msgid "Close Page"
 msgstr "Ð?акÑ?Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ?"
 
-#: ../src/rcstrings.c:7
+#: src/rcstrings.c:7
 msgid "Revert Page"
 msgstr "Ð?озвÑ?аÑ?иÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ?"
 
-#: ../src/rcstrings.c:8 ../src/x_pagesel.c:255
+#: src/rcstrings.c:8 src/x_pagesel.c:255
 msgid "Save Page"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ?"
 
-#: ../src/rcstrings.c:9
+#: src/rcstrings.c:9
 msgid "Save Page As..."
 msgstr "СоÑ?Ñ?аниÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ? как..."
 
-#: ../src/rcstrings.c:10
+#: src/rcstrings.c:10
 msgid "Save All"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? вÑ?е"
 
-#. GtkWindow
-#: ../src/rcstrings.c:11 ../src/x_print.c:276
+#: src/rcstrings.c:11 src/x_print.c:276
 msgid "Print..."
 msgstr "Ð?еÑ?аÑ?Ñ?..."
 
-#. Create the dialog
-#: ../src/rcstrings.c:12 ../src/x_image.c:495
+#: src/rcstrings.c:12 src/x_image.c:495
 #, fuzzy
 msgid "Write image..."
 msgstr "Ð?апиÑ?аÑ?Ñ? изобÑ?ажение..."
 
-#: ../src/rcstrings.c:13 ../src/x_menus.c:501
+#: src/rcstrings.c:13
 #, fuzzy
 msgid "Recent files"
 msgstr "Ð?овÑ?й Ñ?айл"
 
-#: ../src/rcstrings.c:14 ../src/x_script.c:47
+#: src/rcstrings.c:14 src/x_script.c:47
 msgid "Execute Script..."
 msgstr "Ð?Ñ?полниÑ?Ñ? Ñ?кÑ?ипÑ?..."
 
-#: ../src/rcstrings.c:15
+#: src/rcstrings.c:15
 msgid "Close Window"
 msgstr "Ð?акÑ?Ñ?Ñ?Ñ? окно"
 
-#: ../src/rcstrings.c:16
+#: src/rcstrings.c:16
 msgid "Quit"
 msgstr "Ð?Ñ?йÑ?и"
 
-#: ../src/rcstrings.c:18 ../src/i_callbacks.c:695
+#: src/rcstrings.c:18 src/i_callbacks.c:695
 msgid "Edit"
 msgstr "Ð?Ñ?авка"
 
-#: ../src/rcstrings.c:19 ../src/x_window.c:338
+#: src/rcstrings.c:19 src/x_window.c:338
 msgid "Undo"
 msgstr "Ð?Ñ?мениÑ?Ñ? дейÑ?Ñ?вие"
 
-#: ../src/rcstrings.c:20 ../src/x_window.c:345
+#: src/rcstrings.c:20 src/x_window.c:345
 msgid "Redo"
 msgstr "Ð?овÑ?оÑ?иÑ?Ñ? дейÑ?Ñ?вие"
 
-#: ../src/rcstrings.c:21 ../src/i_basic.c:77 ../src/x_window.c:521
+#: src/rcstrings.c:21 src/i_basic.c:77 src/x_window.c:521
 msgid "Select Mode"
 msgstr "Режим вÑ?боÑ?ки"
 
-#: ../src/rcstrings.c:22
+#: src/rcstrings.c:22
 #, fuzzy
 msgid "Cut"
 msgstr "Ð?Ñ?Ñ?езка 1"
 
-#: ../src/rcstrings.c:23 ../src/i_basic.c:135 ../src/i_callbacks.c:536
-#: ../src/i_callbacks.c:560
+#: src/rcstrings.c:23 src/i_basic.c:135 src/i_callbacks.c:536
+#: src/i_callbacks.c:560
 msgid "Copy"
 msgstr "Ð?опиÑ?оваÑ?Ñ?"
 
-#: ../src/rcstrings.c:24
+#: src/rcstrings.c:24
 #, fuzzy
 msgid "Paste"
 msgstr "Ð?Ñ?Ñ?авка 1"
 
-#: ../src/rcstrings.c:25
+#: src/rcstrings.c:25
 msgid "Edit..."
 msgstr "Ð?Ñ?авка..."
 
-#: ../src/rcstrings.c:26
+#: src/rcstrings.c:26
 msgid "Edit Text..."
 msgstr "Ð?Ñ?авка Ñ?екÑ?Ñ?а..."
 
-#: ../src/rcstrings.c:27 ../src/i_basic.c:84
+#: src/rcstrings.c:27 src/i_basic.c:84
 msgid "Copy Mode"
 msgstr "Режим копиÑ?ованиÑ?"
 
-#: ../src/rcstrings.c:28 ../src/i_basic.c:142
+#: src/rcstrings.c:28 src/i_basic.c:142
 msgid "Multiple Copy Mode"
 msgstr "Режим множеÑ?Ñ?венного копиÑ?ованиÑ?"
 
-#: ../src/rcstrings.c:29 ../src/i_basic.c:87
+#: src/rcstrings.c:29 src/i_basic.c:87
 msgid "Move Mode"
 msgstr "Режим пеÑ?емеÑ?ениÑ?"
 
-#: ../src/rcstrings.c:30 ../src/i_callbacks.c:670 ../src/x_multiattrib.c:1401
+#: src/rcstrings.c:30 src/i_callbacks.c:670 src/x_multiattrib.c:1496
 msgid "Delete"
 msgstr "УдалиÑ?Ñ?"
 
-#: ../src/rcstrings.c:31
+#: src/rcstrings.c:31
 msgid "Rotate 90 Mode"
 msgstr "Режим вÑ?аÑ?ениÑ? на 90"
 
-#: ../src/rcstrings.c:32 ../src/i_basic.c:91
+#: src/rcstrings.c:32 src/i_basic.c:91
 msgid "Mirror Mode"
 msgstr "Режим зеÑ?калиÑ?ованиÑ?"
 
-#: ../src/rcstrings.c:33
+#: src/rcstrings.c:33
 msgid "Slot..."
 msgstr "СлоÑ?..."
 
-#: ../src/rcstrings.c:34
+#: src/rcstrings.c:34
 msgid "Color..."
 msgstr "ЦвеÑ?..."
 
-#: ../src/rcstrings.c:35 ../src/i_callbacks.c:920 ../src/x_dialog.c:2409
+#: src/rcstrings.c:35 src/i_callbacks.c:920 src/x_dialog.c:2411
 msgid "Lock"
 msgstr "Ð?локиÑ?оваÑ?Ñ?"
 
-#: ../src/rcstrings.c:36 ../src/i_callbacks.c:938
+#: src/rcstrings.c:36 src/i_callbacks.c:938
 msgid "Unlock"
 msgstr "РазблокиÑ?оваÑ?Ñ?"
 
-#: ../src/rcstrings.c:37
+#: src/rcstrings.c:37
 msgid "Line Width & Type..."
 msgstr "Тип и Ñ?иÑ?ина линии..."
 
-#: ../src/rcstrings.c:38
+#: src/rcstrings.c:38
 msgid "Fill Type..."
 msgstr "Тип заливки..."
 
-#: ../src/rcstrings.c:39
+#: src/rcstrings.c:39
 msgid "Symbol Translate..."
 msgstr "Ð?еÑ?евод Ñ?имвола..."
 
-#: ../src/rcstrings.c:40
+#: src/rcstrings.c:40
 msgid "Embed Component/Picture"
 msgstr "Ð?недÑ?иÑ?Ñ? компоненÑ?/изобÑ?ажение"
 
-#: ../src/rcstrings.c:41
+#: src/rcstrings.c:41
 msgid "Unembed Component/Picture"
 msgstr "Ð?Ñ?клÑ?Ñ?иÑ?Ñ? компоненÑ?/изобÑ?ажение"
 
-#: ../src/rcstrings.c:42
+#: src/rcstrings.c:42
 msgid "Update Component"
 msgstr "Ð?бновиÑ?Ñ? компоненÑ?"
 
-#: ../src/rcstrings.c:43
+#: src/rcstrings.c:43
 msgid "Show/Hide Inv Text"
 msgstr "Ð?оказаÑ?Ñ?/СкÑ?Ñ?Ñ?Ñ? невидимÑ?й Ñ?екÑ?Ñ?"
 
-#: ../src/rcstrings.c:44
+#: src/rcstrings.c:44
 msgid "Make Inv Text Vis"
 msgstr "СделаÑ?Ñ? невидимÑ?й Ñ?екÑ?Ñ? видимÑ?м"
 
-#: ../src/rcstrings.c:46
+#: src/rcstrings.c:46
 msgid "Buffer"
 msgstr "Ð?Ñ?Ñ?еÑ?"
 
-#: ../src/rcstrings.c:47
+#: src/rcstrings.c:47
 msgid "Copy into 1"
 msgstr "Ð?опиÑ?оваÑ?Ñ? в 1"
 
-#: ../src/rcstrings.c:48
+#: src/rcstrings.c:48
 msgid "Copy into 2"
 msgstr "Ð?опиÑ?оваÑ?Ñ? в 2"
 
-#: ../src/rcstrings.c:49
+#: src/rcstrings.c:49
 msgid "Copy into 3"
 msgstr "Ð?опиÑ?оваÑ?Ñ? в 3"
 
-#: ../src/rcstrings.c:50
+#: src/rcstrings.c:50
 msgid "Copy into 4"
 msgstr "Ð?опиÑ?оваÑ?Ñ? в 4"
 
-#: ../src/rcstrings.c:51
+#: src/rcstrings.c:51
 msgid "Copy into 5"
 msgstr "Ð?опиÑ?оваÑ?Ñ? в 5"
 
-#: ../src/rcstrings.c:52
+#: src/rcstrings.c:52
 msgid "Cut into 1"
 msgstr "Ð?Ñ?Ñ?езаÑ?Ñ? в 1"
 
-#: ../src/rcstrings.c:53
+#: src/rcstrings.c:53
 msgid "Cut into 2"
 msgstr "Ð?Ñ?Ñ?езаÑ?Ñ? в 2"
 
-#: ../src/rcstrings.c:54
+#: src/rcstrings.c:54
 msgid "Cut into 3"
 msgstr "Ð?Ñ?Ñ?езаÑ?Ñ? в 3"
 
-#: ../src/rcstrings.c:55
+#: src/rcstrings.c:55
 msgid "Cut into 4"
 msgstr "Ð?Ñ?Ñ?езаÑ?Ñ? в 4"
 
-#: ../src/rcstrings.c:56
+#: src/rcstrings.c:56
 msgid "Cut into 5"
 msgstr "Ð?Ñ?Ñ?езаÑ?Ñ? в 5"
 
-#: ../src/rcstrings.c:57
+#: src/rcstrings.c:57
 msgid "Paste from 1"
 msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? из 1"
 
-#: ../src/rcstrings.c:58
+#: src/rcstrings.c:58
 msgid "Paste from 2"
 msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? из 2"
 
-#: ../src/rcstrings.c:59
+#: src/rcstrings.c:59
 msgid "Paste from 3"
 msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? из 3"
 
-#: ../src/rcstrings.c:60
+#: src/rcstrings.c:60
 msgid "Paste from 4"
 msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? из 4"
 
-#: ../src/rcstrings.c:61
+#: src/rcstrings.c:61
 msgid "Paste from 5"
 msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? из 5"
 
-#: ../src/rcstrings.c:63
+#: src/rcstrings.c:63
 msgid "View"
 msgstr "Ð?ид"
 
-#: ../src/rcstrings.c:64
+#: src/rcstrings.c:64
 msgid "Redraw"
 msgstr "Ð?еÑ?еÑ?иÑ?оваÑ?Ñ?"
 
-#. I don't know if this would get in the way
-#: ../src/rcstrings.c:65 ../src/i_callbacks.c:1471 ../src/i_callbacks.c:1543
+#: src/rcstrings.c:65 src/i_callbacks.c:1474 src/i_callbacks.c:1546
 msgid "Pan"
 msgstr "ЦенÑ?Ñ?иÑ?оваÑ?Ñ?"
 
-#: ../src/rcstrings.c:66 ../src/i_basic.c:95
+#: src/rcstrings.c:66 src/i_basic.c:95
 msgid "Zoom Box"
 msgstr "Ð?блаÑ?Ñ?Ñ? длÑ? маÑ?Ñ?Ñ?абиÑ?ованиÑ?"
 
-#: ../src/rcstrings.c:67
+#: src/rcstrings.c:67
 msgid "Zoom Extents"
 msgstr "Ð?аÑ?Ñ?Ñ?аб на Ñ?кÑ?ан"
 
-#: ../src/rcstrings.c:68
+#: src/rcstrings.c:68
 msgid "Zoom In"
 msgstr "УвелиÑ?иÑ?Ñ?"
 
-#: ../src/rcstrings.c:69
+#: src/rcstrings.c:69
 msgid "Zoom Out"
 msgstr "УменÑ?Ñ?иÑ?Ñ?"
 
-#: ../src/rcstrings.c:70
+#: src/rcstrings.c:70
 msgid "Zoom Full"
 msgstr "Ð? наÑ?Ñ?Ñ?алÑ?нÑ?Ñ? велиÑ?инÑ?"
 
-#: ../src/rcstrings.c:71
+#: src/rcstrings.c:71
 msgid "Dark color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:72
+#: src/rcstrings.c:72
 msgid "Light color scheme"
 msgstr ""
 
-#: ../src/rcstrings.c:74
+#: src/rcstrings.c:74
 msgid "Page"
 msgstr "СÑ?Ñ?аниÑ?а"
 
-#: ../src/rcstrings.c:75
+#: src/rcstrings.c:75
 msgid "Manager..."
 msgstr "Ð?енеджеÑ?..."
 
-#: ../src/rcstrings.c:76
+#: src/rcstrings.c:76
 msgid "Next"
 msgstr "СледÑ?Ñ?Ñ?аÑ?"
 
-#: ../src/rcstrings.c:77
+#: src/rcstrings.c:77
 msgid "Previous"
 msgstr "Ð?Ñ?едÑ?дÑ?Ñ?аÑ?"
 
-#: ../src/rcstrings.c:78 ../src/x_window.c:316
+#: src/rcstrings.c:78 src/x_window.c:316
 msgid "New"
 msgstr "Ð?оваÑ?"
 
-#: ../src/rcstrings.c:79
+#: src/rcstrings.c:79
 msgid "Revert"
 msgstr "Ð?озвÑ?аÑ?иÑ?Ñ?"
 
-#: ../src/rcstrings.c:80
+#: src/rcstrings.c:80
 msgid "Close"
 msgstr "Ð?акÑ?Ñ?Ñ?Ñ?"
 
-#: ../src/rcstrings.c:81
+#: src/rcstrings.c:81
 msgid "Discard"
 msgstr "Ð?Ñ?веÑ?гнÑ?Ñ?Ñ?"
 
-#: ../src/rcstrings.c:83
+#: src/rcstrings.c:83
 msgid "Add"
 msgstr "Ð?обавиÑ?Ñ?"
 
-#: ../src/rcstrings.c:84
+#: src/rcstrings.c:84
 msgid "Component..."
 msgstr "Ð?омпоненÑ?..."
 
-#. need to click
-#: ../src/rcstrings.c:85 ../src/i_callbacks.c:2398 ../src/i_callbacks.c:2425
-#: ../src/x_dialog.c:2376
+#: src/rcstrings.c:85 src/i_callbacks.c:2401 src/i_callbacks.c:2428
+#: src/x_dialog.c:2378
 msgid "Net"
 msgstr "Ð?Ñ?оводник"
 
-#. need to click
-#: ../src/rcstrings.c:86 ../src/i_callbacks.c:2469 ../src/i_callbacks.c:2496
-#: ../src/x_dialog.c:2394 ../src/x_window.c:374
+#: src/rcstrings.c:86 src/i_callbacks.c:2472 src/i_callbacks.c:2499
+#: src/x_dialog.c:2396 src/x_window.c:374
 msgid "Bus"
 msgstr "Шина"
 
-#: ../src/rcstrings.c:87
+#: src/rcstrings.c:87
 msgid "Attribute..."
 msgstr "Ð?Ñ?Ñ?ибÑ?Ñ?..."
 
-#: ../src/rcstrings.c:88
+#: src/rcstrings.c:88
 msgid "Text..."
 msgstr "ТекÑ?Ñ?..."
 
-#: ../src/rcstrings.c:89 ../src/i_callbacks.c:2577 ../src/i_callbacks.c:2600
+#: src/rcstrings.c:89 src/i_callbacks.c:2580 src/i_callbacks.c:2603
 msgid "Line"
 msgstr "Ð?иниÑ?"
 
-#: ../src/rcstrings.c:90 ../src/i_callbacks.c:2622 ../src/i_callbacks.c:2645
+#: src/rcstrings.c:90 src/i_callbacks.c:2625 src/i_callbacks.c:2648
 msgid "Box"
 msgstr "Ð?Ñ?Ñ?моÑ?голÑ?ник"
 
-#: ../src/rcstrings.c:91 ../src/i_callbacks.c:2701 ../src/i_callbacks.c:2725
+#: src/rcstrings.c:91 src/i_callbacks.c:2704 src/i_callbacks.c:2728
 msgid "Circle"
 msgstr "Ð?кÑ?Ñ?жноÑ?Ñ?Ñ?"
 
-#: ../src/rcstrings.c:92 ../src/i_callbacks.c:2747 ../src/i_callbacks.c:2770
+#: src/rcstrings.c:92 src/i_callbacks.c:2750 src/i_callbacks.c:2773
 msgid "Arc"
 msgstr "Ð?Ñ?га"
 
-#: ../src/rcstrings.c:93 ../src/i_callbacks.c:2792 ../src/i_callbacks.c:2815
-#: ../src/x_dialog.c:2367
+#: src/rcstrings.c:93 src/i_callbacks.c:2795 src/i_callbacks.c:2818
+#: src/x_dialog.c:2369
 msgid "Pin"
 msgstr "Ð?онÑ?акÑ?"
 
-#: ../src/rcstrings.c:94
+#: src/rcstrings.c:94
 msgid "Picture..."
 msgstr "Ð?зобÑ?ажение..."
 
-#: ../src/rcstrings.c:96
+#: src/rcstrings.c:96
 msgid "Hierarchy"
 msgstr "Ð?еÑ?аÑ?Ñ?иÑ?"
 
-#: ../src/rcstrings.c:97
+#: src/rcstrings.c:97
 msgid "Down Schematic"
 msgstr "Ð?глÑ?бÑ? Ñ?Ñ?емÑ?"
 
-#: ../src/rcstrings.c:98
+#: src/rcstrings.c:98
 msgid "Down Symbol"
 msgstr "Ð?глÑ?бÑ? Ñ?имвола"
 
-#: ../src/rcstrings.c:99
+#: src/rcstrings.c:99
 msgid "Up"
 msgstr "Ð?авеÑ?Ñ?"
 
-#: ../src/rcstrings.c:100
+#: src/rcstrings.c:100
 msgid "Documentation"
 msgstr "Ð?окÑ?менÑ?аÑ?иÑ?"
 
-#. GtkFrame
-#: ../src/rcstrings.c:102 ../src/x_compselect.c:1418
-#: ../src/x_multiattrib.c:1543
+#: src/rcstrings.c:102 src/x_compselect.c:1417
 msgid "Attributes"
 msgstr "Ð?Ñ?Ñ?ибÑ?Ñ?Ñ?"
 
-#: ../src/rcstrings.c:103 ../src/i_callbacks.c:3092
+#: src/rcstrings.c:103 src/i_callbacks.c:3089
 msgid "Attach"
 msgstr "Ð?Ñ?иÑ?епиÑ?Ñ?"
 
-#: ../src/rcstrings.c:104 ../src/i_callbacks.c:3139
+#: src/rcstrings.c:104 src/i_callbacks.c:3136
 msgid "Detach"
 msgstr "Ð?Ñ?Ñ?епиÑ?Ñ?"
 
-#: ../src/rcstrings.c:105
+#: src/rcstrings.c:105
 msgid "Show Value"
 msgstr "Ð?оказаÑ?Ñ? знаÑ?ение"
 
-#: ../src/rcstrings.c:106
+#: src/rcstrings.c:106
 msgid "Show Name"
 msgstr "Ð?оказаÑ?Ñ? имÑ?"
 
-#: ../src/rcstrings.c:107
+#: src/rcstrings.c:107
 msgid "Show Both"
 msgstr "Ð?оказаÑ?Ñ? оба паÑ?амеÑ?Ñ?а"
 
-#: ../src/rcstrings.c:108
+#: src/rcstrings.c:108
 msgid "Toggle Visibility"
 msgstr "Ð?еÑ?еклÑ?Ñ?ение видимоÑ?Ñ?и"
 
-#: ../src/rcstrings.c:109
+#: src/rcstrings.c:109
 msgid "Find Specific Text..."
 msgstr "Ð?айÑ?и опÑ?еделеннÑ?й Ñ?екÑ?Ñ?..."
 
-#: ../src/rcstrings.c:110
+#: src/rcstrings.c:110
 msgid "Hide Specific Text..."
 msgstr "СкÑ?Ñ?Ñ?Ñ? опÑ?еделеннÑ?й Ñ?екÑ?Ñ?..."
 
-#: ../src/rcstrings.c:111
+#: src/rcstrings.c:111
 msgid "Show Specific Text..."
 msgstr "Ð?оказаÑ?Ñ? опÑ?еделеннÑ?й Ñ?екÑ?Ñ?..."
 
-#: ../src/rcstrings.c:112
+#: src/rcstrings.c:112
 msgid "Autonumber Text..."
 msgstr "Ð?вÑ?онÑ?меÑ?оваÑ?Ñ? Ñ?екÑ?Ñ?..."
 
-#: ../src/rcstrings.c:114
+#: src/rcstrings.c:114
 msgid "Options"
 msgstr "Ð?аÑ?Ñ?Ñ?ойки"
 
-#: ../src/rcstrings.c:115
+#: src/rcstrings.c:115
 msgid "Text Size..."
 msgstr "РазмеÑ? Ñ?екÑ?Ñ?а..."
 
-#: ../src/rcstrings.c:116
+#: src/rcstrings.c:116
 msgid "Cycle grid styles"
 msgstr ""
 
-#: ../src/rcstrings.c:117
+#: src/rcstrings.c:117
 msgid "Toggle Snap On/Off"
 msgstr "Ð?еÑ?еклÑ?Ñ?ение пÑ?ивÑ?зки"
 
-#: ../src/rcstrings.c:118
+#: src/rcstrings.c:118
 msgid "Snap Grid Spacing..."
 msgstr "Шаг Ñ?еÑ?ки пÑ?ивÑ?зки..."
 
-#: ../src/rcstrings.c:119
+#: src/rcstrings.c:119
 #, fuzzy
 msgid "Scale up Grid Spacing"
 msgstr "Шаг Ñ?еÑ?ки пÑ?ивÑ?зки..."
 
-#: ../src/rcstrings.c:120
+#: src/rcstrings.c:120
 #, fuzzy
 msgid "Scale down Grid Spacing"
 msgstr "Шаг Ñ?еÑ?ки пÑ?ивÑ?зки..."
 
-#: ../src/rcstrings.c:121
+#: src/rcstrings.c:121
 msgid "Toggle Outline/Box"
 msgstr "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ? внеÑ?ний конÑ?Ñ?Ñ?/бокÑ?"
 
-#: ../src/rcstrings.c:122
+#: src/rcstrings.c:122
 msgid "Toggle Net Rubberband"
 msgstr ""
 
-#: ../src/rcstrings.c:123
+#: src/rcstrings.c:123
 msgid "Show Log Window..."
 msgstr "Ð?оказаÑ?Ñ? окно пÑ?оÑ?окола"
 
-#: ../src/rcstrings.c:124
+#: src/rcstrings.c:124
 msgid "Show Coord Window..."
 msgstr "Ð?оказаÑ?Ñ? окно кооÑ?динаÑ?"
 
-#: ../src/rcstrings.c:126
+#: src/rcstrings.c:126
 msgid "Help"
 msgstr "Ð?омоÑ?Ñ?"
 
-#: ../src/rcstrings.c:127
+#: src/rcstrings.c:127
 #, fuzzy
 msgid "Manual"
 msgstr "РÑ?ководÑ?Ñ?во..."
 
-#: ../src/rcstrings.c:128
+#: src/rcstrings.c:128
 #, fuzzy
 msgid "gEDA Documentation"
 msgstr "Ð?окÑ?менÑ?аÑ?иÑ?"
 
-#: ../src/rcstrings.c:129
+#: src/rcstrings.c:129
 msgid "gschem FAQ"
 msgstr ""
 
-#: ../src/rcstrings.c:130
+#: src/rcstrings.c:130
 #, fuzzy
 msgid "Component Documentation"
 msgstr "Ð?окÑ?менÑ?аÑ?иÑ?"
 
-#: ../src/rcstrings.c:131
+#: src/rcstrings.c:131
 msgid "About gschem"
 msgstr ""
 
-#: ../src/rcstrings.c:132 ../src/x_dialog.c:2722
+#: src/rcstrings.c:132 src/x_dialog.c:2724
 #, fuzzy
 msgid "Hotkeys"
 msgstr "Ð?оÑ?Ñ?Ñ?ие клавиÑ?и..."
 
-#: ../src/a_zoom.c:212
+#: src/a_zoom.c:212
 msgid "Zoom too small!  Cannot zoom further.\n"
 msgstr "Ð?аÑ?Ñ?Ñ?аб оÑ?енÑ? мал! Ð?евозможно далÑ?нейÑ?ее изменение.\n"
 
-#. Fork failed. Still in parent process, so can use the log
-#. * window
-#: ../src/g_funcs.c:339 ../src/i_callbacks.c:68
+#: src/g_funcs.c:339 src/i_callbacks.c:68
 #, c-format
 msgid "Could not fork\n"
 msgstr "Ð?евозможно Ñ?азвеÑ?влиÑ?Ñ?Ñ?Ñ?\n"
 
-#. if we return, then nothing happened
-#: ../src/g_funcs.c:355 ../src/i_callbacks.c:78
+#: src/g_funcs.c:355 src/i_callbacks.c:78
 #, c-format
 msgid "Could not invoke %s\n"
 msgstr "Ð?евозможно вÑ?зваÑ?Ñ? %s\n"
 
-#: ../src/g_funcs.c:361 ../src/i_callbacks.c:82
+#: src/g_funcs.c:361 src/i_callbacks.c:82
 msgid "Documentation commands not supported under MinGW.\n"
 msgstr "Ð?омандÑ? докÑ?менÑ?аÑ?ии не поддеÑ?живаÑ?Ñ?Ñ?Ñ? в MinGW.\n"
 
-#: ../src/g_rc.c:292
+#: src/g_rc.c:292
 #, c-format
 msgid "Invalid zoomfactor [%d] passed to %s\n"
 msgstr "Ð?евеÑ?нÑ?й маÑ?Ñ?Ñ?аб [%d] пÑ?и обÑ?абоÑ?ке %s\n"
 
-#: ../src/g_rc.c:418
+#: src/g_rc.c:418
 #, c-format
 msgid "Invalid size [%d] passed to text-size\n"
 msgstr "Ð?евеÑ?нÑ?й Ñ?азмеÑ? [%d] пÑ?и обÑ?абоÑ?ке text-size\n"
 
-#: ../src/g_rc.c:445
+#: src/g_rc.c:445
 #, fuzzy, c-format
 msgid "Invalid size [%f] passed to postscript-font-scale\n"
 msgstr "Ð?евеÑ?нÑ?й Ñ?азмеÑ? [%d] пÑ?и обÑ?абоÑ?ке text-size\n"
 
-#: ../src/g_rc.c:488
+#: src/g_rc.c:488
 #, c-format
 msgid "Invalid size [%d] passed to snap-size\n"
 msgstr "Ð?евеÑ?нÑ?й Ñ?азмеÑ? [%d] пÑ?и обÑ?абоÑ?ке snap-size\n"
 
-#: ../src/g_rc.c:960
+#: src/g_rc.c:960
 #, c-format
 msgid "Invalid num levels [%d] passed to undo-levels\n"
 msgstr "Ð?евеÑ?ное колиÑ?еÑ?Ñ?во Ñ?Ñ?овней [%d] пÑ?и обÑ?абоÑ?ке undo-levels\n"
 
-#: ../src/g_rc.c:1218
+#: src/g_rc.c:1218
 #, c-format
 msgid "Invalid size [%d] passed to bus-ripper-size\n"
 msgstr "Ð?евеÑ?нÑ?й Ñ?азмеÑ? [%d] пÑ?и обÑ?абоÑ?ке bus-ripper-size\n"
 
-#: ../src/g_rc.c:1293
+#: src/g_rc.c:1293
 #, fuzzy, c-format
 msgid "Invalid dot size [%d] passed to dots-grid-dot-size\n"
 msgstr "Ð?евеÑ?нÑ?й Ñ?азмеÑ? Ñ?оÑ?ки [%d] пÑ?и обÑ?абоÑ?ке grid-dot-size\n"
 
-#: ../src/g_rc.c:1334
+#: src/g_rc.c:1334
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to dots-grid-fixed-threshold\n"
 msgstr "Ð?евеÑ?нÑ?е оÑ?Ñ?Ñ?Ñ?пÑ? [%d] пÑ?и обÑ?абоÑ?ке grid-fixed-threshold\n"
 
-#: ../src/g_rc.c:1360
+#: src/g_rc.c:1360
 #, fuzzy, c-format
 msgid "Invalid pixel spacing [%d] passed to mesh-grid-display-threshold\n"
 msgstr "Ð?евеÑ?нÑ?е оÑ?Ñ?Ñ?Ñ?пÑ? [%d] пÑ?и обÑ?абоÑ?ке grid-fixed-threshold\n"
 
-#: ../src/g_rc.c:1404
+#: src/g_rc.c:1404
 #, c-format
 msgid "Invalid offset [%d] passed to add-attribute-offset\n"
 msgstr "Ð?евеÑ?ное Ñ?меÑ?ение [%d] пÑ?и обÑ?абоÑ?ке add-attribute-offset\n"
 
-#: ../src/g_rc.c:1428
+#: src/g_rc.c:1428
 #, c-format
 msgid "Invalid number of seconds [%d] passed to auto-save-interval\n"
 msgstr "Ð?евеÑ?ное Ñ?иÑ?ло Ñ?екÑ?нд [%d] пÑ?и обÑ?абоÑ?ке auto-save-interval\n"
 
-#: ../src/g_rc.c:1469
+#: src/g_rc.c:1469
 #, c-format
 msgid "Invalid gain [%d] passed to mousepan-gain\n"
 msgstr "Ð?евеÑ?ное Ñ?Ñ?коÑ?ение [%d] пÑ?и обÑ?абоÑ?ке mousepan-gain\n"
 
-#: ../src/g_rc.c:1492
+#: src/g_rc.c:1492
 #, c-format
 msgid "Invalid gain [%d] passed to keyboardpan-gain\n"
 msgstr "Ð?евеÑ?ное Ñ?Ñ?коÑ?ение [%d] пÑ?и обÑ?абоÑ?ке keyboardpan-gain\n"
 
-#: ../src/g_rc.c:1538
+#: src/g_rc.c:1538
 #, fuzzy, c-format
 msgid "Invalid number of pixels [%d] passed to select-slack-pixels\n"
 msgstr "Ð?евеÑ?ное Ñ?иÑ?ло Ñ?екÑ?нд [%d] пÑ?и обÑ?абоÑ?ке auto-save-interval\n"
 
-#: ../src/g_rc.c:1564
+#: src/g_rc.c:1564
 #, fuzzy, c-format
 msgid "Invalid gain [%d] passed to zoom-gain\n"
 msgstr "Ð?евеÑ?ное Ñ?Ñ?коÑ?ение [%d] пÑ?и обÑ?абоÑ?ке mousepan-gain\n"
 
-#: ../src/g_rc.c:1589
+#: src/g_rc.c:1589
 #, fuzzy, c-format
 msgid "Invalid number of steps [%d] scrollpan-steps\n"
 msgstr "Ð?евеÑ?ное Ñ?иÑ?ло Ñ?екÑ?нд [%d] пÑ?и обÑ?абоÑ?ке auto-save-interval\n"
 
-#: ../src/gschem.c:183 ../src/gschem.c:194
+#: src/gschem.c:183 src/gschem.c:194
 #, c-format
 msgid "gEDA/gschem version %s%s.%s\n"
 msgstr "Ð?еÑ?Ñ?иÑ? gEDA/gschem %s%s.%s\n"
 
-#: ../src/gschem.c:186 ../src/gschem.c:197
+#: src/gschem.c:186 src/gschem.c:197
 #, c-format
 msgid ""
 "gEDA/gschem comes with ABSOLUTELY NO WARRANTY; see COPYING for more "
@@ -641,7 +631,7 @@ msgid ""
 msgstr ""
 "gEDA/gschem поÑ?Ñ?авлÑ?еÑ?Ñ?Ñ? Ð?Ð?Ð? Ð?Ð?РÐ?Ð?ТÐ?Ð?; Ñ?моÑ?Ñ?иÑ?е COPYING длÑ? подÑ?обноÑ?Ñ?ей.\n"
 
-#: ../src/gschem.c:188 ../src/gschem.c:199
+#: src/gschem.c:188 src/gschem.c:199
 #, c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain\n"
@@ -649,7 +639,7 @@ msgstr ""
 "ЭÑ?о Ñ?вободное пÑ?огÑ?аммное обеÑ?пеÑ?ение, и его можно Ñ?аÑ?пÑ?оÑ?Ñ?Ñ?анÑ?Ñ?Ñ? пÑ?и "
 "извеÑ?Ñ?нÑ?Ñ?\n"
 
-#: ../src/gschem.c:190 ../src/gschem.c:201
+#: src/gschem.c:190 src/gschem.c:201
 #, c-format
 msgid ""
 "conditions; please see the COPYING file for more details.\n"
@@ -658,17 +648,17 @@ msgstr ""
 "Ñ?Ñ?ловиÑ?Ñ?; пожалÑ?йÑ?Ñ?а, Ñ?моÑ?Ñ?иÑ?е Ñ?айл COPYING длÑ? полÑ?Ñ?ениÑ? подÑ?обноÑ?Ñ?ей.\n"
 "\n"
 
-#: ../src/gschem.c:205
+#: src/gschem.c:205
 #, c-format
 msgid "This is the MINGW32 port.\n"
 msgstr "ЭÑ?о MINGW32 веÑ?Ñ?иÑ?.\n"
 
-#: ../src/gschem.c:209
+#: src/gschem.c:209
 #, c-format
 msgid "Current locale settings: %s\n"
 msgstr "ТекÑ?Ñ?ие Ñ?Ñ?Ñ?ановки локализаÑ?ии: %s\n"
 
-#: ../src/gschem.c:224
+#: src/gschem.c:224
 msgid ""
 "You must set the GEDADATA environment variable!\n"
 "\n"
@@ -676,223 +666,246 @@ msgid ""
 "environment variable to point to the correct location.\n"
 msgstr ""
 
-#: ../src/gschem.c:251
+#: src/gschem.c:251
 #, fuzzy, c-format
 msgid "Couldn't find init scm file [%s]\n"
 msgstr "Ð?евозможно пÑ?оÑ?иÑ?аÑ?Ñ? наÑ?алÑ?нÑ?й scm-Ñ?айл [%s]\n"
 
-#: ../src/gschem.c:255
+#: src/gschem.c:255
 #, c-format
 msgid "Read init scm file [%s]\n"
 msgstr "ЧÑ?ение наÑ?алÑ?ного scm-Ñ?айла [%s]\n"
 
-#. ! \todo These two messages are the same. Should be
-#. * integrated.
-#: ../src/gschem.c:259
+#: src/gschem.c:259
 #, c-format
 msgid "Failed to read init scm file [%s]\n"
 msgstr "Ð?евозможно пÑ?оÑ?иÑ?аÑ?Ñ? наÑ?алÑ?нÑ?й scm-Ñ?айл [%s]\n"
 
-#: ../src/gschem.c:320
+#: src/gschem.c:320
 #, c-format
 msgid "Scheme directory NOT set!\n"
 msgstr "Ð?аÑ?алог Ñ?Ñ?ем Ð?Ð? Ñ?Ñ?Ñ?ановлен!\n"
 
-#: ../src/gschem.c:327 ../src/x_script.c:66
+#: src/gschem.c:327 src/x_script.c:66
 #, c-format
 msgid "Executing guile script [%s]\n"
 msgstr "Ð?апÑ?Ñ?каеÑ?Ñ?Ñ? guile-Ñ?кÑ?ипÑ? [%s]\n"
 
-#: ../src/gschem_cairo.c:310
+#: src/gschem_accel_label.c:319
+msgid "Accelerator Closure"
+msgstr ""
+
+#: src/gschem_accel_label.c:320
+msgid "The closure to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:326
+msgid "Accelerator Widget"
+msgstr ""
+
+#: src/gschem_accel_label.c:327
+msgid "The widget to be monitored for accelerator changes"
+msgstr ""
+
+#: src/gschem_accel_label.c:333
+#, fuzzy
+msgid "Accelerator String"
+msgstr "Ð?бÑ?аÑ? Ñ?Ñ?Ñ?ока"
+
+#: src/gschem_accel_label.c:334
+msgid "The accelerator string to be displayed"
+msgstr ""
+
+#: src/gschem_cairo.c:310
 #, c-format
 msgid "Unknown end for line (%d)\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й конеÑ? длÑ? линии (%d)\n"
 
-#: ../src/gschem_cairo.c:318
+#: src/gschem_cairo.c:318
 #, fuzzy, c-format
 msgid "Unknown type for stroke (%d) !\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й Ñ?ип длÑ? линии (%d) !\n"
 
-#: ../src/i_basic.c:79
+#: src/i_basic.c:79
 msgid "Component Mode"
 msgstr "Режим компоненÑ?ов"
 
-#: ../src/i_basic.c:81
+#: src/i_basic.c:81
 msgid "Text Mode"
 msgstr "Режим Ñ?екÑ?Ñ?а"
 
-#: ../src/i_basic.c:89
+#: src/i_basic.c:89
 msgid "Rotate Mode"
 msgstr "Режим вÑ?аÑ?ениÑ?"
 
-#: ../src/i_basic.c:99
+#: src/i_basic.c:99
 msgid "Pan Mode"
 msgstr "Режим Ñ?енÑ?Ñ?иÑ?ованиÑ?"
 
-#: ../src/i_basic.c:103
+#: src/i_basic.c:103
 #, c-format
 msgid "Paste %d Mode"
 msgstr "Режим вÑ?Ñ?авки %d"
 
-#: ../src/i_basic.c:109
+#: src/i_basic.c:109
 #, fuzzy
 msgid "Magnetic Net Mode"
 msgstr "Режим пÑ?оводника"
 
-#: ../src/i_basic.c:111
+#: src/i_basic.c:111
 msgid "Net Mode"
 msgstr "Режим пÑ?оводника"
 
-#: ../src/i_basic.c:115
+#: src/i_basic.c:115
 msgid "Bus Mode"
 msgstr "Режим Ñ?инÑ?"
 
-#: ../src/i_basic.c:118
+#: src/i_basic.c:118
 msgid "Line Mode"
 msgstr "Режим линии"
 
-#: ../src/i_basic.c:121
+#: src/i_basic.c:121
 msgid "Box Mode"
 msgstr "Режим пÑ?Ñ?моÑ?голÑ?ника"
 
-#: ../src/i_basic.c:124
+#: src/i_basic.c:124
 msgid "Picture Mode"
 msgstr "Режим изобÑ?ажениÑ?"
 
-#: ../src/i_basic.c:127
+#: src/i_basic.c:127
 msgid "Circle Mode"
 msgstr "Режим окÑ?Ñ?жноÑ?Ñ?и"
 
-#: ../src/i_basic.c:130
+#: src/i_basic.c:130
 msgid "Arc Mode"
 msgstr "Режим дÑ?ги"
 
-#: ../src/i_basic.c:133
+#: src/i_basic.c:133
 msgid "Pin Mode"
 msgstr "Режим конÑ?акÑ?ов"
 
-#: ../src/i_basic.c:137 ../src/i_callbacks.c:626 ../src/i_callbacks.c:650
+#: src/i_basic.c:137 src/i_callbacks.c:626 src/i_callbacks.c:650
 msgid "Move"
 msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ?"
 
-#: ../src/i_basic.c:139 ../src/i_callbacks.c:581 ../src/i_callbacks.c:605
+#: src/i_basic.c:139 src/i_callbacks.c:581 src/i_callbacks.c:605
 msgid "Multiple Copy"
 msgstr "Ð?ножеÑ?Ñ?венное копиÑ?ование"
 
-#: ../src/i_basic.c:168
+#: src/i_basic.c:168
 msgid "Show Hidden"
 msgstr "Ð?оказаÑ?Ñ? Ñ?кÑ?Ñ?Ñ?Ñ?е"
 
-#: ../src/i_basic.c:171
+#: src/i_basic.c:171
 msgid "Snap Off"
 msgstr "Ð?Ñ?ивÑ?зка вÑ?клÑ?Ñ?ена"
 
-#: ../src/i_basic.c:173
+#: src/i_basic.c:173
 msgid "Resnap Active"
 msgstr ""
 
-#: ../src/i_basic.c:254 ../src/x_window.c:495
+#: src/i_basic.c:254 src/x_window.c:495
 msgid "Action"
 msgstr "Ð?ейÑ?Ñ?вие"
 
-#: ../src/i_basic.c:260 ../src/x_dialog.c:2406 ../src/x_window.c:490
+#: src/i_basic.c:260 src/x_dialog.c:2408 src/x_window.c:490
 msgid "Stroke"
 msgstr "ШÑ?Ñ?иÑ?"
 
-#: ../src/i_basic.c:266 ../src/x_window.c:492
+#: src/i_basic.c:266 src/x_window.c:492
 msgid "none"
 msgstr "пÑ?Ñ?Ñ?о"
 
-#: ../src/i_basic.c:271
+#: src/i_basic.c:271
 msgid "Repeat/"
 msgstr "Ð?овÑ?оÑ?иÑ?Ñ?/"
 
-#: ../src/i_basic.c:549 ../src/i_basic.c:563
+#: src/i_basic.c:549 src/i_basic.c:563
 msgid "OFF"
 msgstr ""
 
-#: ../src/i_basic.c:567
+#: src/i_basic.c:567
 msgid "NONE"
 msgstr ""
 
-#: ../src/i_basic.c:572
+#: src/i_basic.c:572
 #, c-format
 msgid "Grid(%s, %s)"
 msgstr ""
 
-#: ../src/i_callbacks.c:63
+#: src/i_callbacks.c:63
 #, c-format
 msgid "Documentation for [%s,%s,%s,%s]\n"
 msgstr "Ð?окÑ?менÑ?аÑ?иÑ? длÑ? [%s, %s, %s, %s]\n"
 
-#: ../src/i_callbacks.c:123 ../src/i_callbacks.c:1702
+#: src/i_callbacks.c:123 src/i_callbacks.c:1705
 #, c-format
 msgid "New page created [%s]\n"
 msgstr "Создана новаÑ? Ñ?Ñ?Ñ?аниÑ?а [%s]\n"
 
-#: ../src/i_callbacks.c:163
+#: src/i_callbacks.c:163
 #, fuzzy, c-format
 msgid "New Window created [%s]\n"
 msgstr "Создано новое окно\n"
 
-#: ../src/i_callbacks.c:281
+#: src/i_callbacks.c:281
 msgid "Failed to Save All"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?оÑ?Ñ?анении вÑ?его"
 
-#: ../src/i_callbacks.c:283
+#: src/i_callbacks.c:283
 msgid "Saved All"
 msgstr "Ð?Ñ?е Ñ?оÑ?Ñ?анено"
 
-#: ../src/i_callbacks.c:373
+#: src/i_callbacks.c:373
 msgid "Closing Window\n"
 msgstr "Ð?акÑ?Ñ?Ñ?ие окна\n"
 
-#: ../src/i_callbacks.c:541 ../src/i_callbacks.c:586 ../src/i_callbacks.c:631
+#: src/i_callbacks.c:541 src/i_callbacks.c:586 src/i_callbacks.c:631
 msgid "Select objs first"
 msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? вÑ?боÑ? обÑ?екÑ?ов"
 
-#: ../src/i_callbacks.c:710
+#: src/i_callbacks.c:710
 #, fuzzy
 msgid "Edit pin type"
 msgstr "Ð?Ñ?авка Ñ?ипа линии"
 
-#: ../src/i_callbacks.c:729
+#: src/i_callbacks.c:729
 msgid "Edit Text"
 msgstr "Ð?Ñ?авка Ñ?екÑ?Ñ?а"
 
-#: ../src/i_callbacks.c:752
+#: src/i_callbacks.c:752
 msgid "Slot"
 msgstr "СлоÑ?"
 
-#: ../src/i_callbacks.c:769
+#: src/i_callbacks.c:769
 msgid "Color"
 msgstr "ЦвеÑ?"
 
-#: ../src/i_callbacks.c:806 ../src/i_callbacks.c:851
+#: src/i_callbacks.c:806 src/i_callbacks.c:851
 msgid "Rotate"
 msgstr "Ð?Ñ?аÑ?аÑ?Ñ?"
 
-#: ../src/i_callbacks.c:874 ../src/i_callbacks.c:899
+#: src/i_callbacks.c:874 src/i_callbacks.c:899
 msgid "Mirror"
 msgstr "Ð?еÑ?калиÑ?ование"
 
-#: ../src/i_callbacks.c:956 ../src/x_dialog.c:1800
+#: src/i_callbacks.c:956 src/x_dialog.c:1800
 msgid "Translate"
 msgstr "Ð?еÑ?евод"
 
-#: ../src/i_callbacks.c:959
+#: src/i_callbacks.c:959
 msgid "WARNING: Do not translate with snap off!\n"
 msgstr "Ð?Ñ?едÑ?пÑ?еждение: не пеÑ?еводиÑ?е c вÑ?клÑ?Ñ?енной пÑ?ивÑ?зкой!\n"
 
-#: ../src/i_callbacks.c:960
+#: src/i_callbacks.c:960
 msgid "WARNING: Turning snap on and continuing with translate.\n"
 msgstr "Ð?Ñ?едÑ?пÑ?еждение: Ð?клÑ?Ñ?иÑ?е пÑ?ивÑ?зкÑ? пÑ?одолжиÑ?е Ñ?Ñ?анÑ?лÑ?Ñ?иÑ?.\n"
 
-#: ../src/i_callbacks.c:967
+#: src/i_callbacks.c:967
 msgid "WARNING: Snap grid size is not equal to 100!\n"
 msgstr "Ð?Ñ?едÑ?пÑ?еждение: Ñ?азмеÑ? Ñ?еÑ?ки пÑ?ивÑ?зки не Ñ?авен 100!\n"
 
-#: ../src/i_callbacks.c:969
+#: src/i_callbacks.c:969
 msgid ""
 "WARNING: If you are translating a symbol to the origin, the snap grid size "
 "should be set to 100\n"
@@ -900,390 +913,387 @@ msgstr ""
 "Ð?Ñ?едÑ?пÑ?еждение: Ð?Ñ?ли оÑ?Ñ?Ñ?еÑ?Ñ?влÑ?еÑ?Ñ?Ñ? пеÑ?евод Ñ?имвола к наÑ?алÑ? оÑ?Ñ?Ñ?еÑ?а, Ñ?азмеÑ? "
 "Ñ?еÑ?ки пÑ?ивÑ?зки должен бÑ?Ñ?Ñ? Ñ?Ñ?Ñ?ановлен в 100\n"
 
-#: ../src/i_callbacks.c:1000
+#: src/i_callbacks.c:1000
 msgid "Embed"
 msgstr "Ð?недÑ?иÑ?Ñ?"
 
-#: ../src/i_callbacks.c:1041
+#: src/i_callbacks.c:1041
 msgid "Unembed"
 msgstr "Ð?Ñ?клÑ?Ñ?иÑ?Ñ?"
 
-#: ../src/i_callbacks.c:1084
+#: src/i_callbacks.c:1085
 msgid "Update"
 msgstr "Ð?бновиÑ?Ñ?"
 
-#: ../src/i_callbacks.c:1141
+#: src/i_callbacks.c:1144
 msgid "ShowHidden"
 msgstr "Ð?оказаÑ?Ñ? Ñ?кÑ?Ñ?Ñ?Ñ?е"
 
-#: ../src/i_callbacks.c:1165
+#: src/i_callbacks.c:1168
 msgid "MakeVisible"
 msgstr "СделаÑ?Ñ? видимÑ?м"
 
-#: ../src/i_callbacks.c:1562
+#: src/i_callbacks.c:1565
 msgid "Update Cues"
 msgstr "Ð?бновиÑ?Ñ? Ñ?игналÑ?"
 
-#: ../src/i_callbacks.c:1746
+#: src/i_callbacks.c:1749
 msgid "Really revert page?"
 msgstr "Ð?ейÑ?Ñ?виÑ?елÑ?но возвÑ?аÑ?иÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ??"
 
-#: ../src/i_callbacks.c:1816
+#: src/i_callbacks.c:1819
 msgid "Copy to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1834
+#: src/i_callbacks.c:1837
 msgid "Cut to clipboard"
 msgstr ""
 
-#: ../src/i_callbacks.c:1852
+#: src/i_callbacks.c:1855
 #, fuzzy
 msgid "Paste from clipboard"
 msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? из 1"
 
-#: ../src/i_callbacks.c:1864 ../src/i_callbacks.c:2103
-#: ../src/i_callbacks.c:2125 ../src/i_callbacks.c:2147
-#: ../src/i_callbacks.c:2169 ../src/i_callbacks.c:2191
+#: src/i_callbacks.c:1867 src/i_callbacks.c:2106 src/i_callbacks.c:2128
+#: src/i_callbacks.c:2150 src/i_callbacks.c:2172 src/i_callbacks.c:2194
 msgid "Empty buffer"
 msgstr "Ð?Ñ?Ñ?Ñ?ой бÑ?Ñ?еÑ?"
 
-#: ../src/i_callbacks.c:1909
+#: src/i_callbacks.c:1912
 msgid "Copy 1"
 msgstr "Ð?опиÑ?ование 1"
 
-#: ../src/i_callbacks.c:1928
+#: src/i_callbacks.c:1931
 msgid "Copy 2"
 msgstr "Ð?опиÑ?ование 2"
 
-#: ../src/i_callbacks.c:1947
+#: src/i_callbacks.c:1950
 msgid "Copy 3"
 msgstr "Ð?опиÑ?ование 3"
 
-#: ../src/i_callbacks.c:1966
+#: src/i_callbacks.c:1969
 msgid "Copy 4"
 msgstr "Ð?опиÑ?ование 4"
 
-#: ../src/i_callbacks.c:1985
+#: src/i_callbacks.c:1988
 msgid "Copy 5"
 msgstr "Ð?опиÑ?ование 5"
 
-#: ../src/i_callbacks.c:2004
+#: src/i_callbacks.c:2007
 msgid "Cut 1"
 msgstr "Ð?Ñ?Ñ?езка 1"
 
-#: ../src/i_callbacks.c:2023
+#: src/i_callbacks.c:2026
 msgid "Cut 2"
 msgstr "Ð?Ñ?Ñ?езка 2"
 
-#: ../src/i_callbacks.c:2042
+#: src/i_callbacks.c:2045
 msgid "Cut 3"
 msgstr "Ð?Ñ?Ñ?езка 3"
 
-#: ../src/i_callbacks.c:2061
+#: src/i_callbacks.c:2064
 msgid "Cut 4"
 msgstr "Ð?Ñ?Ñ?езка 4"
 
-#: ../src/i_callbacks.c:2080
+#: src/i_callbacks.c:2083
 msgid "Cut 5"
 msgstr "Ð?Ñ?Ñ?езка 5"
 
-#: ../src/i_callbacks.c:2096
+#: src/i_callbacks.c:2099
 msgid "Paste 1"
 msgstr "Ð?Ñ?Ñ?авка 1"
 
-#: ../src/i_callbacks.c:2118
+#: src/i_callbacks.c:2121
 msgid "Paste 2"
 msgstr "Ð?Ñ?Ñ?авка 2"
 
-#: ../src/i_callbacks.c:2140
+#: src/i_callbacks.c:2143
 msgid "Paste 3"
 msgstr "Ð?Ñ?Ñ?авка 3"
 
-#: ../src/i_callbacks.c:2162
+#: src/i_callbacks.c:2165
 msgid "Paste 4"
 msgstr "Ð?Ñ?Ñ?авка 4"
 
-#: ../src/i_callbacks.c:2184
+#: src/i_callbacks.c:2187
 msgid "Paste 5"
 msgstr "Ð?Ñ?Ñ?авка 5"
 
-#: ../src/i_callbacks.c:2321 ../src/x_window.c:354
+#: src/i_callbacks.c:2324 src/x_window.c:354
 msgid "Component"
 msgstr "Ð?омпоненÑ?"
 
-#: ../src/i_callbacks.c:2357 ../src/i_callbacks.c:2376 ../src/x_dialog.c:2379
+#: src/i_callbacks.c:2360 src/i_callbacks.c:2379 src/x_dialog.c:2381
 msgid "Attribute"
 msgstr "Ð?Ñ?Ñ?ибÑ?Ñ?Ñ?"
 
-#: ../src/i_callbacks.c:2873
+#: src/i_callbacks.c:2877
 #, c-format
 msgid "Searching for source [%s]\n"
 msgstr "Ð?оиÑ?к иÑ?Ñ?оÑ?ника [%s]\n"
 
-#: ../src/i_callbacks.c:2897
+#: src/i_callbacks.c:2901
 #, c-format
 msgid "Cannot find source [%s]\n"
 msgstr "Ð?евозможно найÑ?и иÑ?Ñ?оÑ?ник [%s]\n"
 
-#: ../src/i_callbacks.c:2964
+#: src/i_callbacks.c:2970
 #, c-format
 msgid "Searching for symbol [%s]\n"
 msgstr "Ð?оиÑ?к Ñ?имвола [%s]\n"
 
-#: ../src/i_callbacks.c:2970
+#: src/i_callbacks.c:2976
 msgid "Symbol is not a real file. Symbol cannot be loaded.\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3001
+#: src/i_callbacks.c:3007
 msgid "Cannot find any schematics above the current one!\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3064
+#: src/i_callbacks.c:3061
 msgid ""
 "This command retrieves the component documentation from the web, but there "
 "is no component selected"
 msgstr ""
 
-#: ../src/i_callbacks.c:3177
+#: src/i_callbacks.c:3171
 msgid "ShowN"
 msgstr "Ð?оказаÑ?Ñ? N"
 
-#: ../src/i_callbacks.c:3213
+#: src/i_callbacks.c:3207
 msgid "ShowV"
 msgstr "Ð?оказаÑ?Ñ? V"
 
-#: ../src/i_callbacks.c:3249
+#: src/i_callbacks.c:3243
 msgid "ShowB"
 msgstr "Ð?оказаÑ?Ñ? B"
 
-#: ../src/i_callbacks.c:3286
+#: src/i_callbacks.c:3280
 msgid "VisToggle"
 msgstr "Ð?еÑ?екл. видимоÑ?Ñ?и"
 
-#: ../src/i_callbacks.c:3316
+#: src/i_callbacks.c:3310
 #, c-format
 msgid "Sorry but this is a non-functioning menu option\n"
 msgstr "Ð?звиниÑ?е6 но Ñ?Ñ?о опÑ?иÑ? не Ñ?Ñ?нкÑ?ионалÑ?ного менÑ?\n"
 
-#: ../src/i_callbacks.c:3406
+#: src/i_callbacks.c:3400
 msgid "Action feedback mode set to OUTLINE\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3409
+#: src/i_callbacks.c:3403
 msgid "Action feedback mode set to BOUNDINGBOX\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3434
+#: src/i_callbacks.c:3428
 msgid "Grid OFF\n"
 msgstr "СеÑ?ка вÑ?кл.\n"
 
-#: ../src/i_callbacks.c:3435
+#: src/i_callbacks.c:3429
 msgid "Dot grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3436
+#: src/i_callbacks.c:3430
 msgid "Mesh grid selected\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3457
+#: src/i_callbacks.c:3451
 msgid "Snap OFF (CAUTION!)\n"
 msgstr "Ð?Ñ?ивÑ?зка Ð?ЫÐ?Ð?ЮЧÐ?Ð?Ð? (Ð?нимание!)\n"
 
-#: ../src/i_callbacks.c:3460
+#: src/i_callbacks.c:3454
 msgid "Snap ON\n"
 msgstr "Ð?Ñ?ивÑ?зка Ð?Ð?Ð?ЮЧÐ?Ð?Ð?\n"
 
-#: ../src/i_callbacks.c:3463
+#: src/i_callbacks.c:3457
 #, fuzzy
 msgid "Snap back to the grid (CAUTION!)\n"
 msgstr "Ð?Ñ?ивÑ?зка Ð?ЫÐ?Ð?ЮЧÐ?Ð?Ð? (Ð?нимание!)\n"
 
-#: ../src/i_callbacks.c:3489
+#: src/i_callbacks.c:3483
 msgid "Rubber band OFF \n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3492
+#: src/i_callbacks.c:3486
 msgid "Rubber band ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3507
+#: src/i_callbacks.c:3501
 msgid "magnetic net mode: ON\n"
 msgstr ""
 
-#: ../src/i_callbacks.c:3510
+#: src/i_callbacks.c:3504
 msgid "magnetic net mode: OFF\n"
 msgstr ""
 
-#: ../src/o_box.c:160
+#: src/o_box.c:160
 #, c-format
 msgid "Unknown type for box (fill)!\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й Ñ?ип длÑ? пÑ?Ñ?моÑ?голÑ?ника (Ñ? заливкой)!\n"
 
-#: ../src/o_buffer.c:57
+#: src/o_buffer.c:57
 #, c-format
 msgid "o_buffer_copy: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:72
+#: src/o_buffer.c:72
 #, c-format
 msgid "o_buffer_cut: Invalid buffer %i\n"
 msgstr ""
 
-#: ../src/o_buffer.c:93
+#: src/o_buffer.c:93
 #, c-format
 msgid "Got an invalid buffer_number [o_buffer_paste_start]\n"
 msgstr "Ð?олÑ?Ñ?ен невеÑ?нÑ?й buffer_number [o_buffer_paste_start]\n"
 
-#: ../src/o_bus.c:135
+#: src/o_bus.c:135
 #, fuzzy, c-format
 msgid "Got an invalid which one in o_bus_draw_stretch\n"
 msgstr "Ð?олÑ?Ñ?ен невеÑ?нÑ?й паÑ?амеÑ?Ñ? в o_bus_draw_xor_single\n"
 
-#: ../src/o_circle.c:141
+#: src/o_circle.c:141
 #, c-format
 msgid "Unknown type for circle (fill)!\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й Ñ?ип длÑ? окÑ?Ñ?жноÑ?Ñ?и (Ñ? заливкой)!\n"
 
-#: ../src/o_complex.c:250 ../src/o_complex.c:254
+#: src/o_complex.c:250 src/o_complex.c:254
 #, c-format
 msgid "Translating schematic [%d %d]\n"
 msgstr "Ð?еÑ?евод Ñ?Ñ?емÑ? [%d %d]\n"
 
-#: ../src/o_misc.c:61
+#: src/o_misc.c:61
 #, c-format
 msgid "Got an unexpected NULL in o_edit\n"
 msgstr "Ð?еожиданнÑ?й NULL в o_edit\n"
 
-#: ../src/o_misc.c:125
+#: src/o_misc.c:125
 #, fuzzy
 msgid "Object already locked\n"
 msgstr "Ð?бÑ?екÑ? Ñ?же заблокиÑ?ован\n"
 
-#: ../src/o_misc.c:163
+#: src/o_misc.c:163
 #, fuzzy
 msgid "Object already unlocked\n"
 msgstr "Ð?бÑ?екÑ? Ñ?же Ñ?азблокиÑ?ован\n"
 
-#: ../src/o_misc.c:445
+#: src/o_misc.c:445
 msgid "Hidden text is now visible\n"
 msgstr "СкÑ?Ñ?Ñ?Ñ?й Ñ?екÑ?Ñ? Ñ?ейÑ?аÑ? видим\n"
 
-#: ../src/o_misc.c:447
+#: src/o_misc.c:447
 msgid "Hidden text is now invisible\n"
 msgstr "СкÑ?Ñ?Ñ?Ñ?й Ñ?еÑ?кÑ? Ñ?ейÑ?аÑ? невидим\n"
 
-#: ../src/o_misc.c:697
+#: src/o_misc.c:700
 #, c-format
 msgid "Could not find symbol [%s] in library. Update failed.\n"
 msgstr ""
 
-#: ../src/o_misc.c:840
+#: src/o_misc.c:847
 #, c-format
 msgid "o_autosave_backups: Can't get the real filename of %s."
 msgstr "o_autosave_backups: невозможно полÑ?Ñ?иÑ?Ñ? Ñ?еалÑ?но имÑ? Ñ?айла длÑ? %s."
 
-#: ../src/o_misc.c:884
+#: src/o_misc.c:891
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr ""
 "Ð?евозможно Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?ежим Ñ?Ñ?ениÑ?-запиÑ?и длÑ? пÑ?едÑ?дÑ?Ñ?ей Ñ?езеÑ?вной копии "
 "Ñ?айла [%s]\n"
 
-#: ../src/o_misc.c:902
+#: src/o_misc.c:909
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Ð?евозможно Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?ежим Ñ?олÑ?ко Ñ?Ñ?ениÑ? длÑ? Ñ?езеÑ?вного Ñ?айла [%s]\n"
 
-#: ../src/o_misc.c:907
+#: src/o_misc.c:914
 #, c-format
 msgid "Could NOT save backup file [%s]\n"
 msgstr "Ð?евозможно Ñ?оÑ?Ñ?аниÑ?Ñ? Ñ?езеÑ?внÑ?й Ñ?айл [%s]\n"
 
-#: ../src/o_move.c:188
+#: src/o_move.c:188
 #, c-format
 msgid "ERROR: NULL object in o_move_end!\n"
 msgstr "Ð?Ñ?ибка: обÑ?екÑ? NULL в o_move_end!\n"
 
-#: ../src/o_move.c:461
+#: src/o_move.c:461
 #, c-format
 msgid "DOH! tried to find the whichone, but didn't find it!\n"
 msgstr "Ð?Ñ?! Ð?опÑ?Ñ?ка найÑ?и Ñ?Ñ?о-либо, но ниÑ?его не полÑ?Ñ?аеÑ?Ñ?Ñ?!\n"
 
-#: ../src/o_move.c:482
+#: src/o_move.c:482
 #, c-format
 msgid "Got a non line object in o_move_check_endpoint\n"
 msgstr "Ð?олÑ?Ñ?ен обÑ?екÑ? не линиÑ? в o_move_check_endpoint\n"
 
-#: ../src/o_net.c:176
+#: src/o_net.c:176
 #, fuzzy, c-format
 msgid "Got an invalid which one in o_net_draw_stretch\n"
 msgstr "Ð?олÑ?Ñ?ен невеÑ?нÑ?й паÑ?амеÑ?Ñ? в o_net_draw_xor_single\n"
 
-#: ../src/o_net.c:552
+#: src/o_net.c:552
 msgid "Warning: Starting net at off grid coordinate\n"
 msgstr ""
 
-#: ../src/o_net.c:614
+#: src/o_net.c:614
 msgid "Warning: Ending net at off grid coordinate\n"
 msgstr ""
 
-#. try to exit gracefully
-#: ../src/o_net.c:982 ../src/o_net.c:1019 ../src/o_net.c:1090
-#: ../src/o_net.c:1126
+#: src/o_net.c:982 src/o_net.c:1019 src/o_net.c:1090 src/o_net.c:1126
 #, c-format
 msgid "Tried to add more than two bus rippers. Internal gschem error.\n"
 msgstr "Ð?опÑ?Ñ?ка добавиÑ?Ñ? более двÑ?Ñ? Ñ?азÑ?Ñ?вов Ñ?инÑ?. Ð?нÑ?Ñ?Ñ?еннÑ?Ñ? оÑ?ибка gschem.\n"
 
-#: ../src/o_net.c:1196
+#: src/o_net.c:1196
 #, fuzzy, c-format
 msgid "Bus ripper symbol [%s] was not found in any component library\n"
 msgstr "Ð?евозможно найÑ?и %s ни в одной из библиоÑ?ек компоненÑ?ов\n"
 
-#: ../src/o_path.c:356
+#: src/o_path.c:356
 #, fuzzy, c-format
 msgid "Unknown type for path (fill)!\n"
 msgstr "Ð?еизвеÑ?Ñ?нÑ?й Ñ?ип длÑ? пÑ?Ñ?моÑ?голÑ?ника (Ñ? заливкой)!\n"
 
-#: ../src/o_picture.c:166 ../src/o_picture.c:557
+#: src/o_picture.c:166 src/o_picture.c:557
 #, c-format
 msgid "Failed to load picture: %s"
 msgstr "Ð?евозможно загÑ?зиÑ?аÑ?Ñ? изобÑ?ажение: [%s]"
 
-#: ../src/o_picture.c:180
+#: src/o_picture.c:180
 msgid "Picture"
 msgstr "Ð?зобÑ?ажение"
 
-#: ../src/o_picture.c:465 ../src/x_attribedit.c:141
+#: src/o_picture.c:465 src/x_attribedit.c:141
 #, c-format
 msgid "ERROR: NULL object!\n"
 msgstr "Ð?Ñ?ибка: обÑ?екÑ? NULL!\n"
 
-#: ../src/o_slot.c:110
+#: src/o_slot.c:81
 msgid "Slot attribute malformed\n"
 msgstr "Ð?Ñ?Ñ?ибÑ?Ñ? Ñ?лоÑ?а иÑ?поÑ?Ñ?ен\n"
 
-#: ../src/o_slot.c:128
+#: src/o_slot.c:99
 msgid "numslots attribute missing\n"
 msgstr "оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? аÑ?Ñ?ибÑ?Ñ? numslots\n"
 
-#: ../src/o_slot.c:130
+#: src/o_slot.c:100
 msgid "Slotting not allowed for this component\n"
 msgstr "СлоÑ?иÑ?ование не допÑ?Ñ?Ñ?имо длÑ? Ñ?Ñ?ого компоненÑ?а\n"
 
-#: ../src/o_slot.c:145
+#: src/o_slot.c:115
 msgid "New slot number out of range\n"
 msgstr "Ð?омеÑ? нового Ñ?лоÑ?а вÑ?Ñ?одиÑ? за пÑ?еделÑ?\n"
 
-#: ../src/o_slot.c:200
+#: src/o_slot.c:170
 #, c-format
 msgid "uggg! you tried to slot edit something that doesn't exist!\n"
 msgstr "Ð?Ñ? пÑ?Ñ?аеÑ?еÑ?Ñ? пÑ?авиÑ?Ñ? Ñ?лоÑ? Ñ?его-Ñ?о неÑ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?его!\n"
 
-#: ../src/o_undo.c:300
+#: src/o_undo.c:300
 msgid "Undo/Redo disabled in rc file\n"
 msgstr "Ð?Ñ?мена/Ð?овÑ?оÑ?  вÑ?клÑ?Ñ?енÑ? в rc-Ñ?айле\n"
 
-#: ../src/parsecmd.c:47
+#: src/parsecmd.c:47
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] schematic_filename1 ... schematic_filenameN\n"
@@ -1308,279 +1318,260 @@ msgstr ""
 "  -h            Ð?омоÑ?Ñ?; Ñ?Ñ?о Ñ?ообÑ?ение\n"
 "\n"
 
-#: ../src/x_attribedit.c:127
+#: src/x_attribedit.c:127
 #, c-format
 msgid "Got invalid show option; defaulting to show both\n"
 msgstr "Ð?олÑ?Ñ?ена невеÑ?наÑ? опÑ?иÑ? пÑ?оÑ?моÑ?Ñ?а, Ñ?Ñ?Ñ?анавливаеÑ?Ñ?Ñ? пÑ?оÑ?моÑ?Ñ? обоиÑ?\n"
 
-#: ../src/x_attribedit.c:330
+#: src/x_attribedit.c:330
 msgid "Single Attribute Editor"
 msgstr "РедакÑ?оÑ? одного аÑ?Ñ?ибÑ?Ñ?а"
 
-#: ../src/x_attribedit.c:359
+#: src/x_attribedit.c:359
 #, fuzzy
 msgid "<b>Edit Attribute</b>"
 msgstr "РедакÑ?иÑ?оваÑ?Ñ? аÑ?Ñ?ибÑ?Ñ?Ñ?"
 
-#: ../src/x_attribedit.c:361
+#: src/x_attribedit.c:361
 #, fuzzy
 msgid "<b>Add Attribute</b>"
 msgstr "Ð?обавиÑ?Ñ? аÑ?Ñ?ибÑ?Ñ?"
 
-#. Name selection
-#. GtkLabel
-#: ../src/x_attribedit.c:377 ../src/x_multiattrib.c:1725
+#: src/x_attribedit.c:377 src/x_multiattrib.c:1921
 msgid "Name:"
 msgstr "Ð?мÑ?:"
 
-#. Value entry
-#. GtkLabel
-#: ../src/x_attribedit.c:393 ../src/x_multiattrib.c:1744
+#: src/x_attribedit.c:393 src/x_multiattrib.c:1940
 msgid "Value:"
 msgstr "Ð?наÑ?ение:"
 
-#. Visibility
-#. GtkButton
-#: ../src/x_attribedit.c:409 ../src/x_multiattrib.c:1781
+#: src/x_attribedit.c:409 src/x_multiattrib.c:1983
 msgid "Visible"
 msgstr "Ð?идимÑ?й"
 
-#: ../src/x_attribedit.c:429
+#: src/x_attribedit.c:429
 msgid "Show Value Only"
 msgstr "Ð?оказаÑ?Ñ? Ñ?олÑ?ко знаÑ?ение"
 
-#: ../src/x_attribedit.c:431
+#: src/x_attribedit.c:431
 msgid "Show Name Only"
 msgstr "Ð?оказаÑ?Ñ? Ñ?олÑ?ко имÑ?"
 
-#: ../src/x_attribedit.c:433 ../src/x_multiattrib.c:1369
+#: src/x_attribedit.c:433 src/x_multiattrib.c:1459
 msgid "Show Name & Value"
 msgstr "Ð?оказаÑ?Ñ? имÑ? и знаÑ?ение"
 
-#. gschem specific
-#: ../src/x_attribedit.c:440
+#: src/x_attribedit.c:440
 #, fuzzy
 msgid "<b>Attach Options</b>"
 msgstr "Ð?аÑ?Ñ?Ñ?ойки"
 
-#: ../src/x_attribedit.c:455
+#: src/x_attribedit.c:455
 msgid "All"
 msgstr "Ð?Ñ?е"
 
-#. GtkTreeViewColumn
-#: ../src/x_attribedit.c:463 ../src/x_compselect.c:896
-#: ../src/x_compselect.c:1010
+#: src/x_attribedit.c:463 src/x_compselect.c:895 src/x_compselect.c:1009
 msgid "Components"
 msgstr "Ð?омпоненÑ?Ñ?"
 
-#: ../src/x_attribedit.c:471 ../src/x_window.c:364
+#: src/x_attribedit.c:471 src/x_window.c:364
 msgid "Nets"
 msgstr "Ð?Ñ?оводники"
 
-#: ../src/x_attribedit.c:479
+#: src/x_attribedit.c:479
 msgid "Replace existing attributes"
 msgstr ""
 
-#: ../src/x_autonumber.c:413
+#: src/x_autonumber.c:415
 msgid ""
 "slotted object without slot attribute may cause problems when autonumbering "
 "slots\n"
 msgstr ""
 
-#. duplicate slot in used_slots
-#: ../src/x_autonumber.c:428
+#: src/x_autonumber.c:430
 #, c-format
 msgid ""
 "duplicate slot may cause problems: [symbolname=%s, number=%d, slot=%d]\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:696
+#: src/x_autonumber.c:702
 msgid "No searchstring given in autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:748
+#: src/x_autonumber.c:754
 msgid "No '*' or '?' given at the end of the autonumber text.\n"
 msgstr ""
 
-#: ../src/x_autonumber.c:883
+#: src/x_autonumber.c:889
 #, fuzzy
 msgid "Diagonal"
 msgstr "диагоналÑ?нÑ?й"
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Top to bottom"
 msgstr ""
 
-#: ../src/x_autonumber.c:884
+#: src/x_autonumber.c:890
 msgid "Bottom to top"
 msgstr ""
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 #, fuzzy
 msgid "Left to right"
 msgstr "левÑ?й пÑ?авÑ?й"
 
-#: ../src/x_autonumber.c:885
+#: src/x_autonumber.c:891
 msgid "Right to left"
 msgstr ""
 
-#: ../src/x_autonumber.c:886
+#: src/x_autonumber.c:892
 #, fuzzy
 msgid "File order"
 msgstr "поÑ?Ñ?док Ñ?айлов"
 
-#: ../src/x_autonumber.c:1222
+#: src/x_autonumber.c:1228
 msgid "Autonumber text"
 msgstr "Ð?вÑ?онÑ?меÑ?оваÑ?Ñ? Ñ?екÑ?Ñ?"
 
-#. scope section
-#: ../src/x_autonumber.c:1246
+#: src/x_autonumber.c:1252
 msgid "<b>Scope</b>"
 msgstr ""
 
-#: ../src/x_autonumber.c:1268
+#: src/x_autonumber.c:1274
 #, fuzzy
 msgid "Search for:"
 msgstr "поиÑ?к Ñ?окÑ?Ñ?а"
 
-#: ../src/x_autonumber.c:1282
+#: src/x_autonumber.c:1288
 #, fuzzy
 msgid "Autonumber text in:"
 msgstr "Ð?вÑ?онÑ?меÑ?оваÑ?Ñ? Ñ?екÑ?Ñ?"
 
-#: ../src/x_autonumber.c:1289
+#: src/x_autonumber.c:1295
 msgid "Skip numbers found in:"
 msgstr ""
 
-#: ../src/x_autonumber.c:1301 ../src/x_autonumber.c:1310
+#: src/x_autonumber.c:1307 src/x_autonumber.c:1316
 #, fuzzy
 msgid "Selected objects"
 msgstr "вÑ?бÑ?анÑ? обÑ?екÑ?Ñ?"
 
-#: ../src/x_autonumber.c:1302 ../src/x_autonumber.c:1311
+#: src/x_autonumber.c:1308 src/x_autonumber.c:1317
 #, fuzzy
 msgid "Current page"
 msgstr "Ñ?екÑ?Ñ?ий лиÑ?Ñ?"
 
-#: ../src/x_autonumber.c:1303 ../src/x_autonumber.c:1312
+#: src/x_autonumber.c:1309 src/x_autonumber.c:1318
 #, fuzzy
 msgid "Whole hierarchy"
 msgstr "Ð?еÑ?аÑ?Ñ?иÑ?"
 
-#: ../src/x_autonumber.c:1314
+#: src/x_autonumber.c:1320
 msgid "Overwrite existing numbers"
 msgstr ""
 
-#. Options section
-#: ../src/x_autonumber.c:1319
+#: src/x_autonumber.c:1325
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "Ð?аÑ?Ñ?Ñ?ойки"
 
-#: ../src/x_autonumber.c:1341
+#: src/x_autonumber.c:1347
 #, fuzzy
 msgid "Starting number:"
 msgstr "Ñ?Ñ?аÑ?Ñ?овÑ?й номеÑ?"
 
-#: ../src/x_autonumber.c:1348
+#: src/x_autonumber.c:1354
 #, fuzzy
 msgid "Sort order:"
 msgstr "поÑ?Ñ?док Ñ?оÑ?Ñ?иÑ?овки"
 
-#: ../src/x_autonumber.c:1369
+#: src/x_autonumber.c:1375
 msgid "Remove numbers"
 msgstr ""
 
-#: ../src/x_autonumber.c:1373
+#: src/x_autonumber.c:1379
 msgid "Automatic slotting"
 msgstr ""
 
-#: ../src/x_color.c:94 ../src/x_color.c:103
+#: src/x_color.c:94 src/x_color.c:103
 #, c-format
 msgid "Could not allocate the color %s!\n"
 msgstr "Ð?евозможно назнаÑ?иÑ?Ñ? Ñ?веÑ? %s!\n"
 
-#: ../src/x_color.c:94
+#: src/x_color.c:94
 msgid "black"
 msgstr "Ñ?еÑ?нÑ?й"
 
-#: ../src/x_color.c:103
+#: src/x_color.c:103
 msgid "white"
 msgstr "белÑ?й"
 
-#: ../src/x_color.c:125
+#: src/x_color.c:125
 #, fuzzy, c-format
 msgid "Could not allocate display color %i!\n"
 msgstr "Ð?евозможно назнаÑ?иÑ?Ñ? Ñ?веÑ? %s!\n"
 
-#: ../src/x_color.c:147
+#: src/x_color.c:147
 #, fuzzy, c-format
 msgid "Could not allocate outline color %i!\n"
 msgstr "Ð?евозможно назнаÑ?иÑ?Ñ? Ñ?веÑ? %s!\n"
 
-#: ../src/x_color.c:164 ../src/x_color.c:181 ../src/x_color.c:197
+#: src/x_color.c:164 src/x_color.c:181 src/x_color.c:197
 #, c-format
 msgid "Tried to get an invalid color: %d\n"
 msgstr "Ð?опÑ?Ñ?ка полÑ?Ñ?ениÑ? невеÑ?ного Ñ?веÑ?а: %d\n"
 
-#: ../src/x_color.c:214
+#: src/x_color.c:214
 #, fuzzy, c-format
 msgid "Tried to get an invalid outline color: %d\n"
 msgstr "Ð?опÑ?Ñ?ка полÑ?Ñ?ениÑ? невеÑ?ного Ñ?веÑ?а: %d\n"
 
-#. GtkLabel
-#: ../src/x_compselect.c:1040
+#: src/x_compselect.c:1039
 #, fuzzy
 msgid "Filter:"
 msgstr "ФилÑ?Ñ?Ñ?"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1143 ../src/x_dialog.c:3774
-#: ../src/x_multiattrib.c:1601
+#: src/x_compselect.c:1142 src/x_dialog.c:3776 src/x_multiattrib.c:1787
 msgid "Name"
 msgstr "Ð?мÑ?"
 
-#. GtkTreeViewColumn
-#: ../src/x_compselect.c:1152 ../src/x_multiattrib.c:1626
+#: src/x_compselect.c:1151 src/x_multiattrib.c:1811
 msgid "Value"
 msgstr "Ð?наÑ?ение"
 
-#: ../src/x_compselect.c:1191
+#: src/x_compselect.c:1190
 msgid "Default behavior - reference component"
 msgstr "Ð?оÑ?малÑ?ное поведение - Ñ?Ñ?Ñ?лка на компоненÑ?"
 
-#: ../src/x_compselect.c:1194
+#: src/x_compselect.c:1193
 msgid "Embed component in schematic"
 msgstr "Ð?недÑ?иÑ?Ñ? компоненÑ? в Ñ?Ñ?емÑ?"
 
-#: ../src/x_compselect.c:1197
+#: src/x_compselect.c:1196
 msgid "Include component as individual objects"
 msgstr "Ð?клÑ?Ñ?иÑ?Ñ? компоненÑ? как индивидÑ?алÑ?нÑ?й обÑ?екÑ?"
 
-#. GtkWindow
-#: ../src/x_compselect.c:1354
+#: src/x_compselect.c:1353
 msgid "Select Component..."
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? компоненÑ?..."
 
-#: ../src/x_compselect.c:1377
+#: src/x_compselect.c:1376
 msgid "In Use"
 msgstr ""
 
-#: ../src/x_compselect.c:1381
+#: src/x_compselect.c:1380
 msgid "Libraries"
 msgstr "Ð?иблиоÑ?еки"
 
-#. GtkFrame
-#: ../src/x_compselect.c:1390 ../src/x_fileselect.c:122
+#: src/x_compselect.c:1389 src/x_fileselect.c:122
 msgid "Preview"
 msgstr "Ð?Ñ?едваÑ?иÑ?елÑ?нÑ?й пÑ?оÑ?моÑ?Ñ?"
 
-#. dialog not created yet
-#: ../src/x_dialog.c:174
+#: src/x_dialog.c:174
 msgid "Text Entry..."
 msgstr "ТекÑ?Ñ?овое вÑ?ождение..."
 
-#: ../src/x_dialog.c:205
+#: src/x_dialog.c:205
 msgid ""
 "Enter text, click apply,\n"
 "move cursor into window, click to place text.\n"
@@ -1590,202 +1581,193 @@ msgstr ""
 "пеÑ?емеÑ?Ñ?иÑ?е кÑ?Ñ?Ñ?оÑ? в окно, Ñ?елкниÑ?е длÑ? Ñ?Ñ?Ñ?ановки Ñ?екÑ?Ñ?а.\n"
 "СÑ?еднÑ?Ñ? кнопка пÑ?едназнаÑ?ена длÑ? вÑ?аÑ?ениÑ? во вÑ?емÑ? Ñ?Ñ?Ñ?ановки."
 
-#: ../src/x_dialog.c:294
-#, c-format
+#: src/x_dialog.c:294
 msgid "Lower Left"
 msgstr "Ð?ижний левÑ?й"
 
-#: ../src/x_dialog.c:305
-#, c-format
+#: src/x_dialog.c:305
 msgid "Middle Left"
 msgstr "СÑ?едний левÑ?й"
 
-#: ../src/x_dialog.c:316
-#, c-format
+#: src/x_dialog.c:316
 msgid "Upper Left"
 msgstr "Ð?еÑ?Ñ?ний левÑ?й"
 
-#: ../src/x_dialog.c:327
-#, c-format
+#: src/x_dialog.c:327
 msgid "Lower Middle"
 msgstr "Ð?ижний Ñ?Ñ?едний"
 
-#: ../src/x_dialog.c:338
-#, c-format
+#: src/x_dialog.c:338
 msgid "Middle Middle"
 msgstr "СÑ?едний Ñ?Ñ?едний"
 
-#: ../src/x_dialog.c:349
-#, c-format
+#: src/x_dialog.c:349
 msgid "Upper Middle"
 msgstr "Ð?еÑ?Ñ?ний Ñ?Ñ?едний"
 
-#: ../src/x_dialog.c:360
-#, c-format
+#: src/x_dialog.c:360
 msgid "Lower Right"
 msgstr "Ð?ижний пÑ?авÑ?й"
 
-#: ../src/x_dialog.c:371
-#, c-format
+#: src/x_dialog.c:371
 msgid "Middle Right"
 msgstr "СÑ?едний пÑ?авÑ?й"
 
-#: ../src/x_dialog.c:382
-#, c-format
+#: src/x_dialog.c:382
 msgid "Upper Right"
 msgstr "Ð?еÑ?Ñ?ний пÑ?авÑ?й"
 
-#: ../src/x_dialog.c:496
+#: src/x_dialog.c:496
 #, fuzzy
 msgid "Edit Text Properties"
 msgstr "Ð?Ñ?авка Ñ?азмеÑ?а Ñ?екÑ?Ñ?а"
 
-#: ../src/x_dialog.c:530
+#: src/x_dialog.c:530
 #, fuzzy
 msgid "<b>Text Content</b>"
 msgstr "Ð?аÑ?Ñ?Ñ?ойки"
 
-#: ../src/x_dialog.c:562
+#: src/x_dialog.c:562
 #, fuzzy
 msgid "<b>Text Properties</b>"
 msgstr "Ð?аÑ?Ñ?Ñ?ойки"
 
-#: ../src/x_dialog.c:577
+#: src/x_dialog.c:577
 #, fuzzy
 msgid "Color:"
 msgstr "ЦвеÑ?"
 
-#: ../src/x_dialog.c:584
+#: src/x_dialog.c:584
 msgid "Size:"
 msgstr ""
 
-#: ../src/x_dialog.c:593
+#: src/x_dialog.c:593
 #, fuzzy
 msgid "Alignment:"
 msgstr "Ð?Ñ?авка вÑ?Ñ?авниваниÑ? Ñ?екÑ?Ñ?а"
 
-#: ../src/x_dialog.c:647
+#: src/x_dialog.c:647
 msgid "Solid"
 msgstr "СплоÑ?ной"
 
-#: ../src/x_dialog.c:648
+#: src/x_dialog.c:648
 msgid "Dotted"
 msgstr "Ð?Ñ?нкÑ?иÑ? Ñ? Ñ?оÑ?кой"
 
-#: ../src/x_dialog.c:649
+#: src/x_dialog.c:649
 msgid "Dashed"
 msgstr "Ð?Ñ?нкÑ?иÑ? Ñ? деÑ?иÑ?ом"
 
-#: ../src/x_dialog.c:650
+#: src/x_dialog.c:650
 msgid "Center"
 msgstr "ЦенÑ?Ñ?иÑ?ованнÑ?й"
 
-#: ../src/x_dialog.c:651
+#: src/x_dialog.c:651
 msgid "Phantom"
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ?веннÑ?й"
 
-#: ../src/x_dialog.c:652 ../src/x_dialog.c:749 ../src/x_dialog.c:758
-#: ../src/x_dialog.c:767 ../src/x_dialog.c:868 ../src/x_dialog.c:870
-#: ../src/x_dialog.c:872 ../src/x_dialog.c:1100 ../src/x_dialog.c:1203
-#: ../src/x_dialog.c:1212 ../src/x_dialog.c:1221 ../src/x_dialog.c:1230
-#: ../src/x_dialog.c:1239 ../src/x_dialog.c:1352 ../src/x_dialog.c:1354
-#: ../src/x_dialog.c:1356 ../src/x_dialog.c:1358 ../src/x_dialog.c:1360
+#: src/x_dialog.c:652 src/x_dialog.c:749 src/x_dialog.c:758 src/x_dialog.c:767
+#: src/x_dialog.c:868 src/x_dialog.c:870 src/x_dialog.c:872
+#: src/x_dialog.c:1100 src/x_dialog.c:1203 src/x_dialog.c:1212
+#: src/x_dialog.c:1221 src/x_dialog.c:1230 src/x_dialog.c:1239
+#: src/x_dialog.c:1352 src/x_dialog.c:1354 src/x_dialog.c:1356
+#: src/x_dialog.c:1358 src/x_dialog.c:1360
 msgid "*unchanged*"
 msgstr "*неизменено*"
 
-#: ../src/x_dialog.c:978
+#: src/x_dialog.c:978
 msgid "Edit Line Width & Type"
 msgstr "Ð?Ñ?авка Ñ?иÑ?инÑ? и Ñ?ипа линии"
 
-#: ../src/x_dialog.c:1017 ../src/x_print.c:307
+#: src/x_dialog.c:1017 src/x_print.c:307
 #, fuzzy
 msgid "Type:"
 msgstr "Тип"
 
-#: ../src/x_dialog.c:1021
+#: src/x_dialog.c:1021
 #, fuzzy
 msgid "Width:"
 msgstr "ШиÑ?ина"
 
-#: ../src/x_dialog.c:1025
+#: src/x_dialog.c:1025
 #, fuzzy
 msgid "Dash Length:"
 msgstr "Ð?лина деÑ?иÑ?а линии"
 
-#: ../src/x_dialog.c:1029
+#: src/x_dialog.c:1029
 #, fuzzy
 msgid "Dash Space:"
 msgstr "Ð?еÑ?иÑ?нÑ?й пÑ?обел линии"
 
-#: ../src/x_dialog.c:1096
+#: src/x_dialog.c:1096
 msgid "Hollow"
 msgstr "Ð?огнÑ?Ñ?Ñ?"
 
-#: ../src/x_dialog.c:1097
+#: src/x_dialog.c:1097
 msgid "Filled"
 msgstr "Ð?аполнено"
 
-#: ../src/x_dialog.c:1098
+#: src/x_dialog.c:1098
 msgid "Mesh"
 msgstr "ЯÑ?ейка"
 
-#: ../src/x_dialog.c:1099
+#: src/x_dialog.c:1099
 msgid "Hatch"
 msgstr "ШÑ?Ñ?иÑ?"
 
-#: ../src/x_dialog.c:1470
+#: src/x_dialog.c:1470
 msgid "Edit Fill Type"
 msgstr "Ð?Ñ?авка Ñ?ипа заливки"
 
-#: ../src/x_dialog.c:1508
+#: src/x_dialog.c:1508
 #, fuzzy
 msgid "Fill Type:"
 msgstr "Тип заливки"
 
-#: ../src/x_dialog.c:1512
+#: src/x_dialog.c:1512
 #, fuzzy
 msgid "Line Width:"
 msgstr "ШиÑ?ина линии"
 
-#: ../src/x_dialog.c:1516
+#: src/x_dialog.c:1516
 #, fuzzy
 msgid "Angle 1:"
 msgstr "Угол1"
 
-#: ../src/x_dialog.c:1520
+#: src/x_dialog.c:1520
 #, fuzzy
 msgid "Pitch 1:"
 msgstr "Ð?аклон1"
 
-#: ../src/x_dialog.c:1524
+#: src/x_dialog.c:1524
 #, fuzzy
 msgid "Angle 2:"
 msgstr "Угол2"
 
-#: ../src/x_dialog.c:1528
+#: src/x_dialog.c:1528
 #, fuzzy
 msgid "Pitch 2:"
 msgstr "Ð?аклон2"
 
-#: ../src/x_dialog.c:1657
+#: src/x_dialog.c:1657
 msgid "Arc Params"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? дÑ?ги"
 
-#: ../src/x_dialog.c:1697
+#: src/x_dialog.c:1697
 msgid "Arc Radius:"
 msgstr ""
 
-#: ../src/x_dialog.c:1705
+#: src/x_dialog.c:1705
 #, fuzzy
 msgid "Start Angle:"
 msgstr "Ð?аÑ?ало Ñ?гла"
 
-#: ../src/x_dialog.c:1713
+#: src/x_dialog.c:1713
 #, fuzzy
 msgid "Degrees of Sweep:"
 msgstr "Угол Ñ?азвеÑ?Ñ?ки в гÑ?адÑ?Ñ?аÑ?"
 
-#: ../src/x_dialog.c:1830
+#: src/x_dialog.c:1830
 msgid ""
 "Offset to translate?\n"
 "(0 for origin)"
@@ -1793,50 +1775,50 @@ msgstr ""
 "СмеÑ?ение длÑ? пеÑ?евода?\n"
 "(о длÑ? наÑ?ала оÑ?Ñ?Ñ?еÑ?а)"
 
-#: ../src/x_dialog.c:1898
+#: src/x_dialog.c:1898
 msgid "Text Size"
 msgstr "РазмеÑ? Ñ?екÑ?Ñ?а"
 
-#: ../src/x_dialog.c:1928
+#: src/x_dialog.c:1928
 #, fuzzy
 msgid "Enter new text size:"
 msgstr "Ð?ведиÑ?е новÑ?й Ñ?азмеÑ? Ñ?екÑ?Ñ?а"
 
-#: ../src/x_dialog.c:2004
+#: src/x_dialog.c:2004
 #, fuzzy
 msgid "Snap Size"
 msgstr "СеÑ?ка пÑ?ивÑ?зки"
 
-#: ../src/x_dialog.c:2034
+#: src/x_dialog.c:2034
 #, fuzzy
 msgid "Enter new snap grid spacing:"
 msgstr "Ð?ведиÑ?е новÑ?й Ñ?аг Ñ?еÑ?ки пÑ?ивÑ?зки"
 
-#: ../src/x_dialog.c:2107
+#: src/x_dialog.c:2110
 msgid "Edit slot number"
 msgstr "Ð?Ñ?авка номеÑ?а Ñ?лоÑ?а"
 
-#: ../src/x_dialog.c:2138
+#: src/x_dialog.c:2141
 #, fuzzy
 msgid "Edit slot number:"
 msgstr "Ð?Ñ?авка номеÑ?а Ñ?лоÑ?а"
 
-#: ../src/x_dialog.c:2200
+#: src/x_dialog.c:2202
 msgid "About..."
 msgstr "Ð?..."
 
-#: ../src/x_dialog.c:2220
+#: src/x_dialog.c:2222
 #, fuzzy
 msgid "<b>gEDA: GPL Electronic Design Automation</b>"
 msgstr ""
 "gEDA: СиÑ?Ñ?ема Ð?вÑ?омаÑ?изиÑ?ованного Ð?РоекÑ?иÑ?ованиÑ? Ñ?лекÑ?Ñ?оннÑ?Ñ? Ñ?Ñ?ем (GPL)"
 
-#: ../src/x_dialog.c:2224
+#: src/x_dialog.c:2226
 #, fuzzy, c-format
 msgid "<b>gschem version %s%s.%s</b>"
 msgstr "веÑ?Ñ?иÑ? gschem %s%s.%s"
 
-#: ../src/x_dialog.c:2232
+#: src/x_dialog.c:2234
 #, fuzzy
 msgid ""
 "Written by:\n"
@@ -1850,161 +1832,160 @@ msgstr ""
 "Ð? многими дÑ?Ñ?гими (Ñ?моÑ?Ñ?иÑ?е Ñ?айл AUTHORS) \n"
 "Ð?еÑ?евод: Andy Shevchenko <andy@xxxxxxxxxxxx>"
 
-#: ../src/x_dialog.c:2295
+#: src/x_dialog.c:2297
 msgid "Coords"
 msgstr "Ð?ооÑ?динаÑ?Ñ?"
 
-#: ../src/x_dialog.c:2316
+#: src/x_dialog.c:2318
 msgid "Screen"
 msgstr "ЭкÑ?ан"
 
-#: ../src/x_dialog.c:2325
+#: src/x_dialog.c:2327
 msgid "World"
 msgstr "Ð?иÑ?"
 
-#: ../src/x_dialog.c:2364
+#: src/x_dialog.c:2366
 msgid "Background"
 msgstr ""
 
-#: ../src/x_dialog.c:2370
+#: src/x_dialog.c:2372
 msgid "Net endpoint"
 msgstr ""
 
-#: ../src/x_dialog.c:2373
+#: src/x_dialog.c:2375
 msgid "Graphic"
 msgstr ""
 
-#: ../src/x_dialog.c:2382
+#: src/x_dialog.c:2384
 msgid "Logic bubble"
 msgstr ""
 
-#: ../src/x_dialog.c:2385
+#: src/x_dialog.c:2387
 msgid "Grid point"
 msgstr ""
 
-#: ../src/x_dialog.c:2388
+#: src/x_dialog.c:2390
 #, fuzzy
 msgid "Detached attribute"
 msgstr "Ð?обавиÑ?Ñ? аÑ?Ñ?ибÑ?Ñ?"
 
-#: ../src/x_dialog.c:2391 ../src/x_window.c:382
+#: src/x_dialog.c:2393 src/x_window.c:382
 msgid "Text"
 msgstr "ТекÑ?Ñ?"
 
-#: ../src/x_dialog.c:2397
+#: src/x_dialog.c:2399
 #, fuzzy
 msgid "Selection"
 msgstr "вÑ?боÑ?"
 
-#: ../src/x_dialog.c:2400
+#: src/x_dialog.c:2402
 msgid "Bounding box"
 msgstr ""
 
-#: ../src/x_dialog.c:2403
+#: src/x_dialog.c:2405
 #, fuzzy
 msgid "Zoom box"
 msgstr "Ð?блаÑ?Ñ?Ñ? длÑ? маÑ?Ñ?Ñ?абиÑ?ованиÑ?"
 
-#: ../src/x_dialog.c:2412
+#: src/x_dialog.c:2414
 msgid "Output background"
 msgstr ""
 
-#: ../src/x_dialog.c:2415
+#: src/x_dialog.c:2417
 #, fuzzy
 msgid "Net junction"
 msgstr "Ð?ейÑ?Ñ?вие"
 
-#: ../src/x_dialog.c:2418
+#: src/x_dialog.c:2420
 msgid "Mesh grid major"
 msgstr ""
 
-#: ../src/x_dialog.c:2421
+#: src/x_dialog.c:2423
 msgid "Mesh grid minor"
 msgstr ""
 
-#: ../src/x_dialog.c:2424
+#: src/x_dialog.c:2426
 msgid "Unknown"
 msgstr ""
 
-#: ../src/x_dialog.c:2570
+#: src/x_dialog.c:2572
 #, c-format
 msgid "ERROR: NULL object in color_edit_dialog_apply!\n"
 msgstr "Ð?Ñ?ибка: обÑ?екÑ? NULL в color_edit_dialog_apply!\n"
 
-#: ../src/x_dialog.c:2633
+#: src/x_dialog.c:2635
 msgid "Color Edit"
 msgstr "Ð?Ñ?авка Ñ?веÑ?а"
 
-#: ../src/x_dialog.c:2664
+#: src/x_dialog.c:2666
 msgid "Object color:"
 msgstr ""
 
-#: ../src/x_dialog.c:2786
+#: src/x_dialog.c:2788
 #, fuzzy
 msgid "Function"
 msgstr "Ð?ейÑ?Ñ?вие"
 
-#: ../src/x_dialog.c:2793
+#: src/x_dialog.c:2795
 #, fuzzy
 msgid "Keystroke(s)"
 msgstr "ФÑ?нкÑ?иÑ? : комбинаÑ?иÑ? клавиÑ?"
 
-#: ../src/x_dialog.c:3102
+#: src/x_dialog.c:3104
 #, fuzzy
 msgid "Find Text"
 msgstr "Ð?айÑ?и Ñ?екÑ?Ñ?"
 
-#: ../src/x_dialog.c:3133
+#: src/x_dialog.c:3135
 msgid "Text to find:"
 msgstr "ТекÑ?Ñ? длÑ? поиÑ?ка:"
 
-#: ../src/x_dialog.c:3143
+#: src/x_dialog.c:3145
 msgid "descend into hierarchy"
 msgstr "СпÑ?Ñ?к по иеÑ?аÑ?Ñ?ии"
 
-#: ../src/x_dialog.c:3208
+#: src/x_dialog.c:3210
 #, fuzzy
 msgid "Hide Text"
 msgstr "СкÑ?Ñ?Ñ?Ñ? Ñ?екÑ?Ñ?"
 
-#: ../src/x_dialog.c:3239
+#: src/x_dialog.c:3241
 msgid "Hide text starting with:"
 msgstr "СкÑ?Ñ?Ñ?Ñ? Ñ?екÑ?Ñ?, наÑ?инаÑ?Ñ?ийÑ?Ñ? Ñ?:"
 
-#: ../src/x_dialog.c:3308
+#: src/x_dialog.c:3310
 #, fuzzy
 msgid "Show Text"
 msgstr "Ð?оказаÑ?Ñ? Ñ?екÑ?Ñ?"
 
-#: ../src/x_dialog.c:3339
+#: src/x_dialog.c:3341
 msgid "Show text starting with:"
 msgstr "Ð?оказаÑ?Ñ? Ñ?екÑ?Ñ?, наÑ?инаÑ?Ñ?ийÑ?Ñ? Ñ?:"
 
-#: ../src/x_dialog.c:3796
+#: src/x_dialog.c:3798
 msgid "S_elect the schematics you want to save:"
 msgstr ""
 
-#: ../src/x_dialog.c:3890
+#: src/x_dialog.c:3892
 #, c-format
 msgid "Save the changes to schematic \"%s\" before closing?"
 msgstr ""
 
-#: ../src/x_dialog.c:3896
+#: src/x_dialog.c:3898
 #, c-format
 msgid ""
 "There are %d schematics with unsaved changes. Save changes before closing?"
 msgstr ""
 
-#. secondary label
-#: ../src/x_dialog.c:3925
+#: src/x_dialog.c:3927
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr ""
 
-#: ../src/x_dialog.c:3945
+#: src/x_dialog.c:3947
 msgid "_Close without saving"
 msgstr ""
 
-#: ../src/x_dialog.c:4279
+#: src/x_dialog.c:4283
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The input attribute \"%s\" is invalid\n"
@@ -2015,51 +1996,51 @@ msgid ""
 "The value cannot start with a space."
 msgstr ""
 
-#: ../src/x_dialog.c:4281
+#: src/x_dialog.c:4285
 #, fuzzy
 msgid "Invalid Attribute"
 msgstr "Ð?обавиÑ?Ñ? аÑ?Ñ?ибÑ?Ñ?"
 
-#: ../src/x_dialog.c:4317
+#: src/x_dialog.c:4321
 #, fuzzy
 msgid "Pin type"
 msgstr "Тип линии"
 
-#: ../src/x_dialog.c:4341
+#: src/x_dialog.c:4345
 #, fuzzy
 msgid "Net pin"
 msgstr "Ð?ейÑ?Ñ?вие"
 
-#: ../src/x_dialog.c:4343
+#: src/x_dialog.c:4347
 msgid "Bus pin (graphical)"
 msgstr ""
 
-#: ../src/x_fileselect.c:42
+#: src/x_fileselect.c:42
 msgid "Schematics"
 msgstr "СÑ?емÑ?"
 
-#: ../src/x_fileselect.c:47
+#: src/x_fileselect.c:47
 msgid "Symbols"
 msgstr "СимволÑ?"
 
-#: ../src/x_fileselect.c:52
+#: src/x_fileselect.c:52
 msgid "Schematics and symbols"
 msgstr "СÑ?емÑ? и Ñ?имволÑ?"
 
-#: ../src/x_fileselect.c:58
+#: src/x_fileselect.c:58
 msgid "All files"
 msgstr "Ð?Ñ?е Ñ?айлÑ?"
 
-#: ../src/x_fileselect.c:171
+#: src/x_fileselect.c:171
 msgid "Open..."
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ?..."
 
-#: ../src/x_fileselect.c:231
+#: src/x_fileselect.c:231
 #, fuzzy
 msgid "Save as..."
 msgstr "СоÑ?Ñ?аниÑ?Ñ? как..."
 
-#: ../src/x_fileselect.c:284
+#: src/x_fileselect.c:284
 #, c-format
 msgid ""
 "The selected file `%s' already exists.\n"
@@ -2067,31 +2048,30 @@ msgid ""
 "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/x_fileselect.c:287
+#: src/x_fileselect.c:287
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Ð?овÑ?й Ñ?айл"
 
-#: ../src/x_fileselect.c:289
+#: src/x_fileselect.c:289
 msgid "Save cancelled on user request\n"
 msgstr ""
 
-#. WK - catch EPS export case
-#: ../src/x_image.c:176
+#: src/x_image.c:176
 msgid "Encapsulated Postscript"
 msgstr ""
 
-#: ../src/x_image.c:296
+#: src/x_image.c:296
 #, fuzzy, c-format
 msgid "x_image_lowlevel: Unable to write eps file %s.\n"
 msgstr "x_image_lowlevel: невозможно запиÑ?аÑ?Ñ? PNG-Ñ?айл.\n"
 
-#: ../src/x_image.c:374
+#: src/x_image.c:374
 #, fuzzy, c-format
 msgid "x_image_lowlevel: Unable to write %s file %s.\n"
 msgstr "x_image_lowlevel: невозможно запиÑ?аÑ?Ñ? PNG-Ñ?айл.\n"
 
-#: ../src/x_image.c:384
+#: src/x_image.c:384
 #, c-format
 msgid ""
 "There was the following error when saving image with type %s to filename:\n"
@@ -2100,315 +2080,315 @@ msgid ""
 "%s.\n"
 msgstr ""
 
-#: ../src/x_image.c:403
+#: src/x_image.c:403
 #, c-format
 msgid "Wrote color image to [%s] [%d x %d]\n"
 msgstr "Ð?апиÑ?ано Ñ?веÑ?ное изобÑ?ажение в [%s] [%d-x%d]\n"
 
-#: ../src/x_image.c:405
+#: src/x_image.c:405
 #, c-format
 msgid "Wrote black and white image to [%s] [%d x %d]\n"
 msgstr "Ð?апиÑ?ано Ñ?еÑ?но-белое изобÑ?ажение в [%s] [%d-x-%d]\n"
 
-#: ../src/x_image.c:413
+#: src/x_image.c:413
 msgid "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n"
 msgstr ""
 "x_image_lowlevel: невозможно полÑ?Ñ?иÑ?Ñ? бÑ?Ñ?еÑ? изобÑ?ажениÑ? из окна gschem.\n"
 
-#: ../src/x_image.c:458
+#: src/x_image.c:458
 #, fuzzy
 msgid "Width x Height"
 msgstr "ШиÑ?ина-x-Ð?Ñ?Ñ?оÑ?а"
 
-#: ../src/x_image.c:474
+#: src/x_image.c:474
 #, fuzzy
 msgid "Image type"
 msgstr "Ð?зобÑ?ажение"
 
-#: ../src/x_log.c:188
+#: src/x_log.c:188
 msgid "** Invalid UTF-8 in log message. See stderr or gschem.log.\n"
 msgstr ""
 
-#: ../src/x_log.c:256
+#: src/x_log.c:256
 msgid "Status"
 msgstr "СÑ?аÑ?Ñ?Ñ?"
 
-#: ../src/x_menus.c:36
+#: src/x_menus.c:36
 msgid "/Add Net"
 msgstr "/Ð?обавиÑ?Ñ? Ñ?оединение"
 
-#: ../src/x_menus.c:37
+#: src/x_menus.c:37
 msgid "/Add Attribute..."
 msgstr "/Ð?обавиÑ?Ñ? аÑ?Ñ?ибÑ?Ñ?"
 
-#: ../src/x_menus.c:38
+#: src/x_menus.c:38
 msgid "/Add Component..."
 msgstr "/Ð?обавиÑ?Ñ? компоненÑ?..."
 
-#: ../src/x_menus.c:39
+#: src/x_menus.c:39
 msgid "/Add Bus"
 msgstr "/Ð?обавиÑ?Ñ? Ñ?инÑ?"
 
-#: ../src/x_menus.c:40
+#: src/x_menus.c:40
 msgid "/Add Text"
 msgstr "/Ð?обавиÑ?Ñ? Ñ?екÑ?Ñ?"
 
-#: ../src/x_menus.c:42
+#: src/x_menus.c:42
 msgid "/Zoom In"
 msgstr "/УвелиÑ?иÑ?Ñ?"
 
-#: ../src/x_menus.c:43
+#: src/x_menus.c:43
 msgid "/Zoom Out"
 msgstr "/УменÑ?Ñ?иÑ?Ñ?"
 
-#: ../src/x_menus.c:44
+#: src/x_menus.c:44
 msgid "/Zoom Box"
 msgstr "/Ð?блаÑ?Ñ?Ñ? длÑ? маÑ?Ñ?Ñ?абиÑ?ованиÑ?"
 
-#: ../src/x_menus.c:45
+#: src/x_menus.c:45
 msgid "/Zoom Extents"
 msgstr "/Ð?аÑ?Ñ?Ñ?аб на Ñ?кÑ?ан"
 
-#: ../src/x_menus.c:47
+#: src/x_menus.c:47
 msgid "/Select"
 msgstr "/Ð?Ñ?бÑ?аÑ?Ñ?"
 
-#: ../src/x_menus.c:48
+#: src/x_menus.c:48
 msgid "/Edit..."
 msgstr "/Ð?Ñ?авка..."
 
-#: ../src/x_menus.c:49
+#: src/x_menus.c:49
 #, fuzzy
 msgid "/Edit pin type..."
 msgstr "Ð?Ñ?авка Ñ?ипа линии"
 
-#: ../src/x_menus.c:50
+#: src/x_menus.c:50
 msgid "/Copy"
 msgstr "/Ð?опиÑ?оваÑ?Ñ?"
 
-#: ../src/x_menus.c:51
+#: src/x_menus.c:51
 msgid "/Move"
 msgstr "/Ð?еÑ?емеÑ?Ñ?иÑ?Ñ?"
 
-#: ../src/x_menus.c:52
+#: src/x_menus.c:52
 msgid "/Delete"
 msgstr "/УдалиÑ?Ñ?"
 
-#: ../src/x_menus.c:55
+#: src/x_menus.c:55
 msgid "/Down Schematic"
 msgstr "/Ð?глÑ?бÑ? Ñ?Ñ?емÑ?"
 
-#: ../src/x_menus.c:56
+#: src/x_menus.c:56
 msgid "/Down Symbol"
 msgstr "/Ð?глÑ?бÑ? Ñ?имвола"
 
-#: ../src/x_menus.c:57
+#: src/x_menus.c:57
 msgid "/Up"
 msgstr "/Ð?авеÑ?Ñ?"
 
-#: ../src/x_menus.c:316
+#: src/x_menus.c:319
 #, fuzzy, c-format
 msgid "Tried to set the sensitivity on non-existent menu item '%s'\n"
 msgstr "Ð?опÑ?Ñ?ка Ñ?Ñ?Ñ?ановки Ñ?Ñ?вÑ?Ñ?виÑ?елÑ?ноÑ?Ñ?и длÑ? неÑ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?его пÑ?нкÑ?а менÑ?\n"
 
-#: ../src/x_menus.c:340
+#: src/x_menus.c:343
 msgid "Popup_menu_item_factory doesn't exist!\n"
 msgstr "Popup_menu_item_factory не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?!\n"
 
-#: ../src/x_menus.c:353
+#: src/x_menus.c:356
 msgid "Tried to set the sensitivity on a non-existent popup menu_item\n"
 msgstr ""
 "Ð?опÑ?Ñ?ка Ñ?Ñ?Ñ?ановки Ñ?Ñ?вÑ?Ñ?виÑ?елÑ?ноÑ?Ñ?и длÑ? неÑ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?его вÑ?Ñ?какиваÑ?Ñ?его "
 "menu_item\n"
 
-#. Remove this entry from all menus
-#: ../src/x_menus.c:462
+#: src/x_menus.c:436
 #, fuzzy, c-format
 msgid "Couldn't open file %s\n"
 msgstr "Ð?евозможно вÑ?зваÑ?Ñ? %s\n"
 
-#: ../src/x_menus.c:524
+#: src/x_menus.c:493
 #, fuzzy
 msgid "Clear"
 msgstr "Ð?акÑ?Ñ?Ñ?Ñ?"
 
-#: ../src/x_multiattrib.c:861
+#: src/x_multiattrib.c:913
 msgid "Attributes with empty name are not allowed. Please set a name."
 msgstr "Ð?Ñ?Ñ?ибÑ?Ñ?Ñ? Ñ? пÑ?Ñ?Ñ?Ñ?м именем недопÑ?Ñ?Ñ?имÑ?. Ð?ожалÑ?йÑ?Ñ?а, Ñ?Ñ?Ñ?ановиÑ?е имÑ?."
 
-#: ../src/x_multiattrib.c:1371
+#: src/x_multiattrib.c:1461
 msgid "Show Value only"
 msgstr "Ð?оказаÑ?Ñ? Ñ?олÑ?ко знаÑ?ение"
 
-#: ../src/x_multiattrib.c:1373
+#: src/x_multiattrib.c:1463
 msgid "Show Name only"
 msgstr "Ð?оказаÑ?Ñ? Ñ?олÑ?ко имÑ?"
 
-#: ../src/x_multiattrib.c:1400
+#: src/x_multiattrib.c:1491
+msgid "Promote"
+msgstr ""
+
+#: src/x_multiattrib.c:1495
 msgid "Duplicate"
 msgstr "Ð?Ñ?блиÑ?оваÑ?Ñ?"
 
-#: ../src/x_multiattrib.c:1528
+#: src/x_multiattrib.c:1713
 msgid "Edit Attributes"
 msgstr "РедакÑ?иÑ?оваÑ?Ñ? аÑ?Ñ?ибÑ?Ñ?Ñ?"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1648
+#: src/x_multiattrib.c:1831
 msgid "Vis?"
 msgstr "Ð?идим?"
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1668
+#: src/x_multiattrib.c:1849
 msgid "N"
 msgstr ""
 
-#. GtkTreeViewColumn
-#: ../src/x_multiattrib.c:1688
+#: src/x_multiattrib.c:1867
 msgid "V"
 msgstr ""
 
-#: ../src/x_multiattrib.c:1709
+#: src/x_multiattrib.c:1889
+#, fuzzy
+msgid "Show inherited attributes"
+msgstr "Ð?обавиÑ?Ñ? аÑ?Ñ?ибÑ?Ñ?"
+
+#: src/x_multiattrib.c:1905
 msgid "Add Attribute"
 msgstr "Ð?обавиÑ?Ñ? аÑ?Ñ?ибÑ?Ñ?"
 
-#: ../src/x_pagesel.c:257
+#: src/x_pagesel.c:257
 msgid "Discard Page"
 msgstr "Ð?Ñ?веÑ?гнÑ?Ñ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ?"
 
-#: ../src/x_pagesel.c:376
+#: src/x_pagesel.c:376
 msgid "Page Manager"
 msgstr "Ð?енеджеÑ? Ñ?Ñ?Ñ?аниÑ?"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:432
+#: src/x_pagesel.c:432
 msgid "Filename"
 msgstr "Ð?мÑ? Ñ?айла"
 
-#. GtkTreeViewColumn
-#: ../src/x_pagesel.c:448
+#: src/x_pagesel.c:448
 msgid "Changed"
 msgstr "Ð?зменено"
 
-#. GtkLabel
-#: ../src/x_pagesel.c:468
+#: src/x_pagesel.c:468
 msgid "Right click on the filename for more options..."
 msgstr "ЩелкниÑ?е пÑ?авой кнопкой на имени Ñ?айла длÑ? дополниÑ?елÑ?нÑ?Ñ? опÑ?ий..."
 
-#: ../src/x_preview.c:223
+#: src/x_preview.c:223
 #, fuzzy
 msgid "Preview Buffer"
 msgstr "Ð?Ñ?Ñ?еÑ?"
 
-#: ../src/x_print.c:84
+#: src/x_print.c:84
 #, fuzzy
 msgid "Select PostScript Filename..."
 msgstr "СоÑ?Ñ?аниÑ?Ñ? PostScript как..."
 
-#: ../src/x_print.c:164
+#: src/x_print.c:164
 msgid "Extents with margins"
 msgstr "РаÑ?Ñ?иÑ?иÑ?Ñ? Ñ? полÑ?ми"
 
-#: ../src/x_print.c:170
+#: src/x_print.c:170
 msgid "Extents no margins"
 msgstr "РаÑ?Ñ?иÑ?иÑ?Ñ? без полей"
 
-#: ../src/x_print.c:176
+#: src/x_print.c:176
 msgid "Current Window"
 msgstr "ТекÑ?Ñ?ее окно"
 
-#: ../src/x_print.c:210
+#: src/x_print.c:210
 msgid "Landscape"
 msgstr "Ð?лÑ?бом"
 
-#: ../src/x_print.c:216
+#: src/x_print.c:216
 msgid "Portrait"
 msgstr "Ð?оÑ?Ñ?Ñ?еÑ?"
 
-#. Upper frame
-#: ../src/x_print.c:284
+#: src/x_print.c:284
 msgid "Settings"
 msgstr "УÑ?Ñ?ановки"
 
-#: ../src/x_print.c:296
+#: src/x_print.c:296
 #, fuzzy
 msgid "Output paper size:"
 msgstr "РазмеÑ? бÑ?маги длÑ? пеÑ?аÑ?и"
 
-#: ../src/x_print.c:318
+#: src/x_print.c:318
 #, fuzzy
 msgid "Orientation:"
 msgstr "Ð?Ñ?иенÑ?аÑ?иÑ?"
 
-#. Lower frame
-#: ../src/x_print.c:330
+#: src/x_print.c:330
 msgid "Destination"
 msgstr "Ð?азнаÑ?ение"
 
-#: ../src/x_print.c:343
+#: src/x_print.c:343
 #, fuzzy
 msgid "File:"
 msgstr "Файл"
 
-#: ../src/x_print.c:373
+#: src/x_print.c:373
 #, fuzzy
 msgid "Command:"
 msgstr "Ð?оманда"
 
-#: ../src/x_print.c:741
+#: src/x_print.c:741
 msgid "No print destination specified\n"
 msgstr "Ð?е Ñ?казано назнаÑ?ение длÑ? пеÑ?аÑ?и\n"
 
-#: ../src/x_print.c:748
+#: src/x_print.c:748
 #, c-format
 msgid "Cannot print current schematic to [%s]\n"
 msgstr "Ð?евозможно Ñ?аÑ?пеÑ?аÑ?аÑ?Ñ? Ñ?екÑ?Ñ?Ñ?Ñ? Ñ?Ñ?емÑ? на [%s]\n"
 
-#: ../src/x_print.c:757
+#: src/x_print.c:757
 #, c-format
 msgid ""
 "Error printing to file '%s'\n"
 "Check the log window for more information"
 msgstr ""
 
-#: ../src/x_print.c:764
+#: src/x_print.c:764
 #, c-format
 msgid "Printed current schematic to [%s]\n"
 msgstr "ТекÑ?Ñ?аÑ? Ñ?Ñ?ема Ñ?аÑ?пеÑ?аÑ?ана на [%s]\n"
 
-#: ../src/x_window.c:81
+#: src/x_window.c:81
 #, c-format
 msgid "Couldn't allocate gc\n"
 msgstr "Ð?евозможно назнаÑ?иÑ?Ñ? gc\n"
 
-#: ../src/x_window.c:317
+#: src/x_window.c:317
 msgid "New file"
 msgstr "Ð?овÑ?й Ñ?айл"
 
-#: ../src/x_window.c:323
+#: src/x_window.c:323
 msgid "Open"
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ?"
 
-#: ../src/x_window.c:324
+#: src/x_window.c:324
 msgid "Open file..."
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? Ñ?айл..."
 
-#: ../src/x_window.c:330
+#: src/x_window.c:330
 msgid "Save"
 msgstr "СоÑ?Ñ?аниÑ?Ñ?"
 
-#: ../src/x_window.c:331
+#: src/x_window.c:331
 msgid "Save file"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? Ñ?айл"
 
-#: ../src/x_window.c:339
+#: src/x_window.c:339
 msgid "Undo last operation"
 msgstr "Ð?Ñ?мениÑ?Ñ? поÑ?леднее дейÑ?Ñ?вие"
 
-#: ../src/x_window.c:346
+#: src/x_window.c:346
 msgid "Redo last undo"
 msgstr "Ð?овÑ?оÑ?иÑ?Ñ? оÑ?мененное дейÑ?Ñ?вие"
 
-#: ../src/x_window.c:355
+#: src/x_window.c:355
 msgid ""
 "Add component...\n"
 "Select library and component from list, move the mouse into main window, "
@@ -2420,7 +2400,7 @@ msgstr ""
 "Ñ?елкниÑ?е длÑ? Ñ?Ñ?Ñ?ановки\n"
 "Ð?Ñ?аваÑ? кнопка мÑ?Ñ?и длÑ? оÑ?менÑ?"
 
-#: ../src/x_window.c:365
+#: src/x_window.c:365
 msgid ""
 "Add nets mode\n"
 "Right mouse button to cancel"
@@ -2428,7 +2408,7 @@ msgstr ""
 "Ð?обавиÑ?Ñ? пÑ?оводники\n"
 "Ð?Ñ?аваÑ? кнопка мÑ?Ñ?и длÑ? оÑ?менÑ?"
 
-#: ../src/x_window.c:375
+#: src/x_window.c:375
 msgid ""
 "Add buses mode\n"
 "Right mouse button to cancel"
@@ -2436,92 +2416,91 @@ msgstr ""
 "Ð?обавиÑ?Ñ? Ñ?инÑ?\n"
 "Ð?Ñ?аваÑ? кнопка мÑ?Ñ?и длÑ? оÑ?менÑ?"
 
-#: ../src/x_window.c:383
+#: src/x_window.c:383
 msgid "Add Text..."
 msgstr "Ð?обавиÑ?Ñ? Ñ?екÑ?Ñ?..."
 
-#: ../src/x_window.c:393
+#: src/x_window.c:393
 msgid "Select"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ?"
 
-#: ../src/x_window.c:394
+#: src/x_window.c:394
 msgid "Select mode"
 msgstr "Режим вÑ?боÑ?ки"
 
-#: ../src/x_window.c:481
+#: src/x_window.c:481
 msgid "Pick"
 msgstr ""
 
-#: ../src/x_window.c:497
+#: src/x_window.c:497
 msgid "Repeat/none"
 msgstr "Ð?овÑ?оÑ?/пÑ?Ñ?Ñ?о"
 
-#: ../src/x_window.c:507
+#: src/x_window.c:507
 msgid "Menu/Cancel"
 msgstr "Ð?енÑ?/Ð?Ñ?мена"
 
-#: ../src/x_window.c:509
+#: src/x_window.c:509
 msgid "Pan/Cancel"
 msgstr "ЦенÑ?Ñ?/Ð?Ñ?мена"
 
-#: ../src/x_window.c:733
+#: src/x_window.c:733
 #, c-format
 msgid "Loading schematic [%s]\n"
 msgstr "Ð?агÑ?Ñ?жаеÑ?Ñ?Ñ? Ñ?Ñ?ема [%s]\n"
 
-#: ../src/x_window.c:745
+#: src/x_window.c:745
 #, fuzzy
 msgid "Failed to load file"
 msgstr "Ð?евозможно загÑ?зиÑ?аÑ?Ñ? изобÑ?ажение: [%s]"
 
-#: ../src/x_window.c:754
+#: src/x_window.c:754
 #, fuzzy, c-format
 msgid "New file [%s]\n"
 msgstr "Ð?овÑ?й Ñ?айл"
 
-#. an error occured when saving page to file
-#: ../src/x_window.c:859
+#: src/x_window.c:859
 #, fuzzy, c-format
 msgid "Could NOT save page [%s]\n"
 msgstr "Ð?евозможно Ñ?оÑ?Ñ?аниÑ?Ñ? [%s]\n"
 
-#: ../src/x_window.c:860
+#: src/x_window.c:860
 msgid "Error while trying to save"
 msgstr "Ð?Ñ?ибка пÑ?и попÑ?Ñ?ке Ñ?оÑ?Ñ?анениÑ?"
 
-#: ../src/x_window.c:869
+#: src/x_window.c:869
 #, fuzzy, c-format
 msgid "Saved as [%s]\n"
 msgstr "Ð?апиÑ?ано как [%s]\n"
 
-#: ../src/x_window.c:871
+#: src/x_window.c:871
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "СоÑ?Ñ?анено [%s]\n"
 
-#: ../src/x_window.c:873
+#: src/x_window.c:873
 msgid "Saved"
 msgstr "СоÑ?Ñ?анено"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Discarding page [%s]\n"
 msgstr "Ð?Ñ?веÑ?жение Ñ?Ñ?Ñ?аниÑ?Ñ? [%s]\n"
 
-#: ../src/x_window.c:947
+#: src/x_window.c:947
 #, c-format
 msgid "Closing [%s]\n"
 msgstr "Ð?акÑ?Ñ?Ñ?ие [%s]\n"
 
-#: ../data/geda-gschem.desktop.in.h:1
-msgid "Create and edit electrical schematics and symbols with gschem"
-msgstr ""
-
-#: ../data/geda-gschem.desktop.in.h:2
+#: data/geda-gschem.desktop.in.h:3
 #, fuzzy
 msgid "gEDA Schematic Editor"
 msgstr "Ð?глÑ?бÑ? Ñ?Ñ?емÑ?"
 
+#: data/geda-gschem.desktop.in.h:4
+msgid "Create and edit electrical schematics and symbols with gschem"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Cut Buffer"
 #~ msgstr "Ð?Ñ?Ñ?еÑ?"
@@ -2691,9 +2670,6 @@ msgstr "Ð?глÑ?бÑ? Ñ?Ñ?емÑ?"
 #~ msgid "Tried to render text with an invalid angle: %d\n"
 #~ msgstr "Ð?опÑ?Ñ?ка полÑ?Ñ?ениÑ? Ñ?екÑ?Ñ?а Ñ? невеÑ?нÑ?м Ñ?глом: %d\n"
 
-#~ msgid "Generic String"
-#~ msgstr "Ð?бÑ?аÑ? Ñ?Ñ?Ñ?ока"
-
 #~ msgid "Enter new string."
 #~ msgstr "Ð?вод новой Ñ?Ñ?Ñ?оки."
 

commit 97e51ad1c88349adc4e826de4b0da25d39cdd86d
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: Don't use intltool.
    
    intltool causes a number of problems at the moment. It's not
    tremendously portable, it hammers the gettext infrastructure heavily,
    and it has large incompatibilities between versions.
    
    Instead I've created a tool called desktop-i18n which does all of the
    things we currently use intltool for, without any dependencies except
    for a working shell & make. It's not as featureful as intltool, but it
    appears to do everything that is required.
    
    Thanks to Dan McMahill for testing and portability suggestions.

diff --git a/libgeda/.gitignore b/libgeda/.gitignore
index 6de2ed7..a040e48 100644
--- a/libgeda/.gitignore
+++ b/libgeda/.gitignore
@@ -20,12 +20,6 @@ install-sh
 missing
 mkinstalldirs
 ABOUT-NLS
-intltool-extract
-intltool-extract.in
-intltool-merge
-intltool-merge.in
-intltool-update
-intltool-update.in
 *~
 *#
 TAGS
@@ -37,3 +31,4 @@ HTML
 gschem.log
 docs/images/*png
 docs/images/*pdf
+.desktop-i18n
diff --git a/libgeda/Makefile.am b/libgeda/Makefile.am
index 3a0edf6..7b2bef1 100644
--- a/libgeda/Makefile.am
+++ b/libgeda/Makefile.am
@@ -1,12 +1,8 @@
 
-SUBDIRS = data docs include intl lib po scheme share src
-
-INTLTOOL_FILES = intltool-extract.in \
-                 intltool-merge.in \
-                 intltool-update.in
+SUBDIRS = po data docs include intl lib scheme share src
 
 EXTRA_DIST = HACKING BUGS ChangeLog-1.0 autogen.sh configure.ac.in \
-             icon-theme-installer $(INTLTOOL_FILES)
+             icon-theme-installer desktop-i18n po/domain.mak.in
 
 pkgconfigdir            = $(libdir)/pkgconfig
 pkgconfig_DATA          = libgeda.pc
@@ -28,15 +24,11 @@ configure.ac: configure.ac.in
 
 MOSTLYCLEANFILES = *.log core FILE *~
 CLEANFILES = *.log core FILE *~
-DISTCLEANFILES = *.log core FILE *~ prototype.bak libgeda.pc \
-                 intltool-extract \
-                 intltool-merge \
-                 intltool-update \
-                 po/.intltool-merge-cache
+DISTCLEANFILES = *.log core FILE *~ prototype.bak libgeda.pc po/domain.mak
 MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in configure config.h.in \
 	               config.status aclocal.m4 libgeda.pc config.guess \
 		       config.sub depcomp install-sh ltmain.sh missing \
-		       mkinstalldirs configure.ac $(INTLTOOL_FILES)
+		       mkinstalldirs configure.ac
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-update-mime-database
 
diff --git a/libgeda/autogen.sh b/libgeda/autogen.sh
index 80f01da..b222a1f 100755
--- a/libgeda/autogen.sh
+++ b/libgeda/autogen.sh
@@ -61,6 +61,16 @@ DIE=0
   }
 }
 
+(grep "^AX_DESKTOP_I18N" $srcdir/$configure_script >/dev/null) && {
+  (test -x $srcdir/desktop-i18n) || {
+    echo
+    echo
+    echo "**Error**: The desktop-i18n program is missing."
+    echo "Ensure that your tarballs are intact or that your git"
+    echo "checkout is up-to-date."
+  }
+}
+
 (automake --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`automake' installed."
@@ -155,10 +165,10 @@ do
 	  echo "autogen.sh running: autopoint ..." 
 	  echo "no" | autopoint --force 
 	fi
-	if grep "^IT_PROG_INTLTOOL" $configure_script >/dev/null; then
-	    echo "autogen.sh running: intltoolize ..."
-	    echo "no" | intltoolize --force --copy --automake
-	fi
+        if grep "^AX_DESKTOP_I18N" $configure_script >/dev/null; then
+          echo "autogen.sh running: desktop-i18n ..."
+          ./desktop-i18n --setup
+        fi
 	if grep "^AM_PROG_LIBTOOL" $configure_script >/dev/null; then
 	    echo "autogen.sh running: libtoolize ..."
 	    $LIBTOOLIZE --force --copy
diff --git a/libgeda/configure.ac.in b/libgeda/configure.ac.in
index 1bacfe7..386bf05 100644
--- a/libgeda/configure.ac.in
+++ b/libgeda/configure.ac.in
@@ -89,9 +89,8 @@ AC_GEDA_MACRO_CHECK([AM_GNU_GETTEXT], [gettext.m4])
 AM_GNU_GETTEXT
 AM_GNU_GETTEXT_VERSION([%INSTALLED_GETTEXT_VERSION%])
 
-# Initialise intltool
-AC_GEDA_MACRO_CHECK([IT_PROG_INTLTOOL], [intltool.m4])
-IT_PROG_INTLTOOL(0.35.0)
+# Setup desktop-i18n
+AX_DESKTOP_I18N
 
 # 
 # Internationalisation end
@@ -440,8 +439,8 @@ AC_CONFIG_FILES([Makefile
                  docs/Makefile
                  data/Makefile
                  intl/Makefile
+                 po/domain.mak
                  po/Makefile.in
-                 po/Makefile
 	         libgeda.pc
 		 share/Makefile
 		 lib/Makefile
diff --git a/libgeda/data/Makefile.am b/libgeda/data/Makefile.am
index b4e75dc..a3671bc 100644
--- a/libgeda/data/Makefile.am
+++ b/libgeda/data/Makefile.am
@@ -30,8 +30,6 @@ xmldir = $(mimedir)/packages
 xml_in_files = libgeda.xml.in
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
-@INTLTOOL_XML_RULE@
-
 kdedatadir=@KDEDATADIR@
 mimelnkdir = $(kdedatadir)/mimelnk
 applicationdir = $(mimelnkdir)/application
@@ -42,8 +40,6 @@ application_in_files = \
 	x-geda-symbol.desktop.in
 application_DATA = $(application_in_files:.desktop.in=.desktop)
 
-@INTLTOOL_DESKTOP_RULE@
-
 install_icon_exec = \
 	$(SHELL) $(top_srcdir)/icon-theme-installer \
 	-t $(theme) \
@@ -53,6 +49,12 @@ install_icon_exec = \
 	-m "$(mkinstalldirs)" \
 	-x "$(INSTALL_DATA)"
 
+DOMAIN=$(GETTEXT_PACKAGE)
+
+@DESKTOP_I18N_LANGS_RULE@
+@DESKTOP_I18N_DESKTOP_RULE@
+@DESKTOP_I18N_XML_RULE@
+
 install-data-local:
 	$(install_icon_exec) -i $(theme_icons)
 
diff --git a/libgeda/desktop-i18n b/libgeda/desktop-i18n
new file mode 100755
index 0000000..6fab9b8
--- /dev/null
+++ b/libgeda/desktop-i18n
@@ -0,0 +1,538 @@
+#!/bin/sh
+#                                                   -*-Shell-script-*-
+# Helper script for translating desktop integration data
+# Copyright (C) 2009  Peter Brett <peter@xxxxxxxxxxxxx>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+# usage [EXITSTATUS]
+# ------------------
+# Print a simple help message, then exit with EXITSTATUS
+usage() {
+cat <<EOF
+Carry out translation tasks on desktop integration data.
+
+Usage:
+  desktop-i18n --extract <options> -- <xgettext_options>
+  desktop-i18n --create  <options> INFILE OUTFILE
+  desktop-i18n --setup
+
+  Operating modes:
+      --extract  Extract strings by calling xgettext
+      --create   Substitute translated strings
+      --setup    Setup a source tree to use desktop-i18n
+      --help     Print this message
+
+  Options for --extract mode:
+      --xgettext=XGETTEXT
+                 Specify xgettext executable to use
+
+  Options for --create mode:
+      --gettext=GETTEXT
+                 Specify gettext executable to use
+      --domain=TEXTDOMAIN
+                 Retrieve translated bmessages from TEXTDOMAIN
+      --localedir=TEXTDOMAINDIR
+                 Retrieve message catalog from TEXTDOMAINDIR
+      --lang=LANG  Add a language to translate messages into
+
+In order for this to work, all strings to be matched must be on a
+single line. In a .desktop file, a translatable name-value pair must
+have the desired name prefixed by an underscore. For example:
+
+   _Comment=gEDA Schematic Editor
+
+In a MIME info file, XML tag pairs where the tagname begins with an
+underscore are recognized. Both tags must be on the same line, and
+the tag must be the only XML content on the line. Whitespace at the
+start of the line before the opening tag is preserved. For example:
+
+    <_comment>gEDA circuit schematic</_comment>
+
+Do not include double-quotes (") or slashes (\) in translatable
+strings.
+EOF
+exit $1
+}
+
+# extract_desktop INFILE
+# ----------------------
+# Parse desktop file data from standard input and generate C on
+# standard output. If an error occurs, a message is printed blaming
+# INFILE.
+extract_desktop() {
+  # First argument is name of file being processed
+  echo "/* Generated from $1 by desktop-i18n */"
+  echo
+  # Loop over each line of standard input
+  n=0
+  while read REPLY; do
+    n=`expr $n + 1`
+    regexp='^_\([^=]*\)=\(.*\)$'
+    if ! (echo $REPLY | grep $regexp > /dev/null); then
+      continue
+    fi
+    name=`echo $REPLY | sed -e "s:$regexp:\1:"`
+    msgid=`echo $REPLY | sed -e "s:$regexp:\2:"`
+
+    # Test for bad characters
+    if (echo $msgid | grep '["\\]' > /dev/null); then
+      echo "$1:$n: msgid contains invalid character" >&2
+      exit 2
+    fi
+
+    # Generate output line
+    if test "x$name" != x -a "x$msgid" != x; then
+      echo "_(\"$msgid\");"
+    else
+      echo "$1:$n: name or msgid is empty" >&2
+      exit 2
+    fi
+  done
+}
+
+
+# extract_xml INFILE
+# ------------------
+# Parse XML mimeinfo data from standard input and generate C on
+# standard output. If an error occurs, a message is printed blaming
+# INFILE.
+extract_xml() {
+  echo "/* Generated from $1 by desktop-i18n */"
+  echo
+  # Loop over each line of standard input
+  n=0
+  while read REPLY; do
+    n=`expr $n + 1`
+    regexp='<_\([a-zA-Z][a-zA-Z]*\)>\(.*\)</_\1>'
+    if ! (echo $REPLY | grep $regexp > /dev/null); then
+      continue
+    fi
+    name=`echo $REPLY | sed -e "s:$regexp:\1:"`
+    msgid=`echo $REPLY | sed -e "s:$regexp:\2:"`
+
+    # Test for bad characters
+    if (echo $msgid | grep '["\\]' > /dev/null); then
+      echo "$1:$n: msgid contains invalid character" >&2
+      exit 2
+    fi
+
+    # Generate output line
+    if test "x$name" != x -a "x$msgid" != x; then
+      echo "_(\"$msgid\");"
+    else
+      echo "$1:$n: name or msgid is empty" >&2
+      exit 2
+    fi
+  done
+}
+
+# do_extract [OPTION]... -- [XGETTEXT_OPTION]...
+# ----------------------------------------------
+# A wrapper around xgettext. It identifies the file lists and search
+# directories being used by xgettext, and from them any desktop or
+# mimeinfo files to be processed.
+#
+# It then creates a new private directory, and adds it to the xgettext
+# search path. It creates a new file list and set of preprocessed
+# files in that directory, and then calls xgettext (preserving all
+# other original arguments).
+do_extract() {
+  XGETTEXT=xgettext
+
+  # First we have to process the command-line arguments
+  for arg; do
+    # Split into name=value
+    name=`echo $arg | sed -e's:=.*::'`
+    value=`echo $arg | sed -e's:^[^=]*=*::'`
+
+    if test "X$in_xg_args" = X; then
+      # This is an argument only for this script
+      case $name in
+        --xgettext) XGETTEXT="$value";;
+        --help)     usage;;
+        --)         in_xg_args=1;;
+        *)          usage 1;;
+      esac
+
+    else
+      # This is an argument to xgettext.  Luckily the Makefile only
+      # uses full-length arguments, and we only really care about the
+      # ones from there!
+      case $name in
+        --directory)  search_dirs="$search_dirs $value";;
+        --files-from) file_lists="$file_lists $value";;
+        *)
+          # We just want to pass this arg straight to xgettext, so
+          # stick it back on the end of the positional parameters
+          set x "$@" "$arg"; shift;;
+      esac
+    fi
+
+    # Discard processed arg from positional parameters
+    shift
+  done
+
+  # If our private data directory exists, die. Otherwise, create it.
+  priv_dir=.po-input
+  if test -d $priv_dir; then
+    echo "desktop-i18n: $PWD/$priv_dir already exists"
+    exit 3
+  fi
+  mkdir $priv_dir
+
+  # Process file lists if necessary
+  if test "X$file_lists" != X; then
+    # Extract names of files we need to preprocess
+    desktop_in=`cat $file_lists | grep ".desktop.in$"`
+    xml_in=`cat $file_lists | grep ".xml.in$"`
+
+    # Create a new POTFILES file which uses the postprocessed
+    # filenames instead of the original ones.
+    cat $file_lists | \
+      sed -e "s:.desktop.in$:.desktop.in.h:" -e "s:.xml.in$:.xml.in.h:" \
+        > $priv_dir/POTFILES
+  fi
+
+  # Preprocess .desktop files
+  for f in $desktop_in; do
+    src=`_search_file $f $search_dirs` || { rm -rf $priv_dir; exit 3; }
+    mkdir -p $priv_dir/`dirname $f`
+    extract_desktop $f < $src > $priv_dir/$f.h
+  done
+
+  # Preprocess .xml files
+  for f in $xml_in; do
+    src=`_search_file $f $search_dirs` || { rm -rf $priv_dir; exit 3; }
+    mkdir -p $priv_dir/`dirname $f`
+    extract_xml $f < $src > $priv_dir/$f.h
+  done
+
+  # Call xgettext (recall we saved some args in $@)
+  gen_args="--files-from=$priv_dir/POTFILES --directory=$priv_dir"
+  for d in $search_dirs; do
+    gen_args="$gen_args --directory=$d"
+  done
+  $XGETTEXT $gen_args "$@"
+
+  # Clean up private directory
+  rm -rf $priv_dir
+}
+
+_search_file() {
+  f=$1
+  shift
+  for d in $@; do
+    if test -f "$d/$f"; then echo "$d/$f"; exit; fi
+  done
+  echo "desktop-i18n: Cannot find $f in xgettext search directories"
+}
+
+# create_desktop INFILE
+# ---------------------
+# Parse desktop file data from standard input and generate a
+# translated desktop file on standard output. If an error occurs, a
+# message is printed blaming INFILE.
+create_desktop() {
+  # Loop over each line of standard input
+  n=0
+  while read REPLY; do
+    n=`expr $n + 1`
+    regexp='^_\([^=]*\)=\(.*\)$'
+    if ! (echo $REPLY | grep $regexp > /dev/null); then
+      echo $REPLY
+      continue
+    fi
+    name=`echo $REPLY | sed -e "s:$regexp:\1:"`
+    msgid=`echo $REPLY | sed -e "s:$regexp:\2:"`
+
+    # Test for bad characters
+    if (echo $msgid | grep '["\\]' > /dev/null); then
+      echo "$1:$n: msgid contains invalid character" >&2
+      exit 2
+    fi
+
+    # Generate first output line
+    echo "$name=$msgid"
+
+    # Generate language-specific output lines
+    for lang in $LINGUAS; do
+      msg=`LANGUAGE=$lang $GETTEXT "$msgid"`
+      # If translated message is unmodified, don't write an output
+      # line
+      if test "x$msg" = x -o "$msg" = "$msgid"; then
+        continue;
+      fi
+
+      echo "$name[$lang]=$msg"
+    done
+  done
+}
+
+# create_xml INFILE
+# -----------------
+# Parse XML mimeinfo data from standard input and generate a
+# translated mimeinfo file on standard output. If an error occurs, a
+# message is printed blaming INFILE.
+create_xml() {
+  # Loop over each line of standard input
+  n=0
+  while read REPLY; do
+    n=`expr $n + 1`
+    regexp='<_\([a-zA-Z][a-zA-Z]*\)>\(.*\)</_\1>'
+    if ! (echo $REPLY | grep $regexp > /dev/null); then
+      echo "$REPLY"
+      continue
+    fi
+    name=`echo $REPLY | sed -e "s:$regexp:\1:"`
+    msgid=`echo $REPLY | sed -e "s:$regexp:\2:"`
+    prefix=`echo $REPLY | sed -e "s:^\(.*\)<_$name>.*:\1:"`
+    suffix=`echo $REPLY | sed -e "s:.*</_$name>\(.*\):\1:"`
+
+    # Test for bad characters
+    if (echo $msgid | grep '["\\]' > /dev/null); then
+      echo "$1:$n: msgid contains invalid character" >&2
+      exit 2
+    fi
+
+    # Test for non-empty prefix/suffix
+    if test "x$prefix" != x -o "x$suffix" != x; then
+      echo "$1:$n: translatable tag must be alone on line" >&2
+      exit 2
+    fi
+
+    # Generate first output line
+    echo "$REPLY" | sed -e "s:<_\($name\)>\(.*\)</_\1>:<\1>\2</\1>:"
+
+    # Generate language-specific output lines
+    for lang in $LINGUAS; do
+      msg=`LANGUAGE=$lang $GETTEXT "$msgid"`
+      # If translated message is unmodified, don't write an output
+      # line
+      if test "x$msg" = x -o "$msg" = "$msgid"; then
+        continue;
+      fi
+      echo "$REPLY" | sed -e "s,<_\($name\)>\(.*\)</_\1>,<\1 xml:lang=\"$lang\">$msg</\1>,"
+    done
+  done
+}
+
+# do_create [OPTION]... INFILE OUTFILE
+# ------------------------------------
+# Substitutes translations into .desktop or mimeinfo files.
+do_create() {
+  GETTEXT=gettext
+
+  # First process command-line arguments
+  for arg; do
+    # Split into name=value
+    name=`echo $arg | sed -e's:=.*::'`
+    value=`echo $arg | sed -e's:^[^=]*=*::'`
+
+    case $name in
+      --gettext)   GETTEXT=$value;;
+      --domain)    TEXTDOMAIN=$value;;
+      --localedir) TEXTDOMAINDIR=$value;;
+      --lang)      LINGUAS="$LINGUAS $value";;
+      *)
+        # Arg might be a filename, so save it at the end of the
+        # positional parameters
+        set x "$@" "$arg"; shift
+    esac
+
+    # Discard processed arg from positional parameters
+    shift
+  done
+
+  if test $# != 2; then usage 1; fi # Should only have 2 args left
+  INFILE=$1; OUTFILE=$2
+  if ! test -r $INFILE; then
+    echo "desktop-i18n: Cannot open $INFILE for reading."
+    exit 3
+  fi
+
+  export TEXTDOMAIN
+  export GETTEXT
+  export TEXTDOMAINDIR
+  export LINGUAS
+
+  if (echo "$INFILE" | grep ".desktop.in$" > /dev/null); then
+    create_desktop $INFILE < $INFILE > $OUTFILE
+    exit 0
+  fi
+
+  if (echo "$INFILE" | grep ".xml.in$" > /dev/null); then
+    create_xml $INFILE < $INFILE > $OUTFILE
+    exit 0
+  fi
+
+  echo "desktop-i18n: $INFILE: Unrecognized extension"
+  exit 1
+}
+
+# do_setup [DIR]
+# --------------
+# Try to set up a source tree to use desktop-i18n.
+#
+# This is a nasty bit of hackery. We need to insert some rules into
+# the Makefile.in.in installed by gettextize/autopoint so that make
+# knows how to generate input for xgettext.
+#
+# Unfortunately, there's no nice way to do this, so we do it by
+# appending some rules onto each Makefile.in.in, using the following
+# procedure:
+#
+# 1. Look for configure.ac in DIR, or in cwd if DIR wasn't
+#    specified. If we can't find it, whinge.
+# 2. If configure.ac doesn't have AX_DESKTOP_I18N, quit successfully.
+# 3. Find anywhere where AC_CONFIG_FILES is called. For each
+#    Makefile.in found in the list of files to create:
+#    (a) Check for Makefile.in.in. If it doesn't exist, skip with a warning.
+#    (b) If Makefile.in.in contains the string DESKTOP_I18N_RULES,
+#        skip silently.
+#    (c) Append a chunk of rules onto Makefile.in.in
+#
+# Note that we can't use a po/Rules-* file because substitution is not
+# carried out on these files.
+do_setup() {
+  # Was DIR specified?
+  if test "x$1" = x; then srcdir=.; else srcdir=$1; fi
+
+  # Can we find configure.ac or configure.in?
+  for f in configure.ac configure.in; do
+    if test -r $srcdir/$f; then
+      ac_file=$srcdir/$f
+      break
+    fi
+  done
+  if test "x$ac_file" = x; then
+    echo "Cannot find configure.ac or configure.in!"
+    exit 4
+  fi
+
+  # Check that configure.ac is readable
+  if ! test -r $ac_file; then
+    echo "Cannot open $ac_file for reading."
+    exit 3
+  fi
+
+  # Is the AX_DESKTOP_I18N macro present?
+  if ! grep AX_DESKTOP_I18N $ac_file > /dev/null; then
+    exit
+  fi
+
+  # Now we use a piece of m4 code to try and discover all of the
+  # configuration files. This is UGLY AND BAD, because it only detects
+  # when AC_CONFIG_FILES is called in the main configure script (if
+  # AC_CONFIG_FILES is called by another macro somewhere, it won't be
+  # detected).
+  cat - $ac_file > conftest <<EOF
+changequote([,])dnl
+divert([-1])
+define([AC_CONFIG_FILES], [divert([0])[\$1]divert([-1])])
+EOF
+  conf_files=`m4 conftest`
+  rm conftest
+
+  # Look for any files called Makefile.in.
+  for f in $conf_files; do
+    # Discard any composition rules and prepend srcdir.
+    f=`echo "$f" | sed -e 's,:.*,,'`
+    f="$srcdir/$f"
+
+    # Skip files not called Makefile.in
+    if test `echo "$f" | sed -e 's:.*/::'` != Makefile.in; then
+      continue
+    fi
+
+    # Check that a corresponding Makefile.in.in exists and we can
+    # read/write it
+    if ! test -r $f.in -a -w $f.in; then
+      echo "desktop-i18n: Cannot process $f.in"
+      continue
+    fi
+
+    # Check that we haven't already hacked it
+    if grep DESKTOP_I18N_RULES $f.in > /dev/null; then
+      continue
+    fi
+
+    # Append our rules
+    echo "desktop-i18n: modifying $f.in"
+    cat >> $f.in <<EOF
+
+# DESKTOP_I18N_RULES  (Do not edit or remove this line)
+#####################################################################
+# Makefile rules needed by the desktop-i18n tool.
+# Copyright (C) 2009  Peter Brett <peter@xxxxxxxxxxxxx>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+top_builddir = @top_builddir@
+MKDIR_P = @MKDIR_P@
+
+DESKTOP_I18N_LOCALE_DIR = @DESKTOP_I18N_LOCALE_DIR@
+
+# We need to temporarily install the localisation files somewhere so
+# that desktop-i18n --create can look up messages in them. We recreate
+# the timestamp before *and* after running 'make install' so that the
+# make doesn't go into an infinite loop!
+all: stamp-i18n
+stamp-i18n: \$(DESKTOP_I18N_LOCALE_DIR) stamp-po Makefile
+	@echo timestamp > stamp-i18nT && mv stamp-i18nT stamp-i18n
+	\$(MAKE) prefix=\$(DESKTOP_I18N_LOCALE_DIR) install && \
+	cp \$(srcdir)/LINGUAS \$(DESKTOP_I18N_LOCALE_DIR)/\$(DOMAIN).LINGUAS \
+	|| rm stamp-i18n
+	@echo timestamp > stamp-i18nT && mv stamp-i18nT stamp-i18n
+\$(DESKTOP_I18N_LOCALE_DIR):
+	\$(MKDIR_P) \$(DESKTOP_I18N_LOCALE_DIR)
+
+clean: clean-i18n
+clean-i18n:
+	-rm -rf \$(DESKTOP_I18N_LOCALE_DIR) stamp-i18n
+
+# End of desktop-i18n rules
+#####################################################################
+
+EOF
+  done
+}
+
+
+
+# First argument has to be the mode of operation. Then call the
+# appropriate function to process the rest of the arguments and do the
+# work.
+if test -z $1; then usage 1; fi
+MODE=$1; shift
+case $MODE in
+  --extract) do_extract "$@";;
+  --create) do_create "$@";;
+  --setup) do_setup "$@";;
+  --help) usage;;
+  *) usage 1;;
+esac
diff --git a/libgeda/m4/.gitignore b/libgeda/m4/.gitignore
index 28cb5f7..d5d05f6 100644
--- a/libgeda/m4/.gitignore
+++ b/libgeda/m4/.gitignore
@@ -1,4 +1,38 @@
 Makefile
 Makefile.in
-*.m4
 *~
+
+codeset.m4
+gettext.m4
+glibc2.m4
+glibc21.m4
+iconv.m4
+intdiv0.m4
+intl.m4
+intldir.m4
+intlmacosx.m4
+intmax.m4
+inttypes-pri.m4
+inttypes_h.m4
+lcmessage.m4
+lib-ld.m4
+lib-link.m4
+lib-prefix.m4
+libtool.m4
+lock.m4
+longlong.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+lt~obsolete.m4
+nls.m4
+po.m4
+printf-posix.m4
+progtest.m4
+size_max.m4
+stdint_h.m4
+uintmax_t.m4
+visibility.m4
+wchar_t.m4
+wint_t.m4
+xsize.m4
diff --git a/libgeda/m4/geda-desktop-i18n.m4 b/libgeda/m4/geda-desktop-i18n.m4
new file mode 100644
index 0000000..5b8af4e
--- /dev/null
+++ b/libgeda/m4/geda-desktop-i18n.m4
@@ -0,0 +1,78 @@
+# geda-desktop-i18n.m4                                  -*-Autoconf-*-
+# serial 1
+
+dnl Carry out configuration tasks needed by desktop-i18n tool
+dnl Copyright (C) 2009  Peter Brett <peter@xxxxxxxxxxxxx>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+AC_DEFUN([AX_DESKTOP_I18N],
+[
+  AC_PREREQ([2.60])dnl
+  AC_REQUIRE([AM_NLS])dnl
+  AC_REQUIRE([AM_PO_SUBDIRS])dnl
+  dnl Complain if desktop-i18n is missing
+  AC_REQUIRE_AUX_FILE([desktop-i18n])
+
+  # We need to check that GNU gettext is available
+  AM_PATH_PROG_WITH_TEST([GETTEXT], [gettext],
+    [$ac_dir/$ac_word --version | grep GNU > /dev/null], :)
+  if test "x$GETTEXT" = x; then
+    AC_MSG_ERROR([The GNU gettext program could not be found. Please ensure that GNU
+gettext is correctly installed, and rerun configure.])
+  fi
+  AC_SUBST([GETTEXT])
+
+  # How should desktop-i18n be run?
+  DESKTOP_I18N_SCRIPT="$am_aux_dir/desktop-i18n"
+  if test "X$GETTEXT" != "Xgettext"; then
+    DESKTOP_I18N="\${SHELL} $DESKTOP_I18N_SCRIPT"
+  else
+    DESKTOP_I18N="GETTEXT=\${GETTEXT} \${SHELL} $DESKTOP_I18N_SCRIPT"
+  fi
+  AC_SUBST([DESKTOP_I18N_SCRIPT])
+  AC_SUBST([DESKTOP_I18N])
+
+  # We have a private directory to temporarily install locale data
+  # into.
+  DESKTOP_I18N_LOCALE_DIR='$(top_builddir)/.desktop-i18n'
+  AC_SUBST([DESKTOP_I18N_LOCALE_DIR])
+
+  # Substitute our own evil, corrupted version of xgettext.
+  # Mwahahahaha!
+  XGETTEXT="$DESKTOP_I18N --extract --xgettext=$XGETTEXT --"
+
+  # Define some rules for substitution into Makefiles
+  DESKTOP_I18N_CREATE='$(DESKTOP_I18N) --create --gettext=$(GETTEXT) --domain=$(DOMAIN) \
+    --localedir=$(DESKTOP_I18N_LOCALE_DIR)/share/locale $(DESKTOP_I18N_LANGS)'
+  DESKTOP_I18N_LANGS_RULE='DESKTOP_I18N_LANGS = $(addprefix --lang=,$(shell cat $(DESKTOP_I18N_LOCALE_DIR)/$(DOMAIN).LINGUAS))'
+  DESKTOP_I18N_DESKTOP_RULE='%.desktop: %.desktop.in ; $(DESKTOP_I18N_CREATE) $< [$]@'
+  DESKTOP_I18N_XML_RULE='%.xml: %.xml.in ; $(DESKTOP_I18N_CREATE) $< [$]@'
+
+  AC_SUBST([DESKTOP_I18N_CREATE])
+  _IT_SUBST([DESKTOP_I18N_LANGS_RULE])
+  _IT_SUBST([DESKTOP_I18N_DESKTOP_RULE])
+  _IT_SUBST([DESKTOP_I18N_XML_RULE])
+])dnl AX_DESKTOP_I18N
+
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+# Stolen from intltool.m4 (GPL v2)
+AC_DEFUN([_IT_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+])dnl _IT_SUBST
diff --git a/libgeda/po/.gitignore b/libgeda/po/.gitignore
index 9400023..178434a 100644
--- a/libgeda/po/.gitignore
+++ b/libgeda/po/.gitignore
@@ -12,5 +12,6 @@ Rules-quot
 Makevars.template
 stamp-po
 stamp-it
-.intltool-merge-cache
+stamp-i18n
+domain.mak
 *~
diff --git a/libgeda/po/Makevars b/libgeda/po/Makevars
new file mode 100644
index 0000000..e9e8470
--- /dev/null
+++ b/libgeda/po/Makevars
@@ -0,0 +1,48 @@
+#                                                       -*-GNUmakefile-*-
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+#DOMAIN = $(PACKAGE)
+# Unfortunately, we need to use message domains that match the current
+# version of libgeda. Even more unfortunately, the way that the
+# gettext m4 code merges Makevars into the Makefile precludes Makevars
+# from containing anything determined at configure time. So we have
+# *yet another* Makefile fragment.
+include domain.mak
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = gEDA Developers
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = geda-bug@xxxxxxxx
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/libgeda/po/de.po b/libgeda/po/de.po
index 9504077..f46030e 100644
--- a/libgeda/po/de.po
+++ b/libgeda/po/de.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 14:35-0400\n"
+"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
+"POT-Creation-Date: 2009-06-18 11:49+0100\n"
 "PO-Revision-Date: 2008-12-21 12:20+0100\n"
 "Last-Translator: Werner Hoch <werner.ho@xxxxxx>\n"
 "Language-Team: deutsch <de@xxxxxx>\n"
@@ -17,45 +17,41 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../data/libgeda.xml.in.h:1
+#: data/libgeda.xml.in.h:3
 msgid "gEDA circuit schematic"
 msgstr "gEDA Schaltplan"
 
-#: ../data/libgeda.xml.in.h:2
-msgid "gEDA gsch2pcb project"
-msgstr "gEDA gsch2pcb Projekt"
-
-#: ../data/libgeda.xml.in.h:3
+#: data/libgeda.xml.in.h:4
 msgid "gEDA schematic symbol"
 msgstr "gEDA Schaltplansymbol"
 
-#: ../data/x-geda-gsch2pcb-project.desktop.in.h:1
+#: data/libgeda.xml.in.h:5
+msgid "gEDA gsch2pcb project"
+msgstr "gEDA gsch2pcb Projekt"
+
+#: data/x-geda-gsch2pcb-project.desktop.in.h:3
 msgid "gEDA Gsch2pcb Project"
 msgstr "gEDA Gsch2pcb Projekt"
 
-#: ../data/x-geda-schematic.desktop.in.h:1
+#: data/x-geda-schematic.desktop.in.h:3
 msgid "gEDA Circuit Schematic"
 msgstr "gEDA Schaltplan"
 
-#: ../data/x-geda-symbol.desktop.in.h:1
+#: data/x-geda-symbol.desktop.in.h:3
 msgid "gEDA Schematic Symbol"
 msgstr "gEDA Schaltplansymbol"
 
-#. ! \todo Maybe we can continue instead of just failing
-#. *  completely? In any case, failing gracefully is better
-#. *  than killing the program, which is what this used to
-#. *  do...
-#: ../src/a_basic.c:185
+#: src/a_basic.c:185
 #, c-format
 msgid "o_save_objects: object %p has unknown type '%c'\n"
 msgstr "o_save_objects: Das Objekt %p hat eine unbekannte Typangabe '%c'\n"
 
-#: ../src/a_basic.c:235
+#: src/a_basic.c:235
 #, c-format
 msgid "o_save: Could not open [%s]\n"
 msgstr "o_save: Konnte Datei [%s] nicht öffnen\n"
 
-#: ../src/a_basic.c:440
+#: src/a_basic.c:440
 #, c-format
 msgid ""
 "Read unexpected embedded symbol start marker in [%s] :\n"
@@ -66,7 +62,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/a_basic.c:469
+#: src/a_basic.c:469
 #, c-format
 msgid ""
 "Read unexpected embedded symbol end marker in [%s] :\n"
@@ -77,7 +73,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/a_basic.c:498
+#: src/a_basic.c:498
 #, c-format
 msgid ""
 "Read an old format sym/sch file!\n"
@@ -88,7 +84,7 @@ msgstr ""
 "Bitte aktualisiere die Datei mit g[sym|sch]update:\n"
 "[%s]\n"
 
-#: ../src/a_basic.c:504
+#: src/a_basic.c:504
 #, c-format
 msgid ""
 "Read garbage in [%s] :\n"
@@ -99,17 +95,17 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/f_basic.c:123 ../src/f_basic.c:136
+#: src/f_basic.c:123 src/f_basic.c:136
 #, c-format
 msgid "Failed to stat [%s]: %s"
 msgstr "Konnte Dateiinformation nicht ermitteln [%s]: %s"
 
-#: ../src/f_basic.c:219
+#: src/f_basic.c:219
 #, c-format
 msgid "Cannot find file %s: %s"
 msgstr "Konnte Datei nicht finden %s: %s"
 
-#: ../src/f_basic.c:257
+#: src/f_basic.c:257
 #, c-format
 msgid ""
 "\n"
@@ -122,13 +118,13 @@ msgstr ""
 "  %s.\n"
 "\n"
 
-#: ../src/f_basic.c:259
+#: src/f_basic.c:259
 msgid "I could not guess if it is newer, so you have to do it manually.\n"
 msgstr ""
 "Konnte nicht feststellen ob die Backupdatei neuer ist oder nicht. Dies muss "
 "nun manuell durchgeführt werden.\n"
 
-#: ../src/f_basic.c:261
+#: src/f_basic.c:261
 msgid ""
 "The backup copy is newer than the schematic, so it seems you should load it "
 "instead of the original file.\n"
@@ -136,7 +132,7 @@ msgstr ""
 "Die Backupdatei ist neuer als die des Schaltplanes. Es sollte eventuell das "
 "Backup anstatt der originalen Datei geladen werden.\n"
 
-#: ../src/f_basic.c:263
+#: src/f_basic.c:263
 msgid ""
 "Gschem usually makes backup copies automatically, and this situation happens "
 "when it crashed or it was forced to exit abruptly.\n"
@@ -144,7 +140,7 @@ msgstr ""
 "Gschem erstellt automatisch Backupdateien. Stürzt gschem ab oder wird es "
 "absichtlich getötet, so ergibt sich diese Situation.\n"
 
-#: ../src/f_basic.c:266
+#: src/f_basic.c:266
 msgid ""
 "\n"
 "Run gschem and correct the situation.\n"
@@ -154,150 +150,145 @@ msgstr ""
 "Starte gschem und korrigiere diesen Zustand.\n"
 "\n"
 
-#: ../src/f_basic.c:375
+#: src/f_basic.c:375
 #, c-format
 msgid "Can't get the real filename of %s."
 msgstr "Konnte den wahren Dateinamen von %s nicht ermitteln."
 
-#: ../src/f_basic.c:395
+#: src/f_basic.c:395
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr ""
 "Konnte die Rechte der alten Backupdatei [%s] nicht auf lesen+schreiben "
 "setzen\n"
 
-#: ../src/f_basic.c:401
+#: src/f_basic.c:401
 #, c-format
 msgid "Can't save backup file: %s."
 msgstr "Konnte Backupdatei nicht speichern: %s."
 
-#: ../src/f_basic.c:411
+#: src/f_basic.c:411
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Konnte die Rechte der Backupdatei [%s] nicht auf nurlesend setzen\n"
 
-#: ../src/f_basic.c:700
+#: src/f_basic.c:700
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../src/f_print.c:117
+#: src/f_print.c:117
 msgid "Unable to get time of day in f_print_header()\n"
 msgstr "f_print_header(): Konnte die aktuelle Zeit nicht ermitteln\n"
 
-#: ../src/f_print.c:159
+#: src/f_print.c:159
 #, c-format
 msgid "Unable to open the prolog file `%s' for reading in f_print_header()\n"
 msgstr "f_print_header(): Konnte die Prologdatei '%s' nicht öffnen.\n"
 
-#: ../src/f_print.c:176
+#: src/f_print.c:176
 #, c-format
 msgid "Error during reading of the prolog file `%s' in f_print_header()\n"
 msgstr "f_print_header(): Fehler beim Lesen der Prologdatei '%s'\n"
 
-#: ../src/f_print.c:182
+#: src/f_print.c:182
 msgid ""
 "Error during writing of the output postscript file in f_print_header()\n"
 msgstr "f_print_header(): Fehler beim Schreiben der Postscript-Datei.\n"
 
-#: ../src/f_print.c:195
+#: src/f_print.c:195
 msgid "Giving up on printing\n"
 msgstr "Gebe das Ausdrucken auf\n"
 
-#: ../src/f_print.c:390
+#: src/f_print.c:390
 #, c-format
 msgid "Could not open [%s] for printing\n"
 msgstr "Konnte die Datei [%s] nicht zum Drucken öffnen\n"
 
-#: ../src/f_print.c:423
+#: src/f_print.c:423
 #, c-format
 msgid "Could not execute command [%s] for printing\n"
 msgstr "Konnte den Befehl [%s] zum Drucken nicht ausführen\n"
 
-#: ../src/f_print.c:698
+#: src/f_print.c:698
 msgid "Too many UTF-8 characters, cannot print\n"
 msgstr "Zu viele UTF-8 Zeichen. Es kann nicht gedruckt werden\n"
 
-#: ../src/g_basic.c:109
+#: src/g_basic.c:101
 #, c-format
 msgid "%s:%i:%i: %s\n"
 msgstr "%s:%i:%i: %s\n"
 
-#: ../src/g_basic.c:116
+#: src/g_basic.c:108
 #, c-format
 msgid "Unknown file: %s\n"
 msgstr "Unbekannte Datei: %s\n"
 
-#. No stack, so can't display debugging info
-#: ../src/g_basic.c:122
+#: src/g_basic.c:114
 #, c-format
 msgid "Evaluation failed: %s\n"
 msgstr "Ausführung gescheitert: %s\n"
 
-#: ../src/g_basic.c:123
+#: src/g_basic.c:115
 msgid "Enable debugging for more detailed information\n"
 msgstr "Aktiviere die Debugausgabe für genaure Informationen\n"
 
-#: ../src/g_basic.c:284
+#: src/g_basic.c:258
 #, c-format
 msgid "Could not find [%s] for interpretation\n"
 msgstr "Konnte [%s] für die Auswertung nicht finden\n"
 
-#. We've already read this one in.
-#: ../src/g_rc.c:136
+#: src/g_rc.c:136
 #, c-format
 msgid "RC file [%s] already read in.\n"
 msgstr "Konfigurationsdatei [%s] wurde bereits gelesen.\n"
 
-#: ../src/g_rc.c:181
+#: src/g_rc.c:181
 #, fuzzy, c-format
 msgid "Read system config file [%%s]\n"
 msgstr "Lese die Systemdatei %s [%%s]\n"
 
-#: ../src/g_rc.c:182
+#: src/g_rc.c:182
 #, fuzzy, c-format
 msgid "Did not find required system config file [%%s]\n"
 msgstr "Konnte die erforderliche Systemdatei %s nicht finden [%%s]\n"
 
-#: ../src/g_rc.c:216
+#: src/g_rc.c:216
 #, fuzzy, c-format
 msgid "Read user config file [%%s]\n"
 msgstr "Lese vorgegebene %s Datei [%%s]\n"
 
-#: ../src/g_rc.c:217
+#: src/g_rc.c:217
 #, fuzzy, c-format
 msgid "Did not find optional user config file [%%s]\n"
 msgstr "Konnte die optionale lokale %s-Datei [%%s] nicht finden\n"
 
-#: ../src/g_rc.c:248
+#: src/g_rc.c:248
 #, fuzzy, c-format
 msgid "Read local config file [%%s]\n"
 msgstr "Lese die lokale %s-Datei [%%s]\n"
 
-#: ../src/g_rc.c:249
+#: src/g_rc.c:249
 #, fuzzy, c-format
 msgid "Did not find optional local config file [%%s]\n"
 msgstr "Konnte die optionale lokale %s-Datei [%%s] nicht finden\n"
 
-#: ../src/g_rc.c:286
+#: src/g_rc.c:286
 #, c-format
 msgid "Read specified %s file [%%s]\n"
 msgstr "Lese vorgegebene %s Datei [%%s]\n"
 
-#: ../src/g_rc.c:288
+#: src/g_rc.c:288
 #, c-format
 msgid "Did not find specified %s file [%%s]\n"
 msgstr "Konnte die angegebene %s-Datei [%%s] nicht finden\n"
 
-#. ! \todo these two are basically the
-#. * same. Inefficient!
-#.
-#: ../src/g_rc.c:338
+#: src/g_rc.c:338
 #, c-format
 msgid "Could not find any %s file!\n"
 msgstr "Konnte keine %s-Dateien finden!\n"
 
-#: ../src/g_rc.c:984
+#: src/g_rc.c:984
 msgid ""
 "WARNING: using a string for 'always-promote-attributes' is deprecated. Use a "
 "list of strings instead\n"
@@ -306,92 +297,88 @@ msgstr ""
 "attributes' ist veraltet. Es sollte statdessen eine Liste von Strings "
 "verwendet werden.\n"
 
-#: ../src/o_arc_basic.c:282
+#: src/o_arc_basic.c:282
 #, c-format
 msgid "Found a zero radius arc [ %c %d, %d, %d, %d, %d, %d ]\n"
 msgstr "Kreisbogen mit Radius 0 entdeckt [%c %d, %d, %d, %d, %d, %d ]\n"
 
-#: ../src/o_arc_basic.c:287 ../src/o_box_basic.c:301 ../src/o_bus_basic.c:188
-#: ../src/o_circle_basic.c:293 ../src/o_line_basic.c:269
-#: ../src/o_net_basic.c:180 ../src/o_path_basic.c:199 ../src/o_pin_basic.c:193
-#: ../src/o_text_basic.c:1155
+#: src/o_arc_basic.c:287 src/o_box_basic.c:301 src/o_bus_basic.c:188
+#: src/o_circle_basic.c:293 src/o_line_basic.c:269 src/o_net_basic.c:180
+#: src/o_path_basic.c:199 src/o_pin_basic.c:193 src/o_text_basic.c:1155
 #, c-format
 msgid "Found an invalid color [ %s ]\n"
 msgstr "Fehlerhafte Farbangabe entdeckt [%s]\n"
 
-#: ../src/o_arc_basic.c:288 ../src/o_box_basic.c:302 ../src/o_bus_basic.c:189
-#: ../src/o_circle_basic.c:294 ../src/o_line_basic.c:270
-#: ../src/o_net_basic.c:181 ../src/o_path_basic.c:200 ../src/o_pin_basic.c:194
-#: ../src/o_text_basic.c:1156
+#: src/o_arc_basic.c:288 src/o_box_basic.c:302 src/o_bus_basic.c:189
+#: src/o_circle_basic.c:294 src/o_line_basic.c:270 src/o_net_basic.c:181
+#: src/o_path_basic.c:200 src/o_pin_basic.c:194 src/o_text_basic.c:1156
 #, fuzzy
 msgid "Setting color to default color\n"
 msgstr "Verwende die Farbe WEISS\n"
 
-#: ../src/o_attrib.c:191
+#: src/o_attrib.c:146
 msgid "Attempt to attach non text item as an attribute!\n"
 msgstr "Es wurde versucht eine Attribut anzubringen, welches kein Text ist!\n"
 
-#: ../src/o_attrib.c:196
+#: src/o_attrib.c:151
 #, c-format
 msgid "Attempt to attach attribute [%s] to more than one object\n"
 msgstr ""
 "Es wurde versucht ein Attribute [%s] an mehr als ein Objekt anzubringen\n"
 
-#. only an error if there's a slot string
-#: ../src/o_attrib.c:1414 ../src/o_attrib.c:1514
+#: src/o_attrib.c:763
 msgid "Did not find slotdef=#:#,#,#... attribute\n"
 msgstr "Es wurde kein slotdef=#:#,#,#... Attribut gefunden\n"
 
-#. Didn't find proper slotdef=#:... put warning into log
-#: ../src/o_attrib.c:1420
+#: src/o_attrib.c:769
 msgid "Improper slotdef syntax: missing \":\".\n"
 msgstr "Fehlerhafte slotdef syntax: \":\" fehlt.\n"
 
-#: ../src/o_attrib.c:1435 ../src/o_attrib.c:1533
+#: src/o_attrib.c:784
 msgid "Did not find proper slotdef=#:#,#,#... attribute\n"
 msgstr "Kein korrektes Attribut slotdef=#:#,#,#... gefunden\n"
 
-#: ../src/o_attrib.c:1467 ../src/o_attrib.c:1562
+#: src/o_attrib.c:814
 msgid "component missing pinseq= attribute\n"
 msgstr "pinseq= Attribut fehlt.\n"
 
-#: ../src/o_basic.c:199 ../src/o_basic.c:211
+#: src/o_basic.c:199 src/o_basic.c:211
 msgid "Invalid space specified, setting to 100\n"
 msgstr "Fehlerhafte Abstandsangabe, verwende 100\n"
 
-#: ../src/o_basic.c:207
+#: src/o_basic.c:207
 msgid "Invalid length specified, setting to 100\n"
 msgstr "Fehlerhafte Längenangabe, verwende 100\n"
 
-#: ../src/o_box_basic.c:296
+#: src/o_box_basic.c:296
 #, c-format
 msgid "Found a zero width/height box [ %c %d %d %d %d %d ]\n"
 msgstr "Rechteck mit der Kantenlänge 0 entdeckt [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_bus_basic.c:179
+#: src/o_bus_basic.c:179
 #, c-format
 msgid "Found a zero length bus [ %c %d %d %d %d %d ]\n"
 msgstr "Bus mit der Länge 0 entdeckt [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_bus_basic.c:194
+#: src/o_bus_basic.c:194
 #, c-format
 msgid "Found an invalid bus ripper direction [ %s ]\n"
 msgstr "Fehlerhafte Richtungsangabe [%s] bei einem Busanschluss entdeckt\n"
 
-#: ../src/o_bus_basic.c:195
+#: src/o_bus_basic.c:195
 msgid "Resetting direction to neutral (no direction)\n"
 msgstr "Setze die Richtung auf neutral (keine Richtung)\n"
 
-#: ../src/o_circle_basic.c:204
+#: src/o_circle_basic.c:204
 msgid "Null radius circles are not allowed\n"
 msgstr "Kreise mit dem Radius 0 sind nicht erlaubt\n"
 
-#: ../src/o_circle_basic.c:287
+#: src/o_circle_basic.c:287
 #, c-format
 msgid "Found a zero radius circle [ %c %d %d %d %d ]\n"
 msgstr "Kreis mit dem Radius 0 entdeckt [ %c %d %d %d %d ]\n"
 
-#: ../src/o_complex_basic.c:489
+#: src/o_complex_basic.c:457
 #, c-format
 msgid ""
 "Component not found:\n"
@@ -400,13 +387,13 @@ msgstr ""
 "Bauteil wurde nicht gefunden:\n"
 " %s"
 
-#: ../src/o_complex_basic.c:703
+#: src/o_complex_basic.c:671
 #, c-format
 msgid "Found a component with an invalid rotation [ %c %d %d %d %d %d %s ]\n"
 msgstr ""
 "Bauteil mit fehlerhafter Rotationsangabe entdeckt [ %c %d %d %d %d %d %s ]\n"
 
-#: ../src/o_complex_basic.c:715
+#: src/o_complex_basic.c:683
 #, c-format
 msgid ""
 "Found a component with an invalid mirror flag [ %c %d %d %d %d %d %s ]\n"
@@ -414,7 +401,7 @@ msgstr ""
 "Bauteil mit fehlerhafter Spiegelungsangabe entdeckt [ %c %d %d %d %d %d %"
 "s ]\n"
 
-#: ../src/o_complex_basic.c:1416
+#: src/o_complex_basic.c:1307
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -424,7 +411,7 @@ msgstr ""
 "s':\n"
 "\tKonnte das Attribut symversion=%s nicht zerlegen\n"
 
-#: ../src/o_complex_basic.c:1420
+#: src/o_complex_basic.c:1311
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -434,7 +421,7 @@ msgstr ""
 "s':\n"
 "\tKonnte das Attribut symversion= nicht zerlegen\n"
 
-#: ../src/o_complex_basic.c:1436
+#: src/o_complex_basic.c:1327
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -444,7 +431,7 @@ msgstr ""
 "s':\n"
 "\tKonnte das angehängte Attribut symversion=%s nicht zerlegen\n"
 
-#: ../src/o_complex_basic.c:1461
+#: src/o_complex_basic.c:1352
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
@@ -456,7 +443,7 @@ msgstr ""
 "\tsymversion=%s existiert bei dem Symbol im Schaltplan, fehlt aber innerhalb "
 "der Schaltsymbol-Datei\n"
 
-#: ../src/o_complex_basic.c:1475
+#: src/o_complex_basic.c:1366
 #, c-format
 msgid ""
 "WARNING: Symbol version mismatch on refdes %s (%s):\n"
@@ -466,20 +453,20 @@ msgstr ""
 "s):\n"
 "\tDas Symbol in der Bibliothek ist neuer als das Symbol im Schaltplan\n"
 
-#: ../src/o_complex_basic.c:1503
+#: src/o_complex_basic.c:1394
 #, c-format
 msgid "\tMAJOR VERSION CHANGE (file %.3f, instantiated %.3f, %s)!\n"
 msgstr ""
 "\tGROSSE VERSIONSÃ?NDERUNG (Symboldatei %.3f, Symbol im Schaltplan %.3f, %"
 "s)!\n"
 
-#: ../src/o_complex_basic.c:1521
+#: src/o_complex_basic.c:1412
 #, c-format
 msgid "\tMinor version change (file %.3f, instantiated %.3f)\n"
 msgstr ""
 "\tKleine Versionsänderung (Symboldatei %.3f, Symbol im Schaltplan %.3f)!\n"
 
-#: ../src/o_complex_basic.c:1532
+#: src/o_complex_basic.c:1423
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
@@ -488,13 +475,12 @@ msgstr ""
 "ACHTUNG: Seltsame Versionskonstellation bei dem Symbol mit der Referenz %s:\n"
 "\tDie Symbolversion im Schaltplan ist aktueller als in der Symbolbibliothek\n"
 
-#: ../src/o_embed.c:58
+#: src/o_embed.c:58
 #, c-format
 msgid "Component [%s] has been embedded\n"
 msgstr "Bauteil [%s] wurde eingebettet\n"
 
-#. symbol not found in the symbol library: signal an error
-#: ../src/o_embed.c:98
+#: src/o_embed.c:98
 #, c-format
 msgid ""
 "Could not find component [%s], while trying to unembed. Component is still "
@@ -503,100 +489,100 @@ msgstr ""
 "Konnte Symbol [%s] nicht finden um es auszubetten. Das Bauteil bleibt "
 "eingebettet\n"
 
-#: ../src/o_embed.c:106
+#: src/o_embed.c:106
 #, c-format
 msgid "Component [%s] has been successfully unembedded\n"
 msgstr "Das Bauteil [%s] wurde erfolgreich ausgebettet\n"
 
-#: ../src/o_line_basic.c:264
+#: src/o_line_basic.c:264
 #, c-format
 msgid "Found a zero length line [ %c %d %d %d %d %d ]\n"
 msgstr "Linie mit der Länge 0 entdeckt [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_net_basic.c:170
+#: src/o_net_basic.c:170
 #, c-format
 msgid "Found a zero length net [ %c %d %d %d %d %d ]\n"
 msgstr "Netz mit der Länge 0 entdeckt [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:80
+#: src/o_picture.c:80
 #, c-format
 msgid "Error reading picture definition line: %s.\n"
 msgstr "Fehler beim Lesen der Bildinformation. Zeile: %s.\n"
 
-#: ../src/o_picture.c:94
+#: src/o_picture.c:94
 #, c-format
 msgid "Found a zero width/height picture [ %c %d %d %d %d ]\n"
 msgstr "Bild mit der Seitenlänge 0 entdeckt [ %c %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:99
+#: src/o_picture.c:99
 #, c-format
 msgid "Found a picture with a wrong 'mirrored' parameter: %c.\n"
 msgstr "Bild mit fehlerhaften Spiegelungsparametern entdeckt: %c.\n"
 
-#: ../src/o_picture.c:101
+#: src/o_picture.c:101
 msgid "Setting mirrored to 0\n"
 msgstr "Setze die Spiegelung auf 0\n"
 
-#: ../src/o_picture.c:106
+#: src/o_picture.c:106
 #, c-format
 msgid "Found a picture with a wrong 'embedded' parameter: %c.\n"
 msgstr "Bild mit fehlerhaften Einbettungsparametern entdeckt. %c.\n"
 
-#: ../src/o_picture.c:108
+#: src/o_picture.c:108
 msgid "Setting embedded to 0\n"
 msgstr "Setze die Einbettung auf 0\n"
 
-#: ../src/o_picture.c:120
+#: src/o_picture.c:120
 #, c-format
 msgid "Found an unsupported picture angle [ %d ]\n"
 msgstr "Bild mit fehlerhafter Winkelangabe entdeckt [%d]\n"
 
-#: ../src/o_picture.c:121 ../src/o_text_basic.c:1127
+#: src/o_picture.c:121 src/o_text_basic.c:1127
 msgid "Setting angle to 0\n"
 msgstr "Setze die Winkelangabe auf 0\n"
 
-#: ../src/o_picture.c:156 ../src/o_picture.c:167 ../src/o_picture.c:924
+#: src/o_picture.c:156 src/o_picture.c:167 src/o_picture.c:924
 #, c-format
 msgid "Failed to load image from embedded data [%s]: %s\n"
 msgstr "Fehler beim Laden der Daten eines eingebetteten Bildes [%s]: %s\n"
 
-#: ../src/o_picture.c:157
+#: src/o_picture.c:157
 msgid "Base64 decoding failed."
 msgstr "Base64 Dekodierung fehlgeschlagen."
 
-#: ../src/o_picture.c:158 ../src/o_picture.c:169 ../src/o_picture.c:926
+#: src/o_picture.c:158 src/o_picture.c:169 src/o_picture.c:926
 msgid "Falling back to file loading. Picture unembedded.\n"
 msgstr "Lade das Bild aus der Datei. Das Bild ist ausgebettet.\n"
 
-#: ../src/o_picture.c:180 ../src/o_picture.c:912 ../src/o_picture.c:961
+#: src/o_picture.c:180 src/o_picture.c:912 src/o_picture.c:961
 #, c-format
 msgid "Failed to load image from file [%s]: %s\n"
 msgstr "Das Bild konnte nicht aus der Datei [%s] geladen werden: %s\n"
 
-#: ../src/o_picture.c:191
+#: src/o_picture.c:191
 msgid "Loading warning picture.\n"
 msgstr "Lade das Warnbild.\n"
 
-#: ../src/o_picture.c:197
+#: src/o_picture.c:197
 #, c-format
 msgid "Error loading picture from file: %s.\n"
 msgstr "Fehler beim Laden des Bildes aus der Datei %s.\n"
 
-#: ../src/o_picture.c:257
+#: src/o_picture.c:257
 msgid "ERROR: o_picture_save: unable to encode the picture.\n"
 msgstr "FEHLER: o_picture_save: Kann das Bild nicht kodieren.\n"
 
-#: ../src/o_picture.c:939
+#: src/o_picture.c:939
 #, c-format
 msgid "Picture [%s] has been embedded\n"
 msgstr "Das Bild [%s] wurde eingebettet\n"
 
-#: ../src/o_picture.c:979
+#: src/o_picture.c:979
 #, c-format
 msgid "Picture [%s] has been unembedded\n"
 msgstr "Das Bild [%s] wurde ausgebettet\n"
 
-#: ../src/o_pin_basic.c:180
+#: src/o_pin_basic.c:180
 msgid ""
 "Found a pin which did not have the whichone field set.\n"
 "Verify and correct manually.\n"
@@ -604,77 +590,77 @@ msgstr ""
 "Pin ohne Markierung (whichend) der aktiven Seite entdeckt.\n"
 "Kontrolliere die Markierung und korrigiere ggf. manuell.\n"
 
-#: ../src/o_pin_basic.c:183
+#: src/o_pin_basic.c:183
 #, c-format
 msgid "Found an invalid whichend on a pin (reseting to zero): %d\n"
 msgstr ""
 "Pin mit fehlerafter Markierung (whichend) der aktiven Seite entdeckt. "
 "Verwende 0: %d\n"
 
-#: ../src/o_pin_basic.c:189
+#: src/o_pin_basic.c:189
 #, c-format
 msgid "Found a zero length pin: [ %s ]\n"
 msgstr "Pin mit der Länge 0 entdeckt: [ %s ]\n"
 
-#: ../src/o_text_basic.c:303
+#: src/o_text_basic.c:303
 #, c-format
 msgid "Could not find character '%s' definition.\n"
 msgstr "Konnte die Definition des Zeichens '%s' nicht finden.\n"
 
-#: ../src/o_text_basic.c:308
+#: src/o_text_basic.c:308
 #, c-format
 msgid "Could not load question font char -- check font-directory keyword\n"
 msgstr ""
 "Konnte das angefragte Zeichen nicht laden -- kontrolliere die Einstellung "
 "'font-directory'\n"
 
-#: ../src/o_text_basic.c:1113
+#: src/o_text_basic.c:1113
 #, c-format
 msgid "Found a zero size text string [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr ""
 "Textstring mit der Zeichengrö�e 0 entdeckt [ %c %d %d %d %d %d %d %d %d ]\n"
 
-#: ../src/o_text_basic.c:1125
+#: src/o_text_basic.c:1125
 #, c-format
 msgid "Found an unsupported text angle [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr ""
 "Text mit nicht unterstützer Winkelangabe entdeckt [ %c %d %d %d %d %d %d %d %"
 "d ]\n"
 
-#: ../src/o_text_basic.c:1147
+#: src/o_text_basic.c:1147
 #, c-format
 msgid "Found an unsupported text alignment [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr ""
 "Text mit nicht unterstützer Ausrichtung entdeckt [ %c %d %d %d %d %d %d %d %"
 "d ]\n"
 
-#: ../src/o_text_basic.c:1149
+#: src/o_text_basic.c:1149
 msgid "Setting alignment to LOWER_LEFT\n"
 msgstr "Verwende die Ausrichtung 'Links Unten'\n"
 
-#: ../src/o_text_basic.c:1238
+#: src/o_text_basic.c:1238
 #, c-format
 msgid "Failed to validate utf-8 character in font definition: \"%s\".\n"
 msgstr ""
 "UTF-8 Zeichen konnte in der Zeichensatzdefinition nicht ermittelt werden: \"%"
 "s\".\n"
 
-#: ../src/s_clib.c:464
+#: src/s_clib.c:464
 #, c-format
 msgid "Library command failed [%s]: %s\n"
 msgstr "Bibliotheksbefehl fehlgeschlagen [%s]: %s\n"
 
-#: ../src/s_clib.c:469
+#: src/s_clib.c:469
 #, c-format
 msgid "Library command failed [%s]: Uncaught signal %i.\n"
 msgstr "Bibliotheksbefehl fehlgeschlagen [%s]: Nicht abgefangenes Signal %i.\n"
 
-#: ../src/s_clib.c:473
+#: src/s_clib.c:473
 #, c-format
 msgid "Library command failed [%s]\n"
 msgstr "Bibliotheksbefehl fehlgeschlagen [%s]\n"
 
-#: ../src/s_clib.c:474
+#: src/s_clib.c:474
 #, c-format
 msgid ""
 "Error output was:\n"
@@ -683,35 +669,35 @@ msgstr ""
 "Die Fehlermeldung lautete:\n"
 "%s\n"
 
-#: ../src/s_clib.c:560
+#: src/s_clib.c:560
 #, c-format
 msgid "Library name [%s] already in use.  Using [%s].\n"
 msgstr "Bibliotheksname [%s] wird bereits verwendet. Verwende [%s].\n"
 
-#: ../src/s_clib.c:597
+#: src/s_clib.c:597
 #, c-format
 msgid "Failed to open directory [%s]: %s\n"
 msgstr "Fehler beim Ã?ffnen eines Verzeichnisses [%s]: %s\n"
 
-#: ../src/s_clib.c:732
+#: src/s_clib.c:732
 #, c-format
 msgid "Failed to scan library [%s]: Scheme function returned non-list\n"
 msgstr ""
 "Fehler beim Einlesen der Bibliothek [%s]: Die Scheme-Funktion hat 'non-list' "
 "zurückgegeben\n"
 
-#: ../src/s_clib.c:740
+#: src/s_clib.c:740
 #, c-format
 msgid "Non-string symbol name while scanning library [%s]\n"
 msgstr ""
 "Beim Einlesen der Bibliothek [%s] wurde der Symbolname 'non-string' "
 "zurückgegeben\n"
 
-#: ../src/s_clib.c:895 ../src/s_clib.c:942
+#: src/s_clib.c:895 src/s_clib.c:942
 msgid "Cannot add library: name not specified\n"
 msgstr "Kann die Bibliothek nicht hinzufügen. Der Name fehlt\n"
 
-#: ../src/s_clib.c:902
+#: src/s_clib.c:902
 #, c-format
 msgid ""
 "Cannot add library [%s]: both 'list' and 'get' commands must be specified.\n"
@@ -719,52 +705,51 @@ msgstr ""
 "Kann die Bibliothek [%s] nicht hinzufügen: Beide Befehle ('list' und 'get') "
 "müssen angegeben werden.\n"
 
-#: ../src/s_clib.c:950
+#: src/s_clib.c:950
 #, c-format
 msgid "Cannot add Scheme-library [%s]: callbacks must be closures\n"
 msgstr ""
 "Die Scheme-Bibliothek kann nicht hinzugefügt werden [%s]: Die aufgerufenen "
 "Prozeduren müssen abgeschlossen sein (closures)\n"
 
-#: ../src/s_clib.c:1077
+#: src/s_clib.c:1077
 #, c-format
 msgid "Failed to load symbol from file [%s]: %s\n"
 msgstr "Fehler beim Laden eines Symbols aus der Datei [%s]: %s\n"
 
-#: ../src/s_clib.c:1135
+#: src/s_clib.c:1135
 #, c-format
 msgid "Failed to load symbol data [%s] from source [%s]\n"
 msgstr "Fehler beim Laden der Symboldaten [%s] aus der Quelle [%s]\n"
 
-#: ../src/s_clib.c:1376
+#: src/s_clib.c:1360
 #, c-format
 msgid "Component [%s] was not found in the component library\n"
 msgstr ""
 "Das Bauteil [%s] konnte nicht in der Bauteilbibliothek gefunden werden\n"
 
-#. More than one symbol
-#: ../src/s_clib.c:1382
+#: src/s_clib.c:1366
 #, c-format
 msgid "More than one component found with name [%s]\n"
 msgstr "Mehr als ein Bauteil mit dem Namen [%s] gefunden\n"
 
-#: ../src/s_color.c:206
+#: src/s_color.c:206
 msgid "Color index out of range"
 msgstr ""
 
-#: ../src/s_color.c:261
+#: src/s_color.c:261
 msgid "Color map entry must be a two-element list"
 msgstr ""
 
-#: ../src/s_color.c:269
+#: src/s_color.c:269
 msgid "Index in color map entry must be an integer"
 msgstr ""
 
-#: ../src/s_color.c:295
+#: src/s_color.c:295
 msgid "Value in color map entry must be #f or a string"
 msgstr ""
 
-#: ../src/s_hierarchy.c:90
+#: src/s_hierarchy.c:90
 #, c-format
 msgid ""
 "hierarchy loop detected while visiting page:\n"
@@ -773,43 +758,42 @@ msgstr ""
 "Zirkuläre Abhängigkeiten in der Hierarchie entdeckt. Schaltplan:\n"
 "  \"%s\"\n"
 
-#: ../src/s_hierarchy.c:185
+#: src/s_hierarchy.c:185
 msgid "There are no schematics above the current one!\n"
 msgstr "Ã?ber diesem Schaltplan gibt es keinen weiteren!\n"
 
-#: ../src/s_hierarchy.c:266
+#: src/s_hierarchy.c:266
 #, c-format
 msgid "ERROR in s_hierarchy_traverse: schematic not found: %s\n"
 msgstr "ERROR: s_hierarchy_traverse: Schaltplan [%s] wurde nicht gefunden.\n"
 
-#: ../src/s_page.c:167
+#: src/s_page.c:167
 #, c-format
 msgid "s_page_delete: Can't get the real filename of %s."
 msgstr ""
 "s_page_delete: Kann den tatsächlichen Dateinamen von [%s] nicht ermitteln."
 
-#: ../src/s_page.c:178
+#: src/s_page.c:178
 #, c-format
 msgid "s_page_delete: Unable to delete backup file %s."
 msgstr "s_page_delete: Kann die Backupdatei [%s] nicht löschen."
 
-#: ../src/s_page.c:380
+#: src/s_page.c:380
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Gespeichert [%s]\n"
 
-#: ../src/s_page.c:386
+#: src/s_page.c:386
 #, c-format
 msgid "Could NOT save [%s]\n"
 msgstr "ACHTUNG: Konnte Datei nicht speichern [%s]\n"
 
-#. return type
-#: ../src/s_slib.c:181
+#: src/s_slib.c:181
 #, c-format
 msgid "Found [%s]\n"
 msgstr "[%s] gefunden\n"
 
-#: ../src/s_slib.c:191
+#: src/s_slib.c:191
 #, c-format
 msgid "Could not find [%s] in any SourceLibrary\n"
 msgstr "Konnte [%s] in keiner Bibliothekenquelle finden\n"
diff --git a/libgeda/po/domain.mak.in b/libgeda/po/domain.mak.in
new file mode 100644
index 0000000..0e45d8b
--- /dev/null
+++ b/libgeda/po/domain.mak.in
@@ -0,0 +1,3 @@
+#                                                       -*-GNUmakefile-*-
+# This is a workaround for buggy logic in the gettext m4 files.
+DOMAIN = @GETTEXT_PACKAGE@
diff --git a/libgeda/po/en_GB.po b/libgeda/po/en_GB.po
index 8f585d2..ca09e90 100644
--- a/libgeda/po/en_GB.po
+++ b/libgeda/po/en_GB.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgeda\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 14:35-0400\n"
+"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
+"POT-Creation-Date: 2009-06-18 11:49+0100\n"
 "PO-Revision-Date: 2009-01-02 14:31+0100\n"
 "Last-Translator: Peter Clifton <pcjc2@xxxxxxxxx>\n"
 "Language-Team: geda-dev <geda-dev@xxxxxxxx>\n"
@@ -15,45 +15,41 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/libgeda.xml.in.h:1
+#: data/libgeda.xml.in.h:3
 msgid "gEDA circuit schematic"
 msgstr "gEDA circuit schematic"
 
-#: ../data/libgeda.xml.in.h:2
-msgid "gEDA gsch2pcb project"
-msgstr "gEDA gsch2pcb project"
-
-#: ../data/libgeda.xml.in.h:3
+#: data/libgeda.xml.in.h:4
 msgid "gEDA schematic symbol"
 msgstr "gEDA schematic symbol"
 
-#: ../data/x-geda-gsch2pcb-project.desktop.in.h:1
+#: data/libgeda.xml.in.h:5
+msgid "gEDA gsch2pcb project"
+msgstr "gEDA gsch2pcb project"
+
+#: data/x-geda-gsch2pcb-project.desktop.in.h:3
 msgid "gEDA Gsch2pcb Project"
 msgstr "gEDA Gsch2pcb Project"
 
-#: ../data/x-geda-schematic.desktop.in.h:1
+#: data/x-geda-schematic.desktop.in.h:3
 msgid "gEDA Circuit Schematic"
 msgstr "gEDA Circuit Schematic"
 
-#: ../data/x-geda-symbol.desktop.in.h:1
+#: data/x-geda-symbol.desktop.in.h:3
 msgid "gEDA Schematic Symbol"
 msgstr "gEDA Schematic Symbol"
 
-#. ! \todo Maybe we can continue instead of just failing
-#. *  completely? In any case, failing gracefully is better
-#. *  than killing the program, which is what this used to
-#. *  do...
-#: ../src/a_basic.c:185
+#: src/a_basic.c:185
 #, c-format
 msgid "o_save_objects: object %p has unknown type '%c'\n"
 msgstr "o_save_objects: object %p has unknown type '%c'\n"
 
-#: ../src/a_basic.c:235
+#: src/a_basic.c:235
 #, c-format
 msgid "o_save: Could not open [%s]\n"
 msgstr "o_save: Could not open [%s]\n"
 
-#: ../src/a_basic.c:440
+#: src/a_basic.c:440
 #, c-format
 msgid ""
 "Read unexpected embedded symbol start marker in [%s] :\n"
@@ -64,7 +60,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/a_basic.c:469
+#: src/a_basic.c:469
 #, c-format
 msgid ""
 "Read unexpected embedded symbol end marker in [%s] :\n"
@@ -75,7 +71,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/a_basic.c:498
+#: src/a_basic.c:498
 #, c-format
 msgid ""
 "Read an old format sym/sch file!\n"
@@ -86,7 +82,7 @@ msgstr ""
 "Please run g[sym|sch]update on:\n"
 "[%s]\n"
 
-#: ../src/a_basic.c:504
+#: src/a_basic.c:504
 #, c-format
 msgid ""
 "Read garbage in [%s] :\n"
@@ -97,17 +93,17 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/f_basic.c:123 ../src/f_basic.c:136
+#: src/f_basic.c:123 src/f_basic.c:136
 #, c-format
 msgid "Failed to stat [%s]: %s"
 msgstr "Failed to stat [%s]: %s"
 
-#: ../src/f_basic.c:219
+#: src/f_basic.c:219
 #, c-format
 msgid "Cannot find file %s: %s"
 msgstr "Cannot find file: %s: %s"
 
-#: ../src/f_basic.c:257
+#: src/f_basic.c:257
 #, c-format
 msgid ""
 "\n"
@@ -120,11 +116,11 @@ msgstr ""
 "  %s.\n"
 "\n"
 
-#: ../src/f_basic.c:259
+#: src/f_basic.c:259
 msgid "I could not guess if it is newer, so you have to do it manually.\n"
 msgstr "I could not guess if it is newer, so you have to do it manually.\n"
 
-#: ../src/f_basic.c:261
+#: src/f_basic.c:261
 msgid ""
 "The backup copy is newer than the schematic, so it seems you should load it "
 "instead of the original file.\n"
@@ -132,7 +128,7 @@ msgstr ""
 "The backup copy is newer than the schematic, so it seems you should load it "
 "instead of the original file.\n"
 
-#: ../src/f_basic.c:263
+#: src/f_basic.c:263
 msgid ""
 "Gschem usually makes backup copies automatically, and this situation happens "
 "when it crashed or it was forced to exit abruptly.\n"
@@ -140,7 +136,7 @@ msgstr ""
 "Gschem usually makes backup copies automatically, and this situation happens "
 "when it crashed or it was forced to exit abruptly.\n"
 
-#: ../src/f_basic.c:266
+#: src/f_basic.c:266
 msgid ""
 "\n"
 "Run gschem and correct the situation.\n"
@@ -150,149 +146,144 @@ msgstr ""
 "Run gschem and correct the situation.\n"
 "\n"
 
-#: ../src/f_basic.c:375
+#: src/f_basic.c:375
 #, c-format
 msgid "Can't get the real filename of %s."
 msgstr "Can't get the real filename of %s."
 
-#: ../src/f_basic.c:395
+#: src/f_basic.c:395
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr "Could NOT set previous backup file [%s] read-write\n"
 
-#: ../src/f_basic.c:401
+#: src/f_basic.c:401
 #, c-format
 msgid "Can't save backup file: %s."
 msgstr "Can't save backup file: %s."
 
-#: ../src/f_basic.c:411
+#: src/f_basic.c:411
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Could NOT set backup file [%s] readonly\n"
 
-#: ../src/f_basic.c:700
+#: src/f_basic.c:700
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../src/f_print.c:117
+#: src/f_print.c:117
 msgid "Unable to get time of day in f_print_header()\n"
 msgstr "Unable to get time of day in f_print_header()\n"
 
-#: ../src/f_print.c:159
+#: src/f_print.c:159
 #, c-format
 msgid "Unable to open the prolog file `%s' for reading in f_print_header()\n"
 msgstr "Unable to open the prolog file `%s' for reading in f_print_header()\n"
 
-#: ../src/f_print.c:176
+#: src/f_print.c:176
 #, c-format
 msgid "Error during reading of the prolog file `%s' in f_print_header()\n"
 msgstr "Error during reading of the prolog file `%s' in f_print_header()\n"
 
-#: ../src/f_print.c:182
+#: src/f_print.c:182
 msgid ""
 "Error during writing of the output postscript file in f_print_header()\n"
 msgstr ""
 "Error during writing of the output postscript file in f_print_header()\n"
 
-#: ../src/f_print.c:195
+#: src/f_print.c:195
 msgid "Giving up on printing\n"
 msgstr "Giving up on printing\n"
 
-#: ../src/f_print.c:390
+#: src/f_print.c:390
 #, c-format
 msgid "Could not open [%s] for printing\n"
 msgstr "Could not open [%s] for printing\n"
 
-#: ../src/f_print.c:423
+#: src/f_print.c:423
 #, c-format
 msgid "Could not execute command [%s] for printing\n"
 msgstr "Could not execute command [%s] for printing\n"
 
-#: ../src/f_print.c:698
+#: src/f_print.c:698
 msgid "Too many UTF-8 characters, cannot print\n"
 msgstr "Too many UTF-8 characters, cannot print\n"
 
-#: ../src/g_basic.c:109
+#: src/g_basic.c:101
 #, c-format
 msgid "%s:%i:%i: %s\n"
 msgstr "%s:%i:%i: %s\n"
 
-#: ../src/g_basic.c:116
+#: src/g_basic.c:108
 #, c-format
 msgid "Unknown file: %s\n"
 msgstr "Unknown file: %s\n"
 
-#. No stack, so can't display debugging info
-#: ../src/g_basic.c:122
+#: src/g_basic.c:114
 #, c-format
 msgid "Evaluation failed: %s\n"
 msgstr "Evaluation failed: %s\n"
 
-#: ../src/g_basic.c:123
+#: src/g_basic.c:115
 msgid "Enable debugging for more detailed information\n"
 msgstr "Enable debugging for more detailed information\n"
 
-#: ../src/g_basic.c:284
+#: src/g_basic.c:258
 #, c-format
 msgid "Could not find [%s] for interpretation\n"
 msgstr "Could not find [%s] for interpretation\n"
 
-#. We've already read this one in.
-#: ../src/g_rc.c:136
+#: src/g_rc.c:136
 #, c-format
 msgid "RC file [%s] already read in.\n"
 msgstr "RC file [%s] already read in.\n"
 
-#: ../src/g_rc.c:181
+#: src/g_rc.c:181
 #, fuzzy, c-format
 msgid "Read system config file [%%s]\n"
 msgstr "Read system-%s file [%%s]\n"
 
-#: ../src/g_rc.c:182
+#: src/g_rc.c:182
 #, fuzzy, c-format
 msgid "Did not find required system config file [%%s]\n"
 msgstr "Did not find required system-%s file [%%s]\n"
 
-#: ../src/g_rc.c:216
+#: src/g_rc.c:216
 #, fuzzy, c-format
 msgid "Read user config file [%%s]\n"
 msgstr "Read specified %s file [%%s]\n"
 
-#: ../src/g_rc.c:217
+#: src/g_rc.c:217
 #, fuzzy, c-format
 msgid "Did not find optional user config file [%%s]\n"
 msgstr "Did not find optional local %s file [%%s]\n"
 
-#: ../src/g_rc.c:248
+#: src/g_rc.c:248
 #, fuzzy, c-format
 msgid "Read local config file [%%s]\n"
 msgstr "Read local %s file [%%s]\n"
 
-#: ../src/g_rc.c:249
+#: src/g_rc.c:249
 #, fuzzy, c-format
 msgid "Did not find optional local config file [%%s]\n"
 msgstr "Did not find optional local %s file [%%s]\n"
 
-#: ../src/g_rc.c:286
+#: src/g_rc.c:286
 #, c-format
 msgid "Read specified %s file [%%s]\n"
 msgstr "Read specified %s file [%%s]\n"
 
-#: ../src/g_rc.c:288
+#: src/g_rc.c:288
 #, c-format
 msgid "Did not find specified %s file [%%s]\n"
 msgstr "Did not find specified %s file [%%s]\n"
 
-#. ! \todo these two are basically the
-#. * same. Inefficient!
-#.
-#: ../src/g_rc.c:338
+#: src/g_rc.c:338
 #, c-format
 msgid "Could not find any %s file!\n"
 msgstr "Could not find any %s file!\n"
 
-#: ../src/g_rc.c:984
+#: src/g_rc.c:984
 msgid ""
 "WARNING: using a string for 'always-promote-attributes' is deprecated. Use a "
 "list of strings instead\n"
@@ -300,90 +291,86 @@ msgstr ""
 "WARNING: using a string for 'always-promote-attributes' is deprecated. Use a "
 "list of strings instead\n"
 
-#: ../src/o_arc_basic.c:282
+#: src/o_arc_basic.c:282
 #, c-format
 msgid "Found a zero radius arc [ %c %d, %d, %d, %d, %d, %d ]\n"
 msgstr "Found a zero radius arc [ %c %d, %d, %d, %d, %d, %d ]\n"
 
-#: ../src/o_arc_basic.c:287 ../src/o_box_basic.c:301 ../src/o_bus_basic.c:188
-#: ../src/o_circle_basic.c:293 ../src/o_line_basic.c:269
-#: ../src/o_net_basic.c:180 ../src/o_path_basic.c:199 ../src/o_pin_basic.c:193
-#: ../src/o_text_basic.c:1155
+#: src/o_arc_basic.c:287 src/o_box_basic.c:301 src/o_bus_basic.c:188
+#: src/o_circle_basic.c:293 src/o_line_basic.c:269 src/o_net_basic.c:180
+#: src/o_path_basic.c:199 src/o_pin_basic.c:193 src/o_text_basic.c:1155
 #, c-format
 msgid "Found an invalid color [ %s ]\n"
 msgstr "Found an invalid colour [ %s ]\n"
 
-#: ../src/o_arc_basic.c:288 ../src/o_box_basic.c:302 ../src/o_bus_basic.c:189
-#: ../src/o_circle_basic.c:294 ../src/o_line_basic.c:270
-#: ../src/o_net_basic.c:181 ../src/o_path_basic.c:200 ../src/o_pin_basic.c:194
-#: ../src/o_text_basic.c:1156
+#: src/o_arc_basic.c:288 src/o_box_basic.c:302 src/o_bus_basic.c:189
+#: src/o_circle_basic.c:294 src/o_line_basic.c:270 src/o_net_basic.c:181
+#: src/o_path_basic.c:200 src/o_pin_basic.c:194 src/o_text_basic.c:1156
 msgid "Setting color to default color\n"
 msgstr "Setting colour to default colour\n"
 
-#: ../src/o_attrib.c:191
+#: src/o_attrib.c:146
 msgid "Attempt to attach non text item as an attribute!\n"
 msgstr "Attempt to attach non text item as an attribute!\n"
 
-#: ../src/o_attrib.c:196
+#: src/o_attrib.c:151
 #, c-format
 msgid "Attempt to attach attribute [%s] to more than one object\n"
 msgstr "Attempt to attach attribute [%s] to more than one object\n"
 
-#. only an error if there's a slot string
-#: ../src/o_attrib.c:1414 ../src/o_attrib.c:1514
+#: src/o_attrib.c:763
 msgid "Did not find slotdef=#:#,#,#... attribute\n"
 msgstr "Did not find slotdef=#:#,#,#... attribute\n"
 
-#. Didn't find proper slotdef=#:... put warning into log
-#: ../src/o_attrib.c:1420
+#: src/o_attrib.c:769
 msgid "Improper slotdef syntax: missing \":\".\n"
 msgstr "Improper slotdef syntax: missing \":\".\n"
 
-#: ../src/o_attrib.c:1435 ../src/o_attrib.c:1533
+#: src/o_attrib.c:784
 msgid "Did not find proper slotdef=#:#,#,#... attribute\n"
 msgstr "Did not find proper slotdef=#:#,#,#... attribute\n"
 
-#: ../src/o_attrib.c:1467 ../src/o_attrib.c:1562
+#: src/o_attrib.c:814
 msgid "component missing pinseq= attribute\n"
 msgstr "component missing pinseq= attribute\n"
 
-#: ../src/o_basic.c:199 ../src/o_basic.c:211
+#: src/o_basic.c:199 src/o_basic.c:211
 msgid "Invalid space specified, setting to 100\n"
 msgstr "Invalid space specified, setting to 100\n"
 
-#: ../src/o_basic.c:207
+#: src/o_basic.c:207
 msgid "Invalid length specified, setting to 100\n"
 msgstr "Invalid length specified, setting to 100\n"
 
-#: ../src/o_box_basic.c:296
+#: src/o_box_basic.c:296
 #, c-format
 msgid "Found a zero width/height box [ %c %d %d %d %d %d ]\n"
 msgstr "Found a zero width/height box [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_bus_basic.c:179
+#: src/o_bus_basic.c:179
 #, c-format
 msgid "Found a zero length bus [ %c %d %d %d %d %d ]\n"
 msgstr "Found a zero length bus [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_bus_basic.c:194
+#: src/o_bus_basic.c:194
 #, c-format
 msgid "Found an invalid bus ripper direction [ %s ]\n"
 msgstr "Found an invalid bus ripper direction [ %s ]\n"
 
-#: ../src/o_bus_basic.c:195
+#: src/o_bus_basic.c:195
 msgid "Resetting direction to neutral (no direction)\n"
 msgstr "Resetting direction to neutral (no direction)\n"
 
-#: ../src/o_circle_basic.c:204
+#: src/o_circle_basic.c:204
 msgid "Null radius circles are not allowed\n"
 msgstr "Null radius circles are not allowed\n"
 
-#: ../src/o_circle_basic.c:287
+#: src/o_circle_basic.c:287
 #, c-format
 msgid "Found a zero radius circle [ %c %d %d %d %d ]\n"
 msgstr "Found a zero radius circle [ %c %d %d %d %d ]\n"
 
-#: ../src/o_complex_basic.c:489
+#: src/o_complex_basic.c:457
 #, c-format
 msgid ""
 "Component not found:\n"
@@ -392,19 +379,19 @@ msgstr ""
 "Component not found:\n"
 " %s"
 
-#: ../src/o_complex_basic.c:703
+#: src/o_complex_basic.c:671
 #, c-format
 msgid "Found a component with an invalid rotation [ %c %d %d %d %d %d %s ]\n"
 msgstr "Found a component with an invalid rotation [ %c %d %d %d %d %d %s ]\n"
 
-#: ../src/o_complex_basic.c:715
+#: src/o_complex_basic.c:683
 #, c-format
 msgid ""
 "Found a component with an invalid mirror flag [ %c %d %d %d %d %d %s ]\n"
 msgstr ""
 "Found a component with an invalid mirror flag [ %c %d %d %d %d %d %s ]\n"
 
-#: ../src/o_complex_basic.c:1416
+#: src/o_complex_basic.c:1307
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -413,7 +400,7 @@ msgstr ""
 "WARNING: Symbol version parse error on refdes %s:\n"
 "\tCould not parse symbol file symversion=%s\n"
 
-#: ../src/o_complex_basic.c:1420
+#: src/o_complex_basic.c:1311
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -422,7 +409,7 @@ msgstr ""
 "WARNING: Symbol version parse error on refdes %s:\n"
 "\tCould not parse symbol file symversion=\n"
 
-#: ../src/o_complex_basic.c:1436
+#: src/o_complex_basic.c:1327
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -431,7 +418,7 @@ msgstr ""
 "WARNING: Symbol version parse error on refdes %s:\n"
 "\tCould not parse attached symversion=%s\n"
 
-#: ../src/o_complex_basic.c:1461
+#: src/o_complex_basic.c:1352
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
@@ -442,7 +429,7 @@ msgstr ""
 "\tsymversion=%s attached to instantiated symbol, but no symversion= inside "
 "symbol file\n"
 
-#: ../src/o_complex_basic.c:1475
+#: src/o_complex_basic.c:1366
 #, c-format
 msgid ""
 "WARNING: Symbol version mismatch on refdes %s (%s):\n"
@@ -451,17 +438,17 @@ msgstr ""
 "WARNING: Symbol version mismatch on refdes %s (%s):\n"
 "\tSymbol in library is newer than instantiated symbol\n"
 
-#: ../src/o_complex_basic.c:1503
+#: src/o_complex_basic.c:1394
 #, c-format
 msgid "\tMAJOR VERSION CHANGE (file %.3f, instantiated %.3f, %s)!\n"
 msgstr "\tMAJOR VERSION CHANGE (file %.3f, instantiated %.3f, %s)!\n"
 
-#: ../src/o_complex_basic.c:1521
+#: src/o_complex_basic.c:1412
 #, c-format
 msgid "\tMinor version change (file %.3f, instantiated %.3f)\n"
 msgstr "\tMinor version change (file %.3f, instantiated %.3f)\n"
 
-#: ../src/o_complex_basic.c:1532
+#: src/o_complex_basic.c:1423
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
@@ -470,13 +457,12 @@ msgstr ""
 "WARNING: Symbol version oddity on refdes %s:\n"
 "\tInstantiated symbol is newer than symbol in library\n"
 
-#: ../src/o_embed.c:58
+#: src/o_embed.c:58
 #, c-format
 msgid "Component [%s] has been embedded\n"
 msgstr "Component [%s] has been embedded\n"
 
-#. symbol not found in the symbol library: signal an error
-#: ../src/o_embed.c:98
+#: src/o_embed.c:98
 #, c-format
 msgid ""
 "Could not find component [%s], while trying to unembed. Component is still "
@@ -485,100 +471,100 @@ msgstr ""
 "Could not find component [%s], while trying to unembed. Component is still "
 "embedded\n"
 
-#: ../src/o_embed.c:106
+#: src/o_embed.c:106
 #, c-format
 msgid "Component [%s] has been successfully unembedded\n"
 msgstr "Component [%s] has been successfully unembedded\n"
 
-#: ../src/o_line_basic.c:264
+#: src/o_line_basic.c:264
 #, c-format
 msgid "Found a zero length line [ %c %d %d %d %d %d ]\n"
 msgstr "Found a zero length line [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_net_basic.c:170
+#: src/o_net_basic.c:170
 #, c-format
 msgid "Found a zero length net [ %c %d %d %d %d %d ]\n"
 msgstr "Found a zero length net [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:80
+#: src/o_picture.c:80
 #, c-format
 msgid "Error reading picture definition line: %s.\n"
 msgstr "Error reading picture definition line: %s.\n"
 
-#: ../src/o_picture.c:94
+#: src/o_picture.c:94
 #, c-format
 msgid "Found a zero width/height picture [ %c %d %d %d %d ]\n"
 msgstr "Found a zero width/height picture [ %c %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:99
+#: src/o_picture.c:99
 #, c-format
 msgid "Found a picture with a wrong 'mirrored' parameter: %c.\n"
 msgstr "Found a picture with a wrong 'mirrored' parameter: %c.\n"
 
-#: ../src/o_picture.c:101
+#: src/o_picture.c:101
 msgid "Setting mirrored to 0\n"
 msgstr "Setting mirrored to 0\n"
 
-#: ../src/o_picture.c:106
+#: src/o_picture.c:106
 #, c-format
 msgid "Found a picture with a wrong 'embedded' parameter: %c.\n"
 msgstr "Found a picture with a wrong 'embedded' parameter: %c.\n"
 
-#: ../src/o_picture.c:108
+#: src/o_picture.c:108
 msgid "Setting embedded to 0\n"
 msgstr "Setting embedded to 0\n"
 
-#: ../src/o_picture.c:120
+#: src/o_picture.c:120
 #, c-format
 msgid "Found an unsupported picture angle [ %d ]\n"
 msgstr "Found an unsupported picture angle [ %d ]\n"
 
-#: ../src/o_picture.c:121 ../src/o_text_basic.c:1127
+#: src/o_picture.c:121 src/o_text_basic.c:1127
 msgid "Setting angle to 0\n"
 msgstr "Setting angle to 0\n"
 
-#: ../src/o_picture.c:156 ../src/o_picture.c:167 ../src/o_picture.c:924
+#: src/o_picture.c:156 src/o_picture.c:167 src/o_picture.c:924
 #, c-format
 msgid "Failed to load image from embedded data [%s]: %s\n"
 msgstr "Failed to load image from embedded data [%s]: %s\n"
 
-#: ../src/o_picture.c:157
+#: src/o_picture.c:157
 msgid "Base64 decoding failed."
 msgstr "Base64 decoding failed."
 
-#: ../src/o_picture.c:158 ../src/o_picture.c:169 ../src/o_picture.c:926
+#: src/o_picture.c:158 src/o_picture.c:169 src/o_picture.c:926
 msgid "Falling back to file loading. Picture unembedded.\n"
 msgstr "Falling back to file loading. Picture unembedded.\n"
 
-#: ../src/o_picture.c:180 ../src/o_picture.c:912 ../src/o_picture.c:961
+#: src/o_picture.c:180 src/o_picture.c:912 src/o_picture.c:961
 #, c-format
 msgid "Failed to load image from file [%s]: %s\n"
 msgstr "Failed to load image from file [%s]: %s\n"
 
-#: ../src/o_picture.c:191
+#: src/o_picture.c:191
 msgid "Loading warning picture.\n"
 msgstr "Loading warning picture.\n"
 
-#: ../src/o_picture.c:197
+#: src/o_picture.c:197
 #, c-format
 msgid "Error loading picture from file: %s.\n"
 msgstr "Error loading picture from file: %s.\n"
 
-#: ../src/o_picture.c:257
+#: src/o_picture.c:257
 msgid "ERROR: o_picture_save: unable to encode the picture.\n"
 msgstr "ERROR: o_picture_save: unable to encode the picture.\n"
 
-#: ../src/o_picture.c:939
+#: src/o_picture.c:939
 #, c-format
 msgid "Picture [%s] has been embedded\n"
 msgstr "Picture [%s] has been embedded\n"
 
-#: ../src/o_picture.c:979
+#: src/o_picture.c:979
 #, c-format
 msgid "Picture [%s] has been unembedded\n"
 msgstr "Picture [%s] has been unembedded\n"
 
-#: ../src/o_pin_basic.c:180
+#: src/o_pin_basic.c:180
 msgid ""
 "Found a pin which did not have the whichone field set.\n"
 "Verify and correct manually.\n"
@@ -586,66 +572,66 @@ msgstr ""
 "Found a pin which did not have the whichone field set.\n"
 "Verify and correct manually.\n"
 
-#: ../src/o_pin_basic.c:183
+#: src/o_pin_basic.c:183
 #, c-format
 msgid "Found an invalid whichend on a pin (reseting to zero): %d\n"
 msgstr "Found an invalid whichend on a pin (reseting to zero): %d\n"
 
-#: ../src/o_pin_basic.c:189
+#: src/o_pin_basic.c:189
 #, c-format
 msgid "Found a zero length pin: [ %s ]\n"
 msgstr "Found a zero length pin: [ %s ]\n"
 
-#: ../src/o_text_basic.c:303
+#: src/o_text_basic.c:303
 #, c-format
 msgid "Could not find character '%s' definition.\n"
 msgstr "Could not find character '%s' definition.\n"
 
-#: ../src/o_text_basic.c:308
+#: src/o_text_basic.c:308
 #, c-format
 msgid "Could not load question font char -- check font-directory keyword\n"
 msgstr "Could not load question font char -- check font-directory keyword\n"
 
-#: ../src/o_text_basic.c:1113
+#: src/o_text_basic.c:1113
 #, c-format
 msgid "Found a zero size text string [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr "Found a zero size text string [ %c %d %d %d %d %d %d %d %d ]\n"
 
-#: ../src/o_text_basic.c:1125
+#: src/o_text_basic.c:1125
 #, c-format
 msgid "Found an unsupported text angle [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr "Found an unsupported text angle [ %c %d %d %d %d %d %d %d %d ]\n"
 
-#: ../src/o_text_basic.c:1147
+#: src/o_text_basic.c:1147
 #, c-format
 msgid "Found an unsupported text alignment [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr "Found an unsupported text alignment [ %c %d %d %d %d %d %d %d %d ]\n"
 
-#: ../src/o_text_basic.c:1149
+#: src/o_text_basic.c:1149
 msgid "Setting alignment to LOWER_LEFT\n"
 msgstr "Setting alignment to LOWER_LEFT\n"
 
-#: ../src/o_text_basic.c:1238
+#: src/o_text_basic.c:1238
 #, c-format
 msgid "Failed to validate utf-8 character in font definition: \"%s\".\n"
 msgstr "Failed to validate utf-8 character in font definition: \"%s\".\n"
 
-#: ../src/s_clib.c:464
+#: src/s_clib.c:464
 #, c-format
 msgid "Library command failed [%s]: %s\n"
 msgstr "Library command failed [%s]: %s\n"
 
-#: ../src/s_clib.c:469
+#: src/s_clib.c:469
 #, c-format
 msgid "Library command failed [%s]: Uncaught signal %i.\n"
 msgstr "Library command failed [%s]: Uncaught signal %i.\n"
 
-#: ../src/s_clib.c:473
+#: src/s_clib.c:473
 #, c-format
 msgid "Library command failed [%s]\n"
 msgstr "Library command failed [%s]\n"
 
-#: ../src/s_clib.c:474
+#: src/s_clib.c:474
 #, c-format
 msgid ""
 "Error output was:\n"
@@ -654,80 +640,79 @@ msgstr ""
 "Error output was:\n"
 "%s\n"
 
-#: ../src/s_clib.c:560
+#: src/s_clib.c:560
 #, c-format
 msgid "Library name [%s] already in use.  Using [%s].\n"
 msgstr "Library name [%s] already in use.  Using [%s].\n"
 
-#: ../src/s_clib.c:597
+#: src/s_clib.c:597
 #, c-format
 msgid "Failed to open directory [%s]: %s\n"
 msgstr "Failed to open directory [%s]: %s\n"
 
-#: ../src/s_clib.c:732
+#: src/s_clib.c:732
 #, c-format
 msgid "Failed to scan library [%s]: Scheme function returned non-list\n"
 msgstr "Failed to scan library [%s]: Scheme function returned non-list\n"
 
-#: ../src/s_clib.c:740
+#: src/s_clib.c:740
 #, c-format
 msgid "Non-string symbol name while scanning library [%s]\n"
 msgstr "Non-string symbol name while scanning library [%s]\n"
 
-#: ../src/s_clib.c:895 ../src/s_clib.c:942
+#: src/s_clib.c:895 src/s_clib.c:942
 msgid "Cannot add library: name not specified\n"
 msgstr "Cannot add library: name not specified\n"
 
-#: ../src/s_clib.c:902
+#: src/s_clib.c:902
 #, c-format
 msgid ""
 "Cannot add library [%s]: both 'list' and 'get' commands must be specified.\n"
 msgstr ""
 "Cannot add library [%s]: both 'list' and 'get' commands must be specified.\n"
 
-#: ../src/s_clib.c:950
+#: src/s_clib.c:950
 #, c-format
 msgid "Cannot add Scheme-library [%s]: callbacks must be closures\n"
 msgstr "Cannot add Scheme-library [%s]: callbacks must be closures\n"
 
-#: ../src/s_clib.c:1077
+#: src/s_clib.c:1077
 #, c-format
 msgid "Failed to load symbol from file [%s]: %s\n"
 msgstr "Failed to load symbol from file [%s]: %s\n"
 
-#: ../src/s_clib.c:1135
+#: src/s_clib.c:1135
 #, c-format
 msgid "Failed to load symbol data [%s] from source [%s]\n"
 msgstr "Failed to load symbol data [%s] from source [%s]\n"
 
-#: ../src/s_clib.c:1376
+#: src/s_clib.c:1360
 #, c-format
 msgid "Component [%s] was not found in the component library\n"
 msgstr "Component [%s] was not found in the component library\n"
 
-#. More than one symbol
-#: ../src/s_clib.c:1382
+#: src/s_clib.c:1366
 #, c-format
 msgid "More than one component found with name [%s]\n"
 msgstr "More than one component found with name [%s]\n"
 
-#: ../src/s_color.c:206
+#: src/s_color.c:206
 msgid "Color index out of range"
 msgstr "Colour index out of range"
 
-#: ../src/s_color.c:261
+#: src/s_color.c:261
 msgid "Color map entry must be a two-element list"
 msgstr "Colour map entry must be a two-element list"
 
-#: ../src/s_color.c:269
+#: src/s_color.c:269
 msgid "Index in color map entry must be an integer"
 msgstr "Index in colour map entry must be an integer"
 
-#: ../src/s_color.c:295
+#: src/s_color.c:295
 msgid "Value in color map entry must be #f or a string"
 msgstr "Value in colour map entry must be #f or a string"
 
-#: ../src/s_hierarchy.c:90
+#: src/s_hierarchy.c:90
 #, c-format
 msgid ""
 "hierarchy loop detected while visiting page:\n"
@@ -736,42 +721,41 @@ msgstr ""
 "hierarchy loop detected while visiting page:\n"
 "  \"%s\"\n"
 
-#: ../src/s_hierarchy.c:185
+#: src/s_hierarchy.c:185
 msgid "There are no schematics above the current one!\n"
 msgstr "There are no schematics above the current one!\n"
 
-#: ../src/s_hierarchy.c:266
+#: src/s_hierarchy.c:266
 #, c-format
 msgid "ERROR in s_hierarchy_traverse: schematic not found: %s\n"
 msgstr "ERROR in s_hierarchy_traverse: schematic not found: %s\n"
 
-#: ../src/s_page.c:167
+#: src/s_page.c:167
 #, c-format
 msgid "s_page_delete: Can't get the real filename of %s."
 msgstr "s_page_delete: Can't get the real filename of %s."
 
-#: ../src/s_page.c:178
+#: src/s_page.c:178
 #, c-format
 msgid "s_page_delete: Unable to delete backup file %s."
 msgstr "s_page_delete: Unable to delete backup file %s."
 
-#: ../src/s_page.c:380
+#: src/s_page.c:380
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Saved [%s]\n"
 
-#: ../src/s_page.c:386
+#: src/s_page.c:386
 #, c-format
 msgid "Could NOT save [%s]\n"
 msgstr "Could NOT save [%s]\n"
 
-#. return type
-#: ../src/s_slib.c:181
+#: src/s_slib.c:181
 #, c-format
 msgid "Found [%s]\n"
 msgstr "Found [%s]\n"
 
-#: ../src/s_slib.c:191
+#: src/s_slib.c:191
 #, c-format
 msgid "Could not find [%s] in any SourceLibrary\n"
 msgstr "Could not find [%s] in any SourceLibrary\n"
diff --git a/libgeda/po/es.po b/libgeda/po/es.po
index c660bce..0f881f8 100644
--- a/libgeda/po/es.po
+++ b/libgeda/po/es.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgeda\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 14:35-0400\n"
+"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
+"POT-Creation-Date: 2009-06-18 11:49+0100\n"
 "PO-Revision-Date: 2008-12-21 21:07+0100\n"
 "Last-Translator: Carlos Nieves Ã?nega <cnieves@xxxxxxxxxx>\n"
 "Language-Team: geda-dev <geda-dev@xxxxxxxx>\n"
@@ -16,45 +16,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/libgeda.xml.in.h:1
+#: data/libgeda.xml.in.h:3
 msgid "gEDA circuit schematic"
 msgstr "Esquema de circuito gEDA"
 
-#: ../data/libgeda.xml.in.h:2
-msgid "gEDA gsch2pcb project"
-msgstr "Proyecto de gEDA gsch2pcb"
-
-#: ../data/libgeda.xml.in.h:3
+#: data/libgeda.xml.in.h:4
 msgid "gEDA schematic symbol"
 msgstr "Símbolo de esquema gEDA"
 
-#: ../data/x-geda-gsch2pcb-project.desktop.in.h:1
+#: data/libgeda.xml.in.h:5
+msgid "gEDA gsch2pcb project"
+msgstr "Proyecto de gEDA gsch2pcb"
+
+#: data/x-geda-gsch2pcb-project.desktop.in.h:3
 msgid "gEDA Gsch2pcb Project"
 msgstr "Proyecto gEDA Gsch2pcb"
 
-#: ../data/x-geda-schematic.desktop.in.h:1
+#: data/x-geda-schematic.desktop.in.h:3
 msgid "gEDA Circuit Schematic"
 msgstr "Esquema de circuito gEDA"
 
-#: ../data/x-geda-symbol.desktop.in.h:1
+#: data/x-geda-symbol.desktop.in.h:3
 msgid "gEDA Schematic Symbol"
 msgstr "Símbolo de esquema gEDA"
 
-#. ! \todo Maybe we can continue instead of just failing
-#. *  completely? In any case, failing gracefully is better
-#. *  than killing the program, which is what this used to
-#. *  do...
-#: ../src/a_basic.c:185
+#: src/a_basic.c:185
 #, c-format
 msgid "o_save_objects: object %p has unknown type '%c'\n"
 msgstr "o_save_objects: el objeto %p tiene un tipo '%c' desconocido\n"
 
-#: ../src/a_basic.c:235
+#: src/a_basic.c:235
 #, c-format
 msgid "o_save: Could not open [%s]\n"
 msgstr "o_save: No se puede abrir [%s]\n"
 
-#: ../src/a_basic.c:440
+#: src/a_basic.c:440
 #, c-format
 msgid ""
 "Read unexpected embedded symbol start marker in [%s] :\n"
@@ -65,7 +61,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/a_basic.c:469
+#: src/a_basic.c:469
 #, c-format
 msgid ""
 "Read unexpected embedded symbol end marker in [%s] :\n"
@@ -76,7 +72,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/a_basic.c:498
+#: src/a_basic.c:498
 #, c-format
 msgid ""
 "Read an old format sym/sch file!\n"
@@ -87,7 +83,7 @@ msgstr ""
 "Por favor ejecute: g[sym|sch]update en: \n"
 "[%s]\n"
 
-#: ../src/a_basic.c:504
+#: src/a_basic.c:504
 #, c-format
 msgid ""
 "Read garbage in [%s] :\n"
@@ -98,17 +94,17 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/f_basic.c:123 ../src/f_basic.c:136
+#: src/f_basic.c:123 src/f_basic.c:136
 #, c-format
 msgid "Failed to stat [%s]: %s"
 msgstr "No se ha podido determinar [%s]: %s"
 
-#: ../src/f_basic.c:219
+#: src/f_basic.c:219
 #, c-format
 msgid "Cannot find file %s: %s"
 msgstr "No se puede encontrar el archivo %s: %s"
 
-#: ../src/f_basic.c:257
+#: src/f_basic.c:257
 #, c-format
 msgid ""
 "\n"
@@ -121,13 +117,13 @@ msgstr ""
 "  %s.\n"
 "\n"
 
-#: ../src/f_basic.c:259
+#: src/f_basic.c:259
 msgid "I could not guess if it is newer, so you have to do it manually.\n"
 msgstr ""
 "No se ha podido averiguar si es más reciente, así que lo tendrá que hacer "
 "usted manualmente.\n"
 
-#: ../src/f_basic.c:261
+#: src/f_basic.c:261
 msgid ""
 "The backup copy is newer than the schematic, so it seems you should load it "
 "instead of the original file.\n"
@@ -135,7 +131,7 @@ msgstr ""
 "La copia de seguridad es más reciente que el esquema. Parece que debería "
 "cargar la copia de seguridad en vez del archivo original.\n"
 
-#: ../src/f_basic.c:263
+#: src/f_basic.c:263
 msgid ""
 "Gschem usually makes backup copies automatically, and this situation happens "
 "when it crashed or it was forced to exit abruptly.\n"
@@ -143,7 +139,7 @@ msgstr ""
 "Gschem normalmente realiza copias de seguridad automáticamente y esta "
 "situaciónocurre cuando ha fallado o se ha forzado una salida abrupta.\n"
 
-#: ../src/f_basic.c:266
+#: src/f_basic.c:266
 msgid ""
 "\n"
 "Run gschem and correct the situation.\n"
@@ -153,154 +149,149 @@ msgstr ""
 "Ejecute gschem y corrija la situación.\n"
 "\n"
 
-#: ../src/f_basic.c:375
+#: src/f_basic.c:375
 #, c-format
 msgid "Can't get the real filename of %s."
 msgstr "No se puede averiguar el nombre real del archivo %s."
 
-#: ../src/f_basic.c:395
+#: src/f_basic.c:395
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr ""
 "No se ha podido poner el archivo de copia de seguridad anterior [%s] en modo "
 "de lectura-escritura\n"
 
-#: ../src/f_basic.c:401
+#: src/f_basic.c:401
 #, c-format
 msgid "Can't save backup file: %s."
 msgstr "No se puede guardar la copia de seguridad: %s"
 
-#: ../src/f_basic.c:411
+#: src/f_basic.c:411
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr ""
 "No se ha podido poner el archivo de copia de seguridad [%s] en modo de sólo "
 "lectura\n"
 
-#: ../src/f_basic.c:700
+#: src/f_basic.c:700
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../src/f_print.c:117
+#: src/f_print.c:117
 msgid "Unable to get time of day in f_print_header()\n"
 msgstr "Imposible obtener la hora en f_print_header()\n"
 
-#: ../src/f_print.c:159
+#: src/f_print.c:159
 #, c-format
 msgid "Unable to open the prolog file `%s' for reading in f_print_header()\n"
 msgstr ""
 "Imposible abrir el archivo de prólogo '%s' para lectura en f_print_header()\n"
 
-#: ../src/f_print.c:176
+#: src/f_print.c:176
 #, c-format
 msgid "Error during reading of the prolog file `%s' in f_print_header()\n"
 msgstr "Error al leer el archivo de prólogo '%s' en f_print_header()\n"
 
-#: ../src/f_print.c:182
+#: src/f_print.c:182
 msgid ""
 "Error during writing of the output postscript file in f_print_header()\n"
 msgstr ""
 "Error al escribir el archivo postscript de salida en f_print_header()\n"
 
-#: ../src/f_print.c:195
+#: src/f_print.c:195
 msgid "Giving up on printing\n"
 msgstr "Se desiste continuar con la impresión\n"
 
-#: ../src/f_print.c:390
+#: src/f_print.c:390
 #, c-format
 msgid "Could not open [%s] for printing\n"
 msgstr "No se puede abrir [%s] para impresión\n"
 
-#: ../src/f_print.c:423
+#: src/f_print.c:423
 #, c-format
 msgid "Could not execute command [%s] for printing\n"
 msgstr "No se puede ejecutar el comando [%s] para impresión\n"
 
-#: ../src/f_print.c:698
+#: src/f_print.c:698
 msgid "Too many UTF-8 characters, cannot print\n"
 msgstr "Demasiados caracteres UTF-8, no se puede imprimir\n"
 
-#: ../src/g_basic.c:109
+#: src/g_basic.c:101
 #, c-format
 msgid "%s:%i:%i: %s\n"
 msgstr "%s:%i:%i: %s\n"
 
-#: ../src/g_basic.c:116
+#: src/g_basic.c:108
 #, c-format
 msgid "Unknown file: %s\n"
 msgstr "Archivo desconocido: %s\n"
 
-#. No stack, so can't display debugging info
-#: ../src/g_basic.c:122
+#: src/g_basic.c:114
 #, c-format
 msgid "Evaluation failed: %s\n"
 msgstr "Ha fallado la evaluación de: %s\n"
 
-#: ../src/g_basic.c:123
+#: src/g_basic.c:115
 msgid "Enable debugging for more detailed information\n"
 msgstr "Habilitar la depuración para ver información más detallada\n"
 
-#: ../src/g_basic.c:284
+#: src/g_basic.c:258
 #, c-format
 msgid "Could not find [%s] for interpretation\n"
 msgstr "No se puede encontrar [%s] para interpretar\n"
 
-#. We've already read this one in.
-#: ../src/g_rc.c:136
+#: src/g_rc.c:136
 #, c-format
 msgid "RC file [%s] already read in.\n"
 msgstr "El archivo RC [%s] ya ha sido leído.\n"
 
-#: ../src/g_rc.c:181
+#: src/g_rc.c:181
 #, fuzzy, c-format
 msgid "Read system config file [%%s]\n"
 msgstr "Leído archivo system-%s [%%s]\n"
 
-#: ../src/g_rc.c:182
+#: src/g_rc.c:182
 #, fuzzy, c-format
 msgid "Did not find required system config file [%%s]\n"
 msgstr "No se ha encontrado el archivo imprescindible system-%s [%%s]\n"
 
-#: ../src/g_rc.c:216
+#: src/g_rc.c:216
 #, fuzzy, c-format
 msgid "Read user config file [%%s]\n"
 msgstr "Leído el archivo especificado %s [%%s]\n"
 
-#: ../src/g_rc.c:217
+#: src/g_rc.c:217
 #, fuzzy, c-format
 msgid "Did not find optional user config file [%%s]\n"
 msgstr "No se ha podido encontrar el archivo local %s [%%s]\n"
 
-#: ../src/g_rc.c:248
+#: src/g_rc.c:248
 #, fuzzy, c-format
 msgid "Read local config file [%%s]\n"
 msgstr "Leído el archivo local %s [%%s]\n"
 
-#: ../src/g_rc.c:249
+#: src/g_rc.c:249
 #, fuzzy, c-format
 msgid "Did not find optional local config file [%%s]\n"
 msgstr "No se ha podido encontrar el archivo local %s [%%s]\n"
 
-#: ../src/g_rc.c:286
+#: src/g_rc.c:286
 #, c-format
 msgid "Read specified %s file [%%s]\n"
 msgstr "Leído el archivo especificado %s [%%s]\n"
 
-#: ../src/g_rc.c:288
+#: src/g_rc.c:288
 #, c-format
 msgid "Did not find specified %s file [%%s]\n"
 msgstr "No se ha podido encontrar el archivo especificado %s [%%s]\n"
 
-#. ! \todo these two are basically the
-#. * same. Inefficient!
-#.
-#: ../src/g_rc.c:338
+#: src/g_rc.c:338
 #, c-format
 msgid "Could not find any %s file!\n"
 msgstr "¡No se puede encontrar ningún archivo %s!\n"
 
-#: ../src/g_rc.c:984
+#: src/g_rc.c:984
 msgid ""
 "WARNING: using a string for 'always-promote-attributes' is deprecated. Use a "
 "list of strings instead\n"
@@ -308,96 +299,92 @@ msgstr ""
 "ADVERTENCIA: el uso de la cadena 'always-promote-attributes' está obsoleto. "
 "Se recomienda utilizar una lista de cadenas en su lugar\n"
 
-#: ../src/o_arc_basic.c:282
+#: src/o_arc_basic.c:282
 #, c-format
 msgid "Found a zero radius arc [ %c %d, %d, %d, %d, %d, %d ]\n"
 msgstr ""
 "Se ha encontrado un arco con radio cero [ %c %d, %d, %d, %d, %d, %d ]\n"
 
-#: ../src/o_arc_basic.c:287 ../src/o_box_basic.c:301 ../src/o_bus_basic.c:188
-#: ../src/o_circle_basic.c:293 ../src/o_line_basic.c:269
-#: ../src/o_net_basic.c:180 ../src/o_path_basic.c:199 ../src/o_pin_basic.c:193
-#: ../src/o_text_basic.c:1155
+#: src/o_arc_basic.c:287 src/o_box_basic.c:301 src/o_bus_basic.c:188
+#: src/o_circle_basic.c:293 src/o_line_basic.c:269 src/o_net_basic.c:180
+#: src/o_path_basic.c:199 src/o_pin_basic.c:193 src/o_text_basic.c:1155
 #, c-format
 msgid "Found an invalid color [ %s ]\n"
 msgstr "Se ha encontrado un color no válido [%s]\n"
 
-#: ../src/o_arc_basic.c:288 ../src/o_box_basic.c:302 ../src/o_bus_basic.c:189
-#: ../src/o_circle_basic.c:294 ../src/o_line_basic.c:270
-#: ../src/o_net_basic.c:181 ../src/o_path_basic.c:200 ../src/o_pin_basic.c:194
-#: ../src/o_text_basic.c:1156
+#: src/o_arc_basic.c:288 src/o_box_basic.c:302 src/o_bus_basic.c:189
+#: src/o_circle_basic.c:294 src/o_line_basic.c:270 src/o_net_basic.c:181
+#: src/o_path_basic.c:200 src/o_pin_basic.c:194 src/o_text_basic.c:1156
 #, fuzzy
 msgid "Setting color to default color\n"
 msgstr "Seleccionando color BLANCO\n"
 
-#: ../src/o_attrib.c:191
+#: src/o_attrib.c:146
 msgid "Attempt to attach non text item as an attribute!\n"
 msgstr "¡Se ha intentado añadir un objeto que no es texto como un attributo!\n"
 
-#: ../src/o_attrib.c:196
+#: src/o_attrib.c:151
 #, c-format
 msgid "Attempt to attach attribute [%s] to more than one object\n"
 msgstr "Se ha intentado añadir el attributo [%s] a más de un objeto\n"
 
-#. only an error if there's a slot string
-#: ../src/o_attrib.c:1414 ../src/o_attrib.c:1514
+#: src/o_attrib.c:763
 msgid "Did not find slotdef=#:#,#,#... attribute\n"
 msgstr "No se ha encontrado un atributo slotdef=#:#,#,#...\n"
 
-#. Didn't find proper slotdef=#:... put warning into log
-#: ../src/o_attrib.c:1420
+#: src/o_attrib.c:769
 msgid "Improper slotdef syntax: missing \":\".\n"
 msgstr "Sintaxis de slotdef incorrecta: falta el carácter \":\".\n"
 
-#: ../src/o_attrib.c:1435 ../src/o_attrib.c:1533
+#: src/o_attrib.c:784
 msgid "Did not find proper slotdef=#:#,#,#... attribute\n"
 msgstr "No se ha encontrado un atributo válido slotdef=#:#,#,#...\n"
 
-#: ../src/o_attrib.c:1467 ../src/o_attrib.c:1562
+#: src/o_attrib.c:814
 msgid "component missing pinseq= attribute\n"
 msgstr "El componente no tiene el atributo pinseq\n"
 
-#: ../src/o_basic.c:199 ../src/o_basic.c:211
+#: src/o_basic.c:199 src/o_basic.c:211
 msgid "Invalid space specified, setting to 100\n"
 msgstr "Se ha especificado un espaciado no válido, se corrige a 100\n"
 
-#: ../src/o_basic.c:207
+#: src/o_basic.c:207
 msgid "Invalid length specified, setting to 100\n"
 msgstr "Se ha especificado una longitud no válida, se corrige a 100\n"
 
-#: ../src/o_box_basic.c:296
+#: src/o_box_basic.c:296
 #, c-format
 msgid "Found a zero width/height box [ %c %d %d %d %d %d ]\n"
 msgstr ""
 "Se ha encontrado un rectángulo con altura o anchura cero [ %c %d %d %d %d %"
 "d ]\n"
 
-#: ../src/o_bus_basic.c:179
+#: src/o_bus_basic.c:179
 #, c-format
 msgid "Found a zero length bus [ %c %d %d %d %d %d ]\n"
 msgstr "Se ha encontrado un bus de longitud cero [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_bus_basic.c:194
+#: src/o_bus_basic.c:194
 #, c-format
 msgid "Found an invalid bus ripper direction [ %s ]\n"
 msgstr ""
 "Se ha encontrado una dirección del símbolo de extracción de bus no válida [ %"
 "s ]\n"
 
-#: ../src/o_bus_basic.c:195
+#: src/o_bus_basic.c:195
 msgid "Resetting direction to neutral (no direction)\n"
 msgstr "Cambiando la dirección al valor por defecto neutro (sin dirección)\n"
 
-#: ../src/o_circle_basic.c:204
+#: src/o_circle_basic.c:204
 msgid "Null radius circles are not allowed\n"
 msgstr "No se permiten círculos con radio cero\n"
 
-#: ../src/o_circle_basic.c:287
+#: src/o_circle_basic.c:287
 #, c-format
 msgid "Found a zero radius circle [ %c %d %d %d %d ]\n"
 msgstr "Se ha encontrado un círculo con radio cero [ %c %d %d %d %d ]\n"
 
-#: ../src/o_complex_basic.c:489
+#: src/o_complex_basic.c:457
 #, c-format
 msgid ""
 "Component not found:\n"
@@ -406,14 +393,14 @@ msgstr ""
 "No se ha encontrado el componente:\n"
 " %s"
 
-#: ../src/o_complex_basic.c:703
+#: src/o_complex_basic.c:671
 #, c-format
 msgid "Found a component with an invalid rotation [ %c %d %d %d %d %d %s ]\n"
 msgstr ""
 "Se ha encontrado un componente con un ángulo de rotación no válido [ %c %d %"
 "d %d %d %d %s ]\n"
 
-#: ../src/o_complex_basic.c:715
+#: src/o_complex_basic.c:683
 #, c-format
 msgid ""
 "Found a component with an invalid mirror flag [ %c %d %d %d %d %d %s ]\n"
@@ -421,7 +408,7 @@ msgstr ""
 "Se ha encontrado un componente con un atributo de simetría no válido [ %c %d "
 "%d %d %d %d %s ]\n"
 
-#: ../src/o_complex_basic.c:1416
+#: src/o_complex_basic.c:1307
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -430,7 +417,7 @@ msgstr ""
 "ADVERTENCIA: Error al obtener la versión de símbolo en la referencia %s:\n"
 "\tNo se ha podido procesar el atributo de versión de archivo symversion=%s\n"
 
-#: ../src/o_complex_basic.c:1420
+#: src/o_complex_basic.c:1311
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -439,7 +426,7 @@ msgstr ""
 "ADVERTENCIA: Error al obtener la versión de símbolo en la referencia %s:\n"
 "\tNo se ha podido procesar el atributo de versión de archivo symversion=\n"
 
-#: ../src/o_complex_basic.c:1436
+#: src/o_complex_basic.c:1327
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -448,7 +435,7 @@ msgstr ""
 "ADVERTENCIA: Error al obtener la versión de símbolo en la referencia %s:\n"
 "\tNo se ha podido procesar el atributo añadido symversion=%s\n"
 
-#: ../src/o_complex_basic.c:1461
+#: src/o_complex_basic.c:1352
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
@@ -460,7 +447,7 @@ msgstr ""
 "\tse ha añadido el atributo symversion=%s a la instancia del símbolo, pero "
 "no hay ningún atributo symversion= dentro del archivo del símbolo\n"
 
-#: ../src/o_complex_basic.c:1475
+#: src/o_complex_basic.c:1366
 #, c-format
 msgid ""
 "WARNING: Symbol version mismatch on refdes %s (%s):\n"
@@ -471,18 +458,18 @@ msgstr ""
 "\t El símbolo en la librería es más reciente que el instanciado en el "
 "esquema\n"
 
-#: ../src/o_complex_basic.c:1503
+#: src/o_complex_basic.c:1394
 #, c-format
 msgid "\tMAJOR VERSION CHANGE (file %.3f, instantiated %.3f, %s)!\n"
 msgstr ""
 "\t¡CAMBIO DE VERSI�N IMPORTANTE (archivo %.3f, instanciado %.3f, %s)!\n"
 
-#: ../src/o_complex_basic.c:1521
+#: src/o_complex_basic.c:1412
 #, c-format
 msgid "\tMinor version change (file %.3f, instantiated %.3f)\n"
 msgstr "\t Cambio menor en la versión (archivo %.3f, instanciado %.3f)\n"
 
-#: ../src/o_complex_basic.c:1532
+#: src/o_complex_basic.c:1423
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
@@ -492,13 +479,12 @@ msgstr ""
 "referencia %s:\n"
 "\tEl símbolo instanciado es más reciente que el símbolo en la librería\n"
 
-#: ../src/o_embed.c:58
+#: src/o_embed.c:58
 #, c-format
 msgid "Component [%s] has been embedded\n"
 msgstr "Se ha incrustado el componente [%s]\n"
 
-#. symbol not found in the symbol library: signal an error
-#: ../src/o_embed.c:98
+#: src/o_embed.c:98
 #, c-format
 msgid ""
 "Could not find component [%s], while trying to unembed. Component is still "
@@ -507,105 +493,105 @@ msgstr ""
 "No se puede encontrar el componente [%s], al intentar desincrustarlo.El "
 "componente permanece todavía incrustado\n"
 
-#: ../src/o_embed.c:106
+#: src/o_embed.c:106
 #, c-format
 msgid "Component [%s] has been successfully unembedded\n"
 msgstr "Se ha desincrustado satisfactoriamente el componente [%s]\n"
 
-#: ../src/o_line_basic.c:264
+#: src/o_line_basic.c:264
 #, c-format
 msgid "Found a zero length line [ %c %d %d %d %d %d ]\n"
 msgstr "Se ha encontrado una línea con longitud cero [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_net_basic.c:170
+#: src/o_net_basic.c:170
 #, c-format
 msgid "Found a zero length net [ %c %d %d %d %d %d ]\n"
 msgstr ""
 "Se ha encontrado una conexión con longitud cero [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:80
+#: src/o_picture.c:80
 #, c-format
 msgid "Error reading picture definition line: %s.\n"
 msgstr "Error al leer la línea de definición de la imagen: %s\n"
 
-#: ../src/o_picture.c:94
+#: src/o_picture.c:94
 #, c-format
 msgid "Found a zero width/height picture [ %c %d %d %d %d ]\n"
 msgstr ""
 "Se ha encontrado una imagen con altura ó anchura cero [ %c %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:99
+#: src/o_picture.c:99
 #, c-format
 msgid "Found a picture with a wrong 'mirrored' parameter: %c.\n"
 msgstr ""
 "Se ha encontrado una imagen con el parámetro 'volteado' incorrecto: %c.\n"
 
-#: ../src/o_picture.c:101
+#: src/o_picture.c:101
 msgid "Setting mirrored to 0\n"
 msgstr "Cambiando el parámetro 'volteado' a 0\n"
 
-#: ../src/o_picture.c:106
+#: src/o_picture.c:106
 #, c-format
 msgid "Found a picture with a wrong 'embedded' parameter: %c.\n"
 msgstr ""
 "Se ha encontrado una imagen con el parámetro 'incrustado' incorrecto: %c.\n"
 
-#: ../src/o_picture.c:108
+#: src/o_picture.c:108
 msgid "Setting embedded to 0\n"
 msgstr "Cambiando el parámetro 'incrustado' a 0\n"
 
-#: ../src/o_picture.c:120
+#: src/o_picture.c:120
 #, c-format
 msgid "Found an unsupported picture angle [ %d ]\n"
 msgstr ""
 "Se ha encontrado una imagen con un ángulo de rotación no válido [ %d ]\n"
 
-#: ../src/o_picture.c:121 ../src/o_text_basic.c:1127
+#: src/o_picture.c:121 src/o_text_basic.c:1127
 msgid "Setting angle to 0\n"
 msgstr "Cambiando el parámetro 'ángulo' a 0\n"
 
-#: ../src/o_picture.c:156 ../src/o_picture.c:167 ../src/o_picture.c:924
+#: src/o_picture.c:156 src/o_picture.c:167 src/o_picture.c:924
 #, c-format
 msgid "Failed to load image from embedded data [%s]: %s\n"
 msgstr "Error al cargar imagen desde los datos embebidos [%s]: %s\n"
 
-#: ../src/o_picture.c:157
+#: src/o_picture.c:157
 msgid "Base64 decoding failed."
 msgstr "Ha fallado la decodificación Base64"
 
-#: ../src/o_picture.c:158 ../src/o_picture.c:169 ../src/o_picture.c:926
+#: src/o_picture.c:158 src/o_picture.c:169 src/o_picture.c:926
 msgid "Falling back to file loading. Picture unembedded.\n"
 msgstr "Volviendo al modo de carga de archivo. Imagen desincrustada.\n"
 
-#: ../src/o_picture.c:180 ../src/o_picture.c:912 ../src/o_picture.c:961
+#: src/o_picture.c:180 src/o_picture.c:912 src/o_picture.c:961
 #, c-format
 msgid "Failed to load image from file [%s]: %s\n"
 msgstr "Error al cargar imagen desde el archivo [%s]: %s\n"
 
-#: ../src/o_picture.c:191
+#: src/o_picture.c:191
 msgid "Loading warning picture.\n"
 msgstr "Cargando imagen de advertencia.\n"
 
-#: ../src/o_picture.c:197
+#: src/o_picture.c:197
 #, c-format
 msgid "Error loading picture from file: %s.\n"
 msgstr "Error al cargar la imagen desde el fichero: %s\n"
 
-#: ../src/o_picture.c:257
+#: src/o_picture.c:257
 msgid "ERROR: o_picture_save: unable to encode the picture.\n"
 msgstr "ERROR: o_picture_save: imposible codificar la imagen.\n"
 
-#: ../src/o_picture.c:939
+#: src/o_picture.c:939
 #, c-format
 msgid "Picture [%s] has been embedded\n"
 msgstr "Se ha incrustado la imagen [%s]\n"
 
-#: ../src/o_picture.c:979
+#: src/o_picture.c:979
 #, c-format
 msgid "Picture [%s] has been unembedded\n"
 msgstr "Se ha desincrustado la imagen [%s]\n"
 
-#: ../src/o_pin_basic.c:180
+#: src/o_pin_basic.c:180
 msgid ""
 "Found a pin which did not have the whichone field set.\n"
 "Verify and correct manually.\n"
@@ -613,75 +599,75 @@ msgstr ""
 "Se ha encontrado una pata que no tiene el campo 'whichone'.\n"
 "Por favor, compruébelo y corríjalo manualmente.\n"
 
-#: ../src/o_pin_basic.c:183
+#: src/o_pin_basic.c:183
 #, c-format
 msgid "Found an invalid whichend on a pin (reseting to zero): %d\n"
 msgstr ""
 "Se ha encontrado un parámetro 'whichone' en una pata (y se cambia a 0): %d\n"
 
-#: ../src/o_pin_basic.c:189
+#: src/o_pin_basic.c:189
 #, c-format
 msgid "Found a zero length pin: [ %s ]\n"
 msgstr "Se ha encontrado una pata con longitud cero [ %s ]\n"
 
-#: ../src/o_text_basic.c:303
+#: src/o_text_basic.c:303
 #, c-format
 msgid "Could not find character '%s' definition.\n"
 msgstr "No se puede encontrar la definición del carácter '%s'.\n"
 
-#: ../src/o_text_basic.c:308
+#: src/o_text_basic.c:308
 #, c-format
 msgid "Could not load question font char -- check font-directory keyword\n"
 msgstr ""
 "No se puede cargar el carácter de interrogación -- compruebe la variable "
 "font-directory\n"
 
-#: ../src/o_text_basic.c:1113
+#: src/o_text_basic.c:1113
 #, c-format
 msgid "Found a zero size text string [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr ""
 "Se ha encontrado un texto con tamaño cero [ %c %d %d %d %d %d %d %d %d ]\n"
 
-#: ../src/o_text_basic.c:1125
+#: src/o_text_basic.c:1125
 #, c-format
 msgid "Found an unsupported text angle [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr ""
 "Se ha encontrado un texto con ángulo no válido [ %c %d %d %d %d %d %d %d %"
 "d ]\n"
 
-#: ../src/o_text_basic.c:1147
+#: src/o_text_basic.c:1147
 #, c-format
 msgid "Found an unsupported text alignment [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr ""
 "Se ha encontrado un texto con alineamiento no válido [ %c %d %d %d %d %d %d %"
 "d %d ]\n"
 
-#: ../src/o_text_basic.c:1149
+#: src/o_text_basic.c:1149
 msgid "Setting alignment to LOWER_LEFT\n"
 msgstr "Cambiando el alineamiento a 'Abajo a la izquierda'\n"
 
-#: ../src/o_text_basic.c:1238
+#: src/o_text_basic.c:1238
 #, c-format
 msgid "Failed to validate utf-8 character in font definition: \"%s\".\n"
 msgstr ""
 "Error al comprobar el carácter utf-8 en la definición de la fuente: \"%s\".\n"
 
-#: ../src/s_clib.c:464
+#: src/s_clib.c:464
 #, c-format
 msgid "Library command failed [%s]: %s\n"
 msgstr "Un comando de librería ha fallado [%s]: %s\n"
 
-#: ../src/s_clib.c:469
+#: src/s_clib.c:469
 #, c-format
 msgid "Library command failed [%s]: Uncaught signal %i.\n"
 msgstr "Un comando de librería ha fallado [%s]: Señal no manejada %i.\n"
 
-#: ../src/s_clib.c:473
+#: src/s_clib.c:473
 #, c-format
 msgid "Library command failed [%s]\n"
 msgstr "Un comando de librería ha fallado [%s]\n"
 
-#: ../src/s_clib.c:474
+#: src/s_clib.c:474
 #, c-format
 msgid ""
 "Error output was:\n"
@@ -690,36 +676,36 @@ msgstr ""
 "La salida de error fue:\n"
 "%s\n"
 
-#: ../src/s_clib.c:560
+#: src/s_clib.c:560
 #, c-format
 msgid "Library name [%s] already in use.  Using [%s].\n"
 msgstr ""
 "Ya se está usando el nombre de la librería [%s]. Se usará [%s] en su lugar.\n"
 
-#: ../src/s_clib.c:597
+#: src/s_clib.c:597
 #, c-format
 msgid "Failed to open directory [%s]: %s\n"
 msgstr "Error al abrir la carpeta [%s]: %s\n"
 
-#: ../src/s_clib.c:732
+#: src/s_clib.c:732
 #, c-format
 msgid "Failed to scan library [%s]: Scheme function returned non-list\n"
 msgstr ""
 "Error al buscar en la librería [%s]: la función de Scheme devolvió algo que "
 "no es una lista\n"
 
-#: ../src/s_clib.c:740
+#: src/s_clib.c:740
 #, c-format
 msgid "Non-string symbol name while scanning library [%s]\n"
 msgstr ""
 "Se ha encontrado un nombre de símbolo que no es una cadena de texto al "
 "buscar en la librería [%s]\n"
 
-#: ../src/s_clib.c:895 ../src/s_clib.c:942
+#: src/s_clib.c:895 src/s_clib.c:942
 msgid "Cannot add library: name not specified\n"
 msgstr "No se puede añadir la librería: nombre sin especificar\n"
 
-#: ../src/s_clib.c:902
+#: src/s_clib.c:902
 #, c-format
 msgid ""
 "Cannot add library [%s]: both 'list' and 'get' commands must be specified.\n"
@@ -727,51 +713,50 @@ msgstr ""
 "No se puede añadir la librería [%s]: se tienen que especificar los comandos "
 "'list' y 'get'.\n"
 
-#: ../src/s_clib.c:950
+#: src/s_clib.c:950
 #, c-format
 msgid "Cannot add Scheme-library [%s]: callbacks must be closures\n"
 msgstr ""
 "No se puede añadir la librería de Scheme [%s]: las funciones de llamada "
 "deben ser cierres (closures)\n"
 
-#: ../src/s_clib.c:1077
+#: src/s_clib.c:1077
 #, c-format
 msgid "Failed to load symbol from file [%s]: %s\n"
 msgstr "Error al cargar símbolo desde el archivo [%s]: %s\n"
 
-#: ../src/s_clib.c:1135
+#: src/s_clib.c:1135
 #, c-format
 msgid "Failed to load symbol data [%s] from source [%s]\n"
 msgstr "Error al cargar los datos del símbolo [%s] desde la fuente [%s]\n"
 
-#: ../src/s_clib.c:1376
+#: src/s_clib.c:1360
 #, c-format
 msgid "Component [%s] was not found in the component library\n"
 msgstr "No se ha encontrado el componente [%s] en la librería de componentes\n"
 
-#. More than one symbol
-#: ../src/s_clib.c:1382
+#: src/s_clib.c:1366
 #, c-format
 msgid "More than one component found with name [%s]\n"
 msgstr "Se ha encontrado más de un componente con el nombre [%s]\n"
 
-#: ../src/s_color.c:206
+#: src/s_color.c:206
 msgid "Color index out of range"
 msgstr ""
 
-#: ../src/s_color.c:261
+#: src/s_color.c:261
 msgid "Color map entry must be a two-element list"
 msgstr ""
 
-#: ../src/s_color.c:269
+#: src/s_color.c:269
 msgid "Index in color map entry must be an integer"
 msgstr ""
 
-#: ../src/s_color.c:295
+#: src/s_color.c:295
 msgid "Value in color map entry must be #f or a string"
 msgstr ""
 
-#: ../src/s_hierarchy.c:90
+#: src/s_hierarchy.c:90
 #, c-format
 msgid ""
 "hierarchy loop detected while visiting page:\n"
@@ -780,43 +765,42 @@ msgstr ""
 "Se ha detectado un bucle de jerarquía al cargar la página:\n"
 "  \"%s\"\n"
 
-#: ../src/s_hierarchy.c:185
+#: src/s_hierarchy.c:185
 msgid "There are no schematics above the current one!\n"
 msgstr "¡No hay más esquemas en un nivel de jerarquía superior al actual!\n"
 
-#: ../src/s_hierarchy.c:266
+#: src/s_hierarchy.c:266
 #, c-format
 msgid "ERROR in s_hierarchy_traverse: schematic not found: %s\n"
 msgstr "ERROR: en s_hierarchy_traverse: no se encuentra el esquema %s\n"
 
-#: ../src/s_page.c:167
+#: src/s_page.c:167
 #, c-format
 msgid "s_page_delete: Can't get the real filename of %s."
 msgstr "s_page_delete: No se puede encontrar el nombre real del archivo %s."
 
-#: ../src/s_page.c:178
+#: src/s_page.c:178
 #, c-format
 msgid "s_page_delete: Unable to delete backup file %s."
 msgstr ""
 "s_page_delete: No se ha podido borrar el archivo de copia de seguridad %s."
 
-#: ../src/s_page.c:380
+#: src/s_page.c:380
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "Guardado [%s]\n"
 
-#: ../src/s_page.c:386
+#: src/s_page.c:386
 #, c-format
 msgid "Could NOT save [%s]\n"
 msgstr "No se ha podido guardar [%s]\n"
 
-#. return type
-#: ../src/s_slib.c:181
+#: src/s_slib.c:181
 #, c-format
 msgid "Found [%s]\n"
 msgstr "Encontrado [%s]\n"
 
-#: ../src/s_slib.c:191
+#: src/s_slib.c:191
 #, c-format
 msgid "Could not find [%s] in any SourceLibrary\n"
 msgstr "No se ha podido encontrar [%s] en ninguna librería fuente\n"
diff --git a/libgeda/po/nl.po b/libgeda/po/nl.po
index b2d5ccf..28d9139 100644
--- a/libgeda/po/nl.po
+++ b/libgeda/po/nl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgeda\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 14:35-0400\n"
+"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
+"POT-Creation-Date: 2009-06-18 11:49+0100\n"
 "PO-Revision-Date: 2009-01-02 08:04+0100\n"
 "Last-Translator: Bert Timmerman <bert.timmerman@xxxxxxxxx>\n"
 "Language-Team: geda-dev <geda-dev@xxxxxxxx>\n"
@@ -17,46 +17,42 @@ msgstr ""
 "X-Poedit-Language: Dutch\n"
 "X-Poedit-Country: NETHERLANDS\n"
 
-#: ../data/libgeda.xml.in.h:1
+#: data/libgeda.xml.in.h:3
 msgid "gEDA circuit schematic"
 msgstr "gEDA schakeling schema"
 
-#: ../data/libgeda.xml.in.h:2
-msgid "gEDA gsch2pcb project"
-msgstr "gEDA gsch2pcb project"
-
-#: ../data/libgeda.xml.in.h:3
+#: data/libgeda.xml.in.h:4
 msgid "gEDA schematic symbol"
 msgstr "gEDA schema symbool"
 
-#: ../data/x-geda-gsch2pcb-project.desktop.in.h:1
+#: data/libgeda.xml.in.h:5
+msgid "gEDA gsch2pcb project"
+msgstr "gEDA gsch2pcb project"
+
+#: data/x-geda-gsch2pcb-project.desktop.in.h:3
 msgid "gEDA Gsch2pcb Project"
 msgstr "gEDA Gsch2pcb Project"
 
-#: ../data/x-geda-schematic.desktop.in.h:1
+#: data/x-geda-schematic.desktop.in.h:3
 msgid "gEDA Circuit Schematic"
 msgstr "gEDA Schakeling Schema"
 
-#: ../data/x-geda-symbol.desktop.in.h:1
+#: data/x-geda-symbol.desktop.in.h:3
 msgid "gEDA Schematic Symbol"
 msgstr "gEDA Schema Symbool"
 
 # ! \todo Misschien kunnen wij doorgaan in plaats van compleet falen? In elk geval, gracieus falen is beter dan het programma om zeep helpen, wat gewoonlijk gebeurt zou zijn...
-#. ! \todo Maybe we can continue instead of just failing
-#. *  completely? In any case, failing gracefully is better
-#. *  than killing the program, which is what this used to
-#. *  do...
-#: ../src/a_basic.c:185
+#: src/a_basic.c:185
 #, c-format
 msgid "o_save_objects: object %p has unknown type '%c'\n"
 msgstr "o_save_objects: object %p heeft een onbekend type '%c'\n"
 
-#: ../src/a_basic.c:235
+#: src/a_basic.c:235
 #, c-format
 msgid "o_save: Could not open [%s]\n"
 msgstr "o_save: Kan [%s] niet openen\n"
 
-#: ../src/a_basic.c:440
+#: src/a_basic.c:440
 #, c-format
 msgid ""
 "Read unexpected embedded symbol start marker in [%s] :\n"
@@ -67,7 +63,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/a_basic.c:469
+#: src/a_basic.c:469
 #, c-format
 msgid ""
 "Read unexpected embedded symbol end marker in [%s] :\n"
@@ -78,7 +74,7 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/a_basic.c:498
+#: src/a_basic.c:498
 #, c-format
 msgid ""
 "Read an old format sym/sch file!\n"
@@ -89,7 +85,7 @@ msgstr ""
 "Voer g[sym|sch]update uit op:\n"
 "[%s]\n"
 
-#: ../src/a_basic.c:504
+#: src/a_basic.c:504
 #, c-format
 msgid ""
 "Read garbage in [%s] :\n"
@@ -100,17 +96,17 @@ msgstr ""
 ">>\n"
 "%s<<\n"
 
-#: ../src/f_basic.c:123 ../src/f_basic.c:136
+#: src/f_basic.c:123 src/f_basic.c:136
 #, c-format
 msgid "Failed to stat [%s]: %s"
 msgstr "Status niet gelukt [%s]: %s"
 
-#: ../src/f_basic.c:219
+#: src/f_basic.c:219
 #, c-format
 msgid "Cannot find file %s: %s"
 msgstr "Kan bestand %s niet vinden: %s"
 
-#: ../src/f_basic.c:257
+#: src/f_basic.c:257
 #, c-format
 msgid ""
 "\n"
@@ -123,11 +119,11 @@ msgstr ""
 " %s.\n"
 "\n"
 
-#: ../src/f_basic.c:259
+#: src/f_basic.c:259
 msgid "I could not guess if it is newer, so you have to do it manually.\n"
 msgstr "Ik kan niet raden of het nieuwer is, je moet het dus handmatig doen.\n"
 
-#: ../src/f_basic.c:261
+#: src/f_basic.c:261
 msgid ""
 "The backup copy is newer than the schematic, so it seems you should load it "
 "instead of the original file.\n"
@@ -135,7 +131,7 @@ msgstr ""
 "De reservekopie is nieuwer dan het schema, het lijkt erop dat je deze zou "
 "moeten laden in plaats van het orginele bestand.\n"
 
-#: ../src/f_basic.c:263
+#: src/f_basic.c:263
 msgid ""
 "Gschem usually makes backup copies automatically, and this situation happens "
 "when it crashed or it was forced to exit abruptly.\n"
@@ -144,7 +140,7 @@ msgstr ""
 "voor wanneer er een crash is of wanneer er een abrupte gedwongen beeindiging "
 "was.\n"
 
-#: ../src/f_basic.c:266
+#: src/f_basic.c:266
 msgid ""
 "\n"
 "Run gschem and correct the situation.\n"
@@ -154,246 +150,237 @@ msgstr ""
 "Voer gschem uit en corrigeer de situatie.\n"
 "\n"
 
-#: ../src/f_basic.c:375
+#: src/f_basic.c:375
 #, c-format
 msgid "Can't get the real filename of %s."
 msgstr "Kan de werkelijke bestandsnaam van %s niet krijgen."
 
-#: ../src/f_basic.c:395
+#: src/f_basic.c:395
 #, c-format
 msgid "Could NOT set previous backup file [%s] read-write\n"
 msgstr "Kan vorige reservekopie [%s] NIET op lezen-schrijven instellen\n"
 
-#: ../src/f_basic.c:401
+#: src/f_basic.c:401
 #, c-format
 msgid "Can't save backup file: %s."
 msgstr "Kan reservekopie niet opslaan: %s."
 
-#: ../src/f_basic.c:411
+#: src/f_basic.c:411
 #, c-format
 msgid "Could NOT set backup file [%s] readonly\n"
 msgstr "Kan reservekopie [%s] NIET op alleen-lezen instellen\n"
 
-#: ../src/f_basic.c:700
+#: src/f_basic.c:700
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../src/f_print.c:117
+#: src/f_print.c:117
 msgid "Unable to get time of day in f_print_header()\n"
 msgstr "Kan geen tijd van de dag krijgen in f_print_header()\n"
 
-#: ../src/f_print.c:159
+#: src/f_print.c:159
 #, c-format
 msgid "Unable to open the prolog file `%s' for reading in f_print_header()\n"
 msgstr ""
 "Kan het prolog bestand `%s' niet openen tijdens lezen in f_print_header()\n"
 
-#: ../src/f_print.c:176
+#: src/f_print.c:176
 #, c-format
 msgid "Error during reading of the prolog file `%s' in f_print_header()\n"
 msgstr "Fout tijdens het lezen van prolog bestand `%s' in f_print_header()\n"
 
-#: ../src/f_print.c:182
+#: src/f_print.c:182
 msgid ""
 "Error during writing of the output postscript file in f_print_header()\n"
 msgstr ""
 "Fout tijdens het schrijven van het postscript uitvoerbestand in "
 "f_print_header()\n"
 
-#: ../src/f_print.c:195
+#: src/f_print.c:195
 msgid "Giving up on printing\n"
 msgstr "Geef het afdrukken op\n"
 
-#: ../src/f_print.c:390
+#: src/f_print.c:390
 #, c-format
 msgid "Could not open [%s] for printing\n"
 msgstr "Kan [%s] niet openen voor afdrukken\n"
 
-#: ../src/f_print.c:423
+#: src/f_print.c:423
 #, c-format
 msgid "Could not execute command [%s] for printing\n"
 msgstr "Kan opdracht [%s] niet uitvoeren voor afdrukken\n"
 
-#: ../src/f_print.c:698
+#: src/f_print.c:698
 msgid "Too many UTF-8 characters, cannot print\n"
 msgstr "Te veel UTF-8 karakters, kan niet afdrukken\n"
 
-#: ../src/g_basic.c:109
+#: src/g_basic.c:101
 #, c-format
 msgid "%s:%i:%i: %s\n"
 msgstr "%s:%i:%i: %s\n"
 
-#: ../src/g_basic.c:116
+#: src/g_basic.c:108
 #, c-format
 msgid "Unknown file: %s\n"
 msgstr "Onbekend bestand: %s\n"
 
 # Geen stapel, kan geen fout informatie laten zien
-#. No stack, so can't display debugging info
-#: ../src/g_basic.c:122
+#: src/g_basic.c:114
 #, c-format
 msgid "Evaluation failed: %s\n"
 msgstr "Evaluatie faalt: %s\n"
 
-#: ../src/g_basic.c:123
+#: src/g_basic.c:115
 msgid "Enable debugging for more detailed information\n"
 msgstr "Schakel foutzoeken in voor meer gedetaileerde informatie\n"
 
-#: ../src/g_basic.c:284
+#: src/g_basic.c:258
 #, c-format
 msgid "Could not find [%s] for interpretation\n"
 msgstr "Kan [%s] niet vinden voor interpretatie\n"
 
 # We hebben deze al ingelezen.
-#. We've already read this one in.
-#: ../src/g_rc.c:136
+#: src/g_rc.c:136
 #, c-format
 msgid "RC file [%s] already read in.\n"
 msgstr "RC bestand [%s] is reeds ingelezen.\n"
 
-#: ../src/g_rc.c:181
+#: src/g_rc.c:181
 #, fuzzy, c-format
 msgid "Read system config file [%%s]\n"
 msgstr "Lees system-%s bestand [%%s]\n"
 
-#: ../src/g_rc.c:182
+#: src/g_rc.c:182
 #, fuzzy, c-format
 msgid "Did not find required system config file [%%s]\n"
 msgstr "Benodigde system-%s bestand is niet gevonden [%%s]\n"
 
-#: ../src/g_rc.c:216
+#: src/g_rc.c:216
 #, fuzzy, c-format
 msgid "Read user config file [%%s]\n"
 msgstr "Lees gespecificeerd %s bestand [%%s]\n"
 
-#: ../src/g_rc.c:217
+#: src/g_rc.c:217
 #, fuzzy, c-format
 msgid "Did not find optional user config file [%%s]\n"
 msgstr "Kan geen optioneel plaatselijk %s bestand [%%s] vinden\n"
 
-#: ../src/g_rc.c:248
+#: src/g_rc.c:248
 #, fuzzy, c-format
 msgid "Read local config file [%%s]\n"
 msgstr "Lees plaatselijk %s bestand [%%s]\n"
 
-#: ../src/g_rc.c:249
+#: src/g_rc.c:249
 #, fuzzy, c-format
 msgid "Did not find optional local config file [%%s]\n"
 msgstr "Kan geen optioneel plaatselijk %s bestand [%%s] vinden\n"
 
-#: ../src/g_rc.c:286
+#: src/g_rc.c:286
 #, c-format
 msgid "Read specified %s file [%%s]\n"
 msgstr "Lees gespecificeerd %s bestand [%%s]\n"
 
-#: ../src/g_rc.c:288
+#: src/g_rc.c:288
 #, c-format
 msgid "Did not find specified %s file [%%s]\n"
 msgstr "Kan geen gespecificeerd %s bestand [%%s] vinden\n"
 
 # ! \todo deze twee zijn eigenlijk het zelfde. inefficient!
-#. ! \todo these two are basically the
-#. * same. Inefficient!
-#.
-#: ../src/g_rc.c:338
+#: src/g_rc.c:338
 #, c-format
 msgid "Could not find any %s file!\n"
 msgstr "Kan geen enkel %s bestand vinden!\n"
 
-#: ../src/g_rc.c:984
+#: src/g_rc.c:984
 msgid ""
 "WARNING: using a string for 'always-promote-attributes' is deprecated. Use a "
 "list of strings instead\n"
 msgstr ""
 
-#: ../src/o_arc_basic.c:282
+#: src/o_arc_basic.c:282
 #, c-format
 msgid "Found a zero radius arc [ %c %d, %d, %d, %d, %d, %d ]\n"
 msgstr "Boog met een straal van nul gevonden [ %c %d, %d, %d, %d, %d, %d ]\n"
 
-#: ../src/o_arc_basic.c:287 ../src/o_box_basic.c:301 ../src/o_bus_basic.c:188
-#: ../src/o_circle_basic.c:293 ../src/o_line_basic.c:269
-#: ../src/o_net_basic.c:180 ../src/o_path_basic.c:199 ../src/o_pin_basic.c:193
-#: ../src/o_text_basic.c:1155
+#: src/o_arc_basic.c:287 src/o_box_basic.c:301 src/o_bus_basic.c:188
+#: src/o_circle_basic.c:293 src/o_line_basic.c:269 src/o_net_basic.c:180
+#: src/o_path_basic.c:199 src/o_pin_basic.c:193 src/o_text_basic.c:1155
 #, c-format
 msgid "Found an invalid color [ %s ]\n"
 msgstr "Ongeldige kleur [ %s ] gevonden\n"
 
-#: ../src/o_arc_basic.c:288 ../src/o_box_basic.c:302 ../src/o_bus_basic.c:189
-#: ../src/o_circle_basic.c:294 ../src/o_line_basic.c:270
-#: ../src/o_net_basic.c:181 ../src/o_path_basic.c:200 ../src/o_pin_basic.c:194
-#: ../src/o_text_basic.c:1156
+#: src/o_arc_basic.c:288 src/o_box_basic.c:302 src/o_bus_basic.c:189
+#: src/o_circle_basic.c:294 src/o_line_basic.c:270 src/o_net_basic.c:181
+#: src/o_path_basic.c:200 src/o_pin_basic.c:194 src/o_text_basic.c:1156
 #, fuzzy
 msgid "Setting color to default color\n"
 msgstr "Stel de kleur in op WIT \n"
 
-#: ../src/o_attrib.c:191
+#: src/o_attrib.c:146
 msgid "Attempt to attach non text item as an attribute!\n"
 msgstr "Probeerde een niet text item toe te voegen als een attribuut!\n"
 
-#: ../src/o_attrib.c:196
+#: src/o_attrib.c:151
 #, c-format
 msgid "Attempt to attach attribute [%s] to more than one object\n"
 msgstr "Probeerde attribuut [%s] aan meer dan een object toe te voegen\n"
 
-#. only an error if there's a slot string
-#: ../src/o_attrib.c:1414 ../src/o_attrib.c:1514
+#: src/o_attrib.c:763
 msgid "Did not find slotdef=#:#,#,#... attribute\n"
 msgstr "Kan slotdef=#:#,#,#... attribuut niet vinden\n"
 
 # Geen gebruikelijke slotdef=#:... gevonden, doe een waarschuwing in het log
-#. Didn't find proper slotdef=#:... put warning into log
-#: ../src/o_attrib.c:1420
+#: src/o_attrib.c:769
 msgid "Improper slotdef syntax: missing \":\".\n"
 msgstr "Ongewenst slotdef syntax: \":\" ontbreekt.\n"
 
-#: ../src/o_attrib.c:1435 ../src/o_attrib.c:1533
+#: src/o_attrib.c:784
 msgid "Did not find proper slotdef=#:#,#,#... attribute\n"
 msgstr "Kan het gewenste slotdef=#:#,#,#... attribuut niet vinden\n"
 
-#: ../src/o_attrib.c:1467 ../src/o_attrib.c:1562
+#: src/o_attrib.c:814
 msgid "component missing pinseq= attribute\n"
 msgstr "komponent mist het pinseq= attribuut\n"
 
-#: ../src/o_basic.c:199 ../src/o_basic.c:211
+#: src/o_basic.c:199 src/o_basic.c:211
 msgid "Invalid space specified, setting to 100\n"
 msgstr "Ongeldige ruimte gespecificeerd, ingesteld op 100\n"
 
-#: ../src/o_basic.c:207
+#: src/o_basic.c:207
 msgid "Invalid length specified, setting to 100\n"
 msgstr "Ongeldige lengte gespecificeerd, ingesteld op 100\n"
 
-#: ../src/o_box_basic.c:296
+#: src/o_box_basic.c:296
 #, c-format
 msgid "Found a zero width/height box [ %c %d %d %d %d %d ]\n"
 msgstr ""
 "Rechthoek met een breedte/hoogte van nul gevonden [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_bus_basic.c:179
+#: src/o_bus_basic.c:179
 #, c-format
 msgid "Found a zero length bus [ %c %d %d %d %d %d ]\n"
 msgstr "Bus met een lengte van nul gevonden [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_bus_basic.c:194
+#: src/o_bus_basic.c:194
 #, c-format
 msgid "Found an invalid bus ripper direction [ %s ]\n"
 msgstr "Ongeldige bus ripper richting gevonden [ %s ]\n"
 
-#: ../src/o_bus_basic.c:195
+#: src/o_bus_basic.c:195
 msgid "Resetting direction to neutral (no direction)\n"
 msgstr "Neutrale richting ingesteld (geen richting)\n"
 
-#: ../src/o_circle_basic.c:204
+#: src/o_circle_basic.c:204
 msgid "Null radius circles are not allowed\n"
 msgstr "Cirkels met een radius van nul zijn niet toegestaan\n"
 
-#: ../src/o_circle_basic.c:287
+#: src/o_circle_basic.c:287
 #, c-format
 msgid "Found a zero radius circle [ %c %d %d %d %d ]\n"
 msgstr "Een cirkel met een radius van nul gevonden [ %c %d %d %d %d ]\n"
 
-#: ../src/o_complex_basic.c:489
+#: src/o_complex_basic.c:457
 #, c-format
 msgid ""
 "Component not found:\n"
@@ -402,13 +389,13 @@ msgstr ""
 "Komponent niet gevonden:\n"
 " %s"
 
-#: ../src/o_complex_basic.c:703
+#: src/o_complex_basic.c:671
 #, c-format
 msgid "Found a component with an invalid rotation [ %c %d %d %d %d %d %s ]\n"
 msgstr ""
 "Een komponent met een ongeldige rotatie gevonden [ %c %d %d %d %d %d %s ]\n"
 
-#: ../src/o_complex_basic.c:715
+#: src/o_complex_basic.c:683
 #, c-format
 msgid ""
 "Found a component with an invalid mirror flag [ %c %d %d %d %d %d %s ]\n"
@@ -416,7 +403,7 @@ msgstr ""
 "Een komponent met een ongeldige spiegel vlag gevonden [ %c %d %d %d %d %d %"
 "s ]\n"
 
-#: ../src/o_complex_basic.c:1416
+#: src/o_complex_basic.c:1307
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -425,7 +412,7 @@ msgstr ""
 "WAARSCHUWING: Symbool versie zoek fout bij refdes %s:\n"
 "\tKan symboolbestand niet doorzoeken symversion=%s\n"
 
-#: ../src/o_complex_basic.c:1420
+#: src/o_complex_basic.c:1311
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -434,7 +421,7 @@ msgstr ""
 "WAARSCHUWING: Symbool versie zoek fout bij refdes %s:\n"
 "\tKan symboolbestand niet doorzoeken symversion=\n"
 
-#: ../src/o_complex_basic.c:1436
+#: src/o_complex_basic.c:1327
 #, c-format
 msgid ""
 "WARNING: Symbol version parse error on refdes %s:\n"
@@ -443,7 +430,7 @@ msgstr ""
 "WAARSCHUWING: Symbool versie zoek fout bij refdes %s:\n"
 "\tKan bijgevoegd symboolbestand niet doorzoeken symversion=%s\n"
 
-#: ../src/o_complex_basic.c:1461
+#: src/o_complex_basic.c:1352
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
@@ -454,7 +441,7 @@ msgstr ""
 "\tsymversion=%s bijgevoegd aan bedoelde symbool, maar geen symversion= in "
 "het symbool bestand\n"
 
-#: ../src/o_complex_basic.c:1475
+#: src/o_complex_basic.c:1366
 #, c-format
 msgid ""
 "WARNING: Symbol version mismatch on refdes %s (%s):\n"
@@ -463,17 +450,17 @@ msgstr ""
 "WAARSCHUWING: Symbool versie fout bij refdes %s (%s):\n"
 "\tSymbool in bibliotheek is nieuwer dan bedoelde symbool\n"
 
-#: ../src/o_complex_basic.c:1503
+#: src/o_complex_basic.c:1394
 #, c-format
 msgid "\tMAJOR VERSION CHANGE (file %.3f, instantiated %.3f, %s)!\n"
 msgstr "\tGROTE VERSIE VERANDERING (bestand %.3f, bedoeld %.3f, %s)!\n"
 
-#: ../src/o_complex_basic.c:1521
+#: src/o_complex_basic.c:1412
 #, c-format
 msgid "\tMinor version change (file %.3f, instantiated %.3f)\n"
 msgstr "\tKleine versie verandering (bestand %.3f, bedoeld %.3f)!\n"
 
-#: ../src/o_complex_basic.c:1532
+#: src/o_complex_basic.c:1423
 #, c-format
 msgid ""
 "WARNING: Symbol version oddity on refdes %s:\n"
@@ -482,14 +469,13 @@ msgstr ""
 "WAARSCHUWING: Symbool versie afwijking bij refdes %s:\n"
 "\tbedoeld symbool is nieuwer dan het symbool in de bibliotheek\n"
 
-#: ../src/o_embed.c:58
+#: src/o_embed.c:58
 #, c-format
 msgid "Component [%s] has been embedded\n"
 msgstr "Komponent [%s] is ingevoegd\n"
 
 # symbool niet gevonden in de symbolenbibliotheek: signaleer een fout
-#. symbol not found in the symbol library: signal an error
-#: ../src/o_embed.c:98
+#: src/o_embed.c:98
 #, c-format
 msgid ""
 "Could not find component [%s], while trying to unembed. Component is still "
@@ -498,101 +484,101 @@ msgstr ""
 "Kan komponent [%s] niet vinden, tijdens het uitvoegen. Komponent is nog "
 "steeds ingevoegd\n"
 
-#: ../src/o_embed.c:106
+#: src/o_embed.c:106
 #, c-format
 msgid "Component [%s] has been successfully unembedded\n"
 msgstr "Komponent [%s] is succesvol uitgevoegd\n"
 
-#: ../src/o_line_basic.c:264
+#: src/o_line_basic.c:264
 #, c-format
 msgid "Found a zero length line [ %c %d %d %d %d %d ]\n"
 msgstr "Lijn met een lengte van nul gevonden [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_net_basic.c:170
+#: src/o_net_basic.c:170
 #, c-format
 msgid "Found a zero length net [ %c %d %d %d %d %d ]\n"
 msgstr "Net met een lengte van nul gevonden [ %c %d %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:80
+#: src/o_picture.c:80
 #, c-format
 msgid "Error reading picture definition line: %s.\n"
 msgstr "Fout bij het lezen van afbeelding definitie regel: %s.\n"
 
-#: ../src/o_picture.c:94
+#: src/o_picture.c:94
 #, c-format
 msgid "Found a zero width/height picture [ %c %d %d %d %d ]\n"
 msgstr ""
 "Afbeelding met een breedte/hoogte van nul gevonden [ %c %d %d %d %d ]\n"
 
-#: ../src/o_picture.c:99
+#: src/o_picture.c:99
 #, c-format
 msgid "Found a picture with a wrong 'mirrored' parameter: %c.\n"
 msgstr "Afbeelding met een verkeerde 'gespiegelde' parameter gevonden: %c.\n"
 
-#: ../src/o_picture.c:101
+#: src/o_picture.c:101
 msgid "Setting mirrored to 0\n"
 msgstr "Spiegelen op 0 ingesteld\n"
 
-#: ../src/o_picture.c:106
+#: src/o_picture.c:106
 #, c-format
 msgid "Found a picture with a wrong 'embedded' parameter: %c.\n"
 msgstr "Afbeelding met een verkeerd 'ingevoegde' waarde gevonden: %c.\n"
 
-#: ../src/o_picture.c:108
+#: src/o_picture.c:108
 msgid "Setting embedded to 0\n"
 msgstr "Invoegen op 0 ingesteld\n"
 
-#: ../src/o_picture.c:120
+#: src/o_picture.c:120
 #, c-format
 msgid "Found an unsupported picture angle [ %d ]\n"
 msgstr "Niet ondersteunde afbeelding hoek [ %d ] gevonden\n"
 
-#: ../src/o_picture.c:121 ../src/o_text_basic.c:1127
+#: src/o_picture.c:121 src/o_text_basic.c:1127
 msgid "Setting angle to 0\n"
 msgstr "Hoek op 0 ingesteld\n"
 
-#: ../src/o_picture.c:156 ../src/o_picture.c:167 ../src/o_picture.c:924
+#: src/o_picture.c:156 src/o_picture.c:167 src/o_picture.c:924
 #, c-format
 msgid "Failed to load image from embedded data [%s]: %s\n"
 msgstr "Laden van afbeelding uit ingesloten data faalde [%s]: %s\n"
 
-#: ../src/o_picture.c:157
+#: src/o_picture.c:157
 msgid "Base64 decoding failed."
 msgstr "Base64 decodering faalde."
 
-#: ../src/o_picture.c:158 ../src/o_picture.c:169 ../src/o_picture.c:926
+#: src/o_picture.c:158 src/o_picture.c:169 src/o_picture.c:926
 msgid "Falling back to file loading. Picture unembedded.\n"
 msgstr "Val terug op het laden van bestand. Afbeelding uitgevoegd.\n"
 
-#: ../src/o_picture.c:180 ../src/o_picture.c:912 ../src/o_picture.c:961
+#: src/o_picture.c:180 src/o_picture.c:912 src/o_picture.c:961
 #, c-format
 msgid "Failed to load image from file [%s]: %s\n"
 msgstr "Laden van afbeelding uit bestand faalde [%s]: %s\n"
 
-#: ../src/o_picture.c:191
+#: src/o_picture.c:191
 msgid "Loading warning picture.\n"
 msgstr "Laad de waarschuwing afbeelding.\n"
 
-#: ../src/o_picture.c:197
+#: src/o_picture.c:197
 #, c-format
 msgid "Error loading picture from file: %s.\n"
 msgstr "Fout bij het laden van een afbeelding uit een bestand: %s.\n"
 
-#: ../src/o_picture.c:257
+#: src/o_picture.c:257
 msgid "ERROR: o_picture_save: unable to encode the picture.\n"
 msgstr "FOUT: o_picture_save: kan de afbeelding niet coderen.\n"
 
-#: ../src/o_picture.c:939
+#: src/o_picture.c:939
 #, c-format
 msgid "Picture [%s] has been embedded\n"
 msgstr "Afbeelding [%s] is ingevoegd\n"
 
-#: ../src/o_picture.c:979
+#: src/o_picture.c:979
 #, c-format
 msgid "Picture [%s] has been unembedded\n"
 msgstr "Afbeelding [%s] is uitgevoegd\n"
 
-#: ../src/o_pin_basic.c:180
+#: src/o_pin_basic.c:180
 msgid ""
 "Found a pin which did not have the whichone field set.\n"
 "Verify and correct manually.\n"
@@ -600,70 +586,70 @@ msgstr ""
 "Pen die geen whichone veld ingesteld heeft gevonden.\n"
 "Verifieer en corigeer handmatig.\n"
 
-#: ../src/o_pin_basic.c:183
+#: src/o_pin_basic.c:183
 #, c-format
 msgid "Found an invalid whichend on a pin (reseting to zero): %d\n"
 msgstr "Pen met een ongeldige whichend gevonden (instellen op nul): %d\n"
 
-#: ../src/o_pin_basic.c:189
+#: src/o_pin_basic.c:189
 #, c-format
 msgid "Found a zero length pin: [ %s ]\n"
 msgstr "Pen met een lengte van nul gevonden: [ %s ]\n"
 
-#: ../src/o_text_basic.c:303
+#: src/o_text_basic.c:303
 #, c-format
 msgid "Could not find character '%s' definition.\n"
 msgstr "Kan karakter '%s' definitie niet vinden.\n"
 
-#: ../src/o_text_basic.c:308
+#: src/o_text_basic.c:308
 #, c-format
 msgid "Could not load question font char -- check font-directory keyword\n"
 msgstr ""
 "Kan vraag font karakter niet laden -- controleer font-map sleutelwoord\n"
 
-#: ../src/o_text_basic.c:1113
+#: src/o_text_basic.c:1113
 #, c-format
 msgid "Found a zero size text string [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr ""
 "Tekst string met een afmeting van nul gevonden [ %c %d %d %d %d %d %d %d %"
 "d ]\n"
 
-#: ../src/o_text_basic.c:1125
+#: src/o_text_basic.c:1125
 #, c-format
 msgid "Found an unsupported text angle [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr "Niet ondersteunde teksthoek gevonden [ %c %d %d %d %d %d %d %d %d ]\n"
 
-#: ../src/o_text_basic.c:1147
+#: src/o_text_basic.c:1147
 #, c-format
 msgid "Found an unsupported text alignment [ %c %d %d %d %d %d %d %d %d ]\n"
 msgstr ""
 "Niet ondersteunde tekst uitlijning gevonden [ %c %d %d %d %d %d %d %d %d ]\n"
 
-#: ../src/o_text_basic.c:1149
+#: src/o_text_basic.c:1149
 msgid "Setting alignment to LOWER_LEFT\n"
 msgstr "Uitlijning op LINKS_ONDER ingesteld\n"
 
-#: ../src/o_text_basic.c:1238
+#: src/o_text_basic.c:1238
 #, c-format
 msgid "Failed to validate utf-8 character in font definition: \"%s\".\n"
 msgstr "Valideren van utf-8 karakter in font definitie: \"%s\" faalde.\n"
 
-#: ../src/s_clib.c:464
+#: src/s_clib.c:464
 #, c-format
 msgid "Library command failed [%s]: %s\n"
 msgstr "Bibliotheek opdracht faalde [%s]: %s\n"
 
-#: ../src/s_clib.c:469
+#: src/s_clib.c:469
 #, c-format
 msgid "Library command failed [%s]: Uncaught signal %i.\n"
 msgstr "Bibliotheek opdracht faalde [%s]: Niet opgevangen signaal %i.\n"
 
-#: ../src/s_clib.c:473
+#: src/s_clib.c:473
 #, c-format
 msgid "Library command failed [%s]\n"
 msgstr "Bibliotheek opdracht faalde [%s]\n"
 
-#: ../src/s_clib.c:474
+#: src/s_clib.c:474
 #, c-format
 msgid ""
 "Error output was:\n"
@@ -672,34 +658,34 @@ msgstr ""
 "Fout uitvoer was:\n"
 "%s\n"
 
-#: ../src/s_clib.c:560
+#: src/s_clib.c:560
 #, c-format
 msgid "Library name [%s] already in use.  Using [%s].\n"
 msgstr "Bibliotheeknaam [%s] is al in gebruik.  Gebruik nu [%s].\n"
 
-#: ../src/s_clib.c:597
+#: src/s_clib.c:597
 #, c-format
 msgid "Failed to open directory [%s]: %s\n"
 msgstr "Openen van directory faalde [%s]: %s\n"
 
-#: ../src/s_clib.c:732
+#: src/s_clib.c:732
 #, c-format
 msgid "Failed to scan library [%s]: Scheme function returned non-list\n"
 msgstr ""
 "Doorzoeken van bibliotheek [%s] faalde: Scheme functie retourneerde non-"
 "list\n"
 
-#: ../src/s_clib.c:740
+#: src/s_clib.c:740
 #, c-format
 msgid "Non-string symbol name while scanning library [%s]\n"
 msgstr ""
 "Niet string symboolnaam tijdens het doorzoeken van de bibliotheek [%s]\n"
 
-#: ../src/s_clib.c:895 ../src/s_clib.c:942
+#: src/s_clib.c:895 src/s_clib.c:942
 msgid "Cannot add library: name not specified\n"
 msgstr "Kan bibliotheek niet toevoegen: naam niet gespecificeerd\n"
 
-#: ../src/s_clib.c:902
+#: src/s_clib.c:902
 #, c-format
 msgid ""
 "Cannot add library [%s]: both 'list' and 'get' commands must be specified.\n"
@@ -707,52 +693,51 @@ msgstr ""
 "Kan bibliotheek niet toevoegen [%s]: zowel 'list' en 'get' opdrachten moeten "
 "gespecificeerd zijn.\n"
 
-#: ../src/s_clib.c:950
+#: src/s_clib.c:950
 #, c-format
 msgid "Cannot add Scheme-library [%s]: callbacks must be closures\n"
 msgstr ""
 "Kan scheme bibliotheek niet toevoegen [%s]: callbacks moeten afsluitingen "
 "zijn\n"
 
-#: ../src/s_clib.c:1077
+#: src/s_clib.c:1077
 #, c-format
 msgid "Failed to load symbol from file [%s]: %s\n"
 msgstr "Laden van symbool uit bestand faalde [%s]: %s\n"
 
-#: ../src/s_clib.c:1135
+#: src/s_clib.c:1135
 #, c-format
 msgid "Failed to load symbol data [%s] from source [%s]\n"
 msgstr "Laden van symbool gegevens [%s] uit bron [%s] faalde\n"
 
-#: ../src/s_clib.c:1376
+#: src/s_clib.c:1360
 #, c-format
 msgid "Component [%s] was not found in the component library\n"
 msgstr "Komponent [%s] is niet in de komponenten bibliotheek gevonden\n"
 
 # Meer dan een symbool
-#. More than one symbol
-#: ../src/s_clib.c:1382
+#: src/s_clib.c:1366
 #, c-format
 msgid "More than one component found with name [%s]\n"
 msgstr "Meer dan een komponent gevonden met de naam [%s]\n"
 
-#: ../src/s_color.c:206
+#: src/s_color.c:206
 msgid "Color index out of range"
 msgstr ""
 
-#: ../src/s_color.c:261
+#: src/s_color.c:261
 msgid "Color map entry must be a two-element list"
 msgstr ""
 
-#: ../src/s_color.c:269
+#: src/s_color.c:269
 msgid "Index in color map entry must be an integer"
 msgstr ""
 
-#: ../src/s_color.c:295
+#: src/s_color.c:295
 msgid "Value in color map entry must be #f or a string"
 msgstr ""
 
-#: ../src/s_hierarchy.c:90
+#: src/s_hierarchy.c:90
 #, c-format
 msgid ""
 "hierarchy loop detected while visiting page:\n"
@@ -761,42 +746,41 @@ msgstr ""
 "hierarchie lus gedetecteerd tijdens het bezoeken van pagina:\n"
 "  \"%s\"\n"
 
-#: ../src/s_hierarchy.c:185
+#: src/s_hierarchy.c:185
 msgid "There are no schematics above the current one!\n"
 msgstr "Er zijn geen schema's boven de huidige!\n"
 
-#: ../src/s_hierarchy.c:266
+#: src/s_hierarchy.c:266
 #, c-format
 msgid "ERROR in s_hierarchy_traverse: schematic not found: %s\n"
 msgstr "FOUT in s_hierarchy_traverse: schema niet gevonden: %s\n"
 
-#: ../src/s_page.c:167
+#: src/s_page.c:167
 #, c-format
 msgid "s_page_delete: Can't get the real filename of %s."
 msgstr "s_page_delete: Kan de echte bestandsnaam van %s niet krijgen."
 
-#: ../src/s_page.c:178
+#: src/s_page.c:178
 #, c-format
 msgid "s_page_delete: Unable to delete backup file %s."
 msgstr "s_page_delete: Niet mogelijk om reservekopie %s te verwijderen."
 
-#: ../src/s_page.c:380
+#: src/s_page.c:380
 #, c-format
 msgid "Saved [%s]\n"
 msgstr "[%s] opgeslagen\n"
 
-#: ../src/s_page.c:386
+#: src/s_page.c:386
 #, c-format
 msgid "Could NOT save [%s]\n"
 msgstr "Kan [%s] NIET opslaan\n"
 
-#. return type
-#: ../src/s_slib.c:181
+#: src/s_slib.c:181
 #, c-format
 msgid "Found [%s]\n"
 msgstr "[%s] gevonden\n"
 
-#: ../src/s_slib.c:191
+#: src/s_slib.c:191
 #, c-format
 msgid "Could not find [%s] in any SourceLibrary\n"
 msgstr "Kan geen [%s] vinden in welke BronBibliotheek dan ook!\n"



_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs